[Gemstracker-svn] SF.net SVN: gemstracker:[596] trunk/library

[<gem...@li...>]

Revision: 596
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=596&view=rev
Author:   matijsdejong
Date:     2012-04-04 18:33:08 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Incorrect optimization removed from MUtil_Date
Date Valid_Until now includes the whol day of the date specified.

Modified Paths:
--------------
    trunk/library/classes/MUtil/Date.php
    trunk/library/snippets/EditTrackTokenSnippet.php

Modified: trunk/library/classes/MUtil/Date.php
===================================================================
--- trunk/library/classes/MUtil/Date.php	2012-04-03 16:52:44 UTC (rev 595)
+++ trunk/library/classes/MUtil/Date.php	2012-04-04 18:33:08 UTC (rev 596)
@@ -68,12 +68,14 @@
         $val1 = intval($day1->getUnixTimestamp() / self::DAY_SECONDS);
 
         if (null === $date) {
-            $val2 = intval(time() / self::DAY_SECONDS);
+            // We must use date objects as unix timestamps do not take
+            // account of leap seconds.
+            $day2 = new MUtil_Date();
         } else {
             $day2 = clone $date;
-            $day2->setTime(0);
-            $val2 = intval($day2->getUnixTimestamp() / self::DAY_SECONDS);
         }
+        $day2->setTime(0);
+        $val2 = intval($day2->getUnixTimestamp() / self::DAY_SECONDS);
 
         return $val1 - $val2;
     }

Modified: trunk/library/snippets/EditTrackTokenSnippet.php
===================================================================
--- trunk/library/snippets/EditTrackTokenSnippet.php	2012-04-03 16:52:44 UTC (rev 595)
+++ trunk/library/snippets/EditTrackTokenSnippet.php	2012-04-04 18:33:08 UTC (rev 596)
@@ -155,10 +155,18 @@
      */
     public function saveData()
     {
+        $model = $this->getModel();
+        if ($this->formData['gto_valid_until']) {
+            // Make sure date based units are valid until the end of the day.
+            $date = new MUtil_Date($this->formData['gto_valid_until'], $model->get('gto_valid_until', 'dateFormat'));
+            $date->addDay(1);
+            $date->subSecond(1);
+            $this->formData['gto_valid_until'] = $date;
+        }
+
         parent::saveData();
 
         if ($this->formData[self::RECALCULATE_FIELD]) {
-            $model = $this->getModel();
             // Refresh token with current form data
             $updateData['gto_valid_from']  = $model->getOnSave($this->formData['gto_valid_from'], true, 'gto_valid_from');
             $updateData['gto_valid_until'] = $model->getOnSave($this->formData['gto_valid_until'], true, 'gto_valid_until');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.