tutos-commits Mailing List for TUTOS

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

Modified Files:
	mail.pinc 
Log Message:
fix


Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- mail.pinc	27 Feb 2004 08:16:06 -0000	1.68
+++ mail.pinc	27 Feb 2004 18:48:18 -0000	1.69
@@ -421,7 +421,10 @@
       } else if (eregi("^Importance:(.*)",$line,$reg)) {
         $this->parse_in = "";
         $this->hdr[] = $line;
-      } else if (ereg("^MIME-Version:(.*)",$line,$reg)) {
+      } else if (eregi("^Content-Id:(.*)",$line,$reg)) {
+        $this->parse_in = "";
+        $this->hdr[] = $line;
+      } else if (eregi("^MIME-Version:(.*)",$line,$reg)) {
         $this->parse_in = "";
         $this->hdr[] = $line;
       } else if (eregi("^Return-Path:(.*)",$line,$reg)) {

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

Modified Files:
	ToDo 
Log Message:
update

Index: ToDo
===================================================================
RCS file: /cvsroot/tutos/tutos/ToDo,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ToDo	31 Dec 2003 17:09:38 -0000	1.40
+++ ToDo	27 Feb 2004 18:08:25 -0000	1.41
@@ -206,7 +206,7 @@
   DONE
 
 Move Efforts from one Object to another (like Bugs/Tasks)
-
+ DONE 20040225  
 
 Minical for Jump in calendars
 
@@ -235,20 +235,29 @@
 
 
 Address new in one step including a location
-  DONE
+  DONE 200401
 
 Occupied flag in appointments
 
 Voting for groups (showing a percentage in overview)
 
 Some concept for making demodata (via scheme.php) for modules
+ DONE
 
 Using LIMIT (or similar stuff) in select statements
+ Partly
 
 NIS Support
 
 Repeating events with resources and reminders
 
+Add a MyGroups to the default acl dialog
+  this will automatically expand to all the teams of the creator 
+  when a new object is define
+ DONE 20040226
+
+A reminder modul
+  like the reminders for notes but attachable everywhere
 #
 #
 # EOF

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

Modified Files:
	appointment.pinc 
Log Message:
Hotfix removed!

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- appointment.pinc	26 Feb 2004 15:11:54 -0000	1.165
+++ appointment.pinc	27 Feb 2004 08:50:56 -0000	1.166
@@ -498,9 +498,8 @@
     global $lang;
 
     
-    #$url = getBaseURL(true). $this->getURL();  //no proper url was generated
-    $url = getBaseURL(false). $this->getURL();
-    
+    $url = getBaseURL(true). $this->getURL();
+        
     $body = eregi_replace("@CREATOR@",$this->creator->getFullName(),$body);
     $body = eregi_replace("@DESC@",$this->descr,$body);
     $body = eregi_replace("@URL@",$url,$body);
@@ -524,9 +523,8 @@
     }
 
     if ( ($this->trace == 1) && ($to->gettype() != "team") ) {
-      #$urlv = getBaseURL(true) ."app_vote.php?id=". $this->id ."&adr_id=".$to->id; //no proper url was generated
-      $urlv = getBaseURL(false) ."app_vote.php?id=". $this->id ."&adr_id=".$to->id;
-
+      $urlv = getBaseURL(true) ."app_vote.php?id=". $this->id ."&adr_id=".$to->id;
+      
       $body = eregi_replace("@URLV@",$urlv,$body);
       $body = eregi_replace("<VOTE>","",$body);
       $body = eregi_replace("</VOTE>","",$body);

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

Modified Files:
	mail.pinc 
Log Message:
fix


Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mail.pinc	25 Feb 2004 19:28:12 -0000	1.67
+++ mail.pinc	27 Feb 2004 08:16:06 -0000	1.68
@@ -207,8 +207,11 @@
       $show_as_img = true;
     } elseif (eregi("^application",$this->contenttype)) {
       $show_headline = true;
+    } elseif (eregi("^audio",$this->contenttype)) {
+      $show_headline = true;
     } else {
       $r .= "Unknown|".$this->contenttype."|<br>\n";
+      $show_headline = true;
     }
 
     if(!$skip && ($mformat == "download") ) {

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

Modified Files:
	app_new.php 
Log Message:
fix


Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- app_new.php	4 Aug 2003 20:11:55 -0000	1.54
+++ app_new.php	26 Feb 2004 18:30:27 -0000	1.55
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2003 by Gero Kohnert
+ * Copyright 1999 - 2004 by Gero Kohnert
  *
  * Editing of "normal" (not repeatig) appointments
  *
@@ -128,7 +128,7 @@
 
      echo "</tr><tr>\n";
      echo $this->showfield($lang['Description'],0,"descr");
-	 echo $this->textarea("descr",5,$table['appointment1']['description'][size],$this->obj->descr);
+     echo $this->textarea("descr",5,$table['appointment1']['description'][size],$this->obj->descr);
 
 
      echo "</tr><tr>\n";
@@ -244,11 +244,10 @@
        if ( $this->obj->visitor != -1 ) {
          $this->obj->xfn['v'] = $this->obj->visitor->getFullName();
        }
-       if ( $this->obj->product->id != -1 ) {
+       if ( $this->obj->product != -1 ) {
          $this->obj->xfn['p'] = $this->obj->product->getFullName();
        }
-       @reset($this->obj->participant);
-       while ( list ($i,$f) = @each ($this->obj->participant) ) {
+       foreach($this->obj->participant as $i => $f) {
          $p[$i] = 2;
        }
      } else {

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

Modified Files:
	app_new_r.php 
Log Message:
fix


Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- app_new_r.php	29 Sep 2003 12:05:11 -0000	1.48
+++ app_new_r.php	26 Feb 2004 18:30:11 -0000	1.49
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2003 by Gero Kohnert
+ * Copyright 1999 - 2004 by Gero Kohnert
  *
  * Editing of "repeating" appointments
  *
@@ -147,7 +147,7 @@
 
      echo "</tr><tr>\n";
      echo $this->showfield($lang['Description'],0,"descr");
-	 echo $this->textarea("descr",5,$table['appointment1']['description'][size],$this->obj->descr);
+     echo $this->textarea("descr",5,$table['appointment1']['description'][size],$this->obj->descr);
 
      echo "</tr><tr>\n";
      # Customer/Visitor name
@@ -224,11 +224,10 @@
        if ( $this->obj->visitor != -1 ) {
          $this->obj->xfn['v'] = $this->obj->visitor->getFullName();
        }
-       if ( $this->obj->product->id != -1 ) {
+       if ( $this->obj->product != -1 ) {
          $this->obj->xfn['p'] = $this->obj->product->getFullName();
        }
-       @reset($this->obj->participant);
-       while ( list ($i,$f) = @each ($this->obj->participant) ) {
+       foreach($this->obj->participant as $i => $f) {
          $p[$i] = 2;
        }
      } else {

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

Modified Files:
	app_show.php 
Log Message:
fix


Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- app_show.php	8 Jan 2004 12:33:10 -0000	1.42
+++ app_show.php	26 Feb 2004 18:24:10 -0000	1.43
@@ -189,7 +189,7 @@
        echo "</tr>\n";
      }
      if ( $this->user->feature_ok(useprojects,PERM_SEE) ) {
-       if ( $this->obj->product->id != -1 ) {
+       if ( $this->obj->product != -1 ) {
          echo "<tr>\n";
          echo $this->showfield($lang['ProductP']);
          echo $this->showdata($this->obj->product->getLink(),3);

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

Modified Files:
	product.pinc 
Log Message:
fix


Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- product.pinc	26 Feb 2004 10:14:21 -0000	1.135
+++ product.pinc	26 Feb 2004 18:23:07 -0000	1.136
@@ -880,7 +880,7 @@
       return;
     }
 
-    if ( $obj->product->id != -1 ) {
+    if ( $obj->product != -1 ) {
       echo "<tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"right\">";
       echo "&#8594;&nbsp;". $obj->product->getLink();
       echo "</td></tr>\n";

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

Modified Files:
	appointment.pinc 
Log Message:
Hotfix: no proper url was generated

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- appointment.pinc	26 Feb 2004 10:14:21 -0000	1.164
+++ appointment.pinc	26 Feb 2004 15:11:54 -0000	1.165
@@ -497,8 +497,10 @@
   function make_mail_body(&$body,&$to) {
     global $lang;
 
-    $url = getBaseURL(true). $this->getURL();
-
+    
+    #$url = getBaseURL(true). $this->getURL();  //no proper url was generated
+    $url = getBaseURL(false). $this->getURL();
+    
     $body = eregi_replace("@CREATOR@",$this->creator->getFullName(),$body);
     $body = eregi_replace("@DESC@",$this->descr,$body);
     $body = eregi_replace("@URL@",$url,$body);
@@ -522,7 +524,8 @@
     }
 
     if ( ($this->trace == 1) && ($to->gettype() != "team") ) {
-      $urlv = getBaseURL(true) ."app_vote.php?id=". $this->id ."&adr_id=".$to->id;
+      #$urlv = getBaseURL(true) ."app_vote.php?id=". $this->id ."&adr_id=".$to->id; //no proper url was generated
+      $urlv = getBaseURL(false) ."app_vote.php?id=". $this->id ."&adr_id=".$to->id;
 
       $body = eregi_replace("@URLV@",$urlv,$body);
       $body = eregi_replace("<VOTE>","",$body);

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

Modified Files:
	watchlist.pinc 
Log Message:
Hotfix: no proper url was generated

Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- watchlist.pinc	25 Feb 2004 19:24:02 -0000	1.43
+++ watchlist.pinc	26 Feb 2004 15:09:46 -0000	1.44
@@ -321,7 +321,8 @@
     if ( !isset($parent->list[usewatchlist]) or count($parent->list[usewatchlist]) == 0 )
       return;
 
-    $url = getBaseURL(true) . $parent->getUrl();
+    #$url = getBaseURL(true) . $parent->getUrl();  //no proper url was generated
+    $url = $tutos[baseurl][$_SESSION['dbnr']] . $parent->getUrl();
 
     foreach ($parent->list[usewatchlist] as $i => $f) {
       $body = "";

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

Modified Files:
	acl.pinc acl_new.php user_ins.php user_new.php 
Log Message:
acldefaults mode 2 will now support a MYTEAMS flag
on creating new objects permissions with this flag 
will expand to all the teams of the current user.



Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- acl.pinc	16 Feb 2004 16:44:57 -0000	1.61
+++ acl.pinc	26 Feb 2004 14:05:41 -0000	1.62
@@ -10,6 +10,7 @@
  */
 
 define ('EVERYBODY',0);
+define ('MYTEAMS',-2);
 
 /**
  * set the default rights
@@ -27,16 +28,16 @@
     $obj->acl[EVERYBODY]  = $tutos[seeok];
     return;
   }
+  if ( ($adr->getType() != "address") &&  ($adr->getType() != "user") ) {
+    return;
+  }
+
+  team::obj_read($adr);
   # 1 = teams can see it
   if ( $tutos[defaultacl] == 1 ) {
-    if ( ($adr->getType() == "address") ||  ($adr->getType() == "user") ) {
-      team::obj_read($adr);
-      # When no teams are defined everybody may see
-      if ( count($adr->teamlist) > 0 ) {
-        foreach($adr->teamlist as $i => $f) {
-          acl_raise($obj,$i,$tutos[seeok]);
-        }
-      }
+    # When no teams are defined everybody may see
+    foreach($adr->teamlist as $i => $f) {
+      acl_raise($obj,$i,$tutos[seeok]);
     }
     return;
   }
@@ -48,7 +49,14 @@
         $obj->acl[EVERYBODY]  = $tutos[seeok];
       } else {
         foreach($adr->acldefault as $i => $f) {
-          acl_raise($obj,$i,$f);
+		  if ($i == MYTEAMS) {
+            # expand a -2(MYTEAMS) to all the teams of that user
+            foreach($adr->teamlist as $i2 => $f2) {
+              acl_raise($obj,$i2,$f);
+            }
+		  } else {
+            acl_raise($obj,$i,$f);
+		  }
         }
       }
     }
@@ -127,14 +135,11 @@
 
   $msg = "";
 
-  $q = "DELETE FROM ". $obj->dbconn->prefix ."acl WHERE obj_id = ". $obj->id;
+  $q = "DELETE FROM ". $obj->dbconn->prefix ."acl WHERE obj_id = ". $obj->id ." OR adr_id ". $obj_id;
+  $r = $obj->dbconn->Exec($q);
+  $q = "DELETE FROM ". $obj->dbconn->prefix ."acldefault WHERE obj_id = ". $obj->id ." OR adr_id ". $obj_id;
   $r = $obj->dbconn->Exec($q);
 
-  # For possible adr_id entries
-  if ( ($obj->gettype() == "user") || ($obj->gettype() == "address") || ($obj->gettype() == "team")) {
-    $q = "DELETE FROM ". $obj->dbconn->prefix ."acl WHERE adr_id = ". $obj->id;
-    $r = $obj->dbconn->Exec($q);
-  }
   return $msg;
 }
 /**
@@ -180,9 +185,8 @@
   $r = $obj->dbconn->Exec($q);
 
   if ( isset($obj->acldefault) && (count($obj->acldefault) > 0) ) {
-    @reset($obj->acldefault);
-    while ( list ($i,$f) = @each ($obj->acldefault) ) {
-      if ( ($i > -1) && (gettype($i) == "integer") && ($f > 0) ) {
+    foreach($obj->acldefault as $i => $f) {
+      if ( ($i == MYTEAMS) || ( ($i > -1) && (gettype($i) == "integer") && ($f > 0) ) ) {
         $q = "INSERT INTO ". $obj->dbconn->prefix ."acldefault (obj_id,adr_id,perm) VALUES (". $id .",". $i .",". $f .")";
         $r = $obj->dbconn->Exec($q);
       }
@@ -426,7 +430,7 @@
   echo "<th>". $lang['ACLmodify'] ."</th>\n";
   echo "<th>". $lang['ACLdelete'] ."</th>\n";
   echo "<th>". $lang['Search'] ."</th>\n";
-  echo "<th>&#9733;<input type=\"checkbox\" name=\"checkitall\" "CheckAllAll(this,'f-')\">&#9733;</th>\n";
+  echo "<th colspan=\"2\">&#9733;<input type=\"checkbox\" name=\"checkitall\" "CheckAllAll(this,'f-')\">&#9733;</th>\n";
 #  echo "<th>&nbsp;</th>\n";
   echo "</tr>\n";
   $line = 0;
@@ -461,10 +465,10 @@
          }
          echo "</td>\n";
       }
-      echo "<td align=\"center\" valign=\"top\" width=\"15%\">*<input type=\"checkbox\" name=\"f-checkit". $i ."\" "CheckAll(this,'f". $i ."[]')\" ". ($obj->p[$i] > 61 ? " checked":"") .">*</td>\n";
+      echo "<td colspan=\"2\" align=\"center\" valign=\"top\" width=\"15%\">*<input type=\"checkbox\" name=\"f-checkit". $i ."\" "CheckAll(this,'f". $i ."[]')\" ". ($obj->p[$i] > 61 ? " checked":"") .">*</td>\n";
 #      echo "<td>&nbsp;</td>\n";
     } else if ( $tutos[$i] == 0 ) {
-      echo "<td align=\"center\" colspan=\"7\">". $lang['FeatureOff'] ."</td>\n";
+      echo "<td align=\"center\" colspan=\"8\">". $lang['FeatureOff'] ."</td>\n";
     } else {
       foreach ($perms as $p) {
         echo "<td align=\"center\" valign=\"top\" width=\"15%\">";

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- acl_new.php	6 Nov 2003 21:23:25 -0000	1.32
+++ acl_new.php	26 Feb 2004 14:05:41 -0000	1.33
@@ -111,7 +111,7 @@
        } else {
          $this->addHidden("id[]",$val->id);
        }
-#   	   echo $val->getFullName() ." ". $val->id ."<br>";
+#          echo $val->getFullName() ." ". $val->id ."<br>";
      }
 
      echo $this->DataTableStart();
@@ -232,4 +232,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: user_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_ins.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- user_ins.php	7 Jan 2004 15:30:07 -0000	1.45
+++ user_ins.php	26 Feb 2004 14:05:41 -0000	1.46
@@ -1,7 +1,10 @@
 <?php
-/*
+/**
  * Copyright 1999 - 2004 by Gero Kohnert
  *
+ * @modulegroup user
+ * @module user_ins
+ * @package user
  */
  include_once 'webelements.p3';
  include_once 'permission.p3';
@@ -133,22 +136,24 @@
  }
 
  # will set user-default-acl from input
- unset($u->acldefault);
+ $u->acldefault = array();
  if ( isset($_POST['r']) ) {
-   @reset($_POST['r']) ;
-   while ( list ($i,$f) = @each ($_POST['r']) ) {
+   foreach($_POST['r'] as $i => $f) {
      $u->acldefault[$f]=$tutos[seeok];  
    }
  }  
+ if ( isset($_POST['u']) ) {
+   foreach($_POST['u'] as $i => $f) {
+     $u->acldefault[$f]=$tutos[useok];  
+   }
+ }  
  if ( isset($_POST['m']) ) {
-   @reset($_POST['m']) ;
-   while ( list ($i,$f) = @each ($_POST['m']) ) {
+   foreach($_POST['m'] as $i => $f) {
      $u->acldefault[$f]=$tutos[modok];  
    }
  }  
  if ( isset($_POST['d']) ) {
-   @reset($_POST['d']) ;
-   while ( list ($i,$f) = @each ($_POST['d']) ) {
+   foreach($_POST['d'] as $i => $f) {
      $u->acldefault[$f]=$tutos[delok];  
    }
  }  

Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- user_new.php	13 Jan 2004 09:57:39 -0000	1.76
+++ user_new.php	26 Feb 2004 14:05:42 -0000	1.77
@@ -27,12 +27,22 @@
      global $lang,$tutos;
 
      $nr["r"] = 0;
-     $nr["m"] = 1;
-     $nr["d"] = 2;
+     $nr["u"] = 1;
+     $nr["m"] = 2;
+     $nr["d"] = 3;
      $js = "";
      echo " <select multiple size=\"". min(count($this->obj->teamlist),$tutos[maxshow]) ."\" name=\"". $name ."[]\" ". $js .">\n";
-     @reset ($this->obj->teamlist);
-     while ( list ($i,$fn) = @each ($this->obj->teamlist) ) {
+     if ( isset($this->obj->acldefault[MYTEAMS]) ) {
+       $l = $this->obj->acldefault[MYTEAMS];
+     } else {
+       $l = 0;
+     }
+     if ( ($l < $max) && ($l >= $min) ) {
+       echo "  <option value=\"". MYTEAMS ."\" selected>&nbsp;all my teams</option>\n";
+     } else {
+       echo "  <option value=\"". MYTEAMS ."\">&nbsp;all my teams</option>\n";
+     }
+     foreach ($this->obj->teamlist as $i => $fn) {
        if ( isset($this->obj->acldefault[$i]) ) {
          $l = $this->obj->acldefault[$i];
        } else {
@@ -56,23 +66,32 @@
      echo " function deselect (obj,nr) { \n";
      echo " for(var j = 0; j <= obj.length ; j++) {\n";
      echo "   if ( obj.elements[j].name == \"r[]\" ) {\n";
-     echo "    var x = obj.elements[j]; \n";
-     echo "    var y = obj.elements[j+1]; \n";
-     echo "    var z = obj.elements[j+2]; \n";
+     echo "    var w = obj.elements[j]; \n";
+     echo "    var x = obj.elements[j+1]; \n";
+     echo "    var y = obj.elements[j+2]; \n";
+     echo "    var z = obj.elements[j+3]; \n";
      echo "    break; \n";
      echo "   }\n";
      echo " }\n";  
      echo "  \n";  
-     echo "  for (var i = 0; i < x.options.length; i++) {\n";
-     echo "    if ( (nr == 0) && (x.options[i].selected) ) {\n";
+     echo "  for (var i = 0; i < w.options.length; i++) {\n";
+     echo "    if ( (nr == 0) && (w.options[i].selected) ) {\n";
+     echo "      x.options[i].selected = false;\n";
      echo "      y.options[i].selected = false;\n";
      echo "      z.options[i].selected = false;\n";
      echo "    }\n";
-     echo "    if ( (nr == 1) && (y.options[i].selected) ) {\n";
+     echo "    if ( (nr == 1) && (x.options[i].selected) ) {\n";
+     echo "      w.options[i].selected = false;\n";
+     echo "      y.options[i].selected = false;\n";
+     echo "      z.options[i].selected = false;\n";
+     echo "    }\n";
+     echo "    if ( (nr == 2) && (y.options[i].selected) ) {\n";
+     echo "      w.options[i].selected = false;\n";
      echo "      x.options[i].selected = false;\n";
      echo "      z.options[i].selected = false;\n";
      echo "    }\n";
-     echo "    if ( (nr == 2) && (z.options[i].selected) ) {\n";
+     echo "    if ( (nr == 3) && (z.options[i].selected) ) {\n";
+     echo "      w.options[i].selected = false;\n";
      echo "      x.options[i].selected = false;\n";
      echo "      y.options[i].selected = false;\n";
      echo "    }\n";
@@ -84,51 +103,53 @@
 
      echo $this->DataTableStart();
      echo "<tr>\n";
-     echo " <th colspan=\"8\">". $lang['UserInfo'] ."</th>\n";
+     echo " <th colspan=\"9\">". $lang['UserInfo'] ."</th>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo " <td align=\"right\" colspan=\"8\">". acl_link($this->obj) ."</td>\n";
+     echo " <td align=\"right\" colspan=\"9\">". acl_link($this->obj) ."</td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      if ( $this->user->isAdmin() ) {
        echo $this->showfieldc($lang['Username'],1,"login");
-       echo " <td colspan=\"3\"><input id=\"login\" size=\"".min($table['people']['login'][size],20) ."\" maxlength=\"". $table['people']['login'][size] ."\" name=\"login\" value=\"". $this->obj->login ."\"></td>\n";
+       echo " <td colspan=\"2\"><input id=\"login\" size=\"".min($table['people']['login'][size],20) ."\" maxlength=\"". $table['people']['login'][size] ."\" name=\"login\" value=\"". $this->obj->login ."\"></td>\n";
        echo $this->showfieldc($lang['UserDisabled'],0,"disabled");
-       echo " <td colspan=\"3\"><input id=\"disabled\" type=\"checkbox\" name=\"disabled\" value=\"1\"". ($this->obj->disabled == 1 ? " checked":"") ."></td>\n";
+       echo " <td colspan=\"2\"><input id=\"disabled\" type=\"checkbox\" name=\"disabled\" value=\"1\"". ($this->obj->disabled == 1 ? " checked":"") ."></td>\n";
      } else {
        echo $this->showfieldc($lang['Username'],0,"login");
-       echo $this->showdata($this->obj->login,7);
+       echo $this->showdata($this->obj->login,5);
        $this->addHidden("login", $this->obj->login );
      }
+     echo "<td colspan=\"3\">&nbsp;</td>\n";
      echo "</tr>\n";
 
      if ($this->obj->id == -1) {
        # new entry
        echo "<tr>\n";
        echo $this->showfieldc($lang['AdrFirstName'],1,"fname");
-       echo " <td colspan=\"7\"><input id=\"fname\" size=\"".min($table['address']['f_name'][size],40) ."\" maxlength=\"". $table['address']['f_name'][size] ."\" name=\"fname\" value=\"". $this->obj->f_name ."\"></td>\n";
+       echo " <td colspan=\"8\"><input id=\"fname\" size=\"".min($table['address']['f_name'][size],40) ."\" maxlength=\"". $table['address']['f_name'][size] ."\" name=\"fname\" value=\"". $this->obj->f_name ."\"></td>\n";
        echo "</tr>\n";
        echo "<tr>\n";
        echo $this->showfieldc($lang['AdrLastName'],1,"lname");
-       echo " <td colspan=\"7\"><input id=\"lname\" size=\"".min($table['address']['l_name'][size],40) ."\" maxlength=\"". $table['address']['l_name'][size] ."\" name=\"lname\" value=\"". $this->obj->l_name ."\"></td>\n";
+       echo " <td colspan=\"8\"><input id=\"lname\" size=\"".min($table['address']['l_name'][size],40) ."\" maxlength=\"". $table['address']['l_name'][size] ."\" name=\"lname\" value=\"". $this->obj->l_name ."\"></td>\n";
        echo "</tr>\n";
        echo "<tr>\n";
        echo $this->showfieldc($lang['AdrEmail'],1,"email");
-       echo " <td colspan=\"7\"><input id=\"email\" size=\"".min($table['location']['email_1'][size],40) ."\" maxlength=\"". $table['location']['email_1'][size] ."\" name=\"email\" value=\"". $this->obj->email_1 ."\"></td>\n";
+       echo " <td colspan=\"8\"><input id=\"email\" size=\"".min($table['location']['email_1'][size],40) ."\" maxlength=\"". $table['location']['email_1'][size] ."\" name=\"email\" value=\"". $this->obj->email_1 ."\"></td>\n";
        echo "</tr>\n";
      } else {
        echo "<tr>\n";
        echo $this->showfieldc($lang['User']);
-       echo $this->showdata($this->obj->getLink(),7);
+       echo $this->showdata($this->obj->getLink(),8);
        echo "</tr>\n";
      }
      echo "<tr>\n";
      echo $this->showfieldc($lang['UserLastSeen']);
-     echo $this->showdata($this->obj->last_seen->getDateTime(),3);
+     echo $this->showdata($this->obj->last_seen->getDateTime(),2);
      echo $this->showfieldc($lang['UserLastHost']);
-     echo $this->showdata($this->obj->last_host,3);
+     echo $this->showdata($this->obj->last_host,2);
+     echo "<td colspan=\"3\">&nbsp;</td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -137,40 +158,41 @@
        $achecked[0] ="";
        $achecked[1] ="";
        $achecked[$this->obj->admin] ="CHECKED";
-       echo " <td colspan=\"3\">". $lang['yes'] ."&nbsp;<input id=\"admin\" type=\"radio\" name=\"admin\" value=\"1\" ". $achecked[1] ."></td>";
-       echo " <td colspan=\"4\">". $lang['no'] ."&nbsp;<input id=\"admin\" type=\"radio\" name=\"admin\" value=\"0\" ". $achecked[0] ."></td>";
+       echo " <td colspan=\"1\" align=\"right\">". $lang['yes'] ."&nbsp;<input id=\"admin\" type=\"radio\" name=\"admin\" value=\"1\" ". $achecked[1] ."></td>";
+       echo " <td colspan=\"4\" align=\"left\">". $lang['no'] ."&nbsp;<input id=\"admin\" type=\"radio\" name=\"admin\" value=\"0\" ". $achecked[0] ."></td>";
      } else {
        $this->addHidden("admin",$this->obj->admin);
        if ( $this->obj->isAdmin() ) {
-         echo $this->showdata($lang['yes'],7);
+         echo $this->showdata($lang['yes'],5);
        } else {
-         echo $this->showdata($lang['no'],7);
+         echo $this->showdata($lang['no'],5);
        }
      }
+     echo "<td colspan=\"3\">&nbsp;</td>\n";
      echo "</tr>\n";
 
      if ( ($tutos[authtype] != "pam") && ($tutos[authtype] != "ldap") ) {
        if ( $this->dbconn->Password("a") == "'a'" ) {
          echo "<tr>\n";
-         echo " <td colspan=\"8\"><span class=\"warn\">Passwords will not be encrypted in the Database.<br>Do not use your standard password !!</span></td>\n";
+         echo " <td colspan=\"9\"><span class=\"warn\">Passwords will not be encrypted in the Database.<br>Do not use your standard password !!</span></td>\n";
          echo "</tr>\n";
        }
        if ( ! $this->user->isAdmin() ) {
          if ( $this->dbconn->gettype() != "MySQL" ) {
            echo "<tr>\n";
            echo $this->showfieldc($lang['Password'] ." (old)",0,"p0");
-           echo " <td colspan=\"7\"><input id=\"p0\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p0\" value=\"\"></td>\n";
+           echo " <td colspan=\"8\"><input id=\"p0\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p0\" value=\"\"></td>\n";
            echo "</tr>\n";
          }
        }
        echo "<tr>\n";
        echo $this->showfieldc($lang['Password'] ." (new)",0,"p1");
-       echo " <td colspan=\"7\"><input id=\"p1\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p1\" value=\"\"></td>\n";
+       echo " <td colspan=\"8\"><input id=\"p1\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p1\" value=\"\"></td>\n";
        echo "</tr>\n";
 
        echo "<tr>\n";
        echo $this->showfieldc($lang['Password'] ." (repeat)",0,"p2");
-       echo " <td colspan=\"7\"><input id=\"p2\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p2\" value=\"\"></td>\n";
+       echo " <td colspan=\"8\"><input id=\"p2\" type=\"password\" size=\"20\" maxlength=\"20\" name=\"p2\" value=\"\"></td>\n";
        echo "</tr>\n";
      }
      #
@@ -200,14 +222,17 @@
        echo "<tr>\n";
        echo $this->showfieldc($lang['UserDefaultGrp'],0,"acldefault");
        echo " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."</th>\n";
-       echo " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br>". $lang['ACLmodify'] ."</th>\n";
-       echo " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br>". $lang['ACLmodify'] ."<br>". $lang['ACLdelete'] ."</th>\n";
-       echo " <th>&nbsp;</th>\n";
+       echo " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br>". $lang['ACLuse'] ."</th>\n";
+       echo " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br>". $lang['ACLuse'] ."<br>". $lang['ACLmodify'] ."</th>\n";
+       echo " <th width=\"30%\" colspan=\"2\">". $lang['ACLread'] ."<br>". $lang['ACLuse'] ."<br>". $lang['ACLmodify'] ."<br>". $lang['ACLdelete'] ."</th>\n";
        echo "</tr>\n";
        echo "<tr>\n"; 
        echo " <td colspan=\"1\">&nbsp;</td>\n";
        echo " <td colspan=\"2\"><center>\n";
-       $this->acldefault_select(1,$tutos[modok],"r");
+       $this->acldefault_select(1,$tutos[useok],"r");
+       echo " </center></td>\n";
+       echo " <td colspan=\"2\"><center>\n";
+       $this->acldefault_select($tutos[useok], $tutos[modok],"u");
        echo " </center></td>\n";
        echo " <td colspan=\"2\"><center>\n";
        $this->acldefault_select($tutos[modok], $tutos[delok],"m");
@@ -215,7 +240,6 @@
        echo " <td colspan=\"2\"><center>\n";
        $this->acldefault_select($tutos[delok], 99, "d");
        echo " </center></td>\n";
-       echo " <td colspan=\"1\">&nbsp;</td>\n";
        echo "</tr>\n";
      }
      #
@@ -223,7 +247,7 @@
      #
      echo "<tr>\n";
      echo $this->showfieldc($lang['UserLanguage'],1,"lng");
-     echo " <td colspan=\"3\">\n";
+     echo " <td colspan=\"2\">\n";
      echo "  <select id=\"lng\" name=\"lng\">\n";
      foreach($lang['lang'] as $i => $f) {
        echo "   <option value=\"". $i ."\"". ( !strcasecmp($i,$this->obj->lang) ? " selected":"") .">". myentities($f) ."</option>\n";
@@ -233,49 +257,51 @@
 
      # TIMEZONE
      echo $this->showfieldc($lang['UserTimezone'],1,"tz");
-     echo " <td colspan=\"3\">";
+     echo " <td colspan=\"2\">";
      echo " <select id=\"tz\" name=\"tz\">\n";
      foreach($tutos[timezones] as $f) {
        echo "  <option value=\"". $f ."\"". ($this->obj->tz == $f ? " selected":"") .">". $f ."</option>\n";
      }
      echo " </select>\n";
      echo " </td>\n";
-     echo "</tr>\n";
 
-     # Workdays
-     echo "<tr>\n";
-     echo $this->showfield($lang['UserWorkdays'],1,"wd[]");
-     echo " <td nowrap colspan=\"7\">\n";
-     for ( $i = 0 ; $i < 7 ; $i++ ) {
-       echo "<input id=\"wd[]\" type=\"checkbox\" name=\"wd[]\" value=\"". $i ."\" ". ($this->obj->isworkday($i) ? "checked":"") .">". $lang['Day'.$i];
-     }
-     echo " </td>\n";
+     echo "<td colspan=\"3\">&nbsp;</td>\n";
+
      echo "</tr>\n";
 
-     # Weekstart
      echo "<tr>\n";
+     # Weekstart
      echo $this->showfield($lang['UserWeekstart'],1,"ws");
-     echo " <td nowrap colspan=\"7\">\n";
+     echo " <td nowrap colspan=\"2\">\n";
      echo " <select id=\"ws\" name=\"ws\">\n";
      echo "  <option value=\"0\"". ($this->obj->weekstart == 0 ? " selected":"") .">". $lang['Day0'] ."</option>\n";
      echo "  <option value=\"1\"". ($this->obj->weekstart == 1 ? " selected":"") .">". $lang['Day1'] ."</option>\n";
      echo "  <option value=\"6\"". ($this->obj->weekstart == 6 ? " selected":"") .">". $lang['Day6'] ."</option>\n";
      echo " </select>\n";
      echo " </td>\n";
+
+     # Workdays
+     echo $this->showfield($lang['UserWorkdays'],1,"wd[]");
+     echo " <td nowrap colspan=\"5\">\n";
+     for ( $i = 0 ; $i < 7 ; $i++ ) {
+       echo "<input id=\"wd[]\" type=\"checkbox\" name=\"wd[]\" value=\"". $i ."\" ". ($this->obj->isworkday($i) ? "checked":"") .">". $lang['Day'.$i];
+     }
+     echo " </td>\n";
+
      echo "</tr>\n";
 
+     echo "<tr>\n";
      # HOLIDAYS
      $xx = 1;
-     echo "<tr>\n";
      echo $this->showfield($lang['UserHoliday'],0,"h[]");
      @reset ($tutos[holiday]);
-     echo " <td colspan=\"7\">\n";
+     echo " <td colspan=\"2\">\n";
      while( list ($i,$f) = @each ($tutos[holiday])) {
        if ( $tutos[holiday][$i] != 1 ) {
          continue;
        }
        echo "  <input id=\"h[]\" type=\"checkbox\" name=\"h[]\" value=\"". strtolower($i) ."\" ". ($this->obj->holiday[strtolower($i)] == 1 ? "checked":"") .">". $i;
-       if ( 0 == ($xx % 6) ) {
+       if ( 0 == ($xx % 3) ) {
          echo "<br>\n";
        } else {
          echo "&nbsp;&nbsp;";
@@ -283,19 +309,17 @@
        $xx++;
      }
      echo " </td>\n";
-     echo "</tr>\n";
 
      # Namedays
-     echo "<tr>\n";
+     $xx = 1;
      echo $this->showfield($lang['UserNamedays'],0,"nd[]");
-     @reset ($tutos[nameday]);
-     echo " <td colspan=\"7\">\n";
-     while( list ($i,$f) = @each ($tutos[nameday])) {
+     echo " <td colspan=\"2\">\n";
+     foreach ($tutos[nameday] as $i => $f) {
        if ( $tutos[nameday][$i] != 1 ) {
          continue;
        }
        echo "  <input id=\"nd[]\" type=\"checkbox\" name=\"nd[]\" value=\"". strtolower($i) ."\" ". ($this->obj->nameday[strtolower($i)] == 1 ? "checked":"") .">". $i;
-       if ( 0 == ($xx % 4) ) {
+       if ( 0 == ($xx % 3) ) {
          echo "<br>\n";
        } else {
          echo "&nbsp;&nbsp;";
@@ -303,12 +327,15 @@
        $xx++;
      }
      echo " </td>\n";
+
+     echo "<td colspan=\"3\">&nbsp;</td>\n";
+
      echo "</tr>\n";
 
-     # THEME
      echo "<tr>\n";
+     # THEME
      echo $this->showfieldc($lang['UserTheme'],1,"theme");
-     echo " <td colspan=\"3\">\n";
+     echo " <td colspan=\"2\">\n";
      echo " <select id=\"theme\" name=\"theme\">\n";
      foreach($tutos[themes] as $f) {
        echo "  <option value=\"". $f ."\" ". ($f == $this->obj->theme ? " selected":"") .">". $f ."</option>\n";
@@ -318,13 +345,16 @@
 
      # Layout Engine
      echo $this->showfieldc($lang['UserLayout'],1,"layout");
-     echo " <td colspan=\"3\">\n";
+     echo " <td colspan=\"2\">\n";
      echo " <select id=\"layout\" name=\"layout\">\n";
      foreach($tutos[layouts] as $f) {
        echo "  <option value=\"". $f ."\" ". ($f == $this->obj->ly ? " selected":"") .">". $f ."</option>\n";
      }
      echo " </select>\n";
      echo " </td>\n";
+
+     echo "<td colspan=\"3\">&nbsp;</td>\n";
+
      echo "</tr>\n";
 
      # References to modules
@@ -479,4 +509,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	table.pinc 
Log Message:
Size of column "m_name" in tabel "addresses" changed to 30!

Index: table.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- table.pinc	21 Feb 2004 17:24:57 -0000	1.21
+++ table.pinc	26 Feb 2004 12:54:50 -0000	1.22
@@ -85,7 +85,7 @@
   "id"       => array(type => "ID_TYPE",             constraints => "PK",  Desc => "Object ID"),
   "title"    => array(type => "VARCHAR", size => 10, constraints => "",    Desc => "title"),
   "f_name"   => array(type => "VARCHAR", size => 30, constraints => "",    Desc => "first name"),
-  "m_name"   => array(type => "VARCHAR", size => 6 , constraints => "",    Desc => "middle initial"),
+  "m_name"   => array(type => "VARCHAR", size => 30, constraints => "",    Desc => "middle name"),
   "l_name"   => array(type => "VARCHAR", size => 30, constraints => "NN",  Desc => "last name"),
   "birthday" => array(type => "date",                constraints => "",    Desc => "birthday"),
   "pic_id"   => array(type => "ID_TYPE",             constraints => "",    Desc => "file id of picture"),

Update of /cvsroot/tutos/tutos/php/group
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5599/php/group

Modified Files:
	group.pinc 
Log Message:
XML-Export: group-export added (removed in base.pinc!)

Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- group.pinc	17 Feb 2004 14:07:50 -0000	1.40
+++ group.pinc	26 Feb 2004 11:46:31 -0000	1.41
@@ -205,6 +205,11 @@
     $r = parent::exportXML_body();
     $r .= "<name>". utf8_encode(htmlspecialchars($this->name))."</name>\n";
     $r .= "<description>". utf8_encode(htmlspecialchars($this->desc)) ."</description>\n";
+    #building the group-member block
+    foreach($this->member as $i => $f) {
+      $r .= "<member><id>". $f->id ."</id></member>\n";
+    }
+    $this->member   = array();
     return $r;
   }
 

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

Modified Files:
	base.pinc 
Log Message:
XML-Export: group-export removed (added in group.pinc!)

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- base.pinc	26 Feb 2004 10:14:21 -0000	1.65
+++ base.pinc	26 Feb 2004 11:44:45 -0000	1.66
@@ -233,16 +233,6 @@
         $r .=  "<lastmod>". $d->exportXML_body() ."</lastmod>\n";
       }
     }
-    if ( $current_user->feature_ok(usegroups,PERM_SEE) ) {
-    group::obj_read($this);
-    if ( isset($this->groupmemberlist) && (count($this->groupmemberlist) > 0) ) {
-      foreach($this->groupmemberlist as $i => $f) {
-          $r .= $f->exportXML_start();
-          $r .= $f->exportXML_body();
-          $r .= $f->exportXML_end();
-        }
-      }
-    }  
     if ( $current_user->feature_ok(useurl,PERM_SEE) ) {
       url::obj_read($this);
       if ( isset($this->list[useurl]) && (count($this->list[useurl]) > 0) ) {
@@ -252,7 +242,7 @@
           $r .= $f->exportXML_end();
         }
       }
-    }  
+    } 
     if ( $current_user->feature_ok(usenotes,PERM_SEE) ) {
       note::obj_read($this);
       if ( isset($this->list[usenotes]) && (count($this->list[usenotes]) > 0) ) {
@@ -262,7 +252,7 @@
           $r .= $f->exportXML_end();
         }
       }
-    }  
+    } 
     
     return $r;
   }
@@ -283,12 +273,12 @@
   /**
    * Export as XML
    */
-  function exportXML ($head = true) {
+  function exportXML($head = true) {
     $r = "";
-    if ($head) {
-      $r .= $this->exportXML_head() ;
+    if ( $head ) {
+      $r .= $this->exportXML_head();
     }
-    if (!$this->see_ok()) {
+    if ( !$this->see_ok() ) {
         return $r;
     }
     $r .=  $this->exportXML_start();

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

Modified Files:
	address.pinc location.pinc 
Log Message:
allow sending of watchlist mails to email addresses that are unvisible to the current user

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- address.pinc	26 Feb 2004 10:14:21 -0000	1.107
+++ address.pinc	26 Feb 2004 11:16:36 -0000	1.108
@@ -103,6 +103,9 @@
    * Read all locations references
    */
   function read_locs () {
+    if ( ! class_exists ("location") ) {
+      require("location.pinc");
+    }
     read_locs($this);
   }
 
@@ -307,9 +310,8 @@
     };
     $e = "";
 
-    if ( isset($this->location) ) {
-      @reset($this->location);
-      while( list ($i,$f) = @each ($this->location)) {
+    if ( isset($this->locall) ) {
+	  foreach($this->locall as $i => $f) {
         if ( $f->email_1 != "") {
           $e = $f->email_1;
           if ( $f->category == 2 ) {

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- location.pinc	26 Feb 2004 10:14:21 -0000	1.62
+++ location.pinc	26 Feb 2004 11:16:36 -0000	1.63
@@ -13,13 +13,12 @@
  */
 function read_locs (&$obj) {
 
-  if (empty($obj->id)) {
-    return;
-  }
-
-  if ( $obj->rl1 == true ) {
-    return;
-  }
+  if (empty($obj->id))  return;
+  if ( $obj == -1 ) return; 
+  if (! is_object($obj) ) return;
+  if (-1 == $obj->id)   return;
+  if ( $obj->rl1 == true ) return;
+  
 
   if ( isset($obj->loc) && (count($obj->loc) > 0) ) {
     return;
@@ -49,6 +48,10 @@
  * Read all locations data
  */
 function read_locs_data (&$obj) {
+  if (empty($obj->id))  return;
+  if ( $obj == -1 ) return; 
+  if (! is_object($obj) ) return;
+  if (-1 == $obj->id)   return;
 
   if ( $obj->rl2 == true ) {
     return;
@@ -63,11 +66,11 @@
 
 
   $obj->location = array();
+  $obj->locall   = array();
 
   $x = $obj->loc;
   if ( isset($x) && (count($x) > 0) ) {
-    @reset($x);
-    while( list ($i,$f) = @each ($x)) {
+    foreach($x as $i => $f) {
       $l = new location($obj->dbconn);
       $l->read($i);
       $l->lname = $f;
@@ -81,6 +84,8 @@
       } else {
         unset($obj->loc[$i]);
       }
+      # we need the hidden locations for watchlist-emails
+      $obj->locall[$i] = &$l;
       unset($l);
     }
   }

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

Modified Files:
	installation.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- installation.pinc	20 Feb 2004 11:37:29 -0000	1.26
+++ installation.pinc	26 Feb 2004 10:14:22 -0000	1.27
@@ -95,8 +95,8 @@
     $this->currency     = $r->get($pos, "currency");
 
     $cid = $r->get($pos, "customer_id");
-    $iid = $r->get($pos, "installer_id");
-    $sid = $r->get($pos, "seller_id");
+    $inst_id = $r->get($pos, "installer_id");
+    $sell_id = $r->get($pos, "seller_id");
     $pid = $r->get($pos, "product_id");
 
 
@@ -104,24 +104,12 @@
     $this->instdate->setDateTime($r->get($pos, "instdate"));
     $this->description = $r->get($pos, "description");
 
-    $this->product = getObject($this->dbconn,$pid);
+    $this->product    = getObject($this->dbconn,$pid);
+    $this->installer  = getObject($this->dbconn,$inst_id);
+    $this->seller     = getObject($this->dbconn,$sell_id);
+    $this->customer   = getObject($this->dbconn,$cid);
 
-    $this->installer->read($iid);
-    if ( $this->installer->id == -1 ) {
-      $this->installer = new team($this->dbconn);
-      $this->installer->read($iid);
-    }
-
-    $this->seller->read($sid);
-    if ( $this->seller->id == -1 ) {
-      $this->seller = new team($this->dbconn);
-      $this->seller->read($sid);
-    }
-
-    $this->customer = getObject($this->dbconn,$cid);
-
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator->read($r->get($pos, "creator"));
+    $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
     return;

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20402/php/layout

Modified Files:
	new_layout.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- new_layout.pinc	23 Feb 2004 18:30:27 -0000	1.25
+++ new_layout.pinc	26 Feb 2004 10:14:22 -0000	1.26
@@ -598,7 +598,7 @@
    * end of a "normal" page
    */
   function layout_stop($name = "") {
-    global $tutos,$lang;
+    global $tutos,$lang,$g_hash;
 
     echo "<!-- layout_stop -->\n";
     echo "   </td>\n";
@@ -609,6 +609,7 @@
 	if ( ($tutos[debug] == 1) && function_exists('memory_get_usage') ) {
 		echo " using ". memory_get_usage() ." Bytes of memory";
 	}
+    echo " cacheinfo ". count($g_hash) ."/". $g_hash['hits'] ."";
     echo "\"><font size=\"-2\"><i><b><acronym title=\"The Ultimative team organization software\">TUTOS</acronym> ". $tutos[version] ."</b></i></font></a>&nbsp;\n";
     echo "   </td>\n";
     echo "  </tr>\n";

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

Modified Files:
	invoice.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- invoice.pinc	25 Feb 2004 19:50:23 -0000	1.44
+++ invoice.pinc	26 Feb 2004 10:14:22 -0000	1.45
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * Copyright 2003 - 2004 by Gero Kohnert
  *
  *  CVS Info:  $Id$
@@ -371,8 +371,7 @@
     $this->datedue[2] = $r->getDateTime($pos, "d_due2");
     $this->datefinish = $r->getDateTime($pos, "d_finish");
 
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator->read($r->get($pos, "creator"));
+    $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
 
     $this->pos = array();
     parent::read_result($r,$pos);

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

Modified Files:
	file.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- file.pinc	22 Feb 2004 19:01:46 -0000	1.28
+++ file.pinc	26 Feb 2004 10:14:22 -0000	1.29
@@ -145,8 +145,7 @@
 
     $this->locked      = $r->get($pos, "locked");
     if ( $this->locked > 0 ) {
-      $this->locker     = new tutos_address($this->dbconn);
-      $this->locker->read($this->locked);
+      $this->locker     = getObject($this->dbconn,$this->locked);
     }
 
     $lid      = $r->get($pos, "link_id");
@@ -156,16 +155,11 @@
     }
 
     $cid      = $r->get($pos, "creator");
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator->read($cid);
+    $this->creator     = getObject($this->dbconn,$cid);
 
     $cid      = $r->get($pos, "author");
-    $this->author     = new tutos_address($this->dbconn);
-    $this->author->read($cid);
-    if ( $this->author->id == -1 ) {
-      $this->author     = new team($this->dbconn);
-      $this->author->read($cid);
-    }
+    $this->author     = getObject($this->dbconn,$cid);
+
     parent::read_result($r,$pos);
     return;
   }

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

Modified Files:
	url.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- url.pinc	20 Feb 2004 11:37:31 -0000	1.13
+++ url.pinc	26 Feb 2004 10:14:23 -0000	1.14
@@ -30,10 +30,7 @@
     $this->link_id     = $r->get($pos, "link_id");
     $this->name        = $r->get($pos, "name");
     $this->url         = $r->get($pos, "url");
-
-    $cid = $r->get($pos, "creator");
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator->read($cid);
+    $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
     return;

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

Modified Files:
	rate.pinc rate_overview.php 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: rate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate.pinc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rate.pinc	25 Feb 2004 14:07:51 -0000	1.14
+++ rate.pinc	26 Feb 2004 10:14:23 -0000	1.15
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2003 by Gero Kohnert
+ * Copyright 1999 - 2004 by Gero Kohnert and ecosoft
  *
  *  CVS Info: $Id$
  *  $Author$
@@ -108,9 +108,7 @@
     $this->role_id     = $r->get($pos, "role_id");
     $this->state       = $r->get($pos, "state");
 
-    $cid = $r->get($pos, "creator");
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator->read($cid);
+    $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
     return;

Index: rate_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_overview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rate_overview.php	14 Feb 2004 09:25:07 -0000	1.3
+++ rate_overview.php	26 Feb 2004 10:14:23 -0000	1.4
@@ -1,7 +1,6 @@
 <?php
-/*
- * Copyright 1999 - 2003 by Gero Kohnert
- * submitted by "Nonn" <nonn at resce.com>
+/**
+ * Copyright 1999 - 2004 by Gero Kohnert and ecosoft
  *
  * @modulegroup rate
  * @module rate_overview
@@ -103,7 +102,7 @@
        if ( $b->worker > 0 ) {
          echo " <td>&nbsp;". $b->worker->getLink($b->worker->getShortname()) ."</td>\n";
        } else {
-       	 echo " <td>&nbsp;". $b->ref->getLink() ."</td>\n";
+         echo " <td>&nbsp;". $b->ref->getLink() ."</td>\n";
        }
        echo " <td>&nbsp;". $lang['ProdRole'][$b->role_id] ."</td>\n";
        echo " <td>&nbsp;". number_format($b->cph,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $b->currency ."</td>\n";
@@ -421,4 +420,4 @@
 <!--
     CVS Info: $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	bug.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bug.pinc	25 Feb 2004 19:49:34 -0000	1.17
+++ bug.pinc	26 Feb 2004 10:14:21 -0000	1.18
@@ -141,7 +141,7 @@
 
     $this->description = $r->get($pos, "description");
     $this->bugid = $r->get($pos, "bugid");
-    $this->creator->read($r->get($pos, "creator"));
+    $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
     return;

Update of /cvsroot/tutos/tutos/php/resource
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20402/php/resource

Modified Files:
	resource.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- resource.pinc	21 Oct 2003 19:56:34 -0000	1.31
+++ resource.pinc	26 Feb 2004 10:14:23 -0000	1.32
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2001 - 2003 by Gero Kohnert
+ * Copyright 2001 - 2004 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -89,6 +89,7 @@
   function read_result (&$r, $pos ) {
     $this->name        = $r->get($pos, "name");
     $this->desc        = $r->get($pos, "description");
+	$this->creator = new tutos_user($this->dbconn);
     $this->creator->read($r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
@@ -467,7 +468,7 @@
     $obj->res = array();
     $msg = "";
     if ( isset($_POST['res']) && (count($_POST['res']) > 0)) {
-  	  foreach($_POST['res'] as $f) {
+      foreach($_POST['res'] as $f) {
         $gotourl= addUrlParameter($gotourl,"res[]=".$f,true);
       }
       $obj->res = $_POST['res'];

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

Modified Files:
	note.pinc 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- note.pinc	21 Feb 2004 17:06:41 -0000	1.45
+++ note.pinc	26 Feb 2004 10:14:23 -0000	1.46
@@ -75,9 +75,7 @@
     $this->note        = $r->get($pos, "note");
     $this->remember    = $r->getDateTime($pos, "remember");
 
-    $cid = $r->get($pos, "creator");
-    $this->creator     = new tutos_address($this->dbconn);
-    $this->creator->read($cid);
+    $this->creator     = getObject($this->dbconn,$r->get($pos, "creator"));
 
     parent::read_result($r,$pos);
     return;

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

Modified Files:
	demodata.p3 
Log Message:
some first fixes to make TUTOS run with PHP5(beta3). All of you who have a PHP5 please test and compare with the results you have in PHP4

Index: demodata.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/demodata.p3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demodata.p3	24 Feb 2004 21:12:50 -0000	1.1
+++ demodata.p3	26 Feb 2004 10:14:21 -0000	1.2
@@ -318,6 +318,7 @@
      $t1 = new task($this->obj);
      $t1->name = "Demo Task 1 /". $f->getFullName();
      $t1->description = "This is a task";
+     $t1->creator = &$u[$cnt % $ucnt];
      $x = new DateTime();
      $t1->setSStart($x);
      $x->addDays(3);
@@ -333,6 +334,7 @@
      $t2 = new task($this->obj);
      $t2->name = "Demo Task 2";
      $t2->description = "This is another task";
+     $t2->creator = &$u[$cnt % $ucnt];
      $t2->volume = 2.5;
      $t2->state = 0;
      $t2->p_id = $f->id;
@@ -348,6 +350,7 @@
 
      $t3 = new task($this->obj);
      $t3->name = "Demo Task 3";
+     $t3->creator = &$u[$cnt % $ucnt];
      $t3->description = "a lot to do eh ?";
      $t3->volume = 14.5;
      $t3->state = 2;