Merge pull request #211 from garyee/Branch_3.3.5

fixed Dateformat FE php error
menatwork · Dec 21, 2016 · 8a25af9 · 8a25af9
2 parents 959d7cc + 3019bf9
commit 8a25af9
Showing 1 changed file with 27 additions and 7 deletions.
diff --git a/system/modules/multicolumnwizard/MultiColumnWizard.php b/system/modules/multicolumnwizard/MultiColumnWizard.php
@@ -250,9 +250,9 @@ protected function validator($varInput)
 
                 // Convert date formats into timestamps (check the eval setting first -> #3063)
                 $rgxp = $arrField['eval']['rgxp'];
-                if (($rgxp == 'date' || $rgxp == 'time' || $rgxp == 'datim') && $varValue != '')
+                if (!$objWidget->hasErrors() && ($rgxp == 'date' || $rgxp == 'time' || $rgxp == 'datim') && $varValue != '')
                 {
-                    $objDate  = new Date($varValue, $GLOBALS['TL_CONFIG'][$rgxp . 'Format']);
+                    $objDate  = new Date($varValue,$this->getNumericDateFormat($rgxp));
                     $varValue = $objDate->tstamp;
                 }
 
@@ -526,7 +526,7 @@ public function generate()
                     if ($arrField['eval']['datepicker'])
                     {
                         $rgxp   = $arrField['eval']['rgxp'];
-                        $format = $GLOBALS['TL_CONFIG'][$rgxp . 'Format'];
+                        $format = $this->getNumericDateFormat($rgxp);
 
                         switch ($rgxp)
                         {
@@ -673,7 +673,7 @@ protected function getMcWDatePickerString($strId, $strKey, $rgxp)
     {
         if (version_compare(VERSION, '2.11', '<'))
         {
-            $format = $GLOBALS['TL_CONFIG'][$rgxp . 'Format'];
+            $format = $this->getNumericDateFormat($rgxp);
             switch ($rgxp)
             {
                 case 'datim':
@@ -711,7 +711,7 @@ protected function getMcWDatePickerString($strId, $strKey, $rgxp)
 
         elseif (version_compare(VERSION,'3.3','<')) {
 
-            $format = Date::formatToJs($GLOBALS['TL_CONFIG'][$rgxp . 'Format']);
+            $format = Date::formatToJs($this->getNumericDateFormat($rgxp));
             switch ($rgxp)
             {
                 case 'datim':
@@ -747,7 +747,7 @@ protected function getMcWDatePickerString($strId, $strKey, $rgxp)
 
         else
         {
-            $format = Date::formatToJs($GLOBALS['TL_CONFIG'][$rgxp . 'Format']);
+            $format = Date::formatToJs($this->getNumericDateFormat($rgxp));
             switch ($rgxp)
             {
                 case 'datim':
@@ -949,9 +949,15 @@ protected function initializeWidget(&$arrField, $intRow, $strKey, $varValue)
 
         // Convert date formats into timestamps (check the eval setting first -> #3063)
         $rgxp = $arrField['eval']['rgxp'];
+        $dateFormatErrorMsg="";
         if (($rgxp == 'date' || $rgxp == 'time' || $rgxp == 'datim') && $varValue != '')
         {
-            $objDate  = new Date($varValue, $GLOBALS['TL_CONFIG'][$rgxp . 'Format']);
+            try{
+                $objDate  = new Date($varValue, $this->getNumericDateFormat($rgxp));
+            }catch(\Exception $e){
+                $dateFormatErrorMsg=$e->getMessage();
+            }
+
             $varValue = $objDate->tstamp;
         }
 
@@ -973,6 +979,9 @@ protected function initializeWidget(&$arrField, $intRow, $strKey, $varValue)
         $objWidget->storeValues   = true;
         $objWidget->xlabel        = $xlabel;
         $objWidget->currentRecord = $this->currentRecord;
+        if(!empty($dateFormatErrorMsg)){
+            $objWidget->addError($e->getMessage());
+        }
 
         return $objWidget;
     }
@@ -1234,4 +1243,15 @@ protected function generateButtonString($level = 0)
         return $return;
     }
 
+    /**
+     * Get Time/Date-format from global config (BE) or Page settings (FE)
+     * @param $rgxp
+     *
+     * @return mixed
+     */
+    private function getNumericDateFormat($rgxp){
+        return call_user_func(array("\Contao\Date","getNumeric".ucfirst($rgxp)."Format" ));
+    }
+
+
 }