tutos-commits Mailing List for TUTOS

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

Modified Files:
	custom.pinc database.pinc 
Log Message:
fixes

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- custom.pinc	2 Jan 2007 19:59:56 -0000	1.12
+++ custom.pinc	18 Jan 2007 11:51:29 -0000	1.13
@@ -54,7 +54,7 @@
    } else if ($x['ftype'] == 'Boolean') {
      return ($obj > 0 ? $lang['yes'] : $lang['no']);
    } else if ($x['ftype'] == 'SelectOne') {
-     return myentities(isset($lang[$x['lang'].'_'][$obj]) ? $lang[$x['lang'].'_'][$obj]: "??". $x['lang'] ."??");
+     return myentities(isset($lang[$x['lang'].'_'][$obj]) ? $lang[$x['lang'].'_'][$obj]: ($x['required'] ? $obj ."??" : '') );
    } else if ($x[type] == 'TS_TYPE') {
      return $obj->getDate();
    } else if ($x['ftype'] == 'number') {
@@ -89,7 +89,6 @@
      $r .= $layout->orderHeader($sortby,myentities(isset($lang[$tx['lang']]) ? $lang[$tx['lang']]:$tx['lang']),$base);
      $layout->flds++;
    }
-#   die ("XXXX".$section);
    return $r;
  }
  /**
@@ -107,7 +106,7 @@
      if (!isset($tx['ftype'])) $tx['ftype'] = '';
 
      $f = '_fld_'.$ti;
-     $r .= '<td>'.get_custom_field($tx,$obj->$f) .'</td>'."\n";
+     $r .= ' <td>'.get_custom_field($tx,$obj->$f) .'</td>'."\n";
    }
    return $r;
  }
@@ -152,13 +151,13 @@
 
    $r = '';
    if (!isset($table[$section])) return $r;
-
    foreach($table[$section] as $i => $x) {
      if (!is_array($x)) continue;
      if (!isset($x['custom'])) continue;
      if (!$x['custom']) continue;
      if (!isset($x['required'])) $x['required'] = false;
      if (!isset($x['ftype'])) $x['ftype'] = "";
+#     echo $section .' '.$i .' '. $x .'<br>';
 
      $fld = "_fld_".$i;
      $parsename = $section ."_". $i;

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- database.pinc	2 Jan 2007 19:59:56 -0000	1.59
+++ database.pinc	18 Jan 2007 11:51:29 -0000	1.60
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2006 by Gero Kohnert
+ *  Copyright 2001 - 2007 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   
@@ -598,4 +598,4 @@
                 );
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	reminder.pinc reminder_ins.php reminder_show.php 
Log Message:
fixes

Index: reminder_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_show.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- reminder_show.php	2 Jan 2007 19:59:59 -0000	1.14
+++ reminder_show.php	18 Jan 2007 11:51:33 -0000	1.15
@@ -46,7 +46,7 @@
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['ReminderTo']);
-     echo $this->showdata( ($this->obj->to >0 ? $this->obj->to->getLink(): $lang['HistoryDeleted']),3);
+     echo $this->showdata( (is_object($this->obj->to) ? $this->obj->to->getLink(): $lang['HistoryDeleted']),3);
      echo "</tr>\n";
 
      echo "<tr>\n";

Index: reminder_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_ins.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- reminder_ins.php	16 Dec 2006 13:08:28 -0000	1.8
+++ reminder_ins.php	18 Jan 2007 11:51:33 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2006 by Gero Kohnert
+ *  Copyright 2004 - 2007 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   
@@ -88,7 +88,7 @@
  $obj->setRemindDate($r);
 
  # other modules
- $msg .= module_parseforms($current_user,$b,$gotourl);
+ $msg .= module_parseforms($current_user,$obj,$gotourl);
 
  if ( $msg == "" ) {
    $dbconn->Begin("WORK");
@@ -106,4 +106,4 @@
   *  CVS Info:  $Id$
   *  $Author$
   */
-?>
+?>
\ No newline at end of file

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- reminder.pinc	2 Jan 2007 19:59:59 -0000	1.21
+++ reminder.pinc	18 Jan 2007 11:51:33 -0000	1.22
@@ -169,7 +169,7 @@
     global $lang;
 
     $this->plist = array();
-    if ($this->ref != -1) {
+    if (is_object($this->ref) && $this->ref->id != -1) {
       # Read possible new parents
       $this->plist = $this->ref->getNeighbours();
     }
@@ -206,9 +206,9 @@
     $info = '';
     $info .= '<html>';
     $info .= '<body>';
-    $info .= "<table class=\"inner\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">";
-    $info .= "<tr><th>". $lang['Reminder'].' &#8594; '.$lang[$this->ref->getType()] ." ". $h  .'</th></tr>';
-    $info .= "<tr><td><font size=\"-1\"><pre>";
+    $info .= '<table class="inner" border="0" cellspacing="0" cellpadding="1">';
+    $info .= '<tr><th>'. $lang['Reminder'].' &#8594; '.$lang[$this->ref->getType()] ." ". $h  .'</th></tr>';
+    $info .= '<tr><td><font size="-1"><pre>';
     $info .= $n;
     $info .= '</pre></font></td></tr>';
     $info .= '</table>';
@@ -239,19 +239,19 @@
    * Return a url that displays this reminder
    */
   function getURL() {
-    return "reminder/reminder_show.php?id=". $this->id;
+    return 'reminder/reminder_show.php?id='. $this->id;
   }
   /**
    * Return a link to modify this reminder
    */
   function getModURL() {
-    return "reminder/reminder_new.php?id=".$this->id;
+    return 'reminder/reminder_new.php?id='.$this->id;
   }
   /**
    * Return a link to delete this reminder
    */
   function getDelURL() {
-    return "reminder/reminder_del.php?id=".$this->id;
+    return 'reminder/reminder_del.php?id='.$this->id;
   }
   /**
    * Return a link to this reminder
@@ -279,7 +279,7 @@
     else
       $r = $lang['HistoryDeleted'];
 
-    $r .= " @ ". $this->remind_date->getDateTime();
+    $r .= ' @ '. $this->remind_date->getDateTime();
     return $r;
   }
   /**

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

Modified Files:
	installation.pinc installation_ins.php installation_new.php 
	installation_overview.php installation_show.php 
Log Message:
fixes

Index: installation_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_new.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- installation_new.php	2 Jan 2007 19:59:58 -0000	1.25
+++ installation_new.php	18 Jan 2007 11:51:32 -0000	1.26
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -203,6 +203,10 @@
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
        $this->stop = true;
      }
+     #
+     # preset additional custom fields
+     #
+     preset_custom_fields($this->obj->gettype(),$this->obj);
      # menu
      $x = installation::getSelectLink($this->user,$lang['Search']);
      $x[category][] = "obj";

Index: installation_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_show.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- installation_show.php	2 Jan 2007 19:59:58 -0000	1.28
+++ installation_show.php	18 Jan 2007 11:51:32 -0000	1.29
@@ -41,7 +41,7 @@
 
      echo "</tr><tr>\n";
      echo $this->showfield($lang['ProductP']);
-     if ( $this->obj->product != -1 ) {
+     if ( is_object($this->obj->product) && $this->obj->product->id != -1 ) {
        echo " <td colspan=\"3\">". $this->obj->product->getLink() ."&nbsp;</td>\n";
      } else {
        echo " <td colspan=\"3\">". $lang['HistoryDeleted'] ."&nbsp;</td>\n";
@@ -49,7 +49,7 @@
      echo "</tr><tr>\n";
      echo $this->showfield($lang['Customer']);
      echo "<td colspan=\"3\">";
-     if ( $this->obj->customer == -1 ) {
+     if ( is_object($this->obj->customer) && $this->obj->customer->id == -1 ) {
        echo "<i>". $lang['HistoryDeleted'] ."</i>";
      } else if ( $this->obj->customer->id != -1 ) {
        echo $this->obj->customer->getLink();
@@ -80,7 +80,7 @@
 
      echo "</tr><tr>\n";
      echo $this->showfield($lang['InstalledBy']);
-     if ( is_object($this->obj->installer) && ($this->obj->installer != -1) ) {
+     if ( is_object($this->obj->installer) && ($this->obj->installer->id != -1) ) {
        echo " <td>". $this->obj->installer->getLink() ."&nbsp;</td>\n";
      #} else if ( $this->obj->installer->id != -1 ) {
      #  echo " <td>". $this->obj->installer->getLink() ."&nbsp;</td>\n";
@@ -155,7 +155,7 @@
      #
      # Show additional custom fields
      #
-	 echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
      echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
@@ -245,4 +245,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: installation_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_overview.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- installation_overview.php	2 Jan 2007 19:59:58 -0000	1.25
+++ installation_overview.php	18 Jan 2007 11:51:32 -0000	1.26
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -91,30 +91,31 @@
        echo $this->OverviewRowStart($line,$lang[$i->getType()] .": ". $i->getFullName());
        echo " <td align=\"right\">". $i->getLink(sprintf("%03d",$a)) ."</td>\n";
        echo " <td>";
-       if ( $i->product != -1 ) {
+       if ( is_object($i->product) && $i->product->id != -1 ) {
          echo $i->product->getLink();
        } else {
          echo "<i>". $lang['HistoryDeleted'] ."</i>";
        }
        echo "</td>\n";
-       if ( $i->customer == -1 ) {
+       if ( is_object($i->customer) && $i->customer->id == -1 ) {
          echo ' <td><i>'. $lang['HistoryDeleted'] ."</i></td>\n";
-       } else if ( $i->customer->id != -1 ) {
+       } else if (is_object($i->customer) && $i->customer->id != -1 ) {
          echo ' <td>'. $i->customer->getLink() ."</td>\n";
        } else {
          echo " <td>&nbsp;</td>\n";
        }
        echo ' <td>'. myentities($i->description) ."&nbsp;</td>\n";
-       if ( $i->installer == -1 ) {
+       if ( is_object($i->installer) && $i->installer->id == -1 ) {
          echo " <td><i>". $lang['HistoryDeleted'] ."</i></td>\n";
-       } else if ( $i->installer->id != -1 ) {
+       } else if ( is_object($i->installer) && $i->installer->id != -1 ) {
          echo " <td>". $i->installer->getLink() ."</td>\n";
        } else {
          echo " <td>&nbsp;</td>\n";
        }
        echo " <td>". $i->instdate->getLinkDate() ."</td>\n";
        echo get_module_overview_data($this,$i);
-       echo show_custom_overview_data($this,'installation',$f);
+       echo show_custom_overview_data($this,'installation',$i);
+
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
          if ( $i->mod_ok() ) {

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- installation.pinc	2 Jan 2007 19:59:58 -0000	1.44
+++ installation.pinc	18 Jan 2007 11:51:31 -0000	1.45
@@ -364,6 +364,7 @@
     if ( $this->seller->id > 0 ) {
       $q->addFV("creator",$this->creator,"OBJ");
     }
+    $this->save_custom_fields($q);
 
     if ( $this->id < 0 ) {
       $this->modified = array();

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- installation_ins.php	16 Dec 2006 13:08:27 -0000	1.17
+++ installation_ins.php	18 Jan 2007 11:51:32 -0000	1.18
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -95,6 +95,11 @@
  $obj->setInstdate($id);
  $obj->setSalesdate($sd);
 
+ #
+ # Parse additional custom fields
+ #
+ $msg .= parse_custom_fields($obj->gettype(),$obj);
+
  # other modules
  $msg .= module_parseforms($current_user,$obj,$gotourl);
 

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

Modified Files:
	note.pinc 
Log Message:
fixes

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- note.pinc	2 Jan 2007 19:59:58 -0000	1.63
+++ note.pinc	18 Jan 2007 11:51:33 -0000	1.64
@@ -41,7 +41,7 @@
       break;
     }
     $r .= "  ". $user->layout->theme->getImage(paper,'list') ." ". $f->getLink() ." ". $f->creation->getDateTime();
-    $r .= " ".($f->creator != -1 ? $f->creator->getLink($f->creator->getShortname()):"")."<br />\n";
+    $r .= " ".(is_object($f->creator) ? $f->creator->getLink($f->creator->getShortname()):"")."<br />\n";
     if ( $cols > 0 ) {
       $r .= "</td></tr>\n";
     }
@@ -57,14 +57,14 @@
 
   $r = "<select id=\"etype\" name=\"etype\">\n";
   foreach( $lang['NoteEventTypes'] as $i => $f) {
-    $r .= "<option value=\"". $i ."\"";
+    $r .= ' <option value="'. $i .'"';
     if ( $i == $default ) {
       $r .= ' selected="selected" ';
     }
     $r .= ">". $f ."</option>\n";
   }
   if ( $any > 0 ) {
-    $r .= "<option value=\"-1\"";
+    $r .= ' <option value="-1"';
     if ( -1 == $default ) {
       $r .= ' selected="selected" ';
     }

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

Modified Files:
	layout_base.pinc 
Log Message:
fixes

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- layout_base.pinc	2 Jan 2007 19:59:58 -0000	1.41
+++ layout_base.pinc	18 Jan 2007 11:51:32 -0000	1.42
@@ -488,7 +488,7 @@
 	}
     $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 colspan="'. ($this->width -1) .'">'. sprintf ($lang['ProdCreation'],( (is_object($this->obj->creator) && $this->obj->creator->id != -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";

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

Modified Files:
	table_custom_example.pinc 
Log Message:
fixes

Index: table_custom_example.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table_custom_example.pinc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- table_custom_example.pinc	2 Jan 2007 19:59:57 -0000	1.15
+++ table_custom_example.pinc	18 Jan 2007 11:51:31 -0000	1.16
@@ -31,6 +31,7 @@
 #                            or
 #               type     => TS_TYPE (== DateTime)
 #                           TX_TYPE (== long text)
+#                           ID_TYPE (== integer ID)
 #                           VARCHAR (== text with given size)
 #                          'default_today' => true or false (needs type = TS_TYPE),
 #              'handler' => the class of handler to use for the field
@@ -227,5 +228,25 @@
                                    'sortable'   => true,                 # show in overview as sortable
                                    'required'   => false
                                   );
+#
+# Example in groups
+#
+$table['group']['salesgroup']   = array('custom'     => true,
+                                   'ftype'      => 'SelectOne',
+                                   type         => "ID_TYPE",
+                                   constraints  => "",
+                                   Desc         => "SalesGroup",
+                                   'lang'       => "INDID",
+                                   'overview'   => true,                 # show in overview
+                                   'sortable'   => true,                 # show in overview as sortable
+                                   'required'   => false
+                                  );
+$lang['INDID'] = "Sales Group";
+$lang['INDID_'][1] = "CHEM";
+$lang['INDID_'][4] = "PAPER";
+$lang['INDID_'][19] = "other";
+$lang['INDID_'][123] = "do not use 1";
+$lang['INDID_'][124] = "do not use 2";
+$tutos['deprecated']['INDID_'] = array(123,124);
 
 ?>
\ No newline at end of file

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

Modified Files:
	group.pinc group_new.php group_overview.php group_show.php 
	mtable.pinc 
Log Message:
fixes

Index: group_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_overview.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- group_overview.php	2 Jan 2007 19:59:58 -0000	1.25
+++ group_overview.php	18 Jan 2007 11:51:31 -0000	1.26
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2006 by Gero Kohnert
+ *  Copyright 2002 - 2007 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   
@@ -99,19 +99,19 @@
          continue;
        }
        echo $this->OverviewRowStart($line);
-       echo "<td valign=\"top\">". $c->getLink() ."</td>";
-       echo "<td valign=\"top\">". myentities($c->desc) ."&nbsp;</td>";
-       echo "<td align=\"right\" valign=\"top\">". count($c->member) ."</td>";
+       echo ' <td valign="top">'. $c->getLink() ."</td>\n";
+       echo ' <td valign="top">'. myentities($c->desc) ."&nbsp;</td>\n";
+       echo ' <td align="right" valign="top">'. count($c->member) ."</td>\n";
        echo show_custom_overview_data($this,'group',$c);
 
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
          if ( $c->mod_ok() ) {
-           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $c->id ."\" />\n";
+           echo '<input name="mark[]" type="checkbox" value="'. $c->id .'" />';
          } else {
-           echo "-\n";
+           echo '-';
          }
-         echo "</td>\n";
+         echo "\n</td>\n";
        }
        echo $this->OverviewRowEnd($line++);
      }

Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- group_new.php	2 Jan 2007 19:59:58 -0000	1.34
+++ group_new.php	18 Jan 2007 11:51:31 -0000	1.35
@@ -56,7 +56,7 @@
      #
      # Show additional custom fields
      #
-     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
      # References to modules
      echo module_addforms($this->user,$this->obj,4);

Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- group.pinc	2 Jan 2007 19:59:58 -0000	1.55
+++ group.pinc	18 Jan 2007 11:51:31 -0000	1.56
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2005 by Gero Kohnert
+ *  Copyright 2002 - 2007 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   
@@ -59,7 +59,7 @@
     while ($a < $n) {
       $i = $r->get($a, "obj_id");
       $obj = getObject($this->dbconn,$i);
-      if ( $obj != -1 ) {
+      if ( is_object($obj) && $obj->id != -1 ) {
         $this->member[$i] = &$obj;
       }
       unset($obj);
@@ -125,6 +125,7 @@
     $q->setTable($this->tablename);
     $q->addFV("name",$this->name,"STRING",$table['group']['name'][size]);
     $q->addFV("description",$this->desc,"STRING",$table['group']['description'][size]);
+    $this->save_custom_fields($q);
 
     if ( $this->id < 0 ) {
       unset ($this->modified);

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/mtable.pinc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mtable.pinc	27 Apr 2004 04:50:58 -0000	1.7
+++ mtable.pinc	18 Jan 2007 11:51:31 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 - 2004 by Gero Kohnert
+ * Copyright 2002 - 2007 by Gero Kohnert
  *
  * Information about the tables and indices neccessary for this module
  *
@@ -8,15 +8,14 @@
  *  $Author$
  */
 
-$table['group'] = array(
-  name => "groups",
-  Desc => "TUTOS groups",
-  "id"          => array(type => "ID_TYPE",     constraints => "PK",  Desc => "Object ID"),
-  "name"        => array(type => "VARCHAR", size => 30, constraints => "",    Desc => "group name"),
-  "description" => array(type => "VARCHAR", size => 60, constraints => "",    Desc => "group description"),
-  "creator"     => array(type => "ID_TYPE",     constraints => "NN",  Desc => "creator ID"),
-  "creation"    => array(type => "TS_TYPE",     constraints => "NN",  Desc => "creation date")
-);
+$table['group'][name]          = 'groups';
+$table['group'][Desc]          = 'TUTOS groups';
+$table['group']['id']          = array(type => "ID_TYPE",     constraints => "PK",  Desc => "Object ID");
+$table['group']['name']        = array(type => "VARCHAR", size => 30, constraints => "", Desc => "group name");
+$table['group']['description'] = array(type => "VARCHAR", size => 60, constraints => "", Desc => "group description");
+$table['group']['creator']     = array(type => "ID_TYPE",     constraints => "NN",  Desc => "creator ID");
+$table['group']['creation']    = array(type => "TS_TYPE",     constraints => "NN",  Desc => "creation date");
+
 $table['group2'] = array(
   name => "group_member",
   Desc => "TUTOS group members",

Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- group_show.php	2 Jan 2007 19:59:58 -0000	1.41
+++ group_show.php	18 Jan 2007 11:51:31 -0000	1.42
@@ -237,32 +237,31 @@
        echo '<th>'. $lang['AdrFax'].'</th>';
        echo "</tr>\n";
        $line = 1;
-       while( list ($i,$f) = @each ($this->obj->member)) {
+       foreach ($this->obj->member as $i => $f) {
          echo $this->OverviewRowStart($line);
          echo "<td>&nbsp;</td>";
          $f->read_locs_data();
          $cnt =  count($f->location);
          if ( $cnt > 0 ) {
-           @reset($f->location);
-           echo "<td valign=\"top\" rowspan=\"". $cnt ."\">". $this->obj->member[$i]->getLink() ."</td>\n";
+           echo '<td valign="top" rowspan="'. $cnt .'">'. $this->obj->member[$i]->getLink() ."</td>\n";
            $cnt2 = 0;
-           while( list ($i2,$f2) = @each ($f->location)) {
+           foreach ($f->location as $i2 => $f2) {
              if ( $cnt2 > 0 ) {
                echo $this->OverviewRowEnd($line);
                echo $this->OverviewRowStart($line);
                echo "<td>&nbsp;</td>";
              }
-             echo " <td>". $f2->company->name ."&nbsp;</td>\n";
-             echo " <td>(". $f2->lname .")&nbsp;</td>\n";
-             echo " <td>". $f2->desc1 ."&nbsp;</td>\n";
-             echo " <td>". asEmail($f2->email_1,$f2->email_1,$f2->getFullName());
+             echo ' <td>'. $f2->company->name ."&nbsp;</td>\n";
+             echo ' <td>('. $f2->lname .")&nbsp;</td>\n";
+             echo ' <td>'. $f2->desc1 ."&nbsp;</td>\n";
+             echo ' <td>'. asEmail($f2->email_1,$f2->email_1,$f2->getFullName());
              if ( $f2->email_2 != "" ) {
-               echo "<br />". asEmail($f2->email_2,$f2->email_2,$f2->getFullName());
+               echo '<br />'. asEmail($f2->email_2,$f2->email_2,$f2->getFullName());
              }
              echo "&nbsp;</td>\n";
-             echo " <td>". handle('phone',$f2,$f2->phone_1);
+             echo ' <td>'. handle('phone',$f2,$f2->phone_1);
              if ( $f2->email_2 != "" ) {
-               echo "<br />". handle('phone',$f2,$f2->phone_2);
+               echo '<br />'. handle('phone',$f2,$f2->phone_2);
              }
              echo "&nbsp;</td>\n";
              echo ' <td>'. handle('fax',$f2,$f2->fax_1) ."&nbsp;</td>\n";

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

Modified Files:
	bug.pinc bug_show.php 
Log Message:
fixes

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- bug_show.php	2 Jan 2007 19:59:57 -0000	1.22
+++ bug_show.php	18 Jan 2007 11:51:31 -0000	1.23
@@ -89,11 +89,11 @@
 
      echo "</tr><tr>\n";
 
-     if ($this->obj->reporter != -1) {
+     if (is_object($this->obj->reporter)) {
        echo $this->showfield($lang['BugReportedFrom']);
-       echo $this->showdata($this->obj->reporter != -1 ? $this->obj->reporter->getLink():"",1);
-       echo $this->showdata( " (". makelink("bugtracking/bug_overview.php?reporterid=". $this->obj->reporter->id,
-                               $lang['BugReportedAll']) .")",2);
+       echo $this->showdata($this->obj->reporter->id != -1 ? $this->obj->reporter->getLink():"",1);
+       echo $this->showdata( ' ('. makelink("bugtracking/bug_overview.php?reporterid=". $this->obj->reporter->id,
+                               $lang['BugReportedAll']) .')',2);
        echo "</tr><tr>\n";
      }
      echo $this->showfield($lang['BugMedium']);

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- bug.pinc	2 Jan 2007 19:59:57 -0000	1.45
+++ bug.pinc	18 Jan 2007 11:51:31 -0000	1.46
@@ -679,8 +679,14 @@
   function make_mail_body(&$body,&$to) {
     global $lang,$current_user;
 
-    $url = dirname(getBaseUrl(true))."/". $this->getUrl();
+    # $url = dirname(getBaseUrl(true))."/". $this->getUrl();
 
+    $baseUrl = getBaseUrl(true);
+    if (strpos($baseUrl, "bugtracking") === false) {
+      $url = $baseUrl . $this->getURL();
+    } else {
+      $url = dirname($baseUrl)."/". $this->getUrl();
+    }
     if ( $this->solver->id > 0 ) {
       $body = eregi_replace("@SOLVER@",$this->solver->getFullName(),$body);
     } else {
@@ -1129,7 +1135,7 @@
           $body = eregi_replace("@TIME@",$diff_total,$body);
 
           $m->addBody($body,"text/plain",$lang['BugsDetail'],"",$f->lg['content_encoding']);
-          $m->addBody($m->HtmlStart(). $this->getBugHistory(false) .$m->HtmlEnd(),"text/html" , $lang['BugHistory']);
+          $m->addBody($m->HtmlStart(). $b->getBugHistory(false) .$m->HtmlEnd(),"text/html" , $lang['BugHistory']);
           $msg .= $m->send();
         }
       }
@@ -1217,4 +1223,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	acl_new.php address.pinc address_new.php address_select.php 
	address_show.php address_tools.p3 admin_sync.php app_new.php 
	app_new_r.php app_select.php app_show.php appointment.pinc 
	calendar.php calendar_day.php calendar_week.php 
	company_new.php company_show.php custom.pinc database.pinc 
	database_new.php database_show.php department.pinc 
	department_new.php department_show.php login.pinc mail_new.php 
	mailchoose.php module_base.pinc product.pinc product_new.php 
	product_overview.php product_role_new.php product_select.php 
	product_show.php res_cal.php res_cal_select.php task.pinc 
	task_import_csv.php task_import_xml.php task_new.php 
	task_overview.php task_select.php task_show.php team.pinc 
	team_new.php team_overview.php team_select.php team_show.php 
	timetrack.pinc timetrack_new.php timetrack_select.php 
	user_new.php webelements.p3 
Log Message:
various html fixes

Index: login.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/login.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- login.pinc	2 Jan 2006 08:43:05 -0000	1.42
+++ login.pinc	2 Jan 2007 19:59:56 -0000	1.43
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2005 by Gero Kohnert
+ *  Copyright 2001 - 2007 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   
@@ -23,8 +23,8 @@
    function info() {
      global $msg,$lang,$tutos,$table;
 
-	 $tutos['pageclass'] = 'login';
-	 $tutos['pagetype'] = 'login';
+     $tutos['pageclass'] = 'login';
+     $tutos['pagetype'] = 'login';
 
      unset ($_GET['msg']);
      if ( count($_GET) ) {
@@ -59,10 +59,10 @@
      echo "\n<!-- ". phpversion() ." ".  PHP_OS ." -->\n";
      echo "<center>\n";
 
-     echo '<form name="login" action="'. $this->gotourl ."\" method=\"post\">\n";
+     echo '<form id="login" name="login" action="'. $this->gotourl ."\" method=\"post\">\n";
 
 
-     DoubleTableStart();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      echo " <th colspan=\"2\">". $lang['PleaseLogin'] .(( $tutos[authtype] == "x509" ) ? " (".$lang['Certificate'].")" : "" )."</th>\n";
@@ -120,9 +120,9 @@
        echo "</tr>\n";
      }
 
-     DoubleTableEnd();
+     echo DoubleTableEnd();
      echo $this->getHidden();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo "</form>\n";
      echo "</center>\n";
      echo $this->setFocus("login.uname");
@@ -138,7 +138,7 @@
      if ($motd != "" && (0 < filesize(getcwd()."/".$motd)) ) {
        echo "<p />\n";
        echo "<center>\n";
-       DoubleTableStart();
+       echo DoubleTableStart();
        echo " <tr><th>". $lang['MOTD'] ."</th></tr>\n";
        echo " <tr><td class=\"motd\"><pre>\n";
        if ( function_exists('is_executable') && is_executable(getcwd()."/".$motd) ) {
@@ -150,7 +150,7 @@
          }
        }
        echo "</pre></td></tr>\n";
-       DoubleTableEnd();
+       echo DoubleTableEnd();
        echo "</center>\n";
      }
    }
@@ -217,4 +217,4 @@
      }
    }
 }
-?>
+?>
\ No newline at end of file

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- product_show.php	9 Dec 2006 19:44:45 -0000	1.114
+++ product_show.php	2 Jan 2007 19:59:56 -0000	1.115
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -166,9 +166,9 @@
      #
      # Show additional custom fields
      #
-	 show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+	 echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
-     appointment::infolist($this->user,$this->obj,4,$this->format);
+     echo appointment::infolist($this->user,$this->obj,4,$this->format);
 
      if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
        $this->obj->readTasks();
@@ -205,10 +205,9 @@
          echo "</tr>\n";
        }
      }
-
-     product::infolist($this->user,$this->obj,4,$this->format);
+     echo product::infolist($this->user,$this->obj,4,$this->format);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
 
      if ( $this->user->feature_ok(usetimetrack,PERM_SEE) ) {
        $timesum = 0.0;

Index: mail_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail_new.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mail_new.php	11 Jul 2006 06:57:31 -0000	1.39
+++ mail_new.php	2 Jan 2007 19:59:56 -0000	1.40
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -20,7 +20,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("mail","new");
+ loadmodules('mail','new');
  loadlayout();
 
  /**
@@ -33,7 +33,7 @@
    Function info() {
      global $tutos,$lang;
 
-     echo "<form name=\"mailnew\" enctype=\"multipart/form-data\" action=\"mail_ins.php\" method=\"post\">\n";
+     echo "<form id=\"mailnew\" name=\"mailnew\" enctype=\"multipart/form-data\" action=\"mail_ins.php\" method=\"post\">\n";
      $this->addHidden("gotourl","mail_new.php");
      echo $this->DataTableStart();
 
@@ -110,10 +110,10 @@
        echo "</tr>\n";
      }
      echo "<tr>\n";
-     submit_reset(0,1,1,1,1,0);
+     echo submit_reset(0,1,1,1,1,0);
      echo "</tr>\n";
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- task_show.php	9 Dec 2006 19:44:45 -0000	1.81
+++ task_show.php	2 Jan 2007 19:59:56 -0000	1.82
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -143,7 +143,7 @@
      #
      # Show additional custom fields
      #
-     show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
      $this->obj->readTasks();
      if ( count($this->obj->tasklist) > 0 ) {
@@ -219,7 +219,7 @@
      }
 
      # References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
 
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
@@ -235,7 +235,7 @@
 
      $s = Round($p * 20);
 
-     DoubleTableStart(1,0);
+     echo DoubleTableStart(1,0);
      echo " <tr>\n";
      echo '  <th colspan="3">'. sprintf($lang['TaskCompleted'],$c) ."</th>\n";
      echo " </tr>\n";
@@ -258,7 +258,7 @@
      }
  
      echo " </tr>\n";
-     DoubleTableEnd();
+     echo DoubleTableEnd();
    }
    /**
     * navigate

Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- department.pinc	24 Jul 2006 15:34:04 -0000	1.67
+++ department.pinc	2 Jan 2007 19:59:56 -0000	1.68
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -295,21 +295,23 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     department::obj_read($obj);
     if ( count($obj->list[usedepartment]) > 0 ) {
-      echo "<tr>\n";
-      echo $user->layout->showfield($lang['Departments']);
-      echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+      $r .= "<tr>\n";
+      $r .= $user->layout->showfield($lang['Departments']);
+      $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
       $pre = "";
       foreach($obj->list[usedepartment] as $i => $f) {
-        echo $pre . $obj->list[usedepartment][$i]->getLink($obj->list[usedepartment][$i]->name) ."\n";
+        $r .= $pre . $obj->list[usedepartment][$i]->getLink($obj->list[usedepartment][$i]->name) ."\n";
         $pre = "<br />\n";
       }
-      echo " </td>\n";
-      echo "</tr>\n";
+      $r .= " </td>\n";
+      $r .= "</tr>\n";
     }
+    return $r;
   }
   /**
    * create a link where a departmenty could be added

Index: mailchoose.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailchoose.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mailchoose.php	4 Jul 2006 14:29:36 -0000	1.1
+++ mailchoose.php	2 Jan 2007 19:59:56 -0000	1.2
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2005 by Gero Kohnert
+ *  Copyright 2000 - 2007 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   
@@ -58,7 +58,7 @@
 			echo " <td><input type=\"text\" name=\"sname\"/></td>\n";
 			echo " <input type=\"hidden\" name=\"action\" value=\"sname\"/>\n";
 			echo "</tr><tr>\n";
-			submit_reset(0,0,1,0,0,0);
+			echo submit_reset(0,0,1,0,0,0);
 			echo "</tr>\n";
 		}
 		if ($this->action == "sname") {
@@ -73,7 +73,7 @@
 			echo " </select></td>\n";
 			echo "<input type=\"hidden\" name=\"action\" value=\"smail\" />";
 			echo "</tr><tr>\n";
-			submit_reset(0,0,1,0,0,0);
+			echo submit_reset(0,0,1,0,0,0);
 			echo "</tr>\n";
 		}
 		if ($this->action == "smail") {
@@ -95,7 +95,7 @@
 		echo "<input type=\"hidden\" name=\"id\" value=\"".$_REQUEST['id']."\" />";
 
 		echo $this->DataTableEnd();
-		hiddenFormElements();
+		echo hiddenFormElements();
 		echo $this->getHidden();
 		echo "</form>\n";
 	}

Index: task_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_select.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- task_select.php	16 Dec 2006 13:08:18 -0000	1.4
+++ task_select.php	2 Jan 2007 19:59:56 -0000	1.5
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2003 - 2006 by Gero Kohnert
+ *  Copyright 2003 - 2007 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,8 +30,8 @@
      global $lang , $tutos;
 
      echo "<br /><br />\n";
-     echo "<form name=\"tasksearch\" action=\"task_overview.php\" method=\"get\">\n";
-     DoubleTableStart();
+     echo "<form id=\"tasksearch\" name=\"tasksearch\" action=\"task_overview.php\" method=\"get\">\n";
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == 0 ) {
@@ -81,8 +81,8 @@
        echo " </td>\n";
      }
      echo "</tr>\n";
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo "</form>\n";
 
      echo $this->setfocus("tasksearch.name");

Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- app_new_r.php	25 Nov 2006 14:47:15 -0000	1.60
+++ app_new_r.php	2 Jan 2007 19:59:56 -0000	1.61
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -170,14 +170,14 @@
      if ( $this->obj->mod_ok() ) {
        echo "</tr><tr>\n";
        if ( $this->obj->id > 0 ) {
-         submit_reset(0,1,2,1,2,0);
+         echo submit_reset(0,1,2,1,2,0);
        } else {
-         submit_reset(0,-1,2,1,2,0);
+         echo submit_reset(0,-1,2,1,2,0);
        }
      }
      echo "</tr>\n";
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- address_tools.p3	25 Jul 2006 11:19:55 -0000	1.88
+++ address_tools.p3	2 Jan 2007 19:59:56 -0000	1.89
@@ -272,7 +272,7 @@
      $layout->flds++;
    }
 
-   echo show_custom_overview_headers($layout,'address');
+   echo show_custom_overview_headers($layout,'address',$atool['link2']);
 
    if ( ($tutos[massupdate] == 1) && !empty($target) ) {
      echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";

Index: product_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_select.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- product_select.php	16 Dec 2006 13:08:18 -0000	1.33
+++ product_select.php	2 Jan 2007 19:59:56 -0000	1.34
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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,9 +30,9 @@
 
      echo "<br /><br />\n";
 
-     echo " <form name=\"prodsearch1\" method=\"get\" action=\"product_overview.php\">\n";
-     hiddenFormElements();
-     DoubleTableStart();
+     echo " <form id=\"prodsearch1\" name=\"prodsearch1\" method=\"get\" action=\"product_overview.php\">\n";
+     echo hiddenFormElements();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == 0 ) {
@@ -79,7 +79,7 @@
      }
      echo "</tr>\n";
 
-     DoubleTableEnd();
+     echo DoubleTableEnd();
      echo " </form>\n";
      echo $this->setfocus("prodsearch1.name");
    }

Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- admin_sync.php	16 Dec 2006 13:08:16 -0000	1.36
+++ admin_sync.php	2 Jan 2007 19:59:56 -0000	1.37
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2006 by Gero Kohnert
+ *  Copyright 2001 - 2007 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   
@@ -571,7 +571,7 @@
      echo "</tr>\n";
 
      echo "</table>\n";
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- address_new.php	25 Nov 2006 14:47:15 -0000	1.82
+++ address_new.php	2 Jan 2007 19:59:56 -0000	1.83
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -149,12 +149,12 @@
      }
      if ( $this->modadr ) {
        # References to modules
-       module_addforms($this->user,$this->obj,4);
+       echo module_addforms($this->user,$this->obj,4);
      }
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
    }
    /**
@@ -200,14 +200,14 @@
 
      echo "<tr>\n";
      if ( $this->obj->id > 0 ) {
-       submit_reset(0,1,1,1,1,0);
+       echo submit_reset(0,1,1,1,1,0);
      } else {
-       submit_reset(0,-1,1,1,1,0);
+       echo submit_reset(0,-1,1,1,1,0);
      }
      echo "</tr>\n";
      echo $this->DataTableEnd();
      echo $this->getHidden();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->setfocus("adrnew.lname");
      echo $this->markBadFields();
      echo "</form>\n";
@@ -298,7 +298,7 @@
 
        if ( $this->obj->mod_ok()  ) {
          if ( count($this->obj->location) > 0 ) {
-           DoubleTableStart();
+           echo DoubleTableStart();
            foreach ($this->obj->location as $i => $f) {
              echo '<tr><th colspan="2">'. sprintf($lang['AdrLocTitle'],myentities($f->lname)) ."</th></tr>\n";
              echo "<tr>\n";
@@ -319,7 +319,7 @@
              echo " </td>\n";
              echo "</tr>\n";
            }
-           DoubleTableEnd();
+           echo DoubleTableEnd();
          }
          echo menulink('address_new.php?id='. $this->obj->id ."&amp;loc_id=-1",$lang['AdrLNew'],sprintf($lang['AdrLNewInfo'],$this->obj->getFullName())) ."<br />";
        }

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- department_show.php	9 Dec 2006 19:44:44 -0000	1.62
+++ department_show.php	2 Jan 2007 19:59:56 -0000	1.63
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -41,7 +41,7 @@
        $cols = 3;
      }
 
-	 $this->width = $cols;
+     $this->width = $cols;
      echo $this->DataTableStart();
      echo $this->headline_gui();
      echo $this->CreatorInfoLine($this->obj,$this->width);
@@ -86,11 +86,11 @@
      $ra->free();
 
      # Project Roles
-     product::infolist($this->user,$this->obj,$cols,$this->format);
+     echo product::infolist($this->user,$this->obj,$cols,$this->format);
      # Older Appointments
-     appointment::infolist($this->user,$this->obj,$cols,$this->format);
+     echo appointment::infolist($this->user,$this->obj,$cols,$this->format);
      # References to modules
-     show_module_infolists($this->user,$this->obj,$cols,$this->format);
+     echo show_module_infolists($this->user,$this->obj,$cols,$this->format);
 
      echo $this->obj->getHistoryLink($cols);
      echo $this->DataTableEnd();
@@ -110,11 +110,11 @@
        if ( $_GET['action'] == -2 ) {
          $this->dbconn->Begin("WORK");
          $this->dbconn->Commit("WORK");
-	   }
-	 }
+       }
+     }
      if (class_exists('watchlist')) {
        watchlist::parse_action($this->user);
-	 }
+     }
 
      if ( $_GET['action'] == -4 ) {
        $this->redirect = acl_action();
@@ -231,4 +231,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: task_import_csv.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_import_csv.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- task_import_csv.php	16 Dec 2006 13:08:18 -0000	1.20
+++ task_import_csv.php	2 Jan 2007 19:59:56 -0000	1.21
@@ -246,7 +246,7 @@
      }
      echo $this->DataTableEnd();
      if( ! $this->import ) {
-       hiddenFormElements();
+       echo hiddenFormElements();
        echo $this->getHidden();
        echo "</form>";
      }
@@ -348,7 +348,7 @@
        echo "</tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

Index: database_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_show.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- database_show.php	22 May 2005 14:23:41 -0000	1.38
+++ database_show.php	2 Jan 2007 19:59:56 -0000	1.39
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2005 by Gero Kohnert
+ *  Copyright 2001 - 2007 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","show");
+ loadmodules('database','show');
  loadlayout();
  /**
   * display a database
@@ -111,8 +111,13 @@
 
      echo "</tr>\n";
 
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+
      # References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
    }
@@ -179,4 +184,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: database_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_new.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- database_new.php	25 Nov 2006 08:48:10 -0000	1.32
+++ database_new.php	2 Jan 2007 19:59:56 -0000	1.33
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2006 by Gero Kohnert
+ *  Copyright 2001 - 2007 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   
@@ -158,18 +158,18 @@
      echo "</tr>\n";
 
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      echo "<tr>\n";
      if ($this->obj->id > 0 ) {
-       submit_reset(0,1,1,1,1,0);
+       echo submit_reset(0,1,1,1,1,0);
      } else {
-       submit_reset(0,-1,1,1,1,0);
+       echo submit_reset(0,-1,1,1,1,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- acl_new.php	28 Jan 2006 22:39:05 -0000	1.37
+++ acl_new.php	2 Jan 2007 19:59:56 -0000	1.38
@@ -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   
@@ -180,11 +180,11 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     submit_reset(0,1,1,1,1,4);
+     echo submit_reset(0,1,1,1,1,4);
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

Index: calendar_day.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_day.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- calendar_day.php	16 Dec 2006 13:08:16 -0000	1.37
+++ calendar_day.php	2 Jan 2007 19:59:56 -0000	1.38
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002-2006 by Gero Kohnert
+ *  Copyright 2002-2007 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   
@@ -195,7 +195,7 @@
        echo " </tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- address_show.php	19 Nov 2006 17:44:42 -0000	1.104
+++ address_show.php	2 Jan 2007 19:59:56 -0000	1.105
@@ -117,9 +117,9 @@
      #
      # Show additional custom fields
      #
-     show_custom_fields($this,$this->obj->gettype(),$this->obj,$cols);
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,$cols);
      # References to modules
-     show_module_infolists($this->user,$this->obj,$cols,$this->format);
+     echo show_module_infolists($this->user,$this->obj,$cols,$this->format);
      
      # Location's Header and Direkt Links to Modify and Delete
      echo "<tr><td></td></tr>\n";
@@ -142,9 +142,9 @@
      Show_LocFields($this->user,$lang['State'],$this->obj,"state",1);
      Show_LocFields($this->user,$lang['Country'],$this->obj,"country",1);
 
-     team::infolist($this->user,$this->obj,$cols,$this->format);
-     product::infolist($this->user,$this->obj,$cols,$this->format);
-     appointment::infolist($this->user,$this->obj,$cols,$this->format);
+     echo team::infolist($this->user,$this->obj,$cols,$this->format);
+     echo product::infolist($this->user,$this->obj,$cols,$this->format);
+     echo appointment::infolist($this->user,$this->obj,$cols,$this->format);
 
      echo $this->obj->getHistoryLink($cols);
      echo $this->DataTableEnd();

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- product_new.php	28 Dec 2006 20:23:43 -0000	1.102
+++ product_new.php	2 Jan 2007 19:59:56 -0000	1.103
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 by Gero Kohnert
  *  cloning option added by Michal Salaban 2003
  *
  *  This program is free software; you can redistribute it and/or modify it 
@@ -266,19 +266,19 @@
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,5);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,5);
      # References to modules
-     module_addforms($this->user,$this->obj,5);
+     echo module_addforms($this->user,$this->obj,5);
 
      echo "<tr>\n";
      if ( $this->obj->id != -1 ) {
-       submit_reset(0,1,1,1,1,1);
+       echo submit_reset(0,1,1,1,1,1);
      } else {
-       submit_reset(0,-1,1,1,1,1);
+       echo submit_reset(0,-1,1,1,1,1);
      }
      echo "</tr>\n";
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: res_cal_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal_select.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- res_cal_select.php	1 May 2005 15:24:37 -0000	1.3
+++ res_cal_select.php	2 Jan 2007 19:59:56 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -27,9 +27,9 @@
 
      echo "<br /><br />\n";
 
-     echo "<form name=\"res_cal_sel\" method=\"get\" action=\"res_cal.php\">\n";
-     hiddenFormElements();
-     DoubleTableStart();
+     echo "<form id=\"res_cal_sel\" name=\"res_cal_sel\" method=\"get\" action=\"res_cal.php\">\n";
+     echo hiddenFormElements();
+     echo DoubleTableStart();
      echo "<tr>\n";
      echo " <th colspan=\"3\">". "RESCAL".$this->base->getLink() ."</th>\n";
      echo "</tr>\n";
@@ -82,7 +82,7 @@
      echo " </td>\n";
      echo "</tr>\n";
 
-     DoubleTableEnd();
+     echo DoubleTableEnd();
      echo $this->getHidden();
      echo "</form>\n";
 

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- webelements.p3	16 Dec 2006 13:08:18 -0000	1.307
+++ webelements.p3	2 Jan 2007 19:59:56 -0000	1.308
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -596,15 +596,19 @@
  * The start of a double table
  */
 Function DoubleTableStart($innersp = 0, $innerpad = 2) {
-  echo "<table class=\"outer\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\"><tr><td class=\"warn\">\n";
-  echo "<table class=\"inner\" border=\"0\" cellpadding=\"". $innerpad ."\" cellspacing=\"". $innersp ."\">\n";
+  $r = '';
+  $r .= "<table class=\"outer\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\"><tr><td class=\"warn\">\n";
+  $r .= "<table class=\"inner\" border=\"0\" cellpadding=\"". $innerpad ."\" cellspacing=\"". $innersp ."\">\n";
+  return $r;
 }
 /*
  * The start of a double table
  */
 Function DoubleTableEnd() {
-  echo "</table>\n";
-  echo "</td></tr></table>\n";
+  $r = '';
+  $r .= "</table>\n";
+  $r .= "</td></tr></table>\n";
+  return $r;
 }
 
 /**
@@ -838,27 +842,29 @@
  Function hiddenFormElements() {
    global $tutos;
 
+   $r = '';
    if ( isset($_GET['lg']) && ($_GET['lg'] != '') ) {
-     echo '  <input type="hidden" name="lg" value="'. $_GET['lg'] ."\" />\n";
+     $r .= '  <input type="hidden" name="lg" value="'. $_GET['lg'] ."\" />\n";
    } else if ( isset($_POST['lg']) && ($_POST['lg'] != '') ) {
-     echo '  <input type="hidden" name="lg" value="'. $_POST['lg'] ."\" />\n";
+     $r .= '  <input type="hidden" name="lg" value="'. $_POST['lg'] ."\" />\n";
    }
    if ( isset($_GET['ly']) && ($_GET['ly'] != '') ) {
-     echo '  <input type="hidden" name="ly" value="'. $_GET['ly'] ."\" />\n";
+     $r .= '  <input type="hidden" name="ly" value="'. $_GET['ly'] ."\" />\n";
    } else if ( isset($_POST['ly']) && ($_POST['ly'] != '') ) {
-     echo '  <input type="hidden" name="ly" value="'. $_POST['ly'] ."\" />\n";
+     $r .= '  <input type="hidden" name="ly" value="'. $_POST['ly'] ."\" />\n";
    }
    if ( isset($_GET['th']) && ($_GET['th'] != '') ) {
-     echo '  <input type="hidden" name="th" value="'. $_GET['th'] ."\" />\n";
+     $r .= '  <input type="hidden" name="th" value="'. $_GET['th'] ."\" />\n";
    } else if ( isset($_POST['th']) && ($_POST['th'] != '') ) {
-     echo '  <input type="hidden" name="th" value="'. $_POST['th'] ."\" />\n";
+     $r .= '  <input type="hidden" name="th" value="'. $_POST['th'] ."\" />\n";
    }
 
    if ( (isset($tutos['SESSID'])) && (!isset($_COOKIE['TUTOS'])) ) {
      if ( SID != '' ) {
-       echo '  <input type="hidden" name="'. session_name() .'" value="'. session_id()  ."\" />\n";
+       $r .= '  <input type="hidden" name="'. session_name() .'" value="'. session_id()  ."\" />\n";
      }
    }
+   return $r;
  }
 /**
  * create a link in navigation menu
@@ -1538,29 +1544,33 @@
  Function submit_reset($pre,$t1,$f1,$t2,$f2,$post,$) {
    global $lang;
 
+   $r = '';
    if ( $pre > 0 ) {
-     echo " <td colspan=\"".$pre."\">&nbsp;</td>\n";
+     $r .= ' <td colspan="'.$pre."\">&nbsp;</td>\n";
    }
    if ( $t1 > 0 ) {
-     echo " <td class=\"desc\" colspan=\"".$t1."\"><label for=\"OK\">". $lang['ChangesOk'] ."</label>&nbsp;</td>\n";
-   }
-   if ( $t1 < 0 ) {
-     echo " <td class=\"desc\" colspan=\"". abs($t1) ."\"><label for=\"OK\">". $lang['InputOk'] ."</label>&nbsp;</td>\n";
+     $r .= ' <td class="desc" colspan="'.$t1.'"><label for="OK">'. $lang['ChangesOk'] ."</label>&nbsp;</td>\n";
+   } else if ( $t1 < 0 ) {
+     $r .= ' <td class="desc" colspan="'. abs($t1) .'"><label for="OK">'. $lang['InputOk'] ."</label>&nbsp;</td>\n";
    }
+
    if ( $f1 > 0 && $ '') {
-     echo " <td colspan=\"".$f1."\">&nbsp;<input id=\"OK\" name=\"OK\" type=\"submit\" value=\"". $lang['Enter'] ."\" title=\"". $lang['Enter'] ."\" /></td>\n";
+     $r .= ' <td colspan="'.$f1.'">&nbsp;<input id="OK" name="OK" type="submit" value="'. $lang['Enter'] ."\" title=\"". $lang['Enter'] ."\" /></td>\n";
    } else if ($f1 > 0 && $onclick != '') {
-     echo " <td colspan=\"".$f1."\">&nbsp;<input id=\"OK\" name=\"OK\" "". $onclick . "\" type=\"submit\" value=\"". $lang['Enter'] ."\" title=\"". $lang['Enter'] ."\" /></td>\n";
+     $r .= ' <td colspan="'.$f1.'">&nbsp;<input id="OK" name="OK"  type="submit" value="'. $lang['Enter'] .'" title="'. $lang['Enter'] ."\" /></td>\n";
    }
+
    if ( $t2 > 0 ) {
-     echo " <td class=\"desc\" colspan=\"".$t2."\" align=\"right\">&nbsp;<label for=\"RESET\">". $lang['Reset'] ."</label>&nbsp;</td>\n";
+     $r .= ' <td class="desc" colspan="'.$t2.'" align="right">&nbsp;<label for="RESET">'. $lang['Reset'] ."</label>&nbsp;</td>\n";
    }
+
    if ( $f2 > 0 ) {
-     echo " <td colspan=\"".$f2."\">&nbsp;<input id=\"RESET\" name=\"RESET\" type=\"reset\" value=\"". $lang['Reset'] ."\" title=\"". $lang['Reset']."\" /></td>\n";
+     $r .= ' <td colspan="'.$f2.'">&nbsp;<input id="RESET" name="RESET" type="reset" value="'. $lang['Reset'] .'" title="'. $lang['Reset']."\" /></td>\n";
    }
    if ( $post > 0 ) {
-     echo " <td colspan=\"".$post."\">&nbsp;</td>\n";
+     $r .= ' <td colspan="'.$post."\">&nbsp;</td>\n";
    }
+   return $r;
  }
  /**
   * parse and use the values form the order-header function (see below)

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- company_show.php	9 Dec 2006 19:44:44 -0000	1.79
+++ company_show.php	2 Jan 2007 19:59:56 -0000	1.80
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -51,7 +51,7 @@
        $cols = 3;
      }
 
-	 $this->width = $cols;
+     $this->width = $cols;
      echo $this->DataTableStart();
      echo $this->headline_gui();
      echo $this->CreatorInfoLine($this->obj,$this->width);
@@ -79,7 +79,7 @@
      echo $this->showdata(myentities($this->obj->revenue),($cols -1));
      echo "</tr>\n";
 
-     department::infolist($this->user,$this->obj,$cols,$this->format);
+     echo department::infolist($this->user,$this->obj,$cols,$this->format);
 
      # Locations
      if ( isset($this->obj->location) && count($this->obj->location) > 0 ) {
@@ -122,11 +122,11 @@
      $ra->free();
 
      # Older Appointments
-     appointment::infolist($this->user,$this->obj,$cols,$this->format);
+     echo appointment::infolist($this->user,$this->obj,$cols,$this->format);
      # Project Roles
-     product::infolist($this->user,$this->obj,$cols,$this->format);
+     echo product::infolist($this->user,$this->obj,$cols,$this->format);
      # References to modules
-     show_module_infolists($this->user,$this->obj,$cols,$this->format);
+     echo show_module_infolists($this->user,$this->obj,$cols,$this->format);
 
      echo $this->obj->getHistoryLink($cols);
      echo $this->DataTableEnd();
@@ -271,4 +271,4 @@
  $l = new company_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
+?>
\ No newline at end of file

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- address.pinc	16 Dec 2006 13:08:16 -0000	1.120
+++ address.pinc	2 Jan 2007 19:59:56 -0000	1.121
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -605,4 +605,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: product_role_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_role_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- product_role_new.php	19 Nov 2006 17:44:42 -0000	1.8
+++ product_role_new.php	2 Jan 2007 19:59:56 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2004 by Gero Kohnert
+ * Copyright 1999 - 2007 by Gero Kohnert
  * cloning option added by Michal Salaban 2003
  *
  * create a new product_role or modify/clone an existing one
@@ -121,14 +121,14 @@
      }
      echo "<tr>\n";
      if ( $this->obj->id != -1 ) {
-       submit_reset(0,1,1,1,1,1);
+       echo submit_reset(0,1,1,1,1,1);
      } else {
-       submit_reset(0,-1,1,1,1,1);
+       echo submit_reset(0,-1,1,1,1,1);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("productroleadd.name");

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- res_cal.php	16 Dec 2006 13:08:18 -0000	1.42
+++ res_cal.php	2 Jan 2007 19:59:56 -0000	1.43
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -78,7 +78,7 @@
        $t = MkTime(0,0,0,$m,$i,$y);
        $dinfo = GetDaysInfo($t);
        $link = addUrlParameter($url,"t=".sprintf("%04d%02d%02d",$y,$m,$i));
-       echo " <td class=\"". $dinfo[color] ." monthday\">". makelink($link,sprintf("%02d",$i)) ."</td>\n";
+       echo ' <td class="'. $dinfo[color] .' monthday">'. makelink($link,sprintf("%02d",$i)) ."</td>\n";
      }
      echo "</tr>\n";
 
@@ -354,7 +354,7 @@
      echo $this->start->enterMonth('s');
      echo $this->start->enterYear('s');
      echo ' <input type="submit" value="GO" />'."\n";
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- product_overview.php	16 Dec 2006 13:08:17 -0000	1.115
+++ product_overview.php	2 Jan 2007 19:59:56 -0000	1.116
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -653,7 +653,7 @@
        echo "}\n";
        echo "//-->\n";
        echo "</script>\n";
-       DoubleTableStart(0,0);
+       echo DoubleTableStart(0,0);
        echo "<tr><th>". $lang['ProdFields'] ."</th></tr>\n";
        foreach ($tutos[prodfields] as $i => $c) {
          if ( ! isset($this->flds[$c]) ) {
@@ -672,8 +672,8 @@
        echo "</td></tr>\n";
 
        echo "<tr><td><input type=\"submit\" value=\"". $lang['show'] ."\" /></td></tr>\n";
-       DoubleTableEnd();
-       hiddenFormElements();
+       echo DoubleTableEnd();
+       echo hiddenFormElements();
        echo $this->getHidden();
        echo "</form>\n";
        echo "</td></tr>";

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- timetrack_new.php	16 Dec 2006 13:08:18 -0000	1.71
+++ timetrack_new.php	2 Jan 2007 19:59:56 -0000	1.72
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -163,9 +163,9 @@
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
      # References to modules
-     module_addforms($this->user,$this->obj,6);
+     echo module_addforms($this->user,$this->obj,6);
 
      echo "<tr>\n";
      echo $this->showfield($lang['Description'],1,"desc");
@@ -174,14 +174,14 @@
 
      echo "<tr>\n";
      if ( $this->obj->id != -1 ) {
-       submit_reset(0,1,1,1,3,0);
+       echo submit_reset(0,1,1,1,3,0);
      } else {
-       submit_reset(0,-1,1,1,3,0);
+       echo submit_reset(0,-1,1,1,3,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- product.pinc	16 Dec 2006 13:08:17 -0000	1.158
+++ product.pinc	2 Jan 2007 19:59:56 -0000	1.159
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -890,35 +890,37 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang,$tutos;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(useprojects,PERM_SEE) ) {
-      return;
+      return $r;
     }
     product::obj_read($obj);
     foreach ($obj->prolist as $role => $y) {
       if ( count($obj->prolist[$role]) > 0 ) {
-        echo "<tr>\n";
-        echo $user->layout->showfield($lang['Product'] .": ".$lang['ProdRole'][$role]);
-        echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+        $r .= "<tr>\n";
+        $r .= $user->layout->showfield($lang['Product'] .": ".$lang['ProdRole'][$role]);
+        $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
         $pre = "";
         $x = count ($obj->prolist[$role]);
         $n = 0;
         foreach ($obj->prolist[$role] as $x1 => $y1) {
           if ( ($n >= $tutos[maxshort]) && ($x != $tutos[maxshort]) && ($this->format != "paper") ) {
             $l = "product_overview.php?role=". $role ."&rid[]=". $obj->id;
-            echo  $pre.$user->layout->theme->getImage(folder,'list') ." ". makelink($l,sprintf($lang['AllEntries'], count($obj->prolist[$role])));
+            $r .=  $pre.$user->layout->theme->getImage(folder,'list') ." ". makelink($l,sprintf($lang['AllEntries'], count($obj->prolist[$role])));
             break;
           }
           $l = $obj->prolist[$role][$x1]->roledesc[$role][$obj->id];
-          echo $pre. $obj->prolist[$role][$x1]->getLink() . ($l == "" ? "":" ( ". myentities($l) ." )");
+          $r .= $pre. $obj->prolist[$role][$x1]->getLink() . ($l == "" ? "":" ( ". myentities($l) ." )");
           $pre = "<br />\n";
           $n++;
         }
-        echo " </td>\n";
-        echo "</tr>\n";
+        $r .= " </td>\n";
+        $r .= "</tr>\n";
       }
     }
+    return $r;
   }
   /**
    * a object that has to do with projects is deleted
@@ -938,15 +940,17 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
+    $r = '';
     if ( ! $user->feature_ok(useprojects,PERM_SEE) ) {
-      return;
+      return $r;
     }
 
     if ( $obj->product != -1 ) {
-      echo "<tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"right\">";
-      echo "&#8594;&nbsp;". $obj->product->getLink();
-      echo "</td></tr>\n";
+      $r .= "<tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"right\">";
+      $r .= "&#8594;&nbsp;". $obj->product->getLink();
+      $r .= "</td></tr>\n";
     }
+    return $r;
   }
   /**
    * create a link to a search page
@@ -1041,7 +1045,7 @@
     $r .= "<li>". makelink("help.php?p=product_show",$lang["show"],$lang["show"]) ."</li>\n";
     $r .= "<li>". makelink("help.php?p=product_overview",$lang['ProductsOverview'],$lang['ProductsOverview'])."</li>\n";
     $r .= "</ul>\n";
-    echo $r;
+    return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- app_new.php	25 Nov 2006 14:47:15 -0000	1.71
+++ app_new.php	2 Jan 2007 19:59:56 -0000	1.72
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -177,26 +177,26 @@
      echo " </label></td>\n";
 
      # reminder email
-     echo " <td colspan=\"3\" class=\"desc\"><label for=\"remember\">". $lang['AppEmailRemind'] ."</label><br />\n";
+     echo ' <td colspan="3" class="desc"><label for="remember">'. $lang['AppEmailRemind'] ."</label><br />\n";
      echo SelectLangArray('remember','AppRemind',$this->obj->remember);
      echo " </td>\n";
      echo " </tr>\n";
 
-     module_addforms($this->user,$this->obj,6);
+     echo module_addforms($this->user,$this->obj,6);
 
      if ( $this->obj->allowed != 0 ) {
        echo "<tr>\n";
 
        if ( $this->obj->id > 0 ) {
-         submit_reset(0,1,2,1,2,0);
+         echo submit_reset(0,1,2,1,2,0);
        } else {
-         submit_reset(0,-1,2,1,2,0);
+         echo submit_reset(0,-1,2,1,2,0);
        }
        echo "</tr>\n";
      }
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- calendar.php	16 Dec 2006 13:08:16 -0000	1.88
+++ calendar.php	2 Jan 2007 19:59:56 -0000	1.89
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -241,7 +241,7 @@
 
      echo " </tr>\n";
      echo "</table>\n";
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- department_new.php	25 Nov 2006 14:47:15 -0000	1.63
+++ department_new.php	2 Jan 2007 19:59:56 -0000	1.64
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -47,12 +47,12 @@
      echo "<tr>\n";
      echo $this->showfieldc($lang['Company'],1,"cfn");
      echo "<td colspan=\"4\">\n";
-     select_from_array_or_input($this->obj,"c",$this->obj->company,0,'c');
+     echo select_from_array_or_input($this->obj,"c",$this->obj->company,0,'c');
      echo "</td>\n";
      echo "</tr>\n";
 
      # References to modules
-     module_addforms($this->user,$this->obj,$this->width);
+     echo module_addforms($this->user,$this->obj,$this->width);
 
      if ( $this->loc->id > -1)  {
        echo '<tr><td colspan="5" align="right">&nbsp;';
@@ -67,14 +67,14 @@
 
      echo "<tr>\n";
      if ($this->obj->id > 0 ) {
-       submit_reset(0,1,1,1,1,1);
+       echo submit_reset(0,1,1,1,1,1);
      } else {
-       submit_reset(0,-1,1,1,1,1);
+       echo submit_reset(0,-1,1,1,1,1);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";
@@ -91,7 +91,7 @@
 
      if ( $this->obj->mod_ok()  ) {
        if ( isset($this->obj->loc) && count($this->obj->loc) ) {
-         DoubleTableStart();
+         echo DoubleTableStart();
          foreach($this->obj->location as $i => $f) {
            echo "<tr><th colspan=\"2\">". sprintf($lang['AdrLocTitle'],$f->lname) ."</th></tr>\n";
            echo "<tr>";
@@ -110,7 +110,7 @@
            echo "</td>\n";
            echo "</tr>\n";
          }
-         DoubleTableEnd();
+         echo DoubleTableEnd();
        }
        if ( $this->obj->id > 0  ) {
          echo menulink("department_new.php?id=". $this->obj->id ."&loc_id=-1",$lang['AdrLNew'],sprintf($lang['AdrLNewInfo'],$this->obj->getFullName())) ."<br />";

Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- team_new.php	9 Dec 2006 19:44:45 -0000	1.55
+++ team_new.php	2 Jan 2007 19:59:56 -0000	1.56
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -86,7 +86,7 @@
          echo $this->OverviewRowStart($line);
          echo "<td>".  $f->getLink($f->getFullName()) ."</td>";
          if ( $this->obj->owner->id == $i ) {
-           echo "<td valign=\"top\"><i>". $lang['TeamManager'] ."</i></td>\n";
+           echo '<td valign="top"><i>'. $lang['TeamManager'] ."</i></td>\n";
          } else {
            echo '<td valign="top">'. $lang['Delete'] .'<input type="checkbox" id="del_fld" name="del[]" value="'. $i ."\" /></td>\n";
          }
@@ -157,25 +157,25 @@
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,8);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,8);
 
-     module_addforms($this->user,$this->obj,8);
+     echo module_addforms($this->user,$this->obj,8);
 
      # Feature Permisssions
-     permission_form($this,$this->user,$this->obj);
+     echo permission_form($this,$this->user,$this->obj);
 
      echo "<tr>\n";
      if ( $this->obj->id == 0 ) {
        echo "<td colspan=\"8\"><span class=\"warn\">". $lang['Err0021'] ."</span><td>";
      } elseif ( $this->obj->id == -1 ) {
-       submit_reset(0,-1,3,1,3,0);
+       echo submit_reset(0,-1,3,1,3,0);
      } else {
-       submit_reset(0,1,3,1,3,0);
+       echo submit_reset(0,1,3,1,3,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- appointment.pinc	28 Dec 2006 20:23:43 -0000	1.198
+++ appointment.pinc	2 Jan 2007 19:59:56 -0000	1.199
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -352,6 +352,7 @@
 function showApps(&$user,&$obj,$cols,$ext = 0,$rows = 0) {
   global $tutos, $lang;
 
+  $r = '';
   $n = 1;
   $xx = $obj->applist;
   $x = count($xx);
@@ -366,34 +367,35 @@
   @reset ($xx);
   while ( list ($i,$f) = @each ($xx) ) {
     if ( $cols > 0 ) {
-      echo "<tr><td colspan=\"". $cols ."\">\n";
+      $r .= "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x > $rows ) ) {
-      echo  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("app_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->applist)));
+      $r .=  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("app_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->applist)));
       if ( $cols > 0 ) {
-        echo "</td></tr>\n";
+        $r .= "</td></tr>\n";
       }
       break;
     }
-    echo $f->getLink();
+    $r .= $f->getLink();
     if ( ($ext == 1) && ($f->product->id != -1) ) {
-      echo "&nbsp;&#8594;&nbsp;". $f->product->getLink();
+      $r .= "&nbsp;&#8594;&nbsp;". $f->product->getLink();
     }
     if ( ($ext == 2) && ($f->visitor != -1) ) {
-      echo "&nbsp;";
+      $r .= "&nbsp;";
       if ( $f->outside ) {
-        echo $lang['VisitAt'] .":&nbsp;";
+        $r .= $lang['VisitAt'] .":&nbsp;";
       } else {
-        echo $lang['VisitFrom'] .":&nbsp;";
+        $r .= $lang['VisitFrom'] .":&nbsp;";
       }
-      echo $f->visitor->getLink();
+      $r .= $f->visitor->getLink();
     }
-    echo "<br />\n";
+    $r .= "<br />\n";
     if ( $cols > 0 ) {
-      echo "</td></tr>\n";
+      $r .= "</td></tr>\n";
     }
     $n++;
   }
+  return $r;
 }
 
 
@@ -1394,10 +1396,10 @@
         echo "<br />". $this->visitor->getLink() ."</td></tr>\n";
       }
 
-      product::small_infolist($current_user,$this,3,$class);
+      echo product::small_infolist($current_user,$this,3,$class);
       foreach($tutos[activemodules] as $i => $f) {
         $x = new $tutos[modules][$f][name]($this->dbconn);
-        $x->small_infolist($current_user,$this,3,$class);
+        echo $x->small_infolist($current_user,$this,3,$class);
       }
     }
     return;
@@ -1667,27 +1669,29 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
+    $r = '';
     if ( ! $user->feature_ok(usecalendar,PERM_SEE) ) {
-      return;
+      return $r;
     }
     appointment::obj_read($obj);
     if ( count($obj->applist) > 0 ) {
-       @reset($obj->applist);
-       echo "<tr>\n";
-       echo $user->layout->showfield($lang['Appointments']);
-       echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
-       $ext = 0;
-       if ($obj->getType() == "product") {
-         $ext = 2;
-       } 
-       if ( $format == "paper" ) {
-         showApps($user,$obj,0,$ext,-1);
-       } else {
-         showApps($user,$obj,0,$ext);
-       }
-       echo " </td>\n";
-       echo "</tr>\n";
+      @reset($obj->applist);
+      $r .= "<tr>\n";
+      $r .= $user->layout->showfield($lang['Appointments']);
+      $r .= ' <td valign="top" colspan="'.($cols-1)."\">\n";
+      $ext = 0;
+      if ($obj->getType() == "product") {
+        $ext = 2;
+      } 
+      if ( $format == "paper" ) {
+        $r .= showApps($user,$obj,0,$ext,-1);
+      } else {
+        $r .= showApps($user,$obj,0,$ext);
+      }
+      $r .= " </td>\n";
+      $r .= "</tr>\n";
     }
+    return $r;
   }
   /**
    * method called from check service

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- custom.pinc	16 Dec 2006 13:08:16 -0000	1.11
+++ custom.pinc	2 Jan 2007 19:59:56 -0000	1.12
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -69,7 +69,7 @@
  /**
   * header for overviews
   */
- function show_custom_overview_headers(&$layout,$section) {
+ function show_custom_overview_headers(&$layout,$section,$base) {
    global $table,$lang;
 
    $r ='';
@@ -80,7 +80,13 @@
      if (isset($tx['overview']) && ($tx['overview'] == false) ) continue;
      if (!isset($tx['ftype'])) $tx['ftype'] = '';
 
-     $r .= $layout->orderHeader('',myentities(isset($lang[$tx['lang']]) ? $lang[$tx['lang']]:$tx['lang']),'');
+     if (isset($tx['sortable']) && ($tx['sortable'] == true) ) {
+       $sortby = $ti;
+     } else {
+       $sortby = '';
+     }
+
+     $r .= $layout->orderHeader($sortby,myentities(isset($lang[$tx['lang']]) ? $lang[$tx['lang']]:$tx['lang']),$base);
      $layout->flds++;
    }
 #   die ("XXXX".$section);
@@ -115,22 +121,24 @@
  function show_custom_fields(&$layout,$section,&$obj,$cols) {
    global $table,$lang;
 
-   if (!isset($table[$section])) return;
+   $r = '';
+   if (!isset($table[$section])) return $r;
 
    foreach($table[$section] as $i => $x) {
+#    echo $section .' '.$i .' '.$x.'<br>';
      if (!is_array($x)) continue;
      if (!isset($x['custom'])) continue;
      if (!$x['custom']) continue;
      if (!isset($x['ftype'])) $x['ftype'] = '';
      $fld = '_fld_'.$i;
-
-     echo "<tr>\n";
-     echo $layout->showfield(myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']));
-     echo "  <td colspan=\"".($cols-1)."\">\n";
-     echo get_custom_field($x,$obj->$fld);
-     echo "  </td>\n";
-     echo "</tr>\n";
+     $r .= "<tr>\n";
+     $r .= $layout->showfield(myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']));
+     $r .= '  <td colspan="'.($cols-1)."\">\n";
+     $r .= get_custom_field($x,$obj->$fld);
+     $r .= "  </td>\n";
+     $r .= "</tr>\n";
    }
+   return $r;
  }
  /**
   * edit custom database fields (called by the new scripts)
@@ -142,7 +150,8 @@
  function edit_custom_fields(&$layout,$section,&$obj,$cols) {
    global $table,$lang,$tutos;
 
-   if (!isset($table[$section])) return;
+   $r = '';
+   if (!isset($table[$section])) return $r;
 
    foreach($table[$section] as $i => $x) {
      if (!is_array($x)) continue;
@@ -154,51 +163,52 @@
      $fld = "_fld_".$i;
      $parsename = $section ."_". $i;
 
-     echo "<tr>\n";
-     echo $layout->showfield(myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']),$x['required']
-							,($x['ftype'] == 'Date' ? $parsename.'_d':$parsename));
+     $r .= "<tr>\n";
+     $r .= $layout->showfield(myentities(isset($lang[$x['lang']]) ? $lang[$x['lang']]:$x['lang']),$x['required']
+                            ,($x['ftype'] == 'Date' ? $parsename.'_d':$parsename));
      if ($x['ftype'] == 'Date') {
-       echo " <td colspan=\"".($cols-1)."\">\n";
+       $r .= ' <td colspan="'.($cols...
 
[truncated message content]

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

Modified Files:
	checkfield_new.php checkfield_overview.php checkfield_show.php 
	checklist.pinc checklist_new.php checklist_show.php 
Log Message:
various html fixes

Index: checklist_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_show.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- checklist_show.php	22 May 2005 14:23:42 -0000	1.11
+++ checklist_show.php	2 Jan 2007 19:59:57 -0000	1.12
@@ -1,7 +1,7 @@
 <?php
 /*
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2002 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2007 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   
@@ -78,14 +78,18 @@
        echo "</tr>";
      }
 
-     checkfield::infolist($this->user,$this->obj,4,$this->format);
+     echo checkfield::infolist($this->user,$this->obj,4,$this->format);
      echo "<tr>\n";
      echo $this->showfield($lang['ChecklistCntFields']);
      echo $this->showdata(sprintf("%4d",count($this->obj->checkfields)),3);
      echo "</tr>";
 
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
    }
@@ -156,4 +160,4 @@
 // CVS Info:  $Id$
 // $Author$
 
-?>
+?>
\ No newline at end of file

Index: checkfield_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_new.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- checkfield_new.php	17 Apr 2005 18:17:00 -0000	1.7
+++ checkfield_new.php	2 Jan 2007 19:59:57 -0000	1.8
@@ -1,7 +1,7 @@
 <?php
 /**
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2002 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2007 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   
@@ -20,7 +20,7 @@
 
 /* Check if user is allowed to use it */
 check_user();
-loadmodule("checklist");
+loadmodule('checklist');
 loadlayout();
 /**
  * display a checkfield create/modify form
@@ -32,7 +32,7 @@
   Function info() {
     global $tutos,$lang;
 
-    echo "<form name=\"checkfieldnew\" action=\"checkfield_ins.php\" method=\"post\">\n";
+    echo "<form id=\"checkfieldnew\" name=\"checkfieldnew\" action=\"checkfield_ins.php\" method=\"post\">\n";
     echo $this->DataTableStart();
 
     echo "<tr><th colspan=\"4\">";
@@ -76,18 +76,18 @@
     echo "</tr>\n";
 
     // References to modules
-    module_addforms($this->user,$this->obj,4);
+    echo module_addforms($this->user,$this->obj,4);
     if ( ($this->obj->id < 0) || ( $this->obj->mod_ok())) {
       echo "<tr>\n";
       if ($this->obj->id > 0 ) {
-        submit_reset(0,1,1,1,1,0);
+        echo submit_reset(0,1,1,1,1,0);
       } else {
-        submit_reset(0,-1,1,1,1,0);
+        echo submit_reset(0,-1,1,1,1,0);
       }
       echo "</tr>\n";
     }
     echo $this->DataTableEnd();
-    hiddenFormElements();
+    echo hiddenFormElements();
     echo $this->getHidden();
     echo "</form>\n";
     echo $this->setfocus("checkfieldnew.name");

Index: checklist_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_new.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- checklist_new.php	23 Apr 2005 13:18:22 -0000	1.12
+++ checklist_new.php	2 Jan 2007 19:59:57 -0000	1.13
@@ -1,7 +1,7 @@
 <?php
 /*
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2002 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2007 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("checklist","new");
- loadmodule("checklist");
+ loadmodules('checklist','new');
+ loadmodule('checklist');
  loadlayout();
  /**
   * display a checklist create/modify form
@@ -32,7 +32,7 @@
    Function info() {
      global $tutos,$lang;
 
-     echo "<form name=\"checklistnew\" action=\"checklist_ins.php\" method=\"post\">\n";
+     echo "<for id=\"checklistnew\" name=\"checklistnew\" action=\"checklist_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
      echo "<tr>\n";
      echo " <th colspan=\"4\">".  sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
@@ -80,19 +80,19 @@
      echo "</tr>\n";
 
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      if ( $this->obj->mod_ok() != 0 ) {
        echo "<tr>\n";
        if ($this->obj->id > 0 ) {
-         submit_reset(0,1,1,1,1,0);
+         echo submit_reset(0,1,1,1,1,0);
        } else {
-         submit_reset(0,-1,1,1,1,0);
+         echo submit_reset(0,-1,1,1,1,0);
        }
        echo "</tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("checklistnew.name");

Index: checkfield_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_overview.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- checkfield_overview.php	24 Jul 2006 15:34:07 -0000	1.26
+++ checkfield_overview.php	2 Jan 2007 19:59:57 -0000	1.27
@@ -1,7 +1,7 @@
 <?php
 /**
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2002 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2007 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   
@@ -118,10 +118,10 @@
         $this->addHidden("checklist_ins","from_editor");
       }
       echo "<tr>\n";
-      submit_reset(0,-1,2,0,0,0);
+      echo submit_reset(0,-1,2,0,0,0);
       echo "</tr>\n";
       echo $this->OverviewTableEnd();
-      hiddenFormElements();
+      echo hiddenFormElements();
       echo $this->getHidden();
       echo "</form>\n";
     } else {
@@ -165,7 +165,7 @@
           echo "<td valign=\"top\">". 
           makelink("checklist/checklist_ins.php?move=up&id=".$c->link_id."&fid=".$c->id ,$this->theme->getImage(up,'list'),sprintf($lang['CheckfieldPosUp'],"none2u")) .
           makelink("checklist/checklist_ins.php?move=down&id=".$c->link_id."&fid=".$c->id ,$this->theme->getImage(down,'list'),sprintf($lang['CheckfieldPosDown'],"none2d")) .
-	"</td>";
+    "</td>";
         }
         echo "<td valign=\"top\">". $c->getLink() ."</td>";
         echo "<td valign=\"top\">". $c->getObjType() ."</td>";
@@ -266,4 +266,4 @@
 $l = new checkfield_overview($current_user);
 $l->display();
 $dbconn->Close();
-?>
+?>
\ No newline at end of file

Index: checkfield_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_show.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- checkfield_show.php	22 May 2005 14:23:42 -0000	1.9
+++ checkfield_show.php	2 Jan 2007 19:59:57 -0000	1.10
@@ -1,7 +1,7 @@
 <?php
 /**
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2002 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2007 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   
@@ -62,10 +62,14 @@
      echo $this->showdata(myentities($this->obj->help_text),3);
      echo "</tr>\n";
 
-     checkfield::infolist($this->user,$this->obj,4,$this->format);
+     echo checkfield::infolist($this->user,$this->obj,4,$this->format);
 
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
    }
@@ -121,4 +125,4 @@
 // CVS Info:  $Id$
 //  $Author$
 
-?>
+?>
\ No newline at end of file

Index: checklist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist.pinc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- checklist.pinc	28 Dec 2006 20:23:43 -0000	1.30
+++ checklist.pinc	2 Jan 2007 19:59:57 -0000	1.31
@@ -1,7 +1,7 @@
 <?php
 /*
  *  Checklist: Copyright 2002 by Markus Leist under GNU GPL
- *  TUTOS:     Copyright 1999 - 2006 by Gero Kohnert
+ *  TUTOS:     Copyright 1999 - 2007 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   
@@ -527,7 +527,7 @@
     if ( $this->class_id > 0 ) {
       $tmp_cl_class = new checklist( $this->dbconn);
       $tmp_cl_class = $tmp_cl_class->read( $this->class_id,$tmp_cl_class);
-      if (!is_object($tmp_cl_class) || $tmp_cl_class == -1) {
+      if (!is_object($tmp_cl_class) || $tmp_cl_class->id == -1) {
         return "&nbsp;";
       }
       $tmp_string = $tmp_cl_class->getLink();

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

Modified Files:
	file.pinc file_massimport.php file_new.php file_overview.php 
	file_select.php file_show.php 
Log Message:
various html fixes

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- file_new.php	25 Nov 2006 14:47:15 -0000	1.22
+++ file_new.php	2 Jan 2007 19:59:57 -0000	1.23
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2006 by Gero Kohnert
+ *  Copyright 2000 - 2007 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   
@@ -157,20 +157,20 @@
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      echo "<tr>\n";
      if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-       submit_reset(0,1,1,1,1,0);
+       echo submit_reset(0,1,1,1,1,0);
      } else {
-       submit_reset(0,-1,1,1,1,0);
+       echo submit_reset(0,-1,1,1,1,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      $this->addHidden("gotourl","file/file_new.php");
      echo $this->getHidden();
      echo $this->markBadFields();

Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_show.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- file_show.php	28 Jan 2006 19:35:02 -0000	1.24
+++ file_show.php	2 Jan 2007 19:59:57 -0000	1.25
@@ -197,9 +197,9 @@
      #
      # Show additional custom fields
      #
-	 show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+	 echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
    }

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- file.pinc	28 Jan 2006 19:35:02 -0000	1.63
+++ file.pinc	2 Jan 2007 19:59:57 -0000	1.64
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -74,6 +74,7 @@
 function show_Files(&$user,&$obj,$rows) {
   global $tutos,$lang;
 
+  $r = '';
   $n = 1;
   $x = count($obj->list[usedocmanagement]);
 
@@ -86,12 +87,13 @@
 
   foreach ($obj->list[usedocmanagement] as $i => $f) {
     if ( ($n >= $rows) && ( $x != $rows ) ) {
-      echo  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("file/file_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usedocmanagement])));
+      $r .=  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("file/file_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usedocmanagement])));
       break;
     }
-    echo "  ". $user->layout->theme->getImage(paper,'list') ." ". $f->getLink() ."<br />\n";
+    $r .= "  ". $user->layout->theme->getImage(paper,'list') ." ". $f->getLink() ."<br />\n";
     $n++;
   }
+  return $r;
 }
 
 /**
@@ -196,9 +198,9 @@
     $this->version     = $r->get($pos, "version");
     $this->logtxt      = $r->get($pos, "logtxt");
     $this->adr_pic     = $r->get($pos, "adr_pic");
-	if ($this->adr_pic == "") {
+    if ($this->adr_pic == "") {
       $this->adr_pic   = 0;
-	}
+    }
     $this->locked      = $r->get($pos, "locked");
     if ( $this->locked > 0 ) {
       $this->locker     = getObject($this->dbconn,$this->locked);
@@ -1061,23 +1063,25 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(usedocmanagement,PERM_SEE) ) {
-      return;
+      return $r;
     }
 
     tutos_file::obj_read($obj);
     if ( count($obj->list[usedocmanagement]) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"right\">";
+    $r .= "<tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"right\">";
     $sep = "";
     foreach ($obj->list[usedocmanagement] as $x) {
-      echo $sep.$lang['File'] ."&nbsp;". $x->getLink();
+      $r .= $sep.$lang['File'] ."&nbsp;". $x->getLink();
       $sep = "<br />\n";
     }
-    echo "</td></tr>\n";
+    $r .= "</td></tr>\n";
+    return $r;
   }
   /**
    * create a list of documents for the given object and given user
@@ -1085,25 +1089,27 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(usedocmanagement,PERM_SEE) ) {
-      return;
+      return $r;
     }
     tutos_file::obj_read($obj);
     if ( count($obj->list[usedocmanagement]) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr>\n";
-    echo $user->layout->showfield($lang['Files']);
-    echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+    $r .= "<tr>\n";
+    $r .= $user->layout->showfield($lang['Files']);
+    $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
     if ( $format == "paper" ) {
-      show_Files($user,$obj,-1);
+      $r .= show_Files($user,$obj,-1);
     } else {
-      show_Files($user,$obj,0);
+      $r .= show_Files($user,$obj,0);
     }
-    echo " </td>\n";
-    echo "</tr>\n";
+    $r .= " </td>\n";
+    $r .= "</tr>\n";
+    return $r;
   }
   /**
    * create a link where a note to for the given object could be added
@@ -1217,4 +1223,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: file_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_select.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- file_select.php	16 Dec 2006 13:08:27 -0000	1.8
+++ file_select.php	2 Jan 2007 19:59:57 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2006 by Gero Kohnert
+ *  Copyright 2001 - 2007 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   
@@ -34,8 +34,8 @@
      echo "<br /><br/>\n";
 
      echo "<form id=\"filesearch\" name=\"filesearch\" method=\"get\" action=\"file_overview.php\">\n";
-     hiddenFormElements();
-     DoubleTableStart();
+     echo hiddenFormElements();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == 0 ) {
@@ -70,7 +70,7 @@
        echo "&nbsp;</td>\n";
      }
      echo "</tr>\n";
-     DoubleTableEnd();
+     echo DoubleTableEnd();
      echo "</form>\n";
 
      echo $this->setfocus("filesearch.name");

Index: file_massimport.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_massimport.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- file_massimport.php	17 Apr 2005 18:17:02 -0000	1.2
+++ file_massimport.php	2 Jan 2007 19:59:57 -0000	1.3
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2005 by Gero Kohnert
+ *  Copyright 2000 - 2007 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,7 +33,7 @@
    Function info() {
      global $tutos,$lang,$table;
 
-     echo "<form name=\"fileimport\" method=\"get\" action=\"file_massimport.php\">\n";
+     echo "<form id=\"fileimport\" name=\"fileimport\" method=\"get\" action=\"file_massimport.php\">\n";
      echo $this->DataTableStart();
 
      echo "<tr>\n".$this->mode;
@@ -72,15 +72,15 @@
 
      echo "<tr>\n";
      if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-       submit_reset(0,1,1,1,1,0);
+       echo submit_reset(0,1,1,1,1,0);
      } else {
-       submit_reset(0,-1,1,1,1,0);
+       echo submit_reset(0,-1,1,1,1,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
      $this->addHidden("mark","dummy");
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $lang['FldsRequired'] ."\n";
@@ -193,17 +193,17 @@
 
          if ( eregi("\.doc$",$obj->filename) ) {
            $obj->filetype = "application/msword";
-		 } else if ( eregi("\.xls$",$obj->filename) ) {
+         } else if ( eregi("\.xls$",$obj->filename) ) {
            $obj->filetype = "application/vnd-ms-excel";
-		 } else if ( eregi("\.pdf$",$obj->filename) ) {
+         } else if ( eregi("\.pdf$",$obj->filename) ) {
            $obj->filetype = "application/pdf";
-		 } else if ( eregi("\.gif$",$obj->filename) ) {
+         } else if ( eregi("\.gif$",$obj->filename) ) {
            $obj->filetype = "image/gif";
-		 } else if ( eregi("\.jp[e]g$",$obj->filename) ) {
+         } else if ( eregi("\.jp[e]g$",$obj->filename) ) {
            $obj->filetype = "image/jpeg";
-		 } else {
+         } else {
            $obj->filetype = "plain/text";
-		 }
+         }
 
          $obj->logtxt = "automated initial import from ".$this->serverpath."/".$f ;
          $obj->vsys = FILE_RCS;

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- file_overview.php	16 Dec 2006 13:08:27 -0000	1.23
+++ file_overview.php	2 Jan 2007 19:59:57 -0000	1.24
@@ -54,7 +54,7 @@
      echo $this->orderHeader("f_size",$lang['FileSize'],$this->link2);
      echo $this->orderHeader("creation",$lang['created'],$this->link2);
      $this->flds = 6;
-     echo show_custom_overview_headers($this,'file');
+     echo show_custom_overview_headers($this,'file',$this->link2);
      if ( $tutos[massupdate] == 1 ) {
        echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
      }

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

Modified Files:
	bug.pinc bug_new.php bug_overview.php bug_select.php 
	bug_show.php 
Log Message:
various html fixes

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- bug_show.php	21 Oct 2006 18:15:13 -0000	1.21
+++ bug_show.php	2 Jan 2007 19:59:57 -0000	1.22
@@ -123,9 +123,9 @@
      #
      # Show additional custom fields
      #
-     show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
-     show_module_infolists($this->user,$this->obj,4,$this->format);
+     echo show_module_infolists($this->user,$this->obj,4,$this->format);
 
      echo $this->DataTableEnd();
    }

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- bug_new.php	28 Dec 2006 20:23:43 -0000	1.27
+++ bug_new.php	2 Jan 2007 19:59:57 -0000	1.28
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -215,21 +215,21 @@
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,5);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,5);
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      if ( $this->obj->mod_ok() != 0 ) {
        echo "<tr>\n";
        if ($this->obj->id > 0 ) {
-         submit_reset(0,1,1,1,1,0);
+         echo submit_reset(0,1,1,1,1,0);
        } else {
-         submit_reset(0,-1,1,1,1,0);
+         echo submit_reset(0,-1,1,1,1,0);
        }
        echo "</tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- bug_overview.php	16 Dec 2006 13:08:23 -0000	1.27
+++ bug_overview.php	2 Jan 2007 19:59:57 -0000	1.28
@@ -175,7 +175,7 @@
      echo $this->orderHeader("reporter",$lang['BugReportedFrom'],$this->link2);
      echo $this->orderHeader("",$lang['BugAssignedTo'],$this->link2);
      $this->flds = 10;
-     echo show_custom_overview_headers($this,'bug');
+     echo show_custom_overview_headers($this,'bug',$this->link2);
 
      if ( $tutos[massupdate] == 1 ) {
        echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- bug.pinc	16 Dec 2006 13:08:23 -0000	1.44
+++ bug.pinc	2 Jan 2007 19:59:57 -0000	1.45
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -1026,19 +1026,21 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang,$tutos;
 
+    $r = '';
     if ( ! $user->feature_ok(usebugtracking,PERM_SEE) ) {
-      return;
+      return $r;
     }
     bug::obj_read($obj);
     if ( count($obj->list[usebugtracking]) > 0 ) {
-      echo "<tr>\n";
-      echo $user->layout->showfield($lang['Bugs']);
-      echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
-      echo bugSummary($obj);
-      echo $user->layout->theme->getImage(folder,'list') ." ". makelink("bugtracking/bug_overview.php?show=all&amp;pid=".$obj->id,$lang['BugsOverview'] );
-      echo "</td>\n";
-      echo "</tr>\n";
+      $r .= "<tr>\n";
+      $r .= $user->layout->showfield($lang['Bugs']);
+      $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+      $r .= bugSummary($obj);
+      $r .= $user->layout->theme->getImage(folder,'list') ." ". makelink("bugtracking/bug_overview.php?show=all&amp;pid=".$obj->id,$lang['BugsOverview'] );
+      $r .= "</td>\n";
+      $r .= "</tr>\n";
     }
+    return $r;
   }
   /**
    * create a link where a bug for the given object could be added
@@ -1215,4 +1217,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: bug_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_select.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bug_select.php	16 Dec 2006 13:08:23 -0000	1.8
+++ bug_select.php	2 Jan 2007 19:59:57 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -34,8 +34,8 @@
 
      echo "<br /><br />\n";
 
-     echo "<form name=\"bugsearch\" name=\"bugsearch\" method=\"get\" action=\"bug_overview.php\">\n";
-     DoubleTableStart();
+     echo "<form id=\"bugsearch\" name=\"bugsearch\" method=\"get\" action=\"bug_overview.php\">\n";
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == 0 ) {
@@ -88,8 +88,8 @@
      }
 
      echo "</tr>\n";
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo "</form>\n";
 
      echo $this->setfocus("bugsearch.name");

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

Modified Files:
	expense.pinc expense_new.php expense_select.php 
	expense_show.php 
Log Message:
various html fixes

Index: expense_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_show.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- expense_show.php	19 Nov 2006 09:26:45 -0000	1.6
+++ expense_show.php	2 Jan 2007 19:59:57 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2007 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   
@@ -148,8 +148,12 @@
        echo "</tr>\n";
      }
      
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4);
+     echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
 
      echo $this->DataTableEnd();

Index: expense.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- expense.pinc	16 Dec 2006 13:08:26 -0000	1.12
+++ expense.pinc	2 Jan 2007 19:59:57 -0000	1.13
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2007 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   
@@ -18,6 +18,7 @@
 function showExpenses(&$user,&$obj,$cols,$rows = 0) {
   global $tutos,$lang,$table;
 
+  $r = '';
   $n = 1;
   $x = count($obj->expenselist);
 
@@ -38,19 +39,20 @@
   for($x=0;$x<count($currbox);$x++){
     $q = "SELECT SUM(gamount) as XX FROM ". $obj->dbconn->prefix .$table['expense'][name];
     $q .= " WHERE currency = '". $currbox[$x] ."' AND link_id = ". $obj->id;
-    $r = $obj->dbconn->Exec($q);
-    $n = $r->numrows();
+    $rs = $obj->dbconn->Exec($q);
+    $n = $rs->numrows();
     if ( $n == 0 ) {
       return;
     }
-    $gamount = $r->get(0,"XX");
-    $r->free();
-    echo makelink("expense/expense_overview.php?link_id=". $obj->id ."&amp;currency=". $currbox[$x],
+    $gamount = $rs->get(0,"XX");
+    $rs->free();
+    $r .= makelink("expense/expense_overview.php?link_id=". $obj->id ."&amp;currency=". $currbox[$x],
          number_format($gamount,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $currbox[$x]) 
          ." (". $lang['ExpenseGAmountAll'] .")<br />\n";
   }
-  echo $user->layout->theme->getImage(folder,'list') 
+  $r .= $user->layout->theme->getImage(folder,'list') 
        ." ". makelink("expense/expense_overview.php?show=all&amp;link_id=". $obj->id,$lang['ExpenseOverview']);
+  return $r;
 }
 /**
  * ask a expense category
@@ -721,25 +723,27 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
+    $r = '';
     if (! is_object($obj) ) return;
 
     if ( ! $user->feature_ok(useexpenses,PERM_SEE) ) {
-      return;
+      return $r;
     }
     expense::obj_read($obj);
     if ( count($obj->expenselist) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr>\n";
-    echo $user->layout->showfield($lang['Expenses']);
-    echo " <td valign=\"top\" colspan=".($cols-1).">\n";
+    $r .= "<tr>\n";
+    $r .= $user->layout->showfield($lang['Expenses']);
+    $r .= " <td valign=\"top\" colspan=".($cols-1).">\n";
     if ( $format == "paper" ) {
-      showExpenses($user,$obj,0,-1);
+      $r .= showExpenses($user,$obj,0,-1);
     } else {
-      showExpenses($user,$obj,0);
+      $r .= showExpenses($user,$obj,0);
     }
-    echo " </td>\n";
-    echo "</tr>\n";
+    $r .= " </td>\n";
+    $r .= "</tr>\n";
+    return $r;
   }
   /**
    * create a smalllist of expenses attached to the given object
@@ -747,22 +751,24 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(useexpenses,PERM_SEE) ) {
-      return;
+      return $r;
     }
     expense::obj_read($obj);
     if ( count($obj->expenselist) > 0 ) {
       $sep = "";
-      echo "  <tr><td class=\"". $class ."\" colspan=". $cols ." align=\"left\">";
+      $r .= "  <tr><td class=\"". $class ."\" colspan=". $cols ." align=\"left\">";
       foreach ($obj->expenselist as $i => $f) {
-        echo $sep . "-" . $f->getLink();
+        $r .= $sep . "-" . $f->getLink();
         $sep = "<br />\n";
       }
-          unset($f);
-      echo "</td></tr>\n";
+      unset($f);
+      $r .= "</td></tr>\n";
     }
+    return $r;
   }
   /**
    * create a link where a expense to for the given object could be added

Index: expense_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_new.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- expense_new.php	25 Nov 2006 14:47:15 -0000	1.7
+++ expense_new.php	2 Jan 2007 19:59:57 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2007 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   
@@ -157,18 +157,18 @@
      echo "</tr>\n";
      
      # References to modules
-     module_addforms($this->user,$this->obj,6);
+     echo module_addforms($this->user,$this->obj,6);
 
      echo "<tr>\n";
      if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-       submit_reset(0,1,2,1,2,0);
+       echo submit_reset(0,1,2,1,2,0);
      } else {
-       submit_reset(0,-1,2,1,2,0);
+       echo submit_reset(0,-1,2,1,2,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("expensenew.name");

Index: expense_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/expense_select.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- expense_select.php	16 Dec 2006 13:08:26 -0000	1.5
+++ expense_select.php	2 Jan 2007 19:59:57 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert and ECOsoft.net
+ *  Copyright 1999 - 2007 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   
@@ -37,7 +37,7 @@
      if ( $this->ext == false ) {
        $this->addHidden("reftype",0);
      }
-     DoubleTableStart();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == false ) {
@@ -86,8 +86,8 @@
 
      echo "</tr>\n";
 
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("expensesearch.name");

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

Modified Files:
	table_custom_example.pinc 
Log Message:
various html fixes

Index: table_custom_example.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table_custom_example.pinc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- table_custom_example.pinc	1 Dec 2005 21:05:14 -0000	1.14
+++ table_custom_example.pinc	2 Jan 2007 19:59:57 -0000	1.15
@@ -10,7 +10,7 @@
 # This is just an example file.
 # The real file should be named tutos/php/db/table_custom.pinc
 #
-# You can extend the fileds taht are diplayed and used within TUTOS
+# You can extend the fields taht are diplayed and used within TUTOS
 #
 #
 #
@@ -32,9 +32,10 @@
 #               type     => TS_TYPE (== DateTime)
 #                           TX_TYPE (== long text)
 #                           VARCHAR (== text with given size)
-#                          'default_today' => true or false (needs type = TS:TYPE),
+#                          'default_today' => true or false (needs type = TS_TYPE),
 #              'handler' => the class of handler to use for the field
 #                           (like phone,money,city,country,fax,geodata)
+#              'overview' => true      show in overviews
 
 # Add a additional text field called desc3  to the project table
 #
@@ -172,7 +173,7 @@
                                    type         => "ID_TYPE",
                                    constraints  => "",
                                    Desc         => "yes/no",
-                                   'lang'       => "YES/NO",
+                                   'lang'       => "Closed ?",
                                    'overview'   => false,                 # show in overview
                                    'required'   => true
                                   );
@@ -187,6 +188,7 @@
                                    Desc         => "Document State",
                                    'lang'       => "DOCSTATUS",
                                    'overview'   => true,                 # show in overview
+                                   'sortable'   => true,                 # show in overview as sortable
                                    'required'   => true
                                   );
 
@@ -212,5 +214,18 @@
                                    'overview'   => true,                 # show in overview
                                    'required'   => false
                                   );
+#
+# Example in installations
+#
+$table['installation']['gurantee']   = array('custom'     => true,
+                                   'ftype'      => 'Boolean', 
+                                   type         => "ID_TYPE",
+                                   constraints  => "",
+                                   Desc         => "with gurantee",
+                                   'lang'       => "Gurantee sold",
+                                   'overview'   => true,                 # show in overview
+                                   'sortable'   => true,                 # show in overview as sortable
+                                   'required'   => false
+                                  );
 
 ?>
\ No newline at end of file

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

Modified Files:
	fax_new.php 
Log Message:
various html fixes

Index: fax_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fax/fax_new.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fax_new.php	16 Dec 2006 13:08:27 -0000	1.3
+++ fax_new.php	2 Jan 2007 19:59:57 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2006 by Gero Kohnert
+ * Copyright 1999 - 2007 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   
@@ -60,11 +60,11 @@
        }
      }
      echo "<tr>\n";
-     submit_reset(0,-1,2,1,2,0);
+     echo submit_reset(0,-1,2,1,2,0);
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
    }

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

Modified Files:
	create_config.php 
Log Message:
various html fixes

Index: create_config.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/create_config.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- create_config.php	23 Apr 2005 13:18:22 -0000	1.4
+++ create_config.php	2 Jan 2007 19:59:56 -0000	1.5
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001-2005 by Gero Kohnert
+ *  Copyright 2001-2007 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   
@@ -437,11 +437,11 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     submit_reset(0,-1,1,1,1,0);
+     echo submit_reset(0,-1,1,1,1,0);
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("confignew.name");

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

Modified Files:
	ToDo 
Log Message:
various html fixes

Index: ToDo
===================================================================
RCS file: /cvsroot/tutos/tutos/ToDo,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ToDo	28 Dec 2006 20:23:43 -0000	1.49
+++ ToDo	2 Jan 2007 19:59:55 -0000	1.50
@@ -280,6 +280,8 @@
 A flag to force SSL mode (at least for login)
 
 use of  FCKEditor http://www.fckeditor.net
+
+use of UTF8 encoding
 #
 #
 # EOF

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

Modified Files:
	classic_base.pinc layout_base.pinc new_layout.pinc 
Log Message:
various html fixes

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- new_layout.pinc	9 Dec 2006 19:44:45 -0000	1.68
+++ new_layout.pinc	2 Jan 2007 19:59:58 -0000	1.69
@@ -220,7 +220,7 @@
     $r = '';
     if ( $tutos[massupdate] == 1 ) {
       $r .= $this->getHidden();
-      hiddenFormElements();
+      $r .= hiddenFormElements();
       $r .= "</form>\n";
     }
     return $r;

Index: classic_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/classic_base.pinc,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- classic_base.pinc	16 Dec 2006 13:08:27 -0000	1.52
+++ classic_base.pinc	2 Jan 2007 19:59:58 -0000	1.53
@@ -269,7 +269,7 @@
     $r = "";
     if ( $tutos[massupdate] == 1 ) {
       $r .= $this->getHidden();
-      hiddenFormElements();
+      $r .= hiddenFormElements();
       $r .= "</form>";
     }
     return $r;

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- layout_base.pinc	9 Dec 2006 19:44:45 -0000	1.40
+++ layout_base.pinc	2 Jan 2007 19:59:58 -0000	1.41
@@ -49,6 +49,7 @@
     } else {
       $this->start = 0;
     }
+    $this->flds = 0;
     $this->center = false;
     $this->stop = false;
     $this->nomenu = false;
@@ -455,7 +456,7 @@
 	}
     $r .= " </th>\n";
     $r .= $this->showGuiIcons(' <th class="icons">',' </th>',$this->obj,$this->obj,array('mod','del','perm'),false);
-    $r .= "<tr>\n";
+    $r .= "</tr>\n";
     return $r;
   }
 

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

Modified Files:
	xml_new.php 
Log Message:
various html fixes

Index: xml_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/xml/xml_new.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xml_new.php	23 Apr 2005 13:18:27 -0000	1.5
+++ xml_new.php	2 Jan 2007 20:00:00 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2003 - 2005 by Gero Kohnert
+ *  Copyright 2003 - 2007 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   
@@ -34,10 +34,10 @@
    Function info() {
      global $lang,$tutos,$table;
 
-     echo "<form name=\"xmlnew\" enctype=\"multipart/form-data\" action=\"xml_ins.php\" method=\"post\">\n";
+     echo "<form id=\"xmlnew\" name=\"xmlnew\" enctype=\"multipart/form-data\" action=\"xml_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
 
-	 if (isset($_GET['XML'])) {
+     if (isset($_GET['XML'])) {
        echo "<tr>\n";
        echo $this->showfield($lang['XMLoutput'],0);
        echo " <td colspan=\"5\"><pre>". UrlDecode($_SESSION['XML']) ."</pre></td>\n";
@@ -77,11 +77,11 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     submit_reset(0,-1,2,1,2,0);
+     echo submit_reset(0,-1,2,1,2,0);
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
  
@@ -111,7 +111,7 @@
        $this->testonly = StripSlashes($_GET['testonly']);
      } else {
        $this->testonly = 0;
-	 }
+     }
      if ( isset($_GET['dataurl']) ){
        $this->dataurl = StripSlashes($_GET['dataurl']);
      }

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

Modified Files:
	note.pinc note_new.php note_overview.php note_select.php 
	note_show.php 
Log Message:
various html fixes

Index: note_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- note_overview.php	16 Dec 2006 13:08:28 -0000	1.44
+++ note_overview.php	2 Jan 2007 19:59:58 -0000	1.45
@@ -69,7 +69,7 @@
      echo $this->orderHeader("remember",$lang['NoteRemember'],$this->link2);
      echo $this->orderHeader("n.creator",$lang['NoteCreator'],$this->link2);
      $this->flds = 5;
-     echo show_custom_overview_headers($this,'note');
+     echo show_custom_overview_headers($this,'note',$this->link2);
      if ( $tutos[massupdate] == 1 ) {
        echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
      }

Index: note_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_select.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- note_select.php	16 Dec 2006 13:08:28 -0000	1.16
+++ note_select.php	2 Jan 2007 19:59:58 -0000	1.17
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 by Gero Kohnert
  *  submitted by "Nonn" <nonn at resce.com>
  *
  *  This program is free software; you can redistribute it and/or modify it 
@@ -38,7 +38,7 @@
      if ( $this->ext == false ) {
        $this->addHidden("reftype",0);
      }
-     DoubleTableStart();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == false ) {
@@ -87,8 +87,8 @@
 
      echo "</tr>\n";
 
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("notesearch.name");

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- note.pinc	16 Dec 2006 13:08:28 -0000	1.62
+++ note.pinc	2 Jan 2007 19:59:58 -0000	1.63
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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,6 +18,7 @@
 function showNotes(&$user,&$obj,$cols,$rows = 0) {
   global $tutos,$lang;
 
+  $r = '';
   $n = 1;
   $x = count($obj->list[usenotes]);
 
@@ -30,22 +31,23 @@
 
   foreach ($obj->list[usenotes] as $i => $f) {
     if ( $cols > 0 ) {
-      echo "<tr><td colspan=\"". $cols ."\">\n";
+      $r .= "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x != $rows ) ) {
-      echo  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("note/note_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usenotes])));
+      $r .=  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("note/note_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usenotes])));
       if ( $cols > 0 ) {
-        echo "</td></tr>\n";
+        $r .= "</td></tr>\n";
       }
       break;
     }
-    echo "  ". $user->layout->theme->getImage(paper,'list') ." ". $f->getLink() ." ". $f->creation->getDateTime();
-    echo " ".($f->creator != -1 ? $f->creator->getLink($f->creator->getShortname()):"")."<br />\n";
+    $r .= "  ". $user->layout->theme->getImage(paper,'list') ." ". $f->getLink() ." ". $f->creation->getDateTime();
+    $r .= " ".($f->creator != -1 ? $f->creator->getLink($f->creator->getShortname()):"")."<br />\n";
     if ( $cols > 0 ) {
-      echo "</td></tr>\n";
+      $r .= "</td></tr>\n";
     }
     $n++;
   }
+  return $r;
 }
 /**
  * ask a note's event type
@@ -66,7 +68,7 @@
     if ( -1 == $default ) {
       $r .= ' selected="selected" ';
     }
-    $r .= ">". $lang['any'] ."</option>\n";
+    $r .= '>'. $lang['any'] ."</option>\n";
   }
   $r .= "</select>\n";
   return $r;
@@ -308,7 +310,7 @@
     $q->addFV("remember",$this->remember,"DATETIME");
     $q->addFV("etype",$this->etype,"INT");
     $q->addFV("link_id",$this->link_id,"INT");
-	$this->save_custom_fields($q);
+    $this->save_custom_fields($q);
 
     if ( $this->id < 0 ) {
       $this->modified = array();
@@ -433,26 +435,28 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if (! is_object($obj) ) return;
-    if ( $obj->id < 0 ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
+    if ( $obj->id < 0 ) return $r;
 
     if ( ! $user->feature_ok(usenotes,PERM_SEE) ) {
-      return;
+      return $r;
     }
     note::obj_read($obj);
     if ( count($obj->list[usenotes]) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr>\n";
-    echo $user->layout->showfield($lang['Notes']);
-    echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+    $r .= "<tr>\n";
+    $r .= $user->layout->showfield($lang['Notes']);
+    $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
     if ( $format == "paper" ) {
-      showNotes($user,$obj,0,-1);
+      $r .= showNotes($user,$obj,0,-1);
     } else {
-      showNotes($user,$obj,0);
+      $r .= showNotes($user,$obj,0);
     }
-    echo " </td>\n";
-    echo "</tr>\n";
+    $r .= " </td>\n";
+    $r .= "</tr>\n";
+    return $r;
   }
   /**
    * create a smalllist of notes attached to the given object
@@ -460,23 +464,25 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if (! is_object($obj) ) return;
-    if ( $obj->id < 0 ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
+    if ( $obj->id < 0 ) return $r;
 
     if ( ! $user->feature_ok(usenotes,PERM_SEE) ) {
-      return;
+      return $r;
     }
     note::obj_read($obj);
     if ( count($obj->list[usenotes]) > 0 ) {
       $sep = "";
-      echo "  <tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"left\">";
+      $r .= "  <tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"left\">";
       foreach ($obj->list[usenotes] as $i => $f) {
-        echo $sep . "-" . $f->getLink();
+        $r .= $sep . "-" . $f->getLink();
         $sep = "<br />\n";
       }
       unset($f);
-      echo "</td></tr>\n";
+      $r .= "</td></tr>\n";
     }
+    return $r;
   }
   /**
    * create a link where a note to for the given object could be added
@@ -698,4 +704,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- note_new.php	25 Nov 2006 08:48:11 -0000	1.36
+++ note_new.php	2 Jan 2007 19:59:58 -0000	1.37
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2006 by Gero Kohnert
+ *  Copyright 2000 - 2007 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,20 +83,20 @@
      #
      # Edit additional custom fields
      #
-     edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
      # References to modules
-     module_addforms($this->user,$this->obj,6);
+     echo module_addforms($this->user,$this->obj,6);
 
      echo "<tr>\n";
      if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-       submit_reset(0,1,2,1,2,0);
+       echo submit_reset(0,1,2,1,2,0);
      } else {
-       submit_reset(0,-1,2,1,2,0);
+       echo submit_reset(0,-1,2,1,2,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: note_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_show.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- note_show.php	28 Jan 2006 19:35:02 -0000	1.36
+++ note_show.php	2 Jan 2007 19:59:58 -0000	1.37
@@ -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   
@@ -68,9 +68,9 @@
      #
      # Show additional custom fields
      #
-     show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4);
+     echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
 
      echo $this->DataTableEnd();

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

Modified Files:
	stuff_new.php stuff_select.php stuff_show.php 
Log Message:
various html fixes

Index: stuff_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_show.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- stuff_show.php	23 Nov 2006 08:57:34 -0000	1.7
+++ stuff_show.php	2 Jan 2007 19:59:59 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2006 by Gero Kohnert
+ *  Copyright 2004 - 2007 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,8 +83,12 @@
 
      echo "</tr>\n";
 
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4);
+     echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
    }

Index: stuff_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_select.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- stuff_select.php	3 Apr 2005 18:32:17 -0000	1.2
+++ stuff_select.php	2 Jan 2007 19:59:59 -0000	1.3
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 2007 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("stuff","select");
- loadmodule("stuff");
+ loadmodules('stuff','select');
+ loadmodule('stuff');
  loadlayout();
 
  /**
@@ -33,8 +33,8 @@
 
      echo "<br /><br />\n";
 
-     echo "<form name=\"stuffsearch\" method=\"get\" action=\"stuff_overview.php\">\n";
-     DoubleTableStart();
+     echo "<form id=\"stuffsearch\" name=\"stuffsearch\" method=\"get\" action=\"stuff_overview.php\">\n";
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      echo "<th colspan=\"3\">". $lang['StuffSearch'] ."</th>\n";
@@ -47,8 +47,8 @@
      echo " </td>\n";
      echo "</tr>\n";
 
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
 

Index: stuff_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- stuff_new.php	25 Nov 2006 14:47:16 -0000	1.8
+++ stuff_new.php	2 Jan 2007 19:59:59 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2004 - 2006 by Gero Kohnert
+ * Copyright 2004 - 2007 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   
@@ -90,21 +90,21 @@
      echo "</tr>\n";
 
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      if ( $this->obj->mod_ok() != 0 ) {
        echo "<tr>\n";
 
        if ($this->obj->id > 0 ) {
-         submit_reset(0,1,1,1,1,0);
+         echo submit_reset(0,1,1,1,1,0);
        } else {
-         submit_reset(0,-1,1,1,1,0);
+         echo submit_reset(0,-1,1,1,1,0);
        }
 
        echo "</tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("stuffnew.name");

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

Modified Files:
	rate.pinc rate_new.php rate_select.php rate_show.php 
Log Message:
various html fixes

Index: rate_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_show.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rate_show.php	19 Nov 2006 09:26:45 -0000	1.8
+++ rate_show.php	2 Jan 2007 19:59:59 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2000 - 2006 by Gero Kohnert and ecosoft
+ *  Copyright 2000 - 2007 by Gero Kohnert and ecosoft
  *
  *  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   
@@ -84,8 +84,12 @@
      echo $this->showdata($this->obj->priority,3);
      echo "</tr>\n";
 
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4);
+     echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
 
      echo $this->DataTableEnd();
@@ -154,4 +158,4 @@
 <!--
     CVS Info: $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: rate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- rate.pinc	2 Jan 2006 08:36:26 -0000	1.33
+++ rate.pinc	2 Jan 2007 19:59:59 -0000	1.34
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert and ecosoft
+ *  Copyright 1999 - 2007 by Gero Kohnert and ecosoft
  *
  *  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,7 +17,8 @@
  */
 function showRates(&$user,&$obj,$cols,$rows = 0) {
   global $tutos,$lang;
-  
+
+  $r = '';  
   $n = 1;
   $x = count($obj->ratelist);
   if ( $rows == 0 ) {
@@ -28,21 +29,22 @@
   }
   foreach ($obj->ratelist as $i => $f) {
     if ( $cols > 0 ) {
-      echo "<tr><td colspan=\"". $cols ."\">\n";
+      $r .= "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x != $rows ) ) {
-      echo  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("rate/rate_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->ratelist)));
+      $r .=  '  '. $user->layout->theme->getImage(folder,'list') ." ". makelink("rate/rate_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->ratelist)));
       if ( $cols > 0 ) {
-        echo "</td></tr>\n";
+        $r .= "</td></tr>\n";
       }
       break;
     }
-    echo "  ". $user->layout->theme->getImage(rate::getHtmlIcon(),'list') ." ". $f->getLink() ." ". number_format($f->cph,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $f->currency ." (". (is_object($f->worker) ? $f->worker->getLink():$lang['HistoryDeleted']) .")<br />\n";
+    $r .= "  ". $user->layout->theme->getImage(rate::getHtmlIcon(),'list') ." ". $f->getLink() ." ". number_format($f->cph,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $f->currency ." (". (is_object($f->worker) ? $f->worker->getLink():$lang['HistoryDeleted']) .")<br />\n";
     if ( $cols > 0 ) {
       echo "</td></tr>\n";
     }
     $n++;
   }
+  return $r;
 }
 /**
  * a rate , attachable nearly everywhere in TUTOS
@@ -542,25 +544,27 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(userates,PERM_SEE) ) {
-      return;
+      return $r;
     }
     rate::obj_read($obj);
     if ( count($obj->ratelist) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr>\n";
-    echo $user->layout->showfield($lang['Rates']);
-    echo " <td valign=\"top\" colspan=".($cols-1).">\n";
+    $r .= "<tr>\n";
+    $r .= $user->layout->showfield($lang['Rates']);
+    $r .= " <td valign=\"top\" colspan=".($cols-1).">\n";
     if ( $format == "paper" ) {
-      showRates($user,$obj,0,-1);
+      $r .= showRates($user,$obj,0,-1);
     } else {
-      showRates($user,$obj,0);
+      $r .= showRates($user,$obj,0);
     }
-    echo " </td>\n";
-    echo "</tr>\n";
+    $r .= " </td>\n";
+    $r .= "</tr>\n";
+    return $r;
   }
   /**
    * create a smalllist of rates attached to the given object
@@ -568,22 +572,24 @@
   function small_infolist (&$user,&$obj,$cols,$class) {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(userates,PERM_SEE) ) {
-      return;
+      return $r;
     }
     rate::obj_read($obj);
     if ( count($obj->ratelist) > 0 ) {
       $sep = "";
-      echo "  <tr><td class=\"". $class ."\" colspan=". $cols ." align=\"left\">";
+      $r .= "  <tr><td class=\"". $class ."\" colspan=". $cols ." align=\"left\">";
       foreach ($obj->ratelist as $i => $f) {
-        echo $sep . "-" . $f->getLink();
+        $r .= $sep . "-" . $f->getLink();
         $sep = "<br />\n";
       }
       unset($f);
-      echo "</td></tr>\n";
+      $r .= "</td></tr>\n";
     }
+    return $r;
   }
   /**
    * create a link where a rate to for the given object could be added
@@ -786,4 +792,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: rate_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_select.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rate_select.php	16 Dec 2006 13:08:28 -0000	1.5
+++ rate_select.php	2 Jan 2007 19:59:59 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2006 by Gero Kohnert
+ *  Copyright 2002 - 2007 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 ( $this->ext == false ) {
        $this->addHidden("reftype",0);
      }
-     DoubleTableStart();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == false ) {
@@ -76,8 +76,8 @@
 
      echo "</tr>\n";
 
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
 

Index: rate_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate_new.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rate_new.php	25 Nov 2006 14:47:15 -0000	1.9
+++ rate_new.php	2 Jan 2007 19:59:59 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2000 - 2006 by Gero Kohnert and ecosoft
+ * Copyright 2000 - 2007 by Gero Kohnert and ecosoft
  *
  * @modulegroup rate
  * @module rate_new
@@ -105,18 +105,18 @@
      echo "</tr>\n";
      
      # References to modules
-     module_addforms($this->user,$this->obj,6);
+     echo module_addforms($this->user,$this->obj,6);
 
      echo "<tr>\n";
      if ( isset($this->obj->id) && ($this->obj->id != -1) ) {
-       submit_reset(0,1,2,1,2,0);
+       echo submit_reset(0,1,2,1,2,0);
      } else {
-       submit_reset(0,-1,2,1,2,0);
+       echo submit_reset(0,-1,2,1,2,0);
      }
      echo "</tr>\n";
 
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("ratenew.name");

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

Modified Files:
	reminder.pinc reminder_new.php reminder_select.php 
	reminder_show.php 
Log Message:
various html fixes

Index: reminder_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_show.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- reminder_show.php	22 Aug 2006 10:10:24 -0000	1.13
+++ reminder_show.php	2 Jan 2007 19:59:59 -0000	1.14
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 2007 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,8 +83,12 @@
      echo "</pre></td>\n";
      echo "</tr>\n";
 
+     #
+     # Show additional custom fields
+     #
+     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4);
+     echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
 
      echo $this->DataTableEnd();
@@ -162,4 +166,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: reminder.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- reminder.pinc	16 Dec 2006 13:08:28 -0000	1.20
+++ reminder.pinc	2 Jan 2007 19:59:59 -0000	1.21
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2006 by Gero Kohnert
+ *  Copyright 2004 - 2007 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   
@@ -69,6 +69,7 @@
 function showReminders(&$user,&$obj,$cols,$rows = 0) {
   global $tutos, $lang;
 
+  $r = '';
   $d = new TUTOS_Date_Time();
   $n = 1;
   $x = count($obj->list[usereminder]);
@@ -82,33 +83,34 @@
 
   foreach ($obj->list[usereminder] as $i => $f) {
     if ( $cols > 0 ) {
-      echo "<tr><td colspan=\"". $cols ."\">\n";
+      $r .= "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x != $rows ) ) {
-      echo  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("reminder/reminder_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usereminder])));
+      $r .=  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("reminder/reminder_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usereminder])));
       if ( $cols > 0 ) {
-        echo "</td></tr>\n";
+        $r .= "</td></tr>\n";
       }
       break;
     }
-    echo $f->getLink()." ";
+    $r .= $f->getLink()." ";
 
     $x1 = $d->getTimeStamp();
     $x2 = $f->remind_date->getTimeStamp();
     $diff = ($x2 - $x1);
     if ( ($diff > 0) && ($diff < 86400) ) {
-      echo sprintf($lang['ReminderInHours'],hour_format( $diff/3600 ));
+      $r .= sprintf($lang['ReminderInHours'],hour_format( $diff/3600 ));
     } else if ( ($diff < 0) && ($diff > -86400) ) {
-      echo sprintf($lang['ReminderAgoHours'],hour_format(- $diff/3600 ));
+      $r .= sprintf($lang['ReminderAgoHours'],hour_format(- $diff/3600 ));
     } else if ($f->type != REMINDER_SIMPLE) {
-      echo $f->getEventName();
+      $r .= $f->getEventName();
     }
-    echo "<br />\n";
+    $r .= "<br />\n";
     if ( $cols > 0 ) {
-      echo "</td></tr>\n";
+      $r .= "</td></tr>\n";
     }
     $n++;
   }
+  return $r;
 }
 /** ---------------------------------------------------------------------------
  * a reminder
@@ -180,7 +182,7 @@
     if ( empty($this->link_id) ) return;
 
     $this->ref = getObject($this->dbconn,$this->link_id);
-    if ( $this->ref == -1 ) {
+    if ( !is_object($this->ref) || $this->ref->id == -1 ) {
       $this->ref = $this->creator;
     }
     return;
@@ -272,7 +274,7 @@
   function getFullname() {
     global $lang;
 
-    if ($this->to > 0)
+    if (is_object($this->to))
       $r =  $this->to->getFullName();
     else
       $r = $lang['HistoryDeleted'];
@@ -578,25 +580,27 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(usereminder,PERM_SEE) ) {
-      return;
+      return $r;
     }
     reminder::obj_read($obj);
     if ( count($obj->list[usereminder]) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr>\n";
-    echo $user->layout->showfield($lang['Reminders']);
-    echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+    $r .= "<tr>\n";
+    $r .= $user->layout->showfield($lang['Reminders']);
+    $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
     if ( $format == "paper" ) {
-      showReminders($user,$obj,0,-1);
+      $r .= showReminders($user,$obj,0,-1);
     } else {
-      showReminders($user,$obj,0);
+      $r .= showReminders($user,$obj,0);
     }
-    echo " </td>\n";
-    echo "</tr>\n";
+    $r .= " </td>\n";
+    $r .= "</tr>\n";
+    return $r;
   }
 
   /**
@@ -867,4 +871,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: reminder_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_select.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- reminder_select.php	29 Jan 2006 13:44:09 -0000	1.3
+++ reminder_select.php	2 Jan 2007 19:59:59 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright 2004 - 2005 by Gero Kohnert
+ *  Copyright 2004 - 2007 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("reminder","select");
-# loadmodule("reminder");
+ loadmodules('reminder','select');
+# loadmodule('reminder');
  loadlayout();
 
  /**
@@ -33,8 +33,8 @@
 
      echo "<br /><br />\n";
 
-     echo "<form name=\"remindersearch\" method=\"get\" action=\"reminder_overview.php\">\n";
-     DoubleTableStart();
+     echo "<form id=\"remindersearch\" name=\"remindersearch\" method=\"get\" action=\"reminder_overview.php\">\n";
+     echo DoubleTableStart();
      echo "<tr>\n";
      echo "<th colspan=\"3\">". $lang['ReminderSearch'] ."</th>\n";
      echo "</tr><tr>\n";
@@ -43,8 +43,8 @@
      echo " <td align=\"center\">\n";
      echo ' <input type="submit" value="'. $lang['Search'] ."\" /></td>\n";
      echo "</tr>\n";
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
 
@@ -79,4 +79,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: reminder_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/reminder_new.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- reminder_new.php	25 Nov 2006 14:47:15 -0000	1.18
+++ reminder_new.php	2 Jan 2007 19:59:59 -0000	1.19
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2004 - 2006 by Gero Kohnert
+ *  Copyright 2004 - 2007 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   
@@ -174,21 +174,21 @@
      echo "</tr>\n";
 
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      if ( $this->obj->mod_ok() != 0 ) {
        echo "<tr>\n";
 
        if ($this->obj->id > 0 ) {
-         submit_reset(0,1,1,1,1,0);
+         echo submit_reset(0,1,1,1,1,0);
        } else {
-         submit_reset(0,-1,1,1,1,0);
+         echo submit_reset(0,-1,1,1,1,0);
        }
 
        echo "</tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("rmnew.name");

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

Modified Files:
	palm_export.php 
Log Message:
various html fixes

Index: palm_export.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/palm/palm_export.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- palm_export.php	23 Apr 2005 13:18:25 -0000	1.10
+++ palm_export.php	2 Jan 2007 19:59:58 -0000	1.11
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2005 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -66,10 +66,10 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     submit_reset(0,-1,1,1,1,0);
+     echo submit_reset(0,-1,1,1,1,0);
      echo "</tr>\n";
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("palmexport.filename");
@@ -108,19 +108,19 @@
          $fields['Description'] = $lang['AppLoc'][$a->outside]. "\n";
          $fields['Description'] .= eregi_replace("\r\n","\n",$a->descr);
 
-		 $startday = Date("Y-m-j",$a->start->getTimeStamp());
-		 $endday = Date("Y-m-j",$a->end->getTimeStamp());
+         $startday = Date("Y-m-j",$a->start->getTimeStamp());
+         $endday = Date("Y-m-j",$a->end->getTimeStamp());
 
          $fields['Date'] = $startday;
 
          # PALM does not know about evebts that span over multiple days
          # we have to manage this with repeating events
-		 if ( ($startday != $endday) && ($a->repeat == APP_NOREP)) {
+         if ( ($startday != $endday) && ($a->repeat == APP_NOREP)) {
            $repeat['Type'] =  PDB_DATEBOOK_REPEAT_DAILY;
            $repeat['Frequency'] =1; // every day
            $repeat['End'] = $endday;
            $fields['Repeat'] =  $repeat;
-		 }
+         }
 
          if ( $a->t_ignore == 0) {
            $fields['StartTime'] =  Date("H:i",$a->start->getTimeStamp());
@@ -293,4 +293,4 @@
  $l = new palm_export($current_user);
  $l->display();
  $dbconn->Close();
-?>
+?>
\ No newline at end of file

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

Modified Files:
	installation.pinc installation_new.php 
	installation_overview.php installation_select.php 
	installation_show.php mtable.pinc 
Log Message:
various html fixes

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- installation.pinc	16 Dec 2006 13:08:27 -0000	1.43
+++ installation.pinc	2 Jan 2007 19:59:58 -0000	1.44
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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,6 +18,7 @@
 function showInstallations(&$user,&$obj,$cols,$rows = 0) {
   global $tutos, $lang;
 
+  $r = '';
   $n = 1;
   $x = 0;
   foreach ($obj->list[useinstmanagement] as $i => $f) {
@@ -35,12 +36,12 @@
 
   foreach ($obj->list[useinstmanagement] as $i => $f) {
     if ( $cols > 0 ) {
-      echo "<tr><td colspan=\"". $cols ."\">\n";
+      $r .= "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x != $rows ) ) {
-      echo  "  ". $user->layout->theme->getImage(folder,'list') ." ". makelink("installation/installation_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], $x));
+      $r .=  '  '. $user->layout->theme->getImage(folder,'list') ." ". makelink("installation/installation_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], $x));
       if ( $cols > 0 ) {
-        echo "</td></tr>\n";
+        $r .= "</td></tr>\n";
       }
       break;
     }
@@ -48,22 +49,23 @@
       continue;
     }
     if ( $obj->getType() == "product" ) {
-      echo $f->getLink($f->salesdate->getDate());
+      $r .= $f->getLink($f->salesdate->getDate());
       if ( is_object($f->customer) ) {
-        echo " : ". $f->customer->getLink();
+        $r .= ' : '. $f->customer->getLink();
       } else {
-        echo " : ". $lang['HistoryDeleted'];
+        $r .= ' : '. $lang['HistoryDeleted'];
       }
     } else {
-      echo $f->getLink();
+      $r .= $f->getLink();
     }
-    echo " : ". myentities($f->description);
-    echo  "<br />\n";
+    $r .= ' : '. myentities($f->description);
+    $r .=  "<br />\n";
     if ( $cols > 0 ) {
-      echo "</td></tr>\n";
+      $r .= "</td></tr>\n";
     }
     $n++;
   }
+  return $r;
 }
 /**
  * a installation of a product/project
@@ -186,7 +188,7 @@
    */
   function getFullName() {
     global $lang;
-    if ( $this->product == -1 ) {
+    if ( !is_object($this->product) && $this->product == -1 ) {
       return $lang['HistoryDeleted'] ." ". $this->salesdate->getDate();
     }
     return sprintf("%s %s", $this->product->getFullname() , $this->salesdate->getDate());
@@ -558,25 +560,27 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if (! is_object($obj) ) return;
+    $r = '';
+    if (! is_object($obj) ) return $r;
 
     if ( ! $user->feature_ok(useinstmanagement,PERM_SEE) ) {
-      return;
+      return $r;
     }
     installation::obj_read($obj);
     if ( count($obj->list[useinstmanagement]) == 0 ) {
-      return;
+      return $r;
     }
-    echo "<tr>\n";
-    echo $user->layout->showfield($lang['Installations']);
-    echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
+    $r .= "<tr>\n";
+    $r .= $user->layout->showfield($lang['Installations']);
+    $r .= " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
     if ( $format == "paper" ) {
-      showInstallations($user,$obj,0,-1);
+      $r .= showInstallations($user,$obj,0,-1);
     } else {
-      showInstallations($user,$obj,0);
+      $r .= showInstallations($user,$obj,0);
     }
-    echo " </td>\n";
-    echo "</tr>\n";
+    $r .= " </td>\n";
+    $r .= "</tr>\n";
+    return $r;
   }
   /**
    * create a link where a installation for the given object could be added

Index: installation_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_show.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- installation_show.php	9 Dec 2006 19:44:45 -0000	1.27
+++ installation_show.php	2 Jan 2007 19:59:58 -0000	1.28
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -80,7 +80,7 @@
 
      echo "</tr><tr>\n";
      echo $this->showfield($lang['InstalledBy']);
-     if ( $this->obj->installer != -1 ) {
+     if ( is_object($this->obj->installer) && ($this->obj->installer != -1) ) {
        echo " <td>". $this->obj->installer->getLink() ."&nbsp;</td>\n";
      #} else if ( $this->obj->installer->id != -1 ) {
      #  echo " <td>". $this->obj->installer->getLink() ."&nbsp;</td>\n";
@@ -93,7 +93,7 @@
 
      echo "<tr>\n";
      echo $this->showfield($lang['SoldBy']);
-     if ( $this->obj->seller != -1) {
+     if ( is_object($this->obj->seller) &&  ($this->obj->seller->id != -1)) {
        echo " <td>". $this->obj->seller->getLink() ."</td>\n";
      #} else if ( $this->obj->seller->id != -1 ) {
      #  echo " <td>". $this->obj->seller->getLink() ."</td>\n";
@@ -143,17 +143,21 @@
              if ( $r == 1 ) {
                echo "<tr>\n";
              }
-             echo " <td align=\"right\">". number_format($this->obj->tsum[$i],2) ."</td>\n";
-             echo " <td align=\"left\">". $lang['hours'] ."</td>\n";
-             echo " <td>(". $lang[$i] .")</td>\n";
+             echo ' <td align="right">'. number_format($this->obj->tsum[$i],2) ."</td>\n";
+             echo ' <td align="left">'. $lang['hours'] ."</td>\n";
+             echo ' <td>('. $lang[$i] .")</td>\n";
              echo "</tr>\n";
              $r = 1;
            }
          }
        }
      }
+     #
+     # Show additional custom fields
+     #
+	 echo show_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     show_module_infolists($this->user,$this->obj,4);
+     echo show_module_infolists($this->user,$this->obj,4);
      echo $this->obj->getHistoryLink(4);
      echo $this->DataTableEnd();
    }

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/mtable.pinc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mtable.pinc	10 Mar 2004 10:28:14 -0000	1.9
+++ mtable.pinc	2 Jan 2007 19:59:58 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2006 by Gero Kohnert
  *
  * Information about the tables and indices neccessary for this module
  *
@@ -8,28 +8,27 @@
  *  $Author$
  */
 
-$table['installation'] = array(
-  name => "installations",
-  Desc => "TUTOS installations",
-  "id"           => array(type => "ID_TYPE",     constraints => "PK",  Desc => "Object ID"),
-  "customer_id"  => array(type => "ID_TYPE",     constraints => "",    Desc => "id of customer"),
-  "installer_id" => array(type => "ID_TYPE",     constraints => "",    Desc => "id of installer"),
-  "seller_id"    => array(type => "ID_TYPE",     constraints => "",    Desc => "id of seller"),
-  "product_id"   => array(type => "ID_TYPE",     constraints => "NN",  Desc => "id of product/project"),
-  "update_id"    => array(type => "ID_TYPE",     constraints => "",    Desc => "id of updated instalation"),
-  "money"        => array(type => "float",       constraints => "",    Desc => "cost of installation"),
-  "currency"     => array(type => "VARCHAR", size => 4,  constraints => "",    Desc => "currency for money"),
-  "instdate"     => array(type => "TS_TYPE",     constraints => "",    Desc => "installation date"),
-  "salesdate"    => array(type => "TS_TYPE",     constraints => "",    Desc => "sales date"),
-  "invoice"      => array(type => "ID_TYPE",     constraints => "",    Desc => "id of invoice"),
-  "description"  => array(type => "VARCHAR", size => 60 ,constraints => "",    Desc => "description"),
-  "version"      => array(type => "VARCHAR", size => 20, constraints => "",    Desc => "version"),
-  "serial"       => array(type => "VARCHAR", size => 40, constraints => "",    Desc => "serial number"),
-  "key_1"        => array(type => "VARCHAR", size => 40, constraints => "",    Desc => "additional key 1"),
-  "key_2"        => array(type => "VARCHAR", size => 40, constraints => "",    Desc => "additional key 2"),
-  "creator"      => array(type => "ID_TYPE",     constraints => "",    Desc => "creator ID"),
-  "creation"     => array(type => "TS_TYPE",     constraints => "",    Desc => "creation date"),
-);
+$table['installation'][name]           = "installations";
+$table['installation'][Desc]           = "TUTOS installations";
+$table['installation']['id']           = array(type => "ID_TYPE",     constraints => "PK",  Desc => "Object ID");
+$table['installation']['customer_id']  = array(type => "ID_TYPE",     constraints => "",    Desc => "id of customer");
+$table['installation']['installer_id'] = array(type => "ID_TYPE",     constraints => "",    Desc => "id of installer");
+$table['installation']['seller_id']    = array(type => "ID_TYPE",     constraints => "",    Desc => "id of seller");
+$table['installation']['product_id']   = array(type => "ID_TYPE",     constraints => "NN",  Desc => "id of product/project");
+$table['installation']['update_id']    = array(type => "ID_TYPE",     constraints => "",    Desc => "id of updated instalation");
+$table['installation']['money']        = array(type => "float",       constraints => "",    Desc => "cost of installation");
+$table['installation']['currency']     = array(type => "VARCHAR", size => 4,  constraints => "",    Desc => "currency for money");
+$table['installation']['instdate']     = array(type => "TS_TYPE",     constraints => "",    Desc => "installation date");
+$table['installation']['salesdate']    = array(type => "TS_TYPE",     constraints => "",    Desc => "sales date");
+$table['installation']['invoice']      = array(type => "ID_TYPE",     constraints => "",    Desc => "id of invoice");
+$table['installation']['description']  = array(type => "VARCHAR", size => 60 ,constraints => "",    Desc => "description");
+$table['installation']['version']      = array(type => "VARCHAR", size => 20, constraints => "",    Desc => "version");
+$table['installation']['serial']       = array(type => "VARCHAR", size => 40, constraints => "",    Desc => "serial number");
+$table['installation']['key_1']        = array(type => "VARCHAR", size => 40, constraints => "",    Desc => "additional key 1");
+$table['installation']['key_2']        = array(type => "VARCHAR", size => 40, constraints => "",    Desc => "additional key 2");
+$table['installation']['creator']      = array(type => "ID_TYPE",     constraints => "",    Desc => "creator ID");
+$table['installation']['creation']     = array(type => "TS_TYPE",     constraints => "",    Desc => "creation date");
+
 $tableidx['installation1'] = array(
   name  => "inst_idx1",
   table => "installations",

Index: installation_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_new.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- installation_new.php	16 Dec 2006 13:08:27 -0000	1.24
+++ installation_new.php	2 Jan 2007 19:59:58 -0000	1.25
@@ -113,20 +113,24 @@
      Currency_Select("currency",$this->obj->currency);
      echo "</td></tr>\n";
 
+     #
+     # Edit additional custom fields
+     #
+     echo edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
      # References to modules
-     module_addforms($this->user,$this->obj,4);
+     echo module_addforms($this->user,$this->obj,4);
 
      if ( $this->obj->mod_ok() != 0 ) {
        echo "<tr>\n";
        if ( $this->obj->id > 0 ) {
-         submit_reset(0,1,1,1,1,0);
+         echo submit_reset(0,1,1,1,1,0);
        } else {
-         submit_reset(0,-1,1,1,1,0);
+         echo submit_reset(0,-1,1,1,1,0);
        }
        echo "</tr>\n";
      }
      echo $this->DataTableEnd();
-     hiddenFormElements();
+     echo hiddenFormElements();
      echo $this->getHidden();
      echo $this->markBadFields();
      echo "</form>\n";

Index: installation_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_overview.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- installation_overview.php	24 Jul 2006 15:34:08 -0000	1.24
+++ installation_overview.php	2 Jan 2007 19:59:58 -0000	1.25
@@ -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","overview");
- loadmodule("installation");
+ loadmodules('installation','overview');
+ loadmodule('installation');
  loadlayout();
 
  /**
@@ -63,11 +63,15 @@
      echo $this->orderHeader("description",$lang['Description'],$this->link1);
      echo $this->orderHeader("",$lang['InstalledBy'],$this->link1);
      echo $this->orderHeader("instdate",$lang['Date'],$this->link1);
+
      echo get_module_overview_header($this,'installation');
+     echo show_custom_overview_headers($this,'installation',$this->link1);
+
      if ( $tutos[massupdate] == 1 ) {
        echo "  <th><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
        $this->flds++;
      }
+
      echo "</tr>\n";
      echo "</thead>\n";
 
@@ -94,13 +98,13 @@
        }
        echo "</td>\n";
        if ( $i->customer == -1 ) {
-         echo " <td><i>". $lang['HistoryDeleted'] ."</i></td>\n";
+         echo ' <td><i>'. $lang['HistoryDeleted'] ."</i></td>\n";
        } else if ( $i->customer->id != -1 ) {
-         echo " <td>". $i->customer->getLink() ."</td>\n";
+         echo ' <td>'. $i->customer->getLink() ."</td>\n";
        } else {
          echo " <td>&nbsp;</td>\n";
        }
-       echo " <td>". myentities($i->description) ."&nbsp;</td>\n";
+       echo ' <td>'. myentities($i->description) ."&nbsp;</td>\n";
        if ( $i->installer == -1 ) {
          echo " <td><i>". $lang['HistoryDeleted'] ."</i></td>\n";
        } else if ( $i->installer->id != -1 ) {
@@ -110,6 +114,7 @@
        }
        echo " <td>". $i->instdate->getLinkDate() ."</td>\n";
        echo get_module_overview_data($this,$i);
+       echo show_custom_overview_data($this,'installation',$f);
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
          if ( $i->mod_ok() ) {
@@ -129,11 +134,11 @@
        echo sprintf($lang['withmarked'],$lang['Installations']);
        echo "&nbsp;<select name=\"action\">\n";
        echo ' <option value="-1" selected="selected">'. $lang['ActionNil'] ."</option>\n";
-       echo " <option value=\"-2\">". $lang['Delete'] ."</option>\n";
-       echo " <option value=\"-4\">". $lang['AclModify'] ."</option>\n";
+       echo ' <option value="-2">'. $lang['Delete'] ."</option>\n";
+       echo ' <option value="-4">'. $lang['AclModify'] ."</option>\n";
        if (class_exists('watchlist')) {
-         echo " <option value=\"WatchAdd\">". $lang['WatchAdd'] ."</option>\n";
-         echo " <option value=\"WatchDel\">". $lang['WatchDel'] ."</option>\n";
+         echo ' <option value="WatchAdd">'. $lang['WatchAdd'] ."</option>\n";
+         echo ' <option value="WatchDel">'. $lang['WatchDel'] ."</option>\n";
        }
        echo "</select>\n";
        echo $this->UpdateRowEnd(2);

Index: installation_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_select.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- installation_select.php	16 Dec 2006 13:08:27 -0000	1.4
+++ installation_select.php	2 Jan 2007 19:59:58 -0000	1.5
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2006 by Gero Kohnert
+ *  Copyright 1999 - 2007 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   
@@ -35,7 +35,7 @@
      echo "<br /><br />\n";
 
      echo "<form id=\"installationsearch\" name=\"installationsearch\" method=\"get\" action=\"installation_overview.php\">\n";
-     DoubleTableStart();
+     echo DoubleTableStart();
 
      echo "<tr>\n";
      if ( $this->ext == 0 ) {
@@ -75,8 +75,8 @@
      }*/
 
      echo "</tr>\n";
-     DoubleTableEnd();
-     hiddenFormElements();
+     echo DoubleTableEnd();
+     echo hiddenFormElements();
      echo "</form>\n";
 
      echo $this->setfocus("installationsearch.name");