tutos-commits Mailing List for TUTOS

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

Modified Files:
	rate_overview.php 
Log Message:
fix

Index: rate_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_overview.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rate_overview.php	17 Apr 2005 18:53:49 -0000	1.11
+++ rate_overview.php	31 Jan 2006 20:53:27 -0000	1.12
@@ -150,7 +150,7 @@
      echo "</tbody>\n";
 
 
-     echo $this->list_navigation($this->link1,(10 - $subcol) + $tutos[massupdate],$this->start,$a,$n);
+     echo $this->list_navigation($this->link1,$cols,$this->start,$a,$n);
      if ( $tutos[massupdate] == 1 ) {
        echo $this->UpdateRowStart($cols-2);
        echo sprintf($lang['withmarked'],$lang['Rates']);
@@ -445,4 +445,4 @@
 <!--
     CVS Info: $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	installation_select.php 
Log Message:
fix

Index: installation_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_select.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- installation_select.php	22 Jan 2006 20:19:21 -0000	1.2
+++ installation_select.php	31 Jan 2006 20:53:28 -0000	1.3
@@ -92,6 +92,7 @@
    Function prepare() {
      global $lang,$tutos;
 
+     $this->ext = 0;
      $this->name = $lang['InstSearch'];
      $this->center = true;
 
@@ -115,9 +116,7 @@
      } else {
        $this->state = -1;
      }
-     /*if ( ! isset($_GET['ext']) ) {
-       $this->ext = 0;
-     } else {
+     /*if ( isset($_GET['ext']) ) {
 	$this->ext = $_GET['ext'];
      }*/
      if ( $this->user->feature_ok(useinstmanagement,PERM_NEW) ) {

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

Modified Files:
	timetrack_overview.php 
Log Message:
html validation

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- timetrack_overview.php	22 Jan 2006 20:23:23 -0000	1.94
+++ timetrack_overview.php	29 Jan 2006 14:00:53 -0000	1.95
@@ -362,7 +362,7 @@
      }
      echo "<tr>\n";
      echo $this->showfield($lang['TimetrackWorker']);
-     echo " <td colspan=\"4\" valign=\"top\"><img src=\"". $link ."\"></td>";
+     echo ' <td colspan="4" valign="top"><img src="'. $link .'" alt="'. myentities($lang['TimetrackWorker']) ."\" /></td>";
      echo "</tr>\n";
 
      $c = 0;
@@ -401,7 +401,7 @@
          echo "<tr>\n";
          echo $this->showfield($lang['TimetrackRef']);
          echo "<td colspan=\"4\" valign=\"top\">\n";
-         echo "<img src=\"". $links[$i] ."\"><br />\n";
+         echo '<img src="'. $links[$i] .'" alt="'. myentities($lang['TimetrackRef']) ."\"/><br />\n";
          echo "</td></tr>\n";
        }
      }

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

Modified Files:
	invoice_overview.php invoice_select.php 
Log Message:
html validation

Index: invoice_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_overview.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- invoice_overview.php	23 May 2005 15:44:12 -0000	1.37
+++ invoice_overview.php	29 Jan 2006 13:44:09 -0000	1.38
@@ -61,7 +61,7 @@
        echo $this->orderHeader("",$lang['ProdCreator'],$this->link2);
        echo $this->orderHeader("creation",$lang['ProdCreationS'],$this->link2);
        if ( $tutos[massupdate] == 1 ) {
-         echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
+         echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
        }
        echo "</tr>\n";
        echo "</thead>\n";
@@ -118,7 +118,7 @@
          if ( $tutos[massupdate] == 1 ) {
            echo " <td align=\"center\">\n";
            if ( $c->mod_ok() ) {
-             echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $c->id ."\">\n";
+             echo '<input name="mark[]" type="checkbox" value="'. $c->id ."\" />\n";
            } else {
              echo "-\n";
            }
@@ -133,9 +133,9 @@
          echo $this->UpdateRowStart(5);
          echo sprintf($lang['withmarked'],$lang['Invoices']);
          echo "&nbsp;<select name=\"action\">\n";
-         echo " <option value=\"-1\" selected>". $lang['ActionNil'] ."</option>\n";
-         echo " <option value=\"-2\">". $lang['Delete'] ."</option>\n";
-         echo " <option value=\"-4\">". $lang['AclModify'] ."</option>\n";
+         echo ' <option value="-1" selected="selected">'. $lang['ActionNil'] ."</option>\n";
+         echo ' <option value="-2">'. $lang['Delete'] ."</option>\n";
+         echo ' <option value="-4">'. $lang['AclModify'] ."</option>\n";
          if (class_exists('watchlist')) {
            echo " <option value=\"WatchAdd\">". $lang['WatchAdd'] ."</option>\n";
            echo " <option value=\"WatchDel\">". $lang['WatchDel'] ."</option>\n";
@@ -143,7 +143,6 @@
          echo "</select>\n";
          echo $this->UpdateRowEnd(3);
        }
-       echo "</tfoot>\n";
        echo $this->OverviewTableEnd();
        echo $this->actionformEnd("bug_overview.php");
      }
@@ -282,4 +281,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: invoice_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_select.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- invoice_select.php	23 Apr 2005 13:18:23 -0000	1.11
+++ invoice_select.php	29 Jan 2006 13:44:09 -0000	1.12
@@ -42,9 +42,9 @@
        echo " <th colspan=\"3\">". $lang['SearchForInv'] ."</th>\n";
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['AdrName']);
-       echo " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\"></td>\n";
+       echo " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
        echo " <td align=\"center\">\n";
-       echo "  <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForInv'] ."\"></td>\n";
+       echo '  <input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForInv'] ."\" /></td>\n";
        echo "</tr><tr>\n";
        echo " <td colspan=\"2\" align=\"center\"><font size=\"-1\">". $lang['InvSelInfo']."</font></td>\n";
        echo " <td align=\"center\">". makelink("invoice/invoice_select.php?ext=1",$lang['extended']) ."</td>\n";
@@ -52,15 +52,15 @@
        echo " <th colspan=\"3\">". $lang['SearchForInvExt'] ."</th>\n";
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['AdrName']);
-       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">\n";
+       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\" />\n";
        echo " </td>\n";
-       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForInvExt'] ."\"></td>\n";
+       echo ' <td align="center"><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForInvExt'] ."\" /></td>\n";
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['InvoiceState']);
        echo " <td colspan=\"2\">&nbsp;<b>". InvAskState($this->isst,2) ."</b>&nbsp;</td>\n";
 
-       echo "</tr>\n";
      }
+     echo "</tr>\n";
      DoubleTableEnd();
      hiddenFormElements();
      echo $this->getHidden();

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

Modified Files:
	resource_new.php resource_overview.php resource_select.php 
Log Message:
html validation

Index: resource_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_new.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- resource_new.php	4 Jul 2005 19:05:17 -0000	1.26
+++ resource_new.php	29 Jan 2006 13:44:09 -0000	1.27
@@ -44,12 +44,12 @@
      }
      echo "<tr>\n";
      echo $this->showfieldc($lang['ResName'],1,"name");
-     echo " <td colspan=\"3\" valign=\"top\"><input id=\"name\" size=\"". min($table['resource']['name'][size],30) ."\" maxlength=\"". $table['resource']['name'][size] ."\" name=\"name\" value=\"". myentities($this->obj->name) ."\"></td>";
+     echo ' <td colspan="3" valign="top"><input id="name" size="'. min($table['resource']['name'][size],30) .'" maxlength="'. $table['resource']['name'][size] .'" name="name" value="'. myentities($this->obj->name) ."\" /></td>";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ResDesc'],0,"desc");
-     echo " <td colspan=\"3\" valign=\"top\"><input id=\"desc\" size=\"". min($table['resource']['description'][size],40) ."\" maxlength=\"". $table['resource']['description'][size] ."\" name=\"desc\" value=\"". $this->obj->desc ."\"></td>";
+     echo ' <td colspan="3" valign="top"><input id="desc" size="'. min($table['resource']['description'][size],40) .'" maxlength="'. $table['resource']['description'][size] .'" name="desc" value="'. $this->obj->desc ."\" /></td>";
      echo "</tr>\n";
 
      #
@@ -143,4 +143,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: resource_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_overview.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- resource_overview.php	25 May 2005 06:04:07 -0000	1.19
+++ resource_overview.php	29 Jan 2006 13:44:09 -0000	1.20
@@ -43,7 +43,7 @@
      $this->flds = 2;
      echo show_custom_overview_headers($this,'resource');
      if ( $tutos[massupdate] == 1 ) {
-       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
+       echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
      }
      echo "</tr>\n";
      echo "</thead>\n";
@@ -57,7 +57,6 @@
        $end = $this->start + $tutos[maxshow];
      }
 
-     echo "<tbody>\n";
      $line = 0;
      while ( ($a < $n) && ($a < $end) ) {
        $c = new resource($this->dbconn);
@@ -74,7 +73,7 @@
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
          if ( $c->mod_ok() ) {
-           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $c->id ."\">\n";
+           echo '<input name="mark[]" type="checkbox" value="'. $c->id ."\" />\n";
          } else {
            echo "-\n";
          }
@@ -83,16 +82,15 @@
        echo $this->OverviewRowEnd($line++);
      }
      $result->free();
-     echo "</tbody>\n";
 
      echo $this->list_navigation($this->link1,$this->flds + $tutos[massupdate],$this->start,$a,$n);
      if ( $tutos[massupdate] == 1 ) {
        echo $this->UpdateRowStart($this->flds-1);
        echo sprintf($lang['withmarked'],$lang['Resources']);
        echo "&nbsp;<select name=\"action\">\n";
-       echo " <option value=\"-1\" selected>". $lang['ActionNil'] ."</option>\n";
-       echo " <option value=\"-2\">". $lang['Delete'] ."</option>\n";
-       echo " <option value=\"-4\">". $lang['AclModify'] ."</option>\n";
+       echo ' <option value="-1" selected="selected">'. $lang['ActionNil'] ."</option>\n";
+       echo ' <option value="-2">'. $lang['Delete'] ."</option>\n";
+       echo ' <option value="-4">'. $lang['AclModify'] ."</option>\n";
        if (class_exists('watchlist')) {
          echo " <option value=\"WatchAdd\">". $lang['WatchAdd'] ."</option>\n";
          echo " <option value=\"WatchDel\">". $lang['WatchDel'] ."</option>\n";

Index: resource_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_select.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resource_select.php	22 Jan 2006 20:20:58 -0000	1.3
+++ resource_select.php	29 Jan 2006 13:44:09 -0000	1.4
@@ -44,9 +44,9 @@
        echo "</tr><tr>\n";
 
        echo $this->showfieldc($lang['AdrName']);
-       echo " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\"></td>\n";
+       echo " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
        echo " <td align=\"center\">\n";
-       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForFile'] ."\"></td>\n";
+       echo ' <input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForFile'] ."\" /></td>\n";
        echo "</tr><tr>\n";
        echo " <td colspan=\"2\" align=\"center\">&nbsp;</td>\n";
 #       echo " <td align=\"center\">". makelink("file/file_select.php?ext=1",$lang['extended']) ."</td>\n";
@@ -54,9 +54,9 @@
        echo "<th colspan=\"3\">". $lang['SearchForFileExt'] ."</th>\n";
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['AdrName']);
-       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">";
+       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\" />";
        echo " </td>\n";
-       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForFileExt'] ."\"></td>\n";
+       echo ' <td align="center"><input type="submit" value="'. $lang['Search'] .'" title="'. $lang['SearchForFileExt'] ."\" /></td>\n";
 
        echo "</tr><tr>\n";
        echo " <td rowspan=\"2\" class=\"desc\">". $lang['TimetrackBetween'] ."</td>\n";

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

Modified Files:
	reminder_new.php reminder_select.php 
Log Message:
html validation

Index: reminder_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- reminder_new.php	22 Jan 2006 20:19:21 -0000	1.14
+++ reminder_new.php	29 Jan 2006 13:44:09 -0000	1.15
@@ -50,7 +50,7 @@
      } else {
        echo "  <select name=\"link_id\">\n";
        foreach ($this->obj->plist as $i => $f) {
-         echo "   <option value=\"". $i ."\"". ($i == $this->obj->link_id ? " selected>* ":">") . $lang[$f->getType()] .": ". myentities($f->getFullName()) ."</option>\n";
+         echo '   <option value="'. $i .'"'. ($i == $this->obj->link_id ? ' selected="selected">* ':'>') . $lang[$f->getType()] .': '. myentities($f->getFullName()) ."</option>\n";
        }
        echo "  </select>\n";
        $this->addhidden("id",$this->obj->id);

Index: reminder_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_select.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- reminder_select.php	3 Apr 2005 18:32:16 -0000	1.2
+++ reminder_select.php	29 Jan 2006 13:44:09 -0000	1.3
@@ -39,9 +39,9 @@
      echo "<th colspan=\"3\">". $lang['ReminderSearch'] ."</th>\n";
      echo "</tr><tr>\n";
      echo $this->showfieldc($lang['ReminderDesc']);
-     echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
+     echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\" /></td>\n";
      echo " <td align=\"center\">\n";
-     echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
+     echo ' <input type="submit" value="'. $lang['Search'] ."\" /></td>\n";
      echo "</tr>\n";
      DoubleTableEnd();
      hiddenFormElements();
@@ -79,4 +79,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	acl_new.php 
Log Message:
html validation

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- acl_new.php	23 Apr 2005 13:18:18 -0000	1.36
+++ acl_new.php	28 Jan 2006 22:39:05 -0000	1.37
@@ -33,7 +33,7 @@
      $nr["m"] = 2;
      $nr["d"] = 3;
      $js = "";
-     echo " <select multiple size=\"". min(count($this->user->parties),$tutos[maxshow]) ."\" name=\"". $name ."[]\" ". $js .">\n";
+     echo ' <select multiple="multiple" size="'. min(count($this->user->parties),$tutos[maxshow]) ."\" name=\"". $name ."[]\" ". $js .">\n";
      foreach ($this->user->parties as $i => $fn) {
 
        $l = 0;
@@ -44,9 +44,9 @@
        }
   
      if ( ($l < $max) && ($l >= $min) ) {
-         echo "  <option value=\"". $i ."\" selected>&nbsp;". myentities($fn) ."&nbsp;</option>\n";
+         echo '  <option value="'. $i .'" selected="selected">&nbsp;'. myentities($fn) ."&nbsp;</option>\n";
        } else {
-         echo "  <option value=\"". $i ."\" >&nbsp;". myentities($fn) ."&nbsp;</option>\n";
+         echo '  <option value="'. $i .'">&nbsp;'. myentities($fn) ."&nbsp;</option>\n";
        }
      }
      echo " </select>\n";
@@ -57,7 +57,8 @@
    Function info() {
      global $lang,$tutos;
 
-     echo "<script LANGUAGE='JavaScript'>\n";
+     echo '<script language="JavaScript" type="text/javascript">'."\n";
+     echo "<!--\n";
      echo " function deselect (obj,nr) { \n";
      echo "  var w = obj.elements[0]; \n";
      echo "  var x = obj.elements[1]; \n";
@@ -87,6 +88,7 @@
      echo "    }\n";
      echo "  }\n";
      echo " }\n";
+     echo "//-->\n";
      echo "</script>\n";
      echo "<form name=\"acl\" action=\"acl_ins.php\" method=\"post\">\n";
 
@@ -170,11 +172,11 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo " <td colspan=\"8\">&nbsp;<input type=\"checkbox\" value=\"1\" name=\"keep\" ". ((count($this->obj) > 1) ? "checked":"") .">". $lang['ACLKeepOld'] ."</td>\n";
+     echo ' <td colspan="8">&nbsp;<input type="checkbox" value="1" name="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' />'. $lang['ACLKeepOld'] ."</td>\n";
      echo "</tr>\n";
      
      echo "<tr>\n";
-     echo " <td colspan=\"8\">&nbsp;<input type=\"checkbox\" value=\"1\" name=\"recursive\" ". ((count($this->obj) > 1) ? "checked":"") .">". $lang['ACLRecursive'] ."</td>\n";
+     echo ' <td colspan="8">&nbsp;<input type="checkbox" value="1" name="recursive" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' />'. $lang['ACLRecursive'] ."</td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -236,4 +238,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	acl.pinc user_new.php 
Log Message:
html validation

Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- acl.pinc	1 May 2005 13:37:53 -0000	1.68
+++ acl.pinc	28 Jan 2006 22:28:53 -0000	1.69
@@ -493,7 +493,7 @@
         }
         echo "</td>\n";
       }
-      echo "<td>&nbsp;</td>\n";
+      echo '<td><span id="f'.$i."_fld\">&nbsp;</span></td>\n";
 #      echo "<td>&nbsp;</td>\n";
     }
     echo $layout->OverviewRowEnd($line++);

Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- user_new.php	1 May 2005 15:24:37 -0000	1.91
+++ user_new.php	28 Jan 2006 22:28:53 -0000	1.92
@@ -181,11 +181,7 @@
        echo " <td colspan=\"4\" align=\"left\">". $lang['no'] ."&nbsp;<input id=\"admin2\" type=\"radio\" name=\"admin\" value=\"0\" ". $achecked[0] ." /></td>";
      } else {
        $this->addHidden("admin",$this->obj->admin);
-       if ( $this->obj->isAdmin() ) {
-         echo $this->showdata($lang['yes'],5);
-       } else {
-         echo $this->showdata($lang['no'],5);
-       }
+       echo $this->showdata('<span id="admin1">'. ($this->obj->isAdmin() ? $lang['yes']:$lang['no']).'</span>',5);
      }
      echo "<td colspan=\"3\">&nbsp;</td>\n";
      echo "</tr>\n";
@@ -361,7 +357,7 @@
      echo $this->showfieldc($lang['RowIconsBefore'],0,"rib1");
      echo " <td colspan=\"3\">\n";
      foreach($tutos[rowiconsbefore] as $f) {
-       echo '  <input id="rib'.$xx.'" type="checkbox" name="rib[]" value="'. $f ."\" ". ($this->obj->rowiconsbefore[strtolower($f)] == 1 ? "checked":"") ." />";
+       echo '  <input id="rib'.$xx.'" type="checkbox" name="rib[]" value="'. $f ."\" ". ($this->obj->rowiconsbefore[strtolower($f)] == 1 ? 'checked="checked"':'') ." />";
        if ( $f == "see" ) {
          echo $lang['show'];
        } else if ( $f == "mod" ) {
@@ -379,7 +375,7 @@
      echo $this->showfieldc($lang['RowIconsAfter'],0,"ria1");
      echo " <td colspan=\"3\">\n";
      foreach($tutos[rowiconsafter] as $f) {
-       echo '  <input id="ria'.$xx.'" type="checkbox" name="ria[]" value="'. $f ."\" ". ($this->obj->rowiconsafter[strtolower($f)] == 1 ? "checked":"") ." />";
+       echo '  <input id="ria'.$xx.'" type="checkbox" name="ria[]" value="'. $f ."\" ". ($this->obj->rowiconsafter[strtolower($f)] == 1 ? 'checked="checked"':'') ." />";
        if ( $f == "see" ) {
          echo $lang['show'];
        } else if ( $f == "mod" ) {
@@ -591,4 +587,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	group_overview.php group_select.php group_show.php 
Log Message:
html validation

Index: group_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_overview.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- group_overview.php	25 May 2005 06:05:07 -0000	1.22
+++ group_overview.php	28 Jan 2006 22:11:45 -0000	1.23
@@ -75,7 +75,7 @@
      $this->flds = 3;
      echo show_custom_overview_headers($this,'group');
      if ( $tutos[massupdate] == 1 ) {
-       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
+       echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
      }
      echo "</tr>\n";
      echo "</thead>\n";
@@ -89,7 +89,6 @@
        $end = $this->start + $tutos[maxshow];
      }
   
-     echo "<tbody>\n";
      $line = 0;
      while ( ($a < $n) && ($a < $end) ) {
        $c = new group($this->dbconn);
@@ -108,7 +107,7 @@
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
          if ( $c->mod_ok() ) {
-           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $c->id ."\">\n";
+           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $c->id ."\" />\n";
          } else {
            echo "-\n";
          }
@@ -117,16 +116,15 @@
        echo $this->OverviewRowEnd($line++);
      }
      $result->free();
-     echo "</tbody>\n";
   
      echo $this->list_navigation($this->link1,$this->flds + $tutos[massupdate],$this->start,$a,$n);
      if ( $tutos[massupdate] == 1 ) {
        echo $this->UpdateRowStart($this->flds-1);
        echo sprintf($lang['withmarked'],$lang['Groups']);
        echo "&nbsp;<select name=\"action\">\n";
-       echo " <option value=\"-1\" selected>". $lang['ActionNil'] ."</option>\n";
-       echo " <option value=\"-2\">". $lang['Delete'] ."</option>\n";
-       echo " <option value=\"-4\">". $lang['AclModify'] ."</option>\n";
+       echo ' <option value="-1" selected="selected">'. $lang['ActionNil'] ."</option>\n";
+       echo ' <option value="-2">'. $lang['Delete'] ."</option>\n";
+       echo ' <option value="-4">'. $lang['AclModify'] ."</option>\n";
        if (class_exists('watchlist')) {
          echo " <option value=\"WatchAdd\">". $lang['WatchAdd'] ."</option>\n";
          echo " <option value=\"WatchDel\">". $lang['WatchDel'] ."</option>\n";

Index: group_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_select.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- group_select.php	5 Jan 2006 20:25:47 -0000	1.3
+++ group_select.php	28 Jan 2006 22:11:45 -0000	1.4
@@ -43,9 +43,9 @@
      echo "</tr><tr>\n";
 
      echo $this->showfieldc($lang['AdrName']);
-     echo " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\"></td>\n";
+     echo " <td align=\"center\"><input type=\"text\" value=\"\" name=\"name\" /></td>\n";
      echo " <td align=\"center\">\n";
-     echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForGroup'] ."\"></td>\n";
+     echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForGroup'] ."\" /></td>\n";
      echo "</tr><tr>\n";
      echo " <td colspan=\"2\" align=\"center\">&nbsp;</td>\n";
      echo "</tr>\n";

Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- group_show.php	1 Dec 2005 22:26:19 -0000	1.37
+++ group_show.php	28 Jan 2006 22:11:45 -0000	1.38
@@ -330,7 +330,7 @@
        $this->addMenu($x);
      }
      if (($this->obj->id > 0) &&  $this->user->feature_ok(useprojects,PERM_SEE) ) {
-       $x = array( url => "group/group_show.php?format=pdf&id=".$this->obj->id,
+       $x = array( url => "group/group_show.php?format=pdf&amp;id=".$this->obj->id,
                    text => 'PDF',
                    info => 'PDF',
                    category => array("group","show","obj")
@@ -353,4 +353,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	sipgate.pinc 
Log Message:
html validation

Index: sipgate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/sipgate/sipgate.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sipgate.pinc	22 May 2005 14:23:44 -0000	1.3
+++ sipgate.pinc	28 Jan 2006 22:03:05 -0000	1.4
@@ -40,7 +40,7 @@
 var ctd_win=null;
 function open_ctd_win2(target, uri) 
 {
-    ctd_win=window.open("https://secure.sipgate.de/user/ctd.php?target="+target+"&uri="+uri+"&kvrk="+Date.parse(new Date()),"ctd_win","toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,top=20,left=20,width=350,height=100");
+    ctd_win=window.open("https://secure.sipgate.de/user/ctd.php?target="+target+"&uri="+uri+"&kvrk="+Date.parse(new Date()),"ctd_win","toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,top=20,left=20,width=350,height=100");
     ctd_win.window.focus();
     return;
 }

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

Modified Files:
	address_show.php address_tools.p3 
Log Message:
html validation

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- address_show.php	2 Jan 2006 08:36:25 -0000	1.101
+++ address_show.php	28 Jan 2006 22:03:05 -0000	1.102
@@ -204,7 +204,9 @@
        $this->obj->read_locs_data();
        $this->name = $lang['AddressDetail'].": ". $this->obj->getFullName();
      }
-	 if ($this->obj->getTypeID() != useaddressbook) {
+	 if (    ($this->obj->getTypeID() != useaddressbook)
+	      && ($this->obj->getTypeID() != usecompany)
+	      && ($this->obj->getTypeID() != usedepartment) ) {
        $msg .= sprintf($lang['Err0040'],$lang['Address']);
        $this->stop = true;
        $this->format = "html";

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- address_tools.p3	5 Jan 2006 10:37:21 -0000	1.86
+++ address_tools.p3	28 Jan 2006 22:03:05 -0000	1.87
@@ -62,7 +62,7 @@
            $url =  "address_show.php";
            $url = addUrlParameter($url,"lid=". $l->id);
            $url = addUrlParameter($url,"format=popup",false);
-           $url = addSessionKey($url,true);
+           $url = addSessionKey($url,false);
            echo "<a href=\"JavaScript:
      mywindow = window.open('". $l ."', 'help', 'width=300,height=300,top=200,left=200,scrollbars=1');
      mywindow.location.href = '". $url ."'; mywindow.focus();\" "self.status='". myentities($l->$name,1) ."' ;return true\" title=\"". myentities($l->$name) ."\">";

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

Modified Files:
	installation_show.php 
Log Message:
html validation

Index: installation_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_show.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- installation_show.php	9 Jun 2005 10:50:22 -0000	1.25
+++ installation_show.php	28 Jan 2006 22:03:05 -0000	1.26
@@ -106,7 +106,7 @@
      echo "</tr><tr>\n";
      $x= array($this->obj->money,$this->obj->currency);
      echo $this->showfield($lang['Money']);
-     echo $this->showdata(handle('money',$x,number_format($this->obj->money,2,$lang['DecPoint'],$lang['ThousandPoint']) ."&nbsp<b>". $this->obj->currency ."</b>"),3);
+     echo $this->showdata(handle('money',$x,number_format($this->obj->money,2,$lang['DecPoint'],$lang['ThousandPoint']) ."&nbsp;<b>". $this->obj->currency ."</b>"),3);
 
      echo "</tr>\n";
 

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

Modified Files:
	file.pinc file_overview.php file_show.php 
Log Message:
html validation

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- file.pinc	2 Jan 2006 08:36:25 -0000	1.62
+++ file.pinc	28 Jan 2006 19:35:02 -0000	1.63
@@ -360,7 +360,7 @@
           if (is_array($iptc)) {
             while(list($key, $val) = each($iptc)) {
               while(list($k, $v) = each($val)) {
-                echo $k ." => \"". $v ."\"\n";
+                echo $k ." => \"". $v ."\"<br />\n";
               }
             }
           }
@@ -369,34 +369,34 @@
     }
     if ( function_exists('exif_read_data') ) {
       if ( ($this->filetype == "image/jpeg") ) {
-        echo "EXIF:\n";
+        echo "EXIF:<br />\n";
         $exif = exif_read_data ($fname,"ANY_TAG",true,true);
         foreach($exif as  $key => $val) {
             if (gettype($val) == "array") {
-              echo "\t". $key ."\n";
+              echo "\t". $key ."<br />\n";
               foreach($val as $k2 => $v2) {
                 if ($k2 == "MakerNote") {
-                  echo "\t\t". $k2 ." => ". gettype($v2)."\n";
+                  echo "\t\t". $k2 ." => ". gettype($v2)."<br />\n";
                 } else if ($k2 == "UserComment") {
-                  echo "\t\t". $k2 ." => ". chop($v2)."\n";
+                  echo "\t\t". $k2 ." => ". chop($v2)."<br />\n";
                 } else if ($k2 == "THUMBNAIL") {
                   echo "\t\t". $k2 ." => <img alt=\"". $this->getFullName() ."\" align=\"top\" border=\"1\" src=\"".  dirname(getBaseUrl()) ."/". addSessionKey($this->getUrl()."&amp;format=thumbnail") ."\">\n\n";
                 } else if (gettype($v2) == "string") {
-                  echo "\t\t". $k2 ." => ". chop($v2)."\n";
+                  echo "\t\t". $k2 ." => ". chop($v2)."<br />\n";
                 } else if (gettype($v2) == "integer") {
-                  echo "\t\t". $k2 ." => ". $v2."\n";
+                  echo "\t\t". $k2 ." => ". $v2."<br />\n";
                 } else if (gettype($v2) == "array") {
                   echo "\t\t". $k2 ." => ";
                   foreach ($v2 as $x) {
                     echo "(". $x .")";
                   }
-                  echo "\n";
+                  echo "<br />\n";
                 } else {
-                  echo "\t\t". $k2 ." => [". gettype($v2)."]\n";
+                  echo "\t\t". $k2 ." => [". gettype($v2)."]<br />\n";
                 }
               }
             } else {
-              echo "\t". $key ." => ". chop($val) ."\n";
+              echo "\t". $key ." => ". chop($val) ."<br />\n";
             }
         }
       }

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- file_overview.php	23 May 2005 15:44:12 -0000	1.20
+++ file_overview.php	28 Jan 2006 19:35:02 -0000	1.21
@@ -56,12 +56,11 @@
      $this->flds = 6;
      echo show_custom_overview_headers($this,'file');
      if ( $tutos[massupdate] == 1 ) {
-       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
+       echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
      }
      echo "</tr>\n";
      echo "</thead>\n";
 
-     echo "<tbody>\n";
      $line = 0;
      while ( ($a < $n) && ($a < $end) ) {
        $f = new tutos_file($this->dbconn);
@@ -109,7 +108,7 @@
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
          if ( $f->mod_ok() ) {
-           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $f->id ."\">\n";
+           echo '<input name="mark[]" type="checkbox" value="'. $f->id ."\" />\n";
          } else {
            echo "-\n";
          }
@@ -120,16 +119,15 @@
        $a++;
      }
      $this->result->free();
-     echo "</tbody>\n";
 
      echo $this->list_navigation($this->link1,$this->flds +  $tutos[massupdate],$this->start,$a,$n);
      if ( $tutos[massupdate] == 1 ) {
        echo $this->UpdateRowStart($this->flds-1);
        echo sprintf($lang['withmarked'],$lang['Files']);
        echo "&nbsp;<select name=\"action\">\n";
-       echo " <option value=\"-1\" selected>". $lang['ActionNil'] ."</option>\n";
-       echo " <option value=\"-2\">". $lang['Delete'] ."</option>\n";
-       echo " <option value=\"-4\">". $lang['AclModify'] ."</option>\n";
+       echo ' <option value="-1" selected="selected">'. $lang['ActionNil'] ."</option>\n";
+       echo ' <option value="-2">'. $lang['Delete'] ."</option>\n";
+       echo ' <option value="-4">'. $lang['AclModify'] ."</option>\n";
        if (class_exists('watchlist')) {
          echo " <option value=\"WatchAdd\">". $lang['WatchAdd'] ."</option>\n";
          echo " <option value=\"WatchDel\">". $lang['WatchDel'] ."</option>\n";
@@ -305,4 +303,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_show.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- file_show.php	1 Dec 2005 22:26:18 -0000	1.23
+++ file_show.php	28 Jan 2006 19:35:02 -0000	1.24
@@ -165,9 +165,9 @@
 
      echo "<tr>\n";
      echo $this->showfield($lang['FileMore']);
-     echo " <td colspan=\"3\" class=\"pre\"><font size=\"-1\"><pre>\n";
+     echo " <td colspan=\"3\" class=\"pre\"><font size=\"-1\"><tt>\n";
      $this->obj->moreinfo($this);
-     echo " </pre></font></td>\n";
+     echo " </tt></font></td>\n";
      echo "</tr>\n";
 
      $this->obj->make_vlist();
@@ -189,9 +189,9 @@
      }
      echo "<tr>\n";
      echo $this->showfield($lang['FileLog']);
-     echo " <td colspan=\"3\" class=\"pre\"><font size=\"-1\"><pre>\n";
+     echo " <td colspan=\"3\" class=\"pre\"><font size=\"-1\"><tt>\n";
      echo $this->obj->logtxt;
-     echo " </pre></font></td>\n";
+     echo " </tt></font></td>\n";
      echo "</tr>\n";
 
      #
@@ -285,4 +285,4 @@
  $l = new file_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Modified Files:
	app_show.php task_show.php team.pinc team_select.php 
	team_show.php 
Log Message:
html validation

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- app_show.php	22 May 2005 14:23:41 -0000	1.48
+++ app_show.php	28 Jan 2006 19:35:01 -0000	1.49
@@ -255,7 +255,7 @@
        $this->addMenu($m);
      }
      if ( $this->obj->see_ok() && ($this->obj->id > 0) ) {
-       $m = array( url => "app_show.php?format=ical&id=".$this->obj->id,
+       $m = array( url => "app_show.php?format=ical&id=".$this->obj->id,
                    text => $lang['AppGetIcal'],
                    info => "get this appointment as Ical file",
                    category => array("app","view")

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- task_show.php	1 Dec 2005 22:26:17 -0000	1.78
+++ task_show.php	28 Jan 2006 19:35:02 -0000	1.79
@@ -240,15 +240,15 @@
      echo " <tr>\n";
      # Work done in time/volume
      if ( Round($m2 * $p) > 0 ) {
-       echo "  <td class=\"taskdone\"><img height=\"20\" width=\"". Round($m2 * $p)."\" src=\"". $tutos['base'] ."/html/green.png\" alt=\"--------\"></td>\n";
+       echo "  <td class=\"taskdone\"><img height=\"20\" width=\"". Round($m2 * $p)."\" src=\"". $tutos['base'] ."/html/green.png\" alt=\"--------\" /></td>\n";
      }
      # Work to do
      if ( Round((100 - $c) * $p) > 0 ) {
-       echo "  <td class=\"tasktodo\"><img height=\"20\" width=\"". Round((100 - $c) * $p)."\" src=\"". $tutos['base'] ."/html/red.png\" alt=\"--------\"></td>\n";
+       echo "  <td class=\"tasktodo\"><img height=\"20\" width=\"". Round((100 - $c) * $p)."\" src=\"". $tutos['base'] ."/html/red.png\" alt=\"--------\" /></td>\n";
      }
      # Work done more than scheduled
      if ( Round(($c - 100) * $p) > 0 ) {
-       echo "  <td class=\"taskmuch\"><img height=\"20\" width=\"". Round(($c - 100) * $p)."\" src=\"". $tutos['base'] ."/html/blue.png\" alt=\"--------\"></td>\n";
+       echo "  <td class=\"taskmuch\"><img height=\"20\" width=\"". Round(($c - 100) * $p)."\" src=\"". $tutos['base'] ."/html/blue.png\" alt=\"--------\" /></td>\n";
      }
  
      echo " </tr>\n";
@@ -335,4 +335,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- team.pinc	1 Dec 2005 21:05:14 -0000	1.94
+++ team.pinc	28 Jan 2006 19:35:02 -0000	1.95
@@ -255,7 +255,7 @@
     global $current_user,$lang,$tutos;
 
     if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos[mailmode] != 0) ) {
-      return "mail_new.php?toid=".$this->id ."&subject=". UrlEncode($lang['Team']." ".$this->getFullName() );
+      return "mail_new.php?toid=".$this->id ."&amp;subject=". UrlEncode($lang['Team']." ".$this->getFullName() );
     }
     $x = "";
     $sep = "";
@@ -681,4 +681,4 @@
     echo $r;
   }
 }
-?>
\ No newline at end of file
+?>

Index: team_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_select.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- team_select.php	3 Apr 2005 18:31:55 -0000	1.5
+++ team_select.php	28 Jan 2006 19:35:02 -0000	1.6
@@ -41,9 +41,9 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['TeamName']);
-     echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
+     echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\" /></td>\n";
      echo " <td align=\"center\">\n";
-     echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
+     echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
      echo "</tr>\n";
 
      DoubleTableEnd();

Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- team_show.php	22 May 2005 14:23:41 -0000	1.63
+++ team_show.php	28 Jan 2006 19:35:02 -0000	1.64
@@ -225,7 +225,7 @@
          echo "<td>". $obj->getLink() ."</td>\n";
          echo "<td>". AsEmail($obj->default_email(),$obj->default_email(),$obj->getFullName()) ."</td>\n";
        }
-       echo $this->OverviewRowStart($line++);
+       echo $this->OverviewRowEnd($line++);
      }  
     
      product::infolist($this->user,$this->obj,2,$this->format);
@@ -354,4 +354,4 @@
  $l = new team_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

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

Modified Files:
	note_select.php note_show.php 
Log Message:
html validation

Index: note_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_select.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- note_select.php	22 Jan 2006 20:19:21 -0000	1.14
+++ note_select.php	28 Jan 2006 19:35:02 -0000	1.15
@@ -46,9 +46,9 @@
 
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteName']);
-       echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
+       echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\" /></td>\n";
        echo " <td align=\"center\">\n";
-       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
+       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
        echo "</tr><tr>\n";
        echo " <td colspan=\"2\" align=\"center\"><font size=\"-1\">". $lang['NoteSelInfo'] ."</font></td>\n";
        echo " <td align=\"center\">". makelink("note/note_select.php?ext=1",$lang['extended']) ."</td>\n";
@@ -57,9 +57,9 @@
 
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteName']);
-       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">";
+       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\" />";
        echo " </td>\n";
-       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
+       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
 
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteRefType']);
@@ -67,11 +67,11 @@
 
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteRefName']);
-       echo " <td colspan=\"2\">&nbsp;<input type=\"text\" value=\"\" name=\"nsrn\">&nbsp;</td>\n";
+       echo " <td colspan=\"2\">&nbsp;<input type=\"text\" value=\"\" name=\"nsrn\" />&nbsp;</td>\n";
 
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteCreator']);
-       echo " <td colspan=\"2\">&nbsp;<input type=\"text\" value=\"\" name=\"nscr\">&nbsp;</td>\n";
+       echo " <td colspan=\"2\">&nbsp;<input type=\"text\" value=\"\" name=\"nscr\" />&nbsp;</td>\n";
        echo "</tr><tr>\n";
 
        echo " <td rowspan=\"2\" class=\"desc\">". $lang['NoteBetween'] ."</td>\n";

Index: note_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_show.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- note_show.php	1 Dec 2005 22:26:21 -0000	1.35
+++ note_show.php	28 Jan 2006 19:35:02 -0000	1.36
@@ -42,7 +42,7 @@
 
      echo "<tr>\n";
      echo $this->showfield($lang['NoteName']);
-     echo "<td colspan=\"3\"><b><font size=\"+1\">". myentities($this->obj->name) ."</font><b></td>";
+     echo "<td colspan=\"3\"><b><font size=\"+1\">". myentities($this->obj->name) ."</font></b></td>";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -141,4 +141,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	app_select.php permission.p3 webelements.p3 
Log Message:
html validation

Index: app_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_select.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- app_select.php	22 Jan 2006 20:19:20 -0000	1.25
+++ app_select.php	28 Jan 2006 18:51:02 -0000	1.26
@@ -46,7 +46,7 @@
        echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" /></td>\n";
        echo "</tr><tr>\n";
        echo " <td align=\"center\" colspan=\"2\"><font size=\"-1\">". $lang['AppSelInfo'] ."</font></td>\n";
-       echo " <td align=\"center\">". makelink("app_select.php?ext=1",$lang['extended']) ."</td>\n";
+       echo " <td align=\"center\">". makelink("app_select.php?ext=1",$lang['extended']) ."</td></tr>\n";
      } else {
        echo "<th colspan=\"3\">". $lang['SearchForAppExt'] ."</th>\n";
 

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- permission.p3	1 Dec 2005 21:05:14 -0000	1.153
+++ permission.p3	28 Jan 2006 18:51:03 -0000	1.154
@@ -34,11 +34,12 @@
   }
 }
 
+# We do that ourself
+@ini_set("session.use_trans_sid","off");
+
 @ini_set("session.bug_compat_warn","off");
 # use files to save session data
 @ini_set("session.save_handler","files");
-# We do that ourself
-@ini_set("session.use_trans_sid","0");
 #
 # On Server Clusters (LoadBalancing) you should
 # change savepath to some path all your servers share

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- webelements.p3	28 Jan 2006 17:34:08 -0000	1.300
+++ webelements.p3	28 Jan 2006 18:51:03 -0000	1.301
@@ -785,7 +785,7 @@
    }
 
    if ($http == false) {
-     $pre2 = htmlentities('&');
+     $pre2 = '&amp;';
    } else {
      $pre2 = '&';
    }
@@ -803,7 +803,7 @@
    }
    if ( isset($_GET['lg']) &&  ($_GET['lg'] != '') ) {
      $href .= $pre . 'lg='.$_GET['lg'];
-     $pre = '&';
+     $pre = $pre2;
    } else if ( isset($_POST['lg']) &&  ($_POST['lg'] != '') ) {
      $href .= $pre . 'lg='.$_POST['lg'];
      $pre = $pre2;

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

Modified Files:
	new_layout.pinc 
Log Message:
html validation

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- new_layout.pinc	27 Jan 2006 17:51:21 -0000	1.63
+++ new_layout.pinc	28 Jan 2006 18:51:03 -0000	1.64
@@ -584,6 +584,7 @@
       }
       if ( in_array($class,$m[category]) ) {
         $href = addSessionKey($m[url],false);
+        $href2 = addSessionKey($m[url],true);
         if ( ! eregi("^(JavaScript:|http:|https:|mailto:|ftp:|gopher:|\./)",$href) ) {
           $href = $tutos['base'] ."/php/". $href;
         }
@@ -608,6 +609,7 @@
         } else {
           $r .= $b. menulink($m[url],$t,$m[info],'',$attr) .$after .$sep;
         }
+	$r .= "\n";
         unset($this->menu[$i][text]);
       }
     }
@@ -640,7 +642,7 @@
     if ( isset($tutos[logolink]) ) {
       echo '   <a target="url" href="'. (ereg("^http",$tutos[logolink]) ? '':$tutos['base'].'/' ) . $tutos[logolink] .'">';
     } 
-    echo '   <img id="logo" border="0" src="'. (ereg("^http",$tutos[logo]) ? '':$tutos['base']."/" ). $tutos[logo] .'" alt="LOGO" align="middle" />';
+    echo '   <img id="logo" border="0" src="'. (ereg("^http",$tutos[logo]) ? '':$tutos['base']."/" ). myentities($tutos[logo]) .'" alt="LOGO" align="middle" />';
     if ( isset($tutos[logolink]) ) {
       echo '</a>';
     }

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

Modified Files:
	location.pinc address_new.php webelements.p3 
Log Message:
bugfix: inserting new department members

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- location.pinc	28 Jan 2006 17:22:20 -0000	1.81
+++ location.pinc	28 Jan 2006 17:34:08 -0000	1.82
@@ -477,11 +477,11 @@
     }
     # Check Department
     if ( !isset($_POST['d_id']) ) {
-      $dep_tmp=StripSlashes($_POST['department']);
+      $dep_tmp = trim(StripSlashes($_POST['department']));
       if ( strlen($dep_tmp) && strstr($dep_tmp," / ") == FALSE ) {
         $dep_tmp = ' / ' . $dep_tmp;
         if (isset($_POST['company'])) {
-          $dep_tmp = StripSlashes($_POST['company']) . $dep_tmp;
+          $dep_tmp = trim(StripSlashes($_POST['company'])) . $dep_tmp;
         } else if (is_object($this->company)) {
           $dep_tmp = $this->company->getFullName() . $dep_tmp;
         }

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- address_new.php	22 Jan 2006 20:19:20 -0000	1.76
+++ address_new.php	28 Jan 2006 17:34:08 -0000	1.77
@@ -63,10 +63,10 @@
        echo $this->showfield($lang['Department']);
        echo "<td><select name=\"d_id\">\n";
        foreach($this->loc->dl as $i => $f ) {
-		 foreach ($f->location as $x1 => $x2) {
+         foreach ($f->location as $x1 => $x2) {
            echo '  <option value="'. $i.'--'.$x1 .'">'. myentities($x2->getFullName()) ."</option>\n";
-		 }
-         echo '  <option value="'. $i .'--0">'. myentities($f->name) .' / '. myentities($f->company->name) ."</option>\n";
+         }
+         echo '  <option value="'. $i .'--0">'. myentities($f->company->name) .' / '. myentities($f->name) ."</option>\n";
        }
        echo "  <option value=\"-1\">----</option>\n";
        echo "</select>\n";
@@ -406,25 +406,25 @@
      if ( isset($_GET['cl']) ) {
        $cl = $_GET['cl'];
        foreach ($cl as $f) {
-		 if ($f != -1) {
+         if ($f != -1) {
            $c = new company($this->dbconn);
            $c = $c->read($f,$c);
            $c->read_locs_data();
            $this->loc->cl[$f] = &$c;
            unset($c);
-		 }
+         }
        }
      }
      if ( isset($_GET['dl']) ) {
        $dl = $_GET['dl'];
        foreach ($dl as $f)  {
-		 if ($f != -1) {
+         if ($f != -1) {
            $d = new department($this->dbconn);
            $d = $d->read($f,$d);
            $d->read_locs_data();
            $this->loc->dl[$f] = &$d;
            unset($d);
-		 }
+         }
        }
      }
      foreach($this->loc->larray as $i => $f) {

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- webelements.p3	2 Jan 2006 09:45:25 -0000	1.299
+++ webelements.p3	28 Jan 2006 17:34:08 -0000	1.300
@@ -1017,8 +1017,8 @@
        $q3 .= $qid;
        check_dbacl( $q3, $current_user->id);
      } else {
-       $cname = substr($name,0,$pos);
-       $dname = substr($name,$pos + 3);
+       $cname = trim(substr($name,0,$pos));
+       $dname = trim(substr($name,$pos + 3));
        $q3 = "SELECT d.* from ". $dbconn->prefix ."departments d , ". $dbconn->prefix ."companies c WHERE (c.id = d.c_id) AND (". $dbconn->Like("d.name",$dname) .") AND (". $dbconn->Like("c.name",$cname) .")";
        $q3 .= $qid2;
 #      echo $dname . " |  ". $cname ."<br />".$q3;

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

Modified Files:
	location.pinc 
Log Message:
bugfix: inserting new department members

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- location.pinc	13 Jan 2006 07:43:14 -0000	1.80
+++ location.pinc	28 Jan 2006 17:22:20 -0000	1.81
@@ -479,11 +479,11 @@
     if ( !isset($_POST['d_id']) ) {
       $dep_tmp=StripSlashes($_POST['department']);
       if ( strlen($dep_tmp) && strstr($dep_tmp," / ") == FALSE ) {
-        $dep_tmp .= ' / ';
+        $dep_tmp = ' / ' . $dep_tmp;
         if (isset($_POST['company'])) {
-          $dep_tmp = StripSlashes($_POST['company']);
+          $dep_tmp = StripSlashes($_POST['company']) . $dep_tmp;
         } else if (is_object($this->company)) {
-          $dep_tmp .= $this->company->getFullName();
+          $dep_tmp = $this->company->getFullName() . $dep_tmp;
         }
       }
       $this->department = check_field($dep_tmp,"department","dl","d");

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

Modified Files:
	new_layout.pinc 
Log Message:
fix

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- new_layout.pinc	2 Jan 2006 08:43:05 -0000	1.62
+++ new_layout.pinc	27 Jan 2006 17:51:21 -0000	1.63
@@ -763,7 +763,7 @@
     if ( ($tutos[debug] == 1) && function_exists('memory_get_usage') ) {
         echo " using ". memory_get_usage() ." Bytes of memory";
     }
-    echo ' cacheinfo '. count($g_hash) .'/"'. $g_hash['hits'] .'';
+    echo ' cacheinfo '. count($g_hash) .'/'. $g_hash['hits'] .'';
     echo '"><font size="-2"><i><b><acronym title="The Ultimative team organization software">TUTOS</acronym> '. $tutos[version] ."</b></i>\n";
     if ( $tutos[debug] == 1 ) {
       $now = microtime();

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

Modified Files:
      Tag: BRANCH-2-0
	mantis_ins.php 
Log Message:
- add: summary of information of bug in database to accelerate the project overview

Index: mantis_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mantis/Attic/mantis_ins.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- mantis_ins.php	18 Jan 2006 13:52:53 -0000	1.1.2.1
+++ mantis_ins.php	25 Jan 2006 09:48:28 -0000	1.1.2.2
@@ -147,6 +147,11 @@
       if ($mbug_info['severity'] == MANTIS_BUG_CLASS_DANGER) $h->class = BUG_CLASS_DANGER;
       $h->volume = '0.00';
       $h->description = $description;
+
+      $b->cur_state   = $h->state;
+      $b->cur_class   = $h->class;
+      $b->cur_solver  = $h->solver;
+      $b->cur_volume += $h->volume;
     }
   }
 

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc bug_ins.php mtable.pinc 
Log Message:
- add: summary of information of bug in database to accelerate the project overview

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.32
retrieving revision 1.13.2.33
diff -u -r1.13.2.32 -r1.13.2.33
--- bug.pinc	5 Jan 2006 11:15:41 -0000	1.13.2.32
+++ bug.pinc	25 Jan 2006 09:48:28 -0000	1.13.2.33
@@ -25,6 +25,8 @@
 function bugSummary(&$obj) {
   global $lang;
 
+  error_log("IN BUGSUMMARY");
+
   foreach ($lang['BugStates'] as $i => $f) {
     $b[$i] = 0;
     $t[$i] = 0;
@@ -32,10 +34,14 @@
   }
 
   foreach ($obj->list[usebugtracking] as $i => $bug) {
-    $bug->read_bugHistory();
-    $b[$bug->state]++;
-    $t[$bug->state] += $bug->timetracksum;
-    $s[$bug->state] = $bug->short;
+    if (!$bug->cur_state) {
+      error_log("Reload bugHistory for update bug summary id:".$bug->id);
+      $bug->read_bugHistory();
+      $bug->save();
+    }
+    $b[$bug->cur_state]++;
+    $t[$bug->cur_state] += $bug->cur_volume;/* $bug->timetracksum;*/
+    $s[$bug->cur_state] = $bug->short;
   }
 
   //$bug = new bug($obj->dbconn);
@@ -221,18 +227,29 @@
     $msg .= parent::save();
 
     $bug = getObject($this->dbconn, $this->bugid);
+    $bug_upd = 0;
       
     // The solvedate will be stored in bug itself
+    if ($bug->cur_state      != $this->state ||
+        $bug->cur_solver->id != $this->solver->id ||
+        $bug->cur_class      != $this->class) {
+      $bug->cur_state  = $this->state;
+      $bug->cur_solver = $this->solver;
+      $bug->cur_class  = $this->class;
+      $bug_upd = 1;
+    }
+
     if ( ($this->state == BUG_STATE_SOLVED) ||
 	 ( $this->state == BUG_STATE_CLOSED) ) {
       // $bug = getObject($this->dbconn, $this->bugid);
-      $bug->solvedate = $this->creation; // ICI ICI ICI ICI ICI ICI ICI ICI ICI ICI ICI ICI ICI ICI ICI
-      $bug->save();
+      $bug->solvedate = $this->creation;
+      $bug_upd = 1;
     }
+    if ($bug_upd)
+      $bug->save();
+
     // Now send a mail for the associated bug change
-error_log ("---- BUGDATA::SAVE ---- before bug::send_mail");
     $msg .= $bug->send_mail();
-error_log ("---- BUGDATA::SAVE ---- after bug::send_mail");
     return $msg;
   }
 
@@ -359,6 +376,11 @@
     $this->plandate   = new DateTime(0);  # planned solve date
     $this->solvedate  = new DateTime(0);  # real solvedate
 
+    $this->cur_solver = null;
+    $this->cur_state  = null;
+    $this->cur_class  = null;
+    $this->cur_volume = 0;
+
     $this->tablename  = $this->dbconn->prefix .$table['bug'][name];
     $this->tablename2 = $this->dbconn->prefix .$table['bug2'][name];
     $this->tablename3 = $this->dbconn->prefix .$table['bug3'][name];
@@ -389,6 +411,11 @@
     $this->creation  = $r->getDateTime($pos, "creation");
     $this->solvedate = $r->getDateTime($pos, "solvedate");
 
+    $this->cur_solver = getObject($this->dbconn,$r->get($pos, "cur_solver"));
+    $this->cur_state  = $r->get($pos, "cur_state");
+    $this->cur_class  = $r->get($pos, "cur_class");
+    $this->cur_volume = $r->get($pos, "cur_volume");
+
     parent::read_result($r,$pos);
     return;
   }
@@ -409,6 +436,16 @@
     $this->state  = $this->bughist[$last]->state;
     $this->class  = $this->bughist[$last]->class;
     $this->solver = $this->bughist[$last]->solver;
+
+    /* update informations to bug */
+    $this->cur_state  = $this->state;
+    $this->cur_class  = $this->class;
+    $this->cur_solver = $this->solver;
+    $this->cur_volume = 0;
+    reset($this->bughist);
+    foreach ($this->bughist as $bh) {
+      $this->cur_volume += $bh->volume;
+    }
   }
 
   /**
@@ -716,6 +753,11 @@
     $q->addFV("solvedate",$this->solvedate,"DATETIME");
     $q->addFV("product_id",$this->parent,"OBJ");
 
+    $q->addFV("cur_solver",$this->cur_solver,"OBJ");
+    $q->addFV("cur_state",$this->cur_state,"INT");
+    $q->addFV("cur_class",$this->cur_class,"INT");
+    $q->addFV("cur_volume",$this->cur_volume,"FLOAT");
+
     if ( $this->id < 0) {
       unset ($this->modified);
       if ( isset($this->newid) ) {
@@ -994,8 +1036,9 @@
     while ($a < $n) {
       $b = new bug($obj->dbconn);
       $b->read_result($r,$a);
-      $b->readTimetrackSum();
-      $obj->tsum['Bugs'] += $b->timetracksum;
+//      $b->readTimetrackSum();
+//      $obj->tsum['Bugs'] += $b->timetracksum;
+      $obj->tsum['Bugs'] += $b->cur_volume;
       $obj->list[usebugtracking][$b->id] = &$b;
       $a++;
       unset($b);

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -r1.7.2.6 -r1.7.2.7
--- bug_ins.php	18 Jan 2006 13:52:53 -0000	1.7.2.6
+++ bug_ins.php	25 Jan 2006 09:48:28 -0000	1.7.2.7
@@ -157,6 +157,12 @@
  $h->volume = $volume;
  $h->description = $description;
 
+  /* new summary directly in bug informations */
+ $b->cur_state   = $h->state;
+ $b->cur_class   = $h->class;
+ $b->cur_solver  = $h->solver;
+ $b->cur_volume += $h->volume;
+
 if( $b->id > 0 ) {
   $h->bugid = $b->id;
 

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/mtable.pinc,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- mtable.pinc	27 May 2005 13:48:51 -0000	1.2.2.5
+++ mtable.pinc	25 Jan 2006 09:48:28 -0000	1.2.2.6
@@ -11,13 +11,17 @@
 $table['bug'] = array(
   name => "bugs",
   Desc => "TUTOS bugs",
-  "id"          => array(type => "ID_TYPE",             constraints => "PK",  Desc => "Object ID"),
-  "name"        => array(type => "VARCHAR", size => 30, constraints => "",    Desc => "Bug Display Name"),
+  "id"          => array(type => "ID_TYPE",              constraints => "PK",  Desc => "Object ID"),
+  "name"        => array(type => "VARCHAR", size => 30,  constraints => "",    Desc => "Bug Display Name"),
   "short"       => array(type => "VARCHAR", size => 100, constraints => "",    Desc => "short description"),
-  "product_id"  => array(type => "ID_TYPE", constraints => "NN",  Desc => "object with bug"),
-  "solvedate"   => array(type => "TS_TYPE", constraints => "", Desc => "solve date"),
-  "creator"     => array(type => "ID_TYPE",     constraints => "",    Desc => "creator ID"),
-  "creation"    => array(type => "TS_TYPE",     constraints => "",    Desc => "creation date")
+  "product_id"  => array(type => "ID_TYPE",              constraints => "NN",  Desc => "object with bug"),
+  "solvedate"   => array(type => "TS_TYPE",              constraints => "",    Desc => "solve date"),
+  "creator"     => array(type => "ID_TYPE",              constraints => "",    Desc => "creator ID"),
+  "creation"    => array(type => "TS_TYPE",              constraints => "",    Desc => "creation date"),
+  "cur_solver"  => array(type => "ID_TYPE",              constraints => "",    Desc => "current solver ID"),
+  "cur_state"   => array(type => "ID_TYPE",              constraints => "",    Desc => "current state of bug"),
+  "cur_class"   => array(type => "ID_TYPE",              constraints => "",    Desc => "current class of bug"),
+  "cur_volume"  => array(type => "float",                constraints => "",    Desc => "current work volume in hours"),
 );
 $tableidx['bug11'] = array(
   name  => "bug_idx1",
@@ -47,7 +51,7 @@
   "tt_id"       => array(type => "ID_TYPE", constraints => "NN",  Desc => "Timetrack entry ID"),
   "class"       => array(type => "ID_TYPE", constraints => "NN",  Desc => "class of bug"),
   "state"       => array(type => "ID_TYPE", constraints => "NN",  Desc => "state of bug"),
-  "solver"     => array(type => "ID_TYPE",     constraints => "",    Desc => "solver ID"),
+  "solver"      => array(type => "ID_TYPE",     constraints => "",    Desc => "solver ID"),
   "creation"    => array(type => "TS_TYPE",     constraints => "",    Desc => "creation date")
 );
 $tableidx['bug31'] = array(

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

Modified Files:
      Tag: BRANCH-2-0
	timetrack_ins.php 
Log Message:
- add: summary of information of bug in database to accelerate the project overview

Index: timetrack_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_ins.php,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -u -r1.42.2.3 -r1.42.2.4
--- timetrack_ins.php	5 Oct 2004 12:38:22 -0000	1.42.2.3
+++ timetrack_ins.php	25 Jan 2006 09:48:28 -0000	1.42.2.4
@@ -24,6 +24,7 @@
  $mode = 0;
  $tt = new timetrack($dbconn);
 
+ $volume_change = 0;
 
  if ( isset($_POST['gotourl']) ) {
    $gotourl = $_POST['gotourl'];
@@ -37,6 +38,7 @@
  if ( isset($_POST['id']) ) {
    $tt->read($_POST['id']);
    $gotourl= addUrlParameter($gotourl,"id=". $tt->id,true);
+   $volume_change -= $tt->volume;
  } else {
    $tt->creator = $current_user;
  }
@@ -56,6 +58,7 @@
    $tt->ref = getObject($dbconn,$tt->link_id);
    $gotourl= addUrlParameter($gotourl,"lid=". $_POST['lid'],true);
  }
+ 
  # worker
  if ( isset($_POST['wfn']) ) {
    if ( empty($_POST['wfn']) ) {
@@ -129,6 +132,7 @@
      $volume = $_POST['volume'];
      $gotourl= addUrlParameter($gotourl, "volume=". UrlEncode($volume), true);
      $tt->setVolume($volume);
+     $volume_change += $volume;
    }
  }
 
@@ -167,8 +171,15 @@
       $tt->setVolumeTodo($_POST['volume_todo']);
     }
   }
+} else if ($tt->ref->getType() == "bug" ) {
+  if ($volume_change != 0) {
+    $b = $tt->ref;
+    $b->cur_volume += $volume_change;
+    $b->save();
+  }
 }
 
+
  if ( !checkfloat($_POST['cph'],true) ) {
    $msg .= sprintf($lang['Err0017'],$lang['TTcph']) ."<br>";
  } else {

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

Modified Files:
	config_default.pinc database.pinc department_new.php 
	timetrack.pinc timetrack_overview.php 
Log Message:
cosmetics

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- config_default.pinc	1 Dec 2005 21:05:14 -0000	1.107
+++ config_default.pinc	22 Jan 2006 20:23:23 -0000	1.108
@@ -143,7 +143,7 @@
 #        call adminpage -> select DB Name -> Modify -> change -> save
 # 
 #$tutos[logo] = "html/tutos_small.gif";
-$tutos[logo] = "http://sourceforge.net/sflogo.php?group_id=8047&type=1";
+$tutos[logo] = "http://sflogo.sourceforge.net/sflogo.php?group_id=8047&type=1";
 #$tutos[logolink] = "html/copyright.html";
 $tutos[logolink] = "http://www.tutos.org";
 #

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- database.pinc	1 Dec 2005 21:05:14 -0000	1.56
+++ database.pinc	22 Jan 2006 20:23:23 -0000	1.57
@@ -70,23 +70,23 @@
 
     $this->init($dbconn);
 
-    $this->name   = "";
-    $this->alias  = "";
-    $this->host   = "";
-    $this->port   = "";
-    $this->user   = "";
-    $this->pass   = "";
-    $this->home   = "";
+    $this->name   = '';
+    $this->alias  = '';
+    $this->host   = '';
+    $this->port   = '';
+    $this->user   = '';
+    $this->pass   = '';
+    $this->home   = '';
     $this->type   = -1;
-    $this->prefix = "";
-    $this->repository   = "undefined";
+    $this->prefix = '';
+    $this->repository   = 'undefined';
     $this->logo = $tutos[logo];
     $this->logolink = $tutos[logolink];
     $this->bugautoname = $tutos[bugautoname];
     $this->invautoname = $tutos[invautoname];
     $this->taskautoname = $tutos[taskautoname];
-    $this->vatlist = "";
-    $this->version = "";
+    $this->vatlist = '';
+    $this->version = '';
     $this->crypt = 0;
 
     $this->lastsync = new Datetime(0);

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- department_new.php	13 Jan 2006 07:28:37 -0000	1.60
+++ department_new.php	22 Jan 2006 20:23:23 -0000	1.61
@@ -33,9 +33,9 @@
      echo $this->DataTableStart();
      echo "<tr>\n";
      if ( $this->obj->id < 0 ) {
-       echo " <th colspan=\"5\">". sprintf($lang['DepartmentCreate'])."</th>\n";
+       echo ' <th colspan="5">'. sprintf($lang['DepartmentCreate'])."</th>\n";
      } else {
-       echo " <th colspan=\"5\">". sprintf($lang['DepartmentModify'])."</th>\n";
+       echo ' <th colspan="5">'. sprintf($lang['DepartmentModify'])."</th>\n";
        $this->addHidden("id", $this->obj->id);
      }
      echo "</tr>\n";
@@ -47,7 +47,7 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['Department'],1,"name");
-     echo "<td colspan=\"4\"><input size=\"". min($table['department']['name'][size],30)."\" maxlength=\"".$table['department']['name'][size]."\" id=\"name \"name=\"name\" value=\"". $this->obj->name ."\"></td>\n";
+     echo ' <td colspan="4"><input size="'. min($table['department']['name'][size],30).'" maxlength="'.$table['department']['name'][size].'" id="name" name="name" value="'. $this->obj->name ."\"></td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- timetrack.pinc	1 Dec 2005 21:05:14 -0000	1.79
+++ timetrack.pinc	22 Jan 2006 20:23:23 -0000	1.80
@@ -464,7 +464,7 @@
    * 
    */
   function mod_ok() {
-    if ( $this->ref != -1 ) {
+    if ( is_object($this->ref) ) {
       return $this->ref->mod_ok();
     } else {
       return 0;

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- timetrack_overview.php	7 Jul 2005 11:45:04 -0000	1.93
+++ timetrack_overview.php	22 Jan 2006 20:23:23 -0000	1.94
@@ -186,23 +186,24 @@
        } else {
          echo " <td align=\"right\">". sprintf("%03d",($a + 1)) ."</td>\n";
        }
-       if ( $tt->ref ==  -1 ) {
-         echo " <td><i>". makelink("history_show.php?id=". $tt->link_id ,$lang['HistoryDeleted']) ."</i></td>\n";
+       if ( ! is_object($tt->ref) ) {
+         echo ' <td><i>'. makelink("history_show.php?id=". $tt->link_id ,$lang['HistoryDeleted']) ."</i></td>\n";
        } else {
-         echo " <td>". $tt->ref->getLink() ."</td>\n";
+         echo ' <td>'. $tt->ref->getLink() ."</td>\n";
        }
-       if ( $tt->worker->id ==  -1 ) {
-         echo " <td><i>". makelink("history_show.php?id=". $tt->wid ,$lang['HistoryDeleted']) ."</i></td>\n";
+       if ( ! is_object($tt->worker) ) {
+         echo ' <td><i>'. makelink("history_show.php?id=". $tt->wid ,$lang['HistoryDeleted']) ."</i></td>\n";
        } else {
-         echo " <td>". $tt->worker->getLink() ."</td>\n";
+         echo ' <td>'. $tt->worker->getLink() ."</td>\n";
        }
-       echo " <td align=\"right\">". hour_format($tt->volume) ."</td>\n";
+       echo ' <td align="right">'. hour_format($tt->volume) ."</td>\n";
+       echo ' <td align="right">';
        if ($tt->volume_todo != 0) {
-         echo " <td align=\"right\">". hour_format($tt->volume_todo) ."</td>\n";
+         echo hour_format($tt->volume_todo) ."</td>\n";
        } else {
-         echo " <td align=\"right\">&nbsp;</td>\n";
+         echo "&nbsp;</td>\n";
        }
-       echo " <td align=\"right\">". $tt->distance ."</td>\n";
+       echo ' <td align="right">'. $tt->distance ."</td>\n";
        $sum['v'] += $tt->volume;
        $sum['d'] += $tt->distance;
        $sum[$tt->currency] += ( $tt->cph * $tt->volume );

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

Modified Files:
	en.p3 rep_bug_state_duration.pinc 
Log Message:
updates

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_bug_state_duration/en.p3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- en.p3	22 Jan 2006 17:57:58 -0000	1.1
+++ en.p3	22 Jan 2006 20:22:53 -0000	1.2
@@ -7,7 +7,7 @@
  *   $Author$
  */
 
-$lang['rep_bug_state_duration_name'] = "Bug States";
+$lang['rep_bug_state_duration_name'] = "Bug States Analysis";
 $lang['rep_bug_state_duration_info'] = "Bug State Durations";
 
 ?>

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rep_bug_state_duration.pinc	22 Jan 2006 17:57:58 -0000	1.1
+++ rep_bug_state_duration.pinc	22 Jan 2006 20:22:53 -0000	1.2
@@ -13,9 +13,19 @@
     $this->init($dbconn,$report);
     $this->format = "html";
     $this->obj = -1;
+    $this->from = new DateTime(0);
+    $this->to = new DateTime(0);
     if (isset($_GET['id'])) {
       $this->obj = getObject($this->dbconn,$_GET['id']);
     }
+    $this->from->setDateTimeF('f');
+    $this->to->setDateTimeF('t');
+#   echo $this->from->getYYYYMMDD(). $this->from->notime;
+
+    $this->bugclass = array();
+    if (isset($_GET['bugclass'])) {
+      $this->bugclass = $_GET['bugclass'];
+    }
   }
 
   function calc_one_bug(&$bug,&$stat,$show_history) {
@@ -76,7 +86,29 @@
     $stat['count'] = 0;
 
     if ($this->obj == -1) {
-      $q = "SELECT * from bugs";
+      $q = "SELECT * from ".$this->dbconn->prefix."bugs";
+      $pre = " WHERE ";
+      if (count($this->bugclass)) {
+        $q .= $pre . "class in (";
+        $pre2 = "";
+		foreach ($this->bugclass as $j) {
+          $q.= $pre2.$j;
+          $pre2 = ",";
+		}
+        $q.= ")";
+        $pre = " AND ";
+      }
+      if ($this->from->notime != 1) {
+        $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();
       $r .= $n ." ". $lang['Bugs']."<br />\n";
@@ -136,12 +168,16 @@
 
   function ask_form() {
     global $lang;
-    $r = "";
-    $r .= '<select size="4" multiple="multiple" name="bugclass[]">';
+    $r = "<b>FILTER:</b><br />\n";
+    $r .= $lang['BugClass'] .':<select size="4" multiple="multiple" name="bugclass[]">';
     foreach ($lang['BugClasses'] as $i => $j) {
       $r .= '<option value="'.$i.'">'. $j .'</option>';
     }
-    $r .= '</select>';
+    $r .= '</select><br />';
+    $from = new DateTime(0);
+    $to   = new DateTime(0);
+    $r .= $lang['DateTimeFrom'] .': '. $from->EnterDate("f",1) ."<br />\n";
+    $r .= $lang['DateTimeTill'] .': '.$to->EnterDate("t",1) ."<br />\n";
     return $r;
   }