tutos-commits Mailing List for TUTOS

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

Modified Files:
	watchlist.pinc 
Log Message:
fix

Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- watchlist.pinc	16 May 2006 09:08:59 -0000	1.58
+++ watchlist.pinc	31 Jul 2006 08:27:13 -0000	1.59
@@ -172,7 +172,8 @@
   function getaddlink (&$user,&$obj,$text = "") {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    if (! is_object($obj) ) return '';
+    if ( $obj->id == -1 ) return '';
     if ( ! $obj->see_ok() ) return;
 
     if ( ! $user->feature_ok(usewatchlist,PERM_NEW) ) return;

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

Modified Files:
	address_show.php address_tools.p3 app_new.php app_overview.php 
	app_show.php appointment.pinc location.pinc mail.pinc 
	permission.p3 webelements.p3 
Log Message:
some patches to remove warnings. Thanks to Gabor Janak <g.janak at unicontrol.de>

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- address_show.php	28 Jan 2006 22:03:05 -0000	1.102
+++ address_show.php	25 Jul 2006 11:19:55 -0000	1.103
@@ -173,11 +173,11 @@
        if ($r->numrows() == 1) {
          $id = $r->get(0, "adr_id");
          $this->obj = $this->obj->read($id,$this->obj);
-         if ( ($this->obj == -1) || ($this->obj->id < 0) ) {
+         if ( (is_numeric($this->obj) && $this->obj == -1) || ($this->obj->id < 0) ) {
            $this->obj = new company($this->dbconn);
            $this->obj = $this->obj->read($id,$this->obj);
          }
-         if ( ($this->obj == -1) || ($this->obj->id < 0) ) {
+         if ( (is_numeric($this->obj) && $this->obj == -1) || ($this->obj->id < 0) ) {
            $this->obj = new department($this->dbconn);
            $this->obj = $this->obj->read($id,$this->obj);
          }
@@ -185,7 +185,7 @@
        $r->free();
      }
 
-     if ( $this->obj == -1 ) {
+     if ( is_numeric($this->obj) && $this->obj == -1 ) {
        $msg .= sprintf($lang['Err0040'],$lang['Address']);
        $this->stop = true;
        $this->format = "html";
@@ -225,7 +225,7 @@
                  );
        $this->addMenu($x);
      }
-     if ( $this->obj != -1 ) {
+     if ( !(is_numeric($this->obj) && $this->obj == -1) ) {
        if ( $this->obj->mod_ok() ) {
          $x = array( url => $this->obj->getModURL(),
                      text => $lang['Modify'],

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- address_tools.p3	28 Jan 2006 22:03:05 -0000	1.87
+++ address_tools.p3	25 Jul 2006 11:19:55 -0000	1.88
@@ -317,7 +317,7 @@
        if ( $atool['search']['name'] != "" ) {
          $b = eregi_replace("(". $atool['search']['name'] .")","<span class=\"found\">\\1</span>",$b);
        }
-       echo " <td valign=\"top\" rowspan=\"". $c ."\">". $b ."&nbsp;</td>\n";
+       echo " <td valign=\"top\" rowspan=\"". $c ."\">". makelink($address->getUrl(),$b) ."&nbsp;</td>\n";
      }
      if ( $ashow['birthday'] ) {
        echo " <td valign=\"top\" rowspan=\"". $c ."\">". $address->birthday->getLinkDate() ."</td>\n";
@@ -333,7 +333,7 @@
 #         $location = new location($dbconn);
 #         $location = $location->read($i,$location);
          if ( $ashow['location'] ) {
-           echo " <td>&nbsp;". myentities($address->loc[$i]) ."</td>\n";
+           echo " <td>&nbsp;". makelink($location->getUrl(),myentities($address->loc[$i])) ."</td>\n";
          }
          if ( $ashow['desc1'] ) {
            $b = myentities($location->desc1);

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- app_new.php	22 Jan 2006 20:19:20 -0000	1.67
+++ app_new.php	25 Jul 2006 11:19:55 -0000	1.68
@@ -239,10 +239,10 @@
        if ( $this->user->id == $this->obj->creator->id )  {
          $this->obj->allowed = 2;
        }
-       if ( $this->obj->visitor != -1 ) {
+       if ( !(is_numeric($this->obj->visitor) && $this->obj->visitor == -1) ) {
          $this->obj->xfn['v'] = $this->obj->visitor->getFullName();
        }
-       if ( $this->obj->product != -1 ) {
+       if ( !(is_numeric($this->obj->product) && $this->obj->product == -1) ) {
          $this->obj->xfn['p'] = $this->obj->product->getFullName();
        }
        foreach($this->obj->participant as $i => $f) {

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- app_overview.php	24 Jul 2006 15:34:04 -0000	1.61
+++ app_overview.php	25 Jul 2006 11:19:55 -0000	1.62
@@ -109,7 +109,7 @@
        }
        echo " <td valign=\"top\">".$x."&nbsp;</td>\n";
        echo " <td valign=\"top\">".  $f->getLocation() ."</td>\n";
-       if ( $f->product->id > 0 ) {
+       if ( isset($f) && isset($f->product) && isset($f->product->id) && $f->product->id > 0 ) {
          echo " <td valign=\"top\">". $f->product->getLink() ."</td>\n";
        } else {
          echo " <td valign=\"top\">&nbsp;</td>\n";

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- app_show.php	28 Jan 2006 19:35:01 -0000	1.49
+++ app_show.php	25 Jul 2006 11:19:55 -0000	1.50
@@ -178,7 +178,7 @@
          $pre = 1;
        }
      }
-     if ( $this->obj->visitor != -1 ) {
+     if ( !(is_numeric($this->obj->visitor) && $this->obj->visitor == -1 )) {
        echo "<tr>\n";
        if ( $this->obj->outside ) {
          echo $this->showfield($lang['VisitAt']);
@@ -219,7 +219,7 @@
      } else {
        $this->stop = true;
      }
-     if ( $this->obj == -1 ) {
+     if ( is_numeric($this->obj) && $this->obj == -1 ) {
        $msg .= sprintf($lang['Err0040'],$lang['Appointment']);
        $this->stop = true;
        $this->format = "html";

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- appointment.pinc	24 Jul 2006 15:34:04 -0000	1.195
+++ appointment.pinc	25 Jul 2006 11:19:55 -0000	1.196
@@ -657,7 +657,7 @@
     } else {
       $id = $new->id;
     }
-    if (   (($this->product != -1) && ($this->product->id != $id) ) 
+    if (   ( !((is_numeric($this->product) && $this->product == -1)) && ($this->product->id != $id) ) 
         || (($this->product == -1) && ($id != -1) ) ) {
       $this->modified[] = array ( "field" => "ProductP" , "old" => $this->product->id , "new" => $id  );
       $this->product = $new;
@@ -845,7 +845,6 @@
       while ( list ($i,$f) = @each ($pl) ) {
         $m->addTo($pl[$i]);
         $body = '';
-        
         if ( ! findMailTemplate("app_new.proto",$f,$body) ) {
           $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<br />\n";
           continue;
@@ -1385,7 +1384,7 @@
       if ($descr != '' ) {
         echo "  <tr><td class=\"". $class ."\" colspan=\"3\">". urlReplace($descr) ."</td></tr>\n";
       }
-      if ( $this->visitor != -1 ) {
+      if ( !(is_numeric($this->visitor) && $this->visitor == -1) ) {
         echo "  <tr><td class=\"". $class ."\" colspan=\"3\">";
         if ( $this->outside ) {
           echo $lang['VisitAt'] .":";

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- location.pinc	23 Jun 2006 11:59:42 -0000	1.84
+++ location.pinc	25 Jul 2006 11:19:55 -0000	1.85
@@ -247,7 +247,7 @@
    */
   function getURL() {
     $this->read_ref();
-    if ( $this->ref != -1 ) {
+    if ( !(is_numeric($this->ref) && $this->ref == -1) ) {
       return $this->ref->getUrl();
     }
     return "address_select.php";

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mail.pinc	24 Jul 2006 15:34:04 -0000	1.84
+++ mail.pinc	25 Jul 2006 11:19:55 -0000	1.85
@@ -940,7 +940,7 @@
    * if obj is a team , than a mail will be send to every team member
    */
   function addTo($obj) {
-    if ( $obj == "" ) {
+    if ( is_string($obj) && $obj == "" ) {
       return;
     }
     if ( ! is_Object($obj) ) {

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- permission.p3	24 Jul 2006 15:34:04 -0000	1.155
+++ permission.p3	25 Jul 2006 11:19:55 -0000	1.156
@@ -480,7 +480,7 @@
   $t1 = '';
   $t2 = '';
   if  ( count($current_user->teamlist) > 0 ) {
-    $t1 = ', adrteam t';
+    $t1 = ', '.$dbconn->prefix.'adrteam t';
     $t2 = ' OR ((t.adr_id='.$user_id.') AND (a.adr_id=t.team_id))';
   }
   if ( ($tutos[use_check_dbacl] == 1) && ! $current_user->isadmin()  ) {

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- webelements.p3	24 Jul 2006 15:34:07 -0000	1.302
+++ webelements.p3	25 Jul 2006 11:19:56 -0000	1.303
@@ -1497,7 +1497,7 @@
      # AJAX stuff
      $js = '  ';
 
-     if ( $sobj->id > 0 ) {
+     if ( isset($sobj) && isset($sobj->id) && $sobj->id > 0 ) {
        echo '<input id="'. $name .'" size="20" maxlength="40" name="'. $name .'fn" value="'. myentities($sobj->getFullname()) .'" '.$js.' />';
      } else {
        if ( ! isset($obj->xfn[$name]) ) {

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

Modified Files:
	note_overview.php 
Log Message:
some patches to remove warnings. Thanks to Gabor Janak <g.janak at unicontrol.de>

Index: note_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- note_overview.php	24 Jul 2006 15:34:08 -0000	1.42
+++ note_overview.php	25 Jul 2006 11:19:56 -0000	1.43
@@ -101,7 +101,7 @@
        echo " <td>". makelink($b->getUrl(),$x) ."</td>\n";
        echo " <td>&nbsp;". $b->ref->getLink() ."</td>\n";
        echo " <td>&nbsp;". $b->remember->getDateTime() ."</td>\n";
-       echo " <td>&nbsp;". ($b->creator != -1 ? $b->creator->getLink($b->creator->getShortname()):$lang['HistoryDeleted']) ."</td>\n";
+       echo " <td>&nbsp;". ((!(is_numeric($b->creator) && $b->creator == -1)) ? $b->creator->getLink($b->creator->getShortname()):$lang['HistoryDeleted']) ."</td>\n";
        echo show_custom_overview_data($this,'note',$b);
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";

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

Modified Files:
	new_layout.pinc 
Log Message:
some patches to remove warnings. Thanks to Gabor Janak <g.janak at unicontrol.de>

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- new_layout.pinc	28 Jan 2006 18:51:03 -0000	1.64
+++ new_layout.pinc	25 Jul 2006 11:19:56 -0000	1.65
@@ -898,9 +898,12 @@
     $r = '';
     $r .= '<script type="text/javascript" language="JavaScript">';
     $r .= "<!--\n";
+    if (isset($_GET['bad']) && is_array($_GET['bad']))
+    {
     foreach($_GET['bad'] as $i) {
       $r .= " setBadField('".$i."'); ";
     }
+    }
     $r .= "//-->\n";
     $r .= '</script>';
     return $r;

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

Modified Files:
	file_popover.php 
Log Message:
some patches to remove warnings. Thanks to Gabor Janak <g.janak at unicontrol.de>

Index: file_popover.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_popover.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file_popover.php	24 Jul 2006 15:34:07 -0000	1.2
+++ file_popover.php	25 Jul 2006 11:19:56 -0000	1.3
@@ -197,11 +197,15 @@
      $this->link1 = "file/file_popover.php";
 
 	if($_GET['action'] == "search") {
-     $this->q = "SELECT distinct f.* FROM ". $this->dbconn->prefix ."files f,". $this->dbconn->prefix ."filelink l,". $this->dbconn->prefix ."acl a";
+     $this->q = "SELECT distinct f.* FROM ".$this->dbconn->prefix ."files f,". $this->dbconn->prefix ."filelink l";
+     if($this->user->admin == 0) 
+     {
+       $this->q .= ",". $this->dbconn->prefix ."acl a";
+     }
      $pre = " WHERE " ;
 
-		$this->q .= $pre . "l.f_id = f.id";
-		$pre = " AND ";
+     $this->q .= $pre . "l.f_id = f.id";
+	 $pre = " AND ";
 
      if ( isset($_GET['link_id']) &&  is_numeric($_GET['link_id']) ) {
        $this->q .= $pre . "( (f.link_id = ".$_GET['link_id'].") OR (l.f_id = f.id and l.link_id = ". $_GET['link_id'] ."))";

Update of /cvsroot/tutos/tutos/php/report-engine/rep_directory
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19080/php/report-engine/rep_directory

Modified Files:
	rep_directory.pinc 
Log Message:
fixes

Index: rep_directory.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_directory/rep_directory.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rep_directory.pinc	19 Feb 2005 13:45:00 -0000	1.3
+++ rep_directory.pinc	25 Jul 2006 07:15:32 -0000	1.4
@@ -51,7 +51,7 @@
     }
 
     $str = eregi_replace("%PROJECT%",$this->obj->getFullName(),$str);
-    $str = eregi_replace("%URL%",dirname(getBaseUrl(true))."/".$this->obj->getUrl(),$str);
+    $str = eregi_replace("%URL%",dirname(getBaseUrl(true)).'/'.$this->obj->getUrl(),$str);
     $str = eregi_replace("%DATE%", strftime($lang['DateFormatStr']),$str);
     $str = eregi_replace("%CUSTOMER%",$customer,$str);
     $str = eregi_replace("%MANAGER%",$manager,$str);
@@ -65,7 +65,7 @@
   function copy($c,$dir) {
     global $tutos;
 
-    $target = $dir.$c[1]."/".$c[0];
+    $target = $dir.$c[1].DIRECTORY_SEPARATOR.$c[0];
     $target = $this->replace($target);
     $target = str_replace(" ","_",$target);
 
@@ -93,7 +93,7 @@
   function copy_replace($c,$dir) {
     global $tutos;
 
-    $target = $dir.$c[1]."/".$c[0];
+    $target = $dir.$c[1].DIRECTORY_SEPARATOR.$c[0];
     $target = $this->replace($target);
     $target = str_replace(" ","_",$target);
 
@@ -163,7 +163,7 @@
     $this->mkdir($this->data['basedir']);
     $dirname = $this->todir($this->obj->getFullName());
 
-    $b = $this->data['basedir']."/".$dirname;
+    $b = $this->data['basedir']. DIRECTORY_SEPARATOR .$dirname;
 
     echo $lang['rep_dir_basedir'] .":&nbsp;". $b."<br />";
     $this->mkdir($b);
@@ -171,7 +171,7 @@
     # Directories to make
     foreach ($this->data['subdir'] as $sub) {
       echo $lang['rep_dir_subdir'] .":". $this->todir($sub) ."<br />";
-      $this->mkdir($b."/".$this->todir($sub));
+      $this->mkdir($b. DIRECTORY_SEPARATOR .$this->todir($sub));
     }
     # Files to copy without replacing content
     foreach ($this->data['copy'] as $c) {
@@ -204,7 +204,7 @@
     global $lang;
     $r = $lang['rep_dir_info'].'<br />';
     foreach ($this->data['subdir'] as $sub) {
-     $r .= $this->data['basedir'].'/'. $this->todir($this->obj->getFullName()).'/'.$this->todir($sub).'<br />';
+     $r .= myentities($this->data['basedir'].DIRECTORY_SEPARATOR. $this->todir($this->obj->getFullName()).DIRECTORY_SEPARATOR.$this->todir($sub)).'<br />';
     }
     return $r;
   }

Update of /cvsroot/tutos/tutos/php/report-engine/rep_bug_state_duration
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19080/php/report-engine/rep_bug_state_duration

Modified Files:
	rep_bug_state_duration.pinc 
Log Message:
fixes

Index: rep_bug_state_duration.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_bug_state_duration/rep_bug_state_duration.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rep_bug_state_duration.pinc	22 Jan 2006 20:22:53 -0000	1.2
+++ rep_bug_state_duration.pinc	25 Jul 2006 07:15:32 -0000	1.3
@@ -89,12 +89,20 @@
       $q = "SELECT * from ".$this->dbconn->prefix."bugs";
       $pre = " WHERE ";
       if (count($this->bugclass)) {
+        $r .= 'FILTERED '. $lang['BugClass'].': ';
+        $pre_r = '';
+        foreach ($this->bugclass as $j) {
+          $r .= $pre_r. $lang['BugClasses'][$j];
+       	  $pre_r = " or ";
+        }
+        $r .= "<br />";
+
         $q .= $pre . "class in (";
         $pre2 = "";
-		foreach ($this->bugclass as $j) {
+        foreach ($this->bugclass as $j) {
           $q.= $pre2.$j;
           $pre2 = ",";
-		}
+        }
         $q.= ")";
         $pre = " AND ";
       }
@@ -102,12 +110,12 @@
         $q .= $pre . "creation >= ".$this->dbconn->Date($this->from);
         $pre = " AND ";
         $r .= 'FILTERED '. $lang['DateTimeFrom'].': '. $this->from->getDate()."<br />";
-	  }
+      }
       if ($this->to->notime != 1) {
         $q .= $pre . "creation <= ".$this->dbconn->Date($this->to);
         $pre = " AND ";
         $r .= 'FILTERED '. $lang['DateTimeTill'].': '. $this->to->getDate()."<br />";
-	  }
+      }
 
       $result = $this->dbconn->Exec($q);
       $n = $result->numrows();
@@ -131,11 +139,33 @@
     if ($this->obj->getType() == 'product') {
       $r .= $lang[$this->obj->getType()].': '. $this->obj->getLink()."<br />\n";
       bug::obj_read($this->obj);
-      $r .= count($this->obj->list[usebugtracking])." ". $lang['Bugs']."<br />\n";
+      if (count($this->bugclass)) {
+        $r .= 'FILTERED '. $lang['BugClass'].': ';
+        $pre = '';
+        foreach ($this->bugclass as $j) {
+          $r .= $pre. $lang['BugClasses'][$j];
+       	  $pre = " or ";
+        }
+        $r .= "<br />";
+      }
+      $rr = '';
+      $cnt = 0;
       foreach($this->obj->list[usebugtracking] as $b) {
-        $r .= $this->calc_one_bug($b,$stat,false);
+        if (count($this->bugclass)) {
+          if (!in_array($b->class,$this->bugclass)) {
+            #$r .= "-".$b->class;
+            unset($b);
+            $cnt++;
+            continue;
+          } else {
+            #$r .= " ".$b->class;
+          }
+        }
+        $rr .= $this->calc_one_bug($b,$stat,false);
         unset($b);
       }
+      $r .= (count($this->obj->list[usebugtracking]) - $cnt) ." ". $lang['Bugs']."<br />\n";
+      $r .= $rr;
     }
 
     $r .= "<p><b>Statistics (Duration per State in hours)</b><br />\n";

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

Modified Files:
	report_overview.php 
Log Message:
fixes

Index: report_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/report_overview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- report_overview.php	3 Apr 2005 18:32:16 -0000	1.3
+++ report_overview.php	25 Jul 2006 07:15:32 -0000	1.4
@@ -42,8 +42,8 @@
      echo $this->OverviewTableStart();
      foreach ($this->obj->list[usereporter] as $i => $j) {
        $x = new report($this->dbconn);
-       $x->read($i);
        echo "<tr>\n";
+       $x->read($i);
        echo " <td>&nbsp;". $x->report->getFullName() ."</td>\n";
        echo " <td>\n";
        echo "   <form target=\"report\" method=\"get\" action=\"report_show.php\">\n";

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

Modified Files:
	Makefile 
Log Message:
fixes

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- Makefile	13 Oct 2005 18:42:45 -0000	1.80
+++ Makefile	25 Jul 2006 07:15:32 -0000	1.81
@@ -15,6 +15,9 @@
 #
 #
 # $Log$
+# Revision 1.81  2006/07/25 07:15:32  gokohnert
+# fixes
+#
 # Revision 1.80  2005/10/13 18:42:45  gokohnert
 # bugfix
 #
@@ -542,6 +545,8 @@
 	$(wildcard php/report-engine/rep_envelope/*.p3) \
 	$(wildcard php/report-engine/rep_spine/*.pinc) \
 	$(wildcard php/report-engine/rep_spine/*.p3) \
+	$(wildcard php/report-engine/rep_bug_state_duration/*.pinc) \
+	$(wildcard php/report-engine/rep_bug_state_duration/*.p3) \
 	$(wildcard php/report-engine/rep_freemind/*.pinc) \
 	$(wildcard php/report-engine/rep_freemind/*.p3) \
 	$(wildcard php/report-engine/rep_index/*.pinc) \
@@ -1152,6 +1157,7 @@
 	stuff.zip \
 	drawboard.zip \
 	palm.zip \
+	report.zip \
 	HDL_cia_factbook.zip \
 	HDL_mapquest.zip \
 	HDL_map24.zip \
@@ -1164,7 +1170,8 @@
 
 THEMENUKE   = README.nuke \
 	html/nuke.css \
-	$(wildcard html/nuke/*gif)
+	$(wildcard html/nuke/*gif) \
+	$(wildcard html/nuke/*png)
 
 nuke.zip: $(THEMENUKE)
 	@$(ECHO) "# Make Filelist for $@"

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

Modified Files:
	reminder_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: reminder_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_overview.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- reminder_overview.php	23 May 2005 15:44:13 -0000	1.15
+++ reminder_overview.php	24 Jul 2006 15:34:08 -0000	1.16
@@ -186,7 +186,7 @@
        $this->link1 = addUrlParameter($this->link1,"link_id=". $_GET['link_id']);
      }
 
-     check_dbacl($this->q, $this->user->id);
+     check_dbacl($this->dbconn,$this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	file_new.php file_overview.php file_popover.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- file_new.php	17 Apr 2006 18:16:21 -0000	1.20
+++ file_new.php	24 Jul 2006 15:34:07 -0000	1.21
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2005 by Gero Kohnert
+ *  Copyright 2000 - 2006 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   
@@ -39,26 +39,26 @@
      }
      echo $this->DataTableStart();
      echo "<tr>\n";
-     echo " <th colspan=\"4\">". $lang['File'] ."</th>\n";
+     echo ' <th colspan="4">'. $lang['File'] ."</th>\n";
      echo "</tr>\n";
 
      if ( $this->obj->id > 0 ) {
        echo "<tr>\n";
        echo " <td colspan=\"3\">&nbsp;</td>\n";
-       echo " <td align=\"right\" colspan=\"1\">". acl_link($this->obj) ."</td>\n";
+       echo ' <td align="right" colspan="1">'. acl_link($this->obj) ."</td>\n";
        echo "</tr>\n";
      }
      echo "<tr>\n";
      echo $this->showfieldc($lang['FileNameDoc'],1,"name");
-     echo " <td><input id=\"name\" maxlength=\"".$table['file']['name'][size]."\" name=\"name\" value=\"". $this->obj->name ."\" /></td>\n";
+     echo ' <td><input id="name" maxlength="'.$table['file']['name'][size]."\" name=\"name\" value=\"". $this->obj->name ."\" /></td>\n";
      echo $this->showfieldc($lang['FileVersion'],0,"version");
-     echo " <td><input id=\"version\" size=\"10\" maxlength=\"".$table['file']['version'][size]."\" name=\"version\" value=\"". $this->obj->version ."\" /></td>\n";
+     echo ' <td><input id="version" size="10" maxlength="'.$table['file']['version'][size].'" name="version" value="'. $this->obj->version ."\" /></td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['FileAuthor'],0,"a");
      echo " <td colspan=\"3\">\n";
-     select_from_array_or_input($this->obj,"a",$this->obj->author,0);
+     select_from_array_or_input($this->obj,"a",$this->obj->author,0,'at');
      echo " </td>\n";
      echo "</tr>\n";
 
@@ -121,12 +121,12 @@
 
      echo "<tr>\n";
      echo $this->showfield($lang['FileName'],0,"file");
-     echo " <td colspan=\"3\"><input id=\"file\" size=\"40\" name=\"file\" type=\"file\" value=\"". $this->obj->filename ."\" />\n";
+     echo ' <td colspan="3"><input id="file" size="40" name="file" type="file" value="'. $this->obj->filename ."\" />\n";
      if ( $this->obj->id != -1 ) {
        echo "<br /><font size=\"-1\">". $this->obj->filename ."</font>";
      }
      echo "<br /><font size=\"-1\">(max. allowed size = ". ini_get('upload_max_filesize') ." Bytes)</font>";
-     echo "</td>\n";
+     echo " </td>\n";
      echo "</tr>\n";
 
      if ( ($this->obj->id != -1) && ($this->obj->vsys != 0) ) {
@@ -134,8 +134,8 @@
        echo $this->showfield($lang['FileVersioning'],0,"save");
        echo " <td id=\"save\" colspan=\"3\">\n";
        echo " <font size=\"-1\">". $lang['FileVersioningI'] ."</font><br />\n";
-       echo "  <input type=\"radio\" name=\"save\" value=\"0\" />&nbsp;". sprintf($lang['FileOverwrite'],$this->obj->getFullname()) ."<br />\n";
-       echo "  <input type=\"radio\" name=\"save\" value=\"1\" checked=\"checked\" />&nbsp;". sprintf($lang['FileSave'],$this->obj->name,$this->obj->version) ."\n";
+       echo '  <input type="radio" name="save" value="0" />&nbsp;'. sprintf($lang['FileOverwrite'],$this->obj->getFullname()) ."<br />\n";
+       echo '  <input type="radio" name="save" value="1" checked="checked" />&nbsp;'. sprintf($lang['FileSave'],$this->obj->name,$this->obj->version) ."\n";
        echo " </td>\n";
        echo "</tr>\n";
      }
@@ -143,9 +143,9 @@
        echo "<tr>\n";
        echo $this->showfield($lang['FileVersionType'],0,"vsys");
        echo " <td id=\"vsys\" colspan=\"3\">&nbsp;\n";
-       echo " <font size=\"-1\">". $lang['FileVersionTypeI'] ."</font><br />\n";
-       echo "  <input type=\"radio\" name=\"vsys\" value=\"0\"". ( $this->obj->vsys == 0 ? ' checked="checked"':'') ." />&nbsp;none \n";
-       echo "  <input type=\"radio\" name=\"vsys\" value=\"1\"". ( $this->obj->vsys == 1 ? ' checked="checked"':'') ." />&nbsp;TUTOS \n";
+       echo ' <font size="-1">'. $lang['FileVersionTypeI'] ."</font><br />\n";
+       echo '  <input type="radio" name="vsys" value="0"'. ( $this->obj->vsys == 0 ? ' checked="checked"':'') ." />&nbsp;none \n";
+       echo '  <input type="radio" name="vsys" value="1"'. ( $this->obj->vsys == 1 ? ' checked="checked"':'') ." />&nbsp;TUTOS \n";
        if ( file_exists($tutos[file_ci]) && is_executable($tutos[file_ci]) ) {
          echo "  <input type=\"radio\" name=\"vsys\" value=\"2\"". ( $this->obj->vsys == 2 ? ' checked="checked"':'') ." />&nbsp;RCS \n";
        }

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- file_overview.php	28 Jan 2006 19:35:02 -0000	1.21
+++ file_overview.php	24 Jul 2006 15:34:07 -0000	1.22
@@ -191,7 +191,11 @@
 
      $this->link1 = "file/file_overview.php";
 
-     $this->q = "SELECT distinct f.* FROM ". $this->dbconn->prefix ."files f,". $this->dbconn->prefix ."filelink l,". $this->dbconn->prefix ."acl a";
+     $this->q = 'SELECT distinct f.* FROM '. $this->dbconn->prefix .'files f,'. $this->dbconn->prefix .'filelink l';
+     if(! $this->user->isadmin()) { 
+       $this->q .= ",".$this->dbconn->prefix ."acl a"; 
+     }
+
      $pre = " WHERE " ;
 
      if ( isset($_GET['link_id']) &&  is_numeric($_GET['link_id']) ) {
@@ -271,7 +275,7 @@
        $pre = " AND ";
      }
     
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

Index: file_popover.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_popover.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_popover.php	4 Jul 2006 14:29:36 -0000	1.1
+++ file_popover.php	24 Jul 2006 15:34:07 -0000	1.2
@@ -280,7 +280,7 @@
         }
 
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	stuff_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: stuff_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_overview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stuff_overview.php	14 Nov 2004 19:30:00 -0000	1.3
+++ stuff_overview.php	24 Jul 2006 15:34:08 -0000	1.4
@@ -115,7 +115,7 @@
        $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
      }
 
-     check_dbacl($this->q, $this->user->id);
+     check_dbacl($this->dbconn,$this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	bug_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bug_overview.php	1 May 2005 13:37:56 -0000	1.23
+++ bug_overview.php	24 Jul 2006 15:34:07 -0000	1.24
@@ -823,7 +823,7 @@
        $this->addHidden("solverid",$solverid);
      }
 
-     check_dbacl( $q1, $this->user->id);
+     check_dbacl($this->dbconn, $q1, $this->user->id);
 
      # reporter to display
      if ( isset($reporterid) ) {

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

Modified Files:
	acl.pinc address.pinc address_overview.php app_overview.php 
	appointment.pinc calendar.php company.pinc 
	company_overview.php database_overview.php department.pinc 
	mail.pinc permission.p3 product.pinc product_overview.php 
	task.pinc team.pinc team_overview.php timetrack_overview.php 
	webelements.p3 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- acl.pinc	28 Jan 2006 22:28:53 -0000	1.69
+++ acl.pinc	24 Jul 2006 15:34:04 -0000	1.70
@@ -84,7 +84,7 @@
     return;
   }
 #  echo $obj->gettype();
-  $q = 'SELECT adr_id,perm FROM '. $obj->dbconn->prefix .'acl WHERE obj_id = '. $id;
+  $q = 'SELECT '.  $obj->dbconn->colname('adr_id') .','.  $obj->dbconn->colname('perm') .' FROM '. $obj->dbconn->prefix .'acl WHERE '. $obj->dbconn->colname('obj_id') .' = '. $id;
   $r = $obj->dbconn->Exec($q);
 
   $n = $r->numrows();

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- address.pinc	23 Jun 2006 12:02:11 -0000	1.118
+++ address.pinc	24 Jul 2006 15:34:04 -0000	1.119
@@ -132,7 +132,7 @@
     $q = "SELECT * from ". $user->dbconn->prefix ."addresses WHERE". $user->dbconn->Like ("f_name",$name,"m_name","l_name");
     $q .= " OR ". $user->dbconn->Like ("l_name",$name,"f_name","m_name");
     $q .= " order by l_name ";
-    check_dbacl( $q, $user->id);
+    check_dbacl($user->dbconn, $q, $user->id);
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
 	$a = 0;

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- address_overview.php	10 Jun 2005 11:18:09 -0000	1.49
+++ address_overview.php	24 Jul 2006 15:34:04 -0000	1.50
@@ -248,7 +248,7 @@
        $q .= " ". $pre ."(". $this->dbconn->Like("f_name",$name,"l_name") .")";
      }
 
-     check_dbacl( $q, $this->user->id);
+     check_dbacl($this->dbconn, $q, $this->user->id);
 
      # Searchorders
      $xxx = "";

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- app_overview.php	5 Apr 2006 11:58:31 -0000	1.60
+++ app_overview.php	24 Jul 2006 15:34:04 -0000	1.61
@@ -300,7 +300,7 @@
        $this->filter['loc'] = $_GET['loc'];
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      #
      # display order

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- appointment.pinc	16 Jul 2006 11:10:42 -0000	1.194
+++ appointment.pinc	24 Jul 2006 15:34:04 -0000	1.195
@@ -1633,7 +1633,7 @@
     $q .= " ORDER BY a_start DESC";
 
     # always at the end of query
-    check_dbacl( $q, $current_user->id);
+    check_dbacl($obj->dbconn, $q, $current_user->id);
 
     $r = $obj->dbconn->Exec($q);
     $n = $r->numrows();
@@ -1803,7 +1803,7 @@
     $q .= ' ORDER by a_start';
 
     # always at the end of query
-    check_dbacl( $q, $current_user->id);
+    check_dbacl($obj->dbconn, $q, $current_user->id);
 
     $r = $obj->dbconn->Exec($q);
     $n = $r->numrows();
@@ -1852,7 +1852,7 @@
 
 
     # always at the end of query
-    check_dbacl( $q, $current_user->id);
+    check_dbacl($obj->dbconn, $q, $current_user->id);
 
     $r = $obj->dbconn->Exec($q);
     $n = $r->numrows();

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- calendar.php	11 Aug 2005 07:37:15 -0000	1.86
+++ calendar.php	24 Jul 2006 15:34:04 -0000	1.87
@@ -275,7 +275,7 @@
      if ( isset($_GET['id']) && is_numeric($_GET['id']) ) {
        $this->id = $_GET['id'];
        $query = "SELECT id,a_start FROM ". $this->dbconn->prefix ."calendar where id =". $this->id;
-       check_dbacl( $query, $this->user->id);
+       check_dbacl($this->dbconn, $query, $this->user->id);
        $result = $this->dbconn->Exec($query);
        if ( 1 != $result->numrows()) {
          $msg .= sprintf($lang['Err0040'],$lang['Appointment']) ;

Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- company.pinc	13 Jul 2006 08:41:20 -0000	1.66
+++ company.pinc	24 Jul 2006 15:34:04 -0000	1.67
@@ -130,7 +130,7 @@
 
     $q = "SELECT * from ". $user->dbconn->prefix ."companies WHERE". $user->dbconn->Like("name",$name);
     $q .= " order by name ";
-    check_dbacl( $q, $user->id);
+    check_dbacl($user->dbconn, $q, $user->id);
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;

Index: company_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_overview.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- company_overview.php	1 May 2005 15:24:36 -0000	1.49
+++ company_overview.php	24 Jul 2006 15:34:04 -0000	1.50
@@ -192,7 +192,7 @@
        $this->link2 = addUrlParameter($this->link2,"name=". UrlEncode($_GET['name']));
      }
 
-     check_dbacl( $q, $this->user->id);
+     check_dbacl($this->dbconn, $q, $this->user->id);
 
      # sorting
      $xxx = "";

Index: database_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_overview.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- database_overview.php	19 Aug 2003 15:55:40 -0000	1.21
+++ database_overview.php	24 Jul 2006 15:34:04 -0000	1.22
@@ -93,7 +93,7 @@
        $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- department.pinc	1 Dec 2005 22:26:17 -0000	1.66
+++ department.pinc	24 Jul 2006 15:34:04 -0000	1.67
@@ -119,7 +119,7 @@
       $q = "SELECT d.* from ". $user->dbconn->prefix ."departments d , ". $user->dbconn->prefix ."companies c WHERE (c.id = d.c_id) AND (". $user->dbconn->Like("d.name",$dname) .") AND (". $user->dbconn->Like("c.name",$cname) .")";
       $q .= " order by c.name,d.name ";
     }
-    check_dbacl( $q, $user->id);
+    check_dbacl($user->dbconn, $q, $user->id);
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- mail.pinc	11 Jul 2006 06:57:31 -0000	1.83
+++ mail.pinc	24 Jul 2006 15:34:04 -0000	1.84
@@ -643,7 +643,7 @@
     $q .= " ". $pre . $this->dbconn->Like("email_1",$em);
     $pre = " or ";
     $q .= " ". $pre . $this->dbconn->Like("email_2",$em);
-    check_dbacl( $q, $this->user->id);
+    check_dbacl($this->dbconn, $q, $this->user->id);
     $res = $this->dbconn->Exec($q);
     if ( 0 != $res->numrows()) {
       $l = new location($this->dbconn);

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- permission.p3	28 Jan 2006 18:51:03 -0000	1.154
+++ permission.p3	24 Jul 2006 15:34:04 -0000	1.155
@@ -474,7 +474,7 @@
  * maybe redesign with two select-statements
  * DOES THIS WORK with TEAMS in TEAMS ??
  */
-Function check_dbacl( &$query, $user_id, $id_name="id") {
+Function check_dbacl( &$dbconn, &$query, $user_id, $id_name="id") {
   global $tutos,$current_user; 
 
   $t1 = '';
@@ -484,7 +484,7 @@
     $t2 = ' OR ((t.adr_id='.$user_id.') AND (a.adr_id=t.team_id))';
   }
   if ( ($tutos[use_check_dbacl] == 1) && ! $current_user->isadmin()  ) {
-    $query =  'SELECT DISTINCT i.* FROM ('.$query.') AS i'. $t1 .', acl a '
+    $query =  'SELECT DISTINCT i.* FROM ('.$query.') AS i'. $t1 .','. $dbconn->prefix .'acl a '
             . 'WHERE i.'.$id_name.'=a.obj_id AND a.perm>='.$tutos[seeok].' AND ((a.adr_id='.$user_id
             . ') OR (a.adr_id=0)'. $t2 .' )';
   }

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- product.pinc	1 Dec 2005 22:31:00 -0000	1.156
+++ product.pinc	24 Jul 2006 15:34:04 -0000	1.157
@@ -306,7 +306,7 @@
 
     $q = "SELECT * from ". $user->dbconn->prefix .$table['product'][name] ." WHERE". $user->dbconn->Like("name",$name,"version");
     $q .= " order by name,version ";
-    check_dbacl( $q, $user->id);
+    check_dbacl($user->dbconn, $q, $user->id);
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- product_overview.php	17 Jul 2006 12:09:27 -0000	1.112
+++ product_overview.php	24 Jul 2006 15:34:05 -0000	1.113
@@ -1001,7 +1001,7 @@
        $pre = " AND ";
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # Order of output
      $this->link2 = $this->link1;

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- task.pinc	13 Jul 2006 07:54:24 -0000	1.171
+++ task.pinc	24 Jul 2006 15:34:07 -0000	1.172
@@ -508,7 +508,7 @@
 
     $q = "SELECT * from ". $user->dbconn->prefix ."tasks WHERE". $user->dbconn->Like("name",$name);
     $q .= " order by name ";
-    check_dbacl( $q, $user->id);
+    check_dbacl($user->dbconn, $q, $user->id);
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- team.pinc	28 Jan 2006 19:35:02 -0000	1.95
+++ team.pinc	24 Jul 2006 15:34:07 -0000	1.96
@@ -179,7 +179,7 @@
 
     $q = "SELECT * from ". $user->dbconn->prefix ."teams WHERE". $user->dbconn->Like ("name",$name);
     $q .= " order by name ";
-    check_dbacl( $q, $user->id);
+    check_dbacl($user->dbconn, $q, $user->id);
     $r = $user->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;

Index: team_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_overview.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- team_overview.php	8 Jun 2005 16:52:34 -0000	1.53
+++ team_overview.php	24 Jul 2006 15:34:07 -0000	1.54
@@ -184,7 +184,7 @@
        $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- timetrack_overview.php	5 Apr 2006 11:58:31 -0000	1.96
+++ timetrack_overview.php	24 Jul 2006 15:34:07 -0000	1.97
@@ -609,7 +609,7 @@
        $this->addHidden("worker",$_GET['worker']);
      }
 
-     check_dbacl( $q, $this->user->id);
+     check_dbacl($this->dbconn, $q, $this->user->id);
 #    echo $q;
      # sorting
      $this->link2 = $this->link1;

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- webelements.p3	28 Jan 2006 18:51:03 -0000	1.301
+++ webelements.p3	24 Jul 2006 15:34:07 -0000	1.302
@@ -995,7 +995,7 @@
      $q1 = 'SELECT * from '. $dbconn->prefix .'addresses WHERE'. $dbconn->Like ("f_name",$name,"m_name","l_name");
      $q1 .= ' OR '. $dbconn->Like ("l_name",$name,"f_name","m_name");
      $q1 .= $qid;
-     check_dbacl( $q1, $current_user->id);
+     check_dbacl($dbconn, $q1, $current_user->id);
      $r1 = $dbconn->Exec($q1);
      $n1 = $r1->numrows();
      $n += $n1;
@@ -1003,7 +1003,7 @@
    if ( strstr($mode,"t") != FALSE ) {
      $q2 = 'SELECT * from '. $dbconn->prefix .'teams WHERE'. $dbconn->Like ("name",$name);
      $q2 .= $qid;
-     check_dbacl( $q2, $current_user->id);
+     check_dbacl($dbconn, $q2, $current_user->id);
      $r2 = $dbconn->Exec($q2);
      $n2 = $r2->numrows();
      $n += $n2;
@@ -1015,7 +1015,7 @@
      if ( $pos == false ) {
        $q3 = "SELECT * from ". $dbconn->prefix ."departments WHERE". $dbconn->Like("name",$name);
        $q3 .= $qid;
-       check_dbacl( $q3, $current_user->id);
+       check_dbacl($dbconn, $q3, $current_user->id);
      } else {
        $cname = trim(substr($name,0,$pos));
        $dname = trim(substr($name,$pos + 3));
@@ -1030,7 +1030,7 @@
    if ( strstr($mode,"c") != FALSE ) {
      $q4 = "SELECT * from ". $dbconn->prefix ."companies WHERE". $dbconn->Like("name",$name);
      $q4 .= $qid;
-     check_dbacl( $q4, $current_user->id);
+     check_dbacl($dbconn, $q4, $current_user->id);
      $r4 = $dbconn->Exec($q4);
      $n4 = $r4->numrows();
      $n += $n4;
@@ -1038,7 +1038,7 @@
    if ( strstr($mode,"p") != FALSE ) {
      $q5 = "SELECT * from ". $dbconn->prefix ."products WHERE". $dbconn->Like("name",$name,"version");
      $q5 .= $qid;
-     check_dbacl( $q5, $current_user->id);
+     check_dbacl($dbconn, $q5, $current_user->id);
      $r5 = $dbconn->Exec($q5);
      $n5 = $r5->numrows();
      $n += $n5;
@@ -1046,7 +1046,7 @@
    if ( class_exists( 'installation') && (strstr($mode,"i") != FALSE) ) {
      $q6 = "SELECT * from ". $dbconn->prefix ."installations WHERE". $dbconn->Like("id",$name);
      $q6 .= $qid;
-     check_dbacl( $q6, $current_user->id);
+     check_dbacl($dbconn, $q6, $current_user->id);
      $r6 = $dbconn->Exec($q6);
      $n6 = $r6->numrows();
      $n += $n6;

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

Modified Files:
	url_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: url_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_overview.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- url_overview.php	19 Jul 2004 19:08:57 -0000	1.8
+++ url_overview.php	24 Jul 2006 15:34:08 -0000	1.9
@@ -172,7 +172,7 @@
        $this->filter['name'] = "";
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	resource_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: resource_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_overview.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- resource_overview.php	29 Jan 2006 13:44:09 -0000	1.20
+++ resource_overview.php	24 Jul 2006 15:34:08 -0000	1.21
@@ -129,7 +129,7 @@
        $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	note_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: note_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- note_overview.php	23 May 2005 15:44:13 -0000	1.41
+++ note_overview.php	24 Jul 2006 15:34:08 -0000	1.42
@@ -367,7 +367,7 @@
      }
 
      $this->q = $j.$q;
-#     check_dbacl( $this->q, $this->user->id); WONT WORK
+#     check_dbacl($this->dbconn, $this->q, $this->user->id); WONT WORK
 
      # sorting
      $xxx = "";

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

Modified Files:
	installation_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: installation_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_overview.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- installation_overview.php	9 Jun 2005 10:50:21 -0000	1.23
+++ installation_overview.php	24 Jul 2006 15:34:08 -0000	1.24
@@ -230,7 +230,7 @@
          $q .= $pre . "description LIKE '%". $this->filter ."%'";
      }
 
-     check_dbacl( $q, $this->user->id);
+     check_dbacl($this->dbconn, $q, $this->user->id);
      # sorting
      $xxx = "";
      order_parse($q,$link1,$xxx,$xxx,"instdate");

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

Modified Files:
	checkfield_overview.php checklist_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: checkfield_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_overview.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- checkfield_overview.php	23 Apr 2005 13:18:22 -0000	1.25
+++ checkfield_overview.php	24 Jul 2006 15:34:07 -0000	1.26
@@ -254,7 +254,7 @@
       $this->link1 = addUrlParameter($this->link1,"link_id=". UrlEncode($_GET['link_id']));
     }
 
-    // check_dbacl( $this->q, $this->user->id);
+    // check_dbacl($this->dbconn, $this->q, $this->user->id);
 
     // sorting
     $xxx = "";

Index: checklist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_overview.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- checklist_overview.php	17 Apr 2005 18:17:00 -0000	1.17
+++ checklist_overview.php	24 Jul 2006 15:34:07 -0000	1.18
@@ -177,7 +177,7 @@
       $this->q .= $pre . "(deleted=".$this->dbconn->notime() ." or deleted is null)";
       $pre = " AND ";
       
-      check_dbacl( $this->q, $this->user->id);
+      check_dbacl($this->dbconn, $this->q, $this->user->id);
 
       // sorting
       $xxx = "";

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

Modified Files:
	db_mysql.pinc 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- db_mysql.pinc	16 Jul 2006 11:10:42 -0000	1.29
+++ db_mysql.pinc	24 Jul 2006 15:34:07 -0000	1.30
@@ -357,7 +357,6 @@
     $q = "ALTER TABLE ". $this->prefix . $oldtbl[name] ." RENAME TO " . $this->prefix . $newname;
     return $this->exec($q,0);    
   }
-
   /**
    * get the mysql columntype
    */

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

Modified Files:
	watchlist_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_overview.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- watchlist_overview.php	1 May 2005 13:37:59 -0000	1.26
+++ watchlist_overview.php	24 Jul 2006 15:34:08 -0000	1.27
@@ -234,7 +234,7 @@
        }
      }
 
-     check_dbacl( $this->q, $this->user->id, "obj_id");
+     check_dbacl($rhis->dbconn, $this->q, $this->user->id, "obj_id");
 
      # sorting
      $this->link2 = $this->link1;

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

Modified Files:
	invoice_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: invoice_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_overview.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- invoice_overview.php	29 Jan 2006 13:44:09 -0000	1.38
+++ invoice_overview.php	24 Jul 2006 15:34:08 -0000	1.39
@@ -253,7 +253,7 @@
        $this->name .= ":". $ref->getFullName();
      }
 
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	rate_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: rate_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_overview.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rate_overview.php	31 Jan 2006 20:53:27 -0000	1.12
+++ rate_overview.php	24 Jul 2006 15:34:08 -0000	1.13
@@ -413,7 +413,7 @@
      }
 
      $this->q = $j.$q;
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn, $this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	group_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: group_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_overview.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- group_overview.php	28 Jan 2006 22:11:45 -0000	1.23
+++ group_overview.php	24 Jul 2006 15:34:07 -0000	1.24
@@ -163,7 +163,7 @@
        $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
      }
 
-     check_dbacl($this->q, $this->user->id);
+     check_dbacl($this->dbconn,$this->q, $this->user->id);
 
      # sorting
      $xxx = "";

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

Modified Files:
	expense_overview.php 
Log Message:
fixed a bug with missing prefixes in check_dbacl. Thanks to Gabor Janak (g.janak at unicontrol.de)

Index: expense_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_overview.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- expense_overview.php	17 Apr 2005 18:17:01 -0000	1.6
+++ expense_overview.php	24 Jul 2006 15:34:07 -0000	1.7
@@ -427,7 +427,7 @@
      }
 
      $this->q = $j.$q;
-     check_dbacl( $this->q, $this->user->id);
+     check_dbacl($this->dbconn,$this->q, $this->user->id);
 
      # sorting
      $xxx = "";