Handle invalid dates in the user modules

contao · Feb 1, 2013 · 03fd7fb · 03fd7fb
1 parent 2576ef9
commit 03fd7fb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/system/modules/frontend/ModulePersonalData.php b/system/modules/frontend/ModulePersonalData.php
@@ -166,9 +166,16 @@ protected function compile()
 				// Convert date formats into timestamps (check the eval setting first -> #3063)
 				if (($rgxp == 'date' || $rgxp == 'time' || $rgxp == 'datim') && $varValue != '')
 				{
-					// Use the numeric back end format here!
-					$objDate = new Date($varValue, $GLOBALS['TL_CONFIG'][$rgxp.'Format']);
-					$varValue = $objDate->tstamp;
+					try
+					{
+						// Use the numeric back end format here!
+						$objDate = new Date($varValue, $GLOBALS['TL_CONFIG'][$rgxp.'Format']);
+						$varValue = $objDate->tstamp;
+					}
+					catch (Exception $e)
+					{
+						$objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['invalidDate'], $varValue));
+					}
 				}
 
 				// Make sure that unique fields are unique (check the eval setting first -> #3063)

diff --git a/system/modules/registration/ModuleRegistration.php b/system/modules/registration/ModuleRegistration.php
@@ -208,9 +208,16 @@ protected function compile()
 				// Convert date formats into timestamps (check the eval setting first -> #3063)
 				if (($rgxp == 'date' || $rgxp == 'time' || $rgxp == 'datim') && $varValue != '')
 				{
-					// Use the numeric back end format here!
-					$objDate = new Date($varValue, $GLOBALS['TL_CONFIG'][$rgxp.'Format']);
-					$varValue = $objDate->tstamp;
+					try
+					{
+						// Use the numeric back end format here!
+						$objDate = new Date($varValue, $GLOBALS['TL_CONFIG'][$rgxp.'Format']);
+						$varValue = $objDate->tstamp;
+					}
+					catch (Exception $e)
+					{
+						$objWidget->addError(sprintf($GLOBALS['TL_LANG']['ERR']['invalidDate'], $varValue));
+					}
 				}
 
 				// Make sure that unique fields are unique (check the eval setting first -> #3063)