tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/watchlist

Modified Files:
      Tag: BRANCH-2-0
	watchlist.pinc 
Log Message:
REFACTOR

Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.40.2.9
retrieving revision 1.40.2.10
diff -u -d -r1.40.2.9 -r1.40.2.10
--- watchlist.pinc	10 May 2007 14:57:03 -0000	1.40.2.9
+++ watchlist.pinc	23 May 2007 10:06:42 -0000	1.40.2.10
@@ -406,7 +406,7 @@
     global $tutos,$lang;
 
     $msg = "";
-    $d = new LocalDateTime();
+    $d = new TutosDateTime();
     $watchmailtxt = "birthday_remember.proto";
     $q = "SELECT a.*,b.lastcall,b.adr_id FROM ". $user->dbconn->prefix ."addresses a, ". $user->dbconn->prefix ."watchlist b WHERE (a.id = b.obj_id) and (a.birthday is not null)";
     $r = $user->dbconn->Exec($q);

Update of /cvsroot/tutos/tutos/php/projectio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/projectio

Modified Files:
      Tag: BRANCH-2-0
	projectio.pinc 
Log Message:
REFACTOR

Index: projectio.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectio/Attic/projectio.pinc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- projectio.pinc	15 May 2007 09:14:24 -0000	1.1.2.5
+++ projectio.pinc	23 May 2007 10:06:44 -0000	1.1.2.6
@@ -198,9 +198,9 @@
       $t->logical = (count($taskData['subtasks']) > 0) ? 1 : 0;
       $t->milestone = ($taskData['milestone']) ? 1 : 0;
 
-      $s_start = new LocalDateTime(0);
+      $s_start = new TutosDateTime(0);
       $s_start->setDateTimeTS($taskData['start']);
-      $s_end = new LocalDateTime(0);
+      $s_end = new TutosDateTime(0);
       $s_end->setDateTimeTS($taskData['end']);
 
       $t->worker = array ();
@@ -512,9 +512,9 @@
     $t->logical = (count($taskData['subtasks']) > 0) ? 1 : 0;
     $t->milestone = ($taskData['milestone']) ? 1 : 0;
 
-    $s_start = new LocalDateTime(0);
+    $s_start = new TutosDateTime(0);
     $s_start->setDateTimeTS($taskData['start']);
-    $s_end = new LocalDateTime(0);
+    $s_end = new TutosDateTime(0);
     $s_end->setDateTimeTS($taskData['end']);
 
     $t->worker = array ();
@@ -587,7 +587,7 @@
             break;
 
           case 'sdate' :
-            $s_start = new LocalDateTime(0);
+            $s_start = new TutosDateTime(0);
             $s_start->setDateTimeTS($taskData['start']);
             $t->setSStart($s_start);
             if ($t->milestone) {
@@ -597,7 +597,7 @@
             break;
 
           case 'edate' :
-            $s_end = new LocalDateTime(0);
+            $s_end = new TutosDateTime(0);
             $s_end->setDateTimeTS($taskData['end']);
             $t->setSEnd($s_end);
             break;

Update of /cvsroot/tutos/tutos/php/mailbox
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/mailbox

Modified Files:
      Tag: BRANCH-2-0
	mailbox_show.php 
Log Message:
REFACTOR

Index: mailbox_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox_show.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- mailbox_show.php	10 May 2007 14:57:04 -0000	1.9.2.1
+++ mailbox_show.php	23 May 2007 10:06:44 -0000	1.9.2.2
@@ -112,7 +112,7 @@
        $end = $this->start + $tutos[maxshow];
      }
 
-     $d = new LocalDateTime();
+     $d = new TutosDateTime();
 
      echo "<tbody>\n";
      foreach ($headers as $hkey => $hval) {

Update of /cvsroot/tutos/tutos/php/rate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/rate

Modified Files:
      Tag: BRANCH-2-0
	rate_select.php rate_overview.php 
Log Message:
REFACTOR

Index: rate_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_overview.php,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- rate_overview.php	10 May 2007 14:57:04 -0000	1.3.2.2
+++ rate_overview.php	23 May 2007 10:06:44 -0000	1.3.2.3
@@ -355,7 +355,7 @@
      }
 
      # Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      } else {
@@ -371,7 +371,7 @@
        $this->filter['from'] = $from;
      }
      # End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      } else {

Index: rate_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_select.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- rate_select.php	10 May 2007 14:57:04 -0000	1.2.2.1
+++ rate_select.php	23 May 2007 10:06:44 -0000	1.2.2.2
@@ -122,8 +122,8 @@
      }
 
      # Defaults for search
-     $this->rsfd = new LocalDateTime(0);
-     $this->rstd = new LocalDateTime(0);
+     $this->rsfd = new TutosDateTime(0);
+     $this->rstd = new TutosDateTime(0);
      $this->rsrt = -1;
 
      if ( isset($_SESSION['ratesearchfrom']) ) {

Update of /cvsroot/tutos/tutos/php/installation
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/installation

Modified Files:
      Tag: BRANCH-2-0
	installation.pinc demodata.p3 installation_ins.php 
Log Message:
REFACTOR

Index: demodata.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/demodata.p3,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- demodata.p3	10 May 2007 14:57:03 -0000	1.1.2.2
+++ demodata.p3	23 May 2007 10:06:44 -0000	1.1.2.3
@@ -17,8 +17,8 @@
      $x->name = "my installation [". $cnt ."]";
      $x->product = $f;
      $x->customer = $f1;
-     $x->instdate = new LocalDateTime();
-	 $x->salesdate = new LocalDateTime();
+     $x->instdate = new TutosDateTime();
+	 $x->salesdate = new TutosDateTime();
 	 $x->description = "a instalation of ". $f->getFullName();
 	 $x->money = 11340.0;
      $x->currency = $tutos[currencies][$cnt %2];

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -u -d -r1.25.2.3 -r1.25.2.4
--- installation.pinc	10 May 2007 14:57:02 -0000	1.25.2.3
+++ installation.pinc	23 May 2007 10:06:44 -0000	1.25.2.4
@@ -81,8 +81,8 @@
     $this->product  = -1;
     $this->plist       = array();
 
-    $this->salesdate= new LocalDateTime();
-    $this->instdate= new LocalDateTime();
+    $this->salesdate= new TutosDateTime();
+    $this->instdate= new TutosDateTime();
 
     $this->tsum = array();
     $this->invlist = array();

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- installation_ins.php	10 May 2007 14:57:02 -0000	1.10.2.1
+++ installation_ins.php	23 May 2007 10:06:44 -0000	1.10.2.2
@@ -65,8 +65,8 @@
  $gotourl= addUrlParameter($gotourl,"money=". UrlEncode($money),true);
  $gotourl= addUrlParameter($gotourl,"currency=". UrlEncode($_POST['currency']),true);
 
- $sd = new LocalDateTime();
- $id = new LocalDateTime();
+ $sd = new TutosDateTime();
+ $id = new TutosDateTime();
  $sd->setDateTimeF("sale");
  $id->setDateTimeF("inst");
 

Update of /cvsroot/tutos/tutos/php/fax
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/fax

Modified Files:
      Tag: BRANCH-2-0
	fax_new.php 
Log Message:
REFACTOR

Index: fax_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fax/fax_new.php,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- fax_new.php	10 May 2007 14:57:00 -0000	1.1.4.1
+++ fax_new.php	23 May 2007 10:06:43 -0000	1.1.4.2
@@ -86,7 +86,7 @@
      if ( isset($_GET['fax']) ) {
        $this->text = Base64_Decode($_GET['fax']);
      } else {
-       $t = new LocalDateTime();
+       $t = new TutosDateTime();
        $this->text = $t->getDateTime();
        $this->text .= "\n";
        $this->text .= "\n";

Update of /cvsroot/tutos/tutos/php/merge
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/merge

Modified Files:
      Tag: BRANCH-2-0
	merge_ins.php 
Log Message:
REFACTOR

Index: merge_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/merge/merge_ins.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- merge_ins.php	10 May 2007 14:57:04 -0000	1.6.2.1
+++ merge_ins.php	23 May 2007 10:06:44 -0000	1.6.2.2
@@ -53,7 +53,7 @@
    $u->read_reference();
  }
 
- #$r = new LocalDateTime(0);
+ #$r = new TutosDateTime(0);
 
  if ( $msg == "" ) {
    $dbconn->Begin("WORK");

Update of /cvsroot/tutos/tutos/php/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/admin

Modified Files:
      Tag: BRANCH-2-0
	demodata.p3 scheme.php 
Log Message:
REFACTOR

Index: scheme.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/scheme.php,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- scheme.php	10 May 2007 14:56:59 -0000	1.5.2.3
+++ scheme.php	23 May 2007 10:06:42 -0000	1.5.2.4
@@ -130,7 +130,7 @@
      $adr = new tutos_address($this->obj);
      $adr->f_name = "Super";
      $adr->l_name = "User";
-     $adr->birthday = new LocalDateTime();
+     $adr->birthday = new TutosDateTime();
      $adr->creator = $adr;
 
      $q = "DELETE FROM ". $adr->tablename ." WHERE f_name = ". $adr->dbconn->String($adr->f_name) ." AND l_name = ". $adr->dbconn->String($adr->l_name);

Index: demodata.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/demodata.p3,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- demodata.p3	10 May 2007 14:56:59 -0000	1.2.2.2
+++ demodata.p3	23 May 2007 10:06:42 -0000	1.2.2.3
@@ -237,8 +237,8 @@
  $c1->descr = "Meeting";
  $c1->outside = 1;
  $c1->t_ignore = 1;
- $c1->a_start = new LocalDateTime();
- $c1->a_end   = new LocalDateTime();
+ $c1->a_start = new TutosDateTime();
+ $c1->a_end   = new TutosDateTime();
  $c1->visitor = &$a[1];
  $c1->product = &$p1;
  $c1->participant[$a[0]->id] = &$a[0];
@@ -253,8 +253,8 @@
  $c2->descr = "Count my money";
  $c2->t_ignore = 1;
  $c2->outside = 0;
- $c2->a_start = new LocalDateTime();
- $c2->a_end   = new LocalDateTime();
+ $c2->a_start = new TutosDateTime();
+ $c2->a_end   = new TutosDateTime();
  $c2->a_end->addDays(2);
  $c2->participant[$a[1]->id] = &$a[1];
  $msg .= $c2->save();
@@ -319,7 +319,7 @@
      $t1->name = "Demo Task 1 /". $f->getFullName();
      $t1->description = "This is a task";
      $t1->creator = &$u[$cnt % $ucnt];
-     $x = new LocalDateTime();
+     $x = new TutosDateTime();
      $t1->setSStart($x);
      $x->addDays(3);
      $t1->setSEnd($x);
@@ -339,7 +339,7 @@
      $t2->state = 0;
      $t2->p_id = $f->id;
      $t2->worker[$a[1]->id] = $a[1];
-     $x = new LocalDateTime();
+     $x = new TutosDateTime();
      $x->addDays(1);
      $t2->setSStart($x);
      $x->addDays(2);
@@ -357,7 +357,7 @@
      $t3->p_id = $t2->id;
      $t3->worker[$a[0]->id] = $a[0];
      $t3->worker[$a[1]->id] = $a[1];
-     $x = new LocalDateTime();
+     $x = new TutosDateTime();
      $x->addDays(2);
      $t3->setSStart($x);
      $x->addDays(2);
@@ -383,7 +383,7 @@
      $x->worker= $a[$cnt % $acnt];
      $x->volume = 2 + ($cnt %7) * 0.25;
      $x->desc = "Working on ". $f->getFullName();
-     $x->wday = new LocalDateTime();
+     $x->wday = new TutosDateTime();
      $x->state = ($cnt %4) + 1;
      $x->invoice = -1;
      $x->cph = 110.5 ;

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/db

Modified Files:
      Tag: BRANCH-2-0
	db_ora.pinc db_oci.pinc db_pg.pinc db.pinc db_mysql.pinc 
Log Message:
REFACTOR

Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_ora.pinc,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -d -r1.21.2.2 -r1.21.2.3
--- db_ora.pinc	10 May 2007 14:56:59 -0000	1.21.2.2
+++ db_ora.pinc	23 May 2007 10:06:43 -0000	1.21.2.3
@@ -237,7 +237,7 @@
     if ( $d->notime == 1) {
       return "null";
     }
-    $t = new LocalDateTime();
+    $t = new TutosDateTime();
     $t->setDateTimeTS($d->ts_def);  // set the fields in default TZ
     $t->ts_def = $t->ts;
     $x = sprintf("to_Date('%04d-%02d-%02d %02d:%02d:%02d','YYYY-MM-DD HH24:MI:SS')",$t->year,$t->month,$t->day,$t->hour,$t->min,$t->sec);
@@ -251,7 +251,7 @@
       return "null";
     }
  
-    $t = new LocalDateTime();
+    $t = new TutosDateTime();
     $t->setDateTimeTS($d->ts_def);  // set the fields in default TZ
     $t->ts_def = $t->ts;
     $x = sprintf("to_Date('%04d-%02d-%02d','YYYY-MM-DD')",$t->year,$t->month,$t->day);
@@ -515,7 +515,7 @@
   function checkservice() {
     global $table,$sequence,$tableidx,$tutos;
 
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
     $diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
 
     # only once a day

Index: db_oci.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_oci.pinc,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -d -r1.22.2.2 -r1.22.2.3
--- db_oci.pinc	10 May 2007 14:56:59 -0000	1.22.2.2
+++ db_oci.pinc	23 May 2007 10:06:43 -0000	1.22.2.3
@@ -212,7 +212,7 @@
     if ( $d->notime == 1) {
       return "null";
     }
-    $t = new LocalDateTime();
+    $t = new TutosDateTime();
     $t->setDateTimeTS($d->ts_def);  // set the fields in default TZ
     $t->ts_def = $t->ts;
     $x = sprintf("to_Date('%04d-%02d-%02d %02d:%02d:%02d','YYYY-MM-DD HH24:MI:SS')",$t->year,$t->month,$t->day,$t->hour,$t->min,$t->sec);
@@ -226,7 +226,7 @@
       return "null";
     }
  
-    $t = new LocalDateTime();
+    $t = new TutosDateTime();
     $t->setDateTimeTS($d->ts_def);  // set the fields in default TZ
     $t->ts_def = $t->ts;
     $x = sprintf("to_Date('%04d-%02d-%02d','YYYY-MM-DD')",$t->year,$t->month,$t->day);
@@ -492,7 +492,7 @@
   function checkservice() {
     global $table,$sequence,$tableidx,$tutos;
 
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
     $diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
 
     # only once a day

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- db_mysql.pinc	10 May 2007 14:56:59 -0000	1.19.2.2
+++ db_mysql.pinc	23 May 2007 10:06:43 -0000	1.19.2.3
@@ -178,7 +178,7 @@
     if ( $d->notime == 1) {
       return "null";
     }
-    $t = new LocalDateTime();
+    $t = new TutosDateTime();
     $t->setDateTimeTS($d->ts_def);  // set the fields in default TZ
     $t->ts_def = $t->ts;
     $x = sprintf ("'%04d-%02d-%02d %02d:%02d:%02d'",$t->year,$t->month,$t->day,$t->hour,$t->min,$t->sec);
@@ -192,7 +192,7 @@
       return "null";
     }
  
-    $t = new LocalDateTime();
+    $t = new TutosDateTime();
     $t->setDateTimeTS($d->ts_def);  // set the fields in default TZ
     $t->ts_def = $t->ts;
     $x = sprintf ("'%04d-%02d-%02d'",$t->year,$t->month,$t->day);
@@ -441,7 +441,7 @@
   function checkservice() {
     global $table,$sequence,$tableidx,$tutos;
 
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
     $diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
 
     # only once a day

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.8
diff -u -d -r1.27.2.7 -r1.27.2.8
--- db_pg.pinc	10 May 2007 14:56:59 -0000	1.27.2.7
+++ db_pg.pinc	23 May 2007 10:06:43 -0000	1.27.2.8
@@ -582,7 +582,7 @@
    * method to call from check service
    */
   function checkservice() {
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
     $diff = $now->getTimestamp() - $this->db->lastanalyze->getTimeStamp();
 
     # only once a day

Index: db.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db.pinc,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- db.pinc	10 May 2007 14:56:59 -0000	1.5.2.2
+++ db.pinc	23 May 2007 10:06:43 -0000	1.5.2.3
@@ -156,7 +156,7 @@
    * get a result entry as DateTime
    */
   function getDateTime($pos,$fld) {
-    return new LocalDateTime($this->get($pos,$fld));
+    return new TutosDateTime($this->get($pos,$fld));
   }
   /**
    * get a result entry as TUTOS object

Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/invoice

Modified Files:
      Tag: BRANCH-2-0
	invoice.pinc invoice_select.php invoice_ins.php 
Log Message:
REFACTOR

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -u -d -r1.43.2.4 -r1.43.2.5
--- invoice.pinc	10 May 2007 14:57:00 -0000	1.43.2.4
+++ invoice.pinc	23 May 2007 10:06:43 -0000	1.43.2.5
@@ -339,16 +339,16 @@
     $this->pos = array();
     $this->customer_id = -1;
     $this->accountant = $current_user->id;
-    $this->datesent[0] = new LocalDateTime(0);
-    $this->datedue[0] = new LocalDateTime(0);
+    $this->datesent[0] = new TutosDateTime(0);
+    $this->datedue[0] = new TutosDateTime(0);
 
-    $this->datesent[1] = new LocalDateTime(0);
-    $this->datedue[1] = new LocalDateTime(0);
+    $this->datesent[1] = new TutosDateTime(0);
+    $this->datedue[1] = new TutosDateTime(0);
 
-    $this->datesent[2] = new LocalDateTime(0);
-    $this->datedue[2] = new LocalDateTime(0);
+    $this->datesent[2] = new TutosDateTime(0);
+    $this->datedue[2] = new TutosDateTime(0);
 
-    $this->datefinish = new LocalDateTime(0);
+    $this->datefinish = new TutosDateTime(0);
 
     $this->tablename  = $this->dbconn->prefix ."invoice";
     $this->tablename2 = $this->dbconn->prefix ."invoice_pos";
@@ -514,7 +514,7 @@
   function setState($value) {
     if ( $this->setIntField("state",$value,"InvoiceState") ){
       if ( ($value == INV_STATE_PAYED) || ($value == INV_STATE_CANCELLED) ) {
-        $this->setDateFinish(new LocalDateTime());
+        $this->setDateFinish(new TutosDateTime());
       }
     }
   }

Index: invoice_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_select.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- invoice_select.php	10 May 2007 14:57:00 -0000	1.9.2.1
+++ invoice_select.php	23 May 2007 10:06:43 -0000	1.9.2.2
@@ -82,8 +82,8 @@
      }
 
      # Defaults for search
-     $this->isfd = new LocalDateTime(0);
-     $this->istd = new LocalDateTime(0);
+     $this->isfd = new TutosDateTime(0);
+     $this->istd = new TutosDateTime(0);
      $this->isst = 0;
      if ( isset($_SESSION['invsearchfrom']) ) {
        $this->isfd->setDateTime($_SESSION['invsearchfrom']);

Index: invoice_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_ins.php,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -d -r1.15.2.1 -r1.15.2.2
--- invoice_ins.php	10 May 2007 14:57:01 -0000	1.15.2.1
+++ invoice_ins.php	23 May 2007 10:06:43 -0000	1.15.2.2
@@ -60,7 +60,7 @@
 
  for ( $x = 0 ; $x < 3 ; $x++ ) {
    if (!isset($_POST['d'.$x])) {
-     $d = new LocalDateTime(0);
+     $d = new TutosDateTime(0);
      $d->setDateTimeF("d". $x);
      $gotourl= addUrlParameter($gotourl,"d".$x."=". $d->getYYYYMMDD() ,true);
      if ( !$d->checkDMY(true) ) {
@@ -70,7 +70,7 @@
      }
    }
    if (!isset($_POST['s'.$x])) {
-     $d = new LocalDateTime(0);
+     $d = new TutosDateTime(0);
      $d->setDateTimeF("s". $x);
      $gotourl= addUrlParameter($gotourl,"s".$x."=". $d->getYYYYMMDD() ,true);
      if ( !$d->checkDMY(true) ) {

Update of /cvsroot/tutos/tutos/php/file
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/file

Modified Files:
      Tag: BRANCH-2-0
	file_select.php file_overview.php 
Log Message:
REFACTOR

Index: file_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_select.php,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- file_select.php	10 May 2007 14:57:02 -0000	1.4.2.2
+++ file_select.php	23 May 2007 10:06:44 -0000	1.4.2.3
@@ -85,8 +85,8 @@
      $this->ext = 0;
 
      # Defaults for search
-     $this->fd = new LocalDateTime(0);
-     $this->td = new LocalDateTime(0);
+     $this->fd = new TutosDateTime(0);
+     $this->td = new TutosDateTime(0);
      if ( isset($_SESSION['filesearchfrom']) ) {
        $this->fd->setDateTime($_SESSION['filesearchfrom']);
      }

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- file_overview.php	10 May 2007 14:57:02 -0000	1.10.2.2
+++ file_overview.php	23 May 2007 10:06:44 -0000	1.10.2.3
@@ -222,7 +222,7 @@
      }
 
      # Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      } else {
@@ -238,7 +238,7 @@
        $this->filter['from'] = $from;
      }
      # End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      } else {

Update of /cvsroot/tutos/tutos/php/projectreport
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/projectreport

Modified Files:
      Tag: BRANCH-2-0
	projectreport_new.php projectreport.pinc 
Log Message:
REFACTOR

Index: projectreport_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/projectreport_new.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- projectreport_new.php	10 May 2007 14:57:01 -0000	1.1.2.7
+++ projectreport_new.php	23 May 2007 10:06:43 -0000	1.1.2.8
@@ -326,7 +326,7 @@
       }
       if ($_REQUEST['action'] == 'savecomplete') {
         $rp->state = REPORT_STATE_COMPLETE;
-        $rp->date = new LocalDateTime(-1);
+        $rp->date = new TutosDateTime(-1);
         $rp->save();
         $msg .= sprintf($lang['ProjectReportMsg0003'], $rp->report_ref);
         $rp->sendmail_complete();
@@ -356,7 +356,7 @@
         continue;
       }
       $rp->state = $_REQUEST['state'];
-      $rp->date = new LocalDateTime(-1);
+      $rp->date = new TutosDateTime(-1);
       $rp->save();
       $this->dbconn->Commit("WORK");
       if ($rp->state >= REPORT_STATE_COMPLETE) {
@@ -378,7 +378,7 @@
         continue;
       }
       $rp->state = REPORT_STATE_INPROGRESS;
-      $rp->date = new LocalDateTime(-1);
+      $rp->date = new TutosDateTime(-1);
       $rp->save();
       $this->dbconn->Commit("WORK");
       $msg .= sprintf($lang['ProjectReportMsg0002'], $rp->report_ref, $rp->creator->getFullName());
@@ -396,7 +396,7 @@
         continue;
       }
       $rp->state = REPORT_STATE_VALIDATE;
-      $rp->date = new LocalDateTime(-1);
+      $rp->date = new TutosDateTime(-1);
       $rp->save();
       $this->dbconn->Commit("WORK");
       $msg .= sprintf($lang['ProjectReportMsg0001'], $rp->report_ref, $rp->creator->getFullName());

Index: projectreport.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/projectreport.pinc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- projectreport.pinc	15 May 2007 13:21:51 -0000	1.1.2.6
+++ projectreport.pinc	23 May 2007 10:06:43 -0000	1.1.2.7
@@ -44,10 +44,10 @@
     $this->prod_ref       = null; // product object
     $this->custumer_ref   = null; // custumer object
     $this->state          = -1;             // product state
-    $this->p_start        = new LocalDateTime(0); // estimated product start
-    $this->p_end          = new LocalDateTime(0); // estimated product end
-    $this->r_start        = new LocalDateTime(0); // real product activity start
-    $this->r_end          = new LocalDateTime(0); // real product activity end
+    $this->p_start        = new TutosDateTime(0); // estimated product start
+    $this->p_end          = new TutosDateTime(0); // estimated product end
+    $this->r_start        = new TutosDateTime(0); // real product activity start
+    $this->r_end          = new TutosDateTime(0); // real product activity end
     $this->vol_estimate   = 0.0;            // estimated hours
     $this->vol_tasks      = 0.0;            // planned hours
     $this->vol_tasks_done = 0.0;            // planned hours done
@@ -321,7 +321,7 @@
     global $current_user, $tutos,  $lang ,$table ;
 
     $msg = "";
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
 
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);
@@ -461,10 +461,10 @@
     $this->init($dbconn);
 
     $this->report_ref = "";                  # Report reference number
-    $this->r_start    = new LocalDateTime(0);     # Beginning date of report
-    $this->r_end      = new LocalDateTime(0);     # End date of report
+    $this->r_start    = new TutosDateTime(0);     # Beginning date of report
+    $this->r_end      = new TutosDateTime(0);     # End date of report
     $this->state      = REPORT_STATE_TODO;   # Report status
-    $this->date       = new LocalDateTime(0);
+    $this->date       = new TutosDateTime(0);
 
     $this->tablename  = $this->dbconn->prefix .$table['report'][name];
     $this->tablename2 = $this->dbconn->prefix .$table['report1'][name];
@@ -489,7 +489,7 @@
     global $current_user, $tutos, $lang, $table ;
 
     $msg = "";
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
 
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);
@@ -526,7 +526,7 @@
   }
 
   function createRef() {
-    $now = new LocalDateTime(-1);
+    $now = new TutosDateTime(-1);
     $this->report_ref = sprintf("%1.1s%2.2s%02d%02d-%05d", $this->creator->f_name, $this->creator->l_name,
                                 $this->r_start->year - 2000, $this->r_start->month,
                                 $now->hour * $now->min * $this->r_start->day);
@@ -634,7 +634,7 @@
     $rp->r_start = $start;
     $rp->r_end   = $end;
     $rp->state   = REPORT_STATE_TODO;
-    $rp->date    = new LocalDateTime(-1);
+    $rp->date    = new TutosDateTime(-1);
     $rp->creator = $user;
     $rp->save();
 
@@ -660,7 +660,7 @@
     }
     
     
-    $today = new LocalDateTime(-1);
+    $today = new TutosDateTime(-1);
     $periods = projectreport::getLast2periodBefore($today);
 
     if (empty($obj->list[useprojectreport])) {
@@ -711,7 +711,7 @@
     error_log("fill the report");
     if ($this->state < REPORT_STATE_INPROGRESS) {
       $this->state = REPORT_STATE_INPROGRESS;
-      $this->date  = new LocalDateTime(-1);
+      $this->date  = new TutosDateTime(-1);
     }
 
     /* project list */
@@ -773,7 +773,7 @@
       $e15;
       /* first fortnight back */
       if ($date->day <= 15) {
-        /* 16-31 mois pr��ent */
+        /* 16-31 mois précédent */
         $s15 = strtotime("+".(16 - $date->day)." days -1 month");
         $e15 = strtotime("-".$date->day." days");
       } else {
@@ -781,22 +781,27 @@
         $s15 = strtotime("-".($date->day - 1)." days");
         $e15 = strtotime("-".($date->day - 15)." days");
       }
-      $period1['start'] = new LocalDateTime(beginDayHour($s15));
-      $period1['end']   = new LocalDateTime(endDayHour($e15));
+      $period1['start'] = new TutosDateTime(0);
+      $period1['start']->setDateTimeTS(beginDayHour($s15));
+      $period1['end']   = new TutosDateTime(0);
+      $period1['end']->setDateTimeTS(endDayHour($e15));
+      
 
       /* second fortnight back */
       if ($date->day <= 15) {
-        /* 1-15 mois pr��ent */
+        /* 1-15 mois précédent */
         $s15 = strtotime("-".($date->day - 1)." days -1 month");
         $e15 = strtotime("+".(15 - $date->day)." days -1 month");
       } else {
-        /* 16-31 mois pr��ent */
+        /* 16-31 mois précédent */
         $s15 = strtotime("-".($date->day - 16)." days -1 month");
         $e15 = strtotime("-".$date->day." days");
       }
-      $period2['start'] = new LocalDateTime(beginDayHour($s15));
-      $period2['end']   = new LocalDateTime(endDayHour($e15));
-
+      $period2['start'] = new TutosDateTime(0);
+      $period2['start']->setDateTimeTS(beginDayHour($s15));
+      $period2['end']   = new TutosDateTime(0);
+      $period2['end']->setDateTimeTS(endDayHour($e15));
+      
       $result[] = $period1;
       $result[] = $period2;
     }
@@ -946,7 +951,7 @@
     $key = $this->sort_by;
     $res = $this->object_array[$ab]->$key;
     if (is_object($res)) {
-      if (is_a($res, "LocalDateTime")) {
+      if (is_a($res, "TutosDateTime")) {
         $res = $this->object_array[$ab]->$key->ts;
       } else {
         $res = $this->object_array[$ab]->$key->getFullName();

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_ins.php bug_new.php bug_overview.php bug_select.php 
	bug.pinc migration.php 
Log Message:
REFACTOR

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.5.2.17
retrieving revision 1.5.2.18
diff -u -d -r1.5.2.17 -r1.5.2.18
--- bug_new.php	10 May 2007 14:56:58 -0000	1.5.2.17
+++ bug_new.php	23 May 2007 10:06:42 -0000	1.5.2.18
@@ -217,7 +217,7 @@
 						  $lang['ThousandPoint'])));
 
      if (!isset($this->obj->wday) || $this->obj->wday->notime) {
-       $this->obj->wday = new LocalDateTime();
+       $this->obj->wday = new TutosDateTime();
      }
      error_log("DAYDAY = ".$this->obj->wday->getYYYYMMDD());
      $this->assign_date($lang['atDateTime'], "wd", $this->obj->wday);

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.32
retrieving revision 1.8.2.33
diff -u -d -r1.8.2.32 -r1.8.2.33
--- bug_overview.php	10 May 2007 14:56:58 -0000	1.8.2.32
+++ bug_overview.php	23 May 2007 10:06:42 -0000	1.8.2.33
@@ -315,10 +315,10 @@
      echo "</tr>\n";
 
      # Creation Times
-     $c1 = new LocalDateTime();
-     $c2 = new LocalDateTime();
-     $t1 = new LocalDateTime();
-     $t2 = new LocalDateTime();
+     $c1 = new TutosDateTime();
+     $c2 = new TutosDateTime();
+     $t1 = new TutosDateTime();
+     $t2 = new TutosDateTime();
      $c1->setDateTimeTS($cmin);
      $c2->setDateTimeTS($cmax);
      $t1->setDateTimeTS($tmin);
@@ -802,7 +802,7 @@
      }
 
      // Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      }
@@ -821,7 +821,7 @@
      }
 
      // End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      }

Index: migration.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/Attic/migration.php,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- migration.php	10 May 2007 14:56:58 -0000	1.1.2.10
+++ migration.php	23 May 2007 10:06:42 -0000	1.1.2.11
@@ -329,7 +329,7 @@
   $h = 0;
 
   $prev = 0;
-  $prev_date = new LocalDateTime;
+  $prev_date = new TutosDateTime;
 
   /**
    * If true, added_by means the previous match was an � Added by �
@@ -341,7 +341,7 @@
     $m    = $matches[$i];
     $hist = array();
 
-    $date = new LocalDateTime($m[1][0]);
+    $date = new TutosDateTime($m[1][0]);
     $hist['creation'] = $date;
 
     if( $m[6][1] == -1 ) {
@@ -565,7 +565,7 @@
 	$desc = $rh->get($h, 'description');
 	$changeset = parse_bug_history($desc);
 
-	$date = new LocalDateTime($rh->get($h, 'creation'));
+	$date = new TutosDateTime($rh->get($h, 'creation'));
 
 	$hist[] = array('id'          => $rh->get($h, 'id'),
 			'bugid'       => $rh->get($h, 'bugid'),
@@ -717,10 +717,10 @@
       $bug->parent    = getObject($this->dbconn, $b['product_id']);
       $bug->short     = $b['short'];
       $bug->creator   = $creator;
-      $bug->creation  = new LocalDateTime($b['creation']);
+      $bug->creation  = new TutosDateTime($b['creation']);
 
       // Don't overwrite default solvedate if none is given
-      if( $solvedate != "" ) $bug->solvedate = new LocalDateTime($solvedate);
+      if( $solvedate != "" ) $bug->solvedate = new TutosDateTime($solvedate);
 
       $bug->state     = $b['state'];
       $bug->class     = $b['class'];
@@ -834,7 +834,7 @@
 	  $h->solver = $previous->solver;
 
 	// And we get creation time and description
-	$h->creation = new LocalDateTime($hist['creation']);
+	$h->creation = new TutosDateTime($hist['creation']);
 	$h->description =
 	   html_entity_decode($hist['changeset']['description'],
 			      ENT_QUOTES, 'ISO8859-15');

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.35
retrieving revision 1.13.2.36
diff -u -d -r1.13.2.35 -r1.13.2.36
--- bug.pinc	10 May 2007 14:56:58 -0000	1.13.2.35
+++ bug.pinc	23 May 2007 10:06:42 -0000	1.13.2.36
@@ -154,7 +154,7 @@
     $this->state = BUG_STATE_OPEN;
     $this->solver      = $current_user;
     $this->creator     = $current_user;
-    $this->creation    = new LocalDateTime();
+    $this->creation    = new TutosDateTime();
     $this->volume      = 0;
     $this->description = "";
     $this->tablename = $this->dbconn->prefix .$table['bug3'][name];
@@ -186,7 +186,7 @@
 
     $msg = "";
 
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
 
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);
@@ -371,8 +371,8 @@
     $this->parent      = -1;
     $this->plist       = array();
     $this->short = "";
-    $this->plandate   = new LocalDateTime(0);  # planned solve date
-    $this->solvedate  = new LocalDateTime(0);  # real solvedate
+    $this->plandate   = new TutosDateTime(0);  # planned solve date
+    $this->solvedate  = new TutosDateTime(0);  # real solvedate
 
     $this->cur_solver = null;
     $this->cur_state  = null;
@@ -603,9 +603,9 @@
   function setState($value) {
     if ( 1 == $this->setIntField("state",$value,"BugState") ) {
       if ( $value == BUG_STATE_SOLVED ) {
-        $this->solvedate = new LocalDateTime();
+        $this->solvedate = new TutosDateTime();
       } else if ( $value == BUG_STATE_CLOSED ) {
-        $this->solvedate = new LocalDateTime();
+        $this->solvedate = new TutosDateTime();
       }
     }
     return;
@@ -1119,7 +1119,7 @@
     if ( $tutos[bugremember] == 0 ) {
       return $msg;
     }
-    $d = new LocalDateTime();
+    $d = new TutosDateTime();
 
     $q = "SELECT * FROM ". $user->dbconn->prefix ."bugs WHERE state = ".BUG_STATE_OPEN;
     $r = $user->dbconn->Exec($q);

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v
retrieving revision 1.7.2.11
retrieving revision 1.7.2.12
diff -u -d -r1.7.2.11 -r1.7.2.12
--- bug_ins.php	10 May 2007 14:56:58 -0000	1.7.2.11
+++ bug_ins.php	23 May 2007 10:06:42 -0000	1.7.2.12
@@ -112,9 +112,9 @@
 
 
  # Read the Work Day
- $wd = new LocalDateTime(0);
+ $wd = new TutosDateTime(0);
  if ( isset($_POST['wd_d']) ) {
-   $today = new LocalDateTime(-1);
+   $today = new TutosDateTime(-1);
    $wd->setDateTimeF("wd",1);
    $wd->hour = $today->hour;
    $wd->min = $today->min;

Index: bug_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_select.php,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- bug_select.php	10 May 2007 14:56:58 -0000	1.1.2.8
+++ bug_select.php	23 May 2007 10:06:42 -0000	1.1.2.9
@@ -147,8 +147,8 @@
 	 }
 
      # Defaults for search
-     $this->from = new LocalDateTime(0);
-     $this->to = new LocalDateTime(0);
+     $this->from = new TutosDateTime(0);
+     $this->to = new TutosDateTime(0);
 	 
      if ( isset($_SESSION['bugsearchfrom']) ) {
        $this->from->setDateTime($_SESSION['bugsearchfrom']);
@@ -186,8 +186,4 @@
  $l = new bug_select($current_user);
  $l->display();
  $dbconn->Close();
-?>
-<!--
-    CVS Info:  $Id$
-    $Author$
--->
\ No newline at end of file
+?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/note

Modified Files:
      Tag: BRANCH-2-0
	note_ins.php note_overview.php note.pinc note_select.php 
Log Message:
REFACTOR

Index: note_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -d -r1.34.2.1 -r1.34.2.2
--- note_overview.php	10 May 2007 14:57:00 -0000	1.34.2.1
+++ note_overview.php	23 May 2007 10:06:43 -0000	1.34.2.2
@@ -329,7 +329,7 @@
      }
 
      # Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      } else {
@@ -345,7 +345,7 @@
        $this->filter['from'] = $from;
      }
      # End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      } else {

Index: note_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_select.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- note_select.php	10 May 2007 14:57:00 -0000	1.12.2.1
+++ note_select.php	23 May 2007 10:06:43 -0000	1.12.2.2
@@ -132,8 +132,8 @@
      }
 
      # Defaults for search
-     $this->nsfd = new LocalDateTime(0);
-     $this->nstd = new LocalDateTime(0);
+     $this->nsfd = new TutosDateTime(0);
+     $this->nstd = new TutosDateTime(0);
      $this->nsrt = -1;
 
      if ( isset($_SESSION['notesearchfrom']) ) {

Index: note_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_ins.php,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- note_ins.php	10 May 2007 14:57:00 -0000	1.14.2.1
+++ note_ins.php	23 May 2007 10:06:43 -0000	1.14.2.2
@@ -51,7 +51,7 @@
    $u->read_reference();
  }
 
- $r = new LocalDateTime(0);
+ $r = new TutosDateTime(0);
  $r->setDateTimeF("remember");
  $u->setRemember($r);
 

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.42.2.5
retrieving revision 1.42.2.6
diff -u -d -r1.42.2.5 -r1.42.2.6
--- note.pinc	10 May 2007 14:57:00 -0000	1.42.2.5
+++ note.pinc	23 May 2007 10:06:43 -0000	1.42.2.6
@@ -55,7 +55,7 @@
     $this->note     = "";
     $this->ref      = -1;
     $this->link_id  = $current_user->id;
-    $this->remember = new LocalDateTime(0);
+    $this->remember = new TutosDateTime(0);
     $this->tablename = $this->dbconn->prefix ."notes";
   }
   /**
@@ -494,7 +494,7 @@
     global $tutos,$lang;
 
     $msg = "";
-    $d = new LocalDateTime();
+    $d = new TutosDateTime();
     $notemailtxt = "note_remember.proto";
     $q = "SELECT * FROM ". $user->dbconn->prefix ."notes WHERE remember < ". $user->dbconn->dbDateTime($d) ." ";
     $r = $user->dbconn->Exec($q);
@@ -520,7 +520,7 @@
       $m->addBody($x->note,"text/plain",$lang['NoteDescription'],"",$x->creator->lg['content_encoding']);
 
       $msg .= $m->send();
-      $x->remember = new LocalDateTime(0);
+      $x->remember = new TutosDateTime(0);
       $x->save();
       $a++;
     }

Update of /cvsroot/tutos/tutos/php/mantis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/mantis

Modified Files:
      Tag: BRANCH-2-0
	mantis.pinc 
Log Message:
REFACTOR

Index: mantis.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mantis/Attic/mantis.pinc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- mantis.pinc	10 May 2007 14:57:00 -0000	1.1.2.5
+++ mantis.pinc	23 May 2007 10:06:43 -0000	1.1.2.6
@@ -57,7 +57,7 @@
     $this->m_name    = '';  // bug name in Mantis
     $this->m_status  = '';  // last bug status in Mantis
     $this->creator   = $current_user;
-    $this->creation  = new LocalDateTime();
+    $this->creation  = new TutosDateTime();
     $this->tablename = $this->dbconn->prefix .$table['mantisbugs'][name];
     $this->acl[$current_user->id] = $tutos[delok];
   }
@@ -84,7 +84,7 @@
     global $current_user, $tutos,  $lang ,$table ;
 
     $msg = "";
-    $now = new LocalDateTime();
+    $now = new TutosDateTime();
 
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);

Update of /cvsroot/tutos/tutos/php/checklist
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10678/php/checklist

Modified Files:
      Tag: BRANCH-2-0
	checkfield.pinc checklist.pinc 
Log Message:
REFACTOR

Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -d -r1.15.2.1 -r1.15.2.2
--- checkfield.pinc	10 May 2007 14:56:58 -0000	1.15.2.1
+++ checkfield.pinc	23 May 2007 10:06:42 -0000	1.15.2.2
@@ -62,8 +62,8 @@
     $this->value_t = "";
     $this->help_text = "";
     $this->modificator  = $current_user;
-    $this->modification = new LocalDateTime();
-    $this->deleted = new LocalDateTime(0);
+    $this->modification = new TutosDateTime();
+    $this->deleted = new TutosDateTime(0);
     $this->name         = "";
     $this->description  = "";
   }
@@ -133,10 +133,10 @@
     $this->maxvalue     = $r->get($pos, "f_val_max");
     $this->pos          = $r->get($pos, "f_pos");
     $this->value_t      = StripSlashes($r->get($pos, "f_val_t"));
-    $this->creation     = new LocalDateTime($r->get($pos, "creation"));
+    $this->creation     = new TutosDateTime($r->get($pos, "creation"));
     $this->modificator->read($r->get($pos, "modificator"));
-    $this->modification= new LocalDateTime($r->get($pos, "modification"));
-    $this->deleted= new LocalDateTime($r->get($pos, "deleted"));
+    $this->modification= new TutosDateTime($r->get($pos, "modification"));
+    $this->deleted= new TutosDateTime($r->get($pos, "deleted"));
 
     if ( ! $this->pos ) {
       $this->pos= -1;
@@ -159,7 +159,7 @@
 
     $this->modificator  = $current_user;
     unset ( $this->modification);
-    $this->modification = new LocalDateTime( "-1");  // now
+    $this->modification = new TutosDateTime( "-1");  // now
   }
   /**
    * compare checkfields
@@ -402,7 +402,7 @@
     $msg = "";
 
     unset ( $this->deleted);
-    $this->deleted = new LocalDateTime( "-1");  // now
+    $this->deleted = new TutosDateTime( "-1");  // now
 
     $q = "UPDATE ". $this->tablename ." SET deleted=".$this->dbconn->dbDateTime($this->deleted)." WHERE id = ". $this->id;
     $this->dbconn->Exec($q);

Index: checklist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist.pinc,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- checklist.pinc	10 May 2007 14:56:58 -0000	1.22.2.1
+++ checklist.pinc	23 May 2007 10:06:42 -0000	1.22.2.2
@@ -135,8 +135,8 @@
     $this->checkfields = array();
     $this->checkfields_valid = false;
     $this->modificator  = $current_user;
-    $this->modification = new LocalDateTime();
-    $this->deleted = new LocalDateTime(0);
+    $this->modification = new TutosDateTime();
+    $this->deleted = new TutosDateTime(0);
   }
 
   /* ---------------------------------------------------------------------------
@@ -189,10 +189,10 @@
     $this->id          = $r->get($pos, "id");
     $this->type        = $r->get($pos, "cl_type");
     $this->class_id    = $r->get($pos, "class_id");
-    $this->creation    = new LocalDateTime($r->get($pos, "creation"));
+    $this->creation    = new TutosDateTime($r->get($pos, "creation"));
     $this->modificator->read($r->get($pos, "modificator"));
-    $this->modification= new LocalDateTime($r->get($pos, "modification"));
-    $this->deleted     = new LocalDateTime($r->get($pos, "deleted"));
+    $this->modification= new TutosDateTime($r->get($pos, "modification"));
+    $this->deleted     = new TutosDateTime($r->get($pos, "deleted"));
 
     acl_read($this);
     $g_hash[$this->id] = &$this;
@@ -304,7 +304,7 @@
 
     $this->modificator  = $current_user;
     unset ( $this->modification);
-    $this->modification = new LocalDateTime( "-1");  // now
+    $this->modification = new TutosDateTime( "-1");  // now
 
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);
@@ -355,7 +355,7 @@
     $msg = "";
 
     unset ( $this->deleted);
-    $this->deleted = new LocalDateTime( "-1");  // now
+    $this->deleted = new TutosDateTime( "-1");  // now
 
     $q = "UPDATE ". $this->tablename ." SET deleted=".$this->dbconn->dbDateTime($this->deleted)." WHERE id = ". $this->id;
     $this->dbconn->Exec($q);
@@ -558,7 +558,7 @@
       @reset ($tmp_cl);
       while ( list ($i,$f) = @each ($tmp_cl) ) {
     $cf = new checkfield($this->dbconn);           // new checkfield
-    $cf->creation = new LocalDateTime();                // created now
+    $cf->creation = new TutosDateTime();                // created now
     $cf->fid_in_class = $f->id;                    // which field-id in class
     $cf->id = -1;                                  // will save as new object
     $cf->link_id = $this->id;                      // reference_id will be id of checklist-__instance__
@@ -596,7 +596,7 @@
       $cf = new checkfield($this->dbconn);
       $cf->read_result($result,$aa);
       unset( $cf->creation);
-      $cf->creation = new LocalDateTime();
+      $cf->creation = new TutosDateTime();
       $checkfields[$cf->id] = $cf;
       $aa++;
       unset($cf);

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10159/php

Modified Files:
      Tag: BRANCH-2-0
	task_import_csv.php app_new_r.php task_overview.php 
	address_ins.php product_ins.php gantt_png.php 
	product_select.php timetrack_overview.php task_select.php 
	app_ins.php admin_sync.php timetrack_ins.php base.pinc 
	Date.pinc history.pinc database.pinc res_cal.php 
	history_show.php timetrack_select.php timetrack_finish.php 
	permission.p3 app_select.php product_overview.php user.pinc 
	admin_show.php timetrack_synthesis.php mytutos.php app_new.php 
	app_overview.php calendar.p3 appointment.pinc address.pinc 
	product.pinc timetrack_new.php timetrack.pinc task_ins.php 
	task.pinc team.pinc task_gantt.php calendar_day.php 
Log Message:
REFACTOR

Index: task_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_select.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- task_select.php	10 May 2007 14:56:56 -0000	1.1.2.1
+++ task_select.php	23 May 2007 10:05:19 -0000	1.1.2.2
@@ -101,8 +101,8 @@
      }
 
      # Defaults for search
-     $this->fd = new LocalDateTime(0);
-     $this->td = new LocalDateTime(0);
+     $this->fd = new TutosDateTime(0);
+     $this->td = new TutosDateTime(0);
      if ( isset($_SESSION['tasksearchfrom']) ) {
        $this->fd->setDateTime($_SESSION['tasksearchfrom']);
      }

Index: timetrack_finish.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_finish.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- timetrack_finish.php	10 May 2007 14:56:57 -0000	1.6.2.1
+++ timetrack_finish.php	23 May 2007 10:05:19 -0000	1.6.2.2
@@ -28,7 +28,7 @@
 
  if ( $msg == "" ) {
    # finish the open timetrack
-   $end   = new LocalDateTime();
+   $end   = new TutosDateTime();
    $tt->setEnd($end);
    $tt->setWorkDay($end);
    $tt->setVolume( ($tt->t_end->getTimeStamp() - $tt->t_start->getTimeStamp()) / 3600.0);

Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -u -d -r1.65.2.2 -r1.65.2.3
--- admin_show.php	10 May 2007 14:52:39 -0000	1.65.2.2
+++ admin_show.php	23 May 2007 10:05:20 -0000	1.65.2.3
@@ -128,7 +128,7 @@
    Function sessions_info() {
      global $lang,$tutos;
 
-     $n = new LocalDateTime();
+     $n = new TutosDateTime();
      $ts = $n->getTimeStamp();
 
      $handle = opendir($tutos[sessionpath]);

Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -d -r1.48.2.5 -r1.48.2.6
--- app_new_r.php	10 May 2007 14:52:39 -0000	1.48.2.5
+++ app_new_r.php	23 May 2007 10:05:19 -0000	1.48.2.6
@@ -75,7 +75,7 @@
 			 'checked' => $this->obj->r_ignore));
 
      // Enter start and end dates
-     $today = new LocalDateTime();
+     $today = new TutosDateTime();
      $this->assign_date($lang['StartDate'], "start", $today);
      $this->assign_date($lang['EndDate'], "end", $today);
 

Index: product_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_select.php,v
retrieving revision 1.26.2.4
retrieving revision 1.26.2.5
diff -u -d -r1.26.2.4 -r1.26.2.5
--- product_select.php	10 May 2007 14:56:56 -0000	1.26.2.4
+++ product_select.php	23 May 2007 10:05:19 -0000	1.26.2.5
@@ -111,8 +111,8 @@
      $this->name = $lang['ProductsSearch'];
 
      # Defaults for search
-     $this->from = new LocalDateTime(0);
-     $this->to = new LocalDateTime(0);
+     $this->from = new TutosDateTime(0);
+     $this->to = new TutosDateTime(0);
 
      if ( isset($_SESSION['prodsearchfrom']) ) {
        $this->from->setDateTime($_SESSION['prodsearchfrom']);

Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- admin_sync.php	10 May 2007 14:52:39 -0000	1.32.2.1
+++ admin_sync.php	23 May 2007 10:05:19 -0000	1.32.2.2
@@ -94,15 +94,15 @@
          $vals .= $pre. $dbconn2->String($fv);
          $upd .= $dbconn2->String($fv);
        } else if ( ($ft == "TIMESTAMP") || ($ft == "DATETIME") || ( ($ft == "DATE") && ($r->dbconn->getType() == "Oracle")) ) {
-         $dt = new LocalDateTime($fv);
+         $dt = new TutosDateTime($fv);
          $vals .= $pre. $dbconn2->dbDateTime($dt);
          $upd .= $dbconn2->dbDateTime($dt);
        } else if ( $ft == "DATE" ) {
-         $dt = new LocalDateTime($fv);
+         $dt = new TutosDateTime($fv);
          $vals .= $pre. $dbconn2->Date($dt);
          $upd .= $dbconn2->Date($dt);
        } else if ( $ft == "TIMESTAMPTZ" ) {
-         $dt = new LocalDateTime($fv);
+         $dt = new TutosDateTime($fv);
          $vals .= $pre. $dbconn2->Date($dt);
          $upd .= $dbconn2->Date($dt);
        } else if ( eregi("^INT",$ft) || ($ft == "REAL") || eregi("^FLOAT",$ft) || ($ft == "LONG") || ($ft == "NUMBER") ) {
@@ -254,7 +254,7 @@
        $dbconn2->setSeqID($seq,$f[name]);
      }
 
-     $dbconn1->db->lastsync = new LocalDateTime();
+     $dbconn1->db->lastsync = new TutosDateTime();
      $dbconn1->db->save();
    }
    /**
@@ -309,7 +309,7 @@
      # The sync happens now
      $dbconn1->db->id = -1;
      $dbconn1->db->lastid = $seq1;
-     $dbconn1->db->lastsync = new LocalDateTime();
+     $dbconn1->db->lastsync = new TutosDateTime();
      # copy tablename (we need the correct prefix)
      $dbconn1->db->tablename = $dbconn2->db->tablename;
      $dbconn1->db->save();

Index: calendar_day.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_day.php,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -u -d -r1.29.2.2 -r1.29.2.3
--- calendar_day.php	10 May 2007 14:52:39 -0000	1.29.2.2
+++ calendar_day.php	23 May 2007 10:05:20 -0000	1.29.2.3
@@ -29,9 +29,9 @@
      global $lang,$tutos;
 
      $ts = mktime(12,0,0,substr($this->t,4,2),substr($this->t,6,2),substr($this->t,0,4));
-     $from = new LocalDateTime();
-     $last_day = new LocalDateTime();
-     $next_day = new LocalDateTime();
+     $from = new TutosDateTime();
+     $last_day = new TutosDateTime();
+     $next_day = new TutosDateTime();
 
      $from->setDateTimeTS($ts);
 

Index: task_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v
retrieving revision 1.40.2.13
retrieving revision 1.40.2.14
diff -u -d -r1.40.2.13 -r1.40.2.14
--- task_ins.php	10 May 2007 14:56:56 -0000	1.40.2.13
+++ task_ins.php	23 May 2007 10:05:20 -0000	1.40.2.14
@@ -170,7 +170,7 @@
    }
  }
 
- $s_start = new LocalDateTime(0);
+ $s_start = new TutosDateTime(0);
  $s_start->setDateTimeF("s_start");
  $gotourl= addUrlParameter($gotourl,"s_start=". $s_start->getYYYYMMDDHHMM(),true);
  if ( !$s_start->checkDMY() ) {
@@ -181,7 +181,7 @@
   $s_end = $s_start;
 }
 else {
-  $s_end = new LocalDateTime(0);
+  $s_end = new TutosDateTime(0);
   $s_end->setDateTimeF("s_end");
 }
 
@@ -202,14 +202,14 @@
 
    # First time work done
    if ( ($t->volume_done == 0) && ($volume_done > 0) ) {
-     $t->setRStart(new LocalDateTime());
+     $t->setRStart(new TutosDateTime());
    }
    # First time state set to finished
    if ( ($t->state != TASK_FINISH) && ($state == TASK_FINISH) ) {
-     $t->setREnd(new LocalDateTime());
+     $t->setREnd(new TutosDateTime());
    }
    if ( ($volume_done > $t->volume_done) && ($state == TASK_FINISH) ) {
-     $t->setREnd(new LocalDateTime());
+     $t->setREnd(new TutosDateTime());
    }
 
    /**

Index: task_import_csv.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_import_csv.php,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- task_import_csv.php	10 May 2007 14:56:56 -0000	1.16.2.1
+++ task_import_csv.php	23 May 2007 10:05:19 -0000	1.16.2.2
@@ -140,13 +140,13 @@
                  break;
                }
                case "s_start": {
-                 $s_start = new LocalDateTime($this->reformat_date($fields[$j]));
+                 $s_start = new TutosDateTime($this->reformat_date($fields[$j]));
                  $t->setSStart($s_start);
                  $val = $t->s_start->getYYYYMMDD();
                  break;
                }
                case "s_end": {
-                 $s_end = new LocalDateTime($this->reformat_date($fields[$j]));
+                 $s_end = new TutosDateTime($this->reformat_date($fields[$j]));
                  $t->setSEnd($s_end);
                  $val = $t->s_end->getYYYYMMDD();
                  break;

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.66.2.2
retrieving revision 1.66.2.3
diff -u -d -r1.66.2.2 -r1.66.2.3
--- history_show.php	10 May 2007 14:56:57 -0000	1.66.2.2
+++ history_show.php	23 May 2007 10:05:19 -0000	1.66.2.3
@@ -224,7 +224,7 @@
          }
 #       } else if ( $f['field'] == "UserLastSeen" ) {
 #         echo " <td><b>&nbsp;". (isset( $lang[$f["field"]]) ? $lang[$f["field"]] : $f["field"]) ."</b></td>\n";
-#        $b =  new LocalDateTime();
+#        $b =  new TutosDateTime();
 #         $b->setDateTime($f["old"]);
 #         echo " <td>&nbsp;". $b->getDateTime() ."</td>\n";
 #         $b->setDateTime($f["new"]);
@@ -299,7 +299,7 @@
          $adr->read($f["adr_id"]);
          echo " <td>&nbsp;". $adr->getLink() ."</td>\n";
        }
-       $mt = new LocalDateTime();
+       $mt = new TutosDateTime();
        $mt->setDateTime($f["m_time"]);
        echo " <td>&nbsp;". $mt->getDateTime() ."</td>\n";
        echo $this->OverviewRowEnd($line++);

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.54.2.4
retrieving revision 1.54.2.5
diff -u -d -r1.54.2.4 -r1.54.2.5
--- app_new.php	10 May 2007 14:52:39 -0000	1.54.2.4
+++ app_new.php	23 May 2007 10:05:20 -0000	1.54.2.5
@@ -61,7 +61,7 @@
 			 'link'  => $this->obj->creator->getUrl()));
 
      // Enter start and end dates
-     $today = new LocalDateTime();
+     $today = new TutosDateTime();
      $this->assign_date($lang['StartDate'], "start", $today);
      $this->assign_date($lang['EndDate'], "end", $today);
 

Index: history.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history.pinc,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -u -d -r1.43.2.2 -r1.43.2.3
--- history.pinc	10 May 2007 14:56:56 -0000	1.43.2.2
+++ history.pinc	23 May 2007 10:05:19 -0000	1.43.2.3
@@ -74,7 +74,7 @@
     return;
   }
 
-  $t = new LocalDateTime();
+  $t = new TutosDateTime();
   foreach ($obj->modified as $i => $f) {
     if (!isset($f["field"]) || empty($f["field"]) ) {
       continue;

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.105.2.7
retrieving revision 1.105.2.8
diff -u -d -r1.105.2.7 -r1.105.2.8
--- address.pinc	10 May 2007 14:52:39 -0000	1.105.2.7
+++ address.pinc	23 May 2007 10:05:20 -0000	1.105.2.8
@@ -25,7 +25,7 @@
 
     $this->init($dbconn);
     $this->larray = array();
-    $this->birthday = new LocalDateTime(0);
+    $this->birthday = new TutosDateTime(0);
     $this->f_name   = "";
     $this->l_name   = "";
     $this->m_name   = "";
@@ -503,7 +503,7 @@
     } else if ($fld == "lastname") {
       $this->setLName($data);
     } else if ($fld == "birthday") {
-      $d = new LocalDateTime($data);
+      $d = new TutosDateTime($data);
       $this->setBirthday($d);
     }
     return;

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.89.2.3
retrieving revision 1.89.2.4
diff -u -d -r1.89.2.3 -r1.89.2.4
--- Date.pinc	10 May 2007 14:56:56 -0000	1.89.2.3
+++ Date.pinc	23 May 2007 10:05:19 -0000	1.89.2.4
@@ -374,12 +374,12 @@
  * @package BASE
  * @module DateTime
  */
-class LocalDateTime {
+class TutosDateTime {
   /**
    * str is whatever a database gives us
    * -1 = now
    */
-  function LocalDateTime( $str = "-1" ) {
+  function TutosDateTime( $str = "-1" ) {
     global $current_user;
 
     $this->notime = 0;

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.30.2.18
retrieving revision 1.30.2.19
diff -u -d -r1.30.2.18 -r1.30.2.19
--- res_cal.php	10 May 2007 14:56:56 -0000	1.30.2.18
+++ res_cal.php	23 May 2007 10:05:19 -0000	1.30.2.19
@@ -552,14 +552,14 @@
        $this->uids[$this->base->id] = $this->base;
      }
      if ( isset($_GET['start']) ) {
-       $this->start = new LocalDateTime($_GET['start']);
+       $this->start = new TutosDateTime($_GET['start']);
      } else {
        $t = MkTime(0,0,0,Date("m"),1,Date("Y"));
-       $this->start = new LocalDateTime();
+       $this->start = new TutosDateTime();
        $this->start->setDateTimeTS($t);
      }
      if ( isset($_GET['end']) ) {
-       $this->end = new LocalDateTime($_GET['end']);
+       $this->end = new TutosDateTime($_GET['end']);
      } else {
        $t = $this->start->getTimeStamp();
        $x = Date("m",$t);
@@ -568,7 +568,7 @@
        }
        $t = MkTime(0,0,0,Date("m",$t),Date("d",$t),Date("Y",$t));
        $t -= 1;
-       $this->end = new LocalDateTime();
+       $this->end = new TutosDateTime();
        $this->end->setDateTimeTS($t);
      }
 

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.99.2.12
retrieving revision 1.99.2.13
diff -u -d -r1.99.2.12 -r1.99.2.13
--- product_overview.php	10 May 2007 14:56:55 -0000	1.99.2.12
+++ product_overview.php	23 May 2007 10:05:20 -0000	1.99.2.13
@@ -567,7 +567,7 @@
        $this->filter['name'] = "";
      }
      //  Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      } else {
@@ -584,7 +584,7 @@
        $this->filter['from'] = $from;
      }
      //  End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      } else {

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.50.2.13
retrieving revision 1.50.2.14
diff -u -d -r1.50.2.13 -r1.50.2.14
--- timetrack_new.php	10 May 2007 14:56:56 -0000	1.50.2.13
+++ timetrack_new.php	23 May 2007 10:05:20 -0000	1.50.2.14
@@ -227,7 +227,7 @@
      } else {
        # new stuff
        if ( $this->mode == 1 ) {
-         $this->obj->t_start = new LocalDateTime();
+         $this->obj->t_start = new TutosDateTime();
        }
        $this->obj->ref = $this->user;
      }

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.19
retrieving revision 1.133.2.20
diff -u -d -r1.133.2.19 -r1.133.2.20
--- product.pinc	10 May 2007 14:56:57 -0000	1.133.2.19
+++ product.pinc	23 May 2007 10:05:20 -0000	1.133.2.20
@@ -117,8 +117,8 @@
     for ( $cl = 1;$cl <= $this->classes; $cl++) {
       $this->cl[$cl] = array();
     }
-    $this->p_start     = new LocalDateTime(0);  # Estimated Start/Order
-    $this->p_end       = new LocalDateTime(0);  # Estimated End
+    $this->p_start     = new TutosDateTime(0);  # Estimated Start/Order
+    $this->p_end       = new TutosDateTime(0);  # Estimated End
 
     $this->tsum = array();
     $this->invlist = array();
@@ -128,7 +128,7 @@
 
     $this->reference = "";
     $this->volume_estimate = 0;
-    $this->state_date = new LocalDateTime(0);
+    $this->state_date = new TutosDateTime(0);
   }
 
   /**
@@ -696,7 +696,7 @@
     $q->addFV("p_end",$this->p_end,"DATETIME");
     $q->addFV("state",$this->state,"");
     if ($this->state != $this->state_orig || $this->state_date->notime) {
-      $this->state_date = new LocalDateTime("-1");
+      $this->state_date = new TutosDateTime("-1");
     }
     if ( ! empty ($this->probability) ) {
       $q->addFV("probability",$this->probability,"FLOAT");

Index: timetrack_synthesis.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/timetrack_synthesis.php,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- timetrack_synthesis.php	10 May 2007 14:56:56 -0000	1.1.2.9
+++ timetrack_synthesis.php	23 May 2007 10:05:20 -0000	1.1.2.10
@@ -439,16 +439,17 @@
     
     // Find the "Prod" Project ancestor
     $ancestor = $prj;
-    while( $ancestor->parent != -1 ) {
-      $ancestor = $ancestor->parent;
-      $ancestor->read($ancestor->id);
-      if ($ancestor->getType() != 'product') {
+    while( is_a($ancestor, "product") && is_a($ancestor->parent, "product") ) {
+      $parent = $ancestor->parent;
+      $parent->read($parent->id);
+      if ($parent->getType() != 'product') {
         break;
       }
-      if (preg_match($pattern, $ancestor->name)) {
+      if (preg_match($pattern, $parent->name)) {
         error_log ("This product parent ".$ancestor->id." is a CVF_PROD");
-        return $ancestor;
+        return $parent;
       }
+      $ancestor = $parent;
     }
     return NULL;
   }
@@ -480,6 +481,10 @@
       $ttsum['byprj'] = array();
     }
     if (!isset($ttsum['byprj'][$prj->id])) {
+      if (!is_a($prj, "product")) {
+          throw new Exception("prj ".$prj->id." not a product");
+      }
+
       $prj->readroles();
       $manager = $prj->creator->getFullName();
       if ( $prj->role[PROD_ROLE_MANAGER] ) {
@@ -685,7 +690,9 @@
           $ptasks = array();
           if ($this->ttsitem == 'byprj') {
             $prj = $tt->ref->getProject($ptasks);
-            $this->cumulByPrj($ttsum, 'task', $prj, $tt->volume, $tt->wday);
+            if (is_a($prj,"product")) {
+                $this->cumulByPrj($ttsum, 'task', $prj, $tt->volume, $tt->wday);
+            }
           } elseif ($this->ttsitem == 'byusr') {
             $this->cumulByUser($ttsum, 'task', $tt->worker, $tt->volume, $tt->wday);
           }
@@ -747,7 +754,7 @@
 
         /* COUNTING Vacations */
         foreach ($vacations as $day => $nbhour) {
-          $wday = new LocalDateTime();
+          $wday = new TutosDateTime();
           $wday->setDateTime($day);
           if ($this->ttsitem == 'byusr') {
             $this->cumulByUser($ttsum, 'vaca', $usr, $nbhour, $wday);

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.130.2.13
retrieving revision 1.130.2.14
diff -u -d -r1.130.2.13 -r1.130.2.14
--- user.pinc	10 May 2007 14:56:56 -0000	1.130.2.13
+++ user.pinc	23 May 2007 10:05:20 -0000	1.130.2.14
@@ -30,7 +30,7 @@
     $this->pw        = " ";
     $this->uid       = -1;
     $this->admin     = 0;
-    $this->last_seen = new LocalDateTime(0);
+    $this->last_seen = new TutosDateTime(0);
     $this->last_host = "unknown";
     $this->prefteam  = 1;
     $this->theme     = (isset ($tutos[themes][0]) ? $tutos[themes][0] : null) ;
@@ -826,7 +826,7 @@
     if ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ) {
       $lh =  $_SERVER['HTTP_X_FORWARDED_FOR'];
     }
-    $this->setLastSeen(new LocalDateTime());
+    $this->setLastSeen(new TutosDateTime());
     $this->setLastHost($lh);
 
     $q = new query($this->dbconn);

Index: gantt_png.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v
retrieving revision 1.22.2.5
retrieving revision 1.22.2.6
diff -u -d -r1.22.2.5 -r1.22.2.6
--- gantt_png.php	10 May 2007 14:56:56 -0000	1.22.2.5
+++ gantt_png.php	23 May 2007 10:05:19 -0000	1.22.2.6
@@ -28,8 +28,8 @@
     $this->obj    = GetObject($dbconn, $id);
 
     $this->state = -1;
-    $this->start = new LocalDateTime(0);
-    $this->end   = new LocalDateTime(0);
+    $this->start = new TutosDateTime(0);
+    $this->end   = new TutosDateTime(0);
 
     /**
      * Get the filter parameters

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.81.2.14
retrieving revision 1.81.2.15
diff -u -d -r1.81.2.14 -r1.81.2.15
--- timetrack_overview.php	10 May 2007 14:56:56 -0000	1.81.2.14
+++ timetrack_overview.php	23 May 2007 10:05:19 -0000	1.81.2.15
@@ -583,7 +583,7 @@
      }
 
      # Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      } else {
@@ -599,7 +599,7 @@
        // $this->addHidden("fd",$from->getYYYYMMDD());
      }
      # End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      } else {

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.161.2.6
retrieving revision 1.161.2.7
diff -u -d -r1.161.2.6 -r1.161.2.7
--- appointment.pinc	10 May 2007 14:52:39 -0000	1.161.2.6
+++ appointment.pinc	23 May 2007 10:05:20 -0000	1.161.2.7
@@ -318,8 +318,8 @@
     $this->trace = 0;
     $this->outside = 0;
     $this->mod_allow = 1;
-    $this->start    = new LocalDateTime();
-    $this->end      = new LocalDateTime();
+    $this->start    = new TutosDateTime();
+    $this->end      = new TutosDateTime();
     $this->t_ignore = 0;
     $this->visitor  = -1;
     $this->product  = new product($this->dbconn);
@@ -381,8 +381,8 @@
     }
     # This should work with different timezones ????
     # but we do not exactly know what date !!
-    $x1 = new LocalDateTime();
-    $x2 = new LocalDateTime();
+    $x1 = new TutosDateTime();
+    $x2 = new TutosDateTime();
     $x1->setDateTimeTS($this->start->ts_def);
     $x2->setDateTimeTS($this->end->ts_def);
     if ( $this->t_ignore   == "0" ) {
@@ -915,10 +915,10 @@
     if ($fld == "description") {
       $this->setDescription($data);
     } else if ($fld == "start") {
-      $d = new LocalDateTime($data);
+      $d = new TutosDateTime($data);
       $this->setStartTime($d);
     } else if ($fld == "end") {
-      $d = new LocalDateTime($data);
+      $d = new TutosDateTime($data);
       $this->setEndTime($d);
 #    } else if ($fld == "participant") {
 #      $this->setLName($data);
@@ -979,7 +979,7 @@
       $ical .= " :". $this->end->getIcal() ."\n";
     }
 
-    $dtstamp = new LocalDateTime();
+    $dtstamp = new TutosDateTime();
     $ical .= "DTSTAMP\n :". $dtstamp->getIcal() ."\n";
     @reset($this->participant);
     while ( list ($i,$f) = @each ($this->participant) ) {
@@ -1330,7 +1330,7 @@
    */
   function inside (&$o) {
     $o->setDateTime($o->getYYYYMMDD());
-    $d = new LocalDateTime(0);
+    $d = new TutosDateTime(0);
     $d->setDateTimeTS($o->ts_def);
 
     $x = $d->getYYYYMMDD();
@@ -1582,7 +1582,7 @@
     global $tutos,$lang;
 
     $msg = "";
-    $d = new LocalDateTime();
+    $d = new TutosDateTime();
     $q = "SELECT * FROM ". $user->dbconn->prefix ."calendar WHERE remember > 0 AND remembered = 0";
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
@@ -1693,7 +1693,7 @@
     $r->free();
 
 
-	$x = new LocalDateTime();
+	$x = new TutosDateTime();
     $x->setDateTimeTS($from->ts);
 
     $wd =  "'". Date("w",$x->getTimeStamp()) ."'";

Index: timetrack_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_ins.php,v
retrieving revision 1.42.2.5
retrieving revision 1.42.2.6
diff -u -d -r1.42.2.5 -r1.42.2.6
--- timetrack_ins.php	10 May 2007 14:56:55 -0000	1.42.2.5
+++ timetrack_ins.php	23 May 2007 10:05:19 -0000	1.42.2.6
@@ -88,7 +88,7 @@
  }
 
  # Read the Work Day
- $wd = new LocalDateTime(0);
+ $wd = new TutosDateTime(0);
  if ( isset($_POST['wd_d']) ) {
    $wd->setDateTimeF("wd",1);
    if ( !$wd->checkDMY() ) {
@@ -100,7 +100,7 @@
  }
 
  if ( isset($_POST['start_d']) ) {
-   $start = new LocalDateTime();
+   $start = new TutosDateTime();
    $start->setDateTimeF("start",0);
    if ( !$start->checkDMY() ) {
      $msg .= sprintf($lang['Err0038'],$lang['AppStart']) ."<br>";
@@ -110,7 +110,7 @@
    $tt->setStart($start);
  }
  if ( isset($_POST['end_d']) ) {
-   $end   = new LocalDateTime();
+   $end   = new TutosDateTime();
    $end->setDateTimeF("end",0);
    if ( !$end->checkDMY(true) ) {
      $msg .= sprintf($lang['Err0038'],$lang['AppEnd']) ."<br>";

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.54.2.2
retrieving revision 1.54.2.3
diff -u -d -r1.54.2.2 -r1.54.2.3
--- app_overview.php	10 May 2007 14:52:39 -0000	1.54.2.2
+++ app_overview.php	23 May 2007 10:05:20 -0000	1.54.2.3
@@ -259,7 +259,7 @@
        $this->addHidden("link_id",$_GET['link_id']);
      }
      # Start Date for search
-     $from = new LocalDateTime(0);
+     $from = new TutosDateTime(0);
      if ( isset($_GET['fd']) ) {
        $from->setDateTime($_GET['fd']);
      } else {
@@ -276,7 +276,7 @@
        $this->filter['from'] = $from;
      }
      # End Date for search
-     $to = new LocalDateTime(0);
+     $to = new TutosDateTime(0);
      if ( isset($_GET['td']) ) {
        $to->setDateTime($_GET['td']);
      } else {

Index: task_gantt.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_gantt.php,v
retrieving revision 1.14.2.6
retrieving revision 1.14.2.7
diff -u -d -r1.14.2.6 -r1.14.2.7
--- task_gantt.php	10 May 2007 14:56:57 -0000	1.14.2.6
+++ task_gantt.php	23 May 2007 10:05:20 -0000	1.14.2.7
@@ -59,8 +59,8 @@
      global $msg,$lang;
 
      $this->state = -1;
-     $this->start = new LocalDateTime(0);
-     $this->end   = new LocalDateTime(0);
+     $this->start = new TutosDateTime(0);
+     $this->end   = new TutosDateTime(0);
 
      $this->name = $lang['TaskGantt'];
      if ( isset($_GET['id']) ) {

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.62.2.28
retrieving revision 1.62.2.29
diff -u -d -r1.62.2.28 -r1.62.2.29
--- task_overview.php	10 May 2007 14:56:55 -0000	1.62.2.28
+++ task_overview.php	23 May 2007 10:05:19 -0000	1.62.2.29
@@ -26,8 +26,8 @@
     * free search
     */
    function select_by_name() {
-     $this->parent->min_start = new LocalDateTime();
-     $this->parent->max_end = new LocalDateTime(0);
+     $this->parent->min_start = new TutosDateTime();
+     $this->parent->max_end = new TutosDateTime(0);
      $this->parent->sum['volume'] = 0.0;
      $this->parent->sum['volume_done'] = 0.0;
      $q = "SELECT * from ". $this->dbconn->prefix ."tasks WHERE ";
@@ -197,9 +197,9 @@
 			      ($volume_todo + $volume_done) );
 
 
-     $start = new LocalDateTime();
+     $start = new TutosDateTime();
      $start->setDateTimeTS($limits['min']);
-     $end = new LocalDateTime();
+     $end = new TutosDateTime();
      $end->setDateTimeTS($limits['max']);
 
      $this->assign('start', array('label' => $lang['AppStart'],
@@ -486,8 +486,8 @@
 
      $this->fld = "";
      $this->name = $lang['TaskOverview'];
-     $this->start = new LocalDateTime(0);
-     $this->end = new LocalDateTime(0);
+     $this->start = new TutosDateTime(0);
+     $this->end = new TutosDateTime(0);
      $this->search = "";
      $this->state = 0;
      $this->parent = -1;

Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -d -r1.39.2.1 -r1.39.2.2
--- app_ins.php	10 May 2007 14:52:39 -0000	1.39.2.1
+++ app_ins.php	23 May 2007 10:05:19 -0000	1.39.2.2
@@ -51,7 +51,7 @@
 
  # Set the Start and End time
 
- $start = new LocalDateTime();
+ $start = new TutosDateTime();
  $start->setDateTimeF("start");
  if ( ( !$start->checkDMY()) || (-1 == $start->getTimeStamp() ) ) {
    $msg .= sprintf($lang['Err0038'],$lang['StartDate']) ."<br>";
@@ -60,7 +60,7 @@
    $a->setStartTime($start);
  }
 
- $end = new LocalDateTime();
+ $end = new TutosDateTime();
  $end->setDateTimeF("end");
  if ( ( !$end->checkDMY()) || (-1 == $end->getTimeStamp()) ) {
    $msg .= sprintf($lang['Err0038'],$lang['EndDate']) ."<br>";

Index: calendar.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/calendar.p3,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- calendar.p3	10 May 2007 14:52:39 -0000	1.1.2.12
+++ calendar.p3	23 May 2007 10:05:20 -0000	1.1.2.13
@@ -53,15 +53,17 @@
   $yy = Date("y",$ts);
 
   $day = 0;
-  $dd = new LocalDateTime();
+  $dd = new TutosDateTime();
 
-  $from =  new LocalDateTime();
+  $from =  new TutosDateTime();
   $from->setDateTimeTS($ts - 12 * 3600);
-  $to = $from;
+  $to = new TutosDateTime();
+  $to->setDateTimeTS($ts - 12 * 3600);
   $to->addDays(7);
-
+  
   $adr->callist = array();
   appointment::readCal($adr, $from, $to);
+   
   task::readCal($adr, $from, $to);
   foreach($tutos[activemodules] as $i => $f) {
     $x = new $tutos[modules][$f][name]($obj->dbconn);

Index: timetrack_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_select.php,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -u -d -r1.20.2.4 -r1.20.2.5
--- timetrack_select.php	10 May 2007 14:56:55 -0000	1.20.2.4
+++ timetrack_select.php	23 May 2007 10:05:19 -0000	1.20.2.5
@@ -74,8 +74,8 @@
      }
 
      # Defaults for search
-     $this->fd = new LocalDateTime(0);
-     $this->td = new LocalDateTime(0);
+     $this->fd = new TutosDateTime(0);
+     $this->td = new TutosDateTime(0);
      if ( isset($_SESSION['ttsearchfrom']) ) {
        $this->fd->setDateTime($_SESSION['ttsearchfrom']);
      }

Index: app_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_select.php,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -u -d -r1.19.2.1 -r1.19.2.2
--- app_select.php	10 May 2007 14:52:39 -0000	1.19.2.1
+++ app_select.php	23 May 2007 10:05:20 -0000	1.19.2.2
@@ -98,8 +98,8 @@
      $this->name = $lang['AppsSearch'];
 
      # Defaults for search
-     $this->asfd = new LocalDateTime(0);
-     $this->astd = new LocalDateTime(0);
+     $this->asfd = new TutosDateTime(0);
+     $this->astd = new TutosDateTime(0);
 
      if ( isset($_SESSION['appsearchfrom']) ) {
        $this->asfd->setDateTime($_SESSION['appsearchfrom']);

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.8
retrieving revision 1.53.2.9
diff -u -d -r1.53.2.8 -r1.53.2.9
--- product_ins.php	10 May 2007 14:56:56 -0000	1.53.2.8
+++ product_ins.php	23 May 2007 10:05:19 -0000	1.53.2.9
@@ -180,14 +180,14 @@
  $gotourl= addUrlParameter($gotourl,"volume_estimate=". $_POST['volume_estimate'],true);
 
 
- $pstart = new LocalDateTime(0);
+ $pstart = new TutosDateTime(0);
  $pstart->setDateTimeF("p_start");
  $gotourl= addUrlParameter($gotourl,"p_start=". $pstart->getYYYYMMDD(),true);
  if (  !$pstart->checkDMY(true) ) {
    $msg .= sprintf($lang['Err0038'],$lang['ProdStart']) ."<br>";
  }
 
- $pend = new LocalDateTime(0);
+ $pend = new TutosDateTime(0);
  $pend->setDateTimeF("p_end");
  $gotourl= addUrlParameter($gotourl,"p_end=". $pend->getYYYYMMDD(),true);
  if (  !$pend->checkDMY(true) ) {

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.62.2.7
retrieving revision 1.62.2.8
diff -u -d -r1.62.2.7 -r1.62.2.8
--- base.pinc	10 May 2007 14:52:39 -0000	1.62.2.7
+++ base.pinc	23 May 2007 10:05:19 -0000	1.62.2.8
@@ -61,7 +61,7 @@
     $this->id       = -1;
     $this->dbconn   = &$dbconn;
     $this->creator  = $current_user;
-    $this->creation = new LocalDateTime();
+    $this->creation = new TutosDateTime();
     $this->acl      = array();
     $this->modified = array();
     $this->history  = array();

Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -d -r1.48.2.1 -r1.48.2.2
--- address_ins.php	10 May 2007 14:52:39 -0000	1.48.2.1
+++ address_ins.php	23 May 2007 10:05:19 -0000	1.48.2.2
@@ -45,7 +45,7 @@
  }
 
 
- $birthday = new LocalDateTime(0);
+ $birthday = new TutosDateTime(0);
  $birthday->setDateTimeF("birthday",1);
 
 

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.81.2.6
retrieving revision 1.81.2.7
diff -u -d -r1.81.2.6 -r1.81.2.7
--- team.pinc	10 May 2007 14:56:57 -0000	1.81.2.6
+++ team.pinc	23 May 2007 10:05:20 -0000	1.81.2.7
@@ -58,7 +58,7 @@
       $this->id       =  $id;
       $this->name     =  $lang['everybody'];
       $this->owner    =  $current_user;
-      $this->creation =  new LocalDateTime();
+      $this->creation =  new TutosDateTime();
 
       while ( $a < $n ) {
         $this->ids[$result->get($a, "adr_id")] = 1 ;

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.84.2.29
retrieving revision 1.84.2.30
diff -u -d -r1.84.2.29 -r1.84.2.30
--- mytutos.php	10 Oct 2006 09:10:30 -0000	1.84.2.29
+++ mytutos.php	23 May 2007 10:05:20 -0000	1.84.2.30
@@ -45,7 +45,7 @@
 	* This assign vars to our $layout->smarty object.
 	*/
        $weeks = cal_week($this->adr, $this->t, $this->uids);
-       // $this->debug($weeks);
+//        $this->debug($weeks);
        $this->assign('weeks', $weeks);
 
        $this->assign('last_week', $weeks[0]['last']);
@@ -203,7 +203,7 @@
      $this->addMenu($x);
 
      /**
-      * The timetrack menu entries will be displayed in the « obj »
+      * The timetrack menu entries will be displayed in the � obj �
       * menu part.
       */ 
      $x = timetrack::getaddlink($this->user, $this->adr);

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.47.2.3
retrieving revision 1.47.2.4
diff -u -d -r1.47.2.3 -r1.47.2.4
--- database.pinc	10 May 2007 14:56:56 -0000	1.47.2.3
+++ database.pinc	23 May 2007 10:05:19 -0000	1.47.2.4
@@ -82,8 +82,8 @@
     $this->version = "";
     $this->crypt = 0;
 
-    $this->lastsync = new LocalDateTime(0);
-    $this->lastanalyze = new LocalDateTime(0);
+    $this->lastsync = new TutosDateTime(0);
+    $this->lastanalyze = new TutosDateTime(0);
     $this->lastid   = -1;
     $this->conn     = -1;
     $this->systemid = "";

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.130.2.42
retrieving revision 1.130.2.43
diff -u -d -r1.130.2.42 -r1.130.2.43
--- task.pinc	10 May 2007 14:56:57 -0000	1.130.2.42
+++ task.pinc	23 May 2007 10:05:20 -0000	1.130.2.43
@@ -26,8 +26,8 @@
     $recursive = true;
   }
 
-  $obj->max_end     = new LocalDateTime(0);
-  $obj->min_start   = new LocalDateTime(0);
+  $obj->max_end     = new TutosDateTime(0);
+  $obj->min_start   = new TutosDateTime(0);
   $obj->sum['volume'] = 0.0;
   $obj->sum['volume_done'] = 0.0;
   if ( $obj->getType() == "task") {
@@ -144,10 +144,10 @@
     $this->volume_done = 0;
     $this->volume_todo = 0;
     $this->worker      = array();
-    $this->s_start     = new LocalDateTime();
-    $this->s_end       = new LocalDateTime();
-    $this->r_start     = new LocalDateTime(0);
-    $this->r_end       = new LocalDateTime(0);
+    $this->s_start     = new TutosDateTime();
+    $this->s_end       = new TutosDateTime();
+    $this->r_start     = new TutosDateTime(0);
+    $this->r_end       = new TutosDateTime(0);
     $this->state       = TASK_PRE;
     $this->diff        = 0;
 

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.64.2.11
retrieving revision 1.64.2.12
diff -u -d -r1.64.2.11 -r1.64.2.12
--- timetrack.pinc	10 May 2007 14:56:56 -0000	1.64.2.11
+++ timetrack.pinc	23 May 2007 10:05:20 -0000	1.64.2.12
@@ -81,10 +81,10 @@
     $this->desc        = "";
     $this->volume      = 0.0;
     $this->volume_todo = -1;
-    $this->wday        = new LocalDateTime();
-    $this->creation    = new LocalDateTime();
-    $this->t_start     = new LocalDateTime(0);
-    $this->t_end       = new LocalDateTime(0);
+    $this->wday        = new TutosDateTime();
+    $this->creation    = new TutosDateTime();
+    $this->t_start     = new TutosDateTime(0);
+    $this->t_end       = new TutosDateTime(0);
     # number of invoice
     $this->invoice  = -1;
     $this->currency = $tutos[currencies][0];
@@ -346,7 +346,7 @@
          ($this->ref != -1) && 
          ($this->ref->getType() == "task") ) {
       if ( $this->ref->r_start->notime == 1 ) {
-        $this->ref->setRStart(new LocalDateTime());
+        $this->ref->setRStart(new TutosDateTime());
       }
 
       // Task has to be considered running

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.137.2.8
retrieving revision 1.137.2.9
diff -u -d -r1.137.2.8 -r1.137.2.9
--- permission.p3	15 May 2007 09:14:23 -0000	1.137.2.8
+++ permission.p3	23 May 2007 10:05:19 -0000	1.137.2.9
@@ -121,7 +121,7 @@
     return;
   }
 
-  $now =  new LocalDateTime();
+  $now =  new TutosDateTime();
   $query = "INSERT into ". $dbconn->prefix ."messages (ts,". $dbconn->colname("message") .") values (". $dbconn->dbDateTime($now) .",". $dbconn->String($msg) .")";
 
   $dbconn->Exec($query);
@@ -381,7 +381,7 @@
       $auth[0]->login_form($_SERVER['PHP_SELF'],$msg);
     }
 
-    $n = new LocalDateTime();
+    $n = new TutosDateTime();
     $diff = $n->getTimestamp() - $current_user->last_seen->getTimestamp();
 #    logmessage("check_user: still logged in ". $current_user->admin ." $userid:". $current_user->getFullname() . " idle for  ". $diff );
 #    logmessage("check_user:  ". $current_user->last_seen->getDateTime() ." " . $n->getDateTime() );
@@ -405,7 +405,7 @@
   }
   $current_user->update($initial_auth);
 
-  $n = new LocalDateTime();
+  $n = new TutosDateTime();
   $_SESSION['username'] = $current_user->getFullName();
   $_SESSION['lastseen'] = $current_user->last_seen->getTimeStamp();
   $_SESSION['lasthost'] = $current_user->last_host;

Update of /cvsroot/tutos/tutos/php/cia_factbook
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10880

Modified Files:
	cia.pinc 
Log Message:
url update

Index: cia.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/cia_factbook/cia.pinc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cia.pinc	22 May 2007 10:43:05 -0000	1.16
+++ cia.pinc	22 May 2007 10:52:13 -0000	1.17
@@ -61,7 +61,7 @@
     if (isset($trans[$cn])) {
       $cn = $trans[$cn];
     }
-    $baseurl = 'https://www.cia.gov/cia/publications/the-world-factbook';
+    $baseurl = 'https://www.cia.gov/library/publications/the-world-factbook';
     $url  = $baseurl . '/print/'. $cn .'.html';
 
     $link2 = '<img alt="'. $arg .'" border="0" height="12" src="'. $baseurl .'/flags/'. $cn .'-flag.gif" />';

Update of /cvsroot/tutos/tutos/php/cia_factbook
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6715

Modified Files:
	cia.pinc 
Log Message:
url update

Index: cia.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/cia_factbook/cia.pinc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cia.pinc	24 Jul 2006 10:28:04 -0000	1.15
+++ cia.pinc	22 May 2007 10:43:05 -0000	1.16
@@ -61,7 +61,7 @@
     if (isset($trans[$cn])) {
       $cn = $trans[$cn];
     }
-    $baseurl = 'https://www.cia.gov/cia/publications/factbook';
+    $baseurl = 'https://www.cia.gov/cia/publications/the-world-factbook';
     $url  = $baseurl . '/print/'. $cn .'.html';
 
     $link2 = '<img alt="'. $arg .'" border="0" height="12" src="'. $baseurl .'/flags/'. $cn .'-flag.gif" />';

Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25021

Modified Files:
	url_ins.php 
Log Message:
removed urltmp


Index: url_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_ins.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- url_ins.php	4 Apr 2007 19:14:36 -0000	1.12
+++ url_ins.php	17 May 2007 08:45:44 -0000	1.13
@@ -51,7 +51,6 @@
  if ( empty($_POST['url']) ) {
    $msg .= sprintf($lang['Err0009'],$lang['URL']) ."<br />";
    $gotourl = addBadField($gotourl,'url',true);
-   $gotourl = addBadField($gotourl,'urltmp',true);
  } else {
    $u->setURL(trim(StripSlashes($_POST['url'])));
    $gotourl= addUrlParameter($gotourl,"url=". UrlEncode($u->url),true);
@@ -76,7 +75,7 @@
 
  $gotourl = addMessage($gotourl,$msg,true);
  $gotourl = addSessionKey($gotourl,true);
-
+#die(dirname(getBaseUrl()) ." / ". $gotourl);
  Header("Status: 302 Moved Temporarily");
  Header("Location: ". dirname(getBaseUrl()) ."/". $gotourl);
  $dbconn->Close();

Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24895

Modified Files:
	url_new.php 
Log Message:
InternetExplorer No longer Supports our type of JavaScript -> removed


Index: url_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_new.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- url_new.php	2 Jan 2007 19:59:59 -0000	1.19
+++ url_new.php	17 May 2007 08:45:08 -0000	1.20
@@ -34,25 +34,7 @@
      global $lang,$tutos,$table;
 
      echo "<form id=\"urlnew\" name=\"urlnew\" enctype=\"multipart/form-data\" action=\"url_ins.php\" method=\"post\">\n";
-     
-     #javascript
-     echo "<script language=\"JavaScript\" type=\"text/javascript\">\n";
-     echo "<!--\n";
-     echo "function FormSubmit()\n";
-     echo "{\n";
-     echo "  if (document.urlnew.urltmp.value.match(/:\/\//) || document.urlnew.urltmp.value.length == 0) {\n";
-     echo "    document.urlnew.url.value = document.urlnew.urltmp.value;\n";
-     echo "  } else if (document.urlnew.urltmp.value.match(/\\\\/)){\n";
-     echo "    document.urlnew.url.value = 'file:///' + document.urlnew.urltmp.value.replace(/\\\\/g,\"/\");\n";
-     echo "    document.urlnew.url.value = document.urlnew.url.value.replace(/ /g,\"%20\");\n";
-     echo "  } else {\n";
-     echo "    document.urlnew.url.value = 'http://' + document.urlnew.urltmp.value;\n";
-     echo "  }\n";
-     echo "  document.urlnew.submit();\n";
-     echo "}\n";
-     echo "// -->\n";
-     echo "</script>\n";
-     
+        
      $this->width = 4;
      echo $this->DataTableStart();
      echo $this->Headline();
@@ -68,29 +50,12 @@
      echo '   <td colspan="3"><input id="urlname" size="'. min($table['url']['name'][size],50) .'" maxlength="'. $table['url']['name'][size] .'" name="urlname" value="'. myentities($this->obj->name) ."\" /></td>\n";
      echo "  </tr>\n";
 
-     if ($this->obj->id < 1) {
-       echo "  <tr>\n";
-       echo $this->showfieldc($lang['URL'],1,"url");
-       echo "   <td colspan=\"3\">\n";
-       echo "    <input id=\"url\" size=\"". min($table['url']['url'][size],50) ."\" maxlength=\"". $table['url']['url'][size] ."\" name=\"url\" value=\"". myentities($this->obj->getUrl()) ."\" type=\"hidden\" />\n";
-       echo "    <input id=\"urltmp\" size=\"". min($table['url']['url'][size],50) ."\" name=\"urltmp\" type=\"file\" />";
-       echo "   </td>\n";
-       echo "  </tr>\n";
-     } else {
-       echo "  <tr>\n";
-       echo $this->showfieldc($lang['URL'],1,"url");
-       if (strtoupper(substr(myentities($this->obj->getUrl()),0,7)) == strtoupper('file://')) {
-         echo "   <td colspan=\"3\">";
-         echo "    <input id=\"url\" size=\"". min($table['url']['url'][size],50) ."\" maxlength=\"". $table['url']['url'][size] ."\" name=\"url\" value=\"". myentities($this->obj->getUrl()) ."\" type=\"hidden\">\n";
-         echo "    <input id=\"urltmp\" size=\"". min($table['url']['url'][size],50) ."\" name=\"urltmp\" type=\"file\" />";
-         #echo "   <td align=\"right\">". myentities($this->obj->getUrl()) ."</td>";
-         echo "   <br />";
-         echo "<font size=\"-1\">". myentities($this->obj->getUrl()) ."</font></td>\n";
-       } else {
-         echo "   <td colspan=\"3\"><input id=\"url\" size=\"". min($table['url']['url'][size],50) ."\" maxlength=\"". $table['url']['url'][size] ."\" name=\"url\" value=\"". myentities($this->obj->getUrl()) ."\" /></td>\n";
-       }
-       echo "  </tr>\n";
-     }
+     echo "  <tr>\n";
+     echo $this->showfieldc($lang['URL'],1,"url");
+     echo "   <td colspan=\"3\">";
+     echo '    <input id="url" size="'. min($table['url']['url'][size],50) .'" maxlength="'. $table['url']['url'][size] .'" name="url" value="'. myentities($this->obj->getUrl()) ."\" />\n";
+     echo "   </td>\n";
+     echo "  </tr>\n";
 
      #
      # Edit additional custom fields
@@ -99,9 +64,9 @@
 
      echo "<tr>\n";
      if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-       echo submit_reset(0,1,1,1,1,0,"FormSubmit();");
+       echo submit_reset(0,1,1,1,1,0);
      } else {
-       echo submit_reset(0,-1,1,1,1,0,"FormSubmit();");
+       echo submit_reset(0,-1,1,1,1,0);
      }
      echo "</tr>\n";
 

Update of /cvsroot/tutos/tutos/php/projectreport
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7372/php/projectreport

Modified Files:
      Tag: BRANCH-2-0
	projectreport.pinc 
Log Message:
BUGFIX on DateTime refactoring

Index: projectreport.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectreport/Attic/projectreport.pinc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- projectreport.pinc	10 May 2007 14:57:01 -0000	1.1.2.5
+++ projectreport.pinc	15 May 2007 13:21:51 -0000	1.1.2.6
@@ -781,8 +781,8 @@
         $s15 = strtotime("-".($date->day - 1)." days");
         $e15 = strtotime("-".($date->day - 15)." days");
       }
-      $period1['start'] = new LocalDateTimeTS(beginDayHour($s15));
-      $period1['end']   = new LocalDateTimeTS(endDayHour($e15));
+      $period1['start'] = new LocalDateTime(beginDayHour($s15));
+      $period1['end']   = new LocalDateTime(endDayHour($e15));
 
       /* second fortnight back */
       if ($date->day <= 15) {
@@ -794,8 +794,8 @@
         $s15 = strtotime("-".($date->day - 16)." days -1 month");
         $e15 = strtotime("-".$date->day." days");
       }
-      $period2['start'] = new LocalDateTimeTS(beginDayHour($s15));
-      $period2['end']   = new LocalDateTimeTS(endDayHour($e15));
+      $period2['start'] = new LocalDateTime(beginDayHour($s15));
+      $period2['end']   = new LocalDateTime(endDayHour($e15));
 
       $result[] = $period1;
       $result[] = $period2;
@@ -946,7 +946,7 @@
     $key = $this->sort_by;
     $res = $this->object_array[$ab]->$key;
     if (is_object($res)) {
-      if (is_a($res, "DateTime")) {
+      if (is_a($res, "LocalDateTime")) {
         $res = $this->object_array[$ab]->$key->ts;
       } else {
         $res = $this->object_array[$ab]->$key->getFullName();

Update of /cvsroot/tutos/tutos/php/projectio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3991/php/projectio

Modified Files:
      Tag: BRANCH-2-0
	projectio.pinc projectio_ins.php 
Log Message:
Updates for php5.2

Index: projectio.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectio/Attic/projectio.pinc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- projectio.pinc	10 May 2007 14:56:55 -0000	1.1.2.4
+++ projectio.pinc	15 May 2007 09:14:24 -0000	1.1.2.5
@@ -86,18 +86,18 @@
     $reader;
     try {
       if ($ftype == PROJECTIO_FTYPE_PLANNER)
-        $reader = new plannerReader($file['tmp_name']);
+        $reader = new plannerReader($file);
 
       else
         if ($ftype == PROJECTIO_FTYPE_MPPXML)
-          $reader = new msprojectReader($file['tmp_name']);
+          $reader = new msprojectReader($file);
 
       if (!$reader) {
-        error_log("Parsing error for file " . $file['name']);
+        error_log("Parsing error for file " . $file);
         return false;
       }
       if (!$reader->read()) {
-        error_log("Reading error for file " . $file['name']);
+        error_log("Reading error for file " . $file);
         return false;
       }
     } catch (Exception $e) {
@@ -114,15 +114,21 @@
    * Import project from file
    */
   function importFile($file, $ftype, $msg) {
-    global $tutos;
+    global $tutos, $lang;
 
     if (!$this->project || $this->project->getType() != 'product') {
       $msg .= $lang['Err0048'] . "<br />";
       return;
     }
 
+    if (!file_exists($file)) {
+      error_log("File $file dos not exists");
+      $msg .= $lang['ProjectIOErr0004'] . "<br />";
+      return false;
+    }
     $data = $this->readFile($file, $ftype);
     if (!$data) {
+      error_log("readFile Error for ".$file);
       $msg .= $lang['ProjectIOErr0004'] . "<br />";
       return false;
     }

Index: projectio_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/projectio/Attic/projectio_ins.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- projectio_ins.php	22 Feb 2006 15:52:42 -0000	1.1.2.2
+++ projectio_ins.php	15 May 2007 09:14:24 -0000	1.1.2.3
@@ -81,16 +81,16 @@
 if ($fct == PROJECTIO_FCT_IMPORT || $fct == PROJECTIO_FCT_SYNCHRO) {
   if ( isset($_FILES['projectfile']) ) {
     $fi = $_FILES['projectfile'];
-    $fname = basename($fi['name']);
-    $localfile = $fi['tmp_name'];
-    $type = $fi['type'];
+    $fname = basename($_FILES['projectfile']['name']);
+    $localfile = $_FILES['projectfile']['tmp_name'];
+    $type = $_FILES['projectfile']['type'];
 
-    if (is_uploaded_file($fi['tmp_name']) ) {
+    if (is_uploaded_file($_FILES['projectfile']['tmp_name']) ) {
       error_log("FILE $fname TO $localfile TYPE $type");
-      $file = $fi;
+    } else {
+      $msg .= $lang['ProjectIOErr0004'] . "<br />";
     }
-  }
-  if ( !$file ) {
+  } else {
     $msg .= $lang['ProjectIOErr0004'] . "<br />";
   }
 }
@@ -106,7 +106,7 @@
   switch ($fct) {
   case PROJECTIO_FCT_IMPORT :
     $dbconn->Begin("WORK");
-    $import_result = $pio->importFile($file, $ftype, &$msg);
+    $import_result = $pio->importFile($_FILES['projectfile']['tmp_name'], $ftype, &$msg);
     $dbconn->Commit("WORK");
 
     if ($import_result) {
@@ -119,7 +119,7 @@
     break;
 
   case PROJECTIO_FCT_SYNCHRO :
-    $synchro_result = $pio->synchroLoadFile($file, $ftype, $msg);
+    $synchro_result = $pio->synchroLoadFile($_FILES['projectfile']['tmp_name'], $ftype, $msg);
     if ($synchro_result) {
       $gotourl = "projectio/projectio_synchro_new.php";
       $gotourl = addUrlParameter($gotourl, "pro_id=". $pio->project->id, true);

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3991/html/classic

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
Updates for php5.2

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/.cvsignore,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- .cvsignore	23 Mar 2007 17:52:53 -0000	1.1.2.3
+++ .cvsignore	15 May 2007 09:14:25 -0000	1.1.2.4
@@ -1,4 +1 @@
-style_old.css
-style_cvf.css
-style_orange.css
 style.css

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3991

Modified Files:
      Tag: BRANCH-2-0
	.cvsignore 
Log Message:
Updates for php5.2

Index: .cvsignore
===================================================================
RCS file: /cvsroot/tutos/tutos/.cvsignore,v
retrieving revision 1.18.4.4
retrieving revision 1.18.4.5
diff -u -d -r1.18.4.4 -r1.18.4.5
--- .cvsignore	23 Mar 2007 17:54:38 -0000	1.18.4.4
+++ .cvsignore	15 May 2007 09:14:25 -0000	1.18.4.5
@@ -107,3 +107,5 @@
 %%E0^E0E^E0E75412%%team_select.tpl.php
 %%F4^F43^F435D879%%task_overview_legend.tpl.php
 %%F8^F80^F8012A4F%%mytutos.tpl.php
+.cache
+mepp.sh