fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed old masks dates bug6438

Browse Source
This commit is contained in:
Alvaro Campos
2011-03-17 16:25:54 -04:00
committed by Alexandre Rosenfeld
parent 931321b3b7
commit ea31c50178
1 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gulliver/system/class.xmlform.php
View File

@@ -3119,9 +3119,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
* By Erik A. O. <erik@colosa.com>
* @package gulliver.system
*/
if($mask == 'yyyy-mm-dd')
$mask = '%Y-%m-%d';
if( strpos($mask, '%') === false ) {
if( strpos($mask, '-') !== false ) { // case '-' saparator
$maskparts = explode('-', $mask);
@@ -3129,6 +3127,14 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
foreach($maskparts as $part) {
if($mask != '')
$mask .= '-';
if($part=='yyyy')
$part='Y';
if($part=='dd')
$part='d';
if($part=='mm')
$part='m';
if($part=='yy')
$part='y';
$mask .= '%'.$part;
}
}
@@ -3139,9 +3145,37 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
foreach($maskparts as $part) {
if($mask != '')
$mask .= '/';
if($part=='yyyy')
$part='Y';
if($part=='dd')
$part='d';
if($part=='mm')
$part='m';
if($part=='yy')
$part='y';
$mask .= '%'.$part;
}
}
if( strpos($mask, '.') !== false ) { // case '.' saparator
$maskparts = explode('.', $mask);
$mask = '';
foreach($maskparts as $part) {
if($mask != '')
$mask .= '.';
if($part=='yyyy')
$part='Y';
if($part=='dd')
$part='d';
if($part=='mm')
$part='m';
if($part=='yy')
$part='y';
$mask .= '%'.$part;
}
}
}
/** - end - Backward compatibility **/
$tmp = str_replace("%", "", $mask);
@@ -3196,14 +3230,14 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
$value=$value1;
}
if ( $this->editable != "0") {
$html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'" pm:defaultvalue="'.$value1.'"/>'
. '<a onclick="removeValue(\''.$pID.'\'); return false;"/> '
. '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>'
. '<a id="'.$pID.'[btn]"><img src="/images/pmdateicon.png" border="0" width="12" height="12" style="position:relative;left:-17px;top:0px;"/></a>'
. '<script>datePicker4("", \''.$pID.'\', \''.$mask.'\', \''.$startDate.'\', \''.$endDate.'\','.$Time.')</script>';
} else {
} else {
$html = '<input id="'.$pID.'" name="'.$pID.'" pm:mask="'.$mask.'" pm:start="'.$startDate.'" pm:end="'.$endDate.'" pm:time="'.$Time.'" '.$onchange.' class="module_app_input___gray" size="'.$sizeend.'" value="'.$value.'"pm:defaultvalue="'.$value1.'" readonly="readonly"/>'
. '<a onclick="removeValue(\''.$pID.'\'); return false;"/> '
. '<img src="/images/icons_silk/calendar_x_button.png" style="position:relative;left:-17px;top:5px;"/></a>'