tutos-commits Mailing List for TUTOS

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

Modified Files:
	group_new.php 
Log Message:
layout updates

Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- group_new.php	22 Aug 2006 10:13:23 -0000	1.32
+++ group_new.php	25 Nov 2006 14:47:15 -0000	1.33
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2005 by Gero Kohnert
+ *  Copyright 2002 - 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   
@@ -33,17 +33,14 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"groupnew\" action=\"group_ins.php\" method=\"post\">\n";
+     $this->width = 4;
+     echo "<form id=\"groupnew\" name=\"groupnew\" action=\"group_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo "</tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ($this->obj->id > 0 ) {
        $this->addHidden("id", $this->obj->id );
-       echo "<tr>\n";
-       echo " <td colspan=\"3\">". sprintf ($lang['BugCreation'],$this->obj->creator != -1 ? $this->obj->creator->getLink():$lang['HistoryDeleted'],$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
      }
 
      echo "<tr>\n";
@@ -151,4 +148,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	url_new.php 
Log Message:
layout updates

Index: url_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_new.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- url_new.php	25 Nov 2006 08:48:11 -0000	1.17
+++ url_new.php	25 Nov 2006 14:47:16 -0000	1.18
@@ -53,7 +53,7 @@
      echo "// -->\n";
      echo "</script>\n";
      
-	 $this->width = 4;
+     $this->width = 4;
      echo $this->DataTableStart();
      echo $this->Headline();
      echo $this->acl_line(true);

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

Modified Files:
	address_new.php app_new.php app_new_r.php company_new.php 
	department_new.php location.pinc user_new.php 
Log Message:
layout updates

Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- user_new.php	25 Nov 2006 08:48:10 -0000	1.94
+++ user_new.php	25 Nov 2006 14:47:15 -0000	1.95
@@ -120,14 +120,10 @@
 
      echo "<form id=\"useradd\" name=\"useradd\" action=\"user_ins.php\" method=\"post\">\n";
 
+	 $this->width = 9;
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo " <th colspan=\"9\">". $lang['UserInfo'] ."</th>\n";
-     echo "</tr>\n";
-
-     echo "<tr>\n";
-     echo " <td align=\"right\" colspan=\"9\">". acl_link($this->obj) ."</td>\n";
-     echo "</tr>\n";
+     echo $this->Headline($lang['UserInfo']);
+     echo $this->acl_line(true);
 
      echo "<tr>\n";
      if ( $this->user->isAdmin() ) {

Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- app_new_r.php	25 Nov 2006 08:48:10 -0000	1.59
+++ app_new_r.php	25 Nov 2006 14:47:15 -0000	1.60
@@ -32,16 +32,18 @@
    Function info() {
      global $table,$tutos, $lang;
 
-     $a_checked[0] = "";
-     $a_checked[1] = "";
-     $a_checked[2] = "";
-     $a_checked[3] = "";
+     $this->width = 6;
+
+     $a_checked[0] = '';
+     $a_checked[1] = '';
+     $a_checked[2] = '';
+     $a_checked[3] = '';
      $a_checked[$this->obj->mod_allow] = ' checked="checked"';
 
-     $r_checked[1] = "";
-     $r_checked[2] = "";
-     $r_checked[3] = "";
-     $r_checked[4] = "";
+     $r_checked[1] = '';
+     $r_checked[2] = '';
+     $r_checked[3] = '';
+     $r_checked[4] = '';
      $r_checked[$this->obj->repeat] = ' checked="checked"';
 
 
@@ -53,25 +55,11 @@
      if ( $this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
      }
+     $this->addHidden("creator",$this->obj->creator->id);
 
      echo $this->DataTableStart();
-
-     echo "<tr>\n";
-     echo "<th colspan=\"6\">";
-     if ( $this->obj->id > 0 ) {
-       echo $lang['ModOldAppoint'] ."(repeat)";
-       echo "</th>\n";
-       echo "</tr><tr>\n";
-       echo "<td colspan=\"5\"><b>". $lang['AppCreatedBy'] ."</b>&nbsp;". $this->obj->creator->getLink();
-       echo "&nbsp;<b>". $lang['atDateTime'] ."</b>&nbsp;". $this->obj->creation->getDateTime()."</td>";
-       echo "<td align=\"right\">" .acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
-     } else {
-       echo $lang['CreateAppoint'] ." (repeat)";
-       echo "</th>\n";
-     }
-     echo "</tr>\n";
-     $this->addHidden("creator",$this->obj->creator->id);
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      # START
      echo "<tr>";
@@ -333,4 +321,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- address_new.php	25 Nov 2006 08:48:10 -0000	1.81
+++ address_new.php	25 Nov 2006 14:47:15 -0000	1.82
@@ -163,6 +163,7 @@
    Function info() {
      global $lang,$table;
 
+     $this->width = 4;
      echo "<form id=\"adrnew\" name=\"adrnew\" enctype=\"multipart/form-data\" action=\"address_ins.php\" method=\"post\">\n";
 
      echo $this->DataTableStart();
@@ -185,13 +186,9 @@
        $title .= sprintf($lang['AdrLocCreate'],myentities($this->obj->getFullName()));
      }
 
-     echo ' <tr><th colspan="4">'. $title ."</th></tr>\n";
+     echo $this->Headline($title);
+     echo $this->acl_line(true);
 
-     if ( $this->obj->id > 0)  {
-       echo "<tr><td colspan=\"4\" align=\"right\">&nbsp;";
-       echo acl_link($this->obj);
-       echo "</td></tr>\n";
-     }
 
      $this->ask_address();
      if ( $this->loc->id > -1)  {

Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- company_new.php	25 Nov 2006 08:48:10 -0000	1.65
+++ company_new.php	25 Nov 2006 14:47:15 -0000	1.66
@@ -28,21 +28,15 @@
    Function info() {
      global $tutos,$lang,$table;
 
+     $this->width = 5;
      echo "<form id=\"cmpadd\" name=\"cmpadd\" action=\"company_ins.php\" method=\"post\">\n";
 
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     if ( $this->obj->id < 0 ) {
-       echo ' <th colspan="5">'. sprintf($lang['CompanyCreate'])."</th>\n";
-     } else {
-       echo ' <th colspan="5">'. sprintf($lang['CompanyModify'])."</th>\n";
-       $this->addHidden("id", $this->obj->id);
-     }
-     echo "</tr>\n"; 
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ( $this->obj->id > 0 ) {
-       echo "<tr>\n";
-       echo ' <td colspan="5" align="right">'. acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
+       $this->addHidden("id", $this->obj->id);
      }
 
      echo "<tr>\n";

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- location.pinc	25 Jul 2006 11:19:55 -0000	1.85
+++ location.pinc	25 Nov 2006 14:47:15 -0000	1.86
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -602,7 +602,7 @@
 
     echo "<tr>\n";
     echo $layout->showfieldc($lang['State'],0,'state');
-    echo ' <td colspan="1"><input size="30" maxlength="'. $table['location']['state'][size] .'" id="state" name="state" value="'. myentities($this->state) ."\" /></td>\n";
+    echo ' <td colspan="4"><input size="30" maxlength="'. $table['location']['state'][size] .'" id="state" name="state" value="'. myentities($this->state) ."\" /></td>\n";
     echo "</tr>\n";
     echo "<tr>\n";
     echo $layout->showfieldc($lang['Country'],0,'country');
@@ -633,4 +633,4 @@
   }
 
 }
-?>
+?>
\ No newline at end of file

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- department_new.php	25 Nov 2006 08:48:10 -0000	1.62
+++ department_new.php	25 Nov 2006 14:47:15 -0000	1.63
@@ -28,21 +28,15 @@
    Function info() {
      global $tutos,$lang,$table;
 
+     $this->width = 5;
      echo "<form id=\"depadd\" name=\"depadd\" action=\"department_ins.php\" method=\"post\">\n";
 
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     if ( $this->obj->id < 0 ) {
-       echo ' <th colspan="5">'. sprintf($lang['DepartmentCreate'])."</th>\n";
-     } else {
-       echo ' <th colspan="5">'. sprintf($lang['DepartmentModify'])."</th>\n";
-       $this->addHidden("id", $this->obj->id);
-     }
-     echo "</tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ( $this->obj->id > 0 ) {
-       echo "<tr>\n";
-       echo ' <td colspan="5" align="right">'. acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
+       $this->addHidden("id", $this->obj->id);
      }
 
      echo "<tr>\n";
@@ -58,10 +52,10 @@
      echo "</tr>\n";
 
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     module_addforms($this->user,$this->obj,$this->width);
 
      if ( $this->loc->id > -1)  {
-       echo "<tr><td colspan=\"5\" align=\"right\">&nbsp;";
+       echo '<tr><td colspan="5" align="right">&nbsp;';
        echo acl_link($this->loc);
        echo "</td></tr>\n";
      }
@@ -212,4 +206,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- app_new.php	25 Nov 2006 08:48:10 -0000	1.70
+++ app_new.php	25 Nov 2006 14:47:15 -0000	1.71
@@ -32,10 +32,11 @@
    Function info() {
      global $tutos, $lang,$table;
 
-     $a_checked[0] = "";
-     $a_checked[1] = "";
-     $a_checked[2] = "";
-     $a_checked[3] = "";
+     $this->width = 6;
+     $a_checked[0] = '';
+     $a_checked[1] = '';
+     $a_checked[2] = '';
+     $a_checked[3] = '';
      $a_checked[$this->obj->mod_allow] = ' checked="checked"';
 
      if ( $this->obj->allowed == 0 ) {
@@ -47,23 +48,11 @@
      if ( $this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
      }
+     $this->addHidden("creator",$this->obj->creator->id);
 
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo "<th colspan=\"6\">";
-     if ( $this->obj->id > 0 ) {
-       echo $lang['ModOldAppoint'];
-       echo "</th>\n";
-       echo "</tr><tr>\n";
-       echo "<td colspan=\"5\">&nbsp;<b>". $lang['AppCreatedBy'] ."</b>&nbsp;". $this->obj->creator->getLink();
-       echo "&nbsp;<b>". $lang['atDateTime'] ."</b>&nbsp;". $this->obj->creation->getDateTime()."</td>";
-       echo "<td align=\"right\">" .acl_link($this->obj) ."</td>\n";
-     } else {
-       echo $lang['CreateAppoint'];
-       echo "</th>\n";
-     }
-     echo "</tr>\n";
-     $this->addHidden("creator",$this->obj->creator->id);
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      # START
      echo "<tr>\n";
@@ -360,4 +349,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	stuff_new.php 
Log Message:
layout updates

Index: stuff_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_new.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- stuff_new.php	23 Nov 2006 08:57:34 -0000	1.7
+++ stuff_new.php	25 Nov 2006 14:47:16 -0000	1.8
@@ -19,8 +19,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("stuff","new");
- loadmodule("stuff");
+ loadmodules('stuff','new');
+ loadmodule('stuff');
  loadlayout();
 
  /**
@@ -33,22 +33,20 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"stuffnew\" action=\"stuff_ins.php\" method=\"post\">\n";
+     $this->width = 4;
+
+     echo "<form id=\"stuffnew\" name=\"stuffnew\" action=\"stuff_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo "</tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ($this->obj->id > 0 ) {
        $this->addHidden("id", $this->obj->id );
-       echo "<tr>\n";
-       echo " <td colspan=\"3\">". sprintf ($lang['BugCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
      }
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['StuffName'],1,"name");
-     echo " <td colspan=\"3\"><input id=\"name\" name=\"name\" size=\"". min($table['stuff']['name'][size],40) ."\" maxlength=\"". $table['stuff']['name'][size] ."\" value=\"". myentities($this->obj->name) ."\" />\n";
+     echo ' <td colspan="3"><input id="name" name="name" size="'. min($table['stuff']['name'][size],40) .'" maxlength="'. $table['stuff']['name'][size] .'" value="'. myentities($this->obj->name) ."\" />\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -58,16 +56,16 @@
 
      echo "<tr>\n";
      echo $this->showfield($lang['StuffType'],0,"type");
-     echo "<td colspan=\"3\"><select id=\"type\" name=\"type\">\n";
-	 foreach($lang['StuffTypes'] as $i => $f) {
-       echo "   <option value=\"". $i ."\"". ($this->obj->type == $i ? " selected=\"selected\"":"") .">". myentities($lang['StuffTypes'][$i]) ."</option>\n";
-	 }
-     echo "</select></td>\n";
+     echo ' <td colspan="3"><select id="type" name="type">'."\n";
+     foreach($lang['StuffTypes'] as $i => $f) {
+       echo '   <option value="'. $i .'"'. ($this->obj->type == $i ? ' selected="selected">':'>'). myentities($lang['StuffTypes'][$i]) ."</option>\n";
+     }
+     echo " </select></td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['StuffSerial'],0,"serial");
-     echo " <td colspan=\"3\"><input id=\"serial\" name=\"serial\" size=\"". min($table['stuff']['name'][size],40) ."\" maxlength=\"". $table['stuff']['name'][size] ."\" value=\"". myentities($this->obj->serial) ."\" />\n";
+     echo ' <td colspan="3"><input id="serial" name="serial" size="'. min($table['stuff']['name'][size],40) .'" maxlength="'. $table['stuff']['name'][size] .'" value="'. myentities($this->obj->serial) ."\" />\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -77,14 +75,14 @@
      echo " </td>\n";
      echo $this->showfieldc($lang['StuffPrice'],0,"price");
      echo " <td>\n";
-     echo "  <input id=\"price\" size=\"10\" maxlength=\"10\" name=\"price\" value=\"".  number_format($this->obj->price,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
+     echo '  <input id="price" size="10" maxlength="10" name="price" value="'.  number_format($this->obj->price,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
      Currency_Select("currency",$this->obj->currency);
      echo " </td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['StuffId'],1,"invid");
-     echo " <td colspan=\"3\"><input id=\"invid\" name=\"invid\" size=\"". min($table['stuff']['name'][size],40) ."\" maxlength=\"". $table['stuff']['name'][size] ."\" value=\"". myentities($this->obj->invid) ."\" />\n";
+     echo ' <td colspan="3"><input id="invid" name="invid" size="'. min($table['stuff']['name'][size],40) .'" maxlength="'. $table['stuff']['name'][size] .'" value="'. myentities($this->obj->invid) ."\" />\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -193,4 +191,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	resource_new.php 
Log Message:
layout updates

Index: resource_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_new.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- resource_new.php	29 Jan 2006 13:44:09 -0000	1.27
+++ resource_new.php	25 Nov 2006 14:47:15 -0000	1.28
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2005 by Gero Kohnert
+ *  Copyright 2001 - 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   
@@ -30,18 +30,16 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"resnew\" action=\"resource_ins.php\" method=\"post\">\n";
+     $this->width = 4;
+     echo "<form id=\"resnew\" name=\"resnew\" action=\"resource_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo "</tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ($this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
-       echo "<tr>\n";
-       echo " <td colspan=\"3\">". sprintf ($lang['BugCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
      }
+
      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>";

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

Modified Files:
	reminder_new.php 
Log Message:
layout updates

Index: reminder_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_new.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- reminder_new.php	25 Nov 2006 08:48:11 -0000	1.17
+++ reminder_new.php	25 Nov 2006 14:47:15 -0000	1.18
@@ -33,6 +33,7 @@
    Function info() {
      global $tutos,$lang,$table;
 
+     $this->width = 4;
      $o = array();
      echo "<form id=\"rmnew\" name=\"rmnew\" action=\"reminder_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
@@ -128,7 +129,7 @@
          echo " <br />\n";
          echo " <select name=\"offset\" id=\"offset\">\n";
          foreach ($o as $offset) {
-           echo " <option value=\"". $offset ."\"".($offset == $this->obj->offset ? " selected=\"selected\"":"").">\n";
+           echo ' <option value="'. $offset .'"'.($offset == $this->obj->offset ? ' selected="selected"':'').">\n";
            echo myentities(reminder_offset_format($offset));
            echo " </option>\n";
          }
@@ -211,7 +212,7 @@
        if ( is_numeric($this->obj) && $this->obj == -1 ) {
          $msg .= sprintf($lang['Err0040'],$lang['Reminder']);
          $this->stop = true;
-     return;
+         return;
        }
        $this->name = $lang['ReminderModify'] .": ". $this->obj->getFullName();
      } else {

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

Modified Files:
	file_new.php 
Log Message:
layout updates

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- file_new.php	24 Jul 2006 15:34:07 -0000	1.21
+++ file_new.php	25 Nov 2006 14:47:15 -0000	1.22
@@ -32,22 +32,16 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"fileadd\" enctype=\"multipart/form-data\" method=\"post\" action=\"file_ins.php\">\n";
+     $this->width = 4;
+     echo "<form id=\"fileadd\" name=\"fileadd\" enctype=\"multipart/form-data\" method=\"post\" action=\"file_ins.php\">\n";
 
-     if ( $this->obj->id != -1 ) {
+     if ( $this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
      }
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo ' <th colspan="4">'. $lang['File'] ."</th>\n";
-     echo "</tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
-     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 "</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";
@@ -93,30 +87,30 @@
      } else {
        echo "<td>&nbsp;</td>\n";
      }
-	 if (count($this->refl) > 0) {
+     if (count($this->refl) > 0) {
        echo " <td colspan=\"3\">";
-	   echo "  <select name=\"link_id[]\">\n";
+       echo "  <select name=\"link_id[]\">\n";
        echo "   <option value=\"-1\" selcted=\"selected\">--</option>\n";
-  	   foreach ($this->refl as $f) {
-	     echo "   <option value=\"". $f->id ."\">". $lang[$f->getType()] .": ". myentities($f->getFullName()) ."</option>\n";
-	   }
+       foreach ($this->refl as $f) {
+         echo "   <option value=\"". $f->id ."\">". $lang[$f->getType()] .": ". myentities($f->getFullName()) ."</option>\n";
+       }
        echo "  </select>\n";
        echo " </td>\n";
-	 } else {	 
+     } else {    
        echo " <td colspan=\"3\">";
-	   echo "  <select name=\"reftype\">\n";
+       echo "  <select name=\"reftype\">\n";
        echo "   <option value=\"0\">--</option>\n";
-  	   foreach ($tutos['docowners'] as $f) {
-	     if (! class_exists($f)) continue;
-	     $x = new $f($this->dbconn);
-    	 if (method_exists($x,"search_by_name")) {
-	       echo "   <option value=\"". $f ."\"". ($this->reftype == $f ? " selected":"") .">". $lang[$x->getType()] ."</option>\n";
-	     }
-	   }
+       foreach ($tutos['docowners'] as $f) {
+         if (! class_exists($f)) continue;
+         $x = new $f($this->dbconn);
+         if (method_exists($x,"search_by_name")) {
+           echo "   <option value=\"". $f ."\"". ($this->reftype == $f ? " selected":"") .">". $lang[$x->getType()] ."</option>\n";
+         }
+       }
        echo "  </select>\n";
        echo "  <input name=\"refname\" size=\"30\" value=\"". myentities($this->refname)."\" />\n";
        echo " </td>\n";
-	 }
+     }
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -195,9 +189,9 @@
    Function prepare() {
      global $msg,$lang,$tutos;
 
-	 $this->refl = array();
-	 $this->refname = "";
-	 $this->reftype = "0";
+     $this->refl = array();
+     $this->refname = "";
+     $this->reftype = "0";
      $this->obj = new tutos_file($this->dbconn);
      if ( isset($_GET['id']) ){
        $this->name = $lang['FileMod'];
@@ -219,32 +213,32 @@
      }
 
      if ( isset($_GET['link_id']) && is_array($_GET['link_id']) ){
-	   $arr = $_GET['link_id'];
-	   foreach($arr as $i) {
+       $arr = $_GET['link_id'];
+       foreach($arr as $i) {
          $l = getObject($this->dbconn,$i);
          $this->obj->links[$l->id] = &$l;
-		 unset($l);
-	   }
+         unset($l);
+       }
      }
      if ( isset($_GET['link_id']) && is_numeric($_GET['link_id']) ){
-	   $arr = $_GET['link_id'];
+       $arr = $_GET['link_id'];
        $l = getObject($this->dbconn,$arr);
        $this->obj->links[$l->id] = &$l;
      }
      if ( isset($_GET['refl']) && is_array($_GET['refl']) ){
-	   $arr = $_GET['refl'];
-	   foreach($arr as $i) {
+       $arr = $_GET['refl'];
+       foreach($arr as $i) {
          $l = getObject($this->dbconn,$i);
          $this->refl[$l->id] = &$l;
-		 unset($l);
-	   }
+         unset($l);
+       }
      }
      if ( isset($_GET['refname']) ) {
-	   $this->refname = Stripslashes($_GET['refname']);
-	 }
+       $this->refname = Stripslashes($_GET['refname']);
+     }
      if ( isset($_GET['reftype']) ) {
-	   $this->reftype = Stripslashes($_GET['reftype']);
-	 }
+       $this->reftype = Stripslashes($_GET['reftype']);
+     }
 
      if ( isset($_GET['name']) ){
        $this->obj->name = StripSlashes($_GET['name']);

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

Modified Files:
	rate_new.php 
Log Message:
layout updates

Index: rate_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rate_new.php	23 Apr 2005 13:18:25 -0000	1.8
+++ rate_new.php	25 Nov 2006 14:47:15 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2000 - 2004 by Gero Kohnert and ecosoft
+ * Copyright 2000 - 2006 by Gero Kohnert and ecosoft
  *
  * @modulegroup rate
  * @module rate_new
@@ -13,8 +13,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("rate","new");
- loadmodule("rate");
+ loadmodules('rate','new');
+ loadmodule('rate');
  loadlayout();
 
  /**
@@ -27,25 +27,17 @@
    Function info() {
      global $lang,$tutos,$table;
 
-     echo "<form name=\"ratenew\" action=\"rate_ins.php\" method=\"post\">\n";
+     $this->width = 6;
+
+     echo "<form id=\"ratenew\" name=\"ratenew\" action=\"rate_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr><th colspan=\"6\">";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ( isset ($this->obj->id) && ( $this->obj->id != -1 ) ) {
-       echo $lang['RateMod'];
-       echo " </th></tr>\n";
-       echo "<tr>\n";
        $this->addhidden("id",$this->obj->id);
-       if ($this->obj->creator->id > 0) {
-         echo " <td colspan=\"5\">". sprintf ($lang['ProdCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       } else {
-         echo " <td colspan=\"3\">". sprintf ($lang['ProdCreation'],$lang['HistoryDeleted'],$this->obj->creation->getDateTime()) ."</td>\n";
-       }
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>";
-       echo "</tr>\n";
-     } else {
-       echo $lang['RateCreation'];
-       echo " </th></tr>\n";
      }
+
      echo "<tr>\n";
      echo $this->showfieldc($lang['RateName'],1,"name");
      echo " <td colspan=\"5\"><input id=\"name\" size=\"". min($table['rate']['name'][size],40) ."\" maxlength=\"". $table['rate']['name'][size] ."\" name=\"name\" value=\"". myentities($this->obj->name) ."\"></td>\n";

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

Modified Files:
	expense_new.php 
Log Message:
layout updates

Index: expense_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_new.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- expense_new.php	22 Jan 2006 20:19:21 -0000	1.6
+++ expense_new.php	25 Nov 2006 14:47:15 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2006 by Gero Kohnert and ECOsoft.net
  *
  *  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   
@@ -31,20 +31,16 @@
    Function info() {
      global $lang,$tutos,$table,$current_user;
 
-     echo "<form name=\"expensenew\" action=\"expense_ins.php\" method=\"post\">\n";
+     $this->width = 6;
+
+     echo "<form id=\"expensenew\" name=\"expensenew\" action=\"expense_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr><th colspan=\"6\">";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
+
      if ( isset ($this->obj->id) && ( $this->obj->id != -1 ) ) {
-       echo $lang['ExpenseMod'];
-       echo " </th></tr>\n";
-       echo "<tr>\n";
        $this->addhidden("id",$this->obj->id);
-       echo " <td colspan=\"5\">". sprintf ($lang['ProdCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>";
-       echo "</tr>\n";
-     } else {
-       echo $lang['ExpenseCreation'];
-       echo " </th></tr>\n";
      }
 
      echo "<tr>\n";

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

Modified Files:
	address_new.php app_new.php app_new_r.php company_new.php 
	database_new.php department_new.php product_ins.php 
	product_new.php task_new.php team_new.php timetrack_new.php 
	user_new.php 
Log Message:
layout updates

Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- team_new.php	19 Nov 2006 17:44:42 -0000	1.53
+++ team_new.php	25 Nov 2006 08:48:10 -0000	1.54
@@ -31,7 +31,7 @@
      global $lang,$tutos,$table;
 
 
-     echo "<form name=\"teamadd\" method=\"post\" action=\"team_ins.php\">\n";
+     echo "<form id=\"teamadd\" name=\"teamadd\" method=\"post\" action=\"team_ins.php\">\n";
      $this->addHidden("id", $this->obj->id);
      echo $this->DataTableStart();
      echo "<tr>\n";

Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- task_new.php	19 Nov 2006 09:25:06 -0000	1.76
+++ task_new.php	25 Nov 2006 08:48:10 -0000	1.77
@@ -30,22 +30,16 @@
    Function info() {
      global $lang,$tutos,$table;
 
-     echo "<form name=\"taskadd\" action=\"task_ins.php\" method=\"post\">\n";
+     $this->width = 4;
+
+     echo "<form id=\"taskadd\" name=\"taskadd\" action=\"task_ins.php\" method=\"post\">\n";
      
      echo $this->DataTableStart();
-     echo " <tr><th colspan=\"4\">";
-     if ( $this->obj->id != -1 ) {
-       echo sprintf($lang['TaskModify'],myentities($this->obj->name));
-     } else {
-       echo $lang['TaskCreate'];
-     }
-     echo "</th></tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ( $this->obj->id > 0 ) {
        $this->addHidden("id", $this->obj->id );
-       echo " <tr>\n";
-       echo "  <td colspan=\"3\">". sprintf ($lang['TaskCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo "  <td align=\"right\" colspan=\"1\">". acl_link($this->obj) ."</td>\n";
-       echo " </tr>\n";
      }
      
      echo " <tr>\n";
@@ -74,7 +68,7 @@
      echo "  <td><input id=\"name\" size=\"". min($table['task']['name'][size],40) ."\" maxlength=\"". $table['task']['name'][size] ."\" name=\"name\" value=\"". myentities($this->obj->name) ."\" /></td>\n";
      echo $this->showfieldc($lang['TaskState'],0,"state");
      echo "  <td>\n";
-	 echo SelectLangArray('state','TaskStates',$this->obj->state);
+     echo SelectLangArray('state','TaskStates',$this->obj->state);
      echo "  </td>\n";
      echo " </tr>\n";
 
@@ -208,7 +202,7 @@
      #
      # Edit additional custom fields
      #
-	 edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
      # References to modules
      module_addforms($this->user,$this->obj,4);
@@ -305,7 +299,7 @@
      #
      # preset additional custom fields
      #
-	 preset_custom_fields($this->obj->gettype(),$this->obj);
+     preset_custom_fields($this->obj->gettype(),$this->obj);
 
      $this->obj->read_relations();
      if ( $this->obj->p_id < 0 ) {

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- product_new.php	19 Nov 2006 17:44:42 -0000	1.99
+++ product_new.php	25 Nov 2006 08:48:10 -0000	1.100
@@ -33,7 +33,8 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"productadd\" action=\"product_ins.php\" method=\"post\">\n";
+     $this->width = 5;
+     echo '<form id="productadd" name="productadd" action="product_ins.php" method="post">'."\n";
      if ( $this->template ) {
        $this->addHidden("tplid",$this->obj->id);
      }
@@ -41,20 +42,15 @@
        $this->addHidden("id",$this->obj->id);
      }
      echo $this->DataTableStart();
-     echo " <tr>\n";
-     echo "  <th colspan=\"5\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo " </tr>\n";
+     echo $this->Headline();
+
      if ( ($this->obj->id > 0) && (! $this->template) ) {
-       echo " <tr>\n";
-       echo "  <td colspan=\"4\">". sprintf ($lang['ProdCreation'],($this->obj->creator != -1 ?$this->obj->creator->getLink():$lang['HistoryDeleted']),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo "  <td align=\"right\" colspan=\"1\">". acl_link($this->obj) ."</td>\n";
-       # Its an update
-       echo " </tr>\n";
+       echo $this->acl_line(true);
      }
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdName'],1,"name");
-     echo " <td colspan=\"4\"><input id=\"name\" size=\"". min($table['product']['name'][size],40) ."\" maxlength=\"". $table['product']['name'][size] ."\" name=\"name\"";
+     echo ' <td colspan="4"><input id="name" size="'. min($table['product']['name'][size],40) .'" maxlength="'. $table['product']['name'][size] ."\" name=\"name\"";
      # leave empty name in clone
      if (! $this->template) echo ' value="'. myentities($this->obj->name) .'"';
      echo " /></td>\n";
@@ -62,19 +58,19 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdVersion'],0,"version");
-     echo " <td colspan=\"4\"><input id=\"version\" size=\"". min($table['product']['version'][size],20) ."\" maxlength=\"". $table['product']['version'][size] ."\" name=\"version\" value=\"". myentities($this->obj->version) ."\" />\n";
+     echo ' <td colspan="4"><input id="version" size="'. min($table['product']['version'][size],20) .'" maxlength="'. $table['product']['version'][size] ."\" name=\"version\" value=\"". myentities($this->obj->version) ."\" />\n";
      echo "&nbsp;<span class=\"desc\">". $lang['ProdState'] ."</span>&nbsp;\n";
 
      echo SelectLangArray('state','ProdStates',$this->obj->state);
      echo "&nbsp;<span class=\"desc\">". $lang['ProdProb'] ."</span>&nbsp;\n";
-     echo "<input id=\"prob\" size=\"3\" maxlength=\"3\" name=\"prob\" value=\"". number_format($this->obj->probability,0,$lang['DecPoint'],$lang['ThousandPoint']) ."\" /> %\n";
-     echo "</td>\n";
+     echo '<input id="prob" size="3" maxlength="3" name="prob" value="'. number_format($this->obj->probability,0,$lang['DecPoint'],$lang['ThousandPoint']) ."\" /> %\n";
+     echo " </td>\n";
      echo "</tr>\n";
 
      # Roles of peoples and teams etc.
      echo "<tr>\n";
      echo $this->showfield($lang['ProdRoles']);
-     echo " <th>". $lang['ProdFunc'] ."</th><th>". $lang['AdrName'] ."</th><th>". $lang['ProdRoleDesc'] ."</th><th>&nbsp;</th>\n";
+     echo ' <th>'. $lang['ProdFunc'] .'</th><th>'. $lang['AdrName'] .'</th><th>'. $lang['ProdRoleDesc'] ."</th><th>&nbsp;</th>\n";
      echo "</tr>\n";
 
      # List all roles in this project
@@ -102,13 +98,13 @@
              }
              echo "</td>";
 
-             echo " <td>". $o->getLink() ."</td>";
-             echo " <td>". myentities($this->obj->roledesc[$role][$i]) ."&nbsp;</td>";
+             echo ' <td>'. $o->getLink() ."</td>\n";
+             echo ' <td>'. myentities($this->obj->roledesc[$role][$i]) ."&nbsp;</td>\n";
              $val = $o->id .",". $role;
              if ( ! isset($this->obj->rdel[$val]) ) {
                $this->obj->rdel[$val] = "";
              }
-             echo " <td align=\"right\"><input type=\"checkbox\" name=\"del[]\" value=\"". $val ."\"". $this->obj->rdel[$val] ." />&nbsp;". $lang['Remove'] ."</td>";
+             echo ' <td align="right"><input type="checkbox" name="del[]" value="'. $val .'"'. $this->obj->rdel[$val] ." />&nbsp;". $lang['Remove'] ."</td>\n";
              $n++;
              echo "</tr>\n";
            }
@@ -145,7 +141,7 @@
      #
      echo "<tr>\n";
      echo $this->showfield($lang['ProdProd']);
-     echo " <th>". $lang['ProdFunc'] ."</th><th>". $lang['AdrName'] ."</th><th>". $lang['ProdRoleDesc'] ."</th><th>&nbsp;</th>\n";
+     echo ' <th>'. $lang['ProdFunc'] ."</th><th>". $lang['AdrName'] ."</th><th>". $lang['ProdRoleDesc'] ."</th><th>&nbsp;</th>\n";
      echo "</tr>\n";
      # List all projectroles in this project
      if ( $this->obj->id > 0 ) {
@@ -198,7 +194,7 @@
            && in_array($role,$tutos['deprecated']['ProdRole']) ) {
          $old = true;
        }
-       echo "   <option" .($old ? ' class="deprecated"':''). " value=\"". $role ."\"". ($role == $this->obj->rsel2 ? " selected=\"selected\"":"") .">". myentities($lang['ProdRole'][$role]).($old ? $lang['deprecated']:'')  ."</option>\n";
+       echo '   <option' .($old ? ' class="deprecated"':''). ' value="'. $role .'"'. ($role == $this->obj->rsel2 ? ' selected="selected"':'') .'>'. myentities($lang['ProdRole'][$role]).($old ? $lang['deprecated']:'')  ."</option>\n";
      }
      echo "  </select>\n";
      echo " </td>\n";
@@ -206,22 +202,22 @@
      select_from_array_or_input($this->obj,"r2",$this->obj->r2,1,'p');
      echo " </td>\n";
 
-     echo " <td valign=\"top\" colspan=\"2\"><input id=\"r2desc\" name=\"r2desc\" value=\"". myentities($this->r2desc) ."\" size=\"".min(30,$table['product2']['description'][size])."\" maxlength=\"".$table['product2']['description'][size]."\" /></td>\n";
+     echo ' <td valign="top" colspan="2"><input id="r2desc" name="r2desc" value="'. myentities($this->r2desc) .'" size="'.min(30,$table['product2']['description'][size]).'" maxlength="'.$table['product2']['description'][size]."\" /></td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdDesc'],0,"desc0");
-     echo " <td colspan=\"4\"><input id=\"desc0\" size=\"40\" maxlength=\"40\" name=\"description\" value=\"". myentities($this->obj->description) ."\" /></td>\n";
+     echo ' <td colspan="4"><input id="desc0" size="40" maxlength="40" name="description" value="'. myentities($this->obj->description) ."\" /></td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdDesc1'],0,"desc1");
-     echo " <td colspan=\"4\"><input id=\"desc1\" size=\"50\" maxlength=\"250\" name=\"desc1\" value=\"". myentities($this->obj->desc1) ."\" /></td>\n";
+     echo ' <td colspan="4"><input id="desc1" size="50" maxlength="250" name="desc1" value="'. myentities($this->obj->desc1) ."\" /></td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdDesc2'],0,"desc2");
-     echo " <td colspan=\"4\"><input id=\"desc2\" size=\"50\" maxlength=\"250\" name=\"desc2\" value=\"". myentities($this->obj->desc2) ."\" /></td>\n";
+     echo ' <td colspan="4"><input id="desc2" size="50" maxlength="250" name="desc2" value="'. myentities($this->obj->desc2) ."\" /></td>\n";
      echo "</tr>\n";
 
      # Classification
@@ -241,9 +237,9 @@
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdPrice'],0,"price");
      echo " <td colspan=\"4\">\n";
-     echo "  <input id=\"price\" size=\"10\" maxlength=\"10\" name=\"price\" value=\"". number_format($this->obj->price,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
+     echo '  <input id="price" size="10" maxlength="10" name="price" value="'. number_format($this->obj->price,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
      echo "  &nbsp;<span class=\"desc\"><label for=\"cost\">". $lang['ProdCost'] ."</label></span>\n";
-     echo "  <input id=\"cost\" size=\"10\" maxlength=\"10\" name=\"cost\" value=\"".  number_format($this->obj->cost,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
+     echo '  <input id="cost" size="10" maxlength="10" name="cost" value="'.  number_format($this->obj->cost,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
      Currency_Select("currency",$this->obj->currency);
      echo " </td>\n";
      echo "</tr>\n";
@@ -264,7 +260,7 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ProdPath'],0,"path");
-     echo " <td colspan=\"4\"><input id=\"path\" size=\"". min($table['product']['path'][size],60) ."\" maxlength=\"". $table['product']['path'][size] ."\" name=\"path\" value=\"". myentities($this->obj->path) ."\" /></td>\n";
+     echo ' <td colspan="4"><input id="path" size="'. min($table['product']['path'][size],60) .'" maxlength="'. $table['product']['path'][size] .'" name="path" value="'. myentities($this->obj->path) ."\" /></td>\n";
      echo "</tr>\n";
 
      #

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- product_ins.php	13 Aug 2005 07:47:06 -0000	1.60
+++ product_ins.php	25 Nov 2006 08:48:10 -0000	1.61
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2004 by Gero Kohnert
+ * Copyright 1999 - 2006 by Gero Kohnert
  * cloning option added by Michal Salaban, 2003
  *
  *  This program is free software; you can redistribute it and/or modify it 

Index: database_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_new.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- database_new.php	1 May 2005 13:37:53 -0000	1.31
+++ database_new.php	25 Nov 2006 08:48:10 -0000	1.32
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2005 by Gero Kohnert
+ *  Copyright 2001 - 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   
@@ -11,7 +11,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("database","new");
+ loadmodules('database','new');
  loadlayout();
 
  /**
@@ -24,10 +24,10 @@
    Function info() {
      global $lang,$tutos,$table;
 
-     echo "<form name=\"dbadd\" action=\"database_ins.php\" method=\"post\">\n";
+     echo "<form id=\"dbadd\" name=\"dbadd\" action=\"database_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
      echo "<tr>\n";
-     echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
+     echo ' <th colspan="4">'.  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
      echo "</tr>\n";
      if ( $this->obj->id != -1 ) {
        $this->addHidden("id",$this->obj->id);
@@ -213,10 +213,10 @@
      } else {
        $this->name = $lang['DBCreate'];
        $this->obj->name = $lang['PlsChangeName'];
-	   if ( !$this->user->isadmin()) {
+       if ( !$this->user->isadmin()) {
          $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]);
          $this->stop = true;
-	   }
+       }
      }
      if ( !empty($_GET['name']) ) {
        $this->obj->name = StripSlashes($_GET['name']);

Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- user_new.php	19 Nov 2006 09:26:44 -0000	1.93
+++ user_new.php	25 Nov 2006 08:48:10 -0000	1.94
@@ -586,4 +586,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- timetrack_new.php	19 Nov 2006 17:44:42 -0000	1.69
+++ timetrack_new.php	25 Nov 2006 08:48:10 -0000	1.70
@@ -67,24 +67,17 @@
        }
      }
 
-     echo "<form name=\"ttadd\" action=\"timetrack_ins.php\" method=\"post\">\n";
+     $this->width = 6;
+     echo "<form id=\"ttadd\" name=\"ttadd\" action=\"timetrack_ins.php\" method=\"post\">\n";
      $this->addHidden("mode",$this->mode);
      echo $this->DataTableStart();
-     echo '<tr><th colspan="6">';
-     if ( $this->obj->id > 0 ) {
-       echo $lang['TimetrackModify'];
-     } else {
-       echo $lang['TimetrackNew'];
-     }
-     echo "</th></tr>\n";
-
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      if ( $this->obj->id > 0 ) {
-       echo '<tr>';
-       echo ' <td colspan="6" align="right">'. acl_link($this->obj) .'</td>';
-       echo "\n</tr>\n";
        $this->addHidden("id",$this->obj->id);
      }
+
      echo "<tr>\n";
      echo $this->showfield($lang['TimetrackRef']);
      echo " <td colspan=\"5\">\n";
@@ -333,4 +326,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- app_new_r.php	22 Jan 2006 20:19:20 -0000	1.58
+++ app_new_r.php	25 Nov 2006 08:48:10 -0000	1.59
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -19,7 +19,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("appointment","new");
+ loadmodules('appointment','new');
  loadlayout();
 
  /**
@@ -36,19 +36,19 @@
      $a_checked[1] = "";
      $a_checked[2] = "";
      $a_checked[3] = "";
-     $a_checked[$this->obj->mod_allow] = " checked=\"checked\"";
+     $a_checked[$this->obj->mod_allow] = ' checked="checked"';
 
      $r_checked[1] = "";
      $r_checked[2] = "";
      $r_checked[3] = "";
      $r_checked[4] = "";
-     $r_checked[$this->obj->repeat] = " checked=\"checked\"";
+     $r_checked[$this->obj->repeat] = ' checked="checked"';
 
 
      if ( $this->obj->allowed == 0 ) {
-        echo "<b>". $lang['ReadOnlyAppoint'] ."</b><br />\n";
+        echo '<b>'. $lang['ReadOnlyAppoint'] ."</b><br />\n";
      }
-     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
+     echo "<form id=\"appnewr\" name=\"appnewr\" action=\"app_ins.php\" method=\"post\">\n";
      $this->addHidden("gotourl","app_new_r.php");
      if ( $this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- address_new.php	19 Nov 2006 17:44:42 -0000	1.80
+++ address_new.php	25 Nov 2006 08:48:10 -0000	1.81
@@ -163,7 +163,7 @@
    Function info() {
      global $lang,$table;
 
-     echo "<form name=\"adrnew\" enctype=\"multipart/form-data\" action=\"address_ins.php\" method=\"post\">\n";
+     echo "<form id=\"adrnew\" name=\"adrnew\" enctype=\"multipart/form-data\" action=\"address_ins.php\" method=\"post\">\n";
 
      echo $this->DataTableStart();
 

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- app_new.php	22 Aug 2006 09:50:49 -0000	1.69
+++ app_new.php	25 Nov 2006 08:48:10 -0000	1.70
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -19,7 +19,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("appointment","new");
+ loadmodules('appointment','new');
  loadlayout();
 
  /**
@@ -36,12 +36,12 @@
      $a_checked[1] = "";
      $a_checked[2] = "";
      $a_checked[3] = "";
-     $a_checked[$this->obj->mod_allow] = " checked=\"checked\"";
+     $a_checked[$this->obj->mod_allow] = ' checked="checked"';
 
      if ( $this->obj->allowed == 0 ) {
        echo $this->error($lang['ReadOnlyAppoint']);
      }
-     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
+     echo "<form id=\"appnew\" name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
      $this->addHidden("repeat","0");
      $this->addHidden("r_ignore","0");
      if ( $this->obj->id > 0 ) {

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- department_new.php	22 Jan 2006 20:23:23 -0000	1.61
+++ department_new.php	25 Nov 2006 08:48:10 -0000	1.62
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -15,7 +15,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("department","new");
+ loadmodules('department','new');
  loadlayout();
 
  /**
@@ -28,7 +28,7 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"depadd\" action=\"department_ins.php\" method=\"post\">\n";
+     echo "<form id=\"depadd\" name=\"depadd\" action=\"department_ins.php\" method=\"post\">\n";
 
      echo $this->DataTableStart();
      echo "<tr>\n";
@@ -41,7 +41,7 @@
      echo "</tr>\n";
      if ( $this->obj->id > 0 ) {
        echo "<tr>\n";
-       echo " <td colspan=\"5\" align=\"right\">". acl_link($this->obj) ."</td>\n";
+       echo ' <td colspan="5" align="right">'. acl_link($this->obj) ."</td>\n";
        echo "</tr>\n";
      }
 

Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- company_new.php	13 Mar 2005 17:05:47 -0000	1.64
+++ company_new.php	25 Nov 2006 08:48:10 -0000	1.65
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -15,7 +15,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("company","new");
+ loadmodules('company','new');
  loadlayout();
 
  /**
@@ -28,36 +28,36 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"cmpadd\" action=\"company_ins.php\" method=\"post\">\n";
+     echo "<form id=\"cmpadd\" name=\"cmpadd\" action=\"company_ins.php\" method=\"post\">\n";
 
      echo $this->DataTableStart();
      echo "<tr>\n";
      if ( $this->obj->id < 0 ) {
-       echo " <th colspan=\"5\">". sprintf($lang['CompanyCreate'])."</th>\n";
+       echo ' <th colspan="5">'. sprintf($lang['CompanyCreate'])."</th>\n";
      } else {
-       echo " <th colspan=\"5\">". sprintf($lang['CompanyModify'])."</th>\n";
+       echo ' <th colspan="5">'. sprintf($lang['CompanyModify'])."</th>\n";
        $this->addHidden("id", $this->obj->id);
      }
      echo "</tr>\n"; 
      if ( $this->obj->id > 0 ) {
        echo "<tr>\n";
-       echo " <td colspan=\"5\" align=\"right\">". acl_link($this->obj) ."</td>\n";
+       echo ' <td colspan="5" align="right">'. acl_link($this->obj) ."</td>\n";
        echo "</tr>\n";
      }
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['Company'],1,"name");
-     echo "<td colspan=\"4\"><input size=\"". min($table['company']['name'][size],30)."\" maxlength=\"".$table['company']['name'][size]."\" id=\"name\" name=\"name\" value=\"". myentities($this->obj->name) ."\" /></td>\n";
+     echo ' <td colspan="4"><input size="'. min($table['company']['name'][size],30).'" maxlength="'.$table['company']['name'][size].'" id="name" name="name" value="'. myentities($this->obj->name) ."\" /></td>\n";
      echo "</tr>\n";
      
      echo "<tr>\n";
      echo $this->showfieldc($lang['CompanyLegalName'],0,"legal_name");
-     echo "<td colspan=\"4\"><input size=\"". min($table['company']['legal_name'][size],30)."\" maxlength=\"".$table['company']['legal_name'][size]."\" id=\"legal_name\" name=\"legal_name\" value=\"". myentities($this->obj->legal_name) ."\" /></td>\n";
+     echo ' <td colspan="4"><input size="'. min($table['company']['legal_name'][size],30).'" maxlength="'.$table['company']['legal_name'][size].'" id="legal_name" name="legal_name" value="'. myentities($this->obj->legal_name) ."\" /></td>\n";
      echo "</tr>\n";
      
      echo "<tr>\n";
      echo $this->showfieldc($lang['CompanyCode'],0,"company_code");
-     echo "<td colspan=\"4\"><input size=\"". min($table['company']['company_code'][size],10)."\" maxlength=\"".$table['company']['company_code'][size]."\" id=\"company_code\" name=\"company_code\" value=\"". myentities($this->obj->company_code) ."\" /></td>\n";
+     echo ' <td colspan="4"><input size="'. min($table['company']['company_code'][size],10).'" maxlength="'.$table['company']['company_code'][size].'" id="company_code" name="company_code" value="'. myentities($this->obj->company_code) ."\" /></td>\n";
      echo "</tr>\n";
      
      echo "<tr>\n";
@@ -242,4 +242,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	url_new.php 
Log Message:
layout updates

Index: url_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- url_new.php	1 May 2005 13:37:59 -0000	1.16
+++ url_new.php	25 Nov 2006 08:48:11 -0000	1.17
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -53,18 +53,11 @@
      echo "// -->\n";
      echo "</script>\n";
      
+	 $this->width = 4;
      echo $this->DataTableStart();
+     echo $this->Headline();
+     echo $this->acl_line(true);
      
-     echo "  <tr><th colspan=\"4\">\n";
-     echo myentities($this->name) ;
-     echo "  </th></tr>\n";
-
-     if ($this->obj->id > 0) {
-       echo "<tr>\n";
-       echo " <td colspan=\"3\">". sprintf ($lang['ProdCreation'],$this->obj->creator != -1 ? $this->obj->creator->getLink():$lang['HistoryDeleted'],$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>";
-       echo "</tr>\n";
-     }
      echo "  <tr>\n";
      echo $this->showfieldc($lang[$this->ref->getType()]);
      echo $this->showData($this->ref->getLink(),3);
@@ -72,7 +65,7 @@
 
      echo "  <tr>\n";
      echo $this->showfieldc($lang['URLName'],1,"urlname");
-     echo "   <td colspan=\"3\"><input id=\"urlname\" size=\"". min($table['url']['name'][size],50) ."\" maxlength=\"". $table['url']['name'][size] ."\" name=\"urlname\" value=\"". myentities($this->obj->name) ."\" /></td>\n";
+     echo '   <td colspan="3"><input id="urlname" size="'. min($table['url']['name'][size],50) .'" maxlength="'. $table['url']['name'][size] .'" name="urlname" value="'. myentities($this->obj->name) ."\" /></td>\n";
      echo "  </tr>\n";
 
      if ($this->obj->id < 1) {

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

Modified Files:
	note_new.php 
Log Message:
layout updates

Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- note_new.php	22 Aug 2006 10:00:01 -0000	1.35
+++ note_new.php	25 Nov 2006 08:48:11 -0000	1.36
@@ -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   
@@ -17,8 +17,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("note","new");
- loadmodule("note");
+ loadmodules('note','new');
+ loadmodule('note');
  loadlayout();
 
  /**
@@ -31,20 +31,14 @@
    Function info() {
      global $lang,$tutos,$table;
 
-     echo "<form name=\"notenew\" action=\"note_ins.php\" method=\"post\">\n";
+     $this->width = 6;
+     echo "<form id=\"notenew\" name=\"notenew\" action=\"note_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr><th colspan=\"6\">";
+     echo $this->Headline();
+     echo $this->acl_line(true);
+
      if ( isset ($this->obj->id) && ( $this->obj->id != -1 ) ) {
-       echo $lang['NoteMod'];
-       echo " </th></tr>\n";
-       echo "<tr>\n";
        $this->addhidden("id",$this->obj->id);
-       echo " <td colspan=\"5\">". sprintf ($lang['ProdCreation'],($this->obj->creator != -1 ? $this->obj->creator->getLink():$lang['HistoryDeleted']),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td align=\"right\">". acl_link($this->obj) ."</td>";
-       echo "</tr>\n";
-     } else {
-       echo $lang['NoteCreation'];
-       echo " </th></tr>\n";
      }
      echo "<tr>\n";
      echo $this->showfieldc($lang['NoteName'],1,"name");
@@ -127,7 +121,7 @@
        if ( is_numeric($this->obj) && $this->obj == -1 ) {
          $msg .= sprintf($lang['Err0040'],$lang['Note']);
          $this->stop = true ;
-	 return;
+     return;
        }
      } else {
        $this->name = $lang['NoteCreation'];
@@ -188,4 +182,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	bug_new.php 
Log Message:
layout updates

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- bug_new.php	19 Nov 2006 17:44:42 -0000	1.25
+++ bug_new.php	25 Nov 2006 08:48:11 -0000	1.26
@@ -20,8 +20,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("bugtracking","new");
- loadmodule("bugtracking");
+ loadmodules('bugtracking','new');
+ loadmodule('bugtracking');
  loadlayout();
 
  /**
@@ -34,6 +34,8 @@
    Function info() {
      global $lang,$tutos,$table;
 
+     $this->width = 4;
+
      echo "<form id=\"bugnew\" name=\"bugnew\" action=\"bug_ins.php\" method=\"post\">\n";
      if ( $this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
@@ -47,20 +49,8 @@
      }
 
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo ' <th colspan="4">'.  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo "</tr>\n";
-
-     if ($this->obj->id > 0 ) {
-       echo "<tr>\n";
-       if ($this->obj->creator->id > 0) {
-         echo ' <td colspan="3">'. sprintf ($lang['BugCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       } else {
-         echo ' <td colspan="3">'. sprintf ($lang['BugCreation'],$lang['HistoryDeleted'],$this->obj->creation->getDateTime()) ."</td>\n";
-       }
-       echo ' <td align="right">'. acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
-     }
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['BugID'],1,"name");
@@ -108,7 +98,7 @@
        if ( $this->obj->parent->id > 0 ) {
          if ( $this->obj->parent->getType() == "product" ) {
            $this->obj->parent->readroles();
-			 /****
+             /****
            echo $lang['BugAutoSolver'] ."&nbsp;";
            reset($this->obj->parent->role[PROD_ROLE_MANAGER]);
            reset($this->obj->parent->role[PROD_ROLE_MANAGER2]);
@@ -124,15 +114,15 @@
              echo  $this->user->getLink();
            }
            $this->addHidden("sid",$sid);
-			 ****/
+             ****/
            echo  '<select id="s" name="sid">';
            foreach ($this->obj->parent->role as $i => $f) {
              foreach ($f as $i2 => $f2) {
                if (($f2->getType() == 'address') || ($f2->getType() == 'team') ) {
                  echo  '<option value="'.$i2.'">'.$f2->getFullName().' ('.$lang['ProdRole'][$i] .")</option>\n";
                }
-			 }
-		   }
+             }
+           }
            echo  "</select>";
 #       select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'at');
 
@@ -176,12 +166,12 @@
      if ( ($this->obj->state == BUG_STATE_SOLVED) || ( $this->obj->state == BUG_STATE_CLOSED) ) {
        echo ' <td colspan="2" valign="top">&nbsp;'.$this->obj->state;
        echo " </td>\n";
-	 } else {
+     } else {
        echo $this->showfieldc($lang['DateTimeTill'],0,"pd");
        echo " <td>\n";
        echo $this->obj->plandate->EnterDate("pd",1);
        echo " </td>\n";
-	 }
+     }
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -266,7 +256,7 @@
        if ( is_numeric($this->obj) && $this->obj == -1 ) {
          $msg .= sprintf($lang['Err0040'],$lang['Bug']);
          $this->stop = true;
-	 return;
+     return;
        }
        $this->obj->read_bughistory();
        $this->name = sprintf($lang['BugModifyI'],$this->obj->getFullName());
@@ -352,4 +342,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	layout_base.pinc new_layout.pinc 
Log Message:
layout updates

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- new_layout.pinc	19 Nov 2006 17:44:43 -0000	1.66
+++ new_layout.pinc	25 Nov 2006 08:48:11 -0000	1.67
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2003 - 2005 by Gero Kohnert
+ *  Copyright 2003 - 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   

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- layout_base.pinc	1 Dec 2005 22:31:00 -0000	1.38
+++ layout_base.pinc	25 Nov 2006 08:48:11 -0000	1.39
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2005 by Gero Kohnert
+ *  Copyright 2002 - 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   
@@ -83,6 +83,9 @@
       }
     }
     $this->theme->setImages();
+
+    $this->width = 4;     # width of infotable
+    $this->obj   = $this; # some useful default
   }
   /**
    * add a menu item
@@ -437,10 +440,38 @@
     return $r;
   }
   /**
-   * type of this class
+   * display infotable headline 
    */
-  function gettype() {
-    return "layout";
+  function headline($text = -1) {
+    global $lang;
+
+    $r =  "<tr>\n";
+    $r .= ' <th colspan="'. $this->width ."\">\n";
+	if ($text != -1) {
+	  $r .= $text;
+	} else {
+	  $r .= sprintf($lang['Showing'],$lang[$this->obj->getType()]);
+	}
+    $r .= " </th>\n";
+    $r .= "<tr>\n";
+    return $r;
+  }
+  /**
+   * display acl line with creator 
+   */
+  function acl_line($showcreator = false) {
+    global $lang;
+
+    if ($this->obj->id < 0 ) {
+	  return '';
+	}
+    $r =  "<tr>\n";
+	if ($showcreator) {
+      $r .= '  <td colspan="'. ($this->width -1) .'">'. sprintf ($lang['ProdCreation'],($this->obj->creator != -1 ?$this->obj->creator->getLink():$lang['HistoryDeleted']),$this->obj->creation->getDateTime()) ."</td>\n";
+	}
+    $r .= '  <td align="right" colspan="'. ($showcreator ? 1: $this->width).'">'. acl_link($this->obj) ."</td>\n";
+    $r .= "<tr>\n";
+    return $r;
   }
 }
 ?>
\ No newline at end of file

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

Modified Files:
	reminder_new.php 
Log Message:
layout updates

Index: reminder_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- reminder_new.php	22 Aug 2006 10:10:24 -0000	1.16
+++ reminder_new.php	25 Nov 2006 08:48:11 -0000	1.17
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 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   
@@ -19,8 +19,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("reminder","new");
- loadmodule("reminder");
+ loadmodules('reminder','new');
+ loadmodule('reminder');
  loadlayout();
 
  /**
@@ -36,9 +36,8 @@
      $o = array();
      echo "<form id=\"rmnew\" name=\"rmnew\" action=\"reminder_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo "</tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ReminderReference']);
@@ -122,8 +121,8 @@
          echo " </option>\n";
          $o = array(-86400*7*2,-86400*7*1,-86400*2,-86400*1,-3600*2,-3600*1,0);
        } else {
-		   die($this->obj->ref->gettype());
-	   }
+           die($this->obj->ref->gettype());
+       }
        echo " </select>\n";
        if (count($o)) {
          echo " <br />\n";
@@ -136,17 +135,17 @@
          echo " </select>\n";
        } else {
          $this->addhidden("offset",0);
-	   }
+       }
        echo " </td>\n";
        echo "</tr>\n";
      } else {
        $this->addhidden("offset",0);
-	 }
+     }
 
      #
      # Repeat
      #
-	 $r = array(0,1800,3600,86400,86400*7);
+     $r = array(0,1800,3600,86400,86400*7);
      echo "<tr>\n";
      echo $this->showfield($lang['ReminderRepeat'],0,"repeat");
      echo " <td colspan=\"3\">\n";
@@ -155,9 +154,9 @@
        echo "  <option value=\"". $repeat ."\"".($repeat == $this->obj->repeat ? " selected=\"selected\"":"").">\n";
        echo myentities(reminder_offset_format($repeat));
        echo " </option>\n";
-	 }
+     }
      echo " </select><br />\n";
-	 echo $lang['ReminderRepeatI'];
+     echo $lang['ReminderRepeatI'];
      echo " </td>\n";
      echo "</tr>\n";
 
@@ -212,7 +211,7 @@
        if ( is_numeric($this->obj) && $this->obj == -1 ) {
          $msg .= sprintf($lang['Err0040'],$lang['Reminder']);
          $this->stop = true;
-	 return;
+     return;
        }
        $this->name = $lang['ReminderModify'] .": ". $this->obj->getFullName();
      } else {
@@ -272,4 +271,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	invoice_new.php 
Log Message:
layout updates

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- invoice_new.php	22 Jan 2006 20:20:58 -0000	1.45
+++ invoice_new.php	25 Nov 2006 08:48:11 -0000	1.46
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2004 by Gero Kohnert
+ *  Copyright 2002 - 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   
@@ -33,14 +33,14 @@
    echo "<tr>\n";
    if ( $f->id != -1 ) {
      if ( $f->ref != -1 ) {
-       echo " <td valign=\"top\"><label for=\"del_". $f->id ."\">". $f->ref->getLink(sprintf("%04d",$f->pos)) ."</label></td>";
+       echo ' <td valign="top"><label for="del_'. $f->id .'">'. $f->ref->getLink(sprintf("%04d",$f->pos)) ."</label></td>";
      } else {
-       echo " <td valign=\"top\"><label for=\"del_". $f->id ."\">". sprintf("%04d",$f->pos) ."</label></td>";
+       echo ' <td valign="top"><label for="del_'. $f->id .'">'. sprintf("%04d",$f->pos) ."</label></td>";
      }
      if ( $obj->change_ok() ) {
        echo ' <td valign="top"><input name="I-'. $f->id .'" size="4" value="'. $f->items ."\" /></td>\n";
      } else {
-       echo " <td align=\"right\" valign=\"top\">".  number_format($f->items,2,$lang['DecPoint'],$lang['ThousandPoint']) ."&nbsp;</td>";
+       echo ' <td align="right" valign="top">'.  number_format($f->items,2,$lang['DecPoint'],$lang['ThousandPoint']) ."&nbsp;</td>";
      }
      echo " <td valign=\"top\">". $f->itype ."</td>";
      if ( $obj->change_ok() ) {
@@ -102,20 +102,14 @@
    Function info() {
      global $lang,$tutos,$table;
 
-     echo "<form name=\"invadd\" action=\"invoice_ins.php\" method=\"post\">\n";
+     $this->width = 9;
+     echo "<form id=\"invadd\" name=\"invadd\" action=\"invoice_ins.php\" method=\"post\">\n";
      if ($this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
      }
      echo $this->DataTableStart();
-     echo "<tr>\n";
-     echo " <th colspan=\"9\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
-     echo "</tr>\n";
-     if ($this->obj->id > 0 ) {
-       echo "<tr>\n";
-       echo " <td colspan=\"5\">". sprintf ($lang['InvoiceCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
-       echo " <td colspan=\"4\" align=\"right\">". acl_link($this->obj) ."</td>\n";
-       echo "</tr>\n";
-     }
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['Accountant'],1,"accountant");
@@ -475,4 +469,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	installation_new.php 
Log Message:
layout updates

Index: installation_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_new.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- installation_new.php	22 Jan 2006 20:19:21 -0000	1.21
+++ installation_new.php	25 Nov 2006 08:48:11 -0000	1.22
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -18,8 +18,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("installation","new");
- loadmodule("installation");
+ loadmodules('installation','new');
+ loadmodule('installation');
  loadlayout();
 
  /**
@@ -32,10 +32,11 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"instadd\" method=\"post\" action=\"installation_ins.php\">\n";
+	 $this->width = 4;
+     echo "<form id=\"instadd\" name=\"instadd\" method=\"post\" action=\"installation_ins.php\">\n";
      echo $this->DataTableStart();
-     echo "<tr><th colspan=\"4\">". $lang['Installation'] ."</th></tr>\n";
-     echo "<tr><td align=\"right\" colspan=\"4\">". acl_link($this->obj) ."</td></tr>\n";
+     echo $this->Headline();
+     echo $this->acl_line(true);
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['Product'],1,"pid");
@@ -43,7 +44,7 @@
      if ( $this->obj->product == -1 ) {
        echo "<select name=\"pid\">\n";
        foreach ($this->obj->plist as $i => $f) {
-         echo "<option value=\"". $i ."\"". ($i == $this->obj->product->id ? " selected>* ":">") . $lang[$f->getType()] .": ". myentities($f->getFullName()) ."</option>\n";
+         echo '<option value="'. $i .'"'. ($i == $this->obj->product->id ? ' selected="selected">* ':'>') . $lang[$f->getType()] .": ". myentities($f->getFullName()) ."</option>\n";
        }
        echo "</select>\n";
      } else {
@@ -60,12 +61,12 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['Description'],0,"desc");
-     echo " <td colspan=\"3\"><input id=\"desc\" name=\"desc\" size=\"". min($table['installation']['description'][size],60) ."\" maxlength=\"". $table['installation']['description'][size] ."\" value=\"". myentities($this->obj->description) ."\" />\n";
+     echo ' <td colspan="3"><input id="desc" name="desc" size="'. min($table['installation']['description'][size],60) ."\" maxlength=\"". $table['installation']['description'][size] ."\" value=\"". myentities($this->obj->description) ."\" />\n";
      echo "</td></tr>\n";
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['InstVersion'],0,"version");
-     echo " <td colspan=\"3\"><input id=\"version\" name=\"version\" size=\"". min($table['installation']['version'][size],20) ."\" maxlength=\"". $table['installation']['version'][size] ."\" value=\"". myentities($this->obj->version) ."\" />\n";
+     echo ' <td colspan="3"><input id="version" name="version" size="'. min($table['installation']['version'][size],20) ."\" maxlength=\"". $table['installation']['version'][size] .'" value="'. myentities($this->obj->version) ."\" />\n";
      echo "</td></tr>\n";
 
      echo "<tr>\n";

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

Modified Files:
      Tag: BRANCH-2-0
	bug_ins.php 
Log Message:
BUGFIX: the hour was 0h00 for all bug changes

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v
retrieving revision 1.7.2.9
retrieving revision 1.7.2.10
diff -u -d -r1.7.2.9 -r1.7.2.10
--- bug_ins.php	16 Nov 2006 15:59:14 -0000	1.7.2.9
+++ bug_ins.php	24 Nov 2006 11:04:14 -0000	1.7.2.10
@@ -114,7 +114,12 @@
  # Read the Work Day
  $wd = new DateTime(0);
  if ( isset($_POST['wd_d']) ) {
+   $today = new DateTime(-1);
    $wd->setDateTimeF("wd",1);
+   $wd->hour = $today->hour;
+   $wd->min = $today->min;
+   $wd->sec = $today->sec;
+   $wd->ts = mktime($wd->hour,$wd->min,$wd->sec,$wd->month,$wd->day,$wd->year);
    if ( !$wd->checkDMY() ) {
      $msg .= sprintf($lang['Err0038'],$lang['Date']) ."<br>";
    } else {

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

Modified Files:
	ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 
	expense.pinc fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 
	pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 
Log Message:
bugfix

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/tw.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tw.p3	26 May 2004 13:38:08 -0000	1.4
+++ tw.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/pl.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pl.p3	26 May 2004 13:38:08 -0000	1.4
+++ pl.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/pt-br.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pt-br.p3	26 May 2004 13:38:08 -0000	1.4
+++ pt-br.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/en.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- en.p3	26 May 2004 13:38:08 -0000	1.4
+++ en.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: pt.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/pt.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pt.p3	26 May 2004 13:38:08 -0000	1.4
+++ pt.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/fr.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fr.p3	8 Jul 2004 15:27:03 -0000	1.5
+++ fr.p3	23 Nov 2006 13:23:13 -0000	1.6
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Poste";
 $lang['ExpenseStartTime']      = "Début";
 $lang['ExpenseEndTime']        = "Fin";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "voiture louée";

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/ru.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ru.p3	26 May 2004 13:38:08 -0000	1.4
+++ ru.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/nl.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nl.p3	26 May 2004 13:38:08 -0000	1.4
+++ nl.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/it.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- it.p3	26 May 2004 13:38:08 -0000	1.4
+++ it.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/ko.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ko.p3	26 May 2004 13:38:08 -0000	1.4
+++ ko.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: es-ve.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/es-ve.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es-ve.p3	26 May 2004 13:38:08 -0000	1.4
+++ es-ve.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/es-mx.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es-mx.p3	26 May 2004 13:38:08 -0000	1.4
+++ es-mx.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/ca.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ca.p3	26 May 2004 13:38:08 -0000	1.4
+++ ca.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/cs.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cs.p3	26 May 2004 13:38:08 -0000	1.4
+++ cs.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/ja.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ja.p3	26 May 2004 13:38:08 -0000	1.4
+++ ja.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: es-ni.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/es-ni.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es-ni.p3	26 May 2004 13:38:08 -0000	1.4
+++ es-ni.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: vi.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/vi.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vi.p3	26 May 2004 13:38:08 -0000	1.4
+++ vi.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: expense.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- expense.pinc	23 Jun 2006 12:35:31 -0000	1.10
+++ expense.pinc	23 Nov 2006 13:23:13 -0000	1.11
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2006 by Gero Kohnert and ECOsoft.net
  *
  *  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   
@@ -267,7 +267,7 @@
 
     $this->read_reference();
 
-    $n =str_replace("\n","<br />",myentities($this->expense));
+    $n =str_replace("\n","<br />",myentities($this->gamount) .' '. $this->currency);
     $n =str_replace("\r","",$n);
     $n =str_replace("\\","\\\\",$n);
     $n =str_replace("'","\'",$n);
@@ -276,8 +276,8 @@
     $t =str_replace("\\","\\\\",$t);
     $t =str_replace("'","\'",$t);
 
-	$h = $this->ref->getFullName();
-	$h = eregi_replace("\r\n"," ",$h);
+    $h = $this->ref->getFullName();
+    $h = eregi_replace("\r\n"," ",$h);
 
     $info = "";
     $info .= "<html>";
@@ -387,7 +387,8 @@
     }
 
     if ( $this->see_ok() ) {
-      return makelink($this->getURL() ,myentities($text),sprintf($lang['ExpenseLinkInfo'], $this->creator->getFullName()),$this->getPopInfo());
+      $this->read_adr_reference();
+      return makelink($this->getURL() ,myentities($text),sprintf($lang['ExpenseLinkInfo'], $this->adr_ref->getFullName()),$this->getPopInfo());
     } else {
       return myentities($text);
     }
@@ -759,7 +760,7 @@
         echo $sep . "-" . $f->getLink();
         $sep = "<br />\n";
       }
-	  unset($f);
+          unset($f);
       echo "</td></tr>\n";
     }
   }

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/es.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es.p3	26 May 2004 13:38:08 -0000	1.4
+++ es.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/hu.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hu.p3	26 May 2004 13:38:08 -0000	1.6
+++ hu.p3	23 Nov 2006 13:23:13 -0000	1.7
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Költségközpont";
 $lang['ExpenseStartTime']      = "Kezdés ideje";
 $lang['ExpenseEndTime']        = "Vége";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "autókölcsönzés";
@@ -76,4 +77,4 @@
 
 $lang['perm'][useexpenses]     = "kiadások használata";
 $lang['expense']               = &$lang['Expense'];
-?>
\ No newline at end of file
+?>

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/el.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- el.p3	26 May 2004 13:38:08 -0000	1.4
+++ el.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/zh.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- zh.p3	26 May 2004 13:38:08 -0000	1.4
+++ zh.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/de.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- de.p3	28 Jun 2004 07:44:20 -0000	1.6
+++ de.p3	23 Nov 2006 13:23:13 -0000	1.7
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Kostenstelle";
 $lang['ExpenseStartTime']      = "Beginn";
 $lang['ExpenseEndTime']        = "Ende";
+$lang['ExpenseLinkInfo']       = "Spesen von %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "Auto/Mietwagen";

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/sv.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sv.p3	26 May 2004 13:38:08 -0000	1.4
+++ sv.p3	23 Nov 2006 13:23:13 -0000	1.5
@@ -45,6 +45,7 @@
 $lang['ExpenseCCentre']        = "Cost centre";
 $lang['ExpenseStartTime']      = "Starting Time";
 $lang['ExpenseEndTime']        = "Ending Time";
+$lang['ExpenseLinkInfo']       = "a expense from %s";
 
 $lang['ExpenseCategories']     = array();
 $lang['ExpenseCategories'][1]  = "hired car";

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

Modified Files:
	bug.pinc 
Log Message:
bugfix


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- bug.pinc	22 Nov 2006 10:26:09 -0000	1.42
+++ bug.pinc	23 Nov 2006 09:15:00 -0000	1.43
@@ -710,7 +710,7 @@
 
     $cc = "";
     foreach($this->ml as $i => $f) {
-      if ($f->id != $to->id) {
+      if ( ($f->id != $to->id) && is_object($f) ) {
         $cc .= $f->getFullName() ."\n";
       }
     }
@@ -868,6 +868,8 @@
 
     $this->ml = $ml;
     foreach($ml as $i => $f) {
+      if (!is_object($f)) continue;
+
       $mail->resetBody();
       $mail->resetTo();
       $mail->addTo($ml[$i]);

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

Modified Files:
	en.p3 mtable.pinc stuff.pinc stuff_ins.php stuff_new.php 
	stuff_overview.php stuff_show.php 
Added Files:
	de.p3 
Log Message:
extended stuff management

Index: stuff_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_overview.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- stuff_overview.php	24 Jul 2006 15:34:08 -0000	1.4
+++ stuff_overview.php	23 Nov 2006 08:57:34 -0000	1.5
@@ -1,11 +1,15 @@
 <?php
 /*
- * Copyright 2004 by Gero Kohnert
+ * Copyright 2004 - 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   
+ *  Free Software Foundation; version 2 of the License.
  *
  *   CVS Info:  $Id$
  *   $Author$
  *
- * Group of Interest Management
+ * Inventory Management
  *
  * @modulegroup stuff
  * @module stuff_overview
@@ -18,12 +22,12 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("stuff","overview");
- loadmodule("stuff");
+ loadmodules('stuff','overview');
+ loadmodule('stuff');
  loadlayout();
 
  /**
-  * display an overview of CRM groups
+  * display an overview of stuff
   */
  class stuff_overview extends layout {
    /**
@@ -45,10 +49,12 @@
      echo "<thead>\n";
      echo "<tr>\n";
      echo $this->orderHeader("name",$lang['StuffName'],$this->link2);
-     echo $this->orderHeader("",$lang['StuffType'],$this->link2);
+     echo $this->orderHeader("type",$lang['StuffType'],$this->link2);
      echo $this->orderHeader("",$lang['StuffSerial'],$this->link2);
      echo $this->orderHeader("",$lang['StuffOwner'],$this->link2);
      echo $this->orderHeader("",$lang['StuffId'],$this->link2);
+     echo $this->orderHeader("purchase_date",$lang['StuffPurchaseDate'],$this->link2);
+     echo $this->orderHeader("",$lang['StuffPrice'],$this->link2);
      echo "</tr>\n";
      echo "</thead>\n";
   
@@ -71,11 +77,13 @@
          continue;
        }
        echo $this->OverviewRowStart($line);
-       echo "<td valign=\"top\">". $c->getLink() ."</td>";
-       echo "<td valign=\"top\">". myentities($lang['StuffTypes'][$c->type]) ."&nbsp;</td>";
-       echo "<td valign=\"top\">". myentities($c->serial) ."&nbsp;</td>";
-       echo "<td valign=\"top\">". $c->owner->getLink() ."&nbsp;</td>";
-       echo "<td valign=\"top\">". myentities($c->invid) ."&nbsp;</td>";
+       echo '<td valign="top">'. $c->getLink() ."</td>\n";
+       echo '<td valign="top">'. myentities($lang['StuffTypes'][$c->type]) ."&nbsp;</td>\n";
+       echo '<td valign="top">'. myentities($c->serial) ."&nbsp;</td>\n";
+       echo '<td valign="top">'. $c->owner->getLink() ."&nbsp;</td>\n";
+       echo '<td valign="top">'. myentities($c->invid) ."&nbsp;</td>\n";
+       echo '<td valign="top">'. $c->p_date->getDate() ."&nbsp;</td>\n";
+       echo '<td valign="top">'. number_format($c->price,2,$lang['DecPoint'],$lang['ThousandPoint'])."&nbsp;<b>". $c->currency ."&nbsp;</td>\n";
        echo $this->OverviewRowEnd($line++);
      }
      echo "</tbody>\n";

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/mtable.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mtable.pinc	23 Nov 2006 08:16:18 -0000	1.3
+++ mtable.pinc	23 Nov 2006 08:57:34 -0000	1.4
@@ -1,7 +1,11 @@
 <?php
-/*
+/**
  * Copyright 2004 - 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   
+ *  Free Software Foundation; version 2 of the License.
+ *
  * Information about the tables and indices neccessary for this module
  *
  *  CVS Info:  $Id$

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/en.p3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- en.p3	22 Jun 2004 14:35:53 -0000	1.2
+++ en.p3	23 Nov 2006 08:57:34 -0000	1.3
@@ -12,15 +12,17 @@
 # English Texts for this module
 #
 
-$lang['Stuff']          = "Inventory";
-$lang['Stuffs']         = "Inventories";
-$lang['StuffSearch']    = "Search Inventory";
-$lang['StuffOverview']  = "Inventory Overview";
-$lang['StuffName']      = "Name";
-$lang['StuffDesc']      = "Description";
-$lang['StuffType']      = "Type";
-$lang['StuffOwner']     = "Owner";
-$lang['StuffId']        = "Inventory Number";
+$lang['Stuff']             = "Inventory";
+$lang['Stuffs']            = "Inventories";
+$lang['StuffSearch']       = "Search Inventory";
+$lang['StuffOverview']     = "Inventory Overview";
+$lang['StuffName']         = "Name";
+$lang['StuffDesc']         = "Description";
+$lang['StuffType']         = "Type";
+$lang['StuffOwner']        = "Owner";
+$lang['StuffId']           = "Inventory Number";
+$lang['StuffPurchaseDate'] = "Purchase Date";
+$lang['StuffPrice']        = "Price";
 
 $lang['StuffTypes'][-1] = "undefined";
 $lang['StuffTypes'][0]  = "Computer/Hardware";

Index: stuff_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_ins.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stuff_ins.php	3 Apr 2005 18:32:17 -0000	1.5
+++ stuff_ins.php	23 Nov 2006 08:57:34 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 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   
@@ -63,6 +63,24 @@
    $gotourl = addUrlParameter($gotourl,"invid=". UrlEncode(StripSlashes($_POST['invid'])),true);
  }
 
+ $pdate = new DateTime(0);
+ $pdate->setDateTimeF("p_date");
+ $gotourl= addUrlParameter($gotourl,"p_date=". $pdate->getYYYYMMDD(),true);
+ if (  !$pdate->checkDMY(true) ) {
+   $msg .= sprintf($lang['Err0038'],$lang['StuffPurchaseDate']) ."<br />";
+ } else {
+   $obj->setPurchaseDate($pdate);
+ }
+
+ if ( !checkfloat($_POST['price']) ) {
+   $msg .= sprintf($lang['Err0017'],$lang['StuffPrice']) ."<br />";
+ } else {
+   $gotourl= addUrlParameter($gotourl,"price=". $_POST['price'],true);
+   $obj->setPrice($_POST['price']);
+ }
+
+ $obj->setCurrency(trim(StripSlashes($_POST['currency'])));
+ $gotourl = addUrlParameter($gotourl,"currency=". UrlEncode(StripSlashes($_POST['currency'])),true);
 
  # other modules
  $msg .= module_parseforms($current_user,$obj,$gotourl);

Index: stuff_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_new.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- stuff_new.php	23 Nov 2006 08:16:18 -0000	1.6
+++ stuff_new.php	23 Nov 2006 08:57:34 -0000	1.7
@@ -52,12 +52,12 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfieldc($lang['StuffDesc'],1,"desc");
+     echo $this->showfieldc($lang['StuffDesc'],0,"desc");
      echo $this->textarea("desc",3,$table['stuff']['description'][size],$this->obj->desc);
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfieldc($lang['StuffType'],1,"type");
+     echo $this->showfield($lang['StuffType'],0,"type");
      echo "<td colspan=\"3\"><select id=\"type\" name=\"type\">\n";
 	 foreach($lang['StuffTypes'] as $i => $f) {
        echo "   <option value=\"". $i ."\"". ($this->obj->type == $i ? " selected=\"selected\"":"") .">". myentities($lang['StuffTypes'][$i]) ."</option>\n";
@@ -66,14 +66,20 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfieldc($lang['StuffSerial'],1,"serial");
+     echo $this->showfieldc($lang['StuffSerial'],0,"serial");
      echo " <td colspan=\"3\"><input id=\"serial\" name=\"serial\" size=\"". min($table['stuff']['name'][size],40) ."\" maxlength=\"". $table['stuff']['name'][size] ."\" value=\"". myentities($this->obj->serial) ."\" />\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfieldc($lang['StuffPurchaseDate'],1,"p_date");
-     echo $this->showfieldc($lang['StuffPrice'],1,"price");
-     echo $this->showfieldc($lang['Currency'],1,"currency");
+     echo $this->showfieldc($lang['StuffPurchaseDate'],0,"p_date");
+     echo " <td>\n";
+     echo $this->obj->p_date->EnterDate("p_date",1);
+     echo " </td>\n";
+     echo $this->showfieldc($lang['StuffPrice'],0,"price");
+     echo " <td>\n";
+     echo "  <input id=\"price\" size=\"10\" maxlength=\"10\" name=\"price\" value=\"".  number_format($this->obj->price,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />\n";
+     Currency_Select("currency",$this->obj->currency);
+     echo " </td>\n";
      echo "</tr>\n";
 
      echo "<tr>\n";
@@ -141,6 +147,16 @@
      if ( isset($_GET['loc']) ) {
        $this->obj->location = StripSlashes($_GET['loc']);
      }
+     if ( isset($_GET['price']) ) {
+       $this->obj->price = $_GET['price'];
+     }
+     if ( isset($_GET['currency']) ) {
+       $this->obj->currency = $_GET['currency'];
+     }
+     if ( isset($_GET['p_date']) ) {
+       $this->obj->p_date->setDateTime($_GET['p_date']);
+     }
+
      if ( ! $this->obj->mod_ok() ) {
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
        $this->stop = true;

Index: stuff_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_show.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- stuff_show.php	22 May 2005 14:23:45 -0000	1.6
+++ stuff_show.php	23 Nov 2006 08:57:34 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 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   
@@ -19,8 +19,8 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("stuff","show");
- loadmodule("stuff");
+ loadmodules('stuff','show');
+ loadmodule('stuff');
  loadlayout();
 
  /**
@@ -56,11 +56,20 @@
      echo "</tr><tr>\n";
 
      echo $this->showfield($lang['StuffSerial']);
-	 if ($this->obj->type == STUFF_TYPE_BOOK) {
+     if ($this->obj->type == STUFF_TYPE_BOOK) {
        echo $this->showdata(handle('ISBN',$this->obj->serial,myentities($this->obj->serial)),3);
-	 } else {
+     } else {
        echo $this->showdata(myentities($this->obj->serial),3);
-	 }
+     }
+
+     echo "</tr><tr>\n";
+
+     echo $this->showfield($lang['StuffPurchaseDate']);
+     echo "  <td>". $this->obj->p_date->GetLinkDate() ."</td>\n";
+
+     echo $this->showfield($lang['StuffPrice']);
+     $x= array($this->obj->price,$this->obj->currency);
+     echo $this->showdata(handle('money',$x,number_format($this->obj->price,2,$lang['DecPoint'],$lang['ThousandPoint']) ."&nbsp;<b>". $this->obj->currency ."</b>"));
 
      echo "</tr><tr>\n";
 
@@ -163,4 +172,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

--- NEW FILE: de.p3 ---
<?php
# $Id: de.p3,v 1.1 2006/11/23 08:57:34 gokohnert Exp $
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
# to TUTOS language files in a file called "en_custom.p3"
# or "lang_custom.p3" (for all languages)
# using the same format like here
# =======================================================
#
#
# German Texts for this module
#

$lang['Stuff']             = "Inventar";
$lang['Stuffs']            = "Inventar";
$lang['StuffSearch']       = "Suche Inventar";
$lang['StuffOverview']     = "Inventarliste";
$lang['StuffName']         = "Name";
$lang['StuffDesc']         = "Beschreibung";
$lang['StuffType']         = "Typ";
$lang['StuffOwner']        = "Benutzer";
$lang['StuffId']           = "Inventar Nummer";
$lang['StuffPurchaseDate'] = "Zugang am";
$lang['StuffPrice']        = "Preis";

$lang['StuffTypes'][-1] = "undefined";
$lang['StuffTypes'][0]  = "Computer/Hardware";
$lang['StuffTypes'][1]  = "Buch";
$lang['StuffTypes'][2]  = "Software";
$lang['StuffTypes'][3]  = "Kommunikation";
$lang['StuffTypes'][4]  = "CD/DVD";
$lang['StuffTypes'][5]  = "Ordner";

$lang['StuffSerial']    = "Seriennummer";
$lang['StuffLocation']  = "Aufbewahrungsort";

$lang['StuffCreate']    = "Neues Inventar anlegen";
$lang['StuffShow']      = "Inventar ansehen";
$lang['StuffModify']    = "Inventar aendern";
$lang['StuffModI']      = "Inventar %s aendern";
$lang['StuffDelI']      = "Inventar %s loeschen";

$lang['perm'][usestuff] = "Inventar benutzen"; 
$lang['stuff'] = &$lang['Stuff'];
?>
Index: stuff.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- stuff.pinc	23 Nov 2006 08:16:18 -0000	1.4
+++ stuff.pinc	23 Nov 2006 08:57:34 -0000	1.5
@@ -2,6 +2,10 @@
 /**
  * Copyright 2004 - 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   
+ *  Free Software Foundation; version 2 of the License.
+ *
  *  CVS Info:  $Id$
  *  $Author$
  */
@@ -123,7 +127,7 @@
    * set the Price
    */
   function setPrice($value) {
-    return $this->setFloatField("price",$value,"ProdPrice");
+    return $this->setFloatField("price",$value,"StuffPrice");
   }
   /**
    * set the Currency
@@ -131,6 +135,12 @@
   function setCurrency($value) {
     return $this->setStrField("currency",$value,"Currency");
   }
+  /**
+   * set the PurchaseDate
+   */
+  function setPurchaseDate(&$value) {
+    return $this->setDateField("p_date",$value,"StuffPurchaseDate");
+  }
 
   /**
    * Save stuff to DB
@@ -147,8 +157,15 @@
     $q->addFV("type",$this->type,"INT");
     $q->addFV("serial",$this->serial,"STRING",$table['stuff']['serial'][size]);
     $q->addFV("invid",$this->invid,"STRING",$table['stuff']['invid'][size]);
+    $q->addFV("currency",$this->currency,"STRING",$table['stuff']['currency'][size]);
+    $q->addFV("purchase_date",$this->p_date,"DATETIME");
+    if ( ! empty ($this->price) ) {
+      $q->addFV("price",$this->price,"FLOAT");
+    } else {
+      $q->addFV("price","null","");
+    }
 
-	$this->save_custom_fields($q);
+    $this->save_custom_fields($q);
 
     if ( $this->id < 0 ) {
       unset ($this->modified);

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

Modified Files:
	config_default.pinc 
Log Message:
extended stuff management

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- config_default.pinc	14 Sep 2006 18:09:57 -0000	1.110
+++ config_default.pinc	23 Nov 2006 08:57:33 -0000	1.111
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -791,6 +791,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.3.20060914';
+$tutos[version] = '1.3.20061123';
 #
 ?>
\ No newline at end of file

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

Modified Files:
	mtable.pinc stuff.pinc stuff_new.php 
Log Message:
extending

Index: stuff.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stuff.pinc	19 Jul 2004 19:08:56 -0000	1.3
+++ stuff.pinc	23 Nov 2006 08:16:18 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2004 by Gero Kohnert
+ * Copyright 2004 - 2006 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -16,16 +16,19 @@
   /* ---------------------------------------------------------------------------
    */
   function stuff(&$dbconn) {
-    global $table;
+    global $table,$tutos;
   
     $this->init($dbconn);
 
-    $this->name = "";
-    $this->desc = "";
+    $this->name = '';
+    $this->desc = '';
     $this->type = -1;
-    $this->serial = "";
-    $this->invid = "";
-    $this->location = "";
+    $this->serial = '';
+    $this->invid  = '';
+    $this->location = '';
+    $this->price    = 0.0;
+    $this->currency   = $tutos[currencies][0];
+    $this->p_date     = new DateTime(0);
     $this->tablename  = $this->dbconn->prefix .$table['stuff'][name];
   }
 
@@ -42,14 +45,17 @@
     $this->serial      = "".$r->get($pos, "serial");
     $this->invid       = "".$r->get($pos, "invid");
     $this->owner       = getObject($this->dbconn,$r->get($pos, "owner"));
+    $this->price       = $r->get($pos, 'price');
+    $this->currency    = $r->get($pos, 'currency');
+    $this->p_date      = $r->getDateTime($pos, 'purchase_date');
     $this->creator     = $this->creator->read($r->get($pos, "creator"),$this->creator);
 
-	if ($this->owner = -1) {
-		$this->owner = $this->creator;
-	}
-	if ($this->type == "") {
+    if ($this->owner = -1) {
+      $this->owner = $this->creator;
+    }
+    if ($this->type == "") {
       $this->type = -1;
-	}
+    }
     parent::read_result($r,$pos);
     return;
   }
@@ -113,6 +119,18 @@
   function setLocation($value) {
     return $this->setStrField("location",$value,"StuffLocation");
   }
+  /**
+   * set the Price
+   */
+  function setPrice($value) {
+    return $this->setFloatField("price",$value,"ProdPrice");
+  }
+  /**
+   * set the Currency
+   */
+  function setCurrency($value) {
+    return $this->setStrField("currency",$value,"Currency");
+  }
 
   /**
    * Save stuff to DB

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/mtable.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mtable.pinc	22 Jun 2004 14:35:53 -0000	1.2
+++ mtable.pinc	23 Nov 2006 08:16:18 -0000	1.3
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2004 by Gero Kohnert
+ * Copyright 2004 - 2006 by Gero Kohnert
  *
  * Information about the tables and indices neccessary for this module
  *
@@ -11,15 +11,18 @@
 $table['stuff'] = array(
   name => "stuff",
   Desc => "TUTOS inventory item",
-  "id"          => array(type => "ID_TYPE",              constraints => "PK",  Desc => "Object ID"),
-  "type"        => array(type => "ID_TYPE",              constraints => "",    Desc => "type"),
-  "name"        => array(type => "VARCHAR", size => 60,  constraints => "",    Desc => "item name"),
-  "serial"      => array(type => "VARCHAR", size => 60,  constraints => "",    Desc => "serial number"),
-  "invid"       => array(type => "VARCHAR", size => 60,  constraints => "",    Desc => "stock id"),
-  "description" => array(type => "VARCHAR", size => 180, constraints => "",    Desc => "group description"),
-  "owner"       => array(type => "ID_TYPE",              constraints => "",    Desc => "owner ID"),
-  "creator"     => array(type => "ID_TYPE",              constraints => "NN",  Desc => "creator ID"),
-  "creation"    => array(type => "TS_TYPE",              constraints => "NN",  Desc => "creation date")
+  "id"            => array(type => "ID_TYPE",              constraints => "PK",  Desc => "Object ID"),
+  "type"          => array(type => "ID_TYPE",              constraints => '',    Desc => "type"),
+  "name"          => array(type => "VARCHAR", size => 60,  constraints => '',    Desc => "item name"),
+  "serial"        => array(type => "VARCHAR", size => 60,  constraints => '',    Desc => "serial number"),
+  "invid"         => array(type => "VARCHAR", size => 60,  constraints => '',    Desc => "stock id"),
+  "description"   => array(type => "VARCHAR", size => 180, constraints => '',    Desc => "description"),
+  "owner"         => array(type => "ID_TYPE",              constraints => '',    Desc => "owner ID"),
+  "purchase_date" => array(type => "TS_TYPE",              constraints => '',    Desc => "purchase date"),
+  "price"         => array(type => "float",                constraints => '',    Desc => "original price"),
+  "currency"      => array(type => 'VARCHAR', size => 4,   constraints => '',    Desc => "currency for price and cost"),
+  "creator"       => array(type => "ID_TYPE",              constraints => "NN",  Desc => "creator ID"),
+  "creation"      => array(type => "TS_TYPE",              constraints => "NN",  Desc => "creation date")
 );
 
 $sequence['stuffid'] = array(

Index: stuff_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_new.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stuff_new.php	23 Apr 2005 13:18:26 -0000	1.5
+++ stuff_new.php	23 Nov 2006 08:16:18 -0000	1.6
@@ -1,6 +1,10 @@
 <?php
 /*
- * Copyright 2004 by Gero Kohnert
+ * Copyright 2004 - 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   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  * Iventory
  *
@@ -67,6 +71,12 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
+     echo $this->showfieldc($lang['StuffPurchaseDate'],1,"p_date");
+     echo $this->showfieldc($lang['StuffPrice'],1,"price");
+     echo $this->showfieldc($lang['Currency'],1,"currency");
+     echo "</tr>\n";
+
+     echo "<tr>\n";
      echo $this->showfieldc($lang['StuffId'],1,"invid");
      echo " <td colspan=\"3\"><input id=\"invid\" name=\"invid\" size=\"". min($table['stuff']['name'][size],40) ."\" maxlength=\"". $table['stuff']['name'][size] ."\" value=\"". myentities($this->obj->invid) ."\" />\n";
      echo "</tr>\n";

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

Modified Files:
	bug.pinc 
Log Message:
bugfix

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- bug.pinc	19 Nov 2006 17:44:42 -0000	1.41
+++ bug.pinc	22 Nov 2006 10:26:09 -0000	1.42
@@ -179,7 +179,7 @@
       $text = $this->getFullName();
     }
     if ( $this->see_ok() ) {
-      return makelink($this->getURL() , myentities($text) ,sprintf($lang['BugShow']));
+      return makelink($this->getURL() , myentities($text) ,sprintf($lang['BugShow'],$this->getFullName()));
     } else {
       return myentities($text);
     }

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

Modified Files:
	product_show.php 
Log Message:
fix

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- product_show.php	19 Nov 2006 17:44:42 -0000	1.112
+++ product_show.php	20 Nov 2006 18:31:13 -0000	1.113
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 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   
@@ -37,7 +37,7 @@
      if ( isset($this->obj->role[$role]) && (count($this->obj->role[$role]) > 0) ) {
        echo "<tr>\n";
        echo $this->showfield($lang['ProdRole'][$role]);
-       echo " <td colspan=\"3\">";
+       echo ' <td colspan="3">';
        $n = 0;
        foreach ($this->obj->role[$role] as $i => $r) {
          if ( $n > 0 ) {