mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1376 from lonalore/master

Browse Source 
Field type "datepicker" enhancements: allow use of "disabled" attribute
This commit is contained in:
Cameron 2016-02-25 10:48:43 -08:00
commit 310d5ff512
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e107_handlers/form_handler.php
View File

@ -953,10 +953,18 @@ class e_form
$id = $this->name2id($name);
$classes = array('date' => 'e-date', 'datetime' => 'e-datetime');
// If default value is set.
if ($datestamp)
{
$value = is_numeric($datestamp) ? e107::getDate()->convert_date($datestamp, $dateFormat) : $datestamp; //date("d/m/Y H:i:s", $datestamp);
// Create timestamp.
if(!is_numeric($datestamp))
{
$datestamp = strtotime($datestamp);
}
// Convert date to proper format.
$value = e107::getDate()->convert_date($datestamp, $dateFormat);
}
$text = "";
@ -967,6 +975,7 @@ class e_form
$required = vartrue($options['required']) ? "required" : "";
$firstDay = vartrue($options['firstDay']) ? $options['firstDay'] : 0;
$xsize = (vartrue($options['size']) && !is_numeric($options['size'])) ? $options['size'] : 'xlarge';
$disabled = vartrue($options['disabled']) ? "disabled" : "";
if(vartrue($options['inline']))
{
@ -976,7 +985,7 @@ class e_form
}
else
{
$text .= "<input class='{$class} input-".$xsize." form-control' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} />";
$text .= "<input class='{$class} input-".$xsize." form-control' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} {$disabled} />";
}
// $text .= "ValueFormat: ".$dateFormat." Value: ".$value;