tutos-commits Mailing List for TUTOS (Page 448)

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv3840/php

Modified Files:
	Date.pinc address.pinc address_new.php address_select.php 
	address_show.php admin_sync.php app_ins.php app_overview.php 
	app_show.php appointment.pinc bug.pinc company.pinc 
	company_new.php company_show.php config.pinc database.pinc 
	db.p3 db_interbase.pinc db_msql.pinc db_mysql.pinc db_ora.pinc 
	db_pg.pinc de.p3 department.pinc department_new.php 
	department_show.php en.p3 es-mx.p3 es.p3 file.pinc fr.p3 
	history_show.php installation.pinc installation_show.php it.p3 
	ko.p3 location.pinc location_ins.php mailbox.pinc nl.p3 
	note.pinc permission.p3 pl.p3 product.pinc 
	product_overview.php product_show.php pt-br.p3 resource.pinc 
	ru.p3 scheme.php task.pinc team.pinc timetrack.pinc tw.p3 
	url.pinc user.pinc user_ins.php user_new.php webelements.p3 
	zh.p3 
Log Message:
Intermediate

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Date.pinc	2001/09/28 09:00:40	1.39
--- Date.pinc	2001/11/19 16:34:59	1.40
***************
*** 49,53 ****
   */
   function ReadHolidayInfo() {
!    global $tutos;
  
     $tutos[cal] = array();
--- 49,53 ----
   */
   function ReadHolidayInfo() {
!    global $current_user,$tutos;
  
     $tutos[cal] = array();
***************
*** 60,65 ****
     @reset($tutos[holiday]);
     while( list ($i,$f) = @each ($tutos[holiday])) {
!      if ($f == 1) {
!        include "holiday_". strtolower($i) .".pinc";
       }
     }
--- 60,66 ----
     @reset($tutos[holiday]);
     while( list ($i,$f) = @each ($tutos[holiday])) {
!      $i = strtolower($i);
!      if ( ($f == 1) && ($current_user->holiday[$i] == 1) ) {       
!        include "holiday_". $i .".pinc";
       }
     }
***************
*** 165,169 ****
  	   }
  	   elseif ( $wd == "Thu" ) {
! 
  		   if ($tutos[cal][$ii][$ij][Date] == "ASCENSIONDAY") {
  			   $tp = mktime (0,0,0,$OM,$OT,$J);
--- 166,170 ----
  	   }
  	   elseif ( $wd == "Thu" ) {
!            # Christ Himmelfahrt
  		   if ($tutos[cal][$ii][$ij][Date] == "ASCENSIONDAY") {
  			   $tp = mktime (0,0,0,$OM,$OT,$J);

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** address.pinc	2001/10/24 17:15:52	1.49
--- address.pinc	2001/11/19 16:34:59	1.50
***************
*** 19,25 ****
     */
    function tutos_address(&$dbconn) {
!     global $lang,$current_user;
  
!     $this->dbconn   = $dbconn;
      $this->id       = -1;
      $this->birthday = new DateTime(0);
--- 19,25 ----
     */
    function tutos_address(&$dbconn) {
!     global $lang;
  
!     $this->dbconn   = &$dbconn;
      $this->id       = -1;
      $this->birthday = new DateTime(0);
***************
*** 29,34 ****
      $this->title    = "";
      $this->pic_id   = -1;
!     $this->pic_file = new file($dbconn);
!     $this->creator  = $current_user;
      $this->rl1 = 0;
      $this->rl2 = 0;
--- 29,34 ----
      $this->title    = "";
      $this->pic_id   = -1;
!     $this->pic_file = new file($this->dbconn);
!     $this->creator  = -1;
      $this->rl1 = 0;
      $this->rl2 = 0;
***************
*** 89,92 ****
--- 89,93 ----
        # Hashed
        $this = $g_adr[$id];
+ #	  echo "HASHED ADR ". $this->getFullName() ."<BR>";
        return;
      }
***************
*** 251,255 ****
     */
    function save () {
!     global $tutos,$current_user;
  
      $msg = "";
--- 252,256 ----
     */
    function save () {
!     global $tutos;
  
      $msg = "";
***************
*** 257,282 ****
      $q->setTable($this->tablename);
      $q->addFV("birthday",$this->birthday,"DATETIME");
!     $q->addFV("title",$this->title,"STRING");
!     $q->addFV("f_name",$this->f_name,"STRING");
!     $q->addFV("m_name",$this->m_name,"STRING");
!     $q->addFV("l_name",$this->l_name,"STRING");
      $q->addFV("pic_id",$this->pic_file->id,"");
  
!     if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
        $q->addFV("creator",$this->creator->id,"");
        $query = $q->getInsert();
- 
-       # Defaut Access Control
-       $this->acl[0]                  = $tutos[seeok];                   # Everybody can see it
-       $this->acl[$this->id]          = $tutos[modok];
-       $this->acl[$this->creator->id] = $tutos[delok];
- 
-       $this->modified = array();
-       $this->modified[] = array ( "field" => "created" ,
-                                   "old" => $this->getType() ,
-                                   "new" => $this->id,
-                                   "obj_id" => $this->id
-                                 );
      } else {
        $q->addWC("id",$this->id,"");
--- 258,288 ----
      $q->setTable($this->tablename);
      $q->addFV("birthday",$this->birthday,"DATETIME");
!     $q->addFV("title",$this->title,"STRING",10);
!     $q->addFV("f_name",$this->f_name,"STRING",30);
!     $q->addFV("m_name",$this->m_name,"STRING",3);
!     $q->addFV("l_name",$this->l_name,"STRING",30);
      $q->addFV("pic_id",$this->pic_file->id,"");
  
!     if ( $this->id < 0 ) {
!       $this->modified = array();
!       if ( isset($this->newid) ) {
!         $this->id = $this->newid;
!         $q->addFV("id",$this->id,"");
! 	  } else {
!         /* Get an new ID */
!         $this->id = $q->addFV("id",-1,"NEXTID");
!         # Defaut Access Control
!         $this->acl[0]                  = $tutos[seeok];                   # Everybody can see it
!         $this->acl[$this->id]          = $tutos[modok];
!         $this->acl[$this->creator->id] = $tutos[delok];
! 
!         $this->modified[] = array ( "field" => "created" ,
!                                     "old" => $this->getType() ,
!                                     "new" => $this->id,
!                                     "obj_id" => $this->id
!                                   );
!       }
        $q->addFV("creator",$this->creator->id,"");
        $query = $q->getInsert();
      } else {
        $q->addWC("id",$this->id,"");

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** address_new.php	2001/09/27 19:40:20	1.20
--- address_new.php	2001/11/19 16:34:59	1.21
***************
*** 114,118 ****
     echo "<TR>\n";
  
!    # FIRST NAME
     add_entry ($lang['AdrTitle'],'title',$address->title,$modadr,10,3);
     echo "</TR><TR>\n";
--- 114,118 ----
     echo "<TR>\n";
  
!    # TITLE
     add_entry ($lang['AdrTitle'],'title',$address->title,$modadr,10,3);
     echo "</TR><TR>\n";
***************
*** 230,236 ****
             echo "<TR>";
             echo "<TD>";
!            echo menulink("address_new.php?id=". $a->id ."&loc_id=$i",$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $a->getFullName()));
             echo "</TD><TD>\n";
!            echo confirmlink("location_del.php?ref=". $a->id ."&id=$i",$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $a->getFullName()));
             echo "</TD>\n";
             echo "</TR>\n";
--- 230,238 ----
             echo "<TR>";
             echo "<TD>";
!            # FIXME check mod_ok
!            echo menulink("address_new.php?id=". $a->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $a->getFullName()));
             echo "</TD><TD>\n";
!            # FIXME check del_ok
!            echo confirmlink("location_del.php?ref=". $a->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $a->getFullName()));
             echo "</TD>\n";
             echo "</TR>\n";

Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** address_select.php	2001/09/16 13:49:44	1.12
--- address_select.php	2001/11/19 16:34:59	1.13
***************
*** 24,28 ****
       echo "<TH COLSPAN=3>". $lang['SearchForAdr'] ."</TH>\n";
       echo "</TR><TR>\n";
!      echo "</TR><TR>\n";
       showfieldc($lang['AdrName']);
       echo "<TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
--- 24,28 ----
       echo "<TH COLSPAN=3>". $lang['SearchForAdr'] ."</TH>\n";
       echo "</TR><TR>\n";
! #     echo "</TR><TR>\n";
       showfieldc($lang['AdrName']);
       echo "<TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
***************
*** 33,38 ****
     } else {
       echo "<TH COLSPAN=3>". $lang['SearchForAdrExt'] ."</TH>\n";
-      echo "</TR><TR>\n";
       echo "</TR><TR>\n";
       showfieldc($lang['AdrName']);
       echo " <TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
--- 33,38 ----
     } else {
       echo "<TH COLSPAN=3>". $lang['SearchForAdrExt'] ."</TH>\n";
       echo "</TR><TR>\n";
+ #     echo "</TR><TR>\n";
       showfieldc($lang['AdrName']);
       echo " <TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
***************
*** 70,74 ****
       echo "<TH COLSPAN=3>". $lang['SearchLdapAdr'] ."</TH>\n";
       echo "</TR><TR>\n";
!      echo "</TR><TR>\n";
       showfieldc($lang['AdrName']);
       echo "<TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
--- 70,74 ----
       echo "<TH COLSPAN=3>". $lang['SearchLdapAdr'] ."</TH>\n";
       echo "</TR><TR>\n";
! #     echo "</TR><TR>\n";
       showfieldc($lang['AdrName']);
       echo "<TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
***************
*** 98,103 ****
     echo "<TR>\n";
     echo "<TH COLSPAN=3>". $lang['SearchForCmp'] ."</TH>\n";
-    echo "</TR><TR>\n";
     echo "</TR><TR>\n";
     showfieldc($lang['Company']);
     echo "<TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";
--- 98,103 ----
     echo "<TR>\n";
     echo "<TH COLSPAN=3>". $lang['SearchForCmp'] ."</TH>\n";
     echo "</TR><TR>\n";
+ #   echo "</TR><TR>\n";
     showfieldc($lang['Company']);
     echo "<TD>&nbsp;<INPUT TYPE=\"text\" VALUE=\"". htmlentities($lookfor) ."\" NAME=\"name\">&nbsp;</TD>\n";

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** address_show.php	2001/10/24 17:15:52	1.21
--- address_show.php	2001/11/19 16:34:59	1.22
***************
*** 85,88 ****
--- 85,89 ----
  #   Show_LocFields($lang['AdrLinks'],$a,"id",0);
  
+ 
     if ( isset($a->teamids) && (count($a->teamids) > 0) ) {
       Show_LocFields("",$a,"teams",0);
***************
*** 96,99 ****
--- 97,101 ----
     }
  
+ 
     if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
       $a->readApps();
***************
*** 102,105 ****
--- 104,108 ----
       }
     }
+ 
  
     if ( ($current_user->p[useinstmanagement] == 1) && ($tutos[useinstmanagement] == 1) ) {

Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** admin_sync.php	2001/09/30 18:41:18	1.7
--- admin_sync.php	2001/11/19 16:34:59	1.8
***************
*** 46,49 ****
--- 46,123 ----
  
   /* ---------------------------------------------------------------------------
+   * Make a insert from a result set
+   */
+  Function result2insert(&$dbconn1,&$dbconn2,$f,&$r,$a) {
+ #   echo $r->numfields()." :".$r->numrows() ."<BR>\n";
+    $fc = $r->numfields();
+    $b = 0;
+    $upd  = "UPDATE ". $f ;
+    $flds = "INSERT into ". $f ."";
+    $vals = " VALUES ";
+    $pre = "(";
+    $upre = " SET ";
+    while ( $b < $fc ) {
+      $fn = strtoupper($r->fieldname($b));
+      $ft = strtoupper($r->fieldtype($b));
+      $fv = $r->get($a,$fn);
+ #	 echo $b .": |". $fn ."|". $fv ."|". $ft ."|<BR>";
+      # OLD VERSION
+      if ( ($f == "products") && ( ($fn == "MANAGER") || ($fn == "SELLER") || ($fn == "MANAGER2") ) ) {
+        $b++;
+        continue;
+      }
+ 	 if ( ($f == "files") && ( ($fn == "SIZE")  ) ) {
+        $b++;
+        continue;
+      }
+ 	 if ( ($f == "people") && ( ($fn == "ADMIN") && ($fv == '')  ) ) {
+        $fv = 0;
+      }
+ 
+      $upd .= $upre . $dbconn2->colname($fn) ." = ";
+      if ( ($ft == "VARCHAR") || ($ft == "VARCHAR2") || ($ft == "STRING") || ($ft == "TEXT") || ($ft == "VARYING")) {
+        $vals .= $pre. $dbconn2->String($fv);
+        $upd .= $dbconn2->String($fv);
+      } else if ( $ft == "BLOB" ) {
+        $vals .= $pre. $dbconn2->String($fv);
+        $upd .= $dbconn2->String($fv);
+      } else if ( ($ft == "TIMESTAMP") || ($ft == "DATETIME") || ( ($ft == "DATE") && ($r->dbconn->getType() == "Oracle")) ) {
+        $dt = new DateTime($fv);
+        $vals .= $pre. $dbconn2->DateTime($dt);
+        $upd .= $dbconn2->DateTime($dt);
+      } else if ( $ft == "DATE" ) {
+        $dt = new DateTime($fv);
+        $vals .= $pre. $dbconn2->Date($dt);
+        $upd .= $dbconn2->Date($dt);
+      } else if ( eregi("^INT",$ft) || ($ft == "REAL") || eregi("^FLOAT",$ft) || ($ft == "LONG") || ($ft == "NUMBER") ) {
+        if ( !is_numeric($fv) ) {
+          $fv = 'null';
+        }
+        $vals .= $pre. $fv;
+        $upd .= $fv;
+ 	 } else {
+        echo "<SPAN CLASS=warn>". $dbconn2->colname($fn)." = ". $ft ." === </SPAN> ". $r->get($a,$b);
+        echo "<BR>". $flds ."......". $vals .".......";
+        exit;
+ 	 } 
+      $flds .= $pre. $dbconn2->colname($fn);
+      $pre = ",";
+      $upre = ",";
+      $b++;
+    }
+    if ( $pre == "(" ) {
+      echo "<SPAN CLASS=warn> no values  ???</SPAN><BR>\n";
+      return;
+    }
+ 
+    $flds .= ")";
+    $vals .= ")";
+ 
+    $q[0] = $flds . $vals;
+    $q[1] = $upd;
+ 
+    return $q;
+  }
+  /* ---------------------------------------------------------------------------
    * Copy a selection of objects
    */
***************
*** 51,86 ****
     global $lang,$tutos,$table;
  
     echo "changes since last sync (". $dbconn1->db->lastsync->getDateTime() .")<BR>\n";
!    $q1 = "SELECT obj_id from history where m_field = ". $dbconn2->String("created");
     if ( $dbconn1->db->lastsync->notime != 1) {
!      $q1 .= " AND m_time > ". $dbconn2->DateTime($dbconn1->db->lastsync);
     }
     $r1 = $dbconn2->Exec($q1);
     $n1 = $r1->numrows();
-    echo "New on target: ". $n1 ."<BR>\n";
- 
-    $q2 = "SELECT obj_id from history where m_field = ". $dbconn2->String("Delete");
-    if ( $dbconn1->db->lastsync->notime != 1) {
-      $q2 .= " AND m_time > ". $dbconn2->DateTime($dbconn1->db->lastsync);
-    }
-    $r2 = $dbconn2->Exec($q2);
-    echo "Deleted on target: ". $r2->numrows() ."<BR>\n";
  
!    # ALL NEW Objects in "target" DB  will get a id for the "source" DB
     $a = 0;
     while ( $a < $n1) {
  	 $xid =  $r1->get($a,"obj_id");
!      $x = getObject($dbconn2,$xid,1);
!      # GET a new ID on source DB for this object
!      $newid = $dbconn1->NextID();
! 
!      echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." ---&gt;". $newid ." T:". $x->tablename ."<BR>\n";
!      $trans[$xid] = $newid;
!      $table[$xid] = $x->tablename;
  
       $a++;
     }
     $r1->free();
-    $r2->free();
   }
   /* ---------------------------------------------------------------------------
--- 125,223 ----
     global $lang,$tutos,$table;
  
+    $msg = "";
     echo "changes since last sync (". $dbconn1->db->lastsync->getDateTime() .")<BR>\n";
!    $q1 = "SELECT obj_id,val_old,m_field from history"; 
     if ( $dbconn1->db->lastsync->notime != 1) {
!      $q1 .= " WHERE m_time > ". $dbconn2->DateTime($dbconn1->db->lastsync);
     }
     $r1 = $dbconn2->Exec($q1);
     $n1 = $r1->numrows();
  
!    $new = 0;
!    $del = 0;
     $a = 0;
     while ( $a < $n1) {
  	 $xid =  $r1->get($a,"obj_id");
!      $mf = $r1->get($a,"m_field");
  
+      if ( $mf == "created" ) {
+        # ALL NEW Objects in "target" DB  will get a id for the "source" DB
+        $x = getObject($dbconn2,$xid,1);
+        # GET a new ID on source DB for this object
+        $newid = $dbconn1->NextID();
+ 
+        echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." ---&gt;". $newid ." T:". $x->tablename ."<BR>\n";
+        $trans[$xid] = $newid;
+        $table[$xid] = $x->tablename;
+        $obj[$xid] = $x;
+        $new++;
+ 	 } else if ( $mf == "Delete" ) {
+        # DELETED Stuff
+        $typ = $r1->get($a,"val_old");
+        if ( $xid <  $dbconn1->db->lastid ) {
+          echo "DEL: ". $xid ." : ". $typ ."<BR>\n";
+          $trans[$xid] = -1;
+          $table[$xid] = $typ;
+          $del++;
+ 	   } else {
+          echo "DEL (was new): ". $xid ." : ". $typ ."<BR>\n";
+ 	   }
+ 	 } else {
+        # Modified Stuff
+        $x = getObject($dbconn2,$xid,1);
+        $trans[$xid] = 0;
+        $table[$xid] = $x->tablename;
+        $obj[$xid] = $x;
+ 	 }
+ 
       $a++;
     }
+ 
+    echo "New on target: ". $new ."<BR>\n";
+    echo "Deleted on target: ". $del ."<BR>\n";
+ 
+    # NOW we walk along the trans array
+    # and update tranferred IDS
+    @reset($trans);
+    while( list ($i,$f) = @each ($trans)) {
+    }   
+ 
+    # NOW we walk along the trans array
+    # and do what have to be done !
+    @reset($trans);
+    while( list ($i,$f) = @each ($trans)) {
+      # DELETE
+      if ( $f == -1 ) {
+        echo "SOURCE: Delete ". $i ." : ". $table[$i] ."<BR>\n";
+ 	 } else if ( $f == 0 ) {
+        echo "SOURCE: Update ". $i ." in table ". $table[$i] ."<BR>\n";
+        # FIXME !!
+        $obj[$i]->modified = array();
+        # READ history since last sync
+        $obj[$i]->save();
+        $msg .= history_save($obj[$i]);
+      } else {
+        echo "SOURCE: Create ". $i ." as ". $f ." in table ". $table[$i] ."<BR>\n";
+        $obj->newid = $f;
+        $obj->id = -2;
+        $obj[$i]->save();
+        # READ history
+        $obj[$i]->modified = array ();
+        $obj[$i]->modified[] = array ( "field" => "AdminDBSync" ,
+                                       "old" => "" ,
+                                       "new" => "",
+                                       "obj_id" => $obj[$i]->id
+                                     );
+        $msg .= history_save($obj[$i]);
+ /*
+        $q = "SELECT * from ". $table[$i] ." WHERE ID = ".$i;
+        $r = $dbconn2->Exec($q);
+        $q2 = result2insert($dbconn2,$dbconn1,$table[$i],$r,0);
+        echo $q2[0] ."<BR>\n";
+        $r = $dbconn1->Exec($q2[0]);
+ */
+ 	 }
+    }
     $r1->free();
   }
   /* ---------------------------------------------------------------------------
***************
*** 95,99 ****
     while ( list ($i,$f) = @each ($table) ) {
       $q = "SELECT * from ". $f;
!      $r = $dbconn1->Exec("SELECT * from ". $f);
       $n = $r->numrows();
       $fc = $r->numfields();
--- 232,236 ----
     while ( list ($i,$f) = @each ($table) ) {
       $q = "SELECT * from ". $f;
!      $r = $dbconn1->Exec($q);
       $n = $r->numrows();
       $fc = $r->numfields();
***************
*** 107,165 ****
       echo "<B>TARGET:</B> ". $q ."<BR>\n";
  
       $a = 0;
       while ( $a < $n ) {
!        $b = 0;
!        $flds = "INSERT into ". $f ."";
!        $vals = " VALUES ";
!        $pre = "(";
!        while ( $b < $fc ) {
!          $fn = strtoupper($r->fieldname($b));
!          $fv = $r->get($a,$fn);
!          $ft = strtoupper($r->fieldtype($b));
!          # OLD VERSION
! 	     if ( ($f == "products") && ( ($fn == "MANAGER") || ($fn == "SELLER") || ($fn == "MANAGER2") ) ) {
!            $b++;
!            continue;
!          }
! 	     if ( ($f == "files") && ( ($fn == "SIZE")  ) ) {
!            $b++;
!            continue;
!          }
! 	     if ( ($f == "people") && ( ($fn == "ADMIN") && ($fv == '')  ) ) {
!            $fv = 0;
!          }
! 
!          
!          if ( ($ft == "VARCHAR") || ($ft == "VARCHAR2") || ($ft == "STRING") || ($ft == "TEXT") || ($ft == "VARYING")) {
!            $vals .= $pre. $dbconn2->String($fv);
!          } else if ( $ft == "DATE" ) {
!            $dt = new DateTime($fv);
!            $vals .= $pre. $dbconn2->Date($dt);
!          } else if ( ($ft == "TIMESTAMP") || ($ft == "DATETIME") ) {
!            $dt = new DateTime($fv);
!            $vals .= $pre. $dbconn2->DateTime($dt);
!          } else if ( eregi("^INT",$ft) || ($ft == "REAL") || eregi("^FLOAT",$ft) || ($ft == "LONG") ) {
!            if ( !is_numeric($fv) ) {
!              $fv = 'null';
!            }
!            $vals .= $pre. $fv;
! 	     } else {
!            $vals .= $pre."<SPAN CLASS=warn>". $ft. "</SPAN> ". $r->get($a,$b);
!            echo $flds . $vals ;
!            exit;
! 		 } 
!          $flds .= $pre. $dbconn2->colname($fn);
!          $pre = ",";
!          $b++;
! 	   }
!        if ( $pre == "(" ) {
!          echo "<SPAN CLASS=warn> no values  ???</SPAN><BR>\n";
!          return;
!        }
! 
!        $flds .= ")";
!        $vals .= ")";
!        $q2 = $flds . $vals;
!        $dbconn2->Exec($q2);
  #       echo "&nbsp; $fc &nbsp;". $q2 ."<BR>\n";
         flush();
--- 244,252 ----
       echo "<B>TARGET:</B> ". $q ."<BR>\n";
  
+ 
       $a = 0;
       while ( $a < $n ) {
!        $q2 = result2insert($dbconn1,$dbconn2,$f,$r,$a);
!        $dbconn2->Exec($q2[0]);
  #       echo "&nbsp; $fc &nbsp;". $q2 ."<BR>\n";
         flush();

Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** app_ins.php	2001/10/06 18:09:19	1.9
--- app_ins.php	2001/11/19 16:34:59	1.10
***************
*** 172,185 ****
   # PRODUCT
   #
!  $a->product = new product($dbconn);
   if ( isset($pfn) && !empty($pfn) ) {
!    $a->product = check_field($pfn,"pfn","pl","p");
   } else {
     if ( isset($pid) && !empty($pid) ) {
       if ( $pid != -1 ) {
!        $a->product->read($pid);
       }
     }
   }
   #
   # Resources
--- 172,186 ----
   # PRODUCT
   #
!  $p = new product($dbconn);
   if ( isset($pfn) && !empty($pfn) ) {
!    $p = check_field($pfn,"pfn","pl","p");
   } else {
     if ( isset($pid) && !empty($pid) ) {
       if ( $pid != -1 ) {
!        $p->read($pid);
       }
     }
   }
+  $a->setProduct($p);
   #
   # Resources

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** app_overview.php	2001/10/01 18:25:45	1.7
--- app_overview.php	2001/11/19 16:34:59	1.8
***************
*** 31,34 ****
--- 31,35 ----
     echo order_header("","&reg;");
     echo order_header("description",$lang['Description']);
+    echo order_header("outside",$lang['Location2']);
     echo order_header("product",$lang['ProductP']);
     echo "</TR>\n";
***************
*** 73,77 ****
         echo " <TD>&nbsp;</TD>\n";
       }
!      echo " <TD>". $f->descr ."</TD>\n";
       if ( $f->product->id > 0 ) {
         echo " <TD>". $f->product->getLink() ."</TD>\n";
--- 74,83 ----
         echo " <TD>&nbsp;</TD>\n";
       }
!      if ( $f->descr != "" ) {
!        echo " <TD>". urlReplace($f->descr) ."</TD>\n";
!      } else {
!        echo " <TD>&nbsp;</TD>\n";
! 	 }
!      echo " <TD>".  $f->getLocation() ."</TD>\n";
       if ( $f->product->id > 0 ) {
         echo " <TD>". $f->product->getLink() ."</TD>\n";
***************
*** 83,87 ****
     }
  
!    ShowBackForwardNav($link1,6,$start,$a,$n);
  
     echo "</TABLE>\n";
--- 89,93 ----
     }
  
!    ShowBackForwardNav($link1,7,$start,$a,$n);
  
     echo "</TABLE>\n";

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** app_show.php	2001/09/19 20:47:29	1.6
--- app_show.php	2001/11/19 16:34:59	1.7
***************
*** 181,184 ****
--- 181,187 ----
       }
     }
+    echo "<TR>\n";
+    echo " <TD COLSPAN=4>". makelink("history_show.php?id=". $a->id,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$a->getFullname())) ."</TD>\n";
+    echo "</TR>\n";
     echo "</TABLE>\n";
  }

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** appointment.pinc	2001/10/24 17:32:20	1.63
--- appointment.pinc	2001/11/19 16:34:59	1.64
***************
*** 210,218 ****
    /* ---------------------------------------------------------------------------
     */
!   function appointment($dbconn) {
      global $current_user;
  
      $this->id = -1;
!     $this->dbconn = $dbconn;
  
      $this->descr = "";
--- 210,218 ----
    /* ---------------------------------------------------------------------------
     */
!   function appointment(&$dbconn) {
      global $current_user;
  
      $this->id = -1;
!     $this->dbconn = &$dbconn;
  
      $this->descr = "";
***************
*** 224,229 ****
      $this->creation = new DateTime();
      $this->creator  = $current_user;
!     $this->visitor  = new tutos_address($dbconn);
!     $this->product  = new product($dbconn);
      $this->notime = 0;
      $this->remember = 0;
--- 224,229 ----
      $this->creation = new DateTime();
      $this->creator  = $current_user;
!     $this->visitor  = new tutos_address($this->dbconn);
!     $this->product  = new product($this->dbconn);
      $this->notime = 0;
      $this->remember = 0;
***************
*** 303,307 ****
      }
      acl_read($this);
!     $g_app[$this->id] = $this;
    }
  
--- 303,307 ----
      }
      acl_read($this);
!     $g_app[$this->id] = &$this;
    }
  
***************
*** 316,320 ****
      if ( isset($g_app[$id]) ) {
        # Hashed
!       $this = $g_app[$id];
        return;
      }
--- 316,320 ----
      if ( isset($g_app[$id]) ) {
        # Hashed
!       $this = &$g_app[$id];
        return;
      }
***************
*** 601,605 ****
--- 601,615 ----
    }
    /* ---------------------------------------------------------------------------
+    * set the Product
     */
+   function setProduct($new) {
+     if ( $this->product->id != $new->id ) {
+       $this->modified[] = array ( "field" => "ProductP" , "old" => $this->product->id , "new" => $new->id  );
+       $this->product->id = $new->id;
+     }
+     return;
+   }
+   /* ---------------------------------------------------------------------------
+    */
    function save() {
      global $lang , $current_user, $tutos;
***************
*** 609,615 ****
      $q->addFV("a_start",$this->start,"DATETIME");
      $q->addFV("a_end",$this->end,"DATETIME");
!     $q->addFV("description",$this->descr,"STRING");
      $q->addFV("outside",$this->outside,"");
!     $q->addFV("r_arg",$this->r_arg,"STRING");
      $q->addFV("r_ignore",$this->r_ignore,"");
      $q->addFV("trace",$this->trace,"");
--- 619,625 ----
      $q->addFV("a_start",$this->start,"DATETIME");
      $q->addFV("a_end",$this->end,"DATETIME");
!     $q->addFV("description",$this->descr,"STRING",100);
      $q->addFV("outside",$this->outside,"");
!     $q->addFV("r_arg",$this->r_arg,"STRING",5);
      $q->addFV("r_ignore",$this->r_ignore,"");
      $q->addFV("trace",$this->trace,"");
***************
*** 623,628 ****
      if ( $this->product->id != -1 ) {
        $q->addFV("product",$this->product->id,"");
      }
- 
      $msg = "";
      if ( $this->trace == 0 ) {
--- 633,639 ----
      if ( $this->product->id != -1 ) {
        $q->addFV("product",$this->product->id,"");
+     } else {
+       $q->addFV("product","null","");
      }
      $msg = "";
      if ( $this->trace == 0 ) {
***************
*** 637,641 ****
      }
  
!     if ( $this->id != -1 ) {
        /* We have to modify an existing appointment */
        $new = 0;
--- 648,652 ----
      }
  
!     if ( $this->id > -1 ) {
        /* We have to modify an existing appointment */
        $new = 0;
***************
*** 651,656 ****
      } else {
        $new = 1;
!       /* Get an new appointment ID */
!       $this->id = $q->addFV("id",-1,"NEXTID");
        $q->addFV("creator",$this->creator->id,"");
        $q->addFV("creation",$this->creation,"DATETIME");
--- 662,680 ----
      } else {
        $new = 1;
!       $this->modified = array();
!       if ( isset($this->newid) ) {
!         $this->id = $this->newid;
!         $q->addFV("id",$this->id,"");
! 	  } else {
!         /* Get an new appointment ID */
!         $this->id = $q->addFV("id",-1,"NEXTID");
!         acl_raise($this,$this->creator->id,$tutos[delok]);
!  
!         $this->modified[] = array ( "field" => "created" ,
!                                     "old" => $this->getType() ,
!                                     "new" => $this->id,
!                                     "obj_id" => $this->id
!                                   );
! 	  }
        $q->addFV("creator",$this->creator->id,"");
        $q->addFV("creation",$this->creation,"DATETIME");
***************
*** 658,669 ****
        $this->dbconn->Exec($q->getInsert());
  
-       acl_raise($this,$this->creator->id,$tutos[delok]);
- 
-       $this->modified = array();
-       $this->modified[] = array ( "field" => "created" ,
-                                   "old" => $this->getType() ,
-                                   "new" => $this->id,
-                                   "obj_id" => $this->id
-                                 );
      }
  
--- 682,685 ----
***************
*** 977,981 ****
      if ( $tutos[applocdesc][$this->outside] == 1 ) {
        $descr = eregi_replace("\n","<BR>",$this->descr);
!       echo "  <TR><TD CLASS=". $class ." COLSPAN=3>". $descr ."</TD></TR>\n";
        if ( $this->visitor->id != -1 ) {
          echo "  <TR><TD CLASS=". $class ." COLSPAN=3>";
--- 993,999 ----
      if ( $tutos[applocdesc][$this->outside] == 1 ) {
        $descr = eregi_replace("\n","<BR>",$this->descr);
!       if ($descr != "" ) {
!         echo "  <TR><TD CLASS=". $class ." COLSPAN=3>". urlReplace($descr) ."</TD></TR>\n";
!       }
        if ( $this->visitor->id != -1 ) {
          echo "  <TR><TD CLASS=". $class ." COLSPAN=3>";

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** bug.pinc	2001/09/30 18:32:47	1.44
--- bug.pinc	2001/11/19 16:34:59	1.45
***************
*** 42,46 ****
  	  $ret .= "<TD ALIGN=left>". makelink($vurl,$bug->getState($i) ) ."</TD>\n";
  	  $ret .= "<TD ALIGN=center>&nbsp;". $b[$i] ."&nbsp;</TD>\n";
! 	  $ret .= "<TD ALIGN=right>". $t[$i] ." ". $lang['hours'] ."</TD>\n";
  	  $ret .= "</TR>\n";
  	}
--- 42,46 ----
  	  $ret .= "<TD ALIGN=left>". makelink($vurl,$bug->getState($i) ) ."</TD>\n";
  	  $ret .= "<TD ALIGN=center>&nbsp;". $b[$i] ."&nbsp;</TD>\n";
! 	  $ret .= "<TD ALIGN=right>". number_format($t[$i],2) ." ". $lang['hours'] ."</TD>\n";
  	  $ret .= "</TR>\n";
  	}
***************
*** 140,144 ****
      global $lang, $current_user;
  
!     $this->dbconn     = $dbconn;
      $this->id         = -1;
      $this->c_class[1] =  "blue";
--- 140,144 ----
      global $lang, $current_user;
  
!     $this->dbconn     = &$dbconn;
      $this->id         = -1;
      $this->c_class[1] =  "blue";
***************
*** 204,208 ****
  	}
        } else {
!         $this->solver = $creator;
        }
      }
--- 204,208 ----
  	}
        } else {
!         $this->solver = $this->creator;
        }
      }
***************
*** 490,495 ****
      $q->addFV("state",$this->state,"");
      $q->addFV("class",$this->class,"");
!     $q->addFV("short",$this->short,"STRING");
!     $q->addFV("description",$this->description,"STRING");
      $q->addFV("solver",$this->solver->id,"");
      $q->addFV("product_id",$this->parent->id,"");
--- 490,495 ----
      $q->addFV("state",$this->state,"");
      $q->addFV("class",$this->class,"");
!     $q->addFV("short",$this->short,"STRING",40);
!     $q->addFV("description",$this->description,"TEXT");
      $q->addFV("solver",$this->solver->id,"");
      $q->addFV("product_id",$this->parent->id,"");
***************
*** 508,513 ****
      $bugmailtxt = "";
  
!     if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
        $q->addFV("creator",$this->creator->id,"");
        $q->addFV("creation",$this->creation,"DATETIME");
--- 508,538 ----
      $bugmailtxt = "";
  
!     if ( $this->id < 0) {
!       unset ($this->modified);
!       if ( isset($this->newid) ) {
!         /* Get an new bug ID */
!         $this->id = $this->newid;
!         $q->addFV("id",$this->id,"");
! 	  } else {
!         $this->id = $q->addFV("id",-1,"NEXTID");
! 
!         # Defaut Access Control
!         $this->acl = $this->parent->acl;
!         $this->acl[$this->creator->id] = $tutos[delok];
!         acl_raise($this,$this->solver->id,$tutos[modok]);
! 
!         acl_default($this,$current_user);
!         # Prepare the history
!         $this->modified[] = array ( "field" => "BugCreate" ,
!                                     "old" => "" ,
!                                     "new" => $this->id,
!                                     "obj_id" => $this->parent->id
!                                   );
!         $this->modified[] = array ( "field" => "created" ,
!                                     "old" => $this->getType() ,
!                                     "new" => $this->id,
!                                     "obj_id" => $this->id
!                                   );
! 	  }
        $q->addFV("creator",$this->creator->id,"");
        $q->addFV("creation",$this->creation,"DATETIME");
***************
*** 521,544 ****
  
        $bugmailtxt = "../html/bug_new.proto.";
- 
-       # Defaut Access Control
-       $this->acl = $this->parent->acl;
-       $this->acl[$this->creator->id]           = $tutos[delok];
-       acl_raise($this,$this->solver->id,$tutos[modok]);
- 
-       acl_default($this,$current_user);
- 
-       # Prepare the history
-       unset ($this->modified);
-       $this->modified[] = array ( "field" => "BugCreate" ,
-                                   "old" => "" ,
-                                   "new" => $this->id,
-                                   "obj_id" => $this->parent->id
-                                 );
-       $this->modified[] = array ( "field" => "created" ,
-                                   "old" => $this->getType() ,
-                                   "new" => $this->id,
-                                   "obj_id" => $this->id
-                                 );
      } else {
        $q->addWC("id",$this->id,"");
--- 546,549 ----
***************
*** 627,631 ****
          $mail->addBody($body,"text/plain",$lang['BugsDetail']);
          $mail->addBody("<PRE>". $this->description ."</PRE>","text/html" , $lang['BugHistory']);
!         $msg .= $mail->send();
        }
      }
--- 632,638 ----
          $mail->addBody($body,"text/plain",$lang['BugsDetail']);
          $mail->addBody("<PRE>". $this->description ."</PRE>","text/html" , $lang['BugHistory']);
!         if ( ! isset ($this->newid) ) {
!           $msg .= $mail->send();
!         }
        }
      }

Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** company.pinc	2001/09/30 18:39:06	1.27
--- company.pinc	2001/11/19 16:34:59	1.28
***************
*** 15,19 ****
     */
    function company(&$dbconn) {
!     $this->dbconn   = $dbconn;
  
      $this->id   = -1;
--- 15,19 ----
     */
    function company(&$dbconn) {
!     $this->dbconn   = &$dbconn;
  
      $this->id   = -1;
***************
*** 41,45 ****
      if ( isset($g_com[$id]) ) {
        # Hashed
!       $this = $g_com[$id];
        return;
      }
--- 41,45 ----
      if ( isset($g_com[$id]) ) {
        # Hashed
!       $this = &$g_com[$id];
        return;
      }
***************
*** 66,70 ****
      $this->creation->setDateTime($r->get($pos, "creation"));
      acl_read($this);
!     $g_com[$this->id] = $this;
    }
    /* ---------------------------------------------------------------------------
--- 66,70 ----
      $this->creation->setDateTime($r->get($pos, "creation"));
      acl_read($this);
!     $g_com[$this->id] = &$this;
    }
    /* ---------------------------------------------------------------------------
***************
*** 205,224 ****
      $q = new query($this->dbconn);
      $q->setTable($this->tablename);
!     $q->addFV("name",$this->name,"STRING");
  
!     if ( $this->id == -1 ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
        $q->addFV("creation",$this->creation,"DATETIME");
  
-       $query = $q->getInsert();
  
!       $this->acl[$current_user->id] = $tutos[delok];
!       acl_default($this,$current_user);
!       $this->modified = array();
!       $this->modified[] = array ( "field" => "created" ,
!                                   "old" => $this->getType() ,
!                                   "new" => $this->id,
!                                   "obj_id" => $this->id
!                                 );
      } else {
        $q->addWC("id",$this->id,"");
--- 205,229 ----
      $q = new query($this->dbconn);
      $q->setTable($this->tablename);
!     $q->addFV("name",$this->name,"STRING",30);
  
!     if ( $this->id < 0 ) {
!       $this->modified = array();
!       if ( isset($this->newid) ) {
!         $this->id = $this->newid;
!         $q->addFV("id",$this->id,"");
!       } else {
!         $this->id = $q->addFV("id",-1,"NEXTID");
!         $this->acl[$current_user->id] = $tutos[delok];
!         acl_default($this,$current_user);
!         $this->modified[] = array ( "field" => "created" ,
!                                     "old" => $this->getType() ,
!                                     "new" => $this->id,
!                                     "obj_id" => $this->id
!                                   );
!       }
        $q->addFV("creation",$this->creation,"DATETIME");
  
  
!       $query = $q->getInsert();
      } else {
        $q->addWC("id",$this->id,"");

Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** company_new.php	2001/09/16 19:11:58	1.15
--- company_new.php	2001/11/19 16:34:59	1.16
***************
*** 51,55 ****
     if ( $loc != "" ) {
       echo "<TR>\n";
!      showfieldc($lang['AdrDescription'],0);
       echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"lname\" value=\"". htmlentities($loc->lname) ."\"></TD>\n";
       echo "</TR>\n";
--- 51,55 ----
     if ( $loc != "" ) {
       echo "<TR>\n";
!      showfieldc($lang['AdrDescription'],1);
       echo "<TD COLSPAN=4><INPUT SIZE=30 MAXLENGTH=30 name=\"lname\" value=\"". htmlentities($loc->lname) ."\"></TD>\n";
       echo "</TR>\n";
***************
*** 138,143 ****
--- 138,145 ----
         echo "<TR>";
         echo "<TD>";
+        # FIXME check mod_ok
         echo menulink("company_new.php?id=". $c->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $c->getFullName()));
         echo "</TD><TD>\n";
+        # FIXME check del_ok
         echo menulink("location_del.php?ref=". $c->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $c->getFullName()));
         echo "</TD>\n";

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** company_show.php	2001/09/19 20:46:07	1.20
--- company_show.php	2001/11/19 16:34:59	1.21
***************
*** 164,172 ****
         showfield($lang['ProdFiles']);
         echo " <TD VALIGN=top COLSPAN=3>\n";
!        if ( $format == "paper" ) {
!          showFiles($c,-1);
!        } else {
!          showFiles($c);
!        }
         echo " </TD>\n";
         echo "</TR>\n";
--- 164,168 ----
         showfield($lang['ProdFiles']);
         echo " <TD VALIGN=top COLSPAN=3>\n";
!        showFiles($c);
         echo " </TD>\n";
         echo "</TR>\n";

Index: config.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config.pinc,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** config.pinc	2001/09/30 18:41:18	1.74
--- config.pinc	2001/11/19 16:34:59	1.75
***************
*** 93,97 ****
  $tutos[dbtype][3]   = 3;
  $tutos[dbalias][3]  = "ORA Faust";
! $tutos[cryptpw][3]  = 1;
  $tutos[repository][3]  = "../repository3";
  $tutos[dbhome][3]   = "/opt/oracle/";
--- 93,97 ----
  $tutos[dbtype][3]   = 3;
  $tutos[dbalias][3]  = "ORA Faust";
! $tutos[cryptpw][3]  = 0;
  $tutos[repository][3]  = "../repository3";
  $tutos[dbhome][3]   = "/opt/oracle/";
***************
*** 148,153 ****
  $tutos[ldapserver][2] = "memberdir.netscape.com";
  $tutos[ldapport][2]   = 389;
! #$tutos[ldapserver][3] = "scd2ldap.siemens.net";
! #$tutos[ldapport][3]   = 389;
  #$tutos[ldapserver][4] = "localhost";
  #$tutos[ldapport][4]   = 389;
--- 148,153 ----
  $tutos[ldapserver][2] = "memberdir.netscape.com";
  $tutos[ldapport][2]   = 389;
! $tutos[ldapserver][3] = "scd2ldap.siemens.net";
! $tutos[ldapport][3]   = 389;
  #$tutos[ldapserver][4] = "localhost";
  #$tutos[ldapport][4]   = 389;
***************
*** 274,277 ****
--- 274,278 ----
  $tutos[themes][] = "visual";
  $tutos[themes][] = "sqli";
+ $tutos[themes][] = "white";
  #
  # Timezones in TUTOS (these timezones must be known to your OS !!)
***************
*** 335,338 ****
--- 336,340 ----
  # c = search companies
  # d = search departments
+ # p = search other products
  #
  $tutos[rolecheck][1] = "at";
***************
*** 345,348 ****
--- 347,354 ----
  $tutos[rolecheck][8] = "atcd";
  $tutos[rolecheck][9] = "atcd";
+ $tutos[rolecheck][10] = "p";
+ $tutos[rolecheck][11] = "p";
+ $tutos[rolecheck][12] = "p";
+ $tutos[rolecheck][13] = "p";
  #
  # Enable/Disable parts of TUTOS

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** database.pinc	2001/09/19 20:45:09	1.5
--- database.pinc	2001/11/19 16:34:59	1.6
***************
*** 77,81 ****
     */
    function read_result (&$r, $pos ) {
!     global $g_res;
  
      $this->name        = StripSlashes($r->get($pos, "name"));
--- 77,81 ----
     */
    function read_result (&$r, $pos ) {
!     global $g_dbs;
  
      $this->name        = StripSlashes($r->get($pos, "name"));
***************
*** 96,100 ****
  
      acl_read($this);
!     $g_dbs[$this->id] = $this;
    }
    /* ---------------------------------------------------------------------------
--- 96,100 ----
  
      acl_read($this);
!     $g_dbs[$this->id] = &$this;
    }
    /* ---------------------------------------------------------------------------
***************
*** 127,131 ****
      if ( isset($g_dbs[$id]) ) {
        # Hashed
!       $this = $g_dbs[$id];
        return;
      }
--- 127,131 ----
      if ( isset($g_dbs[$id]) ) {
        # Hashed
!       $this = &$g_dbs[$id];
        return;
      }

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** db.p3	2001/10/06 18:12:37	1.51
--- db.p3	2001/11/19 16:34:59	1.52
***************
*** 173,176 ****
--- 173,180 ----
   */
  class result {
+ 
+   function result(&$dbconn) {
+     $this->dbconn = &$dbconn;
+   }
  }
  /*
***************
*** 179,183 ****
  class query {
    function query(&$dbconn) {
!     $this->dbconn = $dbconn;
      $this->flds = array();
      # Fields in the Where Clause
--- 183,187 ----
  class query {
    function query(&$dbconn) {
!     $this->dbconn = &$dbconn;
      $this->flds = array();
      # Fields in the Where Clause
***************
*** 190,197 ****
    }
    /* Add Field Value Pairs */
!   function addFV($fld,$val,$type) {
      $fld = $this->dbconn->colname($fld);
      if ( $type == "STRING" ) {
!       $this->flds[$fld] = $this->dbconn->String($val);
      } else if ( $type == "PASSWORD" ) {
        $this->flds[$fld] = $this->dbconn->Password($val);
--- 194,211 ----
    }
    /* Add Field Value Pairs */
!   function addFV($fld,$val,$type,$length = -1) {
      $fld = $this->dbconn->colname($fld);
      if ( $type == "STRING" ) {
!       if ( $length == -1 ) {
!         $this->flds[$fld] = $this->dbconn->String($val);
!       } else {
!         $this->flds[$fld] = $this->dbconn->String(substr($val,0,$length));
!       }
!     } else if ( $type == "TEXT" ) {
!       if ( $this->dbconn->getType() == "Oracle" ) {
!         $this->flds[$fld] = $this->dbconn->String(substr($val,0,400));
!       } else {
!         $this->flds[$fld] = $this->dbconn->String($val);
!       }
      } else if ( $type == "PASSWORD" ) {
        $this->flds[$fld] = $this->dbconn->Password($val);

Index: db_interbase.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_interbase.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** db_interbase.pinc	2001/09/30 18:37:40	1.4
--- db_interbase.pinc	2001/11/19 16:34:59	1.5
***************
*** 113,117 ****
      }
  
!     $x = new result_interbase();
      $x->dbconn = $this;
      $x->rs = $r;
--- 113,117 ----
      }
  
!     $x = new result_interbase($this);
      $x->dbconn = $this;
      $x->rs = $r;

Index: db_msql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_msql.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** db_msql.pinc	2001/09/19 20:45:09	1.3
--- db_msql.pinc	2001/11/19 16:34:59	1.4
***************
*** 93,97 ****
      $this->lastquery = $query;
  
!     return $qi;
    }
    /* ---------------------------------------------------------------------------
--- 93,98 ----
      $this->lastquery = $query;
  
!     $x = new result_msql($this);
!     return $x;
    }
    /* ---------------------------------------------------------------------------
***************
*** 210,213 ****
--- 211,215 ----
        $this->exec("SET TIME ZONE '". $tutos[defaultTZ] ."'");
      }
+ 
    }
    /* ---------------------------------------------------------------------------
***************
*** 241,244 ****
--- 243,290 ----
    function gettype() {
      return "MSQL";
+   }
+ }
+ /*
+  * MSQL Resultset
+  */
+ class result_msql extends result {
+   var $rs;
+   var $cur;
+ 
+   /* ---------------------------------------------------------------------------
+    */
+   function get($pos,$fld) {
+     # Copy the whole thing
+     $x = $this->result[$pos][strtoupper($fld)];
+     # echo "GET ROWS: $pos  COLS: $fld | ".$x."|<BR>";
+     return $x;
+ 
+   }
+   /* ---------------------------------------------------------------------------
+    */
+   function numrows() {
+     return count($this->result);
+   }
+   /* ---------------------------------------------------------------------------
+    */
+   function numfields() {
+     return count($this->result[0]);
+   }
+   /* ---------------------------------------------------------------------------
+    */
+   function fieldname($nr) {
+     return Ora_ColumnName($this->cur,$nr);
+   }
+   /* ---------------------------------------------------------------------------
+    */
+   function fieldtype($nr) {
+     return Ora_ColumnType($this->cur,$nr);
+   }
+   /* ---------------------------------------------------------------------------
+    */
+   function free() {
+     Ora_Close($this->cur);
+     unset($this->result);
+     return;
    }
  }

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_mysql.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** db_mysql.pinc	2001/09/19 20:45:09	1.3
--- db_mysql.pinc	2001/11/19 16:34:59	1.4
***************
*** 17,21 ****
      $this->conn = -1;
      $this->lastquery = "";
!     $this->db = $db;
  
      $this->openfunc = 'mysql_pconnect';
--- 17,21 ----
      $this->conn = -1;
      $this->lastquery = "";
!     $this->db = &$db;
  
      $this->openfunc = 'mysql_pconnect';
***************
*** 71,75 ****
        }
      }
!     $r = new result_mysql();
      $r->rs = $result;
      return $r;
--- 71,75 ----
        }
      }
!     $r = new result_mysql($this);
      $r->rs = $result;
      return $r;

Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_ora.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** db_ora.pinc	2001/10/04 16:05:17	1.5
--- db_ora.pinc	2001/11/19 16:34:59	1.6
***************
*** 26,30 ****
      putenv("ORACLE_SID=".$this->db->name);
      putenv("ORACLE_HOME=".$this->db->home);
!     putenv("NLS_LANG=AMERICA_AMERICA.WE8ISO8859P1");
  
  	$of = $this->openfunc;
--- 26,30 ----
      putenv("ORACLE_SID=".$this->db->name);
      putenv("ORACLE_HOME=".$this->db->home);
! #    putenv("NLS_LANG=AMERICA_AMERICA.WE8ISO8859P1");
  
  	$of = $this->openfunc;
***************
*** 68,72 ****
      }
  
!     $x = new result_ora();
  
      $x->cur = ora_open($this->conn);
--- 68,72 ----
      }
  
!     $x = new result_ora($this);
  
      $x->cur = ora_open($this->conn);
***************
*** 321,325 ****
      # Copy the whole thing
      $x = $this->result[$pos][strtoupper($fld)];
!     #echo "GET ROWS: $pos  COLS: $fld | ".$x."|<BR>";
      return $x;
  
--- 321,325 ----
      # Copy the whole thing
      $x = $this->result[$pos][strtoupper($fld)];
!     # echo "GET ROWS: $pos  COLS: $fld | ".$x."|<BR>";
      return $x;
  
***************
*** 328,332 ****
     */
    function numrows() {
!     return  count($this->result);
    }
    /* ---------------------------------------------------------------------------
--- 328,332 ----
     */
    function numrows() {
!     return count($this->result);
    }
    /* ---------------------------------------------------------------------------
***************
*** 338,347 ****
     */
    function fieldname($nr) {
!     Ora_ColumnName($this->cur,$nr);
    }
    /* ---------------------------------------------------------------------------
     */
    function fieldtype($nr) {
!     Ora_ColumnType($this->cur,$nr);
    }
    /* ---------------------------------------------------------------------------
--- 338,347 ----
     */
    function fieldname($nr) {
!     return Ora_ColumnName($this->cur,$nr);
    }
    /* ---------------------------------------------------------------------------
     */
    function fieldtype($nr) {
!     return Ora_ColumnType($this->cur,$nr);
    }
    /* ---------------------------------------------------------------------------

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db_pg.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** db_pg.pinc	2001/09/19 20:45:09	1.3
--- db_pg.pinc	2001/11/19 16:34:59	1.4
***************
*** 92,96 ****
        }
      }
!     $r = new result_pg();
      $r->rs = $result;
      return $r;
--- 92,96 ----
        }
      }
!     $r = new result_pg($this);
      $r->rs = $result;
      return $r;

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** de.p3	2001/11/10 11:09:54	1.75
--- de.p3	2001/11/19 16:34:59	1.76
***************
*** 229,232 ****
--- 229,233 ----
  $lang['UserTimezone']    = "Zeitzone";
  $lang['UserTheme']       = "Oberfläche";
+ $lang['UserHoliday']     = "Feiertage";
  
  # Bugs

Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** department.pinc	2001/09/30 18:39:06	1.27
--- department.pinc	2001/11/19 16:34:59	1.28
***************
*** 14,18 ****
     */
    function department(&$dbconn) {
!     $this->dbconn   = $dbconn;
  
      $this->id   = -1;
--- 14,18 ----
     */
    function department(&$dbconn) {
!     $this->dbconn   = &$dbconn;
  
      $this->id   = -1;
***************
*** 36,40 ****
  
      if ( isset($g_dep[$id]) ) {
!       $this = $g_dep[$id];
        return;
      }
--- 36,40 ----
  
      if ( isset($g_dep[$id]) ) {
!       $this = &$g_dep[$id];
        return;
      }
***************
*** 66,70 ****
      }
      acl_read($this);
!     $g_dep[$this->id] = $this;
    }
    /* ---------------------------------------------------------------------------
--- 66,70 ----
      }
      acl_read($this);
!     $g_dep[$this->id] = &$this;
    }
    /* ---------------------------------------------------------------------------
***************
*** 179,198 ****
      $q->setTable($this->tablename);
      $q->addFV("c_id",$this->c_id,"");
!     $q->addFV("name",$this->name,"STRING");
  
!     if ( $this->id == -1 ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
        $q->addFV("creation",$this->creation,"DATETIME");
  
        $query = $q->getInsert();
- 
-       $this->acl[$current_user->id] = $tutos[delok];
-       acl_default($this,$current_user);
-       $this->modified = array();
-       $this->modified[] = array ( "field" => "created" ,
-                                   "old" => $this->getType() ,
-                                   "new" => $this->id,
-                                   "obj_id" => $this->id
-                                 );
      } else {
        $q->addWC("id",$this->id,"");
--- 179,202 ----
      $q->setTable($this->tablename);
      $q->addFV("c_id",$this->c_id,"");
!     $q->addFV("name",$this->name,"STRING",30);
  
!     if ( $this->id < 0 ) {
!       $this->modified = array();
!       if ( isset($this->newid) ) {
!         $this->id = $this->newid;
!         $q->addFV("id",$this->id,"");
!       } else {
!         $this->id = $q->addFV("id",-1,"NEXTID");
!         $this->acl[$current_user->id] = $tutos[delok];
!         acl_default($this,$current_user);
!         $this->modified[] = array ( "field" => "created" ,
!                                     "old" => $this->getType() ,
!                                     "new" => $this->id,
!                                     "obj_id" => $this->id
!                                   );
! 	  }
        $q->addFV("creation",$this->creation,"DATETIME");
  
        $query = $q->getInsert();
      } else {
        $q->addWC("id",$this->id,"");

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** department_new.php	2001/09/16 19:11:58	1.13
--- department_new.php	2001/11/19 16:34:59	1.14
***************
*** 159,164 ****
--- 159,166 ----
           echo "<TR>";
           echo "<TD>";
+          # FIXME check mod_ok
           echo menulink("department_new.php?id=". $d->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $d->getFullName()));
           echo "</TD><TD>\n";
+          # FIXME check del_ok
           echo menulink("location_del.php?ref=". $d->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $d->getFullName()));
           echo "</TD>\n";

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** department_show.php	2001/09/16 19:11:58	1.16
--- department_show.php	2001/11/19 16:34:59	1.17
***************
*** 135,143 ****
         showfield($lang['ProdFiles']);
         echo " <TD VALIGN=top COLSPAN=3>\n";
!        if ( $format == "paper" ) {
!          showFiles($d,-1);
!        } else {
!          showFiles($d);
!        }
         echo " </TD>\n";
         echo "</TR>\n";
--- 135,139 ----
         showfield($lang['ProdFiles']);
         echo " <TD VALIGN=top COLSPAN=3>\n";
!        showFiles($d);
         echo " </TD>\n";
         echo "</TR>\n";

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/en.p3,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** en.p3	2001/11/10 11:09:54	1.68
--- en.p3	2001/11/19 16:34:59	1.69
***************
*** 229,232 ****
--- 229,233 ----
  $lang['UserTimezone']    = "Timezone";
  $lang['UserTheme']       = "Theme";
+ $lang['UserHoliday']     = "Holidays";
  
  # Bugs

Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/es-mx.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** es-mx.p3	2001/11/10 11:09:54	1.3
--- es-mx.p3	2001/11/19 16:34:59	1.4
***************
*** 231,234 ****
--- 231,235 ----
  $lang['UserTimezone']    = "Zona horario";
  $lang['UserTheme']       = "Tema";
+ $lang['UserHoliday']     = "Holidays";
  
  # Bugs

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/es.p3,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** es.p3	2001/11/10 11:09:54	1.52
--- es.p3	2001/11/19 16:34:59	1.53
***************
*** 231,234 ****
--- 231,235 ----
  $lang['UserTimezone']    = "Zona horaria";
  $lang['UserTheme']       = "Tema";
+ $lang['UserHoliday']     = "Holidays";
  
  # Bugs

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** file.pinc	2001/10/03 09:24:27	1.44
--- file.pinc	2001/11/19 16:34:59	1.45
***************
*** 16,22 ****
    $msg = "";
    readFiles($obj);
!   if ( count($this->filelist) > 0 ) {
!     @reset ($this->filelist);
!     while ( list ($i,$f) = @each ($this->filelist) ) {
        $msg .= $f->delete();
      }
--- 16,22 ----
    $msg = "";
    readFiles($obj);
!   if ( count($obj->filelist) > 0 ) {
!     @reset ($obj->filelist);
!     while ( list ($i,$f) = @each ($obj->filelist) ) {
        $msg .= $f->delete();
      }
***************
*** 94,100 ****
  
      $this->id        = -1;
!     $this->dbconn    = $dbconn;
  
!     $this->base      = $dbconn->db->repository;
      $this->link_id   = -1;
      $this->name      = "";
--- 94,100 ----
  
      $this->id        = -1;
!     $this->dbconn    = &$dbconn;
  
!     $this->base      = $this->dbconn->db->repository;
      $this->link_id   = -1;
      $this->name      = "";
***************
*** 174,178 ****
  
      acl_read($this);
!     $g_note[$this->id] = $this;
    }
    /* ---------------------------------------------------------------------------
--- 174,178 ----
  
      acl_read($this);
!     $g_file[$this->id] = $this;
    }
    /* ---------------------------------------------------------------------------
***************
*** 522,527 ****
  
  
!     if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
        $this->fileloc =  $this->link_id ."/". $this->id ."/FILE";
        $newfile = 1;
--- 522,533 ----
  
  
!     if ( $this->id < 0 ) {
!       unset ($this->modified);
!       if ( isset($this->newid) ) {
!         $this->id = $this->newid;
!         $q->addFV("id",$this->id,"");
!       } else {
!         $this->id = $q->addFV("id",-1,"NEXTID");
!       }
        $this->fileloc =  $this->link_id ."/". $this->id ."/FILE";
        $newfile = 1;
***************
*** 550,562 ****
  	}
  
!     $q-...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/html
In directory usw-pr-cvs1:/tmp/cvs-serv3840/html

Modified Files:
	red.css white.css 
Log Message:
Intermediate

Index: red.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/red.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** red.css	2001/08/30 13:38:47	1.13
--- red.css	2001/11/19 16:34:59	1.14
***************
*** 254,258 ****
  BODY {
  	background: white;
! 	color: #f8fcf8;
  	padding: 0px;
  	margin-left: 0px;
--- 254,258 ----
  BODY {
  	background: white;
! 	color: black;
  	padding: 0px;
  	margin-left: 0px;

Index: white.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/white.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** white.css	2001/11/08 19:24:40	1.1
--- white.css	2001/11/19 16:34:59	1.2
***************
*** 107,116 ****
  /* line color 1 in overviews */
  .line1 {
! 	background: #98bcd8;
  }
  
  /* line color 2 in overviews */
  .line2 {
! 	background: #88acc8;
  }
  
--- 107,116 ----
  /* line color 1 in overviews */
  .line1 {
! 	background: #B8B8B8;
  }
  
  /* line color 2 in overviews */
  .line2 {
! 	background: #D8D8D8;
  }
  

Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv3840

Modified Files:
	ChangeLog ToDo scheme.sh shellfunc.sh 
Log Message:
Intermediate

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** ChangeLog	2001/09/27 21:39:36	1.64
--- ChangeLog	2001/11/19 16:34:58	1.65
***************
*** 1,3 ****
--- 1,22 ----
  $Header$
+ November 10 2001
+ 	* fixed bug with reapearing permissions when a user saves his own record
+ 	* new Product Relations for Projects/Products
+ 	  it is possible to define base products and/or sucessors
+ 	  ancestors for a project/product using the same mechanisms like
+ 	  roles
+ 	* new per user holiday display. This needs a new column in the
+ 	  people table. To create it you may perrform the following command:
+           in mysql:
+ !! -->      alter table people add (holidays varchar(60)); 
+           in postgres:
+ !! -->      alter table people add (holidays varchar(60)); 
+           in oracle:
+ !! -->      alter table people add column (holidays varchar(60)); 
+ November 8 2001
+ 	* added white CSS theme
+ October 16 2001
+ 	* new display notes in the calendar at their "remember" date
+ 	(thanks to Jeroen Baten <jbaten at i2rs.nl>)
  September 27 2001
  	* new external holiday files (php/holiday_es.pinc
***************
*** 5,9 ****
  	php/holiday_pl.pinc php/holiday_ru.pinc ) Please expand and
  	translate !
- 	
  September 16 2001
  	* new urls that are added to team descriptions will appear in the
--- 24,27 ----
***************
*** 21,25 ****
  	  To add this to existing installations please do
  
! 	  create table tutos_dbs (
  	  id	       int4 primary key,        -- a ID
  	  name	       varchar(30) not null,    -- database name
--- 39,43 ----
  	  To add this to existing installations please do
  
! !! -->	  create table tutos_dbs (
  	  id	       int4 primary key,        -- a ID
  	  name	       varchar(30) not null,    -- database name

Index: ToDo
===================================================================
RCS file: /cvsroot/tutos/tutos/ToDo,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ToDo	2001/09/10 19:53:13	1.11
--- ToDo	2001/11/19 16:34:58	1.12
***************
*** 73,76 ****
--- 73,88 ----
  
  Move Tasks from one Project to another one
+ 
+ Locations with own ACLs
+ 
+ Account creation via Mail / Login Interface (later verification)
+ 
+ only local admin logins
+ 
+ No Invitation emails to the current_user ???
+ 
+ Manage Commit for timetrack entries
+ 
+ Charset entry in Mail Headers
  #
  #

Index: scheme.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/scheme.sh,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** scheme.sh	2001/09/16 19:22:21	1.30
--- scheme.sh	2001/11/19 16:34:58	1.31
***************
*** 113,116 ****
--- 113,117 ----
    lang         varchar(5),                      -- language (auto == use http accepted languages)
    tz           varchar(30),                     -- timezone name
+   holidays     varchar(60),                     -- list of holidays to display
    theme        varchar(10)     default 'tutos'  -- theme
  );

Index: shellfunc.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/shellfunc.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** shellfunc.sh	2001/09/16 19:23:02	1.15
--- shellfunc.sh	2001/11/19 16:34:58	1.16
***************
*** 40,44 ****
      ID_TYPE="number(30,0)"
      TS_TYPE="date"
!     TX_TYPE="varchar2(400)"
      SQLCMD="sqlplus"
      carg1="-s ${DBUSER}/${DBPASSWD}@${DBNAME}"
--- 40,44 ----
      ID_TYPE="number(30,0)"
      TS_TYPE="date"
!     TX_TYPE="varchar2(20000)"
      SQLCMD="sqlplus"
      carg1="-s ${DBUSER}/${DBPASSWD}@${DBNAME}"

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv12839

Modified Files:
	holiday_pl.pinc 
Log Message:
- all polish official holidays.

Index: holiday_pl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_pl.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** holiday_pl.pinc	2001/09/27 19:30:21	1.1
--- holiday_pl.pinc	2001/11/12 23:22:47	1.2
***************
*** 1,5 ****
  <?
  /*
!  * Copyright 2001 by Gero Kohnert
   *
   *  CVS Info:  $Id$
--- 1,5 ----
  <?
  /*
!  * Copyright 2001 by Gero Kohnert, Sergiusz Paw³owicz
   *
   *  CVS Info:  $Id$
***************
*** 8,12 ****
  
  	 $tutos[cal][] = array(
! 							array( Date => "03-05",             Desc => "National Holiday (PL)"),
! 							);
! ?>
\ No newline at end of file
--- 8,19 ----
  
  	 $tutos[cal][] = array(
! 	array( Date => "01-01", Desc => "Nowy Rok"),
! 	array( Date => "01-05", Desc => "¦wiêto Pracy"),
! 	array( Date => "03-05", Desc => "Konstytucja 3 Maja"),
! 	array( Date => "15-08",	Desc => "Wniebowziêcie NMP"),
! 	array( Date => "01-11", Desc => "Wszystkich ¦wiêtych"),
! 	array( Date => "11-11", Desc => "Narodowe ¦wiêto Niepodleg³o¶ci"),
! 	array( Date => "25-12", Desc => "Bo¿e Narodzenie"),
! 	array( Date => "26-12", Desc => "Bo¿e Narodzenie")
! 	 );
! ?>

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv32412

Modified Files:
	pl.p3 
Log Message:
- update with relation to english version.

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pl.p3,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** pl.p3	2001/11/10 11:09:54	1.24
--- pl.p3	2001/11/12 22:41:24	1.25
***************
*** 9,13 ****
  # =======================================================
  #
! # Translated by Sergiusz Paw³owicz <se...@hy...>
  # (C) Max Weber (http://maxweber.net/).
  # Released under GPL: http://www.gnu.org/copyleft/gpl.html
--- 9,13 ----
  # =======================================================
  #
! # Translated by Sergiusz Paw³owicz <se...@it...>
  # (C) Max Weber (http://maxweber.net/).
  # Released under GPL: http://www.gnu.org/copyleft/gpl.html
***************
*** 26,30 ****
  $lang['Login']           = "Login";
  $lang['LoggedIn']        = "Jeste¶ zalogowany. Dokonaj wyboru w menu z lewej strony ekranu.";
! $lang['ReadOnlyAppoint'] = "Nie masz praw do zmian paremetrów tego spotkania!";
  $lang['StartDate']       = "Data rozpoczêcia";
  $lang['StartTime']       = "Godzina rozpoczêcia";
--- 26,30 ----
  $lang['Login']           = "Login";
  $lang['LoggedIn']        = "Jeste¶ zalogowany. Dokonaj wyboru w menu z lewej strony ekranu.";
! $lang['ReadOnlyAppoint'] = "Nie masz praw do zmian parametrów tego spotkania!";
  $lang['StartDate']       = "Data rozpoczêcia";
  $lang['StartTime']       = "Godzina rozpoczêcia";
***************
*** 97,101 ****
  $lang['lang']['fr']      = "francuski";
  $lang['lang']['es']      = "hiszpañski";
! $lang['lang']['es-MX']   = "Español/México";
  $lang['lang']['it']      = "w³oski";
  $lang['lang']['tw']      = "chiñski tradycyjny";
--- 97,101 ----
  $lang['lang']['fr']      = "francuski";
  $lang['lang']['es']      = "hiszpañski";
! $lang['lang']['es-MX']   = "hiszpañski/Meksyk";
  $lang['lang']['it']      = "w³oski";
  $lang['lang']['tw']      = "chiñski tradycyjny";
***************
*** 133,137 ****
  $lang['State_1']         = "TAK";
  $lang['State_2']         = "NIE";
! $lang['SeeAddress']      = "zobacz adres of %s";
  $lang['NavFirst']        = "pierwszy";
  $lang['NavBack']         = "ty³";
--- 133,137 ----
  $lang['State_1']         = "TAK";
  $lang['State_2']         = "NIE";
! $lang['SeeAddress']      = "zobacz adres %s";
  $lang['NavFirst']        = "pierwszy";
  $lang['NavBack']         = "ty³";
***************
*** 144,148 ****
  $lang['FldsRequired']    = "<FONT SIZE=-1>Pola zaznaczone <FONT COLOR=red>(*)</FONT> musz± zostaæ wype³nione.</FONT>";
  $lang['any']             = "ka¿dy";
! $lang['all']             = "All";
  $lang['extended']        = "rozszerzone";
  $lang['OrderBy']         = "w kolejno¶ci %s";
--- 144,148 ----
  $lang['FldsRequired']    = "<FONT SIZE=-1>Pola zaznaczone <FONT COLOR=red>(*)</FONT> musz± zostaæ wype³nione.</FONT>";
  $lang['any']             = "ka¿dy";
! $lang['all']             = "wszystko";
  $lang['extended']        = "rozszerzone";
  $lang['OrderBy']         = "w kolejno¶ci %s";
***************
*** 298,303 ****
  $lang['ProdName']        = "Produkty/projekty";
  $lang['ProdVersion']     = "Wersja";
! $lang['ProdProd']        = "related Projects";
! $lang['ProdProdNew']     = "new relation";
  $lang['ProdRoles']       = "Rola";
  $lang['ProdFunc']        = "Funkcja";
--- 298,303 ----
  $lang['ProdName']        = "Produkty/projekty";
  $lang['ProdVersion']     = "Wersja";
! $lang['ProdProd']        = "powi±zane projekty";
! $lang['ProdProdNew']     = "nowe powi±zanie";
  $lang['ProdRoles']       = "Rola";
  $lang['ProdFunc']        = "Funkcja";
***************
*** 312,319 ****
  $lang['ProdRole'][8]     = "Sprzedawca";
  $lang['ProdRole'][9]     = "Partner";
! $lang['ProdRole'][10]    = "Project Base";
! $lang['ProdRole'][11]    = "Ancestor Project";
! $lang['ProdRole'][12]    = "Succesor Project";
! $lang['ProdRole'][13]    = "Sub Project";
  $lang['ProdPath']        = "¦cie¿ka pliku";
  $lang['ProdDesc']        = "Opis";
--- 312,319 ----
  $lang['ProdRole'][8]     = "Sprzedawca";
  $lang['ProdRole'][9]     = "Partner";
! $lang['ProdRole'][10]    = "Projekt podstawowy";
! $lang['ProdRole'][11]    = "Projekt nadrzêdny";
! $lang['ProdRole'][12]    = "Projekt potomny";
! $lang['ProdRole'][13]    = "Podprojekt";
  $lang['ProdPath']        = "¦cie¿ka pliku";
  $lang['ProdDesc']        = "Opis";
***************
*** 413,418 ****
  $lang['ACLmodI']         = "powy¿si u¿ytkownicy/grupy bêd± mogli modyfikowaæ %s";
  $lang['ACLdelI']         = "powy¿si u¿ytkownicy/grupy bêd± mogli kasowaæ %s";
! $lang['ACLOverview']     = "Permissions Overview";
! $lang['ACLOverviewI']    = "see all permissions";
  
  # Tasks
--- 413,418 ----
  $lang['ACLmodI']         = "powy¿si u¿ytkownicy/grupy bêd± mogli modyfikowaæ %s";
  $lang['ACLdelI']         = "powy¿si u¿ytkownicy/grupy bêd± mogli kasowaæ %s";
! $lang['ACLOverview']     = "Przegl±d uprawnieñ";
! $lang['ACLOverviewI']    = "zobacz wszystkie uprawnienia";
  
  # Tasks
***************
*** 428,433 ****
  $lang['TaskName']        = "Nazwa";
  $lang['TaskState']       = "Stan";
! $lang['TaskDesc']        = "ToDo";
! $lang['TaskWorker']      = "ToDo przez";
  $lang['TaskVolumeFull']  = "Nak³ad pracy";
  $lang['TaskVolumeDone']  = "Wykonanie";
--- 428,433 ----
  $lang['TaskName']        = "Nazwa";
  $lang['TaskState']       = "Stan";
! $lang['TaskDesc']        = "Do zrobienia";
! $lang['TaskWorker']      = "Do zrobienia przez";
  $lang['TaskVolumeFull']  = "Nak³ad pracy";
  $lang['TaskVolumeDone']  = "Wykonanie";
***************
*** 570,574 ****
  $lang['AdrLNewInfo']     = "utwórz nowy adres dla %s";
  $lang['AdrName']         = "Nazwa";
! $lang['AdrMailInfo']     = "wyslij pocztê do %s";
  $lang['AdrGetVcard']     = "Pobierz Vcard";
  $lang['AdrGetVcardI']    = "Pobierz niniejszy adres jako Vcard";
--- 570,574 ----
  $lang['AdrLNewInfo']     = "utwórz nowy adres dla %s";
  $lang['AdrName']         = "Nazwa";
! $lang['AdrMailInfo']     = "wy¶lij pocztê do %s";
  $lang['AdrGetVcard']     = "Pobierz Vcard";
  $lang['AdrGetVcardI']    = "Pobierz niniejszy adres jako Vcard";
***************
*** 581,585 ****
  $lang['Location']        = "Miejsce";
  $lang['Location2']       = "Miejsce";
! $lang['AdrTitle']        = "Title";
  $lang['AdrFirstName']    = "Imiê";
  $lang['AdrMiddleName']   = "Inicja³ drugiego imienia";
--- 581,585 ----
  $lang['Location']        = "Miejsce";
  $lang['Location2']       = "Miejsce";
! $lang['AdrTitle']        = "Tytu³";
  $lang['AdrFirstName']    = "Imiê";
  $lang['AdrMiddleName']   = "Inicja³ drugiego imienia";
***************
*** 589,593 ****
  $lang['AdrCat1']         = "Dom";
  $lang['AdrCat2']         = "Biuro";
! $lang['AdrCpLoc']        = "Copy company's address";
  $lang['ZIP']             = "Kod pocztowy";
  $lang['State']           = "Stan";
--- 589,593 ----
  $lang['AdrCat1']         = "Dom";
  $lang['AdrCat2']         = "Biuro";
! $lang['AdrCpLoc']        = "Powiel adres firmy";
  $lang['ZIP']             = "Kod pocztowy";
  $lang['State']           = "Stan";
***************
*** 638,642 ****
  # Filehandling
  $lang['File']            = "Dokument";
! $lang['Files']           = "Dokuments";
  $lang['FileDetail']      = "Szczegó³y dokumentu";
  $lang['FileOverview']    = "Przegl±d dokumentów";
--- 638,642 ----
  # Filehandling
  $lang['File']            = "Dokument";
! $lang['Files']           = "Dokumenty";
  $lang['FileDetail']      = "Szczegó³y dokumentu";
  $lang['FileOverview']    = "Przegl±d dokumentów";
***************
*** 671,677 ****
  $lang['FileVersioning']  = "Wersje";
  $lang['FileVersioningI'] = "Je¿eli poda³e¶(a¶) nazwê powy¿ej.";
! $lang['FileSearch']      = "Document Search";
! $lang['SearchForFile']   = "Document Search";
! $lang['SearchForFileExt']= "Extended Document Search";
  
  # MAP
--- 671,677 ----
  $lang['FileVersioning']  = "Wersje";
  $lang['FileVersioningI'] = "Je¿eli poda³e¶(a¶) nazwê powy¿ej.";
! $lang['FileSearch']      = "Poszukiwanie dokumentu";
! $lang['SearchForFile']   = "Poszukiwanie dokumentu";
! $lang['SearchForFileExt']= "Rozszerzone poszukiwanie dokumentu";
  
  # MAP
***************
*** 741,745 ****
  $lang['ResUsage']          = "Zu¿ycie zasobów";
  $lang['ResOverview']       = "Przegl±d zasobów";
! $lang['ResDelI']           = "delete resource %s";
  
  # Admin Pages
--- 741,745 ----
  $lang['ResUsage']          = "Zu¿ycie zasobów";
  $lang['ResOverview']       = "Przegl±d zasobów";
! $lang['ResDelI']           = "Usuñ zasób %s";
  
  # Admin Pages
***************
*** 749,779 ****
  $lang['AdminDBCount']      = "Wpisy";
  $lang['AdminDBName']       = "Nazwa bazy";
! $lang['AdminDBAlias']      = "Database Alias";
  $lang['AdminDBUser']       = "U¿ytkownik bazy";
! $lang['AdminDBPass']       = "Password";
  $lang['AdminDBHost']       = "Serwer";
  $lang['AdminDBPort']       = "Port";
! $lang['AdminDBType']       = "Type";
  $lang['AdminDBHome']       = "ORA_HOME";
  $lang['AdminLoginInfo']    = "Ostatnie logowania";
! $lang['AdminDBSync']       = "Database Sync";
! $lang['AdminDBSource']     = "Source DB";
! $lang['AdminDBWhat']       = "What/How";
! $lang['AdminDBTarget']     = "Target DB";
! $lang['AdminDBRep']        = "File Repository";
  
  # Database
! $lang['DB']                = "Database";
  $lang['DBInit']            = "Inicjalizacja";
! $lang['DBModify']          = "Database Modify";
! $lang['DBModifyI']         = "Modify DB %s";
! $lang['DBCreate']          = "Database Create";
! $lang['DBDetail']          = "Database Detail";
! $lang['DBLastDate']        = "LastSync Date";
  $lang['DBCurrID']          = "ID";
! $lang['DBLastID']          = "LastSync ID";
! $lang['DBrelogin']         = "use Database";
! $lang['DBreloginI']        = "relogin on %s";
! $lang['DBOverview']        = "Database Overview";
  
  # Permissions
--- 749,779 ----
  $lang['AdminDBCount']      = "Wpisy";
  $lang['AdminDBName']       = "Nazwa bazy";
! $lang['AdminDBAlias']      = "Synonim bazy";
  $lang['AdminDBUser']       = "U¿ytkownik bazy";
! $lang['AdminDBPass']       = "Has³o";
  $lang['AdminDBHost']       = "Serwer";
  $lang['AdminDBPort']       = "Port";
! $lang['AdminDBType']       = "Typ";
  $lang['AdminDBHome']       = "ORA_HOME";
  $lang['AdminLoginInfo']    = "Ostatnie logowania";
! $lang['AdminDBSync']       = "Synchronizacja bazy danych";
! $lang['AdminDBSource']     = "¬ród³owa baza danych";
! $lang['AdminDBWhat']       = "Co/Jak";
! $lang['AdminDBTarget']     = "Docelowa baza danych";
! $lang['AdminDBRep']        = "Repozytorium plików";
  
  # Database
! $lang['DB']                = "Baza danych";
  $lang['DBInit']            = "Inicjalizacja";
! $lang['DBModify']          = "Modyfkacja bazdy danych";
! $lang['DBModifyI']         = "Modyfikuj bazê danych %s";
! $lang['DBCreate']          = "Utwórz bazê danych";
! $lang['DBDetail']          = "Szczegó³y bazy danych";
! $lang['DBLastDate']        = "Data ostatniej synchronizacji";
  $lang['DBCurrID']          = "ID";
! $lang['DBLastID']          = "ID ostatniej synchronizacji";
! $lang['DBrelogin']         = "u¿yj bazy danych";
! $lang['DBreloginI']        = "ponownie zaloguj w %s";
! $lang['DBOverview']        = "Przegl±d bazy danych";
  
  # Permissions

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv32524/php

Modified Files:
	team.pinc 
Log Message:
better acl permissions for new teammembers

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** team.pinc	2001/10/24 17:25:59	1.35
--- team.pinc	2001/11/10 16:48:32	1.36
***************
*** 248,251 ****
--- 248,252 ----
                                    "obj_id" => $this->id
                                  );
+       acl_raise($this,$this->owner->id,$tutos[delok]);
      } else {
        $q->addWC("id",$this->id,"");
***************
*** 259,264 ****
        while( list ($i,$f) = @each ($add)) {
          $q = "INSERT INTO adrteam (adr_id,team_id ) VALUES (". $f .",". $this->id .")";
!         $r = $this->dbconn->Exec($q);
          acl_raise($this,$f,$tutos[seeok]);
          $this->modified[] = array ( "field" => "TeamAdd" ,
                                      "old" => "-1",
--- 260,269 ----
        while( list ($i,$f) = @each ($add)) {
          $q = "INSERT INTO adrteam (adr_id,team_id ) VALUES (". $f .",". $this->id .")";
!         $this->dbconn->Exec($q);
!         $x = new tutos_user($this->dbconn);
!         $x->read($f);
          acl_raise($this,$f,$tutos[seeok]);
+         acl_raise($x,$this->id,$tutos[seeok]);
+         acl_save($x);
          $this->modified[] = array ( "field" => "TeamAdd" ,
                                      "old" => "-1",
***************
*** 274,277 ****
--- 279,286 ----
          $r = $this->dbconn->Exec($q);
          acl_set($this,$f,0);
+         $x = new tutos_user($this->dbconn);
+         $x->read($f);
+         acl_set($x,$this->id,0);
+         acl_save($x);
          $this->modified[] = array ( "field" => "TeamDel" ,
                                      "old" => $f,
***************
*** 283,287 ****
  
      acl_raise($this,$this->id,$tutos[seeok]);
-     acl_raise($this,$this->owner->id,$tutos[delok]);
  
      $msg .= acl_save($this);
--- 292,295 ----
***************
*** 325,333 ****
     */
    function del_ok () {
-     global $current_user,$tutos;
- 
-     if ( $current_user->id == $this->owner->id ) {
-       return $tutos[delok];
-     }
      return acl_del_ok($this);
    }
--- 333,336 ----
***************
*** 336,344 ****
     */
    function mod_ok () {
-     global $current_user,$tutos;
- 
-     if ( $current_user->id == $this->owner->id ) {
-       return $tutos[delok];
-     }
      return acl_mod_ok($this);
    }
--- 339,342 ----

Update of /cvsroot/tutos/tutos/homepage
In directory usw-pr-cvs1:/tmp/cvs-serv32239/homepage

Modified Files:
	about.html bugstats.png download.html links.html product.html 
	product.png 
Log Message:
homepage update

Index: about.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/about.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** about.html	2001/09/27 20:29:25	1.12
--- about.html	2001/11/10 16:47:36	1.13
***************
*** 21,25 ****
    <LI><A HREF=task.html>with task management</A>  (incl. screenshot)</LI>
    <LI><A HREF=file.html>with document management</A>  (incl. screenshot)</LI>
!   <LI><A HREF=installations.html>with installation management</A>  (incl. screenshot)</LI>
   </UL>
  <LI>mailboxes (imap/pop)</LI>
--- 21,27 ----
    <LI><A HREF=task.html>with task management</A>  (incl. screenshot)</LI>
    <LI><A HREF=file.html>with document management</A>  (incl. screenshot)</LI>
!   <LI><A HREF=installations.html>with installation management</A> (incl. screenshot)</LI>
!   <LI>support of different roles (manager,developer,customer etc.)</LI>
!   <LI>support of relations to other projects (base product, subproject etc.)</LI>
   </UL>
  <LI>mailboxes (imap/pop)</LI>

Index: bugstats.png
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/bugstats.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsLZ4euY and /tmp/cvsocfyIM differ

Index: download.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/download.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** download.html	2001/09/16 19:29:00	1.33
--- download.html	2001/11/10 16:47:36	1.34
***************
*** 17,23 ****
  <P>
  <UL>
! <LI>31 August 2001: <A HREF=" rel="nofollow">http://download.sourceforge.net/tutos/tutos-all-20010831.tar.bz2>
!                     tutos-all-20010831.tar.bz2</STRIKE></A>
  <P>OLDER:<BR>
  <LI>26 July 2001: <A HREF=" rel="nofollow">http://download.sourceforge.net/tutos/tutos-all-20010726.tar.bz2>
                      <STRIKE>tutos-all-20010726.tar.bz2</STRIKE></A>
--- 17,25 ----
  <P>
  <UL>
! <LI>11 November 2001: <A HREF=" rel="nofollow">http://download.sourceforge.net/tutos/tutos-all-20011111.tar.bz2>
!                     tutos-all-20011111.tar.bz2</STRIKE></A>
  <P>OLDER:<BR>
+ <LI>31 August 2001: <A HREF=" rel="nofollow">http://download.sourceforge.net/tutos/tutos-all-20010831.tar.bz2>
+                     <STRIKE>tutos-all-20010831.tar.bz2</STRIKE></A>
  <LI>26 July 2001: <A HREF=" rel="nofollow">http://download.sourceforge.net/tutos/tutos-all-20010726.tar.bz2>
                      <STRIKE>tutos-all-20010726.tar.bz2</STRIKE></A>

Index: links.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/links.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** links.html	2000/12/17 16:16:36	1.10
--- links.html	2001/11/10 16:47:36	1.11
***************
*** 14,20 ****
  
    <LI><A HREF=Appindex" rel="nofollow">http://freshmeat.net/projects/tutos>Appindex for TUTOS at freshmeat</A>
-   <LI><A HREF=ftp://TUTOS" rel="nofollow">tutos.sourceforge.net/pub/tutos>TUTOS ftp at sourceforge</A> (additional files not in released packages)
    <LI><A HREF=http://www.apache.org>Apache</A>
-   <LI><A HREF=Apache" rel="nofollow">http://java.apache.org/jserv/index.html>Apache Servlet Engine</A>
    <LI><A HREF=http://www.php.net>PHP</A>
    <LI>Overlib Javascript Library at <A HREF=http://www.bosrup.com/web/overlib/" rel="nofollow">http://www.bosrup.com/web/overlib/>http://www.bosrup.com/web/overlib/</A>
--- 14,18 ----

Index: product.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/product.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** product.html	2001/06/20 17:29:07	1.5
--- product.html	2001/11/10 16:47:36	1.6
***************
*** 24,27 ****
--- 24,34 ----
    <LI>Customer
   </UL>
+ <LI>define and set different roles of other projects</A>
+  <UL>
+   <LI>sucessors
+   <LI>ancestors
+   <LI>base products
+   <LI>sub projects
+  </UL>
  <LI>Timetracking of the time spent in the project
  <LI>automated notifications emails on changes with a watchlist

Index: product.png
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/product.png,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
Binary files /tmp/cvsZSIg2Z and /tmp/cvsMyYjDP differ

Update of /cvsroot/tutos/tutos/homepage
In directory usw-pr-cvs1:/tmp/cvs-serv31392/homepage

Modified Files:
	address.png calendar.png task.png 
Log Message:
updated screenshots

Index: address.png
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/address.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Binary files /tmp/cvs6qceHq and /tmp/cvsyEmlfJ differ

Index: calendar.png
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/calendar.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Binary files /tmp/cvs6tRGRr and /tmp/cvswNy5AL differ

Index: task.png
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/task.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvshQFPVs and /tmp/cvs8z9UKN differ

Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv16620

Modified Files:
	Makefile.in 
Log Message:
added white theme

Index: Makefile.in
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** Makefile.in	2001/09/30 18:28:40	1.70
--- Makefile.in	2001/11/08 19:27:23	1.71
***************
*** 11,14 ****
--- 11,17 ----
  #
  # $Log$
+ # Revision 1.71  2001/11/08 19:27:23  gokohnert
+ # added white theme
+ #
  # Revision 1.70  2001/09/30 18:28:40  gokohnert
  # added australian holiday file
***************
*** 513,517 ****
  	html/red.css \
  	html/sqli.css \
! 	html/visual.css
  
  #
--- 516,521 ----
  	html/red.css \
  	html/sqli.css \
! 	html/visual.css \
! 	html/white.css
  
  #

Update of /cvsroot/tutos/tutos/html
In directory usw-pr-cvs1:/tmp/cvs-serv15849/html

Added Files:
	white.css 
Log Message:
Initial

--- NEW FILE: white.css ---
/*
 * Copyright 1999/2000 by Gero Kohnert
 *
 * black/white theme
 *
 * CVS Info: $Id: white.css,v 1.1 2001/11/08 19:24:40 gokohnert Exp $
 * $Author: gokohnert $
 *
 */

A {
	text-decoration: none;
	color: #1e3ca0;
}

.nodeco {
	text-decoration: none;
	color: #282c28;
}

/*
A:link {
	color: #f8fcf8;
}

A:visited {
	color: #f8fcf8;
}

A:active {
	color: lime;
}
*/

.warn {
	font-weight: bold;
	color: red;
}

/* preformatted text */
.pre {
	background: #F0F0F0;
	color: black;
}

/* text found by search */
.found {
	color: #00F000;
}

.desc {
	font-weight: bold;
/*	font-style: italic; */
/*	color: #f8fcf8; */
	color: black;
}

.pagetitle {
	background: #808080;
	color: #f8fcf8;
	font-weight: bold;
	font-size: 20px;
}

.navigate {
	text-decoration: none;
	background: #C0C0C0;
	color: #f8fcf8;
	vertical-align: top;
	margin-top: 20px;
	margin-left: 5px;
	font-size: 12px;
}

.state0 {
	background: #F0F000;
}

.text0 {
	color: #F0F000;
	font-size: 10px;
}

.state1 {
	background: #00BB00;
}

.text1 {
	color: #00FF00;
	font-size: 10px;
}

.state2 {
	background: #FF0000;
}

.text2 {
	color: #FF0000;
	font-size: 10px;
}

.headline {
	background: #808080;
	color: white;
}

/* line color 1 in overviews */
.line1 {
	background: #98bcd8;
}

/* line color 2 in overviews */
.line2 {
	background: #88acc8;
}

/* not started task */
.task0 {
	background: #bb8888;
	color: black;
	font-size: 10px;
}

/* ongoing task */
.task1 {
	background: #a0e0a0;
	color: black;
	font-size: 10px;
}

/* finished task */
.task2 {
	background: #DDFFDD;
	color: black;
	font-size: 10px;
}

/* overdue task */
.task3 {
	background: #e07777;
	color: black;
	font-size: 10px;
}

/* task done */
.taskdone {
	background: green;
	color: black;
	font-size: 10px;
}

/* task to do */
.tasktodo {
	background: #E00000;
	color: black;
	font-size: 10px;
}

/* task too much time */
.taskmuch {
	background: red;
	color: black;
	font-size: 10px;
}

/* office */
.apploc0 {
	color: black;
}

/* out */
.apploc1 {
	color: black;
}

/* vacation */
.apploc2 {
	color: green;
}

/* sick */
.apploc3 {
	color: red;
}

.holiday {
	background: #c47b89;
	vertical-align: top;
	color: black;
	font-size: 12px;
}

.freeday {
	background: #c999a5; 
	vertical-align: top;
	color: black;
	font-size: 12px;
}

.appday {
	background: #A0A0A0;
	vertical-align: top;
	color: black;
	font-size: 12px;
}

.today {
	background: #90C090;
	vertical-align: top;
	color: black;
	font-size: 12px;
}

.week {
	color: black;
	background: #C0C0C0;
	width: 5%;
	vertical-align: top;
}

.app {
	background: #e8ece8 ;
	color: black;
	font-size: 10px;
}

.privapp {
	background: #ffdcd8;
	color: black;
	font-size: 10px;
}

ADDRESS {
	font-size: x-small;
}

TABLE {
	margin: 0px;
}

TABLE.single {
	background: white;
}

TABLE.inner {
	background: white;
}

TABLE.outer {
	background: white;
	margin: 0px;
	padding: 1px;
}

BODY {
	background: white;
	color: black;
	padding: 0px;
	margin-left: 0px;
	margin-top: 0px;
	margin-right: 0px;
	margin-bottom: 0px;
	font-family: arial, verdana, sans-serif;
	font-size: 10px;
}

TD {
	color: black;
	font-family: arial, verdana, sans-serif;
	font-size: 12px;
}

TH {
	color: black;
	background: #C0C0C0;
	font-weight: normal;
	font-family: arial, verdana, sans-serif;
	font-size: 12px;
}

INPUT {
	font-family: verdana, arial, sans-serif;
	font-size: 11px;
	color: black;
}

SELECT {
	font-family: verdana, arial, sans-serif;
	font-size: 11px;
	color: black;
}

SPAN.warn {
	font-weight: bold;
	color: red;
}

/* EOF */

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv18157

Modified Files:
	product_overview.php 
Log Message:
fixed role display

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** product_overview.php	2001/09/30 18:35:39	1.30
--- product_overview.php	2001/11/03 18:46:05	1.31
***************
*** 871,874 ****
--- 871,878 ----
     if ( isset($role) ) {
       $q1 = "SELECT pro_id FROM projectroles WHERE role_id in (". $role .") AND adr_id in (". $ml .")";
+      $link1 = addUrlParameter($link1,"role=".$role);
+      $link2 = addUrlParameter($link2,"role=".$role);
+      $qarg .= "&role=".$role;
+      $hidden .= "<INPUT TYPE=hidden NAME=\"role\" VALUE=\"". $role ."\">\n";
     } else {
       $q1 = "SELECT pro_id FROM projectroles WHERE adr_id in (". $ml .")";

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv423

Modified Files:
	holiday_hu.pinc 
Log Message:
Added Mindenszentek 1. November

Index: holiday_hu.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_hu.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** holiday_hu.pinc	2001/09/11 20:58:25	1.1
--- holiday_hu.pinc	2001/11/03 18:05:40	1.2
***************
*** 14,17 ****
--- 14,18 ----
  							array( Date => "20-08",             Desc => "Szt. István (H)"),
  							array( Date => "23-10",             Desc => "Nemzeti ünnep 1956 (H)"),
+                             array( Date => "01-11",             Desc => "Mindenszentek (H)"),
  							array( Date => "25-12",             Desc => "Karácsony (H)"),
  							array( Date => "26-12",             Desc => "Karácsony (H)"),

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv2211/php

Modified Files:
	holiday_fr.pinc 
Log Message:
Update from Thomas GIBERT

Index: holiday_fr.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_fr.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** holiday_fr.pinc	2001/09/27 19:30:21	1.1
--- holiday_fr.pinc	2001/10/30 19:06:09	1.2
***************
*** 5,12 ****
   *  CVS Info:  $Id$
   *  $Author$
   */
- 
       $tutos[cal][] = array(
! 							array( Date => "14-07",             Desc => "National Holiday (F)"),
  							);
  ?>
--- 5,25 ----
   *  CVS Info:  $Id$
   *  $Author$
+  * 
+  * Added by Thomas GIBERT 2001-10-30 
   */
       $tutos[cal][] = array(
!                             array( Date => "01-01",             Desc => "Nouvel An (F)"),
!                             array( Date => "EASTERSUNDAY",      Desc => "Pâques (F)"),
!                             array( Date => "EASTERMONDAY",      Desc => "Lundi de Pâques (F)"),
!                             array( Date => "01-05",             Desc => "Fête du Travail (F)"),
!                             array( Date => "08-05",             Desc => "Victoire 1945 (F)"),
!                             array( Date => "ASCENSIONDAY",      Desc => "Ascension (F)"),
!                             array( Date => "WHITSUNDAY",        Desc => "Pentecôte (F)"),
!                             array( Date => "WHITMONDAY",        Desc => "Lundi de Pentecôte (F)"),
!                             array( Date => "14-07",             Desc => "Fête Nationale (F)"),
!                             array( Date => "15-08",             Desc => "Assomption (F)"),
!                             array( Date => "01-11",             Desc => "Toussaint (F)"),
!                             array( Date => "11-11",             Desc => "Armistice 1918 (F)"),
!                             array( Date => "25-12",             Desc => "Noël (F)")
  							);
  ?>

Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv4139

Modified Files:
	createdb.sh 
Log Message:
using db superuser info for pg

Index: createdb.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/createdb.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** createdb.sh	2001/09/16 19:23:02	1.8
--- createdb.sh	2001/10/24 17:40:52	1.9
***************
*** 106,115 ****
    if [ $2 = "CREATE" ]
    then
!     createdb -h $DBHOST -p $DBPORT $DBNAME
      echo " Database $DBNAME created !"
  # OLD Postgres 6.5
  #    createuser -h $DBHOST -p $DBPORT -U -D $DBUSER
      #  Postgres 7
!     createuser -A -D -h $DBHOST -p $DBPORT  $DBUSER
      echo " User $DBUSER created !"
      echo "---------------------------------------------------------------"
--- 106,115 ----
    if [ $2 = "CREATE" ]
    then
!     createdb -h $DBHOST -p $DBPORT -U $DBSUSER $DBNAME
      echo " Database $DBNAME created !"
  # OLD Postgres 6.5
  #    createuser -h $DBHOST -p $DBPORT -U -D $DBUSER
      #  Postgres 7
!     createuser -A -D -h $DBHOST -p $DBPORT -U $DBSUSER $DBUSER
      echo " User $DBUSER created !"
      echo "---------------------------------------------------------------"

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv3841/php

Modified Files:
	location.pinc 
Log Message:
added default acl funcs

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** location.pinc	2001/09/19 20:51:38	1.16
--- location.pinc	2001/10/24 17:39:46	1.17
***************
*** 72,76 ****
        $l->read($i);
        $l->lname = $f;
!       $obj->location[$i] = $l;
      }
    }
--- 72,78 ----
        $l->read($i);
        $l->lname = $f;
!       if ( $l->see_ok() ) {
!         $obj->location[$i] = $l;
! 	  }
      }
    }
***************
*** 167,173 ****
--- 169,201 ----
      $this->id            = $result->get(0, "id");
  
+     acl_read($this);
      $g_loc[$this->id] = $this;
    }
  
+   /* ---------------------------------------------------------------------------
+    * Checks if the current user is allowed to see this location
+    */
+   function see_ok () {
+     global $tutos;
+ 
+     return $tutos[seeok];
+ #    return acl_see_ok($this);
+   }
+   /* ---------------------------------------------------------------------------
+    * Checks if the current user is allowed to delete this location
+    */
+   function del_ok () {
+     global $tutos;
+     return $tutos[delok];
+ #    return acl_del_ok($this);
+   }
+   /* ---------------------------------------------------------------------------
+    * Checks if the current user is allowed to modify this location
+    */
+   function mod_ok () {
+     global $tutos;
+     return $tutos[modok];
+ #    return acl_mod_ok($this);
+   }
    /* ---------------------------------------------------------------------------
     *

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv2204/php

Modified Files:
	user.pinc 
Log Message:
fixed string lenght

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** user.pinc	2001/10/06 18:10:44	1.53
--- user.pinc	2001/10/24 17:33:53	1.54
***************
*** 636,640 ****
      $q->addFV("last_seen",$this->last_seen,"DATETIME");
      $q->addFV("prefteam",$this->get_prefteam(),"");
!     $q->addFV("last_host",$this->last_host,"STRING");
      $q->addWC("login",$this->login,"STRING");
      $query = $q->getUpdate();
--- 636,640 ----
      $q->addFV("last_seen",$this->last_seen,"DATETIME");
      $q->addFV("prefteam",$this->get_prefteam(),"");
!     $q->addFV("last_host",substr($this->last_host,0,20),"STRING");
      $q->addWC("login",$this->login,"STRING");
      $query = $q->getUpdate();

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv1800/php

Modified Files:
	appointment.pinc 
Log Message:
bugfix for daylightsaving time

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** appointment.pinc	2001/09/30 18:31:08	1.62
--- appointment.pinc	2001/10/24 17:32:20	1.63
***************
*** 51,56 ****
    if ( $to == -1 ) {
      $to   =  new DateTime();
!     $to->setDateTimeTS( NextDay($from->getTimeStamp()) - 12 * 3600);
    }
    $x1 =  $obj->dbconn->DateTime($from);
    $x2 =  $obj->dbconn->DateTime($to);
--- 51,60 ----
    if ( $to == -1 ) {
      $to   =  new DateTime();
!     $to->setDateTimeTS( NextDay($from->getTimeStamp()) );
    }
+ 
+   $from->setDateTime($from->getYYYYMMDD() . "000000");
+   $to->setDateTime($to->getYYYYMMDD() . "000000");
+ 
    $x1 =  $obj->dbconn->DateTime($from);
    $x2 =  $obj->dbconn->DateTime($to);
***************
*** 215,219 ****
      $this->trace = 0;
      $this->outside = 0;
!     $this->mod_allow = 0;
      $this->start    = new DateTime();
      $this->end      = new DateTime();
--- 219,223 ----
      $this->trace = 0;
      $this->outside = 0;
!     $this->mod_allow = 1;
      $this->start    = new DateTime();
      $this->end      = new DateTime();
***************
*** 235,238 ****
--- 239,243 ----
      $this->res = array();
      $this->resuselist = array();
+     $this->tablename = "calendar";
    }
  
***************
*** 315,319 ****
      }
  
!     $query = "SELECT * FROM calendar WHERE id = ". $id;
      $result = $this->dbconn->Exec($query);
      $i = $result->numrows();
--- 320,324 ----
      }
  
!     $query = "SELECT * FROM ". $this->tablename ." WHERE id = ". $id;
      $result = $this->dbconn->Exec($query);
      $i = $result->numrows();
***************
*** 494,498 ****
      $msg = "";
  
!     $q = "DELETE FROM calendar WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
--- 499,503 ----
      $msg = "";
  
!     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
***************
*** 601,605 ****
  
      $q = new query($this->dbconn);
!     $q->setTable("calendar");
      $q->addFV("a_start",$this->start,"DATETIME");
      $q->addFV("a_end",$this->end,"DATETIME");
--- 606,610 ----
  
      $q = new query($this->dbconn);
!     $q->setTable($this->tablename);
      $q->addFV("a_start",$this->start,"DATETIME");
      $q->addFV("a_end",$this->end,"DATETIME");
***************
*** 638,646 ****
        $q->addWC("id",$this->id,"");
  
!       $r = $this->dbconn->Exec($q->getUpdate());
  
        /* Remove the old list of participants */
        $q = "DELETE FROM participants WHERE app_id = ". $this->id;
!       $r = $this->dbconn->Exec($q);
  
      } else {
--- 643,651 ----
        $q->addWC("id",$this->id,"");
  
!       $this->dbconn->Exec($q->getUpdate());
  
        /* Remove the old list of participants */
        $q = "DELETE FROM participants WHERE app_id = ". $this->id;
!       $this->dbconn->Exec($q);
  
      } else {
***************
*** 651,655 ****
        $q->addFV("creation",$this->creation,"DATETIME");
  
!       $r = $this->dbconn->Exec($q->getInsert());
  
        acl_raise($this,$this->creator->id,$tutos[delok]);
--- 656,660 ----
        $q->addFV("creation",$this->creation,"DATETIME");
  
!       $this->dbconn->Exec($q->getInsert());
  
        acl_raise($this,$this->creator->id,$tutos[delok]);
***************
*** 692,697 ****
        $vals .= ",".$state;
  
!       $q="INSERT INTO participants (". $flds .") VALUES (". $vals .")";
!       $r = $this->dbconn->Exec($q);
  
        # Manage the permissions
--- 697,702 ----
        $vals .= ",".$state;
  
!       $q = "INSERT INTO participants (". $flds .") VALUES (". $vals .")";
!       $this->dbconn->Exec($q);
  
        # Manage the permissions

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv593/php

Modified Files:
	webelements.p3 
Log Message:
bugfixes / cleanups

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** webelements.p3	2001/10/06 18:09:20	1.85
--- webelements.p3	2001/10/24 17:29:06	1.86
***************
*** 376,380 ****
    HTML_Head1($text);
    /* Margins are needed for Netscape */
!   echo "<BODY MARGINWIDTH=0 MARGINHEIGHT=0>\n";
  #  echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
--- 376,380 ----
    HTML_Head1($text);
    /* Margins are needed for Netscape */
!   echo "<BODY MARGINWIDTH=\"0\" MARGINHEIGHT=\"0\">\n";
  #  echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
***************
*** 434,440 ****
    echo "<!-- all rights reserved -->\n";
    echo "<HEAD>\n";
    echo " <META NAME=\"GENERATOR\" CONTENT=\"TUTOS ". $tutos[version] ."\">\n";
    echo " <META NAME=\"language\" CONTENT=\"". $tutos[lang] ."\">\n";
!   # echo " <META HTTP-EQUIV=\"Expires\" CONTENT=\"0\">\n";
    if (is_readable("../html/". $theme .".css") ) {
      echo " <LINK REL=\"stylesheet\" HREF=\"../html/". $theme .".css\" TYPE=\"text/css\">\n";
--- 434,441 ----
    echo "<!-- all rights reserved -->\n";
    echo "<HEAD>\n";
+   echo " <META http-equiv=\"Content-Type\" CONTENT=\"text/html; charset=". $lang['content_encoding'] ."\">\n";
    echo " <META NAME=\"GENERATOR\" CONTENT=\"TUTOS ". $tutos[version] ."\">\n";
    echo " <META NAME=\"language\" CONTENT=\"". $tutos[lang] ."\">\n";
!   echo " <META HTTP-EQUIV=\"Expires\" CONTENT=\"-1\">\n";
    if (is_readable("../html/". $theme .".css") ) {
      echo " <LINK REL=\"stylesheet\" HREF=\"../html/". $theme .".css\" TYPE=\"text/css\">\n";
***************
*** 442,446 ****
      echo "\n<!-- NO THEME ". $theme ." found -->\n";
    }
!   echo "<META NAME=\"MSSmartTagsPreventParsing\" CONTENT=\"TRUE\">";
  
    echo " <LINK REL=\"copyright\" HREF=\"../html/copyright.html\" TITLE=\"Copyright\">\n";
--- 443,447 ----
      echo "\n<!-- NO THEME ". $theme ." found -->\n";
    }
!   echo " <META NAME=\"MSSmartTagsPreventParsing\" CONTENT=\"TRUE\">";
  
    echo " <LINK REL=\"copyright\" HREF=\"../html/copyright.html\" TITLE=\"Copyright\">\n";
***************
*** 460,464 ****
    HTML_Head1($text);
    /* Margins are needed for Netscape */
!   echo "<BODY MARGINWIDTH=0 MARGINHEIGHT=0>\n";
  #  echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
--- 461,465 ----
    HTML_Head1($text);
    /* Margins are needed for Netscape */
!   echo "<BODY MARGINWIDTH=\"0\" MARGINHEIGHT=\"0\">\n";
  #  echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
***************
*** 477,481 ****
      echo "  <TD WIDTH=\"16%\" COLSPAN=2 VALIGN=middle ALIGN=left>&nbsp;<A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
    } else {
!     echo "  <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left><A TARGET=url HREF=\"". $tutos[logolink] ."\"><IMG HEIGHT=40 BORDER=0 SRC=\"". $tutos[logo] ."\" ALT=\"LOGO\" ALIGN=middle></A></TD>\n";
      echo "  <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left>&nbsp;<A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
    }
--- 478,488 ----
      echo "  <TD WIDTH=\"16%\" COLSPAN=2 VALIGN=middle ALIGN=left>&nbsp;<A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
    } else {
!     echo "  <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left>";
!     if ( isset($tutos[logolink]) ) {
!       echo "<A TARGET=url HREF=\"". $tutos[logolink] ."\"><IMG HEIGHT=40 BORDER=0 SRC=\"". $tutos[logo] ."\" ALT=\"LOGO\" ALIGN=middle></A>";
!     } else {
!       echo "<IMG HEIGHT=40 BORDER=0 SRC=\"". $tutos[logo] ."\" ALT=\"LOGO\" ALIGN=middle>";
!     }
!     echo "</TD>\n";
      echo "  <TD WIDTH=\"8%\" VALIGN=middle ALIGN=left>&nbsp;<A CLASS=nodeco HREF=\"../html/copyright.html\">TUTOS</A></TD>\n";
    }
***************
*** 601,604 ****
--- 608,612 ----
        while ( list ($i,$f) = @each ($current_user->teamids) ) {
          if ( count($t[$i]->urllist) > 0 ) {
+           echo "<UL>\n";
            @reset($t[$i]->urllist);
            while ( list ($j,$x) = @each ($t[$i]->urllist) ) {
***************
*** 606,609 ****
--- 614,618 ----
              echo "<LI><A CLASS=nodeco HREF=\"". $x->getUrl() ."\" TARGET=url>". htmlentities($x->name) . "</A><BR>\n";
            }
+           echo "</UL>\n";
          }
        }
***************
*** 640,679 ****
  Function HTML_Close () {
    global $lang;
- #  global $includes, $g_bug,$g_app,$g_adr,$g_com,$g_dep,$g_pro,$g_team, $g_usr, $g_ins, $g_note;
  
    echo "</BODY>\n";
- /* echo "<FONT SIZE=-1>\n"; */
- #  echo makelink("show_source.php?page_url=$PHP_SELF","$PHP_SELF","See the source") ."&nbsp;last modified ";
- #  echo "$PHP_SELF &nbsp;last modified ";
- #  echo Date("H:i d.m.Y",getLastMod());
- #  echo "&nbsp;&nbsp;<B>Copyright 1999/2000 by Gero Kohnert</B>\n";
- /* echo "</FONT>\n"; */
- 
-   /*
-   echo "<ADDRESS>\n";
-   @reset($includes);
-   while( list ($i,$f) = @each ($includes)) {
-     echo "&nbsp;".$i." == ". $f ."<BR>";
-   }
-   echo "Bugs: ". count($g_bug) ."<BR>";
-   echo "Appointments: ". count($g_app) ."<BR>";
-   echo "Addresses: ". count($g_adr) ."<BR>";
-   @reset($g_adr);
-   while( list ($i,$f) = @each ($g_adr)) {
-     echo "&nbsp;".$f->getLink();
-   }
-   echo "<BR>Companies: ". count($g_com) ."<BR>";
-   @reset($g_com);
-   while( list ($i,$f) = @each ($g_com)) {
-     echo "&nbsp;".$f->getLink();
-   }
-   echo "<BR>Departments: ". count($g_dep) ."<BR>";
-   echo "Products: ". count($g_pro) ."<BR>";
-   echo "Installations: ". count($g_ins) ."<BR>";
-   echo "Notes: ". count($g_note) ."<BR>";
-   echo "Teams: ". count($g_team) ."<BR>";
-   echo "User: ". count($g_usr) ."<BR>";
-   echo "</ADDRESS>\n";
-   */
    echo "</HTML>\n";
  }
--- 649,654 ----
***************
*** 775,784 ****
   # $tutos[baseurl] = sprintf("http://%s:%s%s/",
   #                            $SERVER_NAME, $SERVER_PORT, dirname($PHP_SELF);
   if($SERVER_PORT == 443) {
!    $r = sprintf("https://%s%s/",$HTTP_HOST,dirname($PHP_SELF));
   } else if($SERVER_PORT == 80) {
!    $r = sprintf("http://%s%s/",$HTTP_HOST, dirname($PHP_SELF));
   } else {
!    $r = sprintf("http://%s%s/",$HTTP_HOST, dirname($PHP_SELF));
   }
   return $r;
--- 750,763 ----
   # $tutos[baseurl] = sprintf("http://%s:%s%s/",
   #                            $SERVER_NAME, $SERVER_PORT, dirname($PHP_SELF);
+  $dir = dirname($PHP_SELF);
+  if ( $dir == "/" ) {
+    $dir = "";
+  }
   if($SERVER_PORT == 443) {
!    $r = sprintf("https://%s%s/",$HTTP_HOST,$dir);
   } else if($SERVER_PORT == 80) {
!    $r = sprintf("http://%s%s/",$HTTP_HOST, $dir);
   } else {
!    $r = sprintf("http://%s%s/",$HTTP_HOST, $dir);
   }
   return $r;
***************
*** 829,844 ****
      return $faxnr;
    }
- }
- 
- /* ---------------------------------------------------------------------------
-  * get next color for big tables with colored lines
-  *
-  */
- Function get_next_col ( $oldcol ) {
- 
-   if ( $oldcol == "#DDDDDD" ) {
-      return "#CCCCCC";
-    }
-    return "#DDDDDD";
  }
  
--- 808,811 ----

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv32265/php

Modified Files:
	task.pinc task_ins.php 
Log Message:
using query object / transaction lock in _ins

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** task.pinc	2001/10/03 09:23:48	1.48
--- task.pinc	2001/10/24 17:26:49	1.49
***************
*** 47,52 ****
    if ( $to == -1 ) {
      $to   =  new DateTime();
!     $to->setDateTimeTS( NextDay($from->getTimeStamp()) - 12 * 3600);
    }
    $x1 =  $obj->dbconn->DateTime($from);
    $x2 =  $obj->dbconn->DateTime($to);
--- 47,56 ----
    if ( $to == -1 ) {
      $to   =  new DateTime();
!     $to->setDateTimeTS( NextDay($from->getTimeStamp()) );
    }
+ 
+   $from->setDateTime($from->getYYYYMMDD() . "000000");
+   $to->setDateTime($to->getYYYYMMDD() . "000000");
+ 
    $x1 =  $obj->dbconn->DateTime($from);
    $x2 =  $obj->dbconn->DateTime($to);
***************
*** 212,215 ****
--- 216,221 ----
      $this->state       = 0;
      $this->diff        = 0;
+ 
+     $this->tablename   = "tasks";
    }
    /* ---------------------------------------------------------------------------
***************
*** 289,293 ****
      }
  
!     $q = "SELECT * from tasks where id = ". $id;
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
--- 295,299 ----
      }
  
!     $q = "SELECT * from ". $this->tablename ." where id = ". $id;
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
***************
*** 360,413 ****
  
      $msg = "";
-     if ( -1 == $this->id ) {
-       $this->id = $this->dbconn->NextID();
- 
-       $flds = "INSERT INTO tasks (ID";
-       $vals = "VALUES (". $this->id;
- 
-       $flds .= ",WORKER";
-       $vals = sprintf("%s,%d",$vals, $this->worker->id);
- 
-       $flds .= ",CREATOR";
-       $vals = sprintf("%s,%d",$vals, $this->creator->id);
- 
-       $flds .= ",CREATION";
-       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->creation));
- 
-       $flds .= ",P_ID";
-       $vals = sprintf("%s,%d",$vals,$this->p_id);
- 
-       $flds .= ",STATUS";
-       $vals = sprintf("%s,%d",$vals,$this->state);
  
!       $flds .= ",VOLUME";
!       $vals = sprintf("%s,%f",$vals,$this->volume);
  
! #      $flds .= ",VOLUME_DONE";
! #      $vals = sprintf("%s,%f",$vals,$this->volume_done);
! 
!       $flds .= ",NAME";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->String($this->name));
! 
!       $flds .= ",DESCRIPTION";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->String($this->desc));
! 
!       $flds .= ",R_START";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->r_start));
! 
!       $flds .= ",R_END";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->r_end));
! 
!       $flds .= ",S_START";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->s_start));
! 
!       $flds .= ",S_END";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->s_end));
! 
  
!       $flds .= " )";
!       $vals .= " )";
  
-       $q = $flds ." ".  $vals;
        # Defaut Access Control (get parents acl as default)
        $this->acl  = $this->parent->acl;
--- 366,390 ----
  
      $msg = "";
  
!     $q = new query($this->dbconn);
!     $q->setTable($this->tablename);
!     $q->addFV("worker",$this->worker->id,"");
!     $q->addFV("p_id",$this->p_id,"");
!     $q->addFV("status",$this->state,"");
!     $q->addFV("volume",$this->volume,"FLOAT");
!     $q->addFV("name",$this->name,"STRING");
!     $q->addFV("description",$this->desc,"STRING");
!     $q->addFV("r_start",$this->r_start,"DATETIME");
!     $q->addFV("r_end",$this->r_end,"DATETIME");
!     $q->addFV("s_start",$this->s_start,"DATETIME");
!     $q->addFV("s_end",$this->s_end,"DATETIME");
  
!     if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
!       $q->addFV("creator",$this->creator->id,"");
!       $q->addFV("creation",$this->creation,"DATETIME");
  
!       $query = $q->getInsert();
  
        # Defaut Access Control (get parents acl as default)
        $this->acl  = $this->parent->acl;
***************
*** 424,452 ****
                                  );
      } else {
!       $q = "UPDATE tasks SET";
!       $q .= " NAME = ". $this->dbconn->String($this->name);
!       $q .= ",DESCRIPTION = ". $this->dbconn->String($this->desc);
!       $q .= ",VOLUME = ". $this->volume ;
!       # volume_done is deprecated and now using timetracks
!       # $q .= ",VOLUME_DONE = ". $this->volume_done ;
!       $q .= ",VOLUME_DONE = NULL" ;
!       $q .= ",STATUS = ". $this->state ;
!       $q .= ",WORKER = ". $this->worker->id ;
!       $q .= ",S_START = ". $this->dbconn->DateTime($this->s_start)  ;
!       $q .= ",S_END = ". $this->dbconn->DateTime($this->s_end)  ;
!       $q .= ",R_START = ". $this->dbconn->DateTime($this->r_start)  ;
!       $q .= ",R_END = ". $this->dbconn->DateTime($this->r_end)  ;
!       $q .= " WHERE id = ". $this->id;
      }
      acl_raise($this,$this->worker->id,$tutos[modok]);
      acl_raise($this,$this->creator->id,$tutos[delok]);
  
!     $this->dbconn->Begin("WORK");
!     $this->dbconn->Exec($q);
      $msg .= acl_save($this);
      $msg .= history_save($this);
  	$msg .= resource_save($this);
  
-     $this->dbconn->Commit("WORK");
  
      if ( ($this->diff != 0) && ($this->worker->getType() == "address") ) {
--- 401,415 ----
                                  );
      } else {
!       $q->addWC("id",$this->id,"");
!       $query = $q->getUpdate();
      }
      acl_raise($this,$this->worker->id,$tutos[modok]);
      acl_raise($this,$this->creator->id,$tutos[delok]);
  
!     $this->dbconn->Exec($query);
      $msg .= acl_save($this);
      $msg .= history_save($this);
  	$msg .= resource_save($this);
  
  
      if ( ($this->diff != 0) && ($this->worker->getType() == "address") ) {
***************
*** 475,482 ****
  
  
!     $q = "UPDATE tasks SET p_id = ". $this->p_id ." WHERE p_id = ". $this->id;
      $this->dbconn->Exec($q);
  
!     $q = "DELETE FROM tasks WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
--- 438,445 ----
  
  
!     $q = "UPDATE ". $this->tablename ." SET p_id = ". $this->p_id ." WHERE p_id = ". $this->id;
      $this->dbconn->Exec($q);
  
!     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  

Index: task_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** task_ins.php	2001/09/10 16:35:44	1.12
--- task_ins.php	2001/10/24 17:26:49	1.13
***************
*** 133,137 ****
     $t->s_end = $s_end;
  
!    $msg = $t->save();
  
     $gotourl= $t->getURL();
--- 133,139 ----
     $t->s_end = $s_end;
  
!    $dbconn->Begin("WORK");
!    $msg .= $t->save();
!    $dbconn->Commit("WORK");
  
     $gotourl= $t->getURL();

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv31940/php

Modified Files:
	team.pinc team_ins.php 
Log Message:
using query object / better history support

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** team.pinc	2001/09/19 20:47:29	1.34
--- team.pinc	2001/10/24 17:25:59	1.35
***************
*** 21,24 ****
--- 21,26 ----
      $this->creation =  new DateTime();
      $this->member   = array();
+ 
+     $this->tablename = "teams";
    }
    /* ---------------------------------------------------------------------------
***************
*** 57,61 ****
        $g_team[$this->id] = $this;
      } else {
!       $query = "SELECT * FROM teams WHERE id = ". $id;
        $result = $this->dbconn->Exec($query);
        $n = $result->numrows();
--- 59,63 ----
        $g_team[$this->id] = $this;
      } else {
!       $query = "SELECT * FROM ". $this->tablename ." WHERE id = ". $id;
        $result = $this->dbconn->Exec($query);
        $n = $result->numrows();
***************
*** 211,214 ****
--- 213,227 ----
    }
    /* ---------------------------------------------------------------------------
+    * set the team name
+    */
+   function setName($new) {
+     $new = trim($new);
+     if ( $this->name != $new ) {
+       $this->modified[] = array ( "field" => "Team" , "old" => $this->name , "new" => $new  );
+       $this->name = $new;
+     }
+     return;
+   }
+   /* ---------------------------------------------------------------------------
     * Save the tema info
     */
***************
*** 217,224 ****
  
      $msg = "";
  
      if ( $this->id == -1 ) {
!       $this->id = $this->dbconn->NextID();
!       $q = "INSERT INTO teams (id,name,owner,creation) VALUES (". $this->id .",". $this->dbconn->String($this->name) .",". $this->owner->id .",". $this->dbconn->DateTime($this->creation) .")";
  
        acl_default($this,$current_user);
--- 230,243 ----
  
      $msg = "";
+     $q = new query($this->dbconn);
+     $q->setTable($this->tablename);
+     $q->addFV("name",$this->name,"STRING");
+     $q->addFV("owner",$this->owner->id,"");
  
      if ( $this->id == -1 ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
!       $q->addFV("creation",$this->creation,"DATETIME");
! 
!       $query = $q->getInsert();
  
        acl_default($this,$current_user);
***************
*** 230,237 ****
                                  );
      } else {
!       $q = "UPDATE teams SET name = ". $this->dbconn->String($this->name) .", owner = ". $this->owner->id ." WHERE id = ". $this->id;
      }
  
!     $this->dbconn->Exec($q);
  
      if ( $add != "" ) {
--- 249,257 ----
                                  );
      } else {
!       $q->addWC("id",$this->id,"");
!       $query = $q->getUpdate();
      }
  
!     $this->dbconn->Exec($query);
  
      if ( $add != "" ) {
***************
*** 251,255 ****
        @reset($del);
        while( list ($i,$f) = @each ($del)) {
!         $q = "DELETE FROM adrteam WHERE adr_id = $f AND team_id = $this->id";
          $r = $this->dbconn->Exec($q);
          acl_set($this,$f,0);
--- 271,275 ----
        @reset($del);
        while( list ($i,$f) = @each ($del)) {
!         $q = "DELETE FROM adrteam WHERE adr_id = ". $f ." AND team_id = ". $this->id;
          $r = $this->dbconn->Exec($q);
          acl_set($this,$f,0);
***************
*** 275,279 ****
      $msg = "";
  
!     $q = "DELETE FROM teams WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
--- 295,299 ----
      $msg = "";
  
!     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  

Index: team_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** team_ins.php	2001/09/19 20:47:29	1.10
--- team_ins.php	2001/10/24 17:25:59	1.11
***************
*** 60,65 ****
   }
   if ( $msg == "" ) {
!    $t->name     = $name;
!    $t->owner    = new tutos_address($dbconn);
     $t->owner->read($owner);
    
--- 60,65 ----
   }
   if ( $msg == "" ) {
!    $t->SetName($name);
!    $t->owner = new tutos_address($dbconn);
     $t->owner->read($owner);
    

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv30707/php

Modified Files:
	note.pinc mytutos.php calendar_week.php calendar.php 
Log Message:
show reminding notes in calendars

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** note.pinc	2001/10/03 09:24:27	1.43
--- note.pinc	2001/10/24 17:21:53	1.44
***************
*** 8,11 ****
--- 8,58 ----
   */
  
+ /* --------------------------------------------------------------------------
+  * support function for readNotesCal
+  * author J.Baten
+  */
+ function addNotesCal(&$obj, &$r,&$from) {
+   $n = $r->NumRows($r);
+   $a = 0;
+   while ( $a < $n ) {
+ 
+     $o = new note($obj->dbconn);
+     $o->read_result($r,$a);
+     $a++;
+ 
+     if ( ! $o->see_ok() ) {
+       continue;
+     }
+     $obj->callist[] = $o;
+   }
+ }
+ /*
+  * Reading Notes for the calendar
+  * author J.Baten
+  */
+ function readNotesCal(&$obj, &$from) {
+ # read notes to display in calendar.
+ 
+   $to   =  new DateTime();
+   $to->setDateTimeTS( NextDay($from->getTimeStamp()) - 12 * 3600 );
+ 
+   $from->setDateTime($from->getYYYYMMDD() . "000000");
+   $to->setDateTime($to->getYYYYMMDD() . "000000");
+ 
+   $x1 =  $obj->dbconn->DateTime($from);
+   $x2 =  $obj->dbconn->DateTime($to);
+   #
+   # First query
+   #
+   $q = "SELECT n.* FROM notes n WHERE ";
+   $q .= "  (remember < ". $x2 ." AND remember >= ". $x1 .")";
+   $q .= "AND creator = ". $obj->id ." ORDER by remember";
+ 
+   $result = $obj->dbconn->Exec($q);
+   /* Create all Notes */
+   addNotesCal($obj,$result,$from);
+   $result->free();
+ }
+ 
  /* ---------------------------------------------------------------------------
   * delete note entries for a object
***************
*** 170,173 ****
--- 217,229 ----
      return "no link";
    }
+   /* ---------------------------------------------------------------------------
+    */
+   /* added by J. Baten */
+   function formatted () {
+     global $lang,$tutos,$current_user;
+ 
+     echo "<TR><TD COLSPAN=3  bgcolor='yellow'>". $this->getLink() ."</TD></TR>\n";
+   }
+ 
    /* ---------------------------------------------------------------------------
     * Popup for overlib

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** mytutos.php	2001/09/19 20:51:38	1.38
--- mytutos.php	2001/10/24 17:21:53	1.39
***************
*** 81,86 ****
       $adr->callist = array();
       readAppsCal($adr,$from);
!      readTaskCal($adr,$from);
! 
       echo "<TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
  
--- 81,90 ----
       $adr->callist = array();
       readAppsCal($adr,$from);
!      if ( ($current_user->p[usetaskmanagement] == 1) && ($tutos[usetaskmanagement] == 1) ) {
!        readTaskCal($adr,$from);
!      }
!      if ( ($current_user->p[usenotes] == 1) && ($tutos[usenotes] == 1) ) {
!        readNotesCal($adr,$from);
!      }
       echo "<TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
  

Index: calendar_week.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_week.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** calendar_week.php	2001/09/10 16:43:22	1.3
--- calendar_week.php	2001/10/24 17:21:53	1.4
***************
*** 13,16 ****
--- 13,17 ----
   include("bug.pinc");
   include("timetrack.pinc");
+  include("note.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 56,60 ****
       $current_user->callist = array();
       readAppsCal($current_user,$from);
!      readTaskCal($current_user,$from);
  
  	 if ( $col == 1 ) {
--- 57,66 ----
       $current_user->callist = array();
       readAppsCal($current_user,$from);
!      if ( ($current_user->p[usetaskmanagement] == 1) && ($tutos[usetaskmanagement] == 1) ) {
!        readTaskCal($current_user,$from);
! 	 }
!      if ( ($current_user->p[usenotes] == 1) && ($tutos[usenotes] == 1) ) {
!        readNotesCal($current_user,$from);
!      }
  
  	 if ( $col == 1 ) {

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** calendar.php	2001/09/19 20:50:10	1.31
--- calendar.php	2001/10/24 17:21:53	1.32
***************
*** 8,11 ****
--- 8,12 ----
   include("product.pinc");
   include("resource.pinc");
+  include("note.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 160,165 ****
       $current_user->callist = array();
       readAppsCal($current_user,$from);
! 
! 
       $hastable = 0;
  
--- 161,167 ----
       $current_user->callist = array();
       readAppsCal($current_user,$from);
!      if ( ($current_user->p[usenotes] == 1) && ($tutos[usenotes] == 1) ) {
!        readNotesCal($current_user,$from);
!      }
       $hastable = 0;
  
***************
*** 171,194 ****
  		 /* if user is not interessted in - show nothing */
  	     $found = 0;
!          if ( ! isset($uids[0])  ) {
!            @reset($apo->participant);
!            while ( list ($i,$f) = @each ($apo->participant) ) {
!              @reset($uids);
!              while ( list ($i1,$f1) = @each ($uids) ) {
!                if (  ($f->id == $i1) && ($f1 == 1) ) {
!                  $found = "$i1";
!                  break;
                 }
               }
             }
!          } else {
!            $found = 1;
!          }
! 
!          if ( $found == 0 ) {
!            /* Show nothing */
!            $a++;
!            continue;
!          }
  
           if ( $hastable == 0 ) {
--- 173,197 ----
  		 /* if user is not interessted in - show nothing */
  	     $found = 0;
! 	     if ( $apo->gettype() == "appointment" ) {
!            if ( ! isset($uids[0])  ) {
!              @reset($apo->participant);
!              while ( list ($i,$f) = @each ($apo->participant) ) {
!                @reset($uids);
!                while ( list ($i1,$f1) = @each ($uids) ) {
!                  if (  ($f->id == $i1) && ($f1 == 1) ) {
!                    $found = "$i1";
!                    break;
!                  }
                 }
               }
+            } else {
+              $found = 1;
             }
!            if ( $found == 0 ) {
!              /* Show nothing */
!              $a++;
!              continue;
!            }
! 		 }
  
           if ( $hastable == 0 ) {
***************
*** 208,211 ****
--- 211,215 ----
         }
       }
+ 
       if ( $hastable == 1 ) {
          if ( $tutos[caltable] == 2 ) {

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv30003/php

Modified Files:
	installation.pinc installation_ins.php 
Log Message:
using query object / transaction block in _ins

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** installation.pinc	2001/09/19 20:47:29	1.33
--- installation.pinc	2001/10/24 17:19:29	1.34
***************
*** 105,108 ****
--- 105,110 ----
      $this->salesdate= new DateTime();
      $this->instdate= new DateTime();
+ 
+     $this->tablename = "installations";
    }
    /* ---------------------------------------------------------------------------
***************
*** 119,123 ****
      }
  
!     $query = "SELECT * FROM installations WHERE id = ". $id;
      $result = $this->dbconn->Exec($query);
      $n = $result->numrows();
--- 121,125 ----
      }
  
!     $query = "SELECT * FROM ". $this->tablename ." WHERE id = ". $id;
      $result = $this->dbconn->Exec($query);
      $n = $result->numrows();
***************
*** 339,376 ****
  
      $msg = "";
      if ( -1 == $this->id ) {
!       $this->id = $this->dbconn->NextID();
!       $flds = "id";
!       $vals = $this->id;
! 
!       $flds = sprintf("%s,product_id",$flds);
!       $vals = sprintf("%s,%s",$vals,$this->product->id);
! 
!       $flds = sprintf("%s,customer_id",$flds);
!       $vals = sprintf("%s,%s",$vals,$this->customer->id);
! 
!       if ( !empty($this->money) ) {
!         $flds = sprintf("%s,money",$flds);
!         $vals = sprintf("%s,%s",$vals,$this->money);
!       }
!       $flds = sprintf("%s,currency",$flds);
!       $vals = sprintf("%s,'%s'",$vals,$this->currency);
! 
!       $flds = sprintf("%s,instdate",$flds);
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->instdate));
! 
!       if ( $this->installer->id > 0 ) {
!         $flds = sprintf("%s,installer_id",$flds);
!         $vals = sprintf("%s,%s",$vals,$this->installer->id);
!       }
!       $flds = sprintf("%s,salesdate",$flds);
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->salesdate));
! 
!       if ( $this->seller->id > 0 ) {
!         $flds = sprintf("%s,seller_id",$flds);
!         $vals = sprintf("%s,%s",$vals,$this->seller->id);
!       }
  
-       $q = "INSERT INTO installations ($flds) VALUES ($vals)";
  
        # Defaut Access Control
--- 341,371 ----
  
      $msg = "";
+     $q = new query($this->dbconn);
+     $q->setTable($this->tablename);
+     $q->addFV("product_id",$this->product->id,"");
+     $q->addFV("customer_id",$this->customer->id,"");
+     $q->addFV("instdate",$this->instdate,"DATETIME");
+     $q->addFV("salesdate",$this->salesdate,"DATETIME");
+     $q->addFV("currency",$this->currency,"STRING");
+     if ( !empty($this->money) ) {
+       $q->addFV("money",$this->money,"FLOAT");
+     } else {
+       $q->addFV("money","null");
+ 	}
+     if ( $this->installer->id > 0 ) {
+       $q->addFV("installer_id",$this->installer->id,"");
+     } else {
+       $q->addFV("installer_id","null");
+     }
+     if ( $this->seller->id > 0 ) {
+       $q->addFV("seller_id",$this->seller->id,"");
+     } else {
+       $q->addFV("seller_id","null");
+     }
+ 
      if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
!       $query = $q->getInsert();
  
  
        # Defaut Access Control
***************
*** 393,417 ****
                                  );
      } else {
!       $q = "UPDATE installations SET ";
!       $q =  sprintf("%s product_id = %d", $q,$this->product->id );
!       if ( !empty($this->money) ) {
!         $q =  sprintf("%s,money = %f", $q,$this->money );
!       }
!       $q =  sprintf("%s,currency = '%s'", $q,$this->currency );
!       if ( $this->installer->id > 0 ) {
!         $q =  sprintf("%s,installer_id = %d", $q,$this->installer->id );
!       } else {
!         $q =  sprintf("%s,installer_id = null", $q );
!       }
!       if ( $this->seller->id > 0 ) {
!         $q =  sprintf("%s,seller_id = %d", $q,$this->seller->id );
!       } else {
!         $q =  sprintf("%s,seller_id = null", $q );
!       }
!       $q =  sprintf("%s,customer_id = %d", $q,$this->customer->id );
!       $q =  sprintf("%s,salesdate = %s", $q,$this->dbconn->DateTime($this->salesdate) );
!       $q =  sprintf("%s,instdate = %s", $q,$this->dbconn->DateTime($this->instdate) );
! 
!       $q =  sprintf("%s WHERE id = %d", $q,$this->id );
      }
  
--- 388,393 ----
                                  );
      } else {
!       $q->addWC("id",$this->id,"");
!       $query = $q->getUpdate();
      }
  
***************
*** 426,436 ****
      }
  
!     $this->dbconn->Begin("WORK");
!     $this->dbconn->Exec($q);
      $msg .= acl_save($this);
      $msg .= history_save($this);
  	$msg .= resource_save($this);
  
-     $this->dbconn->Commit("WORK");
      return $msg;
    }
--- 402,410 ----
      }
  
!     $this->dbconn->Exec($query);
      $msg .= acl_save($this);
      $msg .= history_save($this);
  	$msg .= resource_save($this);
  
      return $msg;
    }
***************
*** 446,450 ****
      $this->dbconn->Lock("timetrack");
  
!     $q = "DELETE FROM installations WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
--- 420,424 ----
      $this->dbconn->Lock("timetrack");
  
!     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** installation_ins.php	2001/10/06 18:09:20	1.10
--- installation_ins.php	2001/10/24 17:19:29	1.11
***************
*** 95,99 ****
--- 95,102 ----
     }
  
+    $dbconn->Begin("WORK");
     $msg .= $i->save();
+    $dbconn->Commit("WORK");
+ 
     $gotourl = $i->getUrl();
   }

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv29573/php

Modified Files:
	timetrack.pinc timetrack_ins.php 
Log Message:
using query object / transaction block in _ins

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** timetrack.pinc	2001/09/19 20:47:29	1.19
--- timetrack.pinc	2001/10/24 17:17:55	1.20
***************
*** 13,16 ****
--- 13,17 ----
  Function timetrack_delete_obj(&$obj) {
    $msg = "";
+ 
    # FIXME (mybe we should rebook the efforts to the user himself) !!
    $q = "DELETE FROM timetrack WHERE link_id = ". $obj->id;
***************
*** 63,66 ****
--- 64,69 ----
      $this->wday     = new DateTime();
      $this->creation = new DateTime();
+ 
+     $this->tablename = "timetrack";
    }
    /* ---------------------------------------------------------------------------
***************
*** 101,105 ****
      }
  
!     $q = "SELECT * FROM timetrack WHERE id =". $id;
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
--- 104,108 ----
      }
  
!     $q = "SELECT * FROM ". $this->tablename ." WHERE id =". $id;
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
***************
*** 118,152 ****
  
      $msg = "";
!     unset ($this->modified);
! 
!     if ( -1 == $this->id ) {
!       $this->id = $this->dbconn->NextID();
! 
!       $flds = "id";
!       $vals = $this->id;
! 
!       $flds .= ",link_id";
!       $vals .= ",". $this->link_id;
  
-       $flds .= ",adr_id";
-       $vals .= ",". $this->worker->id;
  
!       $flds .= ",volume";
!       $vals .= ",". $this->volume;
! 
!       $flds .= ",description";
!       $vals .= ",". $this->dbconn->String($this->desc);
! 
! #      $flds = $flds .",creator";
! #      $vals = $vals .",". $this->creator->id;
! 
! 
!       $flds .= ",vtime";
!       $vals .= ",". $this->dbconn->DateTime($this->wday);
  
!       $flds .= ",creation";
!       $vals .= ",". $this->dbconn->DateTime($this->creation);
  
!       $q = "INSERT INTO timetrack (". $flds .") VALUES (". $vals .")";
  
        # Prepare the history
--- 121,140 ----
  
      $msg = "";
!     $q = new query($this->dbconn);
!     $q->setTable($this->tablename);
!     $q->addFV("link_id",$this->link_id,"");
!     $q->addFV("adr_id",$this->worker->id,"");
!     $q->addFV("volume",$this->volume,"FLOAT");
!     $q->addFV("description",$this->desc,"STRING");
!     $q->addFV("vtime",$this->wday,"DATETIME");
  
  
!     unset ($this->modified);
  
!     if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
!       $q->addFV("creation",$this->creation,"DATETIME");
  
!       $query = $q->getInsert();
  
        # Prepare the history
***************
*** 162,171 ****
                                  );
      } else {
!       $q = "UPDATE timetrack SET ";
!       $q .= " description = ". $this->dbconn->String($this->desc);
!       $q .= ",volume = ". $this->volume;
!       $q .= ",vtime = ". $this->dbconn->DateTime($this->wday);
!       $q .= ",adr_id = ". $this->worker->id;
!       $q .= " WHERE id = ". $this->id;
  
        # Prepare the history FIX ME !!
--- 150,155 ----
                                  );
      } else {
!       $q->addWC("id",$this->id,"");
!       $query = $q->getUpdate();
  
        # Prepare the history FIX ME !!
***************
*** 177,184 ****
      }
  
!     $this->dbconn->Begin("WORK");
!     $this->dbconn->Exec($q);
      $msg .= history_save($this);
-     $this->dbconn->Commit("WORK");
  
      return $msg;
--- 161,166 ----
      }
  
!     $this->dbconn->Exec($query);
      $msg .= history_save($this);
  
      return $msg;
***************
*** 190,194 ****
      $msg = "";
  
!     $q = "DELETE FROM timetrack WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
--- 172,176 ----
      $msg = "";
  
!     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  

Index: timetrack_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** timetrack_ins.php	2001/10/06 18:09:20	1.10
--- timetrack_ins.php	2001/10/24 17:17:55	1.11
***************
*** 72,76 ****
  
   if ( $msg == "" ) {
!    $msg = $tt->save();
     $gotourl = $tt->ref->getURL();
   }
--- 72,80 ----
  
   if ( $msg == "" ) {
! 
!    $dbconn->Begin("WORK");
!    $msg .= $tt->save();
!    $dbconn->Commit("WORK");
! 
     $gotourl = $tt->ref->getURL();
   }

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv29441/php

Modified Files:
	resource.pinc resource_ins.php 
Log Message:
using query object / transaction block in _ins

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** resource.pinc	2001/09/19 20:48:33	1.20
--- resource.pinc	2001/10/24 17:17:20	1.21
***************
*** 139,142 ****
--- 139,144 ----
      $this->creation = new DateTime();
      $this->ulist    = array();
+ 
+     $this->tablename = "resources";
    }
    /* ---------------------------------------------------------------------------
***************
*** 154,158 ****
      }
  
!     $q = "SELECT * from resources WHERE id = ". $id;
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
--- 156,160 ----
      }
  
!     $q = "SELECT * from ". $this->tablename ." WHERE id = ". $id;
      $r = $this->dbconn->Exec($q);
      $n = $r->numrows();
***************
*** 273,296 ****
  
      $msg = "";
- 
-     if ( -1 == $this->id ) {
-       $this->id = $this->dbconn->NextID();
- 
-       $flds = "id";
-       $vals = $this->id;
  
!       $flds .= ",name";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->String($this->name));
  
!       $flds .= ",description";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->String($this->desc));
! 
!       $flds .= ",creation";
!       $vals = sprintf("%s,%s",$vals,$this->dbconn->DateTime($this->creation));
! 
!       $flds .= ",creator";
!       $vals = sprintf("%s,%d",$vals,$this->creator->id);
  
!       $q = "INSERT INTO resources (". $flds .") VALUES (". $vals .")";
  
        $this->acl[$this->creator->id] = $tutos[delok];
--- 275,290 ----
  
      $msg = "";
  
!     $q = new query($this->dbconn);
!     $q->setTable($this->tablename);
!     $q->addFV("name",$this->name,"STRING");
!     $q->addFV("description",$this->desc,"STRING");
  
!     if ( -1 == $this->id ) {
!       $this->id = $q->addFV("id",-1,"NEXTID");
!       $q->addFV("creator",$this->creator->id,"");
!       $q->addFV("creation",$this->creation,"DATETIME");
  
!       $query = $q->getInsert();
  
        $this->acl[$this->creator->id] = $tutos[delok];
***************
*** 303,318 ****
                                  );
      } else {
!       $q = "UPDATE resources SET";
! 
!       $q .= " description = ". $this->dbconn->String($this->desc);
!       $q .= ",name = ". $this->dbconn->String($this->name);
!       $q .= " WHERE id = ". $this->id ;
      }
  
!     $this->dbconn->Begin("WORK");
!     $result = $this->dbconn->Exec($q);
      $msg .= acl_save($this);
      $msg .= history_save($this);
-     $this->dbconn->Commit("WORK");
  
      return $msg;
--- 297,307 ----
                                  );
      } else {
!       $q->addWC("id",$this->id,"");
!       $query = $q->getUpdate();
      }
  
!     $this->dbconn->Exec($query);
      $msg .= acl_save($this);
      $msg .= history_save($this);
  
      return $msg;
***************
*** 324,328 ****
      $msg = "";
  
!     $q = "DELETE FROM resources WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  
--- 313,317 ----
      $msg = "";
  
!     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
      $this->dbconn->Exec($q);
  

Index: resource_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource_ins.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** resource_ins.php	2001/09/10 16:37:54	1.5
--- resource_ins.php	2001/10/24 17:17:21	1.6
***************
*** 32,36 ****
     $b->name = $name;
     $b->desc = $desc;
!    $msg = $b->save();
     $gotourl = $b->getURL();
   }
--- 32,40 ----
     $b->name = $name;
     $b->desc = $desc;
! 
!    $dbconn->Begin("WORK");
!    $msg .= $b->save();
!    $dbconn->Commit("WORK");
! 
     $gotourl = $b->getURL();
   }

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv29028/php

Modified Files:
	address_show.php address.pinc 
Log Message:
removed comments from vcards

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** address_show.php	2001/09/27 19:40:20	1.20
--- address_show.php	2001/10/24 17:15:52	1.21
***************
*** 2,5 ****
--- 2,8 ----
  /*
   * Copyright 1999/2000 by Gero Kohnert
+  *
+  *   CVS Info:  $Id$
+  *   $Author$
   */
   include("webelements.p3");
***************
*** 217,222 ****
   $dbconn->Close();
  ?>
- <!--
-     CVS Info:  $Id$
-     $Author$
- -->
--- 220,221 ----

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** address.pinc	2001/09/30 18:39:06	1.48
--- address.pinc	2001/10/24 17:15:52	1.49
***************
*** 535,578 ****
      $this->read_locs_data();
      $ical = "";
!     $ical = $ical . "BEGIN:VCARD\n";
!     $ical = $ical . "VERSION:2.1\n";
!     $ical = $ical . "N:" . $this->l_name .";". $this->f_name ."\n";
!     $ical = $ical . "FN:" . $this->getFullName() ."\n";
      if ( isset($this->location) && (count($this->location) > 0) ) {
        @reset($this->location);
        while( list ($i,$f) = @each ($this->location)) {
! 	if ( $f->email_1 != "" ) {
! 	  $ical = $ical . "EMAIL;TYPE=INTERNET:" . $f->email_1 ."\n";
! 	}
! 	if ( $f->email_2 != "" ) {
! 	  $ical = $ical . "EMAIL;TYPE=INTERNET:" . $f->email_2 ."\n";
! 	}
! 	if ( $f->phone_1 != "" ) {
! 	  if ( $f->category == 2 ) {
! 	    $ical = $ical . "TEL;TYPE=WORK:" . $f->phone_1 ."\n";
! 	  } else {
! 	    $ical = $ical . "TEL;TYPE=HOME:" . $f->phone_1 ."\n";
! 	  }
! 	}
! 	if ( $f->phone_2 != "" ) {
! 	  if ( $f->category == 2 ) {
! 	    $ical = $ical . "TEL;TYPE=WORK:" . $f->phone_2 ."\n";
! 	  } else {
! 	    $ical = $ical . "TEL;TYPE=HOME:" . $f->phone_2 ."\n";
! 	  }
! 	}
! 	if ( $f->fax_1 != "" ) {
! 	  if ( $f->category == 2 ) {
! 	    $ical = $ical . "TEL;TYPE=WORK,FAX:" . $f->fax_1 ."\n";
! 	  } else {
! 	    $ical = $ical . "TEL;TYPE=HOME,FAX:" . $f->fax_1 ."\n";
! 	  }
! 	}
! 	if ( ($f->company->id != -1) && ($f->company->name != "") ) {
! 	  $ical = $ical . "ORG:" . $f->company->name ."\n";
! 	}
        }
      }
!     $ical = $ical . "END:VCARD\n";
      return $ical;
    }
--- 535,578 ----
      $this->read_locs_data();
      $ical = "";
!     $ical .= "BEGIN:VCARD\n";
!     $ical .= "VERSION:2.1\n";
!     $ical .= "N:" . $this->l_name .";". $this->f_name ."\n";
!     $ical .= "FN:" . $this->getFullName() ."\n";
      if ( isset($this->location) && (count($this->location) > 0) ) {
        @reset($this->location);
        while( list ($i,$f) = @each ($this->location)) {
!         if ( $f->email_1 != "" ) {
!           $ical .= "EMAIL;TYPE=INTERNET:" . $f->email_1 ."\n";
!         }
!         if ( $f->email_2 != "" ) {
!           $ical .= "EMAIL;TYPE=INTERNET:" . $f->email_2 ."\n";
!         }
!         if ( $f->phone_1 != "" ) {
!           if ( $f->category == 2 ) {
!             $ical .= "TEL;TYPE=WORK:" . $f->phone_1 ."\n";
!           } else {
!             $ical .= "TEL;TYPE=HOME:" . $f->phone_1 ."\n";
!           }
!         }
!         if ( $f->phone_2 != "" ) {
!           if ( $f->category == 2 ) {
!             $ical .= "TEL;TYPE=WORK:" . $f->phone_2 ."\n";
!           } else {
!             $ical .= "TEL;TYPE=HOME:" . $f->phone_2 ."\n";
!           }
!         }
!         if ( $f->fax_1 != "" ) {
!           if ( $f->category == 2 ) {
!             $ical .= "TEL;TYPE=WORK,FAX:" . $f->fax_1 ."\n";
!           } else {
!             $ical .= "TEL;TYPE=HOME,FAX:" . $f->fax_1 ."\n";
!           }
! 	    }
!         if ( ($f->company->id != -1) && ($f->company->name != "") ) {
!           $ical .= "ORG:" . $f->company->name ."\n";
!         }
        }
      }
!     $ical .= "END:VCARD\n";
      return $ical;
    }