mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Issue #83 - datepicker fixed existing value conversion.

Browse Source
This commit is contained in:
Cameron
2013-01-21 12:35:29 -08:00
parent 795d854a0d
commit 2141e8a2af
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/form_handler.php
View File

@@ -564,32 +564,32 @@ class e_form
$dateFormat = varset($options['dateformat']) ? trim($options['dateformat']) :e107::getPref('inputdate', '%Y-%m-%d'); $dateFormat = varset($options['dateformat']) ? trim($options['dateformat']) :e107::getPref('inputdate', '%Y-%m-%d');
$timeFormat = varset($options['timeformat']) ? trim($options['timeformat']) :e107::getPref('inputtime', '%H:%M:%S'); $timeFormat = varset($options['timeformat']) ? trim($options['timeformat']) :e107::getPref('inputtime', '%H:%M:%S');
$type = varset($options['type']) ? trim($options['type']) : "date"; // 'datetime' $type = varset($options['type']) ? trim($options['type']) : "date"; // 'datetime'
// echo "TYPE=".$type; // echo "TYPE=".$type;
$ampm = (preg_match("/%l|%I|%p|%P/",$timeFormat)) ? 'true' : 'false'; $ampm = (preg_match("/%l|%I|%p|%P/",$timeFormat)) ? 'true' : 'false';
$dformat = e107::getDate()->toMask($dateFormat); $dformat = e107::getDate()->toMask($dateFormat);
$tformat = e107::getDate()->toMask($timeFormat); $tformat = e107::getDate()->toMask($timeFormat);
$id = $this->name2id($name); $id = $this->name2id($name);
$classes = array( $classes = array(
'date' => 'e-date', 'date' => 'e-date',
// 'time' => 'e-time', // 'time' => 'e-time',
'datetime' => 'e-datetime' 'datetime' => 'e-datetime'
); );
$def = array( $def = array(
'date' => $dateFormat, 'date' => $dateFormat,
// 'time' => $timeFormat, // 'time' => $timeFormat,
'datetime' => $dateFormat." ".$timeFormat 'datetime' => $dateFormat." ".$timeFormat
); );
$defdisp = (isset($def[$type])) ? $def[$type] : $def['date']; $defdisp = (isset($def[$type])) ? $def[$type] : $def['date'];
$defdisp = e107::getDate()->toMask($defdisp); // $defdisp = e107::getDate()->toMask($defdisp);
if ($datestamp) if ($datestamp)
{ {
@@ -608,16 +608,16 @@ class e_form
{ {
$text .= "<div class='{$class}' id='inline-{$id}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' ></div> $text .= "<div class='{$class}' id='inline-{$id}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' ></div>
<input type='hidden' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' /> <input type='hidden' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' />
"; ";
} }
else else
{ {
$text .= "<input class='{$class}' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' {$required} />"; $text .= "<input class='{$class}' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' {$required} />";
} }
return $text; return $text;
} }
/** /**