tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs1:/tmp/cvs-serv25739

Modified Files:
	ChangeLog Makefile ToDo 
Log Message:
Happy new year

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog	30 Oct 2003 11:01:24 -0000	1.104
+++ ChangeLog	31 Dec 2003 17:09:38 -0000	1.105
@@ -1,4 +1,10 @@
 $Header$
+	* note reminders will now work with given times.
+	* new XML export. To get a XML File just add a &format=xml to address_show.php,company_show.php etc..
+	* new permission type "use". This right is neccessary to use a object i.e. to attach something or to 
+	  use a person as a participant in an meeting (not for own team members)
+	* invoice pdf is now using fpdf package (see http://www.fpdf.org) 
+	* performance fix in history browsing
 	* bugtracking is a own module now
 	* massupdate for "Add to watchlist"/"Delete from watchlist" in a lot of the overview pages
 	* locations for addresses/companies and departments are now created together with the base entries

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Makefile	20 Sep 2003 09:13:46 -0000	1.65
+++ Makefile	31 Dec 2003 17:09:38 -0000	1.66
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.66  2003/12/31 17:09:38  gokohnert
+# Happy new year
+#
 # Revision 1.65  2003/09/20 09:13:46  gokohnert
 # added new handlers
 #
@@ -253,6 +256,8 @@
 	$(PHP_LOCAL) \
 	$(PHP_GRP) \
 	$(PHP_NOTE) \
+	$(PHP_BUG) \
+	$(PHP_XML) \
 	$(PHP_URL) \
 	$(PHP_RES) \
 	$(PHP_FILE) \
@@ -303,6 +308,16 @@
 	$(wildcard php/note/*.p3) \
 	$(wildcard php/note/*.pinc)
 
+# Bugtracking Module
+PHP_BUG = $(wildcard php/bugtracking/*.php) \
+	$(wildcard php/bugtracking/*.p3) \
+	$(wildcard php/bugtracking/*.pinc)
+
+# Xml Import Module
+PHP_XML = $(wildcard php/xml/*.php) \
+	$(wildcard php/xml/*.p3) \
+	$(wildcard php/xml/*.pinc)
+
 # URL Module
 PHP_URL = $(wildcard php/url/*.php) \
 	$(wildcard php/url/*.p3) \
@@ -865,6 +880,8 @@
 	cp ${PHP_GRP} /net/zaphod/home/gero/src/tutos/php/group
 	cp ${PHP_INV} /net/zaphod/home/gero/src/tutos/php/invoice
 	cp ${PHP_NOTE} /net/zaphod/home/gero/src/tutos/php/note
+	cp ${PHP_BUG} /net/zaphod/home/gero/src/tutos/php/bugtracking
+	cp ${PHP_XML} /net/zaphod/home/gero/src/tutos/php/xml
 	cp ${PHP_LDAP} /net/zaphod/home/gero/src/tutos/php/ldap
 	cp ${PHP_MBOX} /net/zaphod/home/gero/src/tutos/php/mailbox
 	cp ${PHP_URL} /net/zaphod/home/gero/src/tutos/php/url
@@ -904,6 +921,8 @@
 	install -o www-data -m 664 $(PHP_GRP)    $(TARGETDIR)/php/group
 	install -o www-data -m 664 $(PHP_INV)    $(TARGETDIR)/php/invoice
 	install -o www-data -m 664 $(PHP_NOTE)   $(TARGETDIR)/php/note
+	install -o www-data -m 664 $(PHP_BUG)    $(TARGETDIR)/php/bugtracking
+	install -o www-data -m 664 $(PHP_XML)    $(TARGETDIR)/php/xml
 	install -o www-data -m 664 $(PHP_LDAP)   $(TARGETDIR)/php/ldap
 	install -o www-data -m 664 $(PHP_MBOX)   $(TARGETDIR)/php/mailbox
 	install -o www-data -m 664 $(PHP_URL)    $(TARGETDIR)/php/url

Index: ToDo
===================================================================
RCS file: /cvsroot/tutos/tutos/ToDo,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ToDo	21 Oct 2003 19:56:33 -0000	1.39
+++ ToDo	31 Dec 2003 17:09:38 -0000	1.40
@@ -205,7 +205,7 @@
 Resource check on usage
   DONE
 
-Move Efforts form one Object to another (like Bugs/Tasks)
+Move Efforts from one Object to another (like Bugs/Tasks)
 
 
 Minical for Jump in calendars
@@ -235,7 +235,19 @@
 
 
 Address new in one step including a location
+  DONE
+
+Occupied flag in appointments
+
+Voting for groups (showing a percentage in overview)
+
+Some concept for making demodata (via scheme.php) for modules
+
+Using LIMIT (or similar stuff) in select statements
+
+NIS Support
 
+Repeating events with resources and reminders
 
 #
 #

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv23982

Modified Files:
	company.pinc company_overview.php db.p3 
Log Message:
xml export / import for companies

Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- company.pinc	28 Dec 2003 17:12:35 -0000	1.55
+++ company.pinc	31 Dec 2003 16:58:32 -0000	1.56
@@ -217,7 +217,7 @@
   function exportXML_body () {
     $this->read_locs_data();
     $r = parent::exportXML_body();
-    $r .=  "<name>". utf8_encode($this->name) ."</name>\n";
+    $r .=  "<name>". utf8_encode(htmlspecialchars($this->name)) ."</name>\n";
     if ( isset($this->location) && (count($this->location) > 0) ) {
       foreach($this->location as $i => $f) {
         $r .= $f->exportXML_start();

Index: company_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_overview.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- company_overview.php	1 Oct 2003 09:18:44 -0000	1.41
+++ company_overview.php	31 Dec 2003 16:58:32 -0000	1.42
@@ -1,6 +1,9 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
+ *
+ *   CVS Info:  $Id$
+ *   $Author$
  *
  * @modulegroup company
  * @module company_overview
@@ -27,6 +30,26 @@
      global $lang,$tutos;
 
      $n = $this->result->numrows();
+
+     if ( $this->format == "xml" ) {
+       if ( 0 != $n) {
+         $a = new company($this->dbconn);
+         echo $a->exportXMLHeader();
+         echo $a->exportXML_head() ;
+         echo "<company_set>\n";
+         $x = 0;
+         while ( $x < $n ) {
+           $a = new company($this->dbconn);
+           $a->read_result($this->result,$x);
+           echo $a->exportXML(false);
+           $x++;
+         }
+         echo "</company_set>\n";
+       }
+	   return;
+     }
+
+
      echo $this->actionformStart("company_overview.php");
      echo $this->OverviewTableStart();
      echo "<thead>\n";
@@ -203,8 +226,4 @@
  $l = new company_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
-<!--
-    CVS Info:  $Id$
-    $Author$
--->
+?>
\ No newline at end of file

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- db.p3	17 Dec 2003 15:13:22 -0000	1.131
+++ db.p3	31 Dec 2003 16:58:32 -0000	1.132
@@ -164,10 +164,11 @@
 define ('usesync',-34);
 define ('useacl',-35);
 
-# ID 50 is riskmanagement module (non GPL by Gero Kohnert)
-# ID 51 is requirements module   (non GPL by Gero Kohnert)
-# ID 52 is global search module  (non GPL by Gero Kohnert)
+# ID 50 is riskmanagement module (non GPL by Gero Kohnert www.tutos.de)
+# ID 51 is requirements module   (non GPL by Gero Kohnert www.tutos.de)
+# ID 52 is global search module  (non GPL by Gero Kohnert www.tutos.de)
 
+# ID 95 is xml module
 # ID 96 is admin module
 # ID 97 is ticker module
 # ID 98 is merge module

Update of /cvsroot/tutos/tutos/php/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv23982/xml

Modified Files:
	xml_parse.pinc 
Log Message:
xml export / import for companies

Index: xml_parse.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/xml/xml_parse.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml_parse.pinc	31 Dec 2003 13:06:35 -0000	1.1
+++ xml_parse.pinc	31 Dec 2003 16:58:32 -0000	1.2
@@ -17,7 +17,8 @@
     $this->parser = xml_parser_create();
     $this->depth[$this->parser] = 0;
     $this->ctag = "";
-    $this->cobj = "";
+    $this->cobj = null;
+    $this->parentobj = null;
     $this->testonly = false;
     $this->stop = false;
     $this->output = "";
@@ -46,9 +47,14 @@
       $this->adr = new tutos_address($this->dbconn);
       $this->cobj = &$this->adr;
     }
+    if ( $name == "company" ) {
+      $this->company = new company($this->dbconn);
+      $this->cobj = &$this->company;
+    }
     if ( $name == "location" ) {
       $this->loc = new location($this->dbconn);
-      $this->loc->ref = $this->adr;
+      $this->loc->ref = &$this->cobj;
+      $this->parentobj = &$this->cobj;
       $this->cobj = &$this->loc;
     }
 
@@ -66,21 +72,27 @@
     }
 
     if ( $name == "location" ) {
-      $this->loc->ref = $this->adr;
-      $this->loc->adr_id = $this->adr->id;
+      $this->loc->ref = $this->parentobj;
+      $this->loc->adr_id = $this->parentobj->id;
       $this->output .= "save :". $this->loc->getFullName()."\n";
       if (!$this->testonly) {
 #       echo $this->loc->save();
       }
       $this->loc = null;
-      $this->cobj = $this->adr;
-    }
-    if ( $name == "address" ) {
+      $this->cobj = &$this->parentobj;
+    } else if ( $name == "address" ) {
       $this->output .= "save :". $this->adr->getFullName() ."\n";
       if (!$this->testonly) {
 #       echo $this->adr->save();
       }
       $this->adr = null;
+      $this->cobj = null;
+	} else if ( $name == "company" ) {
+      $this->output .= "save :". $this->company->getFullName() ."\n";
+      if (!$this->testonly) {
+#       echo $this->company->save();
+      }
+      $this->company = null;
       $this->cobj = null;
     }
 

Update of /cvsroot/tutos/tutos/php/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv14866/xml

Added Files:
	README en.p3 mconfig.pinc xml_ins.php xml_new.php 
	xml_parse.pinc 
Log Message:
XML import modul

--- NEW FILE: README ---

The XML interface to TUTOS

# $Id: README,v 1.1 2003/12/31 13:06:35 gokohnert Exp $

--- NEW FILE: en.p3 ---
<?php
# $Id: en.p3,v 1.1 2003/12/31 13:06:35 gokohnert Exp $
#
# ========================= NOTE ========================
# Please put site specific extensions and changes
# to TUTOS language files in a file called "en_custom.p3"
# or "lang_custom.p3" (for all languages)
# using the same format like here
# =======================================================

# XML
$lang['XMLimport']          = "XML Import";
$lang['XMLFile']            = "XML File";
$lang['XMLUrl']             = "XML URL";
$lang['XMLData']            = "XML Data";
$lang['XMLoutput']          = "output of last import";
$lang['XMLtestonly']        = "only test do not save";

$lang['perm'][usexmlimport] = "use xmlimport";
?>

--- NEW FILE: mconfig.pinc ---
<?php
/*
 * Copyright 2003 by Gero Kohnert
 *
 * Module specific configuration
 *
 *  CVS Info:  $Id: mconfig.pinc,v 1.1 2003/12/31 13:06:35 gokohnert Exp $
 *  $Author: gokohnert $
 */

#
# Every module must have an individual ID ( < 0 > -100 ).
# this is module 95
#
define('usexmlimport',-95);
$tutos[modules]['xmlimport'] = array( 
	name => "TUTOS_XMLParser", 
	Desc => "import of XML files", 
	file => "php/xml/xml_parse.pinc",
	'overview' => "mytutos.php",
	'perm' => usexmlimport
);
#
# globally enable this module
#
$tutos[usexmlimport] = 1; 

?>

--- NEW FILE: xml_ins.php ---
<?php
/*
 * Copyright 1999 - 2003 by Gero Kohnert
 * Display a object by id
 *
 *   CVS Info:  $Id: xml_ins.php,v 1.1 2003/12/31 13:06:35 gokohnert Exp $
 *   $Author: gokohnert $
 */
 $tutos['base'] = "../..";
 ini_set("include_path","..");

 include 'webelements.p3';
 include 'permission.p3';
 include 'xml_parse.pinc';

 /* Check if user is allowed to use it */
 check_user();

 $gotourl="xml_new.php";
 $msg="";

 $xml_parser = new TUTOS_XMLParser($dbconn);

 if (isset($_POST['testonly']) && trim($_POST['testonly'])) {
   $xml_parser->testonly = true;
   $xml_parser->output .= " TEST \n\n";
   $gotourl= addUrlParameter($gotourl,"testonly=1",true);
 } else {
   $gotourl= addUrlParameter($gotourl,"testonly=0",true);
 }
 if (isset($_POST['data']) && trim($_POST['data'])) {
   $msg .= "Imported XML-DATA<br>\n";
   $xml_parser->parse_data($_POST['data']);
   $gotourl= addUrlParameter($gotourl,"data=". UrlEncode(StripSlashes($_POST['data'])),true);
 } else if (isset($_POST['dataurl']) && trim($_POST['dataurl']) ) {
   $msg .= "Imported file from url : ". $_POST['dataurl'] ."<br>\n";
   $xml_parser->parse_file($_POST['dataurl']);
   $gotourl= addUrlParameter($gotourl,"dataurl=". UrlEncode(StripSlashes($_POST['dataurl'])),true);
 } else if ( isset($HTTP_POST_FILES['datafile']) ) {
   $file = $HTTP_POST_FILES['datafile'];
   if ( isset($file) && ($file != "none") && ($file['name'] != "")) {
     $msg .= "Imported file : ". $file['name'] ."<br>\n";
     $xml_parser->parse_file($file['tmp_name']);
     $gotourl= addUrlParameter($gotourl,"datafile=". UrlEncode(StripSlashes($file['name'])),true);
   } else {
     $msg .= "invalid file<br>\n";
   }
 } else {
   $msg .= "missing input<br>\n";
 }

#$file = "/home/gero/tmp/TUTOS-adr.xml";
#$file = "http://next/tutosdev/php/showobject.php?id=23406&format=xml&uname=superuser&pw=tutos";
#$file = "http://next/tutosdev/php/address_overview.php?format=xml&uname=superuser&pw=tutos";


#$xml_parser->parse_file($file);

 $_SESSION['XML'] = UrlEncode($xml_parser->output);
 $gotourl = addUrlParameter($gotourl,"XML",true);
 xml_parser_free($xml_parser->parser);
 $gotourl = addMessage($gotourl,$msg,true);
 $gotourl = addSessionKey($gotourl,true);

 Header("Status: 302 Moved Temporarily");
 Header("Location:". getBaseUrl(). $gotourl);
 $dbconn->Close();
?>

--- NEW FILE: xml_new.php ---
<?php
/**
 * Copyright 2003 by Gero Kohnert
 *
 * @modulegroup xml
 * @module xml_new
 * @package xml
 *
 * Interface for importing XML data to TUTOS
 *
 */
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 include_once 'webelements.p3';
 include_once 'permission.p3';

 /* Check if user is allowed to use it */
 check_user();
 loadmodules("xmlimport","new");
 loadmodule("xmlimport");
 loadlayout();

 /**
  * change/modify a note
  */
 class xml_new extends layout {
   /**
    * display the form
    */
   Function info() {
     global $lang,$tutos,$table;

     echo "<form name=\"xmlnew\" enctype=\"multipart/form-data\" action=\"xml_ins.php\" method=\"POST\">\n";
     echo $this->DataTableStart();

	 if (isset($_GET['XML'])) {
       echo "<tr>\n";
       echo $this->showfield($lang['XMLoutput'],0);
       echo " <td colspan=\"5\"><pre>". UrlDecode($_SESSION['XML']) ."</pre></td>\n";
       echo "</tr>\n";
     }
     echo "<tr><th colspan=\"6\">";
     echo $lang['XMLimport'];
     echo " </th></tr>\n";

     echo "<tr>\n";
     echo " <td colspan=\"6\">Select one of the three alternatives to transfer data</td>\n";
     echo "</tr>\n";

     echo "<tr>\n";
     echo $this->showfieldc($lang['XMLtestonly'],0,"testonly");
     echo " <td colspan=\"5\"><input id=\"testonly\" name=\"testonly\" type=\"checkbox\" value=\"1\"". ($this->testonly == 1 ? "checked":"" )."></td>\n";
     echo "</tr>\n";

     echo "<tr>\n";
     echo $this->showfieldc($lang['XMLFile'],0,"datafile");
     echo " <td colspan=\"5\"><input id=\"datafile\" size=\"40\" name=\"datafile\" type=\"file\" value=\"". $this->datafile ."\"></td>\n";
     echo "</tr>\n";

     echo "<tr>\n";
     echo $this->showfieldc($lang['XMLUrl'],0,"dataurl");
     echo " <td colspan=\"5\"><input id=\"dataurl\" size=\"100\" maxlength=\"100\" name=\"dataurl\" value=\"". myentities($this->dataurl) ."\"></td>\n";
     echo "</tr>\n";

     echo "<tr>\n";
     echo $this->showfield($lang['XMLData'],0,"data");
     echo " <td colspan=\"5\"><textarea id=\"data\"  rows=\"20\" cols=\"80\" name=\"data\">". $this->data ."</textarea></td>\n";
     echo "</tr>\n";

     echo "<tr>\n";
     submit_reset(0,-1,2,1,2,0);
     echo "</tr>\n";

     echo $this->DataTableEnd();
     hiddenFormElements();
     echo $this->getHidden();
     echo "</form>\n";
 
     echo $this->setfocus("xmlnew.data");
     echo $lang['FldsRequired'] ."\n";


   }
   /**
    * navigate
    */
   Function navigate() {
   }
   /**
    * prepare
    */
   Function prepare() {
     global $msg,$lang;

     $this->name = $lang['XMLimport'];
     $this->testonly = 1;

     if ( isset($_GET['testonly']) ){
       $this->testonly = StripSlashes($_GET['testonly']);
     } else {
       $this->testonly = 0;
	 }
     if ( isset($_GET['dataurl']) ){
       $this->dataurl = StripSlashes($_GET['dataurl']);
     }
     if ( isset($_GET['data']) ){
       $this->data = StripSlashes($_GET['data']);
     }
   }
 }

 $l = new xml_new($current_user);
 $l->display();
 $dbconn->Close();
?>
<!--
    CVS Info:  $Id: xml_new.php,v 1.1 2003/12/31 13:06:35 gokohnert Exp $
    $Author: gokohnert $
-->
--- NEW FILE: xml_parse.pinc ---
<?php
/*
 * Copyright 1999 - 2003 by Gero Kohnert
 * Display a object by id
 *
 *   CVS Info:  $Id: xml_parse.pinc,v 1.1 2003/12/31 13:06:35 gokohnert Exp $
 *   $Author: gokohnert $
 */

class TUTOS_XMLParser extends tutos_module {
  var $depth = array();
  var $stack = array();

  function TUTOS_XMLParser(&$dbconn) {
    $this->init($dbconn);

    $this->parser = xml_parser_create();
    $this->depth[$this->parser] = 0;
    $this->ctag = "";
    $this->cobj = "";
    $this->testonly = false;
    $this->stop = false;
    $this->output = "";

    xml_parser_set_option($this->parser,XML_OPTION_CASE_FOLDING,0);
    xml_set_object($this->parser, &$this);
    xml_set_element_handler($this->parser, "tag_start", "tag_end");
    xml_set_character_data_handler($this->parser, "cdata");
    xml_set_default_handler($this->parser, "defaulthandler");
  }

  /**
   * read the data of the specified object
   *
   * @param int $id the object id
   */
  function read ($id ) {
    return;
  }
  function tag_start(&$parser, $name, $attrs) {
    $this->depth[$parser]++;
    array_push($this->stack,$name);

    $this->data = "";
    if ( $name == "address" ) {
      $this->adr = new tutos_address($this->dbconn);
      $this->cobj = &$this->adr;
    }
    if ( $name == "location" ) {
      $this->loc = new location($this->dbconn);
      $this->loc->ref = $this->adr;
      $this->cobj = &$this->loc;
    }

    $this->ctag = $name;
    $this->attrs = $attrs;
#    echo "#". $name ."#<br>\n";
  }

  function tag_end(&$parser, $name) {
    $this->depth[$parser]--;
    array_pop($this->stack);

    if ($this->cobj != null) {
      $this->cobj->parseXML($this->ctag,utf8_decode($this->data),$this->attrs);
    }

    if ( $name == "location" ) {
      $this->loc->ref = $this->adr;
      $this->loc->adr_id = $this->adr->id;
      $this->output .= "save :". $this->loc->getFullName()."\n";
      if (!$this->testonly) {
#       echo $this->loc->save();
      }
      $this->loc = null;
      $this->cobj = $this->adr;
    }
    if ( $name == "address" ) {
      $this->output .= "save :". $this->adr->getFullName() ."\n";
      if (!$this->testonly) {
#       echo $this->adr->save();
      }
      $this->adr = null;
      $this->cobj = null;
    }

    $this->ctag = end($this->stack);
  }

  function cdata(&$parser, $data) {
    $this->data .= $data;
    if ($data == "\n") {
      return;
    }
    $this->output .= $this->ctag. "|". utf8_decode($this->data) ."|\n";
  }

  function defaulthandler($parser, $data) {
    if (trim($data)) {
      $this->output .= "d|". utf8_decode($data) ."|\n";
    }
  }

  function parse_data($data) {
    if (!xml_parse($this->parser, $data)) {
      $this->error();
    }
  }

  function parse_file($fname) {
    if (!($fp = fopen($fname, "r"))) {
	  $this->stop = true;
      $this->output .= "could not open XML input file:".$fname ."\n";
    }
    while (!$this->stop && ($data = fread($fp, 4096)) ) {
      $this->parse_data($data); 
    }
  }

  function error() {
    $this->stop = true;
    $this->output .= sprintf("XML error: %s at line %d pos %d",
                xml_error_string(xml_get_error_code($this->parser)),
                xml_get_current_line_number($this->parser),
                xml_get_current_column_number($this->parser));
  }
}

?>

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv11177

Modified Files:
	address_overview.php 
Log Message:
fix


Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- address_overview.php	30 Dec 2003 09:37:12 -0000	1.39
+++ address_overview.php	30 Dec 2003 14:33:28 -0000	1.40
@@ -43,7 +43,7 @@
            echo $a->exportXML(false);
            $x++;
          }
-         echo "<address_set>\n";
+         echo "</address_set>\n";
        }
      } else {
        address_overview($this,$this->result,$this->ashow,$this->atool,"address_overview.php");

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv29899

Modified Files:
	location.pinc address_overview.php address.pinc 
Log Message:
xml stuff

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- location.pinc	27 Dec 2003 16:47:08 -0000	1.46
+++ location.pinc	30 Dec 2003 09:37:11 -0000	1.47
@@ -374,12 +374,12 @@
    */
   function exportXML_body () {
     $r = parent::exportXML_body();
-    $r .=  "<lname>". $this->lname ."</lname>\n";
+    $r .=  "<lname>". utf8_encode(htmlspecialchars($this->lname)) ."</lname>\n";
     $r .=  "<category>". $this->category ."</category>\n";
     $i=0;
     while($i < count($this->larray)) {
       $f = $this->larray[$i];
-      $r .=  "<".$f.">". utf8_encode($this->$f) ."</".$f.">\n";
+      $r .=  "<".$f.">". utf8_encode(htmlspecialchars($this->$f)) ."</".$f.">\n";
       $i++;
     }
     return $r;

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- address_overview.php	28 Dec 2003 17:12:35 -0000	1.38
+++ address_overview.php	30 Dec 2003 09:37:12 -0000	1.39
@@ -32,16 +32,18 @@
      if ( $this->format == "xml" ) {
        $n = $this->result->numrows();
        if ( 0 != $n) {
+         $a = new tutos_address($this->dbconn);
+         echo $a->exportXMLHeader();
+         echo $a->exportXML_head() ;
+         echo "<address_set>\n";
          $x = 0;
          while ( $x < $n ) {
            $a = new tutos_address($this->dbconn);
            $a->read_result($this->result,$x);
-           if ($x == 0) {
-             echo $a->exportXMLHeader();
-           }
-           echo $a->exportXML();
+           echo $a->exportXML(false);
            $x++;
          }
+         echo "<address_set>\n";
        }
      } else {
        address_overview($this,$this->result,$this->ashow,$this->atool,"address_overview.php");

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- address.pinc	27 Dec 2003 16:47:08 -0000	1.97
+++ address.pinc	30 Dec 2003 09:37:12 -0000	1.98
@@ -413,10 +413,10 @@
   function exportXML_body () {
     $this->read_locs_data();
 	$r = parent::exportXML_body();
-    $r .=  "<title>". utf8_encode($this->title) ."</title>\n";
-    $r .=  "<firstname>". utf8_encode($this->f_name) ."</firstname>\n";
-    $r .=  "<middlename>". utf8_encode($this->m_name) ."</middlename>\n";
-    $r .=  "<lastname>". utf8_encode($this->l_name) ."</lastname>\n";
+    $r .=  "<title>". utf8_encode(htmlspecialchars($this->title)) ."</title>\n";
+    $r .=  "<firstname>". utf8_encode(htmlspecialchars($this->f_name)) ."</firstname>\n";
+    $r .=  "<middlename>". utf8_encode(htmlspecialchars($this->m_name)) ."</middlename>\n";
+    $r .=  "<lastname>". utf8_encode(htmlspecialchars($this->l_name)) ."</lastname>\n";
     if ( $this->birthday->notime != 1 ) {
       $r .=  "<birthday>". $this->birthday->exportXML_body() ."</birthday>\n";
 	}

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv29794/note

Modified Files:
	note_overview.php 
Log Message:
show remember dattime

Index: note_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- note_overview.php	4 Dec 2003 09:49:36 -0000	1.31
+++ note_overview.php	30 Dec 2003 09:36:39 -0000	1.32
@@ -91,7 +91,7 @@
        }
        echo " <td>". makelink($b->getUrl(),$x) ."</td>\n";
        echo " <td>&nbsp;". $b->ref->getLink() ."</td>\n";
-       echo " <td>&nbsp;". $b->remember->getDate() ."</td>\n";
+       echo " <td>&nbsp;". $b->remember->getDateTime() ."</td>\n";
        echo " <td>&nbsp;". $b->creator->getLink($b->creator->getShortname()) ."</td>\n";
        echo $this->OverviewRowEnd($line++);
        unset($b);

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv16714

Modified Files:
	database.pinc product_show.php 
Log Message:
fix

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- database.pinc	17 Oct 2003 13:05:12 -0000	1.45
+++ database.pinc	28 Dec 2003 22:05:20 -0000	1.46
@@ -392,7 +392,7 @@
   function getconnection() {
     global $tutos;
 
-    if ( $this->type == 1 ) {
+    if ( $this->type == DB_TYPE_POSTGRES ) {
       # Postgres
       require_once 'db/db_pg.pinc';
       $dbconn = new db_pg($this);
@@ -402,16 +402,16 @@
       require_once 'db/db_pg.pinc';
       $dbconn = new db_pg($this);
       $dbconn->version = 2;
-    } else if ( $this->type == 2 ) {
+    } else if ( $this->type == DB_TYPE_MYSQL ) {
       # MySQL
       require_once 'db/db_mysql.pinc';
       $dbconn = new db_mysql($this);
-    } else if ( $this->type == 3 ) {
+    } else if ( $this->type == DB_TYPE_ORACLE ) {
       # Oracle
       require_once 'db/db_ora.pinc';
       $dbconn = new db_ora($this);
       $dbconn->home = $this->home;
-    } else if ( $this->type == 8 ) {
+    } else if ( $this->type == DB_TYPE_OCI ) {
       # Oracle OCI
       require_once 'db/db_oci.pinc';
       $dbconn = new db_oci($this);
@@ -424,7 +424,7 @@
       # Sybase
       require_once 'db/db_sybase.pinc';
       $dbconn = new db_sybase($this);
-    } else if ( $this->type == 7 ) {
+    } else if ( $this->type == DB_TYPE_INTERBASE ) {
       # Interbase
       require_once 'db/db_interbase.pinc';
       $dbconn = new db_interbase($this);

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- product_show.php	22 Oct 2003 17:47:20 -0000	1.86
+++ product_show.php	28 Dec 2003 22:05:20 -0000	1.87
@@ -164,7 +164,7 @@
        if ( count($this->obj->tasklist) >0 ) {
          @reset($this->obj->tasklist);
          echo "<tr>\n";
-         echo $this->showfield($lang['ProdTasks']);
+         echo $this->showfield($lang['Tasks']);
          echo " <td valign=\"top\" colspan=\"3\">\n";
          echo $this->theme->getImage(folder,'list') ." ".  makelink("task_overview.php?id=".  $this->obj->id, $lang['TaskOverview'],
             sprintf($lang['TaskOverviewInfo'],

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1:/tmp/cvs-serv16714/db

Modified Files:
	db_oci.pinc 
Log Message:
fix

Index: db_oci.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_oci.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- db_oci.pinc	28 Dec 2003 11:40:21 -0000	1.20
+++ db_oci.pinc	28 Dec 2003 22:05:20 -0000	1.21
@@ -41,7 +41,6 @@
   function db_oci(&$db) {
     global $tutos;
 
-	die ("xxxx");
     parent::init($db);
 
     $tutos[use_check_dbacl] = 0;

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv26664

Modified Files:
	base.pinc company.pinc company_show.php address_overview.php 
	app_show.php 
Log Message:
XML export stuff

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- base.pinc	27 Dec 2003 16:47:08 -0000	1.50
+++ base.pinc	28 Dec 2003 17:12:34 -0000	1.51
@@ -179,7 +179,10 @@
    * Head of XML export
    */
   function exportXML_head () {
-    return "<?xml version=\"1.0\"?>\n";
+    global $tutos;
+    $r =  "<?xml version=\"1.0\" encoding=\"UTF8\" ?>\n";
+    $r .= "<!-- TUTOS Version :". $tutos[version] ." -->\n";
+    return $r;
   }
   /**
    * Start of XML export
@@ -207,9 +210,9 @@
     # datetime of last modification
     if ( $current_user->feature_ok(usehistory,PERM_SEE) ) {
       $d = history_get_lastmod($this);
-	  if ($d) {
+      if ($d) {
         $r .=  "<lastmod>". $d->exportXML_body() ."</lastmod>\n";
-	  }
+      }
     }
     return $r;
   }
@@ -227,12 +230,16 @@
   /**
    * Export as XML
    */
-  function exportXML () {
-    $r = $this->exportXML_head() ;
-    $r .=  $this->exportXML_start();
-    if ($this->see_ok()) {
-      $r .=  $this->exportXML_body();
+  function exportXML ($head = true) {
+    $r = "";
+    if ($head) {
+      $r .= $this->exportXML_head() ;
     }
+    if (!$this->see_ok()) {
+        return $r;
+    }
+    $r .=  $this->exportXML_start();
+    $r .=  $this->exportXML_body();
     $r .=  $this->exportXML_end();
     return $r;
   }

Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- company.pinc	18 Aug 2003 09:27:25 -0000	1.54
+++ company.pinc	28 Dec 2003 17:12:35 -0000	1.55
@@ -211,5 +211,31 @@
   function gettypeid () {
     return usecompany;
   }
+  /**
+   * Data of XML export
+   */
+  function exportXML_body () {
+    $this->read_locs_data();
+    $r = parent::exportXML_body();
+    $r .=  "<name>". utf8_encode($this->name) ."</name>\n";
+    if ( isset($this->location) && (count($this->location) > 0) ) {
+      foreach($this->location as $i => $f) {
+        $r .= $f->exportXML_start();
+        $r .= $f->exportXML_body();
+        $r .= $f->exportXML_end();
+      }
+    }
+    return $r;
+  }
+  /**
+   * parse XML import
+   */
+  function parseXML ($fld,$data,$attrs) {
+    parent::parseXML($fld,$data,$attrs);
+    if ($fld == "name") {
+      $this->setName($data);
+    }
+    return;
+  }
 }
 ?>

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- company_show.php	27 Dec 2003 16:47:08 -0000	1.60
+++ company_show.php	28 Dec 2003 17:12:35 -0000	1.61
@@ -2,6 +2,10 @@
 /**
  * Copyright 1999 - 2003 by Gero Kohnert
  *
+ *
+ *   CVS Info:  $Id$
+ *   $Author$
+ *
  * @modulegroup company
  * @module company_show
  * @package company
@@ -29,8 +33,8 @@
      global $tutos,$lang;
 
      if ( $this->format == "xml" ) {
-	   echo $this->obj->exportXMLHeader();
-	   echo $this->obj->exportXML();
+       echo $this->obj->exportXMLHeader();
+       echo $this->obj->exportXML();
        return;
      }
 
@@ -114,11 +118,11 @@
        if ( $_GET['action'] == -2 ) {
          $this->dbconn->Begin("WORK");
          $this->dbconn->Commit("WORK");
-	   }
-	 }
+       }
+     }
      if (class_exists('watchlist')) {
        watchlist::parse_action($this->user);
-	 }
+     }
 
      if ( $_GET['action'] == -4 ) {
        $this->redirect = acl_action();
@@ -144,7 +148,7 @@
      } else {
        $this->obj->read($_GET['id']);
        $this->obj->read_locs_data();
-	   $this->addHidden("id",$this->obj->id);
+       $this->addHidden("id",$this->obj->id);
      }
 
      # Handling of department member list
@@ -229,8 +233,4 @@
  $l = new company_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
-<!--
-    CVS Info:  $Id$
-    $Author$
--->
+?>
\ No newline at end of file

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- address_overview.php	15 Dec 2003 13:28:16 -0000	1.37
+++ address_overview.php	28 Dec 2003 17:12:35 -0000	1.38
@@ -1,6 +1,11 @@
 <?php
 /*
  * Copyright 1999 - 2003 by Gero Kohnert
+ *
+ *
+ *   CVS Info:  $Id$
+ *   $Author$
+ *
  */
  include_once 'webelements.p3';
  include_once 'permission.p3';
@@ -24,7 +29,23 @@
    Function info() {
      global $lang;
 
-     address_overview($this,$this->result,$this->ashow,$this->atool,"address_overview.php");
+     if ( $this->format == "xml" ) {
+       $n = $this->result->numrows();
+       if ( 0 != $n) {
+         $x = 0;
+         while ( $x < $n ) {
+           $a = new tutos_address($this->dbconn);
+           $a->read_result($this->result,$x);
+           if ($x == 0) {
+             echo $a->exportXMLHeader();
+           }
+           echo $a->exportXML();
+           $x++;
+         }
+       }
+     } else {
+       address_overview($this,$this->result,$this->ashow,$this->atool,"address_overview.php");
+     }
      $this->result->free();
    }
    /**
@@ -55,7 +76,7 @@
          unset($b);
        }
        $this->dbconn->Commit("WORK");
-	 }
+     }
      else if ( $_GET['action'] == 'WatchAdd' ) {
        $this->dbconn->Begin("WORK");
        foreach ($_GET['mark'] as $key => $val) {
@@ -64,9 +85,9 @@
          if ( $b->id != $val ) {
            continue;
          }
-   	     $w = new watchlist($this->dbconn);
-	     $w->add($b,$this->user);
-	   }
+         $w = new watchlist($this->dbconn);
+         $w->add($b,$this->user);
+       }
        $this->dbconn->Commit("WORK");
      } else if ( $_GET['action'] == 'WatchDel' ) {
        $this->dbconn->Begin("WORK");
@@ -77,8 +98,8 @@
            continue;
          }
          $w = new watchlist($this->dbconn);
-	     $w->remove($b->id,$this->user->id);
-	   }
+         $w->remove($b->id,$this->user->id);
+       }
        $this->dbconn->Commit("WORK");
      } else if ( $_GET['action'] == -4 ) {
        $this->redirect = acl_action();
@@ -114,13 +135,13 @@
      if ( isset($_GET['name']) ) {
        $name = $_GET['name'];
        $this->atool['link1'] = addUrlParameter($this->atool['link1'],"name=".UrlEncode($name));
-	   $this->addHidden("name",$name);
+       $this->addHidden("name",$name);
      } else {
        $name = "";
      }
      if ( isset($_GET['ext']) ) {
        $ext = $_GET['ext'];
-	   $this->addHidden("ext",$ext);
+       $this->addHidden("ext",$ext);
      }
 
      $e['name'] = 0;
@@ -266,8 +287,4 @@
  $l = new address_overview($current_user);
  $l->display();
  $dbconn->Close();
-?>
-<!--
-    CVS Info:  $Id$
-    $Author$
--->
+?>
\ No newline at end of file

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- app_show.php	18 Jul 2003 11:06:48 -0000	1.40
+++ app_show.php	28 Dec 2003 17:12:35 -0000	1.41
@@ -47,6 +47,10 @@
        Header("Content-Description: Upload from TUTOS" );
        echo $this->obj->getIcal();
        return;
+     } else if ( $this->format == "xml") {
+       echo $this->obj->exportXMLHeader();
+       echo $this->obj->exportXML();
+       return;
      }
 
      echo $this->DataTableStart();
@@ -259,4 +263,4 @@
  $l = new app_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
+?>
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv26040/note

Modified Files:
	note.pinc note_new.php note_show.php 
Log Message:
note reminders with time

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- note.pinc	27 Dec 2003 16:47:48 -0000	1.38
+++ note.pinc	28 Dec 2003 17:09:06 -0000	1.39
@@ -167,7 +167,7 @@
     $body = eregi_replace("@NOTE@",$this->note,$body);
     $body = eregi_replace("@CREATOR@",$this->creator->getFullName(),$body);
     $body = eregi_replace("@CREATED@",$this->creation->getDateTime(),$body);
-    $body = eregi_replace("@REMEMBER@",$this->remember->getDate(),$body);
+    $body = eregi_replace("@REMEMBER@",$this->remember->getDateTime(),$body);
     $body = eregi_replace("@URL@",$url,$body);
     $body = eregi_replace("@REFERENZ@",$this->ref->getFullName(),$body);
   }
@@ -227,7 +227,7 @@
    * set the remember date
    */
   function setRemember(&$value) {
-    return $this->setDateField("remember",$value,"NoteRemember");
+    return $this->setDateTimeField("remember",$value,"NoteRemember");
   }
   /**
    * set the reference

Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- note_new.php	16 Nov 2003 16:40:21 -0000	1.22
+++ note_new.php	28 Dec 2003 17:09:06 -0000	1.23
@@ -70,7 +70,7 @@
      echo "<tr>\n";
      echo $this->showfieldc($lang['NoteRemember'],0,"remember_d");
      echo " <td colspan=\"5\">\n";
-     $this->obj->remember->EnterDate("remember",1);
+     $this->obj->remember->EnterDateTime("remember",1);
      echo " </td>\n";
      echo "</tr>\n";
 

Index: note_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_show.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- note_show.php	4 Aug 2003 20:11:57 -0000	1.20
+++ note_show.php	28 Dec 2003 17:09:06 -0000	1.21
@@ -51,7 +51,7 @@
      if ( $this->obj->remember->notime != 1 ) {
        echo "<tr>\n";
        echo $this->showfield($lang['NoteRemember']);
-       echo "<td colspan=\"3\">". $this->obj->remember->getDate() ."</td>";
+       echo "<td colspan=\"3\">". $this->obj->remember->getDateTime() ."</td>";
        echo "</tr>\n";
      }
      echo "<tr>\n";

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1:/tmp/cvs-serv25928/localization

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

Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ca.p3	17 Dec 2003 17:17:39 -0000	1.34
+++ ca.p3	28 Dec 2003 17:08:40 -0000	1.35
@@ -313,7 +313,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "Preu";
 $lang['ProdCost']        = "Cost";
-$lang['ProdTasks']       = "Feines";
 $lang['SearchForProd']   = "Buscar un producte/Projecte";
 $lang['SearchForProdExt']= "Recerca avanzada d'un producte/Projecte";
 $lang['ProdCreateInfo']  = "Crear un nou producte/Projecte";
@@ -416,6 +415,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Veure diagrama de Gantt";

Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cs.p3	17 Dec 2003 17:17:39 -0000	1.34
+++ cs.p3	28 Dec 2003 17:08:40 -0000	1.35
@@ -316,7 +316,6 @@
 $lang['ProdClasses2'][2] = "Nìco 2";
 $lang['ProdPrice']       = "Cena";
 $lang['ProdCost']        = "Náklady";
-$lang['ProdTasks']       = "Úlohy";
 $lang['SearchForProd']   = "Vyhledat produkt nebo projekt";
 $lang['SearchForProdExt']= "Roz¹íøené vyhledání produktu nebo projektu";
 $lang['ProdCreateInfo']  = "Vytvoøit nový produkt nebo projekt";
@@ -419,6 +418,10 @@
 $lang['ImportIndex']     = "WBS index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Potvrdit import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Zobrazit diagram Gantt";

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- de.p3	17 Dec 2003 15:13:22 -0000	1.38
+++ de.p3	28 Dec 2003 17:08:40 -0000	1.39
@@ -315,7 +315,6 @@
 $lang['ProdClasses2'][2] = "Region Süd";
 $lang['ProdPrice']       = "Projektpreis";
 $lang['ProdCost']        = "Kosten";
-$lang['ProdTasks']       = "Aufgaben";
 $lang['SearchForProd']   = "Suche nach einem Produkt oder Projekt";
 $lang['SearchForProdExt']= "Erweiterte Suche nach einem Produkt oder Projekt";
 $lang['ProdCreateInfo']  = "Ein neues Produkt oder Projekt anlegen";
@@ -418,6 +417,10 @@
 $lang['ImportIndex']     = "WBS-Index";
 $lang['ImportValid']     = "Importieren";
 $lang['ImportConfirm']   = "Import bestätigen";
+$lang['TaskSearch']        = "Aufgaben Suche";
+$lang['SearchForTask']     = "Suche nach Aufgaben";
+$lang['SearchForTaskExt']  = "Erweiterte Suche nach Aufgaben";
+$lang['TaskBetween']       = "Zeitraum zwischen";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Gantt-Diagramm anzeigen";

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- el.p3	17 Dec 2003 17:17:39 -0000	1.35
+++ el.p3	28 Dec 2003 17:08:40 -0000	1.36
@@ -314,7 +314,6 @@
 $lang['ProdClasses2'][2] = "Íüôéá Ðåñéï÷Þ";
 $lang['ProdPrice']       = "ÔéìÞ";
 $lang['ProdCost']        = "Êüóôïò";
-$lang['ProdTasks']       = "Åñãáóßåò";
 $lang['SearchForProd']   = "ÁíáæÞôçóç ðñïúüíôïò Þ Ýñãïõ";
 $lang['SearchForProdExt']= "ÅêôåôáìÝíç ÁíáæÞôçóç ðñïúüíôïò Þ Ýñãïõ";
 $lang['ProdCreateInfo']  = "Äçìéïõñãßá íÝïõ ðñïúüíôïò Þ Ýñãïõ";
@@ -417,6 +416,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Äåò Gantt";

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- en.p3	17 Dec 2003 15:13:22 -0000	1.41
+++ en.p3	28 Dec 2003 17:08:40 -0000	1.42
@@ -315,7 +315,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "Price";
 $lang['ProdCost']        = "Cost";
-$lang['ProdTasks']       = "Tasks";
 $lang['SearchForProd']   = "Search for a product or project";
 $lang['SearchForProdExt']= "Extended Search for a product or project";
 $lang['ProdCreateInfo']  = "Create a new product or project";
@@ -418,6 +417,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- es-mx.p3	17 Dec 2003 17:17:39 -0000	1.33
+++ es-mx.p3	28 Dec 2003 17:08:40 -0000	1.34
@@ -312,7 +312,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "Precio";
 $lang['ProdCost']        = "Costo";
-$lang['ProdTasks']       = "Tareas";
 $lang['SearchForProd']   = "Buscar un producto/proyecto";
 $lang['SearchForProdExt']= "Búsqueda avanzada de un producto/proyecto";
 $lang['ProdCreateInfo']  = "Crear un nuevo producto/proyecto";
@@ -415,6 +414,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Ver diag. Gantt";

Index: es-ni.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- es-ni.p3	17 Dec 2003 17:17:39 -0000	1.33
+++ es-ni.p3	28 Dec 2003 17:08:40 -0000	1.34
@@ -313,7 +313,6 @@
 $lang['ProdClasses2'][2] = "Region Sur";
 $lang['ProdPrice']       = "Precio";
 $lang['ProdCost']        = "Costo";
-$lang['ProdTasks']       = "Tareas";
 $lang['SearchForProd']   = "Buscar un producto/proyecto";
 $lang['SearchForProdExt']= "Búsqueda avanzada de un producto/proyecto";
 $lang['ProdCreateInfo']  = "Crear un nuevo producto/proyecto";
@@ -416,6 +415,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Ver el Gantt";

Index: es-ve.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-ve.p3,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- es-ve.p3	17 Dec 2003 17:17:39 -0000	1.8
+++ es-ve.p3	28 Dec 2003 17:08:40 -0000	1.9
@@ -313,7 +313,6 @@
 $lang['ProdClasses2'][2] = "Región Sur";
 $lang['ProdPrice']       = "Precio";
 $lang['ProdCost']        = "Costo";
-$lang['ProdTasks']       = "Tareas";
 $lang['SearchForProd']   = "Buscar un producto/proyecto";
 $lang['SearchForProdExt']= "Búsqueda avanzada de un producto/proyecto";
 $lang['ProdCreateInfo']  = "Crear un nuevo producto/proyecto";
@@ -416,6 +415,10 @@
 $lang['ImportIndex']     = "Índice WBS";
 $lang['ImportValid']     = "Importar";
 $lang['ImportConfirm']   = "Confirmar Importación";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Ver diag. Gantt";

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- es.p3	17 Dec 2003 17:17:39 -0000	1.34
+++ es.p3	28 Dec 2003 17:08:40 -0000	1.35
@@ -312,7 +312,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "Precio";
 $lang['ProdCost']        = "Coste";
-$lang['ProdTasks']       = "Tareas";
 $lang['SearchForProd']   = "Buscar un producto/proyecto";
 $lang['SearchForProdExt']= "Búsqueda avanzada de un producto/proyecto";
 $lang['ProdCreateInfo']  = "Crear un nuevo producto/proyecto";
@@ -415,6 +414,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Ver diagrama de Gantt";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fr.p3	17 Dec 2003 15:13:22 -0000	1.35
+++ fr.p3	28 Dec 2003 17:08:40 -0000	1.36
@@ -312,7 +312,6 @@
 $lang['ProdClasses2'][2] = "Région Sud";
 $lang['ProdPrice']       = "Prix";
 $lang['ProdCost']        = "Coût";
-$lang['ProdTasks']       = "Tâches";
 $lang['SearchForProd']   = "Rechercher un produit ou projet";
 $lang['SearchForProdExt']= "Recherche étendue pour un produit ou projet";
 $lang['ProdCreateInfo']  = "Créer un nouveau produit ou projet";
@@ -415,6 +414,10 @@
 $lang['ImportIndex']     = "Index WBS";
 $lang['ImportValid']     = "Importer";
 $lang['ImportConfirm']   = "Confirmer l'import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- hu.p3	17 Dec 2003 17:17:39 -0000	1.31
+++ hu.p3	28 Dec 2003 17:08:40 -0000	1.32
@@ -316,7 +316,6 @@
 $lang['ProdClasses2'][2] = "Déli régió";
 $lang['ProdPrice']       = "Projektpreis";
 $lang['ProdCost']        = "Költség";
-$lang['ProdTasks']       = "Feladatok";
 $lang['SearchForProd']   = "Termék vagy projekt keresése";
 $lang['SearchForProdExt']= "Bõvített keresés egy termék vagy projekt után";
 $lang['ProdCreateInfo']  = "Új termék vagy projekt indítása";
@@ -419,6 +418,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Gantt-Diagramm kijelzés";

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- it.p3	17 Dec 2003 15:13:22 -0000	1.34
+++ it.p3	28 Dec 2003 17:08:40 -0000	1.35
@@ -310,7 +310,6 @@
 $lang['ProdClasses2'][2] = "Regione Sud";
 $lang['ProdPrice']       = "Prezzo";
 $lang['ProdCost']        = "Costo";
-$lang['ProdTasks']       = "Operazioni (task)";
 $lang['SearchForProd']   = "Cerca un prodotto o un progetto";
 $lang['SearchForProdExt']= "Ricerca estesa di un prodotto o un progetto";
 $lang['ProdCreateInfo']  = "Crea un nuovo prodotto o progetto";
@@ -413,7 +412,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ja.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ja.p3	17 Dec 2003 17:17:39 -0000	1.34
+++ ja.p3	28 Dec 2003 17:08:40 -0000	1.35
@@ -309,7 +309,6 @@
 $lang['ProdClasses2'][2] = "ÆîÉôÃÏÊý";
 $lang['ProdPrice']       = "ÃÍÃÊ";
 $lang['ProdCost']        = "¥³¥¹¥È";
-$lang['ProdTasks']       = "¥¿¥¹¥¯";
 $lang['SearchForProd']   = "À½Éʤޤ¿¤Ï¥×¥í¥¸¥§¥¯¥È¤Î¸¡º÷";
 $lang['SearchForProdExt']= "À½Éʤޤ¿¤Ï¥×¥í¥¸¥§¥¯¥È¤Î³ÈÄ¥¸¡º÷";
 $lang['ProdCreateInfo']  = "¿·¤¿¤ÊÀ½Éʤޤ¿¤Ï¥×¥í¥¸¥§¥¯¥È¤òºîÀ®";
@@ -412,6 +411,10 @@
 $lang['ImportIndex']     = "WBS¥¤¥ó¥Ç¥Ã¥¯¥¹";
 $lang['ImportValid']     = "¥¤¥ó¥Ý¡¼¥È";
 $lang['ImportConfirm']   = "¥¤¥ó¥Ý¡¼¥È³Îǧ";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "¥¬¥ó¥È¿Þ";

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ko.p3	17 Dec 2003 17:17:39 -0000	1.33
+++ ko.p3	28 Dec 2003 17:08:40 -0000	1.34
@@ -312,7 +312,6 @@
 $lang['ProdClasses2'][2] = "¸¶ÄÉÆà °ü·Ã";
 $lang['ProdPrice']       = "°¡°Ý";
 $lang['ProdCost']        = "¿ø°¡";
-$lang['ProdTasks']       = "ÀϰŸ®";
 $lang['SearchForProd']   = "Á¦Ç°/ÇÁ·ÎÁ§Æ® °Ë»ö";
 $lang['SearchForProdExt']= "Á¦Ç°/ÇÁ·ÎÁ§Æ® È®Àå °Ë»ö";
 $lang['ProdCreateInfo']  = "Á¦Ç°/ÇÁ·ÎÁ§Æ® »ý¼º";
@@ -415,7 +414,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- nl.p3	17 Dec 2003 15:13:22 -0000	1.39
+++ nl.p3	28 Dec 2003 17:08:40 -0000	1.40
@@ -319,7 +319,6 @@
 $lang['ProdClasses2'][2] = "Zuidelijke regio";
 $lang['ProdPrice']       = "Prijs";
 $lang['ProdCost']        = "Kosten";
-$lang['ProdTasks']       = "Taken";
 $lang['SearchForProd']   = "Zoek naar een product of project";
 $lang['SearchForProdExt']= "Uitgebreid zoeken naar een product of project";
 $lang['ProdCreateInfo']  = "Maak een nieuw product of project";
@@ -422,7 +421,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Bevestig Import";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Bekijk de Gantt";

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pl.p3	17 Dec 2003 17:17:39 -0000	1.44
+++ pl.p3	28 Dec 2003 17:08:40 -0000	1.45
@@ -317,7 +317,6 @@
 $lang['ProdClasses2'][2] = "Region po³udniowy";
 $lang['ProdPrice']       = "Cena";
 $lang['ProdCost']        = "Koszt";
-$lang['ProdTasks']       = "Zadania";
 $lang['SearchForProd']   = "Szukaj produktu lub projektu";
 $lang['SearchForProdExt']= "Rozszerzone przeszukiwanie produktów i projektów";
 $lang['ProdCreateInfo']  = "Utwórz nowy produkt lub projekt";
@@ -420,7 +419,10 @@
 $lang['ImportIndex']     = "Indeks WBS";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Potwierd¼ import";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Zobacz wykres Ganta";

Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pt-br.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- pt-br.p3	17 Dec 2003 17:17:39 -0000	1.34
+++ pt-br.p3	28 Dec 2003 17:08:40 -0000	1.35
@@ -311,7 +311,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "Preço";
 $lang['ProdCost']        = "Custo";
-$lang['ProdTasks']       = "Tarefas";
 $lang['SearchForProd']   = "Busca por um produto ou um projeto";
 $lang['SearchForProdExt']= "Busca avançada por um produto ou projeto";
 $lang['ProdCreateInfo']  = "Criar um novo produto ou projeto";
@@ -414,6 +413,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Index: pt.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pt.p3,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pt.p3	17 Dec 2003 17:17:39 -0000	1.8
+++ pt.p3	28 Dec 2003 17:08:41 -0000	1.9
@@ -321,7 +321,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "Preço";
 $lang['ProdCost']        = "Custo";
-$lang['ProdTasks']       = "Tarefas";
 $lang['SearchForProd']   = "Pesquisa de um produto ou projecto";
 $lang['SearchForProdExt']= "Pesquisa avançada de um produto ou projecto";
 $lang['ProdCreateInfo']  = "Criar um novo produto ou projecto";
@@ -424,6 +423,10 @@
 $lang['ImportIndex']     = "Índice WBS";
 $lang['ImportValid']     = "Importar";
 $lang['ImportConfirm']   = "Confirmar Importação";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Ver o Gantt";

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ru.p3	17 Dec 2003 17:17:39 -0000	1.38
+++ ru.p3	28 Dec 2003 17:08:41 -0000	1.39
@@ -312,7 +312,6 @@
 $lang['ProdClasses2'][2] = "æÉÌÉÁÌÙ";
 $lang['ProdPrice']       = "ãÅÎÁ";
 $lang['ProdCost']        = "óÔÏÉÍÏÓÔØ";
-$lang['ProdTasks']       = "úÁÄÁÞÉ";
 $lang['SearchForProd']   = "ðÏÉÓË ÐÒÏÄÕËÔÏ× ÉÌÉ ÐÒÏÅËÔÏ×";
 $lang['SearchForProdExt']= "òÁÓÛÉÒÅÎÎÙÊ ÐÏÉÓË ÐÒÏÄÕËÔÏ× ÉÌÉ ÐÒÏÅËÔÏ×";
 $lang['ProdCreateInfo']  = "óÏÚÄÁÔØ ÎÏ×ÙÊ ÐÒÏÄÕËÔ ÉÌÉ ÐÒÏÅËÔ";
@@ -415,7 +414,10 @@
 $lang['ImportIndex']     = "éÎÄÅËÓ WBS";
 $lang['ImportValid']     = "éÍÐÏÒÔ";
 $lang['ImportConfirm']   = "ðÏÄÔ×ÅÒÄÉÔØ ÉÍÐÏÒÔ";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "äÉÁÇÒÁÍÍÁ çÁÎÔÔÁ";

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sv.p3	17 Dec 2003 17:17:39 -0000	1.35
+++ sv.p3	28 Dec 2003 17:08:41 -0000	1.36
@@ -308,7 +308,6 @@
 $lang['ProdClasses2'][2] = "Södra Regionen";
 $lang['ProdPrice']       = "Pris";
 $lang['ProdCost']        = "Kostar";
-$lang['ProdTasks']       = "Uppgifter";
 $lang['SearchForProd']   = "Sök efter en produkt eller projekt";
 $lang['SearchForProdExt']= "Utökad sökning efter en produkt eller projekt";
 $lang['ProdCreateInfo']  = "Skapa en ny produkt eller projekt";
@@ -411,7 +410,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/tw.p3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tw.p3	17 Dec 2003 15:13:22 -0000	1.35
+++ tw.p3	28 Dec 2003 17:08:41 -0000	1.36
@@ -313,7 +313,6 @@
 $lang['ProdClasses2'][2] = "«n°Ï";
 $lang['ProdPrice']       = "»ù®æ";
 $lang['ProdCost']        = "¦¨¥»";
-$lang['ProdTasks']       = "¤u§@";
 $lang['SearchForProd']   = "·j´M²£«~/­p¹º";
 $lang['SearchForProdExt']= "¶i¶¥·j´M²£«~/­p¹º";
 $lang['ProdCreateInfo']  = "«Ø¥ß·s²£«~/­p¹º";
@@ -416,7 +415,10 @@
 $lang['ImportIndex']     = "WBS ¯Á¤Þ";
 $lang['ImportValid']     = "¶×¤J";
 $lang['ImportConfirm']   = "½T»{¶×¤J";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "À˵ø¥Ì¯S¹Ï";

Index: vi.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/vi.p3,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vi.p3	17 Dec 2003 17:17:39 -0000	1.10
+++ vi.p3	28 Dec 2003 17:08:41 -0000	1.11
@@ -317,7 +317,6 @@
 $lang['ProdClasses2'][2] = "Các tỉnh phía Nam";
 $lang['ProdPrice']       = "Giá bán";
 $lang['ProdCost']        = "Giá vốn";
-$lang['ProdTasks']       = "Hạng mục";
 $lang['SearchForProd']   = "Truy lục hồ sơ công trình";
 $lang['SearchForProdExt']= "Truy lục mở rộng hồ sơ công trình";
 $lang['ProdCreateInfo']  = "tạo mới 1 công trình";
@@ -420,6 +419,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Xác nhận Import";
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Xem biểu đồ Gantt";

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/zh.p3,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- zh.p3	17 Dec 2003 15:13:22 -0000	1.35
+++ zh.p3	28 Dec 2003 17:08:41 -0000	1.36
@@ -315,7 +315,6 @@
 $lang['ProdClasses2'][2] = "South Region";
 $lang['ProdPrice']       = "¼Û¸ñ";
 $lang['ProdCost']        = "³É±¾";
-$lang['ProdTasks']       = "¹¤×÷";
 $lang['SearchForProd']   = "ÕÒÑ°²úÆ·/¼Æ»®";
 $lang['SearchForProdExt']= "ÉîÈëÕÒÑ°²úÆ·/¼Æ»®";
 $lang['ProdCreateInfo']  = "ÉèÁ¢Ð²úÆ·/¼Æ»®";
@@ -418,7 +417,10 @@
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
 $lang['ImportConfirm']   = "Confirm Import";
-
+$lang['TaskSearch']        = "Task Search";
+$lang['SearchForTask']     = "Task Search";
+$lang['SearchForTaskExt']  = "Extended Task Search";
+$lang['TaskBetween']       = "Time between";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv25928

Modified Files:
	task.pinc task_overview.php 
Added Files:
	task_select.php 
Log Message:
new task_select

--- NEW FILE: task_select.php ---
<?php
/**
 * Copyright 2003 by Gero Kohnert
 *
 * @modulegroup task
 * @module task_select
 * @package task
 */
 include_once 'webelements.p3';
 include_once 'permission.p3';
 include_once 'task.pinc';

 /* Check if user is allowed to use it */
 check_user();
 loadmodules("task","select");
 loadlayout();

 /**
  * display a task selection form
  */
 class task_select extends layout {
   /**
    *
    */
   Function info() {
     global $lang , $tutos;

     echo "<br><br><center>\n";
     echo "<form name=\"tasksearch\" action=\"task_overview.php\" method=\"get\">\n";
     DoubleTableStart();

     echo "<tr>\n";
     if ( $this->ext == 0 ) {
       echo "<th colspan=\"3\">". $lang['SearchForTask'] ."</th>\n";
       echo "</tr><tr>\n";

       echo $this->showfieldc($lang['AdrName']);
       echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
       echo " <td align=\"center\">\n";
       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForTask'] ."\"></td>\n";
       echo "</tr><tr>\n";
       echo " <td colspan=\"2\" align=\"center\"><font size=\"-1\">&nbsp;</font></td>\n";
       echo " <td align=\"center\">". makelink("task_select.php?ext=1",$lang['extended']) ."</td>\n";
     } else {
       echo "<th colspan=\"3\">". $lang['SearchForTaskExt'] ."</th>\n";

       echo "</tr><tr>\n";
       echo $this->showfieldc($lang['AdrName']);
       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">";
       echo " </td>\n";
       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForTaskExt'] ."\"></td>\n";

       echo "</tr><tr>\n";
       echo " <td rowspan=\"2\" class=\"desc\">". $lang['TaskBetween'] ."</td>\n";
       echo " <td colspan=\"2\">&nbsp;";
       $this->fd->EnterDate("start",1);
       echo "&nbsp;</td>\n";

       echo "</tr><tr>\n";
       echo " <td colspan=\"2\">&nbsp;";
       $this->td->EnterDate("end",1);
       echo "&nbsp;</td>\n";

       echo "</tr><tr>\n";
       echo $this->showfieldc($lang['TaskState']);
       echo " <td colspan=\"2\"><select name=\"state\">";
       echo "   <option value=\"-2\">". $lang['any'] ."</option>\n";
       foreach ($lang['TaskStates'] as $s => $x) {
         echo "   <option value=\"". $s ."\"". ($this->state == $s ? " selected" : "") .">". $lang['TaskStates'][$s] ."</option>\n";
       }
       echo "</select></td>\n";

       echo "</tr><tr>\n";
       echo $this->showfieldc($lang['TaskWorker']);
       echo " <td colspan=\"2\">\n";
       echo $this->user->askPeople("worker",$this->user->id,0);
       echo " </td>\n";
     }
     echo "</tr>\n";
     DoubleTableEnd();
     hiddenFormElements();
     echo "</form>\n";
     echo "</center>\n";
     echo $this->setfocus("tasksearch.name");
   }
   /**
    * naviagte
    */
   Function navigate() {
   }
   /**
    * prepare
    */
   Function prepare() {
     global $lang;

     $this->name = $lang['TaskSearch'];
     if ( ! $this->user->feature_ok(usetaskmanagement,PERM_SEL) ) {
       $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
       $this->stop = true;
     }

     # Defaults for search
     $this->fd = new DateTime(0);
     $this->td = new DateTime(0);
     if ( isset($_SESSION['tasksearchfrom']) ) {
       $this->fd->setDateTime($_SESSION['tasksearchfrom']);
     }
     if ( isset($_SESSION['tasksearchto']) ) {
       $this->td->setDateTime($_SESSION['tasksearchto']);
     }
     if ( isset($_SESSION['tasksearchstate']) ) {
       $this->state = $_SESSION['tasksearchstate'];
     } else {
       $this->state = -2;
     }

     if ( isset($_GET['ext']) ) {
       $this->ext = $_GET['ext'];
     } else {
       $this->ext = 0;
     }
   }
 }

 $l = new task_select($current_user);
 $l->display();
 $dbconn->Close();
?>
<!--
    CVS Info:  $Id: task_select.php,v 1.1 2003/12/28 17:08:40 gokohnert Exp $
    $Author: gokohnert $
-->

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- task.pinc	27 Nov 2003 15:35:34 -0000	1.128
+++ task.pinc	28 Dec 2003 17:08:39 -0000	1.129
@@ -21,9 +21,9 @@
   task::obj_read($obj);
 
   if ( ($obj->getType() == "address")||($obj->getType() == "team") ) {
-    $norecur = 1;
+    $recursive = false;
   } else {
-    $norecur = 0;
+    $recursive = true;
   }
 
   $obj->max_end     = new DateTime(0);
@@ -39,7 +39,7 @@
 
   if ( count($obj->tasklist) > 0 ) {
     foreach ($obj->tasklist as $i => $f) {
-      if ( $norecur == 0 ) {
+      if ( $recursive ) {
         task_calc($f);
         $min = $f->min_start->ts;
         $max = $f->max_end->ts;
@@ -630,9 +630,8 @@
    */
 
   function printRow (&$layout,$depth, &$parent, $fld = "", $slimit=0, $elimit=0) {
-     global $lang, $tutos;
+     global $lang, $tutos, $projects_tasks;
 
-     global $projects_tasks;
      if( !isset($projects_tasks) ) $projects_tasks = array();
 
      #echo $this->id." XXX  ".$parent->id." XXX ".$parent->getType()." <br>";
@@ -641,14 +640,14 @@
      if( $this->id == -1 )
        return;
 
-     if ( ($parent->getType() == "address")||($parent->getType() == "team") ) {
-       $norecur = 1;
+     if ( ($parent->getType() == "address")||($parent->getType() == "team")||($parent->getType() == "base") ) {
+       $recursive = false;
        # print only unfinished tasks
        if ( $this->state == TASK_FINISH ) {
          return 1;
        }
      } else {
-       $norecur = 0;
+       $recursive = true;
      }
 
      /* we limit the date range of printed tasks */
@@ -709,27 +708,26 @@
            echo "<p align=\"right\">".$lang['Product']." ".$project->getLink();
            break;
 
-        default:
-           break;
-        }
+           default:
+              break;
+           }
 
-        echo "</td>\n";
-       }
+           echo "</td>\n";
+         }
        } // end of switch $parent->getType()
 
        // I have some strange bug where I reach non existing entities.
        if( $this->getLink() == "" )
-     return 0;
+         return 0;
 
        // When displaying an address time overview, we have to compute
        // the volume done by the $parent address !
        if( $parent->getType() == "address" ) {
-     $volume = $this->volume;
-     $volume_done = computeWorkedHours($parent, $this);
-       }
-       else {
-     $volume = $this->volume;
-     $volume_done = $this->volume_done;
+         $volume = $this->volume;
+         $volume_done = computeWorkedHours($parent, $this);
+       } else {
+         $volume = $this->volume;
+         $volume_done = $this->volume_done;
        }     
 
        echo "  <td align=\"right\" valign=\"top\" nowrap>"
@@ -766,40 +764,40 @@
        echo "  <td align=\"left\" colspan=\"2\" width=\"".($w +1)."\" nowrap>";
 
        if ( $x1a + $x1b > 0 ) {
-     if ( $x1b < 0 ) {
-       echo "<img border=\"0\" height=\"". $h ."\" width=\"".( $x1a + $x1b) ."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\">";
-     } else {
-       if ( $x1a > 0 ) {
-         echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x1a  ."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\">";
-       }
-     }
-     if ( $x1b > 0 ) {
-       echo "<img border=\"0\" height=\"". $h ."\" width=\"".$x1b."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\">";
-     }
+         if ( $x1b < 0 ) {
+           echo "<img border=\"0\" height=\"". $h ."\" width=\"".( $x1a + $x1b) ."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\">";
+         } else {
+           if ( $x1a > 0 ) {
+             echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x1a  ."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\">";
+           }
+         }
+         if ( $x1b > 0 ) {
+           echo "<img border=\"0\" height=\"". $h ."\" width=\"".$x1b."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\">";
+         }
        }
        if ( $x2 == 0 ) {
-     $x2=1;
+         $x2=1;
        }
        $x2a = Round($x2 * $c/100.0);
        $x2b = Round($x2 * (100 - $c)/100.0);
        if ( $x2a != 0 ) {
-     echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x2a."\" src=\"". $tutos['base'] ."/html/green.png\" alt=\"". $this->getFullName() ."\">";
+         echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x2a."\" src=\"". $tutos['base'] ."/html/green.png\" alt=\"". $this->getFullName() ."\">";
        }
        if ( $x2b > 0 ) {
-     echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x2b."\" src=\"". $tutos['base'] ."/html/red.png\"  alt=\"". $this->getFullName() ."\">";
+         echo "<img border=\"0\" height=\"". $h ."\" width=\"". $x2b."\" src=\"". $tutos['base'] ."/html/red.png\"  alt=\"". $this->getFullName() ."\">";
        }
 
        if ( $x3a + $x3b > 0 ) {
-     if ( $x3a > 0 ) {
-       echo "<img border=\"0\" height=\"". $h ."\" width=\"".$x3a."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\">";
-       if ( $x3b > 0 ) {
-         echo "<img border=\"0\" height=\"". $h ."\" width=\"". ($x3b - 1) ."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\">";
-       }
-     } else {
-       if ( ($x3b + $x3a) > 0 ) {
-         echo "<img border=\"0\" height=\"". $h ."\" width=\"".($x3b + $x3a)."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\">";
-       }
-     }
+         if ( $x3a > 0 ) {
+           echo "<img border=\"0\" height=\"". $h ."\" width=\"".$x3a."\" src=\"". $tutos['base'] ."/html/gray.png\" alt=\"\">";
+           if ( $x3b > 0 ) {
+             echo "<img border=\"0\" height=\"". $h ."\" width=\"". ($x3b - 1) ."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\">";
+           }
+         } else {
+           if ( ($x3b + $x3a) > 0 ) {
+             echo "<img border=\"0\" height=\"". $h ."\" width=\"".($x3b + $x3a)."\" src=\"". $tutos['base'] ."/html/white.png\" alt=\"\">";
+           }
+         }
        }
        echo "</td>\n";
        echo "  <td valign=\"bottom\">&nbsp;". $this->s_end->getDate() ."&nbsp;</td>\n";
@@ -810,27 +808,26 @@
 
        echo "  <td align=\"center\">&nbsp;";
        if ( $tutos[massupdate] == 1 ) {
-# Checkbox column for massupdate
-     if ( $this->mod_ok() ) {
-       echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $this->id ."\">";
-     } else {
-       echo "-";
-     }
+         # Checkbox column for massupdate
+         if ( $this->mod_ok() ) {
+           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $this->id ."\">";
+         } else {
+           echo "-";
+         }
        } else {
-     if ( $this->del_ok() ) {
-       echo confirmlink("task_del.php?id=".$this->id,$lang['Delete'],sprintf($lang['TaskDelete'],$this->name));
-     } else {
-       echo $lang['Delete'];
-     }
+         if ( $this->del_ok() ) {
+           echo confirmlink("task_del.php?id=".$this->id,$lang['Delete'],sprintf($lang['TaskDelete'],$this->name));
+         } else {
+           echo $lang['Delete'];
+         }
        }
        echo "&nbsp;</td>\n";
        echo $layout->OverviewRowEnd($layout->line++);
      }
 
-     if ( $norecur != 1 ) {
+     if ( $recursive ) {
        task::obj_read($this);
-       @reset($this->tasklist);
-       while ( list ($i,$f) = @each ($this->tasklist) ) {
+       foreach($this->tasklist as $i => $f) {
          $f->printRow($layout,$depth +1,$parent, $fld, $slimit, $elimit);
        }
      }

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- task_overview.php	29 Oct 2003 08:59:43 -0000	1.60
+++ task_overview.php	28 Dec 2003 17:08:40 -0000	1.61
@@ -22,12 +22,41 @@
   */
  class task_overview extends layout {
    /**
+    * free search
+    */
+   function select_by_name() {
+     $this->parent->min_start = new DateTime();
+     $this->parent->max_end = new DateTime(0);
+     $this->parent->sum['volume'] = 0.0;
+     $this->parent->sum['volume_done'] = 0.0;
+     $q = "SELECT * from ". $this->dbconn->prefix ."tasks WHERE ";
+     $q .= $this->dbconn->like("name", $this->search);
+     $q .= " ORDER by s_start";
+     $r = $this->dbconn->Exec($q);
+     $n = $r->numrows();
+     $a = 0;
+     while ($a < $n) {
+       $t = new task($this->dbconn);
+       $t->read_result($r,$a);
+       $t->readTimetrackSum();
+       $this->parent->tasklist[$t->id] = &$t;
+       $a++;
+
+       $max_end = max($this->parent->max_end->ts,$t->s_end->ts);
+       $min_start = min($this->parent->min_start->ts,$t->s_start->ts);
+	   $this->parent->min_start->setDateTimeTS($min_start);
+	   $this->parent->max_end->setDateTimeTS($max_end);
+       $this->parent->sum['volume_done'] += $t->timetracksum;
+       $this->parent->sum['volume'] += $t->volume;
+	   unset($t);
+	 }
+   }
+   /**
     * display the info
     */
    Function info() {
      global $lang,$tutos;
 
-     task_calc($this->parent);
 
      if ( $tutos[massupdate] == 1 ) {
        echo "<form name=\"actionform\" method=\"get\" action=\"task_overview.php\">\n";
@@ -58,7 +87,7 @@
        echo "</script>\n";
      }
      
-     if( ! isset($this->start) || $this->start == 0) {
+     if( $this->start->notime == 1) {
        $this->start = $this->parent->min_start;
        $this->end   = $this->parent->max_end;
      }
@@ -94,7 +123,13 @@
      $cols = 9;
      echo " <thead>\n";
      echo " <tr>\n";
-     echo "  <th colspan=\"". $cols ."\" width=\"100%\">". $lang['TaskOverview'] ." ". $lang['forphrase'] ." " . menulink($this->parent->getURL(),$this->parent->getFullName()) ."</th>\n";
+     echo "  <th colspan=\"". $cols ."\" width=\"100%\">". $lang['TaskOverview'] ." ". $lang['forphrase'] ." ";
+	 if ($this->search == "") {
+       echo menulink($this->parent->getURL(),$this->parent->getFullName());
+	 } else {
+       echo "\"". $this->search ."\"";
+	 }
+     echo "</th>\n";
      echo " </tr>\n";
      echo " <tr>\n";
      echo "  <td colspan=\"2\" class=\"desc\" nowrap>&nbsp;". $lang['TaskVolumeFull'] ."&nbsp;</td>\n";
@@ -324,45 +359,69 @@
 
      $this->fld = "";
      $this->name = $lang['TaskOverview'];
+     $this->start = new DateTime(0);
+     $this->end = new DateTime(0);
+     $this->search = "";
+     $this->state = 0;
+	 $this->parent = -1;
 
      if ( ! $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
        $msg .= sprintf($lang['Err0022'],"'". $this->name ."'");
        $this->stop = true;
      }
 
+
      if ( isset($_GET['id']) ) {
        $this->parent = GetObject($this->dbconn,$_GET['id']);
+	   if ($this->parent == -1) {
+         $msg .= $lang['Err0048'];
+         $this->stop = true;
+         return;
+	   }
        $this->addHidden("id",$this->parent->id);
        $this->name .= " : ". $this->parent->getFullName();
-     } else {
-       $msg .= $lang['Err0048'];
-       $this->stop = true;
-       return;
-     }
-     if ( isset($_GET['fld']) ) {
-       $this->fld = $_GET['fld'];
-     }
 
+       if ( isset($_GET['fld']) ) {
+         $this->fld = $_GET['fld'];
+       }
+       task_calc($this->parent);
+
+       $x = task::getaddlink($this->user,$this->parent,$lang['NewEntry']);
+       $this->addMenu($x);
+     } else if ( isset($_GET['name']) ) {
+       # Classical Search
+	   $this->search = $_GET['name'];
+	   $this->parent = new tutos_base($this->dbconn);
+       $this->fld = "worker";
+	   $this->select_by_name();
+	 }
+
+     # State
+     if ( isset($_GET['state']) ) {
+	   $this->state = $_GET['state'];
+	 }
+
+     # Timerange Start
      if ( isset($_GET['start']) ) {
-       $this->start = new DateTime($_GET['start']);
+       $this->start->setDateTime($_GET['start']);
      } else {
        if( isset($_GET['start_d']) ) {
-         $start = sprintf("%04d%02d%02d", $_GET['start_y'],$_GET['start_m'], $_GET['start_d']);
-         $this->start = new DateTime($start);
+         $this->start->setDateTimeF('start');
+         $_SESSION['tasksearchfrom'] = $this->start->getYYYYMMDD();
        }
      }
+     # Timerange End
      if ( isset($_GET['end']) ) {
-       $this->end = new DateTime($_GET['end']);
+       $this->end->setDateTime($_GET['end']);
      } else {
        if( isset($_GET['end_d']) ) {
-         $end = sprintf("%04d%02d%02d", $_GET['end_y'],$_GET['end_m'], $_GET['end_d']);
-         $this->end = new DateTime($end);
+         $this->end->setDateTimeF('end');
+         $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
        }
      }
-
+     if ($this->parent == -1)  {
+	 }
      # menu
-     $x = task::getaddlink($this->user,$this->parent,$lang['NewEntry']);
-     $this->addMenu($x);
 
      // The PNG Gantt functionality, using JpGraph Tools, to be installed
      if( $tutos[usejpgraph] ) {
@@ -374,7 +433,7 @@
        $this->addMenu($x);
      }
 
-     if( $this->parent != -1 && $this->parent->getType() !=  "address" ) {
+     if( $this->parent != -1  && ($this->name == "") && $this->parent->getType() !=  "address" ) {
        $x = array( url =>  "task_overview.php?id=".$this->parent->id, 
                    info => sprintf($lang['TaskOverviewInfo'],$this->parent->getFullName()),
                    category => array("task","view")
@@ -387,11 +446,11 @@
        switch( $this->parent->getType() ) {
        case "user":
        case "team":
-	 $x[url] .= "&amp;fld=product";
-       break;
+         $x[url] .= "&amp;fld=product";
+         break;
        default:
-	 $x[url] .= "&amp;fld=worker";
-       break;
+         $x[url] .= "&amp;fld=worker";
+         break;
        }
        $this->addMenu($x);
      }

Update of /cvsroot/tutos/tutos/php/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv2145/php/admin

Modified Files:
	scheme.php 
Log Message:
fix

Index: scheme.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/scheme.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scheme.php	28 Dec 2003 10:21:08 -0000	1.4
+++ scheme.php	28 Dec 2003 11:40:21 -0000	1.5
@@ -136,7 +136,7 @@
      $this->user->id = $adr->id;
      $this->user->admin = 1;
 
-     $q = "DELETE FROM ". $user->tablename ." WHERE login = ". $this->user->dbconn->String($this->user->login);
+     $q = "DELETE FROM ". $this->user->tablename ." WHERE login = ". $this->user->dbconn->String($this->user->login);
      $this->user->dbconn->exec($q);
 
      $msg = $this->user->save();
@@ -562,12 +562,12 @@
      global $tutos,$lang;
 
      echo "<tr><td nowrap>";
-     echo menulink("update.php?id=".$this->id ,"UPDATE ". $tutos[dbalias][$this->id]);
+     echo menulink("admin/update.php?id=".$this->id ,"UPDATE ". $tutos[dbalias][$this->id]);
      echo "<br>\n";
      echo "<br>\n";
 
      foreach ($tutos[dbname] as $i => $f) {
-       echo menulink("scheme.php?id=".$i ,$tutos[dbalias][$i],$tutos[dbalias][$i]);
+       echo menulink("admin/scheme.php?id=".$i ,$tutos[dbalias][$i],$tutos[dbalias][$i]);
        echo "<br>\n";
      }
 

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1:/tmp/cvs-serv2145/php/db

Modified Files:
	db_oci.pinc db_ora.pinc 
Log Message:
fix

Index: db_oci.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_oci.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- db_oci.pinc	15 Dec 2003 13:22:24 -0000	1.19
+++ db_oci.pinc	28 Dec 2003 11:40:21 -0000	1.20
@@ -41,6 +41,7 @@
   function db_oci(&$db) {
     global $tutos;
 
+	die ("xxxx");
     parent::init($db);
 
     $tutos[use_check_dbacl] = 0;
@@ -478,7 +479,7 @@
          select inner.*,rownum as tutos_rn from (". $q .") inner
         where rownum < ". ($start + $cnt) ."
       ) outer
-      where tutos_rn > ".$start
+      where tutos_rn > ".$start;
   }
   /**
    * do we need a count(*) to get the number of possible results in a select
@@ -568,4 +569,4 @@
   }
 
 }
-?>
+?>
\ No newline at end of file

Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_ora.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- db_ora.pinc	15 Dec 2003 13:22:24 -0000	1.19
+++ db_ora.pinc	28 Dec 2003 11:40:21 -0000	1.20
@@ -501,7 +501,7 @@
          select inner.*,rownum as tutos_rn from (". $q .") inner
         where rownum < ". ($start + $cnt) ."
       ) outer
-      where tutos_rn > ".$start
+      where tutos_rn > ".$start;
   }
   /**
    * do we need a count(*) to get the number of possible results in a select

Update of /cvsroot/tutos/tutos/php/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv24135a

Modified Files:
	scheme.php 
Log Message:
fix


Index: scheme.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/scheme.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scheme.php	15 Dec 2003 13:28:17 -0000	1.3
+++ scheme.php	28 Dec 2003 10:21:08 -0000	1.4
@@ -62,7 +62,7 @@
        } else { 
          echo "<span class=\"found\">Table <b>". $this->obj->prefix . $f[name] ."</b> created</span><br>\n";
        }
-	   flush();
+       flush();
      }
      # Build the inidces
      echo "<p>\n";
@@ -78,7 +78,7 @@
        } else { 
          echo "<span class=\"found\">Index <b>". $this->obj->prefix . $f[name] ."</b> created</span><br>\n";
        }
-	   flush();
+       flush();
      }
      # Build the sequencers
      echo "<p>\n";
@@ -124,8 +124,8 @@
      $adr->birthday = new DateTime();
      $adr->creator = $adr;
 
-	 $q = "DELETE FROM ". $adr->tablename ." WHERE f_name = ". $adr->dbconn->String($adr->f_name) ." AND l_name = ". $adr->dbconn->String($adr->l_name);
-	 $adr->dbconn->exec($q);
+     $q = "DELETE FROM ". $adr->tablename ." WHERE f_name = ". $adr->dbconn->String($adr->f_name) ." AND l_name = ". $adr->dbconn->String($adr->l_name);
+     $adr->dbconn->exec($q);
 
      $msg .= $adr->save();
 
@@ -136,8 +136,8 @@
      $this->user->id = $adr->id;
      $this->user->admin = 1;
 
-	 $q = "DELETE FROM ". $user->tablename ." WHERE login = ". $this->user->dbconn->String($this->user->login);
-	 $this->user->dbconn->exec($q);
+     $q = "DELETE FROM ". $user->tablename ." WHERE login = ". $this->user->dbconn->String($this->user->login);
+     $this->user->dbconn->exec($q);
 
      $msg = $this->user->save();
      echo $msg ."<br>\n";
@@ -178,7 +178,7 @@
      echo $lang[$u1->getType()].":". $u1->login ."<br>\n";
      flush();
 
-	 $current_user = &$u1;
+     $current_user = &$u1;
 
      $a2->f_name = "Bill";
      $a2->l_name = "Gates";
@@ -293,8 +293,8 @@
      $p1->name = "TUTOS";
      $p1->version = $tutos[version];
      $p1->creator = &$u3;
-	 $p1->setRole($a3,PROD_ROLE_MANAGER,"managing");
-	 $p1->setRole($f1,PROD_ROLE_PARTNER,"find the customers");
+     $p1->setRole($a3,PROD_ROLE_MANAGER,"managing");
+     $p1->setRole($f1,PROD_ROLE_PARTNER,"find the customers");
      $p1->cl[1][] = 1;
      $p1->cl[2][] = 1;
      $msg .= $p1->save();
@@ -304,7 +304,7 @@
      $p2->name = "Linux";
      $p2->version = "2.2";
      $p2->creator = &$u1;
-	 $p1->setRole($a1,PROD_ROLE_MANAGER,"lead the bunch");
+     $p1->setRole($a1,PROD_ROLE_MANAGER,"lead the bunch");
      $p2->cl[1][] = 1;
      $p2->cl[2][] = 1;
      $msg .= $p2->save();
@@ -314,8 +314,8 @@
      $p3->name = "Linux";
      $p3->version = "2.4";
      $p3->creator = &$u1;
-	 $p1->setRole($a1,PROD_ROLE_MANAGER,"lead the bunch");
-	 $p1->setRole($p2,PROD_ROLE_ANCESTOR,"");
+     $p1->setRole($a1,PROD_ROLE_MANAGER,"lead the bunch");
+     $p1->setRole($p2,PROD_ROLE_ANCESTOR,"");
      $msg .= $p3->save();
      echo $lang[$p3->getType()].":". $p3->getFullName() ."<br>\n";
 
@@ -349,9 +349,9 @@
      echo $lang[$c2->getType()].":". $c2->getFullName() ."<br>\n";
 
      # Bug
-	 if (class_exists('bug')) {
+     if (class_exists('bug')) {
        $b1 = new bug($this->obj);
-	   $b1->setName("auto");
+       $b1->setName("auto");
        $b1->state = 1;
        $b1->class = 1;
        $b1->short = "too slow";
@@ -363,7 +363,7 @@
        echo $lang[$b1->getType()].":". $b1->getFullName() ."<br>\n";
 
        $b2 = new bug($this->obj);
-	   $b2->setName("auto");
+       $b2->setName("auto");
        $b2->state = 1;
        $b2->class = 1;
        $b2->short = "too fast";
@@ -373,14 +373,14 @@
        $b2->solver = $a2;
        $msg .= $b2->save();
        echo $lang[$b2->getType()].":". $b2->getFullName() ."<br>\n";
-	 }
+     }
      # Task
      $t1 = new task($this->obj);
      $t1->name = "Demo Task 1";
      $t1->description = "This is a task";
-	 $x = new DateTime();
+     $x = new DateTime();
      $t1->setSStart($x);
-	 $x->addDays(3);
+     $x->addDays(3);
      $t1->setSEnd($x);
      $t1->volume = 12.5;
      $t1->state = 1;
@@ -396,10 +396,10 @@
      $t2->state = 0;
      $t2->p_id = $p1->id;
      $t2->worker[$a1->id] = $a1;
-	 $x = new DateTime();
-	 $x->addDays(1);
+     $x = new DateTime();
+     $x->addDays(1);
      $t2->setSStart($x);
-	 $x->addDays(2);
+     $x->addDays(2);
      $t2->setSEnd($x);
      $msg .= $t2->save();
      echo $lang[$t2->getType()].":". $t2->getFullName() ."<br>\n";
@@ -412,10 +412,10 @@
      $t3->p_id = $t2->id;
      $t3->worker[$a1->id] = $a1;
      $t3->worker[$a2->id] = $a2;
-	 $x = new DateTime();
-	 $x->addDays(2);
+     $x = new DateTime();
+     $x->addDays(2);
      $t3->setSStart($x);
-	 $x->addDays(2);
+     $x->addDays(2);
      $t3->setSEnd($x);
      $msg .= $t3->save();
      echo $lang[$t3->getType()].":". $t3->getFullName() ."<br>\n";
@@ -482,7 +482,7 @@
        $url2->link_id = $f1->id;
        $msg .= $url2->save();
        echo $lang[$url2->getType()].":". $url2->getFullName() ."<br>\n";
-	 }
+     }
      echo $msg ."<br>\n";
      return;
    }
@@ -568,7 +568,7 @@
 
      foreach ($tutos[dbname] as $i => $f) {
        echo menulink("scheme.php?id=".$i ,$tutos[dbalias][$i],$tutos[dbalias][$i]);
-	   echo "<br>\n";
+       echo "<br>\n";
      }
 
      echo "<br>\n";
@@ -581,9 +581,9 @@
    Function prepare() {
      global $msg,$current_user,$lang,$tutos,$msg,$table,$tableidx,$sequence;
 
-	 if (isset($_GET['msg'])) { 
+     if (isset($_GET['msg'])) { 
        $msg = $_GET['msg'];
-	 }
+     }
      ReadLang($lang);
 
      if ( ! minimum_version(minimumversion) ) {
@@ -594,9 +594,10 @@
 
      # read the table definitions of modules
      foreach ($tutos[modules] as $r => $x) {
+       if (!isset($tutos[modules][$r][file])) continue;
        if (file_exists(dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc") ) {
          @include_once dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc";
-		 loadmodule($r);
+         loadmodule($r);
        }
      }
      if ( isset($_GET['step']) && ($tutos[demo] == 0) ) {
@@ -615,7 +616,7 @@
        $this->stop = true;
      } else {
        $this->obj = DB_Open($this->id,false);
-	 }
+     }
      if ( $this->stop == false ) {
        if ( $this->obj->gettype() == "Postgres" ) {
          # No persistent connections here
@@ -630,7 +631,7 @@
      $this->user->f_name = "TUTOS";
      $this->user->l_name = "(installation service)";
      $this->user->admin = 1;
-	 $current_user = $this->user;
+     $current_user = $this->user;
 
      $this->name = $lang['DBInit']." STEP ". $this->step;
    }

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv17359/note

Modified Files:
	note.pinc 
Log Message:
fix

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- note.pinc	17 Oct 2003 19:34:28 -0000	1.37
+++ note.pinc	27 Dec 2003 16:47:48 -0000	1.38
@@ -139,11 +139,14 @@
     $t =str_replace("\\","\\\\",$t);
     $t =str_replace("'","\'",$t);
 
+	$h = $this->ref->getFullName();
+	$h = eregi_replace("\r\n"," ",$h);
+
     $info = "";
     $info .= "<html>";
     $info .= "<body>";
     $info .= "<table class=\"inner\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">";
-    $info .= "<tr><th>". $lang[$this->ref->getType()] ." ".$this->ref->getFullName()."  &#8594; ". $t  ."</th></tr>";
+    $info .= "<tr><th>". $lang[$this->ref->getType()] ." ". $h ."  &#8594; ". $t  ."</th></tr>";
     $info .= "<tr><td><font size=\"-1\"><pre>";
     $info .= $n;
     $info .= "</pre></font></td></tr>";

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv17262

Modified Files:
	base.pinc history.pinc Date.pinc showobject.php address.pinc 
	location.pinc company_show.php address_show.php permission.p3 
Log Message:
XML import/export

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- base.pinc	6 Nov 2003 21:40:24 -0000	1.49
+++ base.pinc	27 Dec 2003 16:47:08 -0000	1.50
@@ -164,6 +164,18 @@
     return;
   }
   /**
+   * parse XML import
+   */
+  function parseXML ($fld,$data,$attrs) {
+    if ($fld == "id") {
+      $this->id = $data;
+    }
+    if ($fld == "creation") {
+      $this->creation->setDateTime($data);
+    }
+    return;
+  }
+  /**
    * Head of XML export
    */
   function exportXML_head () {
@@ -182,11 +194,45 @@
     return "</". $this->gettype() .">\n";
   }
   /**
+   * Data of XML export
+   */
+  function exportXML_body () {
+    global $current_user;
+
+    if (!$this->see_ok()) {
+      return;
+    }
+    $r =  "<id>". $this->id ."</id>\n";
+    $r .= "<creation>". $this->creation->exportXML_body() ."</creation>\n";
+    # datetime of last modification
+    if ( $current_user->feature_ok(usehistory,PERM_SEE) ) {
+      $d = history_get_lastmod($this);
+	  if ($d) {
+        $r .=  "<lastmod>". $d->exportXML_body() ."</lastmod>\n";
+	  }
+    }
+    return $r;
+  }
+  /**
+   * Header for Export as XML
+   */
+  function exportXMLHeader () {
+    Header("Expires: 0");
+    Header("Pragma: no-cache");
+    Header("Content-type: text/xml");
+    Header("Content-Disposition: attachment; filename=\"". $this->gettype() .".xml\"");
+    Header("Content-Description: XML Export from TUTOS" );
+    return;
+  }
+  /**
    * Export as XML
    */
   function exportXML () {
     $r = $this->exportXML_head() ;
     $r .=  $this->exportXML_start();
+    if ($this->see_ok()) {
+      $r .=  $this->exportXML_body();
+    }
     $r .=  $this->exportXML_end();
     return $r;
   }
@@ -251,6 +297,9 @@
    * @param String $histfield the label of the field in the history table
    */
   function setStrField ($fld,$value,$histfield) {
+    if ( !isset($this->$fld) ) {
+        echo "NIX:". $this->gettype() ." ". $fld ." ". $value;
+    }
     if ( $this->$fld != $value ) {
       $this->modified[] = array ( "field" => $histfield , "old" => $this->$fld , "new" => $value  );
       $this->$fld = $value;

Index: history.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- history.pinc	15 Dec 2003 13:22:24 -0000	1.41
+++ history.pinc	27 Dec 2003 16:47:08 -0000	1.42
@@ -112,8 +112,21 @@
   }
   return $msg;
 }
-/* ---------------------------------------------------------------------------
- * Remove the history
+/**
+ * get the datetime of last modification
+ */
+function history_get_lastmod (&$obj) {
+  $q = "SELECT m_time from ". $obj->dbconn->prefix ."history where obj_id = ". $obj->id ." order by m_time desc";
+  $r = $obj->dbconn->Exec($q);
+  if ( ($r == -1) || (1 > $r->numrows()) ) {
+    return "";
+  }
+  $d = $r->getDateTime(0, "m_time");
+  $r->free();
+  return $d;
+}
+/**
+ * Remove the history of the given object
  */
 function history_delete (&$obj) {
   $msg = "";

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- Date.pinc	8 Dec 2003 17:20:30 -0000	1.84
+++ Date.pinc	27 Dec 2003 16:47:08 -0000	1.85
@@ -905,6 +905,12 @@
     }
   }
   /**
+   * Data of XML export
+   */
+  function exportXML_body () {
+    return $this->getYYYYMMDDHHMM();
+  }
+  /**
    * add given number of days to this date
    */
   function addDays($val) {

Index: showobject.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/showobject.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- showobject.php	31 Dec 2002 14:33:39 -0000	1.10
+++ showobject.php	27 Dec 2003 16:47:08 -0000	1.11
@@ -1,7 +1,10 @@
 <?php
 /*
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  * Display a object by id
+ *
+ *   CVS Info:  $Id$
+ *   $Author$
  */
  include("webelements.p3");
  include("permission.p3");
@@ -16,12 +19,15 @@
  } else {
    echo "ID:". $_GET['id'] ." not found.<br>\n";
  }
+
+ if ( $_GET['format'] == "xml" ) {
+   echo $obj->exportXMLHeader();
+   echo $obj->exportXML();
+   return;
+ }
+
  Header("Status: 302 Moved Temporarily");
  Header("Location: ". getBaseUrl(). $gotourl);
 
  $dbconn->Close();
 ?>
-<!--
-    CVS Info:  $Id$
-    $Author$
--->

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- address.pinc	19 Dec 2003 08:58:18 -0000	1.96
+++ address.pinc	27 Dec 2003 16:47:08 -0000	1.97
@@ -408,6 +408,47 @@
     return $n;
   }
   /**
+   * Data of XML export
+   */
+  function exportXML_body () {
+    $this->read_locs_data();
+	$r = parent::exportXML_body();
+    $r .=  "<title>". utf8_encode($this->title) ."</title>\n";
+    $r .=  "<firstname>". utf8_encode($this->f_name) ."</firstname>\n";
+    $r .=  "<middlename>". utf8_encode($this->m_name) ."</middlename>\n";
+    $r .=  "<lastname>". utf8_encode($this->l_name) ."</lastname>\n";
+    if ( $this->birthday->notime != 1 ) {
+      $r .=  "<birthday>". $this->birthday->exportXML_body() ."</birthday>\n";
+	}
+    if ( isset($this->location) && (count($this->location) > 0) ) {
+      foreach($this->location as $i => $f) {
+        $r .= $f->exportXML_start();
+        $r .= $f->exportXML_body();
+        $r .= $f->exportXML_end();
+      }
+    }
+	return $r;
+  }
+  /**
+   * parse XML import
+   */
+  function parseXML ($fld,$data,$attrs) {
+	parent::parseXML($fld,$data,$attrs);
+    if ($fld == "title") {
+      $this->setTitle($data);
+    } else if ($fld == "firstname") {
+      $this->setFName($data);
+    } else if ($fld == "middlename") {
+      $this->setMName($data);
+    } else if ($fld == "lastname") {
+      $this->setLName($data);
+    } else if ($fld == "birthday") {
+	  $d = new DateTime($data);
+      $this->setBirthday($d);
+    }
+    return;
+  }
+  /**
    * Return a vcard for this address
    */
   function getVcard() {
@@ -419,8 +460,7 @@
     $ical .= "N:" . $this->l_name .";". $this->f_name ."\n";
     $ical .= "FN:" . $this->getFullName() ."\n";
     if ( isset($this->location) && (count($this->location) > 0) ) {
-      @reset($this->location);
-      while( list ($i,$f) = @each ($this->location)) {
+      foreach($this->location as $i => $f) {
         if ( $f->email_1 != "" ) {
           $ical .= "EMAIL;TYPE=INTERNET:" . $f->email_1 ."\n";
         }

Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- location.pinc	17 Oct 2003 13:05:12 -0000	1.45
+++ location.pinc	27 Dec 2003 16:47:08 -0000	1.46
@@ -173,7 +173,7 @@
       $text = $this->getFullName();
     }
 
-	$this->read_ref();
+    $this->read_ref();
     if ( $this->see_ok() && ($this->ref != -1)) {
       return makelink($this->ref->getURL() , myentities($text) ,sprintf($lang['location'] ." %s",$this->getFullName()));
     } else {
@@ -352,6 +352,39 @@
     return $msg;
   }
   /**
+   * parse XML import
+   */
+  function parseXML ($fld,$data,$attrs) {
+    parent::parseXML($fld,$data,$attrs);
+
+    if ($fld == "lname") {
+      $this->setLName($data);
+    } else if ($fld == "category") {
+      $this->setCategory($data);
+    }
+    foreach($this->larray as $f) {
+      if ($fld == $f) {
+        $this->setField($f,$data);
+      }
+    }
+    return;
+  }
+  /**
+   * Data of XML export
+   */
+  function exportXML_body () {
+    $r = parent::exportXML_body();
+    $r .=  "<lname>". $this->lname ."</lname>\n";
+    $r .=  "<category>". $this->category ."</category>\n";
+    $i=0;
+    while($i < count($this->larray)) {
+      $f = $this->larray[$i];
+      $r .=  "<".$f.">". utf8_encode($this->$f) ."</".$f.">\n";
+      $i++;
+    }
+    return $r;
+  }
+  /**
    * get the type of object
    */
   function gettype () {
@@ -385,9 +418,9 @@
     } else {
       $this->setLname(StripSlashes($_POST['lname']));
       $gotourl= addUrlParameter($gotourl,"lname=". UrlEncode(StripSlashes($this->lname)),true);
-	  if (!empty($this->lname)) {
+      if (!empty($this->lname)) {
         $this->used = true;
-	  }
+      }
     }
 
     # Check Company
@@ -417,9 +450,9 @@
       if ( isset($_POST[$f]) ) {
         $this->setField($f,StripSlashes($_POST[$f]));
         $gotourl= addUrlParameter($gotourl,$f ."=". UrlEncode($this->$f),true);
-		if (!empty($this->$f)) {
+        if (!empty($this->$f)) {
           $this->used = true;
-		}
+        }
       }
       $i++;
     }

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- company_show.php	22 Oct 2003 17:47:20 -0000	1.59
+++ company_show.php	27 Dec 2003 16:47:08 -0000	1.60
@@ -28,6 +28,12 @@
    Function info() {
      global $tutos,$lang;
 
+     if ( $this->format == "xml" ) {
+	   echo $this->obj->exportXMLHeader();
+	   echo $this->obj->exportXML();
+       return;
+     }
+
      if ( isset($this->obj->location) ) {
        $cols = count($this->obj->location);
      } else {

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- address_show.php	16 Nov 2003 16:40:21 -0000	1.80
+++ address_show.php	27 Dec 2003 16:47:08 -0000	1.81
@@ -81,6 +81,10 @@
      } else if ( $this->format == "popup" ) {
        $this->popinfo();
        return;
+     } else if ( $this->format == "xml" ) {
+	   echo $this->obj->exportXMLHeader();
+	   echo $this->obj->exportXML();
+       return;
      }
      $cols = 1;
      if ( count($this->obj->loc) > 0 ) {

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- permission.p3	30 Oct 2003 11:01:26 -0000	1.131
+++ permission.p3	27 Dec 2003 16:47:08 -0000	1.132
@@ -135,6 +135,7 @@
 
   $current_user = new tutos_user($dbconn);
   $current_user->read_result($result,0);
+  $result->free();
   $m = $current_user->default_email();
 
   if ( empty($m) ) {
@@ -383,7 +384,9 @@
   $_SESSION['lasthost'] = $current_user->last_host;
   $_SESSION['path']     = ini_get("session.cookie_path");
   $_SESSION['server']   = $_SERVER["HTTP_HOST"];
-  $_SESSION['client']   = $_SERVER["HTTP_USER_AGENT"];
+  if (isset($_SERVER["HTTP_USER_AGENT"])) {
+    $_SESSION['client']   = $_SERVER["HTTP_USER_AGENT"];
+  }
 
 #  logmessage($current_user->tz ." ". getenv("TZ"));
 

Update of /cvsroot/tutos/tutos/php/xml
In directory sc8-pr-cvs1:/tmp/cvs-serv17006/xml

Log Message:
Directory /cvsroot/tutos/tutos/php/xml added to the repository

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv26720

Modified Files:
	config_default.pinc task_ins.php timetrack_overview.php 
	user.pinc 
Log Message:
fixes

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- config_default.pinc	17 Dec 2003 15:13:22 -0000	1.70
+++ config_default.pinc	19 Dec 2003 17:13:31 -0000	1.71
@@ -642,11 +642,6 @@
 #
 $tutos[use_check_dbacl] = 0;
 #
-# Login will be insert a entry into table lastlogins
-# !! not completly implemented yet
-#
-#$tutos[use_login_log] = 1;
-#
 # Set tutos[demo] to 0 for real work !
 # Setting it to 1 will disable changes of user settings, permissions and
 # sending mails, etc. (that"s what you see in our online demo)

Index: task_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- task_ins.php	27 Nov 2003 15:35:34 -0000	1.39
+++ task_ins.php	19 Dec 2003 17:13:31 -0000	1.40
@@ -64,10 +64,11 @@
    $gotourl= addUrlParameter($gotourl,"volume=". UrlEncode($_POST['volume']),true);
  }
 
- if ( !checkfloat($_POST['volume_done'],true) ) {
+ $volume_done = $_POST['volume_done'];
+ if ( !checkfloat($volume_done,true) ) {
    $msg .= sprintf($lang['Err0009'],$lang['TaskVolumeDone']) ."<br>";
  } else {
-   $gotourl= addUrlParameter($gotourl,"volume_done=". UrlEncode($_POST['volume_done']),true);
+   $gotourl= addUrlParameter($gotourl,"volume_done=". UrlEncode($volume_done),true);
  }
 
  $volume_todo = $_POST['volume_todo'];
@@ -173,7 +174,7 @@
 
    $t->setState($state);
    $t->setVolume($_POST['volume']);
-   $t->setVolumeDone($_POST['volume_done']);
+   $t->setVolumeDone($volume_done);
    $t->setVolumeTodo($volume_todo);
    $t->setSStart($s_start);
    $t->setSEnd($s_end);

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- timetrack_overview.php	22 Oct 2003 17:47:20 -0000	1.75
+++ timetrack_overview.php	19 Dec 2003 17:13:31 -0000	1.76
@@ -124,7 +124,7 @@
        } else {
          echo "&nbsp;</td>\n";
        }
-       echo " <td>". myentities($tt->desc) ."</td>\n";
+       echo " <td>". myentities($tt->desc) ."&nbsp;</td>\n";
        echo " <td>". $lang['TTStates'][$tt->state] ."</td>\n";
 
        $x= array($tt->cph * $tt->volume,$tt->currency);

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- user.pinc	17 Dec 2003 17:17:07 -0000	1.123
+++ user.pinc	19 Dec 2003 17:13:31 -0000	1.124
@@ -274,9 +274,10 @@
    * parties   == combined list
    * t_parties == teams
    * a_parties == users
+   * indexed by the Adr-ID
    */
   function readKnownParties() {
-    global $lang;
+    global $tutos,$lang;
 
     if ( isset($this->parties) ) {
       return $this->parties ;
@@ -309,7 +310,7 @@
     #
     # users we may see by special (ACL) allowance
     #
-    $q = "SELECT distinct u.adr_id ,d.f_name , d.l_name FROM ". $this->tablename ." u,". $this->dbconn->prefix ."addresses d , ". $this->dbconn->prefix ."acl a WHERE (u.id = a.obj_id) AND (u.adr_id = d.id) AND (a.perm > 0) AND $t2 ORDER by l_name";
+    $q = "SELECT distinct u.adr_id ,d.f_name , d.l_name FROM ". $this->tablename ." u,". $this->dbconn->prefix ."addresses d , ". $this->dbconn->prefix ."acl a WHERE (u.id = a.obj_id) AND (u.adr_id = d.id) AND (a.perm >= ".$tutos[useok].") AND ". $t2 ." ORDER by l_name";
     $r = $this->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;
@@ -325,7 +326,7 @@
     #
     # teams we may see by special (ACL) allowance
     #
-    $q = "SELECT distinct t.id ,t.name from ". $this->dbconn->prefix ."teams t , ". $this->dbconn->prefix ."acl a WHERE (t.id = a.obj_id) AND (a.perm > 0) AND $t2 ORDER by t.name";
+    $q = "SELECT distinct t.id ,t.name from ". $this->dbconn->prefix ."teams t , ". $this->dbconn->prefix ."acl a WHERE (t.id = a.obj_id) AND (a.perm >= ". $tutos[useok].") AND ".$t2." ORDER by t.name";
     $r = $this->dbconn->Exec($q);
     $n = $r->numrows();
     $a = 0;
@@ -340,7 +341,7 @@
     #
     # Members of our teams
     #
-    $q = "SELECT distinct a.id ,a.l_name ,a.f_name FROM ". $this->dbconn->prefix ."addresses a, ". $this->dbconn->prefix ."adrteam t WHERE t.adr_id = a.id AND $t1 ORDER by a.l_name";
+    $q = "SELECT distinct a.id ,a.l_name ,a.f_name FROM ". $this->dbconn->prefix ."addresses a, ". $this->dbconn->prefix ."adrteam t WHERE t.adr_id = a.id AND ".$t1." ORDER by a.l_name";
     $r = $this->dbconn->exec($q);
     $n = $r->numrows();
     $a = 0;
@@ -356,6 +357,8 @@
     # Self
     $this->parties[$this->id] = $this->getFullName();
     $this->a_parties[$this->id] = $this->getFullName();
+
+    return;
   }
   /**
    * Ask for People (list all people teams  the user can see)
@@ -376,11 +379,10 @@
     $r .= "\n<!-- PRE: ". $pre ." -->\n";
 
     /* Insert Teams and users */
-    @reset($this->t_parties);
-    while ( list ($id,$f) = @each ($this->t_parties) ) {
+    foreach($this->t_parties as $id => $f) {
       $x = "<option value=\"".$id ."\"";
       if ( ($pre == $id) && ($multi == 0) ) {
-        $x .= " SELECTED";
+        $x .= " selected";
       } else
       if (  ($multi == 1) && isset($pre[$id]) && ($pre[$id] != 0) ) {
         $x .= " selected";
@@ -390,8 +392,7 @@
 
       $tlist[$f] = $x;
     }
-    @reset($this->a_parties);
-    while ( list ($id,$f) = @each ($this->a_parties) ) {
+    foreach($this->a_parties as $id => $f) {
       $x = "<option value=\"".$id ."\"";
       if ( ($pre == $id) && ($multi == 0) ) {
         $x .= " selected";
@@ -454,8 +455,7 @@
       $r .= "<optgroup label=\"". $lang['User'] ."\">\n";
     }
     @ksort($plist);
-    @reset($plist);
-    while ( list ($i,$f) = @each ($plist) ) {
+    foreach($plist as $f) {
       $r .= $f;
     }
     if ($useOPTGROUP) {
@@ -463,8 +463,7 @@
       $r .= "<optgroup label=\"". $lang['Teams'] ."\">\n";
     }
     @ksort($tlist);
-    @reset($tlist);
-    while ( list ($i,$f) = @each ($tlist) ) {
+    foreach($tlist as $f) {
       $r .= $f;
     }
     if ($useOPTGROUP) {

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs1:/tmp/cvs-serv26720/layout

Modified Files:
	new_layout.pinc 
Log Message:
fixes

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- new_layout.pinc	16 Dec 2003 15:36:37 -0000	1.17
+++ new_layout.pinc	19 Dec 2003 17:13:32 -0000	1.18
@@ -572,7 +572,7 @@
           echo "<tr><th>History</th></tr>\n";
           echo "<tr><td nowrap>\n";
           foreach($_SESSION['history'] as $x) {
-            echo menulink($x[url],$x[text]) ."<br>\n";
+            echo menulink($x[url],$x[text],$x[info]) ."<br>\n";
           }
           echo "</td></tr>\n";
         }

Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1:/tmp/cvs-serv26285/invoice

Modified Files:
	invoice_pdf.pinc 
Log Message:
extended

Index: invoice_pdf.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_pdf.pinc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- invoice_pdf.pinc	17 Dec 2003 15:13:22 -0000	1.1
+++ invoice_pdf.pinc	19 Dec 2003 17:12:10 -0000	1.2
@@ -11,28 +11,34 @@
   function invoice_pdf(&$obj) {
     global $tutos;
     $this->fpdf('P','mm',$tutos[paperformat]);
-	$this->AliasNbPages("{nb}");
+    $this->AliasNbPages("{nb}");
     $this->obj = $obj;
   }
 
   /**
    * Page header
    */
-  function Header()
-  {
-    global $lang;
+  function Header() {
+    global $lang,$tutos;
+
+
+    $this->SetX(40);
+#    $this->SetFont('Arial','B',2);
+#    $this->Text(40,40, "X:".$this->obj->dbconn->db->logo);
 
-    //Logo
-#    $this->Image('logo_pb.png',10,8,33);
 
     //Title
-	if ($this->PageNo() == 1) {
+    if ($this->PageNo() == 1) {
+      //Logo
+#      $this->Image($tutos['base'].'/html/tutos_small.png',10,10,20,0);
+      $this->Image($this->obj->dbconn->db->logo,10,10,20,0,"PNG");
       $this->SetFont('Arial','B',26);
       $this->Cell(0,20, $lang['Invoice']." ". $this->obj->getFullName(),1,1,'C');
-	} else {
+    } else {
+      $this->Image($this->obj->dbconn->db->logo,10,10,10,0,"PNG");
       $this->SetFont('Arial','B',12);
       $this->Cell(90,8,$lang[$this->obj->getType()].":". $this->obj->getFullName() ,1,0,'L');
-	}
+    }
 
     //Line break
     $this->Ln(20);
@@ -46,22 +52,22 @@
     global $lang;
 
     //Read text file
-	if (file_exists($fname)) {
+    if (file_exists($fname)) {
       $f=fopen($fname,'r');
       $txt=fread($f,filesize($fname));
       fclose($f);
-	} else {
-	  $txt = "you have to create a file called ". $fname ." to change this text\n";
-	  $txt .= "TUTOS will replace some TAGS when reading that file\n";
-	  $txt .= "%NAME% will become the name of the object\n";
-	  $txt .= "%DATE% will become the current date\n";
-	  $txt .= "%TIME% will become the current time\n";
-	  $txt .= "\nEverything else will be exact as found in that file. Using long lines will cause an automatic wrap at the end of such a line.\n";
-	}
-
-	$txt = preg_replace("/%NAME%/",$this->obj->getFullName(),$txt);
-	$txt = preg_replace("/%DATE%/",strftime($lang['DateFormatStr']),$txt);
-	$txt = preg_replace("/%TIME%/",strftime($lang['TimeFormatStr']),$txt);
+      $txt = preg_replace("/%NAME%/",$this->obj->getFullName(),$txt);
+      $txt = preg_replace("/%DATE%/",strftime($lang['DateFormatStr']),$txt);
+      $txt = preg_replace("/%TIME%/",strftime($lang['TimeFormatStr']),$txt);
+    } else {
+      $txt = "you have to create a file called ". $fname ." to change this text\n";
+      $txt .= "TUTOS will replace some TAGS when reading that file\n";
+      $txt .= "%NAME% will become the name of the object\n";
+      $txt .= "%DATE% will become the current date\n";
+      $txt .= "%TIME% will become the current time\n";
+      $txt .= "\nEverything else will be exact as found in that file. Using long lines will cause an automatic wrap at the end of such a line.\n";
+    }
+
 
     //Output justified text
     $this->MultiCell(0,$h,$txt);
@@ -77,7 +83,7 @@
 
     $this->SetY(-22);
     $this->SetFont('Arial','',5);
-	$this->addFileBlock("invoice_footer.txt",1.5);
+    $this->addFileBlock("invoice_footer.txt",1.5);
     //Position at 1.5 cm from bottom
     $this->SetY(-15);
     //Arial italic 8

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1:/tmp/cvs-serv26114/db

Modified Files:
	db.pinc 
Log Message:
use select with ranges

Index: db.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- db.pinc	15 Dec 2003 13:22:24 -0000	1.4
+++ db.pinc	19 Dec 2003 17:11:52 -0000	1.5
@@ -216,13 +216,14 @@
   function query(&$dbconn) {
     $this->dbconn = &$dbconn;
     $this->flds = array();
+    $this->alias = array();
     # Fields in the Where Clause
     $this->wc = array();
     $this->table = "UNKNOWN";
     $this->order = " ";
     $this->range_start = "";
     $this->range_cnt = "";
-    $this->use_range = true;
+    $this->use_range = false;
   }
   /**
    *  Set the tablename for a query
@@ -233,9 +234,12 @@
   /**
    * Add Field for a select
    */
-  function addFld($fld) {
+  function addFld($fld,$alias = "") {
     $fld = $this->dbconn->colname($fld);
     $this->flds[$fld] = true;
+    if ($alias != "") {
+      $this->alias[$fld] = $alias;
+	}
   }
   /**
    * Add Field Value Pairs
@@ -278,25 +282,30 @@
       $this->flds[$fld] = $val;
     }
   }
-  /* Add Field Value Pairs for the where clause of UPDATES using "AND" and " = " */
-  function addWC($fld,$val,$type) {
+  /**
+   *  Add Field Value Pairs for the where clause of UPDATES using "AND" and " = " 
+   *  Type is type of fld
+   *  Value is the value the fld is compared to
+   *  type of cpmpare (defaults to =)
+   */
+  function addWC($fld,$val,$type,$cmp = " = ") {
     $fld = $this->dbconn->colname($fld);
     if ( $type == "STRING" ) {
-      $this->wc[$fld] = $this->dbconn->String($val);
+      $this->wc[$fld] = $cmp. $this->dbconn->String($val);
     } else if ( $type == "PASSWORD" ) {
-      $this->wc[$fld] = $this->dbconn->Password($val);
+      $this->wc[$fld] = $cmp. $this->dbconn->Password($val);
     } else if ( $type == "DATETIME" ) {
-      $this->wc[$fld] = $this->dbconn->datetime($val);
+      $this->wc[$fld] = $cmp. $this->dbconn->datetime($val);
     } else if ( $type == "DATE" ) {
-      $this->wc[$fld] = $this->dbconn->date($val);
+      $this->wc[$fld] = $cmp. $this->dbconn->date($val);
     } else if ( $type == "OBJ" ) {
-      $this->wc[$fld] = sprintf("%d",$val->id);
+      $this->wc[$fld] = $cmp. sprintf("%d",$val->id);
     } else if ( $type == "INT" ) {
-      $this->wc[$fld] = sprintf("%d",$val);
+      $this->wc[$fld] = $cmp. sprintf("%d",$val);
     } else if ( $type == "FLOAT" ) {
-      $this->wc[$fld] = sprintf("%f",$val);
+      $this->wc[$fld] = $cmp. sprintf("%f",$val);
     } else {
-      $this->wc[$fld] = $val;
+      $this->wc[$fld] = $cmp. $val;
     }
   }
 
@@ -325,7 +334,7 @@
     if ($start == "") $start = 0;
     $this->range_start = $start;
     $this->range_cnt   = $cnt;
-    $this->userange = true;
+    $this->use_range = true;
   }
 
   /**
@@ -360,7 +369,7 @@
     $pre = " WHERE ";
     @reset($this->wc);
     while( list ($i,$f) = @each ($this->wc)) {
-      $q .= $pre ."(". $i ." = ". $f .")";
+      $q .= $pre ."(". $i . $f .")";
       $pre = " AND ";
     }
     return $q;
@@ -372,17 +381,23 @@
     $q = "SELECT ";
     $pre = "";
     if ($short) {
-      $q .= "count(*) as c";
+      foreach( $this->flds as $i => $f) {
+	    break;
+	  }
+      $q .= "count(". $i .") as c";
     } else {
       foreach( $this->flds as $i => $f) {
         $q .= $pre . $i ;
+		if (isset($this->alias[$i])) {
+          $q .= " as " . $this->alias[$i];
+		}
         $pre = ",";
       }
     }
     $q .= " FROM " .  $this->table;
     $pre = " WHERE ";
     foreach ($this->wc as $i => $f) {
-      $q .= $pre ."(". $i ." = ". $f .")";
+      $q .= $pre ."(". $i . $f .")";
       $pre = " AND ";
     }
     if (! $short) {
@@ -391,6 +406,7 @@
         $q = $this->dbconn->getRange($q,$this->range_start,$this->range_cnt);
       }
     }
+#	echo $q ." |". $this->use_range ."|<br>";
     return $q;
   }
   /**

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv26114

Modified Files:
	acl_overview.php 
Log Message:
use select with ranges

Index: acl_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_overview.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- acl_overview.php	8 Dec 2003 17:20:31 -0000	1.43
+++ acl_overview.php	19 Dec 2003 17:11:52 -0000	1.44
@@ -35,15 +35,24 @@
      global $lang,$tutos;
 
 
+     $query = new query($this->dbconn);
+
      if ( $this->type != ""  ) {
-       $query = "SELECT DISTINCT id FROM ". $this->dbconn->prefix . $this->type ." ORDER by id";
+       $query->setTable($this->dbconn->prefix .$this->type);
+       $query->addFld("DISTINCT id");
      } else if ( $this->xtype != ""  ) {
-       $query = "SELECT DISTINCT id FROM ". $this->xtype ." ORDER by id";
-     } else {
-       $query = "SELECT DISTINCT obj_id as id FROM ". $this->dbconn->prefix ."acl WHERE obj_id > 0 ORDER by obj_id";
-     }
+       $query->setTable($this->xtype);
+       $query->addFld("DISTINCT id");
+	 } else {
+       $query->setTable($this->dbconn->prefix ."acl");
+       $query->addFld("DISTINCT obj_id","id");
+       $query->addWC("obj_id",0,"INT",">");
+	 }
+     $query->addOrder("id","ASC");
+     $query->addRange($this->start,$tutos[maxshow]);
+
+     $result = $query->runSelect();
 
-     $result = $this->dbconn->Exec($query);
      $n = $result->numrows();
      if ( 0 == $n) {
        echo $this->error($lang['Err0048']);
@@ -81,10 +90,17 @@
          $a++;
          if ( $this->type == ""  ) {
            $obj = new tutos_base($this->dbconn);
-           $obj->id = $g;
-           // delete the acl set
-           acl_delete_obj($obj);
-#           echo "removed invalid entry:". $g ."<br>";
+		   if ($g != "") {
+             $obj->id = $g;
+             // delete the acl set
+             acl_delete_obj($obj);
+		   }
+		   if ($tutos[debug] == 1) { 
+            $line++;
+             echo $this->OverviewRowStart($line);
+             echo "<td colspan=\"".(6 + $tutos[massupdate]) ."\">removed invalid entry:". $g ."</td>";
+             echo $this->OverviewRowEnd($line);
+		   }
          }
 		 unset($obj);
          continue;
@@ -141,6 +157,8 @@
              echo $lang['ACLmodify'];
            } else if ( $p == $tutos[delok] ) {
              echo $lang['ACLdelete'];
+           } else if ( $p == $tutos[useok] ) {
+             echo $lang['ACLuse'];
            } else {
              echo "? (".$p.")";
            }

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv3252

Modified Files:
	team.pinc 
Log Message:
bugfix: 827526

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- team.pinc	25 Aug 2003 13:27:57 -0000	1.79
+++ team.pinc	19 Dec 2003 09:30:56 -0000	1.80
@@ -352,11 +352,12 @@
     $this->dbconn->Exec($query);
 
     if ( count($add) > 0 ) {
-      @reset($add);
-      while( list ($i,$f) = @each ($add)) {
+      foreach($add as $i => $f) {
         if ( $f == "" ) {
           continue;
         }
+        $q = "DELETE FROM ". $this->tablename2 ." WHERE adr_id = ". $f ." AND team_id = ". $this->id;
+        $this->dbconn->Exec($q);
         $q = "INSERT INTO ". $this->tablename2 ." (adr_id,team_id ) VALUES (". $f .",". $this->id .")";
         $this->dbconn->Exec($q);
         $x = new tutos_user($this->dbconn);
@@ -378,8 +379,7 @@
       $del[] = $aid;
     }
     if ( count($del) > 0 ) {
-      @reset($del);
-      while( list ($i,$f) = @each ($del)) {
+      foreach($del as $i => $f) {
         if ( $f == "" ) {
           continue;
         }