tutos-commits Mailing List for TUTOS

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

Modified Files:
	mconfig.pinc 
Log Message:
introduced patches from Boris W

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/mconfig.pinc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mconfig.pinc	23 Dec 2008 15:30:58 -0000	1.11
+++ mconfig.pinc	30 Jan 2009 09:43:51 -0000	1.12
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2002 - 2008 by Gero Kohnert
+ * Copyright 2002 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -24,21 +24,21 @@
 #
 # globally enable this module
 #
-$tutos[useinvoice] = 1; 
+if(!isset($tutos[useinvoice])) {
+    $tutos[useinvoice] = 1; 
+}
 #
 # List of objects/modules where we do something with this module
 # and need to include this module
 #
-$tutos[modulesinc]['invoice'] = array(
-	"mytutos",
-	"product",
-	"timetrack",
-	"installation",
-	"company",
-	"department",
-	"scheme",
-	"expense",
-	);
+$tutos[modulesinc]['invoice'][] = 'mytutos';
+$tutos[modulesinc]['invoice'][] = 'product';
+$tutos[modulesinc]['invoice'][] = 'timetrack';
+$tutos[modulesinc]['invoice'][] = 'installation';
+$tutos[modulesinc]['invoice'][] = 'company';
+$tutos[modulesinc]['invoice'][] = 'department';
+$tutos[modulesinc]['invoice'][] = 'scheme';;
+$tutos[modulesinc]['invoice'][] = 'expense';
 #
 # modify those values using bug_config
 # here are only defaults

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

Modified Files:
	mconfig.pinc 
Log Message:
introduced patches from Boris W

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/mconfig.pinc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mconfig.pinc	21 Feb 2004 17:24:59 -0000	1.8
+++ mconfig.pinc	30 Jan 2009 09:43:51 -0000	1.9
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -23,7 +23,9 @@
 #
 # globally enable this module
 #
-$tutos[useinstmanagement] = 1; 
+if(!isset($tutos[useinstmanagement])) {
+    $tutos[useinstmanagement] = 1;
+}
 #
 # List of objects/modules where we do something with this module
 # and need to include this module

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

Modified Files:
	mconfig.pinc 
Log Message:
introduced patches from Boris W

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/mconfig.pinc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mconfig.pinc	25 May 2005 06:05:08 -0000	1.9
+++ mconfig.pinc	30 Jan 2009 09:43:51 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -23,15 +23,15 @@
 #
 # globally enable this module
 #
-$tutos[usegroups] = 1; 
+if(!isset($tutos[usegroups])) {
+    $tutos[usegroups] = 1;
+}
 #
 # List of objects/modules where we do something with this module
 # and need to include this module
 #
-$tutos[modulesinc]['group'] = array(
-	"company",
-	"department",
-	"address",
-	"scheme"
-	);
+$tutos[modulesinc]['group'][] = 'company';
+$tutos[modulesinc]['group'][] =	'department';
+$tutos[modulesinc]['group'][] = 'address';
+$tutos[modulesinc]['group'][] = 'scheme';
 ?>

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

Modified Files:
	mconfig.pinc 
Log Message:
introduced patches from Boris W

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/mconfig.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mconfig.pinc	10 Sep 2004 08:21:35 -0000	1.4
+++ mconfig.pinc	30 Jan 2009 09:43:51 -0000	1.5
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -23,7 +23,9 @@
 #
 # globally enable this module
 #
-$tutos[userates] = 1; 
+if(!isset($tutos[userates])) {
+    $tutos[userates] = 1;
+}
 #
 # List of objects/modules where we do something with this module
 # and need to include this module

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

Modified Files:
	de.p3 
Log Message:
introduced patches from Boris W

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/de.p3,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- de.p3	5 Apr 2007 16:14:59 -0000	1.9
+++ de.p3	30 Jan 2009 09:43:52 -0000	1.10
@@ -22,8 +22,8 @@
 $lang['ResOverview']       = "Ressourcenübersicht";
 $lang['ResDelI']           = "Ressource %s löschen";
 $lang['ResConflict']       = "Die Benutzung von \"%2\$s\" durch \"%1\$s\" kollidiert mit \"%3\$s\"";
-$lang['ResSearch']         = "Resourcen Suche";
-$lang['SearchForRes']      = "Eine Resource suchen";
+$lang['ResSearch']         = "Ressourcensuche";
+$lang['SearchForRes']      = "Eine Ressource suchen";
 
 $lang['perm'][useresource]       = "Ressourcennutzung";
 $lang['resource']    = &$lang['Resource'];

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

Modified Files:
	mconfig.pinc 
Log Message:
introduced patches from Boris W

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/mconfig.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mconfig.pinc	14 Mar 2004 19:09:45 -0000	1.1
+++ mconfig.pinc	30 Jan 2009 09:43:51 -0000	1.2
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2004 by Gero Kohnert
+ * Copyright 2004 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -23,13 +23,13 @@
 #
 # globally enable this module
 #
-$tutos[usereminder] = 1; 
+if(!isset($tutos[usereminder])) {
+    $tutos[usereminder] = 1;
+}
 #
 # List of objects/modules where we do something with this module
 # and need to include this module
 #
-$tutos[modulesinc]['reminder'] = array(
-	"all",
-	"scheme"
-	);
+$tutos[modulesinc]['reminder'][] = 'all';
+$tutos[modulesinc]['reminder'][] = 'scheme';
 ?>
\ No newline at end of file

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

Modified Files:
	mconfig.pinc 
Log Message:
introduced patches from Boris W

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/mconfig.pinc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mconfig.pinc	13 Feb 2004 22:01:24 -0000	1.14
+++ mconfig.pinc	30 Jan 2009 09:43:52 -0000	1.15
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *
@@ -23,7 +23,9 @@
 #
 # globally enable this module
 #
-$tutos[usewatchlist] = 1; 
+if(!isset($tutos[usewatchlist])) {
+    $tutos[usewatchlist] = 1;
+}
 #
 # List of objects/modules where we do something with this module
 # and need to include this module

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

Modified Files:
	db_mysql.pinc 
Log Message:
introduced patches from Boris W

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- db_mysql.pinc	9 Jan 2009 14:17:01 -0000	1.46
+++ db_mysql.pinc	30 Jan 2009 09:43:51 -0000	1.47
@@ -99,7 +99,7 @@
     $this->conn = &$c;
 
     # Does not work on older mysql
-    # $r = $this->exec('SET CHARACTER SET latin1',1);
+    $r = $this->exec('SET CHARACTER SET utf8',1);
   }
   /* ---------------------------------------------------------------------------
    */

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

Modified Files:
	ChangeLog Makefile upload.sh 
Log Message:
updates

Index: upload.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/upload.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- upload.sh	20 Aug 2008 10:44:43 -0000	1.8
+++ upload.sh	18 Jan 2009 20:47:46 -0000	1.9
@@ -29,6 +29,7 @@
 put TUTOS-MODULE-palm-${DATE}.zip
 put TUTOS-MODULE-checklist-${DATE}.zip
 put TUTOS-MODULE-ticker-${DATE}.zip
+put TUTOS-MODULE-expense-${DATE}.zip
 put TUTOS-THEME-sqli-${DATE}.zip
 put TUTOS-THEME-visual-${DATE}.zip
 put TUTOS-LANG-catalan-${DATE}.zip

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- Makefile	5 Jan 2009 19:10:55 -0000	1.97
+++ Makefile	18 Jan 2009 20:47:46 -0000	1.98
@@ -2,7 +2,7 @@
 #   the ultimate team organization software
 #   ---------------------------------------
 #
-# Copyright 1999-2008 by Gero Kohnert
+# Copyright 1999-2009 by Gero Kohnert
 #
 # This program is free software; you can redistribute it and/or modify it 
 # under the terms of the GNU General Public License as published by the   
@@ -15,6 +15,9 @@
 #
 #
 # $Log$
+# Revision 1.98  2009/01/18 20:47:46  gokohnert
+# updates
+#
 # Revision 1.97  2009/01/05 19:10:55  gokohnert
 # fix
 #
@@ -551,6 +554,12 @@
 PHP_MERGE_HLP =	$(wildcard php/merge/help/*.html) \
 	php/merge/help/.htaccess
 
+# Search Modul (nonstandard , need extra download/buy)
+PHP_SEARCH = $(wildcard php/search/*.php) \
+	$(wildcard php/search/*.p3) \
+	$(wildcard php/search/*.pinc) \
+        php/search/README \
+	php/search/.htaccess
 # Riskmanagement Module (nonstandard , need extra download/buy)
 PHP_RISK = $(wildcard php/riskmanagement/*.php) \
 	$(wildcard php/riskmanagement/*.p3) \
@@ -592,7 +601,8 @@
 PHP_EXPENSE = $(wildcard php/expense/*.php) \
 	$(wildcard php/expense/*.p3) \
 	$(wildcard php/expense/*.pinc) \
-	php/expense/.htaccess
+	php/expense/.htaccess \
+	php/expense/README
 
 # Ticker Module (nonstandard , need extra download)
 PHP_TICKER = $(wildcard php/ticker/*.php) \
@@ -740,6 +750,12 @@
 	$(wildcard php/sipgate/*.pinc) \
 	php/sipgate/README
 
+# extra stuff (not part of distribution)
+HDL_ISBN =  $(wildcard php/isbn/*.php) \
+	$(wildcard php/isbn/*.p3) \
+	$(wildcard php/isbn/*.pinc) \
+	php/isbn/README
+
 LIBS_BASE = libs/.htaccess
 
 LIBS_FPDF = $(wildcard libs/fpdf/*.php) \
@@ -980,7 +996,8 @@
 	${HDL_FAX} \
 	${HDL_SMS} \
 	${HDL_WEATHER} \
-	${HDL_SIPGATE} 
+	${HDL_SIPGATE} \
+	${HDL_ISBN} 
 
 # Edited for Debian GNU/Linux.
 DESTDIR =
@@ -1398,6 +1415,8 @@
 	$(INSTALL) $(INSTALLARGS) -m 644 $(HDL_SMS) $(TARGETDIR)/php/sms
 	$(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/fax
 	$(INSTALL) $(INSTALLARGS) -m 644 $(HDL_FAX) $(TARGETDIR)/php/fax
+	$(INSTALL) $(INSTALLARGS) -d -m 755 $(TARGETDIR)/php/isbn
+	$(INSTALL) $(INSTALLARGS) -m 644 $(HDL_SIPGATE) $(TARGETDIR)/php/isbn
 
 
 	# LIBS
@@ -1490,7 +1509,8 @@
 	HDL_fax.zip \
 	HDL_sms.zip \
 	HDL_phpweather.zip \
-	HDL_sipgate.zip
+	HDL_sipgate.zip \
+	HDL_isbn.zip
 
 THEMENUKE   = README.nuke \
 	html/nuke.css \
@@ -1652,6 +1672,17 @@
 	@$(MV) checklist.zip TUTOS-MODULE-checklist-${FULLVERSION}.zip
 
 # Riskmanagement Module
+search.zip: $(PHP_SEARCH)
+	@$(ECHO) "# Make Filelist for $@"
+	@$(RM) -f search.list
+	@$(TOUCH) search.list
+	@$(foreach d,$(PHP_SEARCH), \
+		echo tutos/$(d) >> search.list; \
+	)
+	cd ..;cat tutos/search.list | $(ZIP) $(ZIPARGS) -@ tutos/$@
+	@$(MV) search.zip TUTOS-MODULE-search-${FULLVERSION}.zip
+
+# Riskmanagement Module
 risk.zip: $(PHP_RISK)
 	@$(ECHO) "# Make Filelist for $@"
 	@$(RM) -f risk.list
@@ -1811,5 +1842,15 @@
 	cd ..;cat tutos/sipgate.list | $(ZIP) $(ZIPARGS) -@ tutos/$@
 	@$(MV) HDL_sipgate.zip TUTOS-HDL_sipgate-${FULLVERSION}.zip
 
+HDL_isbn.zip: $(HDL_ISBN)
+	@$(ECHO) "# Make Filelist for $@"
+	@$(RM) -f isbn.list
+	@$(TOUCH) isbn.list
+	@$(foreach d,$(HDL_ISBN), \
+		echo tutos/$(d) >> isbn.list; \
+	)
+	cd ..;cat tutos/isbn.list | $(ZIP) $(ZIPARGS) -@ tutos/$@
+	@$(MV) HDL_sipgate.zip TUTOS-HDL_isbn-${FULLVERSION}.zip
+
 
 # EOF

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- ChangeLog	14 Nov 2008 21:14:51 -0000	1.125
+++ ChangeLog	18 Jan 2009 20:47:46 -0000	1.126
@@ -1,4 +1,6 @@
 #$Header$
+	* new fields for user/owner and source in stuff module
+	* new checkfield type headline (this allows to structure a checklist)
 	* additional replace fields supported in $tutos[bugautoname]
 	* custom object type allows to reference objects
 	* new support for sqlite 2.*

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

Modified Files:
	task.pinc 
Log Message:
updates

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- task.pinc	12 Dec 2008 14:42:08 -0000	1.207
+++ task.pinc	18 Jan 2009 20:47:46 -0000	1.208
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   

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

Modified Files:
	nuke.css 
Log Message:
updates

Index: nuke.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/nuke.css,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- nuke.css	24 Aug 2007 13:05:30 -0000	1.28
+++ nuke.css	18 Jan 2009 20:47:46 -0000	1.29
@@ -434,29 +434,17 @@
         text-align: center;
 }
 
-INPUT {
-        font-family: tahoma, verdana, arial, sans-serif;
-        font-size: 12px;
-        border-width: 1px;
-        border-color: gray;
-        border-style: solid;
-        color: black;
-}
-
-TEXTAREA {
+INPUT,TEXTAREA,SELECT {
         font-family: tahoma, verdana, arial, sans-serif;
         font-size: 12px;
         border-width: 1px;
-        border-color: gray;
+        border-color: silver;
         border-style: solid;
         color: black;
 }
 
-SELECT {
-        font-family: tahoma, verdana, arial, sans-serif;
-        font-size: 12px;
-        border-style: none;
-        color: black;
+INPUT:focus,TEXTAREA:focus,SELECT:focus {
+        border-color: black;
 }
 
 SPAN.warn {

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

Modified Files:
	stuff_ins.php 
Log Message:
fix

Index: stuff_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/stuff/stuff_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- stuff_ins.php	7 Jan 2009 20:23:37 -0000	1.9
+++ stuff_ins.php	17 Jan 2009 11:55:14 -0000	1.10
@@ -75,7 +75,7 @@
         $owner = $current_user;
     }
 } else {
-    if ($obj->owner->getFullName() == $_POST['ownerfn']) {
+    if (is_object($obj->owner) && ($obj->owner->getFullName() == $_POST['ownerfn'])) {
         $owner = $obj->owner;
     } else {
         $owner = check_field($_POST['ownerfn'],"ownerfn","ownerl",'atdc');

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

Modified Files:
	checkfield.pinc 
Log Message:
comments in appendmode with date and user


Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- checkfield.pinc	14 Jan 2009 20:12:32 -0000	1.35
+++ checkfield.pinc	16 Jan 2009 16:16:11 -0000	1.36
@@ -192,14 +192,18 @@
    * set the fields comment
    */
   function setFieldComment( $value) {
-    if ( !$this->commentappendonly && $this->comment != $value ) {
-      $this->setStrField("comment",$value,"CheckfieldComment");
-      $this->ValueChanged();
-    } else
-    if ( $this->commentappendonly && $value != '' ) {
-      $this->setStrField("comment",$this->comment ."\n". $value,"CheckfieldComment");
-      $this->ValueChanged();
-	}
+      global $current_user;
+
+      if ( !$this->commentappendonly && $this->comment != $value ) {
+          $this->setStrField("comment",myentities($value),"CheckfieldComment");
+          $this->ValueChanged();
+      } else
+      if ( $this->commentappendonly && $value != '' ) {
+		  $x = new TUTOS_Date_Time();
+		  $value = "\n<i>".$current_user->getFullName().' '.$x->getDateTimeShort()."</i>\n". myentities($value) ."\n";
+          $this->setStrField("comment",$this->comment.$value,"CheckfieldComment");
+          $this->ValueChanged();
+   	  }
   }
   /**
    * get Code for input a value

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

Modified Files:
	checkfield.pinc checkfield_overview.php checklist_ins.php 
Log Message:
appendonly chekfield comments

Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- checkfield.pinc	13 Jan 2009 08:47:07 -0000	1.34
+++ checkfield.pinc	14 Jan 2009 20:12:32 -0000	1.35
@@ -64,6 +64,7 @@
     $this->value_n = 0;
     $this->maxvalue = 4;
     $this->comment = '';
+    $this->commentappendonly = false; /** comments will only be appended if true */
     $this->pos = -1;
     $this->ref = null;
     $this->value_t = "";
@@ -191,10 +192,14 @@
    * set the fields comment
    */
   function setFieldComment( $value) {
-    if ( $this->comment != $value ) {
+    if ( !$this->commentappendonly && $this->comment != $value ) {
       $this->setStrField("comment",$value,"CheckfieldComment");
       $this->ValueChanged();
-    }
+    } else
+    if ( $this->commentappendonly && $value != '' ) {
+      $this->setStrField("comment",$this->comment ."\n". $value,"CheckfieldComment");
+      $this->ValueChanged();
+	}
   }
   /**
    * get Code for input a value
@@ -356,7 +361,7 @@
     $r .= '<html>';
     $r .= '<body>';
     $r .= '<table class="inner" border="0" cellspacing="5" cellpadding="1">';
-    $r .= '<tr><td><pre>'.$this->getHelp().'</pre></td></tr>';
+    $r .= '<tr><td><pre>'.wordwrap($this->getHelp(),50).'</pre></td></tr>';
     $r .= '</table>';
     $r .= '</body>';
     $r .= '</html>';
@@ -578,7 +583,7 @@
       $r .='(this.form,". $maxsize .");\" ";
       $r .='(this.form,". $maxsize .");\" ";
     }
-    $r .= 'id="'. $name .'" rows="'. $rows .'" cols="'. $cols .'" name="'. $name .'">'. $this->getComment() ."</textarea>\n";
+    $r .= 'id="'. $name .'" rows="'. $rows .'" cols="'. $cols .'" name="'. $name .'">'. ($this->commentappendonly ? '':$this->getComment()) ."</textarea>\n";
     if ($maxsize != -1) {
       $r .= "<br /><font size=\"-2\">(<input disabled=\"disabled\" size=\"3\" maxlength=\"3\" name=\"cnt_".$name."\" id=\"cnt_".$name.'" value="'. strlen($value) .'" /> / '.$maxsize.' characters)</font>';
     }

Index: checklist_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checklist_ins.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- checklist_ins.php	8 Jan 2009 17:56:41 -0000	1.19
+++ checklist_ins.php	14 Jan 2009 20:12:32 -0000	1.20
@@ -1,7 +1,7 @@
 <?php
 /**
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2008 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2009 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   
@@ -13,9 +13,9 @@
  */
 $tutos['base'] = "../..";
 ini_set("include_path","..");
-include_once 'webelements.p3';
-include_once 'permission.p3';
-include_once 'checklist/checkfield.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'checklist/checkfield.pinc';
 
 /* Check if user is allowed to use it */
 check_user();
@@ -44,6 +44,9 @@
   if (isset($_POST['format'])) {
       $gotourl= addUrlParameter($gotourl,"format=". $_POST['format'],true);
   }
+  if (isset($_REQUEST['append'])) {
+      $gotourl= addUrlParameter($gotourl,"append",true);
+  }
   $new_cl = new checklist($dbconn);
   $new_cl = $new_cl->read( $_POST['ref_id'],$new_cl);
   
@@ -60,6 +63,9 @@
   foreach($flist as $fid) {
     $new_cf = new checkfield($dbconn);
     $new_cf = $new_cf->read( $fid,$new_cf);
+    if (isset($_REQUEST['append'])) {
+        $new_cf->commentappendonly = true;
+	}
     $new_cf->setFieldValue($_POST['fld_'.$fid]);
     if (isset($_POST['comment_'.$fid])) {
       $new_cf->setFieldComment($_POST['comment_'.$fid]);

Index: checkfield_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield_overview.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- checkfield_overview.php	7 Jan 2009 13:31:36 -0000	1.39
+++ checkfield_overview.php	14 Jan 2009 20:12:32 -0000	1.40
@@ -1,7 +1,7 @@
 <?php
 /**
  * Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS:     Copyright 1999 - 2008 by Gero Kohnert
+ * TUTOS:     Copyright 1999 - 2009 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   
@@ -44,6 +44,9 @@
       while ( ($a < $n) && ($a < $end) ) {
           $c = new checkfield($this->dbconn);
           $c->read_result($this->result,$a);
+          if (isset($_REQUEST['append'])) {
+              $c->commentappendonly = true;
+          }
           $a++;
           if ( ! $c->see_ok() ) {
               continue;
@@ -61,7 +64,12 @@
           }
           if($c->type != CF_TYPE_HEADLINE) {
               $r .= '&nbsp;&nbsp;&nbsp;'. $c->getInput().'</p>'."\n";
-              $r .= '  <p>'.$c->textarea(-1,$c->getComment()).'</p>'."\n";
+              if ($c->commentappendonly) {
+                  $r .= '  <p><pre>'.$c->getComment().'</pre></p>'."\n";
+                  $r .= '  <p>'.$c->textarea().'</p>'."\n";
+              } else {
+                  $r .= '  <p>'.$c->textarea().'</p>'."\n";
+              }
           }
           $r .= ' <hr />'."\n";
       }
@@ -69,6 +77,9 @@
         $this->addHidden("ref_id",$this->checklistID);
         $this->addHidden("checklist_ins","from_editor2");
       }
+      if (isset($_REQUEST['append'])) {
+          $this->addHidden("append",'true');
+	  }
       $this->addHidden("format",$this->format);
       $r .= hiddenFormElements();
       $r .= $this->getHidden();

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

Modified Files:
	file.pinc 
Log Message:
use a random password as default on database creation

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- file.pinc	14 Nov 2008 14:23:03 -0000	1.79
+++ file.pinc	13 Jan 2009 15:17:56 -0000	1.80
@@ -1371,4 +1371,4 @@
   }
 
 }
-?>
+?>
\ No newline at end of file

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

Modified Files:
	permission.p3 
Log Message:
use a random password as default on database creation

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- permission.p3	11 Jan 2009 10:34:22 -0000	1.164
+++ permission.p3	13 Jan 2009 15:17:56 -0000	1.165
@@ -142,6 +142,11 @@
   return;
 }
 
+/** generate a password */
+function generatePassword() 
+{
+  return  substr(md5(uniqid()),0,8);
+}
 /** ---------------------------------------------------------------------------
  * send a lost password or generate a new one
  */
@@ -190,7 +195,7 @@
   }
 
   if ( ($tutos[pwlostsupport] == 2) || ($dbconn->db->crypt != 0)) {
-    $current_user->setPassword(substr(session_id(),0,8));
+    $current_user->setPassword(generatePassword());
     $current_user->updatepw = 1;
     if ($tutos[demo] != 1 ) {
       $current_user->save();

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

Modified Files:
	scheme.php 
Log Message:
use a random password as default on database creation

Index: scheme.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/scheme.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- scheme.php	3 Dec 2008 13:37:48 -0000	1.16
+++ scheme.php	13 Jan 2009 15:17:56 -0000	1.17
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001-2008 by Gero Kohnert
+ *  Copyright 2001-2009 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   
@@ -14,24 +14,24 @@
  * @module scheme
  * @package BASE
  */
- $tutos['base'] = "../..";
- ini_set("include_path","..");
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'appointment.pinc';
- include_once 'timetrack.pinc';
- include_once 'product.pinc';
- include_once 'task.pinc';
- include_once 'mail.pinc';
- include_once 'history.pinc';
+$tutos['base'] = "../..";
+ini_set("include_path","..");
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'appointment.pinc';
+require_once 'timetrack.pinc';
+require_once 'product.pinc';
+require_once 'task.pinc';
+require_once 'mail.pinc';
+require_once 'history.pinc';
 
- loadmodules('admin','install');
- loadlayout();
+loadmodules('admin','install');
+loadlayout();
 
- /**
-  * initialize database
-  */
- class admin_scheme extends layout {
+/**
+ * initialize database
+ */
+class Admin_scheme extends layout {
    /**
     * Perform Step 1  (creating tables,indizes,sequences)
     */
@@ -150,7 +150,7 @@
      $this->user = new tutos_user($this->obj);
      $this->user->updatepw = 1;
      $this->user->login = "superuser";
-     $this->user->pw = "tutos";
+     $this->user->pw = generatePassword();
      $this->user->id = $adr->id;
      $this->user->admin = 1;
 
@@ -159,7 +159,7 @@
      $r->free();
 
      $msg = $this->user->save();
-	 echo $this->obj->after_update_db();
+     echo $this->obj->after_update_db();
      echo $msg ."<br />\n";
    }
    /**
@@ -249,7 +249,7 @@
      if ( $this->step == 2 ) {
        echo "<br /><input type=\"submit\" value=\"". $lang['Enter'] . " Step 3\"><br />\n";
        $this->step2();
-       echo "Go on to create some example data <br />or<br /> stop here and login at <a href=\"". dirname(getBaseUrl()) ."/mytutos.php\">". dirname(getBaseUrl()) ."/mytutos.php</a> as superuser with password tutos<br />\n";
+       echo 'Go on to create some example data <br />or<br /> stop here and login at <a href="'. dirname(getBaseUrl()) .'/mytutos.php">'. dirname(getBaseUrl()) .'/mytutos.php</a> as <i>superuser</i> with password <font color="red"><b>'. $this->user->pw ."</b></font><br />\n";
      }
      if ( $this->step == 3 ) {
        echo "<br /><input type=\"submit\" value=\"". $lang['Enter'] . " Step 4\"><br />\n";
@@ -352,11 +352,10 @@
    }
  }
 
-
- $dbc = null;
- $x = new tutos_user($dbc);
- $l = new admin_scheme($x);
- $l->display();
+$dbc = null;
+$x = new tutos_user($dbc);
+$l = new Admin_scheme($x);
+$l->display();
 ?>
 <!--
     CVS Info:  $Id$

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

Modified Files:
	checkfield.pinc 
Log Message:
fix

Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- checkfield.pinc	8 Jan 2009 10:21:55 -0000	1.33
+++ checkfield.pinc	13 Jan 2009 08:47:07 -0000	1.34
@@ -355,8 +355,8 @@
     $r = '';
     $r .= '<html>';
     $r .= '<body>';
-    $r .= '<table class="inner" border="1" cellspacing="5" cellpadding="1">';
-    $r .= '<tr></td><pre>'.$this->getHelp().'</pre></td></tr>';
+    $r .= '<table class="inner" border="0" cellspacing="5" cellpadding="1">';
+    $r .= '<tr><td><pre>'.$this->getHelp().'</pre></td></tr>';
     $r .= '</table>';
     $r .= '</body>';
     $r .= '</html>';

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

Modified Files:
	task_overview.php 
Log Message:
fix "bad" select query with ful join


Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- task_overview.php	7 Nov 2008 15:33:30 -0000	1.110
+++ task_overview.php	12 Jan 2009 19:10:54 -0000	1.111
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -13,21 +13,22 @@
  * @module task_overview
  * @package task
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'task.pinc';
- include_once 'product.pinc';
- include_once 'timetrack.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'task.pinc';
+require_once 'product.pinc';
+require_once 'timetrack.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('task','overview');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('task','overview');
+loadlayout();
 
- /**
-  * show a overview of task for user / project
-  */
- class task_overview extends layout {
+/**
+ * show a overview of task for user / project
+ */
+class Task_overview extends layout 
+{
    /**
     * free search
     */
@@ -96,7 +97,7 @@
        $w = $_REQUEST['worker'];
        $wobj = getObject($this->dbconn,$w);
        if (is_object($wobj)) {
-         $q .= $qpre ." (( w.w_id = ".$w." AND w.t_id = t.id) OR (t.p_id=". $w."))";
+         $q .= $qpre ." (w.t_id = t.id AND ( w.w_id = ".$w." OR t.p_id=". $w."))";
          $this->searchargs .= $lang['TaskWorker'] .' = '. $wobj->getLink() .'&nbsp;';
          $this->link = addUrlParameter($this->link,'worker='.$wobj->id);
          $_SESSION['tasksearchworker'][$wobj->id] = $wobj->id;
@@ -671,7 +672,7 @@
    }
  }
 
- $l = new task_overview($current_user);
- $l->display();
- $dbconn->Close();
+$l = new Task_overview($current_user);
+$l->display();
+$dbconn->Close();
 ?>

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

Modified Files:
	file_ins.php 
Log Message:
fixing mail support

Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_ins.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- file_ins.php	14 Nov 2008 14:23:03 -0000	1.27
+++ file_ins.php	11 Jan 2009 10:34:22 -0000	1.28
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   

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

Modified Files:
	mail_show.php mailbox_show.php 
Log Message:
fixing mail support

Index: mail_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mail_show.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- mail_show.php	5 Apr 2007 16:14:57 -0000	1.19
+++ mail_show.php	11 Jan 2009 10:34:22 -0000	1.20
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2009 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: mailbox_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox_show.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mailbox_show.php	5 Apr 2007 16:14:57 -0000	1.17
+++ mailbox_show.php	11 Jan 2009 10:34:22 -0000	1.18
@@ -150,18 +150,10 @@
        echo " </td>\n";
        echo ' <td>';
        if ( isset($hdr->subject) ) {
-         $s = '';
-         $x = imap_mime_header_decode($hdr->subject);
-         foreach ($x as $f) {
-          $s .= $f->text;
-         }
+         $s = iconv_mime_decode($hdr->subject,ICONV_MIME_DECODE_CONTINUE_ON_ERROR,$lang['content_encoding']);
          if ( $this->search ) {
            $s = eregi_replace("(". $this->search .")","<span class=\"found\">\\1</span>",$s);
          }
-         if ($lang['content_encoding'] == 'utf8') {
-#           $s = utf8_encode($s);
-         }
-#		 $s= decodeHeader($s);
          echo "&nbsp;". $s;
        } else {
          echo "<i><font size=\"-2\">". $lang['MailNoSubject'] ."</font></i>";

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

Modified Files:
	mail.pinc mail_ins.php permission.p3 product.pinc 
Log Message:
fixing mail support

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- mail.pinc	27 Sep 2008 19:50:35 -0000	1.92
+++ mail.pinc	11 Jan 2009 10:34:22 -0000	1.93
@@ -185,7 +185,7 @@
 #    $r .= "p:". $this->part ."b:".$this->boundary ."e:".$this->contentencoding ."|t:". $this->contenttype ."|b:".count($this->bodies)."|len:".strlen($this->body) ."". $this->part ."<br />";
 
     if ( ($part != 0) && ($part != $this->part)) {
-#       echo "SKIP".$this->part;
+#       echo "SKIP ".$this->part .'<br>';
       $skip = true;
     }
 
@@ -244,7 +244,7 @@
         $r .= "";
       } else {
         $r .= "<tr>\n";
-        $r .= " <th colspan=\"4\">". $this->contentencoding ."|". $this->contenttype ."|";
+        $r .= ' <th colspan="4">'.$this->contentencoding.' | '.$this->contenttype.' | '.$this->charset;
         $r .= "</th>\n";
         $r .= "</tr>\n";
         $xx  = "[". makelink($this->getShowLink(), $lang['MailAttachmentShow'],$lang['MailAttachmentShow']) ."]";
@@ -272,7 +272,7 @@
       }
     }
 
-    if ($show_text && $part > 0) {
+    if ($show_text && $part != '0') {
       $show_raw  = true;
       $show_text  = false;
     }
@@ -286,14 +286,14 @@
         $r .= "<tr><td colspan=\"4\" class=\"pre\"><pre>\n";
       }
       if ($this->contentencoding == "quoted-printable") {
-        $r .= wordwrap(quoted_printable_decode($this->body),80);
+        $r .= wordwrap(urlreplace(iconv($this->charset,$lang['content_encoding'],quoted_printable_decode($this->body))),80);
       } else if ($this->contentencoding == "base64") {
-        $r .= wordwrap(base64_decode($this->body),80);
+        $r .= wordwrap(urlreplace(iconv($this->charset,$lang['content_encoding'],base64_decode($this->body))),80);
       } else if (($this->contentencoding == "8bit") || ($this->contentencoding == "7bit")) {
         if ($mformat == 'reply') {
-          $r .= wordwrap($this->body,80);
+          $r .= wordwrap(iconv($this->charset,$lang['content_encoding'],$this->body),80);
         } else {
-          $r .= wordwrap(urlreplace(myentities($this->body),80));
+          $r .= wordwrap(urlreplace(myentities(iconv($this->charset,$lang['content_encoding'],$this->body)),80));
         }
       }
       if ($mformat == 'reply') {
@@ -306,19 +306,22 @@
         $r .= quoted_printable_decode($this->body);
       } else if ($this->contentencoding == "base64") {
         $r .= base64_decode($this->body);
-      } else if (($this->contentencoding == "8bit") || ($this->contentencoding == "7bit")) {
+      } else if (($this->contentencoding == "8bit") ||($this->contentencoding == "8-bit") || ($this->contentencoding == "7bit")) {
         if (strtolower($this->contenttype) == "text/html") {
-          $r .= urlreplace($this->body,0);
+          #$r .= urlreplace($this->body,0);
+          $r .= $this->body;
         } else {
           $r .= urlreplace($this->body);
         }
-      }
+      } else {
+          $r .= $this->body;
+	  }
     } elseif ($show_as_frame) {
       if ($mformat == 'reply') {
         $r .= "--------\n";
       } else {
         $r .= "<tr><td colspan=\"4\" class=\"pre\">\n";
-        $r .= "<iframe width=\"100%\" height=\"500px\" src=\"".$tutos['base'] ."/php/". $this->getShowLink() ."\"></iframe>\n";
+        $r .= "<iframe width=\"600px\" height=\"500px\" src=\"".$tutos['base'] ."/php/". $this->getShowLink() ."\"></iframe>\n";
         $r .= "</td></tr>\n";
       }
     } elseif ($show_as_img) {
@@ -335,19 +338,32 @@
       
     if ($select_alternative) {
       // check for text/plain
+	  $found = false;
+	  $found_html = false;
+	  $found_text = false;
       foreach($this->bodies as $abody) {
-        if (strtolower($abody->contenttype) == "text/plain") {
-          $r .= $abody->show_html($ly,$mformat,$part);
-          break;
-        } else if (strtolower($abody->contenttype) == "text/html") {
-          $r .= $abody->show_html($ly,$mformat,$part);
-          break;
+        if (!$found_text && strtolower($abody->contenttype) == "text/plain") {
+          $x1 = $abody->show_html($ly,$mformat,$part);
+ 	      $found = true;
+ 	      $found_text = true;
         }
-        // show all
-        foreach($this->bodies as $abody) {
-          $r .= $abody->show_html($ly,$mformat,$part);
+        if (!$found_html && strtolower($abody->contenttype) == "text/html") {
+          $x2 = $abody->show_html($ly,$mformat,$part);
+ 	      $found = true;
+ 	      $found_html = true;
         }
-      }
+	  }
+	  if ($found_html) {
+		  $r .= $x2;
+	  } else if ($found_text) {
+		  $r .= $x1;
+	  }
+      // show all
+	  if (!$found) {
+          foreach($this->bodies as $abody) {
+              $r .= $abody->show_html($ly,$mformat,$part);
+          }
+	  }
     } else {
       foreach($this->bodies as $abody) {
         $r .= $abody->show_html($ly,$mformat,$part);
@@ -523,10 +539,17 @@
 
     // analyze content type
     if ($this->ct && ($this->parse_in != "Content-type")) {
-      $x = eregi("boundary=[\"]([-_=0-9A-Za-z/.:]*)[\"]",$this->ct,$reg);
+      $x = eregi("charset=[\"]*([-_=0-9A-Za-z/.:]*)[\"]*",$this->ct,$reg);
+      if ($x) {
+        $this->charset = $reg[1];
+      }
+#		echo 'xxx  '.$this->ct.'  '. $this->charset .'<br>';
+      $x = eregi("boundary=[\"]*([-_=0-9A-Za-z/.:]*)[\"]*",$this->ct,$reg);
+#		echo 'xxx  '.$this->ct.' | '. $this->boundary .'<br>';
       if ($x) {
         $this->boundary = $reg[1];
       }
+#		echo 'xxx  '.$this->ct.' | '. $this->boundary .'<br>';
       eregi("Content-type:[ ]*([0-9A-Za-z./-]*)",$this->ct,$reg);
       $this->contenttype = $reg[1];
 #        echo "ct |". $this->contenttype  ."|". $this->ct."<br />\n";
@@ -1406,7 +1429,7 @@
   /**
    * send this mail
    */
-  function send() {
+  function send($fname = '') {
     global $lang, $tutos;
 
     $msg = "";
@@ -1540,8 +1563,11 @@
       $msg .= $lang['Err0035'] ." (1)<br />\n";
       return $msg;
     }    
-
-    $omsg = $this->open_channel($from,$rcpt);
+	if($fname == '') {
+        $omsg = $this->open_channel($from,$rcpt);
+	} else {
+        $this->fd =  @fopen($fname,'w');
+	}
     if ($omsg != "") {
       return $msg . $omsg;
     }
@@ -1568,8 +1594,18 @@
 #    };
     $this->output($this);
 
-    $msg .= $this->close_channel();
+	if ($fname == '') {
+        $msg .= $this->close_channel();
+  	} else {
+	    fclose($this->fd);
+	}
     return $msg;
   }
+  /**
+   * write to a file
+   */
+  function save_to_file($fname) {
+    return $this->send($fname);
+  }
 }
 ?>
\ No newline at end of file

Index: mail_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail_ins.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- mail_ins.php	4 Apr 2007 19:14:34 -0000	1.39
+++ mail_ins.php	11 Jan 2009 10:34:22 -0000	1.40
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2009 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,7 +95,7 @@
    $file = new tutos_file($dbconn);
    $file = $file->read($_POST['fid'],$file);
    $m2 = new mail($current_user);
-   $m2->init_by_file_obj($this->file,false);
+   $m2->init_by_file_obj($file,false);
    # add a in reply/reference id build by the message-id
    foreach ($m2->hdr as $i) {
      if (eregi("^Message-ID:(.*)",$i,$reg)) {

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- product.pinc	9 Jan 2009 14:17:01 -0000	1.166
+++ product.pinc	11 Jan 2009 10:34:22 -0000	1.167
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- permission.p3	22 Sep 2008 17:52:57 -0000	1.163
+++ permission.p3	11 Jan 2009 10:34:22 -0000	1.164
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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,12 +18,12 @@
   ini_set("include_path",".");
 }
 # Files noted here are included everywhere
-include_once 'base.pinc';
-include_once 'module_base.pinc';
-include_once 'handler.pinc';
-include_once 'db.p3';
-include_once 'Date.pinc';
-include_once 'user.pinc';
+require_once 'base.pinc';
+require_once 'module_base.pinc';
+require_once 'handler.pinc';
+require_once 'db.p3';
+require_once 'Date.pinc';
+require_once 'user.pinc';
 
 
 if (!extension_loaded('session')) {

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

Modified Files:
	task_new.php 
Log Message:
using strat and end date from parent objects

Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- task_new.php	14 Nov 2008 21:14:51 -0000	1.83
+++ task_new.php	10 Jan 2009 10:53:50 -0000	1.84
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -10,20 +10,20 @@
  * @module task_new
  * @package task
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'task.pinc';
- include_once 'product.pinc';
- include_once 'timetrack.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'task.pinc';
+require_once 'product.pinc';
+require_once 'timetrack.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('task','new');
- loadlayout();
- /**
-  * display a form to enter/modify a task
-  */
- class task_new extends layout {
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('task','new');
+loadlayout();
+/**
+ * display a form to enter/modify a task
+ */
+class Task_new extends layout {
    /**
     *
     */
@@ -259,6 +259,22 @@
        return;
      }
 
+     if ( isset($_GET['pid']) ) {
+       $this->obj->parent = GetObject($this->dbconn,$_GET['pid']);
+       if (is_object($this->obj->parent) ) {
+         $this->obj->p_id = $this->obj->parent->id;
+		 /** preset start and end date */
+		 if ($this->obj->parent->getTypeId() == usetaskmanagement ) {
+ 		     $this->obj->s_start = $this->obj->parent->s_start;
+		     $this->obj->s_end = $this->obj->parent->s_end;
+		 } else
+		 if ($this->obj->parent->getTypeId() == useprojects ) {
+ 		     $this->obj->s_start = $this->obj->parent->p_start;
+		     $this->obj->s_end = $this->obj->parent->p_end;
+		 }
+       }
+     }
+
      $this->obj->set_string_from_arg('name','name',$lang['TaskName']);
      $this->obj->set_string_from_arg('desc','desc',$lang['TaskDesc']);
 
@@ -290,12 +306,6 @@
      $this->obj->set_datetime_from_arg('s_start','s_start',$lang['TaskS_Start']);
      $this->obj->set_datetime_from_arg('s_end','s_end',$lang['TaskS_End']);
 
-     if ( isset($_GET['pid']) ) {
-       $this->obj->parent = GetObject($this->dbconn,$_GET['pid']);
-       if (is_object($this->obj->parent) ) {
-         $this->obj->p_id = $this->obj->parent->id;
-       }
-     }
      #
      # preset additional custom fields
      #
@@ -319,11 +329,11 @@
 
      add_module_newlinks($this,$this->obj);
    }
- }
+}
 
- $l = new task_new($current_user);
- $l->display();
- $dbconn->Close();
+$l = new Task_new($current_user);
+$l->display();
+$dbconn->Close();
 ?>
 <!--
     CVS Info:  $Id$

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

Modified Files:
	admin_show.php base.pinc custom.pinc database.pinc 
	handler.pinc mytutos.php product.pinc product_ins.php 
	product_new.php product_overview.php product_show.php 
	team_show.php timetrack_new.php timetrack_overview.php 
	webelements.p3 
Log Message:
mainly fixes for new coding standard PEAR / added copyright end date where touched

Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- admin_show.php	23 Dec 2008 15:30:58 -0000	1.91
+++ admin_show.php	9 Jan 2009 14:17:01 -0000	1.92
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2001 - 2008 by Gero Kohnert
+ *  Copyright 2001 - 2009 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   
@@ -10,14 +10,14 @@
  * @module admin_show
  * @package BASE
  */
- include 'webelements.p3';
- include 'permission.p3';
- require_once 'db/table.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'db/table.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('admin','show');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('admin','show');
+loadlayout();
 
  /**
   * FROM http://www.php.net/manual/en/function.session-set-save-handler.php
@@ -69,10 +69,10 @@
  }
 
 
- /**
-  * display a admin page
-  */
- class admin_show extends layout {
+/**
+ * display a admin page
+ */
+class Admin_show extends layout {
    Function SubTableStart() {
      return "<table width=\"100%\" class=\"single\" border=\"1\" cellpadding=\"3\" cellspacing=\"0\">\n";
    }
@@ -551,10 +551,11 @@
      $this->addMenu($x);
    }
  }
- session_write_close();
- $l = new admin_show($current_user);
- $l->display();
- $dbconn->close();
+
+session_write_close();
+$l = new Admin_show($current_user);
+$l->display();
+$dbconn->close();
 ?>
 <!--
     CVS Info:  $Id$

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- product_show.php	20 May 2008 17:42:34 -0000	1.119
+++ product_show.php	9 Jan 2009 14:17:01 -0000	1.120
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -12,17 +12,17 @@
  * @module product_show
  * @package product
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'product.pinc';
- include_once 'appointment.pinc';
- include_once 'timetrack.pinc';
- include_once 'task.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'product.pinc';
+require_once 'appointment.pinc';
+require_once 'timetrack.pinc';
+require_once 'task.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('product','show');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('product','show');
+loadlayout();
 
  /**
   * display a product

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- product_new.php	14 Nov 2008 21:14:51 -0000	1.107
+++ product_new.php	9 Jan 2009 14:17:01 -0000	1.108
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 by Gero Kohnert
  *  cloning option added by Michal Salaban 2003
  *
  *  This program is free software; you can redistribute it and/or modify it 
@@ -13,20 +13,20 @@
  * @module product_new
  * @package product
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'appointment.pinc';
- include_once 'product.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'appointment.pinc';
+require_once 'product.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('product','new');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('product','new');
+loadlayout();
 
- /**
-  * change/modify a project
-  */
- class product_new extends layout {
+/**
+ * change/modify a project
+ */
+class Product_new extends layout {
    /**
     * display the form
     */
@@ -425,11 +425,11 @@
      }
      add_module_newlinks($this,$this->obj);
    }
- }
+}
 
- $l = new product_new($current_user);
- $l->display();
- $dbconn->Close();
+$l = new Product_new($current_user);
+$l->display();
+$dbconn->Close();
 ?>
 <!--
     CVS Info:  $Id$

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- product_ins.php	23 Jul 2008 18:51:14 -0000	1.66
+++ product_ins.php	9 Jan 2009 14:17:01 -0000	1.67
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2008 by Gero Kohnert
+ * Copyright 1999 - 2009 by Gero Kohnert
  * cloning option added by Michal Salaban, 2003
  *
  *  This program is free software; you can redistribute it and/or modify it 

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- timetrack_overview.php	22 Dec 2008 10:49:01 -0000	1.106
+++ timetrack_overview.php	9 Jan 2009 14:17:01 -0000	1.107
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
  *  under the terms of the GNU General Public License as published by the   
@@ -15,19 +15,19 @@
  * @module timetrack_overview
  * @package timetrack
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'timetrack.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'timetrack.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('timetrack','overview');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('timetrack','overview');
+loadlayout();
 
- /**
-  * show a overview of timetracks
-  */
- class timetrack_overview extends layout {
+/**
+ * show a overview of timetracks
+ */
+class Timetrack_overview extends layout {
    /**
     * display the info
     */
@@ -736,10 +736,9 @@
        $this->addMenu($x);
      }
    }
- }
-
+}
 
- $l = new timetrack_overview($current_user);
- $l->display();
- $dbconn->Close();
+$l = new Timetrack_overview($current_user);
+$l->display();
+$dbconn->Close();
 ?>
\ No newline at end of file

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- webelements.p3	14 Dec 2008 16:22:53 -0000	1.341
+++ webelements.p3	9 Jan 2009 14:17:01 -0000	1.342
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -1660,6 +1660,7 @@
    if (! class_exists('bug')) {
      return;
    }
+   $sep = '';
    bug::obj_read($ref);
    if ( count($ref->list[usebugtracking]) > 0 ) {
      foreach($ref->list[usebugtracking] as $i => $f) {
@@ -1676,6 +1677,7 @@
    if (! class_exists('installation')) {
      return;
    }
+   $sep = '';
    installation::obj_read($ref);
    if ( count($ref->list[useinstmanagement]) > 0 ) {
      foreach($ref->list[useinstmanagement] as $i => $f) {

Index: handler.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/handler.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- handler.pinc	4 Jun 2004 06:06:37 -0000	1.5
+++ handler.pinc	9 Jan 2009 14:17:01 -0000	1.6
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2009 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -9,33 +9,35 @@
 /**
  * run handler for given input and type
  */
-Function handle($type,&$obj,$arg) {
-  global $tutos;
-  $msg = "";
-  if (!isset($tutos[handler][$type]) || (count($tutos[handler][$type]) == 0) ) {
-    return $arg;
-  }
-  $cnt = count($tutos[handler][$type]);
-  if ($cnt > 1) {
-    $msg = $arg;
-  }
-  foreach($tutos[handler][$type] as $i => $f) {
-    if (file_exists($tutos['base'] ."/php/". $f)) {
-      include_once  $tutos['base'] ."/php/". $f;
-      if (class_exists($i)) {
-        $x = new $i($obj->dbconn);
-        if ( ! is_subclass_of($x,'tutos_handler') ) {
-           Fatal_Error("Wrong handler class: ". $i);
-        }
-        $msg .= $x->handle($obj,$arg,$cnt);
-      } else {
-        $msg .= $i ." not correctly configured";
-      }
-    } else {
-      $msg .= $arg."<br \> (". $i ."handler not found)";
-	}
-  }
-  return $msg;
+Function handle($type,&$obj,$arg) 
+{
+    global $tutos;
+
+    $msg = '';
+    if (!isset($tutos[handler][$type]) || (count($tutos[handler][$type]) == 0) ) {
+        return $arg;
+    }
+    $cnt = count($tutos[handler][$type]);
+    if ($cnt > 1) {
+        $msg = $arg;
+    }
+    foreach($tutos[handler][$type] as $i => $f) {
+        if (file_exists($tutos['base'] .'/php/'. $f)) {
+            include_once  $tutos['base'] .'/php/'. $f;
+            if (class_exists($i)) {
+                $x = new $i($obj->dbconn);
+                if ( ! is_subclass_of($x,'tutos_handler') ) {
+                    Fatal_Error('Wrong handler class: '. $i);
+                }
+                $msg .= $x->handle($obj,$arg,$cnt);
+            } else {
+                $msg .= $i .' not correctly configured';
+            }
+        } else {
+            $msg .= $arg.'<br \> ('. $i .' handler not found)';
+	    }
+    }
+    return $msg;
 }
 
 /**
@@ -44,12 +46,13 @@
  * @package BASE
  * @module tutos_handler
  */
-class tutos_handler {
-  /**
-   * run the handler
-   */
-  function handle(&$obj,$cnt) {
-  }
+class tutos_handler 
+{
+    /**
+     * run the handler
+     */
+    function handle(&$obj,$cnt) {
+    }
 }
 
 ?>
\ No newline at end of file

Index: custom.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/custom.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- custom.pinc	7 Nov 2008 20:00:38 -0000	1.28
+++ custom.pinc	9 Jan 2009 14:17:01 -0000	1.29
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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 @@
   * x   = table description
   * obj = a object as described in $x
   */
- function get_custom_field(&$x,&$obj) {
+ function get_custom_field(&$x,&$obj,&$base) {
    global $lang;
 
    if (!isset($x['ftype'])) $x['ftype'] = '';
@@ -71,7 +71,7 @@
    } else if ($x[type] == "float") {
      return number_format($obj,2,$lang['DecPoint'],$lang['ThousandPoint']);
    } else {
-     return handle($x['handler'],$obj,myentities($obj)) .'&nbsp;';
+     return handle($x['handler'],$base,myentities($obj)) .'&nbsp;';
    }
    return 'unknown fieldtype'.$x['ftype'].' '.$x[type];
  }
@@ -283,7 +283,7 @@
    $r ='';
    foreach(get_custom_overview_fields(&$layout,$section) as $ti => $tx) {
      $f = '_fld_'.$ti;
-     $d = get_custom_field($tx,$obj->$f);
+     $d = get_custom_field($tx,$obj->$f,$obj);
      $r .= ' <td>'.($d != '' ? $d:'&nbsp;').'</td>'."\n";
    }
    return $r;
@@ -310,7 +310,7 @@
      $r .= "<tr>\n";
      $r .= $layout->showfield(myentities(getLang($x['lang'])));
      $r .= '  <td colspan="'.($cols-1)."\">\n";
-     $r .= get_custom_field($x,$obj->$fld);
+     $r .= get_custom_field($x,$obj->$fld,$obj);
      $r .= "  </td>\n";
      $r .= "</tr>\n";
    }

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- mytutos.php	7 Jul 2008 13:55:00 -0000	1.99
+++ mytutos.php	9 Jan 2009 14:17:01 -0000	1.100
@@ -6,331 +6,376 @@
  *  under the terms of the GNU General Public License as published by the   
  *  Free Software Foundation; version 2 of the License.                     
  *
+ *  PHP version 5
  *
- * based on some work/ideas of Michael Somers( Twent First Century Communication <msomers at tfcci.com>)
+ *  @category  PHP
+ *  @package   mytutos
+ *  @author    Gero Kohnert
+ *  @copyright 1999-2008 Gero Kohnert
+ *  @license   GPL2
+ *  @link      http://www.tutos.org
+ *
+ *  based on some work/ideas of Michael Somers
+ * ( Twent First Century Communication <msomers at tfcci.com>)
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'product.pinc';
- include_once 'appointment.pinc';
- include_once 'task.pinc';
- include_once 'timetrack.pinc';
 
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'product.pinc';
+require_once 'appointment.pinc';
+require_once 'task.pinc';
+require_once 'timetrack.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('mytutos','show');
- loadmodule('rate');
- loadlayout();
+
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('mytutos', 'show');
+loadmodule('rate');
+loadlayout();
  
 
- Function info_table_start() {
-   return " <table border=\"0\" cellpadding=\"3\" cellspacing=\"1\" width=\"100%\">\n";
- }
- Function info_table_end() {
-   return " </table>\n";
- }
- /* ---------------------------------------------------------------------------
-  * Display calendar for one week
-  */
- Function calendar_info(&$adr,$t) {
-   global $lang, $tutos, $current_user;
+/**
+ * starting a subtable with info
+ */
+Function info_table_start() 
+{
+    return " <table border=\"0\" cellpadding=\"3\" cellspacing=\"1\" width=\"100%\">\n";
+}
 
-   $ts = adodb_mktime(12,0,0,substr($t,4,2),substr($t,6,2),substr($t,0,4));
+/**
+ * closing a subtable with info
+ */
+Function info_table_end() 
+{
+    return " </table>\n";
+}
 
-   /* Back to last Monday or Sunday before ts */
-   while ( Date("w",$ts) != $adr->weekstart ) {
-     $ts -= 86400;
-   }
+/**
+ * Display calendar for one week
+ */
+Function calendar_info(&$adr, $t) 
+{
+    global $lang, $tutos, $current_user;
 
-   $w0 =  (( 1 + Date("w",adodb_mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3;
-   $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
-   $yy = Date("y",$ts);
+    $ts = adodb_mktime(12, 0, 0, 
+                       substr($t, 4, 2), 
+                       substr($t, 6, 2), 
+                       substr($t, 0, 4));
 
-   $day = 0;
-   $dd = new TUTOS_Date_Time();
+    /* Back to last Monday or Sunday before ts */
+    while ( Date("w", $ts) != $adr->weekstart ) {
+        $ts -= 86400;
+    }
 
-   $from =  new TUTOS_Date_Time();
-   $to =  new TUTOS_Date_Time();
+    $w0 =  ((1 + Date("w", adodb_mktime(12, 0, 0, 1, 1, Date("Y", $ts)))) % 7) > 3;
+    $wn = sprintf("%02d", Round((Date("z", $ts)+7) / 7));
+    $yy = Date("y", $ts);
 
-   $from->setDateTimeTS($ts - 12 * 3600);
-   $to->setDateTimeTS($ts - 12 * 3600);
-   $to->addDays(7);
+    $day = 0;
+    $dd  = new TUTOS_Date_Time();
 
-   $adr->callist = array();
-   appointment::readCal($adr,$from,$to);
-   task::readCal($adr,$from,$to);
-   foreach($tutos[activemodules] as $i => $f) {
-     $x = new $tutos[modules][$f][name]($adr->dbconn);
-     $x->readCal($adr,$from,$to);
-   }
+    $from =  new TUTOS_Date_Time();
+    $to   =  new TUTOS_Date_Time();
 
-   echo info_table_start();
-   echo " <tr>\n";
-   echo "  <th>". $lang['week'] ."</th>\n";
-   $wd = $ts;
+    $from->setDateTimeTS($ts - 12 * 3600);
+    $to->setDateTimeTS($ts - 12 * 3600);
+    $to->addDays(7);
 
-   for ( $i = $adr->weekstart;$i<=6;$i++ ) {
-     if ($adr->isWorkDay($i)) {
-       $tref = Date("Ymd",$wd);
-       echo "  <th>". menulink("calendar_day.php?t=". $tref,$lang["Day$i"]) ."</th>\n";
-     }
-     $wd = NextDay($wd);
-   } 
+    $adr->callist = array();
+    appointment::readCal($adr, $from, $to);
+    task::readCal($adr, $from, $to);
+    foreach ($tutos[activemodules] as $i => $f) {
+        $x = new $tutos[modules][$f][name]($adr->dbconn);
+        $x->readCal($adr, $from, $to);
+    }
 
-   for ( $i = 0;$i<$adr->weekstart;$i++ ) {
-     if ($adr->isWorkDay($i)) {
-       $tref = Date("Ymd",$wd);
-       echo "  <th>". menulink("calendar_day.php?t=". $tref,$lang["Day$i"]) ."</th>\n";
-     }
-     $wd = NextDay($wd);
-   }
-   echo " </tr>\n";
+    echo info_table_start();
+    echo " <tr>\n";
+    echo "  <th>". $lang['week'] ."</th>\n";
+    $wd = $ts;
 
-   echo " <tr>\n";
-   echo "  <td class=\"week\" width=\"5%\">". menulink("calendar_week.php?t=".Date("Ymd",$ts), $wn ."/". $yy,$lang['week'] ." ". $wn ."/". $yy ) ."</td>\n";
+    for ( $i = $adr->weekstart;$i<=6;$i++ ) {
+        if ($adr->isWorkDay($i)) {
+            $tref = Date("Ymd", $wd);
+            echo '  <th>';
+            echo menulink("calendar_day.php?t=". $tref, $lang["Day$i"]);
+            echo "</th>\n";
+        }
+        $wd = NextDay($wd);
+    } 
 
-   while ( $day < 7 ) {
-     # $d = strftime($lang['DateFormatStr'],$ts);
-     $dd->setDateTimeTS($ts);
-     $d = $dd->getDate();
-     $tref = Date("Ymd",$ts);
-     $dinfo = GetDaysInfo($ts);
-     /* Select appointments for this day */
-     $next = NextDay($ts);
-     if ( ! $dd->isWorkDay($adr) ) {
-       $ts = $next;
-       $day++;
-       continue;
-     }
-     echo "<td class=\"". $dinfo[color] ."\" width=\"10%\">\n";
+    for ( $i = 0;$i<$adr->weekstart;$i++ ) {
+        if ($adr->isWorkDay($i)) {
+            $tref = Date("Ymd", $wd);
+            echo '  <th>';
+            echo menulink("calendar_day.php?t=". $tref, $lang["Day$i"]);
+            echo "</th>\n";
+        }
+        $wd = NextDay($wd);
+    }
+    echo " </tr>\n";
 
-     if ( isset($dinfo[Desc]) ) {
-       if ( $current_user->feature_ok(usecalendar,PERM_NEW) ) {
-         echo " " . makelink("app_new.php?t=". $tref,$d,$lang['NewAppointInfo'],$dinfo[popinfo]) ."\n";
-       } else {
-         echo " " . $d ."\n";
-       }
-       echo "<br /><span class=\"dinfo\">". $dinfo[Desc] ."</span>\n";
-     } else {
-       if ( $current_user->feature_ok(usecalendar,PERM_NEW) ) {
-         echo " " . makelink("app_new.php?t=". $tref,$d,$lang['NewAppointInfo']) ."\n";
-       } else {
-         echo " " . $d ."\n";
-       }
-     }
+    echo " <tr>\n";
+    echo "  <td class=\"week\" width=\"5%\">". menulink("calendar_week.php?t=".Date("Ymd", $ts), $wn ."/". $yy, $lang['week'] .' '. $wn .'/'. $yy) ."</td>\n";
 
-     $hastable = 0;
-     foreach ($adr->callist as $idx => $x) {
-       /* the correct day */
-       if ( ! $adr->callist[$idx]->inside($dd) ) {
-         continue;
-       }
-       # Check if appointment is displayed
-       if ( $adr->callist[$idx]->gettype() == "appointment" ) {
-         $found = 0;
-         @reset($adr->callist[$idx]->participant);
-         while ( ($found == 0) && (list ($i,$f) = @each ($adr->callist[$idx]->participant)) ) {
-           if ( $f->id == $adr->id ) {
-             $found = 1;
-           } else if ( array_key_exists($f->id,$adr->teamlist) ) {
-             $found = 1;
-           }
-         }
-         if ( $found == 0 ) {
-           continue;
-         }
-       }
-       // Do not show finished tasks
-       if ( ($adr->callist[$idx]->gettype() == "task") && ($adr->callist[$idx]->state == 2) ) {
-         continue;
-       }
-       if ( $hastable == 0 ) {
-         echo " <table class=\"formatted\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
-         $hastable = 1;
-       } else {
-         echo "  <tr><td class=\"". $dinfo[color] ."\" colspan=\"3\"><img src=\"". $tutos['base'] ."/html/black.png\" width=\"100%\" height=\"1\" alt=\"--------\"></td></tr>\n";
-       }
-       // Show appointments or task
-       $adr->callist[$idx]->formatted();
-     }
+    while ($day < 7) {
+        // $d = strftime($lang['DateFormatStr'],$ts);
+        $dd->setDateTimeTS($ts);
+        $d     = $dd->getDate();
+        $tref  = Date("Ymd", $ts);
+        $dinfo = GetDaysInfo($ts);
+        /* Select appointments for this day */
+        $next  = NextDay($ts);
+        if ( ! $dd->isWorkDay($adr) ) {
+            $ts = $next;
+            $day++;
+            continue;
+        }
+        echo "<td class=\"". $dinfo[color] ."\" width=\"10%\">\n";
 
-     if ( $hastable == 1 ) {
-       echo " </table>\n";
-     }
+        if ( isset($dinfo[Desc]) ) {
+            if ($current_user->feature_ok(usecalendar, PERM_NEW) ) {
+                echo ' ';
+                echo makelink("app_new.php?t=". $tref, 
+                                    $d, 
+                                    $lang['NewAppointInfo'],
+                                    $dinfo[popinfo]);
+                echo "\n";
+            } else {
+                echo ' ' . $d ."\n";
+            }
+            echo '<br /><span class="dinfo">'. $dinfo[Desc] ."</span>\n";
+        } else {
+            if ($current_user->feature_ok(usecalendar, PERM_NEW) ) {
+                echo ' ';
+                echo makelink("app_new.php?t=". $tref, $d, $lang['NewAppointInfo']);
+                echo "\n";
+            } else {
+                echo ' ' . $d ."\n";
+            }
+        }
 
-     echo "</td>\n";
-     $day++;
-     $ts = $next;
-   }
-   echo " </tr>\n";
-   echo info_table_end();
- }
+        $hastable = 0;
+        foreach ($adr->callist as $idx => $x) {
+            /* the correct day */
+            if ( ! $adr->callist[$idx]->inside($dd) ) {
+                continue;
+            }
+            /* Check if appointment is displayed */
+            if ($adr->callist[$idx]->gettype() == "appointment") {
+                $found = 0;
+                @reset($adr->callist[$idx]->participant);
+                while ( ($found == 0) && (list ($i,$f) = @each ($adr->callist[$idx]->participant)) ) {
+                    if ( $f->id == $adr->id ) {
+                        $found = 1;
+                    } else if ( array_key_exists($f->id,$adr->teamlist) ) {
+                        $found = 1;
+                    }
+                }
+                if ( $found == 0 ) {
+                    continue;
+                }
+            }
+            // Do not show finished tasks
+            if ( ($adr->callist[$idx]->gettype() == "task") && ($adr->callist[$idx]->state == 2) ) {
+                continue;
+            }
+            if ( $hastable == 0 ) {
+                echo " <table class=\"formatted\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
+                $hastable = 1;
+            } else {
+                echo '  <tr><td class="'. $dinfo[color] .'" colspan="3">';
+                echo '  <img src="'. $tutos['base'] ."/html/black.png\" width=\"100%\" height=\"1\" alt=\"--------\" /></td></tr>\n";
+            }
+            // Show appointments or task
+            $adr->callist[$idx]->formatted();
+        }
 
+        if ( $hastable == 1 ) {
+            echo " </table>\n";
+        }
 
+        echo "</td>\n";
+        $day++;
+        $ts = $next;
+    }
+    echo " </tr>\n";
+    echo info_table_end();
+}
 
- /**
-  * display an overview of everything that's interessting for an user
-  */
- class mytutos extends layout {
-   /**
-    * the data display part
-    */
-   Function info() {
-     global $lang , $tutos;
 
-     echo $this->DataTableStart();
-     echo "<tr>\n";
-     # Header
-     echo "<th colspan=\"4\">". sprintf($lang['PersonalPageFor'],menulink($this->adr->getUrl(),$this->adr->getFullName(),$this->adr->getFullName())) ."</th>\n";
-     echo "</tr>\n";
 
-     # Display all the info blocks
-     # Weeks calendar
-     $ts = adodb_mktime(0,0,0,substr($this->t,4,2),substr($this->t,6,2),substr($this->t,0,4));
-     $last_week = Date("Ymd",$ts -  7 * 86400);
-     $next_week = Date("Ymd",$ts +  7 * 86400);
-     if ( $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-       echo "<tr>\n";
-       echo " <th colspan=\"4\">\n  ". menulink("mytutos.php?t=".$last_week,$this->theme->getImage(left,'list'),$lang['lastweek']) . "&nbsp;". $this->theme->getImage(appointment::getHtmlIcon(),'list') ." ". $lang['Calendar'] ."&nbsp;" . menulink("mytutos.php?t=".$next_week,$this->theme->getImage(right,'list') ,$lang['nextweek'])  ."\n</th>\n";
-       echo "</tr>\n";
-       echo "<tr>\n";
-       echo " <td colspan=\"4\" valign=\"top\">\n";
-       calendar_info($this->adr,$this->t);
-       echo " </td>\n";
-       echo "</tr>\n";
-     }
+/**
+ * display an overview of everything that's interessting for an user
+ */
+class Mytutos extends layout 
+{
+    /**
+     * the data display part
+     */
+    Function info() 
+    {
+        global $lang , $tutos;
 
-     $cnt = 0;
+        echo $this->DataTableStart();
+        echo "<tr>\n";
+        /* Header */
+        echo ' <th colspan="4">';
+        echo sprintf($lang['PersonalPageFor'], menulink($this->adr->getUrl(), $this->adr->getFullName(), $this->adr->getFullName()));
+        echo " </th>\n";
+        echo "</tr>\n";
 
-     # Projects
-     $r = product::mytutos($this->adr);
-     if ($r != "") {
-       if ( ($cnt % 2) == 0 ) {
-         echo "<tr>\n";
-       }
-       echo " <td width=\"50%\" colspan=\"2\" valign=\"top\">\n". $r ."</td>\n";
-       if ( ($cnt % 2) != 0 ) {
-         echo "</tr>\n";
-       }
-       $cnt++;
-     }
+        /* Display all the info blocks  */
+        /* Weeks calendar               */
+        $ts        = adodb_mktime(0, 0, 0,
+                           substr($this->t, 4, 2),
+                           substr($this->t, 6, 2),
+                           substr($this->t, 0, 4));
+        $last_week = Date("Ymd", $ts -  7 * 86400);
+        $next_week = Date("Ymd", $ts +  7 * 86400);
+        if ( $this->user->feature_ok(usecalendar, PERM_SEE) ) {
+            echo "<tr>\n";
+            echo " <th colspan=\"4\">\n";
+            echo menulink("mytutos.php?t=".$last_week, $this->theme->getImage(left, 'list'), $lang['lastweek']) . "&nbsp;". $this->theme->getImage(appointment::getHtmlIcon(), 'list') ." ". $lang['Calendar'] ."&nbsp;";
+            echo menulink("mytutos.php?t=".$next_week, $this->theme->getImage(right, 'list'), $lang['nextweek'])  ."\n</th>\n";
+            echo "</tr>\n";
+            echo "<tr>\n";
+            echo " <td colspan=\"4\" valign=\"top\">\n";
+            calendar_info($this->adr, $this->t);
+            echo " </td>\n";
+            echo "</tr>\n";
+        }
 
-     foreach($tutos[activemodules] as $i => $f) {
-       $x = new $tutos[modules][$f][name]($this->dbconn);
-       $r = $x->mytutos($this->adr);
-       if ($r == "") {
-         continue;
-       }
-       if ( ($cnt % 2) == 0 ) {
-         echo "<tr>\n";
-       }
-       echo " <td width=\"50%\" colspan=\"2\" valign=\"top\">\n". $r ."</td>\n";
-       if ( ($cnt % 2) != 0 ) {
-         echo "</tr>\n";
-       }
-       $cnt++;
-     }
-     if ( ($cnt % 2) != 0 ) {
-       echo "</tr>\n";
-     }
+        $cnt = 0;
 
-     echo $this->DataTableEnd();
-   }
-   /**
-    * naviagtion
-    */
-   Function navigate() {
-   }
-   /**
-    * prepare
-    */
-   Function prepare() {
-     global $lang ;
+        /* Projects */
+        $r = product::mytutos($this->adr);
+        if ($r != "") {
+            if ( ($cnt % 2) == 0 ) {
+                echo "<tr>\n";
+            }
+            echo " <td width=\"50%\" colspan=\"2\" valign=\"top\">\n". $r ."</td>\n";
+            if ( ($cnt % 2) != 0 ) {
+                echo "</tr>\n";
+            }
+            $cnt++;
+        }
 
-     $this->name = $lang['PersonalPage'];
-     $this->t = Date("Ymd");
-     $this->adr = new tutos_user($this->dbconn);
+        foreach ($tutos[activemodules] as $i => $f) {
+            $x = new $tutos[modules][$f][name]($this->dbconn);
+            $r = $x->mytutos($this->adr);
+            if ($r == "") {
+                continue;
+            }
+            if ( ($cnt % 2) == 0 ) {
+                echo "<tr>\n";
+            }
+            echo " <td width=\"50%\" colspan=\"2\" valign=\"top\">\n". $r ."</td>\n";
+            if ( ($cnt % 2) != 0 ) {
+                echo "</tr>\n";
+            }
+            $cnt++;
+        }
+        if ( ($cnt % 2) != 0 ) {
+            echo "</tr>\n";
+        }
 
-     if ( isset($_GET['t']) ) {
-       $this->t = $_GET['t'];
-     }
-     if ( isset($_GET['adr']) ) {
-       $this->adr = $this->adr->read($_GET['adr'],$this->adr);
-       $this->adr->read_permissions();
-       $this->adr->layout = $this->user->layout;
-     }
-     if ( $this->adr->id == -1 ) {
-       $this->adr = &$this->user;
-     }
-     if (! $this->adr->see_ok() ) {
-       $this->adr = &$this->user;
-     }
+        echo $this->DataTableEnd();
+    }
+    /**
+     * naviagtion
+     */
+    Function navigate() 
+    {
+    }
+    /**
+     * prepare
+     */
+    Function prepare() 
+    {
+        global $lang ;
 
-     $x = task::getaddlink($this->user,$this->adr);
-     $this->addMenu($x);
-     
-     if ( $this->user->feature_ok(userates,PERM_SEE) ) {
-       $x = rate::getaddlink($this->user,$this->adr);
-       $this->addMenu($x);
-     }
-     
-     $x = timetrack::getaddlink($this->user,$this->adr);
-     $this->addMenu($x);
-     $x = timetrack::getSelectLink($this->user,$lang['TimetrackSearch']);
-     $this->addMenu($x);
+        $this->name = $lang['PersonalPage'];
+        $this->t    = Date("Ymd");
+        $this->adr  = new tutos_user($this->dbconn);
 
-     if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
-       $x = array( url => "task_overview.php?id=".$this->adr->id,
-                   image =>  $this->theme->getImage(task::getHtmlIcon(),'menu'),
-                   text => $lang['TaskOverview'],
-                   info =>sprintf($lang['TaskOverviewInfo'],$this->adr->getFullName()),
-                   category => array("overview","task")
-                 );
-       $this->addMenu($x);
-     }
+        if (isset($_GET['t'])) {
+            $this->t = $_GET['t'];
+        }
+        if ( isset($_GET['adr']) ) {
+            $this->adr = $this->adr->read($_GET['adr'], $this->adr);
+            $this->adr->read_permissions();
+            $this->adr->layout = $this->user->layout;
+        }
+        if ( $this->adr->id == -1 ) {
+            $this->adr = &$this->user;
+        }
+        if (! $this->adr->see_ok() ) {
+            $this->adr = &$this->user;
+        }
 
-    if ( $this->user->feature_ok(usehistory,PERM_SEE) ) {
-       $x = array( url => "history_show.php?adr_id=".$this->adr->id,
-                   text => $lang['HistoryLink'],
-                   info =>sprintf($lang['HistoryLinkI'],$this->adr->getFullName()),
-                   category => array("overview","history")
-                 );
-       $this->addMenu($x);
-    }
+        $x = task::getaddlink($this->user, $this->adr);
+        $this->addMenu($x);
+     
+        if ( $this->user->feature_ok(userates, PERM_SEE) ) {
+            $x = rate::getaddlink($this->user, $this->adr);
+            $this->addMenu($x);
+        }
+     
+        $x = timetrack::getaddlink($this->user, $this->adr);
+        $this->addMenu($x);
+        $x = timetrack::getSelectLink($this->user, $lang['TimetrackSearch']);
+        $this->addMenu($x);
 
-    if ( $this->adr->mod_ok() ) {
-       $x = array( url => "user_new.php?id=".$this->adr->id,
-                   text => $lang['PersonalSettings'],
-                   info =>sprintf($lang['PersonalSettingsI'],$this->adr->getFullName()),
-                   category => array("obj","view")
-                 );
-       $this->addMenu($x);
-     }
+        if ( $this->user->feature_ok(usetaskmanagement, PERM_SEE) ) {
+            $x = array( URL => "task_overview.php?id=".$this->adr->id,
+                image =>  $this->theme->getImage(task::getHtmlIcon(), 'menu'),
+                TEXT => $lang['TaskOverview'],
+                INFO =>sprintf($lang['TaskOverviewInfo'], $this->adr->getFullName()),
+                CATEGORY => array("overview","task")
+            );
+            $this->addMenu($x);
+        }
 
-     if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) &&  $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-       $x = array( url => "res_cal.php?id=".$this->adr->id,
-                   text => $lang['ResCal'],
-                   info => $lang['ResCal'],
-                   category => array("obj","view")
-                 );
-       $this->addMenu($x);
-     }
+        if ( $this->user->feature_ok(usehistory, PERM_SEE) ) {
+            $x = array( URL => "history_show.php?adr_id=".$this->adr->id,
+                TEXT => $lang['HistoryLink'],
+                INFO =>sprintf($lang['HistoryLinkI'], $this->adr->getFullName()),
+                CATEGORY => array("overview","history")
+            );
+            $this->addMenu($x);
+        }
 
-     if ( $this->user->feature_ok(usetimetrack,PERM_SEE) ) {
-       $x = array( url => "timetrack_overview.php?worker=".$this->adr->id,
-                   text => $lang['TimetrackBooked'],
-                   info => sprintf($lang['TimetrackBookedI'],$this->adr->getFullName()),
-                   category => array("obj","view")
-                 );
-       $this->addMenu($x);
-     }
+        if ( $this->adr->mod_ok() ) {
+            $x = array( URL => "user_new.php?id=".$this->adr->id,
+                TEXT => $lang['PersonalSettings'],
+                INFO =>sprintf($lang['PersonalSettingsI'], $this->adr->getFullName()),
+                CATEGORY => array("obj","view")
+            );
+            $this->addMenu($x);
+        }
 
+        if ( $this->user->feature_ok(usetaskmanagement, PERM_SEE) &&  $this->user->feature_ok(usecalendar, PERM_SEE) ) {
+            $x = array( URL => "res_cal.php?id=".$this->adr->id,
+                TEXT => $lang['ResCal'],
+                INFO => $lang['ResCal'],
+                CATEGORY => array("obj","view")
+            );
+            $this->addMenu($x);
+        }
 
-   }
- }
+        if ( $this->user->feature_ok(usetimetrack, PERM_SEE) ) {
+            $x = array( URL => "timetrack_overview.php?worker=".$this->adr->id,
+                TEXT => $lang['TimetrackBooked'],
+                INFO => sprintf($lang['TimetrackBookedI'], $this->adr->getFullName()),
+                CATEGORY => array("obj","view")
+            );
+            $this->addMenu($x);
+        }
+    }
+}
 
- $l = new mytutos($current_user);
+ $l = new Mytutos($current_user);
  $l->display();
  $dbconn->Close();
 ?>

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- product_overview.php	22 Dec 2008 10:49:01 -0000	1.127
+++ product_overview.php	9 Jan 2009 14:17:01 -0000	1.128
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -13,22 +13,22 @@
  * @module product_overview
  * @package product
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'appointment.pinc';
- include_once 'timetrack.pinc';
- include_once 'product.pinc';
- include_once 'task.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'appointment.pinc';
+require_once 'timetrack.pinc';
+require_once 'product.pinc';
+require_once 'task.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('product','overview');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('product','overview');
+loadlayout();
 
- /**
-  * show a overview of projects
-  */
- class product_overview extends layout {
+/**
+ * show a overview of projects
+ */
+class Product_overview extends layout {
    /**
     * display the info
     */
@@ -1109,9 +1109,9 @@
      
 
    }
- }
+}
 
- $l = new product_overview($current_user);
- $l->display();
- $dbconn->Close();
+$l = new Product_overview($current_user);
+$l->display();
+$dbconn->Close();
 ?>

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- timetrack_new.php	14 Nov 2008 21:14:51 -0000	1.79
+++ timetrack_new.php	9 Jan 2009 14:17:01 -0000	1.80
@@ -10,21 +10,22 @@
  * @module timetrack_new
  * @package timetrack
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'timetrack.pinc';
- include_once 'task.pinc';
- include_once 'product.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'timetrack.pinc';
+require_once 'task.pinc';
+require_once 'product.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('timetrack','new');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('timetrack','new');
+loadlayout();
 
- /**
-  * change/modify a timetrack entry
-  */
- class timetrack_new extends layout {
+/**
+ * change/modify a timetrack entry
+ */
+class Timetrack_new extends layout 
+{
    /**
     * display the form
     */
@@ -201,12 +202,14 @@
    /**
     * naviagte
     */
-   Function navigate() {
+   Function navigate() 
+   {
    }
    /**
     * prepare
     */
-   Function prepare() {
+   Function prepare() 
+   {
      global $msg,$tutos,$lang;
      #
      # Mode
@@ -330,9 +333,9 @@
    }
  }
 
- $l = new timetrack_new($current_user);
- $l->display();
- $dbconn->Close();
+$l = new Timetrack_new($current_user);
+$l->display();
+$dbconn->Close();
 ?>
 <!--
     CVS Info:  $Id$

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- product.pinc	6 Nov 2008 15:33:10 -0000	1.165
+++ product.pinc	9 Jan 2009 14:17:01 -0000	1.166
@@ -247,6 +247,25 @@
     }
     $r->free();
 
+	// Backreference
+    $q = "SELECT * FROM ". $this->tablename2 ." WHERE adr_id = ". $this->id;
+    $r = $this->dbconn->Exec($q);
+    $n = $r->numrows();
+    $a = 0;
+    while ($a < $n) {
+      $role   = $r->get($a, "role_id");
+      $adr_id = $r->get($a, "pro_id");
+      $desc   = $r->get($a, "description");
+      $obj = getObject($this->dbconn,$adr_id);
+      if ( is_object($obj) ) {
+        $this->role[$role][$obj->id] = &$obj;
+        $this->roledesc[$role][$obj->id] = $desc;
+      }
+      $a++;
+      unset($obj);
+    }
+    $r->free();
+
     foreach(array_unique(array_keys($this->role)) as $i) {
       $x = $this->role[$i];
       usort($x,'obj_cmp');
@@ -461,7 +480,6 @@
     if (count ($this->neighbours) > 0 ) return $this->neighbours;
 
     parent::getNeighbours();
-
     # Possible new parents are all related projects
     $this->readRoles();
     foreach ($lang['ProdRole'] as $role => $z ) {
@@ -765,11 +783,9 @@
 
     $this->readroles();
 
-    @reset ($this->role) ;
-    while ( list ($role,$f) = @each ($this->role) ) {
+    foreach ($this->role as $role => $f) {
       if ( isset ($this->role[$role] ) && is_array ($this->role[$role]) ) {
-        @reset ($this->role[$role]) ;
-        while ( list($i,$o) = @each ($this->role[$role]) ) {
+        foreach ($this->role[$role] as $i => $o) {
           if (isset($trans[$o->id])) {
             $this->role[$role][$i]->id = $trans[$o->id];
           }

Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- team_show.php	2 Jan 2007 19:59:56 -0000	1.68
+++ team_show.php	9 Jan 2009 14:17:01 -0000	1.69
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2007 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -13,17 +13,17 @@
  * @module team_show
  * @package team
  */
- include_once 'webelements.p3';
- include_once 'permission.p3';
- include_once 'appointment.pinc';
- include_once 'product.pinc';
- include_once 'address_tools.p3';
- include_once 'pdf.pinc';
+require_once 'webelements.p3';
+require_once 'permission.p3';
+require_once 'appointment.pinc';
+require_once 'product.pinc';
+require_once 'address_tools.p3';
+require_once 'pdf.pinc';
 
- /* Check if user is allowed to use it */
- check_user();
- loadmodules('team','show');
- loadlayout();
+/* Check if user is allowed to use it */
+check_user();
+loadmodules('team','show');
+loadlayout();
 
  function member_sort(&$a,&$b) {
    if ( ($a->gettype() == 'team') && ($b->gettype() != 'team') ) {
@@ -228,11 +228,6 @@
        echo $this->OverviewRowEnd($line++);
      }  
     
-     #
-     # Show additional custom fields
-     #
-     echo show_custom_fields($this,$this->obj->gettype(),$this->obj,2);
-
      echo product::infolist($this->user,$this->obj,2,$this->format);
      echo show_module_infolists($this->user,$this->obj,2,$this->format);
 

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- base.pinc	12 Dec 2008 14:49:13 -0000	1.109
+++ base.pinc	9 Jan 2009 14:17:01 -0000	1.110
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 2002 - 2008 by Gero Kohnert
+ *  Copyright 2002 - 2009 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   
@@ -12,8 +12,8 @@
  * Base Class for most TUTOS objects
  */
 
-include_once 'acl.pinc';
-include_once 'history.pinc';
+require_once 'acl.pinc';
+require_once 'history.pinc';
 
 /**
  * Base for TUTOS objects

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- database.pinc	25 Dec 2008 08:54:22 -0000	1.73
+++ database.pinc	9 Jan 2009 14:17:01 -0000	1.74
@@ -182,7 +182,7 @@
     }
     
     # For all DB ids between 0 and 1000 the connection part of the description is 
-    # maintained in config.pinc
+    # maintained in config.php
     if ( ($id < 1000) && ($id > -1) ) {
       if ( !isset($tutos[dbname][$id])) {
         return 0;

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

Modified Files:
	bug_config.php mconfig.pinc 
Log Message:
mainly fixes for new coding standard PEAR / added copyright end date where touched

Index: bug_config.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_config.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bug_config.php	23 Dec 2008 15:30:58 -0000	1.3
+++ bug_config.php	9 Jan 2009 14:17:01 -0000	1.4
@@ -1,6 +1,6 @@
 <?php
 /**
- *  Copyright 1999 - 2008 by Gero Kohnert
+ *  Copyright 1999 - 2009 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   
@@ -9,21 +9,21 @@
  *  CVS Info:  $Id$
  *  $Author$
  */
- $tutos['base'] = "../..";
- ini_set("include_path","..");
+$tutos['base'] = "../..";
+ini_set("include_path","..");
 
- include 'webelements.p3';
- include 'permission.p3';
+include 'webelements.p3';
+include 'permission.p3';
 
- check_user();
- loadmodules('bugtracking','config');
- loadmodule('bugtracking');
- loadlayout();
+check_user();
+loadmodules('bugtracking','config');
+loadmodule('bugtracking');
+loadlayout();
 
- /**
-  * display a admin page
-  */
- class bug_config extends layout {
+/**
+ * display a admin page
+ */
+class Bug_config extends layout {
    function info() {
      global $lang,$table,$tutos;
 
@@ -105,11 +105,11 @@
        $msg .= ' saving done ';
      }
    }
- }
+}
 
- $l = new bug_config($current_user);
- $l->display();
- $dbconn->close();
+$l = new Bug_config($current_user);
+$l->display();
+$dbconn->close();
 ?>
 <!--
     CVS Info:  $Id$

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/mconfig.pinc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mconfig.pinc	14 Dec 2008 16:32:14 -0000	1.7
+++ mconfig.pinc	9 Jan 2009 14:17:01 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2003 - 2008 by Gero Kohnert
+/**
+ * Copyright 2003 - 2009 by Gero Kohnert
  *
  * Module specific configuration
  *