tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20974

Modified Files:
      Tag: BRANCH-1-4
	webelements.p3 
Log Message:
fix

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.335
retrieving revision 1.335.2.1
diff -u -d -r1.335 -r1.335.2.1
--- webelements.p3	13 Sep 2008 19:29:53 -0000	1.335
+++ webelements.p3	26 Oct 2008 09:19:18 -0000	1.335.2.1
@@ -1810,7 +1810,7 @@
 }
 
 
-function load_jpgraph($arr) {
+function load_jpgraph($arr,$path) {
   global $tutos,$msg;
 
   # Required Verison
@@ -1828,9 +1828,9 @@
     $dir = '';
   }
   if ($dir != '') {
-    require_once $dir.'/jpgraph.php';
+    require_once $path.$dir.'/jpgraph.php';
     foreach($arr as $i) {
-      require_once $dir .'/'. $i;
+      require_once $path.$dir .'/'. $i;
     }
     if (!defined('JPG_VERSION') ) {
       $tutos[jpgraph_old] = 1;

Update of /cvsroot/tutos/tutos/php
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21635

Modified Files:
      Tag: BRANCH-1-4
	task.pinc task_show.php 
Log Message:
fix

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.87
retrieving revision 1.87.2.1
diff -u -d -r1.87 -r1.87.2.1
--- task_show.php	22 Jun 2008 19:42:17 -0000	1.87
+++ task_show.php	26 Oct 2008 09:39:55 -0000	1.87.2.1
@@ -71,7 +71,9 @@
        $pre = "";
        foreach ($this->obj->worker as $i => $x) {
 #       echo $pre.$i." ". $x;
-         echo $pre.$this->obj->worker[$i]->getLink();
+	 if (is_object($x)) {
+           echo $pre.$this->obj->worker[$i]->getLink();
+         }
          $pre = "<br />\n";
        }
        echo " </td>\n";
@@ -365,4 +367,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.203
retrieving revision 1.203.2.1
diff -u -d -r1.203 -r1.203.2.1
--- task.pinc	23 Jul 2008 07:36:51 -0000	1.203
+++ task.pinc	26 Oct 2008 09:39:55 -0000	1.203.2.1
@@ -935,6 +935,9 @@
     $sep = '';
     $c = 0;
     foreach ($this->worker as $i => $x) {
+      if (!is_object($x)) {
+        continue;
+      }
       $info .= $sep.$this->worker[$i]->getShortName();
       $sep = ', ';
       if ($c == 4) {

Update of /cvsroot/tutos/tutos/php/report-engine/rep_mta
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20974/report-engine/rep_mta

Modified Files:
      Tag: BRANCH-1-4
	rep_mta.pinc 
Log Message:
fix

Index: rep_mta.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_mta/rep_mta.pinc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- rep_mta.pinc	16 Dec 2006 13:08:29 -0000	1.3
+++ rep_mta.pinc	26 Oct 2008 09:19:18 -0000	1.3.2.1
@@ -68,7 +68,7 @@
         }
       }
       $this->format = "png";
-      if (!load_jpgraph( array("jpgraph_scatter.php","jpgraph_line.php") )) {
+      if (!load_jpgraph( array("jpgraph_scatter.php","jpgraph_line.php"),'../' )) {
         die($url);
       };
 
@@ -159,7 +159,7 @@
                       $this->obj->desc1 ."\n". 
                       $lang['ProdDesc2'].":\n".
                       $this->obj->desc2);
-        $txt->Pos(900 - 40 ,580 - 20 ,"right","bottom");
+        $txt->SetPos(900 - 40 ,580 - 20 ,"right","bottom");
         $txt->SetFont(FF_FONT1,FS_NORMAL);
         $txt->SetWordWrap(50);
         $txt->ParagraphAlign('left');
@@ -170,7 +170,7 @@
         unset ($txt);
       }
       $txt=new Text("generated by TUTOS ".$tutos[version] ." http://www.tutos.org");
-      $txt->Pos(20 ,580 - 10 ,"left","bottom");
+      $txt->SetPos(20 ,580 - 10 ,"left","bottom");
       $txt->SetFont(FF_FONT0,FS_NORMAL);
       $txt->ParagraphAlign('left');
 #      $txt->SetBox('white','navy','gray');
@@ -180,7 +180,7 @@
 
       $x = new TUTOS_Date_Time();
       $txt=new Text($x->getDateTime());
-      $txt->Pos(0.5 ,580 - 10 ,"center","bottom");
+      $txt->SetPos(0.5 ,580 - 10 ,"center","bottom");
       $txt->SetFont(FF_FONT0,FS_NORMAL);
       $txt->ParagraphAlign('left');
 #      $txt->SetBox('white','navy','gray');
@@ -231,4 +231,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/report-engine/rep_prodstat
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20974/report-engine/rep_prodstat

Modified Files:
      Tag: BRANCH-1-4
	rep_prodstat.pinc 
Log Message:
fix

Index: rep_prodstat.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_prodstat/rep_prodstat.pinc,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- rep_prodstat.pinc	12 Oct 2004 06:35:20 -0000	1.2
+++ rep_prodstat.pinc	26 Oct 2008 09:19:18 -0000	1.2.4.1
@@ -17,7 +17,7 @@
   function show() {
     global $tutos,$lang;
 
-    if (!load_jpgraph( array("jpgraph_gantt.php","jpgraph_pie.php","jpgraph_pie3d.php","jpgraph_bar.php") )) {
+    if (!load_jpgraph( array("jpgraph_gantt.php","jpgraph_pie.php","jpgraph_pie3d.php","jpgraph_bar.php"),'../' )) {
       die($msg);
     };
     $graph = new PieGraph(400,200);
@@ -48,4 +48,4 @@
 
 }
 
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/report-engine/rep_mta
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19825

Modified Files:
	rep_mta.pinc 
Log Message:
fix


Index: rep_mta.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_mta/rep_mta.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rep_mta.pinc	16 Dec 2006 13:08:29 -0000	1.3
+++ rep_mta.pinc	26 Oct 2008 08:56:18 -0000	1.4
@@ -30,9 +30,9 @@
 #   echo $this->from->getYYYYMMDD(). $this->from->notime;
     if ($_GET['type'] == "download") {
       $this->format = "png";
-        } else {
+    } else {
       $this->format = "html";
-        }
+    }
 
   }
 
@@ -68,12 +68,12 @@
         }
       }
       $this->format = "png";
-      if (!load_jpgraph( array("jpgraph_scatter.php","jpgraph_line.php") )) {
+      if (!load_jpgraph( array("jpgraph_scatter.php","jpgraph_line.php"),'../' )) {
         die($url);
       };
 
       $graph = new Graph(900,580);
-      $graph->img->SetAntiAliasing();
+#      $graph->img->SetAntiAliasing();
       $graph->img->SetMargin(100,400,40,140);
       $graph->SetScale("linlin");
       $graph->title->Set($lang['rep_mta_name']."\n". $lang[$this->obj->getType()] .": ". $this->obj->getFullName());
@@ -159,7 +159,7 @@
                       $this->obj->desc1 ."\n". 
                       $lang['ProdDesc2'].":\n".
                       $this->obj->desc2);
-        $txt->Pos(900 - 40 ,580 - 20 ,"right","bottom");
+        $txt->SetPos(900 - 40 ,580 - 20 ,"right","bottom");
         $txt->SetFont(FF_FONT1,FS_NORMAL);
         $txt->SetWordWrap(50);
         $txt->ParagraphAlign('left');
@@ -170,7 +170,7 @@
         unset ($txt);
       }
       $txt=new Text("generated by TUTOS ".$tutos[version] ." http://www.tutos.org");
-      $txt->Pos(20 ,580 - 10 ,"left","bottom");
+      $txt->SetPos(20 ,580 - 10 ,"left","bottom");
       $txt->SetFont(FF_FONT0,FS_NORMAL);
       $txt->ParagraphAlign('left');
 #      $txt->SetBox('white','navy','gray');
@@ -180,7 +180,7 @@
 
       $x = new TUTOS_Date_Time();
       $txt=new Text($x->getDateTime());
-      $txt->Pos(0.5 ,580 - 10 ,"center","bottom");
+      $txt->SetPos(0.5 ,580 - 10 ,"center","bottom");
       $txt->SetFont(FF_FONT0,FS_NORMAL);
       $txt->ParagraphAlign('left');
 #      $txt->SetBox('white','navy','gray');

Update of /cvsroot/tutos/tutos/php/report-engine
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17720

Modified Files:
      Tag: BRANCH-1-4
	reporter.pinc 
Log Message:
bugfix


Index: reporter.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/reporter.pinc,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- reporter.pinc	3 Aug 2008 19:45:50 -0000	1.15
+++ reporter.pinc	26 Oct 2008 08:03:23 -0000	1.15.2.1
@@ -132,13 +132,13 @@
     }
 
     $xa = array();
-    foreach ($lang['rep_category'] as $i) {
+    foreach ($lang['rep_category'] as $i => $f) {
       $x[$i] = 0;
       foreach ($user->list[usereporter] as $j) {
         if($j['category'] == $i) $x[$i]++;
       }
       if ($x[$i] > 0) {
-       $xa[$i] = array( url => "report-engine/report_overview.php?class=".$tutos['pageclass']."&type=".$tutos['pagetype'].'&cat='.$i,
+       $xa[] = array( url => "report-engine/report_overview.php?class=".$tutos['pageclass']."&type=".$tutos['pagetype'].'&cat='.$i,
                   text => ($text == "" ? $lang['rep_category'][$i] : $text),
                   info => $lang['rep_category_info'][$i],
                   category => array("module")

Update of /cvsroot/tutos/tutos/php/checklist
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25471/checklist

Modified Files:
	checkfield_overview.php checklist.pinc checklist_ins.php 
	checklist_show.php checklist_update.php 
Log Message:
permission changes (and more).User needs only use permission to fill checkfields

Index: checklist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist.pinc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- checklist.pinc	5 Oct 2008 18:17:55 -0000	1.38
+++ checklist.pinc	8 Oct 2008 18:41:31 -0000	1.39
@@ -235,7 +235,7 @@
   /**
    * Return a link to this checklist
    */
-  function getLink($text = "") {
+  function getLink2($text = "") {
     global $lang;
 
     if ( empty($text) ) {
@@ -248,6 +248,24 @@
     }
   }
   /**
+   * Return a link to this checklist
+   */
+  function getLink($text = "") {
+    global $lang;
+
+    if ( empty($text) ) {
+      $text = $this->getFullName();
+    }
+    if ( $this->use_ok() ) {
+      return makelink('checklist/checkfield_overview.php?mode=checklist&link_id='.$this->id ,myentities($text),sprintf($lang['ChecklistDetail4'],$this->getFullName()));
+	} else if ( $this->see_ok() ) {
+      return makelink('checklist/checkfield_overview.php?link_id='.$this->id ,myentities($text),sprintf($lang['ChecklistDetail4'],$this->getFullName()));
+#      return makelink($this->getURL() ,myentities($text),sprintf($lang['ChecklistDetail4'],$this->getFullName()));
+    } else {
+      return myentities($text);
+    }
+  }
+  /**
    * Save Checklist to DB
    */
   function save() {
@@ -379,7 +397,7 @@
                   category => array("checklist","new","module")
                 );
     }
-    if ($user->feature_ok(usechecklists,PERM_USE) ) {
+    if ($user->feature_ok(usechecklists,PERM_MOD) ) {
       $x2 = array( url => "checklist/checklist_new.php?link_id=". $obj->id."&type=".CL_TYPE_WORKING,
                   confirm => false,
                   text => ($text == "" ? $lang['ChecklistInstance']:$text),

Index: checklist_update.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_update.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- checklist_update.php	2 Jun 2008 06:58:30 -0000	1.7
+++ checklist_update.php	8 Oct 2008 18:41:31 -0000	1.8
@@ -20,7 +20,7 @@
 loadmodule("checklist");
 
 $gotourl = "checklist/checkfield_overview.php";
-$gotourl= addUrlParameter( $gotourl, "format=checklist",true);
+$gotourl= addUrlParameter( $gotourl, "mode=checklist",true);
 
 $msg = "";
 $clid = $HTTP_GET_VARS['id'];

Index: checklist_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_show.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- checklist_show.php	2 Jun 2008 06:58:30 -0000	1.16
+++ checklist_show.php	8 Oct 2008 18:41:31 -0000	1.17
@@ -1,7 +1,7 @@
 <?php
 /*
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2007 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -107,7 +107,8 @@
      }
      if ( $this->obj->mod_ok() ) {
        echo menulink("checklist/checklist_new.php?id=". $this->obj->id ,$lang['Modify'],sprintf($lang['ChecklistModify'],$this->obj->getFullName())) ."<br />\n";
-
+	 }
+     if ( $this->obj->use_ok() ) {
        if ( $this->obj->type == CL_TYPE_TEMPL ) { // Class
          echo menulink("checklist/checkfield_new.php?link_id=". $this->obj->id ,$lang['CheckfieldCreate'],sprintf($lang['CheckfieldCreate'],$this->obj->getFullName())) ."<br />\n";
        }
@@ -115,14 +116,14 @@
        echo menulink("checklist/checkfield_overview.php?link_id=". $this->obj->id,$lang['CheckfieldOverview'],$lang['CheckfieldOverview']) ."<br />\n";
 
        if ( $this->obj->type == CL_TYPE_TEMPL ) { // Class
-         echo menulink("checklist/checkfield_overview.php?link_id=". $this->obj->id."&format=checklist" ,$lang['ChecklistDefaultEditor'],$lang['ChecklistDefaultEditor']) ."<br />\n";
+         echo menulink("checklist/checkfield_overview.php?link_id=". $this->obj->id."&mode=checklist" ,$lang['ChecklistDefaultEditor'],$lang['ChecklistDefaultEditor']) ."<br />\n";
        } elseif ( $this->obj->type == CL_TYPE_WORKING ) { // working-copy
-         echo menulink("checklist/checkfield_overview.php?link_id=". $this->obj->id."&format=checklist" ,$lang['ChecklistEditor'],$lang['ChecklistEditor']) ."<br />\n";
+         echo menulink("checklist/checkfield_overview.php?link_id=". $this->obj->id."&mode=checklist" ,$lang['ChecklistEditor'],$lang['ChecklistEditor']) ."<br />\n";
          echo menulink("checklist/checklist_update.php?id=". $this->obj->id ,$lang['ChecklistInstanceUpdate'],$lang['ChecklistInstanceUpdate']) ."&nbsp;<br />\n";
        }
        
        if ( $this->obj->type == CL_TYPE_TEMPL ) { // Class
-         echo menulink("checklist/checklist_new.php?link_id=". $this->obj->id."&format=checklist" ,$lang['ChecklistInstance'],$lang['ChecklistInstance']) ."<br />\n";
+         echo menulink("checklist/checklist_new.php?link_id=". $this->obj->id."&mode=checklist" ,$lang['ChecklistInstance'],$lang['ChecklistInstance']) ."<br />\n";
        }
      }
      echo "</td></tr>";

Index: checklist_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_ins.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- checklist_ins.php	5 May 2008 12:07:06 -0000	1.15
+++ checklist_ins.php	8 Oct 2008 18:41:31 -0000	1.16
@@ -33,7 +33,7 @@
 $msg = "";
 
 if ( isset($_POST['checklist_ins']) && ($_POST['checklist_ins'] == 'from_editor') ) {
-  $gotourl = "checklist/checkfield_overview.php?format=checklist";
+  $gotourl = "checklist/checkfield_overview.php?mode=checklist";
   $gotourl= addUrlParameter($gotourl,"link_id=". $_POST['ref_id'],true);
   $new_cl = new checklist($dbconn);
   $new_cl = $new_cl->read( $_POST['ref_id'],$new_cl);
@@ -138,7 +138,7 @@
   }
   $new_cl_inst->generateCheckFields();
   $new_cl_inst->save();
-  $gotourl = "checklist/checkfield_overview.php?format=checklist";
+  $gotourl = "checklist/checkfield_overview.php?mode=checklist";
   $gotourl= addUrlParameter($gotourl,"link_id=". $new_cl_inst->id);
   Header("Status: 302 Moved Temporarily");
   Header("Location: ../". $gotourl);

Index: checkfield_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_overview.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- checkfield_overview.php	20 Aug 2008 08:30:04 -0000	1.33
+++ checkfield_overview.php	8 Oct 2008 18:41:31 -0000	1.34
@@ -43,7 +43,7 @@
       return;
     }
 
-    if ($this->format == "checklist") {
+    if ($this->mode == "checklist") {
       echo "<form name=\"editchecklist\" action=\"checklist_ins.php\" method=\"post\">\n";
       echo $this->OverviewTableStart();
       echo "<thead>\n";
@@ -54,10 +54,10 @@
         $tmp_checklist = new checklist( $this->dbconn);
         $tmp_checklist =  $tmp_checklist->read( $this->checklistID,$tmp_checklist);
         if ( $tmp_checklist->type == CL_TYPE_TEMPL ) {  // class
-          echo sprintf($lang['ChecklistOKClass'],$tmp_checklist->getLink());
+          echo sprintf($lang['ChecklistOKClass'],$tmp_checklist->getLink2());
         } else
         if ( $tmp_checklist->type == CL_TYPE_WORKING ) {  // instance
-          echo sprintf($lang['ChecklistOKInstance'],$tmp_checklist->getLink());
+          echo sprintf($lang['ChecklistOKInstance'],$tmp_checklist->getLink2());
         } else {
           echo "?";
         }
@@ -217,7 +217,7 @@
       if ( $this->checklistID > 0 ) {
         echo menulink("checklist/checkfield_new.php?link_id=".$this->checklistID,$lang['NewEntry'],$lang['CheckfieldCreate']) . "<br />\n";
         echo menulink("checklist/checkfield_overview.php?link_id=".$this->checklistID,$lang['CheckfieldOverview'],$lang['CheckfieldOverview']) . "<br />\n";
-        echo menulink("checklist/checkfield_overview.php?link_id=".$this->checklistID."&format=checklist" ,$lang['ChecklistEditor'],$lang['ChecklistEditor']) ."<br />\n";
+        echo menulink("checklist/checkfield_overview.php?link_id=".$this->checklistID."&mode=checklist" ,$lang['ChecklistEditor'],$lang['ChecklistEditor']) ."<br />\n";
         echo menulink("checklist/checklist_show.php?id=".$this->checklistID,$lang['ChecklistDetail'],$lang['ChecklistDetail']) ."<br />\n";
 
         $tmp_checklist = new checklist( $this->dbconn);
@@ -235,8 +235,12 @@
    */
   Function prepare() {
     global $msg,$lang;
+    $this->mode = '';
+    if ( isset($_REQUEST['mode']) ) {
+      $this->mode = $_REQUEST['mode'];
+    }
 
-    if ($this->format == "checklist") {
+    if ($this->mode == "checklist") {
       $this->name = $lang['ChecklistEditor'];
     } else {
       $this->name = $lang['ChecklistDetail'];
@@ -267,8 +271,8 @@
     // sorting
     $xxx = "";
     $this->link2 = $this->link1;
-    if ($this->format == "checklist") {
-      $this->link2 = addUrlParameter($this->link2,"format=checklist");
+    if ($this->mode == "checklist") {
+      $this->link2 = addUrlParameter($this->link2,"mode=checklist");
     }
     order_parse($this->q,$this->link1,$xxx,$xxx,"f_pos");
   }

Update of /cvsroot/tutos/tutos/php/layout
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6763/php/layout

Modified Files:
	new_layout.pinc 
Log Message:
more flexible report stuff

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- new_layout.pinc	29 Jun 2008 12:23:53 -0000	1.78
+++ new_layout.pinc	6 Oct 2008 19:33:30 -0000	1.79
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2003 - 2007 by Gero Kohnert
+ *  Copyright 2003 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -576,7 +576,8 @@
     foreach ($this->menu as $i => $m) {
       $attr = "";
       if ( !isset($m[text])|| ($m[text] == '') ) {
-        continue;
+        $m[text] = '??';
+#        continue;
       }
       if ($img) {
         $t = (isset($m[image])?$m[image]:""). myentities($m[text]);
@@ -618,6 +619,7 @@
         }
         $r .= "\n";
         unset($this->menu[$i][text]);
+        unset($this->menu[$i]);
       }
     }
     if ($r != '') {

Update of /cvsroot/tutos/tutos/php/report-engine
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6763/php/report-engine

Modified Files:
	report_overview.php report_show.php reporter.pinc 
Log Message:
more flexible report stuff

Index: report_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/report_overview.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- report_overview.php	3 Aug 2008 19:45:50 -0000	1.10
+++ report_overview.php	6 Oct 2008 19:33:30 -0000	1.11
@@ -49,7 +49,7 @@
        echo "<tr>\n";
        echo " <td>&nbsp;". $x->report->getFullName() ."</td>\n";
        echo " <td>\n";
-       echo "   <form target=\"report\" method=\"get\" action=\"report_show.php\">\n";
+       echo '   <form '. ($x->target != '' ? ' target="'.$x->target.'"':'') ." method=\"get\" action=\"report_show.php\">\n";
        echo "     <input type=\"hidden\" name=\"name\" value=\"".$i."\" />\n";
        echo "     <input type=\"hidden\" name=\"type\" value=\"".$this->obj->type ."\" />\n";
        echo "     <input type=\"hidden\" name=\"class\" value=\"".$this->obj->class ."\" />\n";

Index: report_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/report_show.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- report_show.php	8 Aug 2007 12:19:22 -0000	1.6
+++ report_show.php	6 Oct 2008 19:33:30 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2006 by Gero Kohnert
+ *  Copyright 2004 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: reporter.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/reporter.pinc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- reporter.pinc	3 Aug 2008 19:45:50 -0000	1.15
+++ reporter.pinc	6 Oct 2008 19:33:30 -0000	1.16
@@ -24,11 +24,13 @@
     global $tutos,$current_user,$table;
 
     $this->init($dbconn);
+    $this->category = 1;
     $this->class = '';
     $this->type = '';
     $this->rep_obj_id = -1;
     $this->rep_obj = -1;
     $this->report = -1;
+    $this->target = 'report';
   }
 
   /**
@@ -54,7 +56,12 @@
     }
     $cname = $report[$name]['classname'];
     $this->report = new $cname($this->dbconn,$report[$name]);
-
+	if (isset($report[$name]['category'])) {
+  	  $this->category = $report[$name]['category'];
+	}
+	if (isset($report[$name]['target'])) {
+  	  $this->target = $report[$name]['target'];
+	}
     ReadLang1($lang,dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] ),$current_user);
 #   echo dirname($tutos['base'] ."/php/report-engine/".$report[$name]['dir']."/".$report[$name]['file'] )." XXX<br />";
     return;
@@ -182,4 +189,4 @@
 
   }
 }
-?>
+?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/invoice
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3763/php/invoice

Modified Files:
	invoice.pinc 
Log Message:
updates

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- invoice.pinc	23 Nov 2007 05:32:14 -0000	1.64
+++ invoice.pinc	5 Oct 2008 18:17:55 -0000	1.65
@@ -388,6 +388,7 @@
     $this->state = 1;
     $this->pos = array();
     $this->customer_id = -1;
+    $this->customer = null;
     $this->accountant = $current_user->id;
     $this->datesent[0] = new TUTOS_Date_Time(0);
     $this->datedue[0] = new TUTOS_Date_Time(0);
@@ -619,8 +620,8 @@
   /**
    * set the Customer
    */
-  function setCustomer($obj) {
-	if (!is_object($obj)) return;
+  function setCustomer(&$obj) {
+    if (!is_object($obj)) return;
     if ( ($this->customer_id != $obj->id) ) {
       $this->modified[] = array ( "field" => "Customer", "old" => $this->customer_id , "new" => $obj->id );
       $this->customer = $obj;

Update of /cvsroot/tutos/tutos
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3763

Modified Files:
	ChangeLog test.sh 
Log Message:
updates

Index: test.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/test.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- test.sh	29 Jun 2008 12:23:52 -0000	1.6
+++ test.sh	5 Oct 2008 18:17:55 -0000	1.7
@@ -30,11 +30,11 @@
 COOKIES=test.cookies
 
 
-ADR=1000
+ADR=1015
 
 USER=superuser
 PW=tutos
-DBNR=0
+DBNR=6
 
 CHECKURI=http://validator.w3.org/check?uri=
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- ChangeLog	13 Sep 2008 19:29:51 -0000	1.123
+++ ChangeLog	5 Oct 2008 18:17:55 -0000	1.124
@@ -1,6 +1,8 @@
 #$Header$
 	* additional replace fields supported in $tutos[bugautoname]
-	* custom object type allows to refeernce objects
+	* custom object type allows to reference objects
+	* new support for sqlite 2.*
+	* modified bugautoname replacement keys (see comment in config_default.pinc)
 20 August 2008
 	* Release 1.4
 	* much bugfixes

Update of /cvsroot/tutos/tutos/php/db
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5821

Modified Files:
	db_mysql.pinc 
Log Message:
fix the fix


Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- db_mysql.pinc	5 Oct 2008 19:01:18 -0000	1.42
+++ db_mysql.pinc	5 Oct 2008 19:02:43 -0000	1.43
@@ -294,10 +294,10 @@
     }
     else if ( $this->db->crypt == 3 ) {
       return "old_password('".$pw."')";
-	}
+    }
     else if ( $this->db->crypt == 2 ) {
       return "password('".$pw."')";
-	}
+    }
     return "'". crypt($pw,"271166") ."'";
   }
   /* ---------------------------------------------------------------------------
@@ -653,9 +653,10 @@
    */
   function free() {
     if ( empty($this->rs) ) return -1;
-	if (is_resource($this->rs)) {
+    if (is_resource($this->rs)) {
       return mysql_free_result($this->rs);
+    }
   }
 
 }
-?>
+?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/db
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5676

Modified Files:
	db_mysql.pinc 
Log Message:
fix


Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- db_mysql.pinc	10 Sep 2008 17:44:42 -0000	1.41
+++ db_mysql.pinc	5 Oct 2008 19:01:18 -0000	1.42
@@ -653,7 +653,8 @@
    */
   function free() {
     if ( empty($this->rs) ) return -1;
-    return mysql_free_result($this->rs);
+	if (is_resource($this->rs)) {
+      return mysql_free_result($this->rs);
   }
 
 }

Update of /cvsroot/tutos/tutos/php/file
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5073

Modified Files:
	file.pinc 
Log Message:
fix


Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- file.pinc	18 Aug 2008 11:36:40 -0000	1.76
+++ file.pinc	5 Oct 2008 18:47:14 -0000	1.77
@@ -522,27 +522,27 @@
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       myreadfile ($this->base ."/". $this->fileloc);
       return;
-    } else if ( ereg("\.tar\.gz$",$this->filename) ) {
+    } else if ( eregi("\.tar\.gz$",$this->filename) ) {
       Header("Content-type: text/plain");
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       @passthru("tar tzvf \"". $this->base ."/". $this->fileloc ."\"");
       return;
-    } else if ( ereg("\.rpm$",$this->filename) ) {
+    } else if ( eregi("\.rpm$",$this->filename) ) {
       Header("Content-type: text/plain");
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       @passthru("rpm -qivlp \"". $this->base ."/". $this->fileloc ."\"");
       return;
-    } else if ( ereg("\.zip$",$this->filename) ) {
+    } else if ( eregi("\.zip$",$this->filename) ) {
       Header("Content-type: text/plain");
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       @passthru("zipinfo -zl \"". $this->base ."/". $this->fileloc ."\"");
       return;
-    } else if ( ereg("\.tar\.bz2$",$this->filename) ) {
+    } else if ( eregi("\.tar\.bz2$",$this->filename) ) {
       Header("Content-type: text/plain");
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       @passthru("tar tIvf \"". $this->base ."/". $this->fileloc ."\"");
       return;
-    } else if ( ereg("\.dxf$",$this->filename) 
+    } else if ( eregi("\.dxf$",$this->filename) 
                && file_exists($tutos[dxf2fig]) && is_executable($tutos[dxf2fig]) 
                && file_exists($tutos[fig2dev]) && is_executable($tutos[fig2dev]) 
      ) {
@@ -563,7 +563,7 @@
       unlink($tmpname1);
       unlink($tmpname2);
       return;
-    } else if ( ereg("\.fig$",$this->filename) && file_exists($tutos[fig2dev]) && is_executable($tutos[fig2dev]) ) {
+    } else if ( eregi("\.fig$",$this->filename) && file_exists($tutos[fig2dev]) && is_executable($tutos[fig2dev]) ) {
       Header("Expires: 0");
       Header("Cache-control: no-cache");
       Header("Content-type: image/gif");
@@ -581,7 +581,12 @@
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       @passthru($tutos[tiffConvert] . " -sample 842x1190 ". $this->base ."/". $this->fileloc ." jpeg:-");
       return;
-    } else if ( ereg("image/.*",$this->filetype) ) {
+    } else if ( ereg("image/.*",$this->filetype) 
+            ||  eregi("\.jpg$",$this->filename)
+            ||  eregi("\.jpeg$",$this->filename)
+            ||  eregi("\.gif$",$this->filename)
+            ||  eregi("\.png$",$this->filename)
+               ) {
       Header("Content-type: ". $this->filetype);
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       myreadfile ($this->base ."/". $this->fileloc);

Update of /cvsroot/tutos/tutos/php/mailbox
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3763/php/mailbox

Modified Files:
	mailbox.pinc 
Log Message:
updates

Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox.pinc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mailbox.pinc	22 Sep 2008 17:52:57 -0000	1.30
+++ mailbox.pinc	5 Oct 2008 18:17:55 -0000	1.31
@@ -620,14 +620,14 @@
       $a++;
       unset($m);
     }
-	$r->free();
+    $r->free();
     return;
   }
   /**
    * a object that uses mailboxes is deleted
    */
   Function obj_delete(&$user,&$obj) {
-    $msg = "";
+    $msg = '';
     mailbox::obj_read($obj);
     if (!isset($obj->list[usemailboxes])) {
       return $msg;
@@ -700,4 +700,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/checklist
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3763/php/checklist

Modified Files:
	checkfield.pinc checklist.pinc 
Log Message:
updates

Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- checkfield.pinc	13 Sep 2008 19:29:54 -0000	1.26
+++ checkfield.pinc	5 Oct 2008 18:17:55 -0000	1.27
@@ -1,7 +1,7 @@
 <?php
 /**
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2002 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: checklist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist.pinc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- checklist.pinc	20 Aug 2008 08:30:04 -0000	1.37
+++ checklist.pinc	5 Oct 2008 18:17:55 -0000	1.38
@@ -215,6 +215,18 @@
     return "checklist/checklist_show.php?id=". $this->id;
   }
   /**
+   * Return a url that displays this resource
+   */
+  function getModURL() {
+    return "checklist/checklist_new.php?id=". $this->id;
+  }
+  /**
+   * Return a url that displays this resource
+   */
+  function getDelURL() {
+    return "checklist/checklist_del.php?id=". $this->id;
+  }
+  /**
    *  Return a fullname
    */
   function getFullname() {

Update of /cvsroot/tutos/tutos/homepage
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3763/homepage

Modified Files:
	modules.php 
Log Message:
updates

Index: modules.php
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/modules.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- modules.php	27 Jan 2008 19:58:17 -0000	1.2
+++ modules.php	5 Oct 2008 18:17:55 -0000	1.3
@@ -20,7 +20,7 @@
 	Date("d.m.Y H:i:s T") ." \t".
 	$x2."\t".
 	$_SERVER['HTTP_USER_AGENT'] ."\n"
-	,3,"/tmp/persistent/tutos/mod.log");
+	,3,"mod.log");
 
 ?>
 Name|ID|STATUS|VERSION|VERSIONREQUIRED|LOCATION|DOWNLOADURL|LICENSE|DESCRIPTION

Update of /cvsroot/tutos/tutos/php
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3763/php

Modified Files:
	address_show.php database.pinc location.pinc 
Log Message:
updates

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- location.pinc	12 Oct 2007 14:12:47 -0000	1.89
+++ location.pinc	5 Oct 2008 18:17:55 -0000	1.90
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- address_show.php	2 Jan 2007 19:59:56 -0000	1.105
+++ address_show.php	5 Oct 2008 18:17:55 -0000	1.106
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2008 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- database.pinc	2 Oct 2008 11:04:14 -0000	1.67
+++ database.pinc	5 Oct 2008 18:17:55 -0000	1.68
@@ -175,8 +175,8 @@
       if ( is_object($r) && ($r->numrows() > 0) ) {
         $obj->read_result($r,0);
         $obj->dbentryexist = true;
+        $r->free();
       }
-      $r->free();
     }
     
     # For all DB ids between 0 and 1000 the connection part of the description is 

Update of /cvsroot/tutos/tutos/php/checklist
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25942

Modified Files:
      Tag: BRANCH-1-4
	checkfield_new.php 
Log Message:
bugfix in Stable Branch

Index: checkfield_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_new.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- checkfield_new.php	13 Sep 2008 19:29:54 -0000	1.12
+++ checkfield_new.php	2 Oct 2008 15:18:49 -0000	1.12.2.1
@@ -159,7 +159,7 @@
       $this->obj->read_reference();
     }
 
-	if (!$this->stop && $this->ref == null) {
+	if (!$this->stop && $this->obj->ref == null) {
       $msg .= sprintf($lang['Err0012'],$lang['Checklist'],'');
       $this->stop = true;
 	}

Update of /cvsroot/tutos/tutos/php/checklist
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25333

Modified Files:
	checkfield_new.php 
Log Message:
bugfix


Index: checkfield_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_new.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- checkfield_new.php	13 Sep 2008 19:29:54 -0000	1.12
+++ checkfield_new.php	2 Oct 2008 15:08:32 -0000	1.13
@@ -159,7 +159,7 @@
       $this->obj->read_reference();
     }
 
-	if (!$this->stop && $this->ref == null) {
+	if (!$this->stop && $this->obj->ref == null) {
       $msg .= sprintf($lang['Err0012'],$lang['Checklist'],'');
       $this->stop = true;
 	}

Update of /cvsroot/tutos/tutos/php
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13123/php

Modified Files:
	address_new.php 
Log Message:
better checks

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- address_new.php	22 Jun 2008 19:42:17 -0000	1.84
+++ address_new.php	2 Oct 2008 11:05:20 -0000	1.85
@@ -241,7 +241,7 @@
          $this->addHidden("year_". $varname,$varvalue->year);
        }
      } elseif ( $varname == 'picture' ) {
-       if ( $mod == true ) {
+       if (is_object($varvalue) && ($mod == true) ) {
          echo ' <input size="30" id="picture" name="file" type="file" value="'. myentities($varvalue->pic_path) ."\" />\n";
          $this->addHidden("pic_id",$varvalue->id);
          if ( $varvalue->id > 0 ) {
@@ -377,10 +377,10 @@
        }
      }
 
-     if ( isset($this->loc->company) ) {
+     if ( is_object($this->loc->company) ) {
        $this->loc->company_name = $this->loc->company->name;
      }
-     if ( isset($this->loc->department) ) {
+     if ( is_object($this->loc->department) ) {
        $this->loc->department_name = $this->loc->department->name;
      }
      if ( isset($_GET['company']) ) {
@@ -445,10 +445,12 @@
      if ( isset($_GET['bd']) ) {
        $this->obj->birthday->setDateTime($_GET['bd']);
      }
-     if ( isset($_GET['pic_path']) ) {
-       $this->obj->pic_file->pic_path = StripSlashes($_GET['pic_path']);
-     } else {
-       $this->obj->pic_file->pic_path = "";
+     if (is_object($this->obj->pic_file)) {
+       if ( isset($_GET['pic_path']) ) {
+         $this->obj->pic_file->pic_path = StripSlashes($_GET['pic_path']);
+       } else {
+         $this->obj->pic_file->pic_path = "";
+       }
      }
      if (($this->obj->id < 0) && !$this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
@@ -556,4 +558,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Update of /cvsroot/tutos/tutos/php/db
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12936/php/db

Modified Files:
	db_sqlite3.pinc 
Log Message:
freeing resultsets

Index: db_sqlite3.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_sqlite3.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- db_sqlite3.pinc	21 Sep 2008 16:41:36 -0000	1.1
+++ db_sqlite3.pinc	2 Oct 2008 11:04:14 -0000	1.2
@@ -597,7 +597,8 @@
       $this->Exec($q,0);
     }
     $q = "vacuum";
-    $this->Exec($q,0);
+    $r = $this->Exec($q,0);
+    $r->free();
     $this->db->setLastAnalyze($now);
     $msg = $this->db->save();
     return $msg;

Update of /cvsroot/tutos/tutos/php
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12936/php

Modified Files:
	database.pinc acl.pinc address.pinc 
Log Message:
freeing resultsets

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- database.pinc	21 Sep 2008 16:41:30 -0000	1.66
+++ database.pinc	2 Oct 2008 11:04:14 -0000	1.67
@@ -174,9 +174,9 @@
       $r = $obj->dbconn->Exec($q,0);
       if ( is_object($r) && ($r->numrows() > 0) ) {
         $obj->read_result($r,0);
-        $r->free();
         $obj->dbentryexist = true;
       }
+      $r->free();
     }
     
     # For all DB ids between 0 and 1000 the connection part of the description is 
@@ -377,7 +377,8 @@
       $query = $q->getUpdate();
     }
 
-    $this->dbconn->Exec($query);
+    $r = $this->dbconn->Exec($query);
+    $r->free();
     $msg .= parent::save();
 
     return $msg;
@@ -577,8 +578,8 @@
     $msg = "";
 
     $q = "DELETE FROM ". $this->tablename ." WHERE id = ". $this->id;
-    $this->dbconn->Exec($q);
-
+    $r = $this->dbconn->Exec($q);
+    $r->free();
     $msg .= parent::delete();
     return $msg;
   }

Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- acl.pinc	20 Aug 2008 08:30:03 -0000	1.74
+++ acl.pinc	2 Oct 2008 11:04:14 -0000	1.75
@@ -127,10 +127,12 @@
     while ( list ($i,$f) = @each ($obj->acl) ) {
       if ( ($i > -1) && (gettype($i) == "integer") && ($f > 0) ) {
         $q = 'INSERT INTO '. $obj->dbconn->prefix .'acl (obj_id,adr_id,perm) VALUES ('. $id .','. $i .','. $f .')';
-        $r = $obj->dbconn->Exec($q);
+        $r2 = $obj->dbconn->Exec($q);
+        $r2->free();
       }
     }
   }
+  $r->free();
 }
 /**
  * delete acl entries for a object to be deleted
@@ -142,8 +144,10 @@
 
   $q = 'DELETE FROM '. $obj->dbconn->prefix .'acl WHERE obj_id = '. $obj->id .' OR adr_id = '. $obj->id;
   $r = $obj->dbconn->Exec($q);
+  $r->free();
   $q = 'DELETE FROM '. $obj->dbconn->prefix .'acldefault WHERE obj_id = '. $obj->id .' OR adr_id = '. $obj->id;
   $r = $obj->dbconn->Exec($q);
+  $r->free();
 
   return $msg;
 }
@@ -206,6 +210,7 @@
   $msg = '';
   $q = 'DELETE FROM '. $obj->dbconn->prefix .'acldefault WHERE obj_id = '. $obj->id;
   $r = $obj->dbconn->Exec($q);
+  $r->free();
 
   return $msg;
 }
@@ -512,4 +517,4 @@
   }
   return $url;
 }
-?>
\ No newline at end of file
+?>

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- address.pinc	13 Jun 2008 19:54:31 -0000	1.125
+++ address.pinc	2 Oct 2008 11:04:14 -0000	1.126
@@ -432,6 +432,7 @@
       if ( $this->pic_id > 0 ) {
         $q = "DELETE FROM ". $this->dbconn->prefix ."files WHERE id = ". $this->pic_id;
         $r = $this->dbconn->Exec($q);
+        $r->free();
       }
 
 #    $msg .= tutos_file::obj_delete($current_user,$this);