Some cleanup and commenting.

diff --git a/WEB-INF/lib/DateAndTime.class.php b/WEB-INF/lib/DateAndTime.class.php
index d960f008e735689c0163ec9b6898f5ff1d8cfb4d..4752e99fc7411fa33e1d1354b53b7721b4ae64c7 100644 (file)
--- a/WEB-INF/lib/DateAndTime.class.php
+++ b/WEB-INF/lib/DateAndTime.class.php
@@ -287,27 +287,17 @@ class DateAndTime {
   }
 
   function isError() {
   }
 
   function isError() {

-    if ($this->mParseResult!=0) return true;
+    if ($this->mParseResult != 0) return true;

     return false;
   }
 
     return false;
   }
 

-  function getClone() {
-    if (version_compare(phpversion(), '5.0') < 0) {
-      $d = new DateAndTime($this->getFormat());
-      $d->setTimestamp($this->getTimestamp());
-      return $d;
-    } else {
-      return clone($this);
-    }
-  }
-

   function before(/*DateAndTime*/ $obj) {
   function before(/*DateAndTime*/ $obj) {

-    if ($this->getTimestamp()<$obj->getTimestamp()) return true;
+    if ($this->getTimestamp() < $obj->getTimestamp()) return true;

     return false;
   }
 
   function after(/*DateAndTime*/ $obj) {
     return false;
   }
 
   function after(/*DateAndTime*/ $obj) {

-    if ($this->getTimestamp()>$obj->getTimestamp()) return true;
+    if ($this->getTimestamp() > $obj->getTimestamp()) return true;

     return false;
   }
 
     return false;
   }
 


@@ -316,12 +306,6 @@ class DateAndTime {
     return false;
   }
 
     return false;
   }
 

-  function nextDate() {
-    $d = $this->getClone();
-    $d->incDay();
-    return $d;
-  }
-

   function decDay(/*int*/$days=1) {
     $this->setTimestamp(@mktime($this->mHour, $this->mMinute, $this->mSecond, $this->mMonth, $this->mDate - $days, $this->mYear));
   }
   function decDay(/*int*/$days=1) {
     $this->setTimestamp(@mktime($this->mHour, $this->mMinute, $this->mSecond, $this->mMonth, $this->mDate - $days, $this->mYear));
   }

diff --git a/WEB-INF/lib/Period.class.php b/WEB-INF/lib/Period.class.php
index 5730a75d04d47722c132dd4fa7d8eb45d82c5cf4..0e901a8d6ebf5151e888f84cef3794b0605e926f 100644 (file)
--- a/WEB-INF/lib/Period.class.php
+++ b/WEB-INF/lib/Period.class.php
@@ -52,9 +52,14 @@ define('INTERVAL_PREVIOUS_DAY', 44);
 define('INTERVAL_SELECTED_DAY', 48);
 */
 
 define('INTERVAL_SELECTED_DAY', 48);
 */
 

+// TODO: Refactoring is needed for this class. Probably by refactoring DateAndTime first, as Period is
+// basically a collection of 2 DateAndTime instances.
+//
+// Second problem is that "today" is (most likely?) server today, so reports may give incorrect dates
+// for browser users in different time zones. Verify and fix this.

 class Period {
 class Period {

-  var $startDate;
-  var $endDate;
+  var $startDate; // DateAndTime object.
+  var $endDate;   // DateAndTime object.

 
   function __construct($period_type = 0, $date_point = null) {
 
 
   function __construct($period_type = 0, $date_point = null) {