Merge pull request #947 from heliopsis/EZP-6959

Fix EZP-6959: eZDate and eZDateTime accept values prior to epoch
ezsystems · May 20, 2014 · 2eff97b · 2eff97b
2 parents 480fbfc + 4a95844
commit 2eff97b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/kernel/classes/datatypes/ezdatetime/ezdatetimetype.php b/kernel/classes/datatypes/ezdatetime/ezdatetimetype.php
@@ -147,7 +147,7 @@ function fetchObjectAttributeHTTPInput( $http, $base, $contentObjectAttribute )
 
             if ( ( $year == '' and $month == '' and $day == '' and
                    $hour == '' and $minute == '' and ( !$useSeconds or $second == '' ) ) or
-                 !checkdate( $month, $day, $year ) or $year < 1970 )
+                 !checkdate( $month, $day, $year ) )
             {
                     $dateTime->setTimeStamp( 0 );
             }
@@ -239,7 +239,7 @@ function fetchCollectionAttributeHTTPInput( $collection, $collectionAttribute, $
             $contentClassAttribute = $contentObjectAttribute->contentClassAttribute();
             if ( ( $year == '' and $month == ''and $day == '' and
                    $hour == '' and $minute == '' and ( !$useSeconds or $second == '' ) ) or
-                 !checkdate( $month, $day, $year ) or $year < 1970 )
+                 !checkdate( $month, $day, $year ) )
             {
                     $dateTime->setTimeStamp( 0 );
             }

diff --git a/lib/ezlocale/classes/ezdate.php b/lib/ezlocale/classes/ezdate.php
@@ -73,7 +73,7 @@ function eZDate( $date = false )
         }
         $this->Date = $date;
         $this->Locale = eZLocale::instance();
-        $this->IsValid = $date > 0;
+        $this->IsValid = true;
     }
 
     function attributes()
@@ -144,7 +144,7 @@ function timeStamp()
     function setTimeStamp( $stamp )
     {
         $this->Date = $stamp;
-        $this->IsValid = $stamp > 0;
+        $this->IsValid = true;
     }
 
     /*!

diff --git a/lib/ezlocale/classes/ezdatetime.php b/lib/ezlocale/classes/ezdatetime.php
@@ -85,9 +85,9 @@ function eZDateTime( $datetime = false )
             $datetime = time();
         }
 
-        $this->DateTime = $datetime;
+        $this->DateTime = intval( $datetime );
         $this->Locale = eZLocale::instance();
-        $this->IsValid = $datetime > 0;
+        $this->IsValid = true;
     }
 
     function attributes()
@@ -192,7 +192,7 @@ function timeStamp( )
     function setTimeStamp( $stamp )
     {
         $this->DateTime = $stamp;
-        $this->IsValid = $stamp > 0;
+        $this->IsValid = true;
     }
 
     /*!

diff --git a/lib/ezutils/classes/ezdatetimevalidator.php b/lib/ezutils/classes/ezdatetimevalidator.php
@@ -28,7 +28,6 @@ static function validateDate( $day, $month, $year )
         $check = checkdate( $month, $day, $year );
         $datetime = mktime( 0, 0, 0, $month, $day, $year );
         if ( !$check or
-             $year < 1970 or
              $datetime === false )
         {
             return eZInputValidator::STATE_INVALID;
@@ -54,7 +53,6 @@ static function validateDateTime( $day, $month, $year, $hour, $minute, $second =
         $check = checkdate( $month, $day, $year );
         $datetime = mktime( $hour, $minute, $second, $month, $day, $year );
         if ( !$check or
-             $year < 1970 or
              $datetime === false or
              eZDateTimeValidator::validateTime( $hour, $minute ) == eZInputValidator::STATE_INVALID )
         {