From 70a735b501bea48b4833dd3768c24e7b48c83904 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Tue, 4 Dec 2012 12:07:30 -0400
Subject: [PATCH] BUG-7569 Date Fields are not applying the mask when
 displaying saved dates.

When applaying the mask it was showing a rear message. I add some mask letters to function masktophp to solution this issue, and add some validations to applay the mask when displaying saved dates.
---
 gulliver/system/class.xmlform.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 2360d6de2..276ad9bed 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -4057,13 +4057,6 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
         //$this->defaultValue = G::replaceDataField( $this->defaultValue, $owner->values);
         $id = "form[$this->name]";
 
-        if ($this->renderMode == 'edit' && $this->renderMode == 'view') {
-            if ($value == 'today') {
-                $mask = str_replace( "%", "", $this->mask );
-                $value = date( masktophp($mask) );
-                return $value;
-            }
-        }
         return $this->__draw_widget( $id, $value, $owner );
     }
 
@@ -4096,7 +4089,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
                     }
                     if ($v == 'today') {
                         $mask = str_replace( "%", "", $this->mask );
-                        $v = date( masktophp($mask) );
+                        $v = date( masktophp($mask, $v) );
                     }
                     $html = '<input ' . $this->NSRequiredValue() . ' class="module_app_input___gray" id="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" name="form[' . $owner->name . '][' . $r . '][' . $this->name . ']" type ="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" value="' . $this->htmlentities( $v, ENT_COMPAT, 'utf-8' ) . '" required="' . $isRequired . '" style="display:none;' . htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '"/>' . htmlentities( $v, ENT_COMPAT, 'utf-8' );
                 } else {
@@ -4172,7 +4165,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
         }
 
         if ($this->defaultValue != "") {
-            $defaultValue = masktophp( $mask );
+            $defaultValue = masktophp( $mask, $defaultValue);
         }
 
         if (strpos( $mask, '%' ) === false) {
@@ -4213,7 +4206,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
             $value = ''; //date ($tmp);
         } else {
             if ($value != "") {
-                $value = masktophp( $mask );
+                $value = masktophp( $mask, $value);
             }
         }
 
@@ -5453,7 +5446,7 @@ class XmlForm_Field_Image extends XmlForm_Field
 }
 
 //mask function to php
-function masktophp ($mask)
+function masktophp ($mask, $value)
 {
     $tmp = str_replace("%", "", $mask);
     if (preg_match('/M/',$tmp)) {
@@ -5501,7 +5494,12 @@ function masktophp ($mask)
     if (preg_match('/P/',$tmp)) {
         $tmp = str_replace("P", "a", $tmp);
     }
-    $value = date($tmp);
+
+    if ($value == 'today') {
+        $value = date($tmp);
+    } else {
+        $value = date($tmp, strtotime ($value));
+    }
     return $value;
 }