tutos-commits Mailing List for TUTOS

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

Modified Files:
	calendar.php database_show.php task.pinc timetrack.pinc 
Log Message:
fix

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- calendar.php	10 Mar 2007 17:33:24 -0000	1.90
+++ calendar.php	30 Jul 2007 18:50:27 -0000	1.91
@@ -339,4 +339,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- task.pinc	3 May 2007 07:21:10 -0000	1.178
+++ task.pinc	30 Jul 2007 18:50:27 -0000	1.179
@@ -10,8 +10,6 @@
  *  $Author$
  *
  */
-
-# include_once 'file/file.pinc'; // never load modules directly
  
 define ('TASK_PRE',0);
 define ('TASK_RUNNING',1);

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- timetrack.pinc	2 Jan 2007 19:59:56 -0000	1.82
+++ timetrack.pinc	30 Jul 2007 18:50:28 -0000	1.83
@@ -444,7 +444,7 @@
    * Checks if the current user is allowed to delete this timetrack
    */
   function del_ok () {
-    if ( $this->ref != -1 ) {
+    if ( is_object($this->ref) ) {
       return $this->ref->del_ok();
     } else {
       return 0;
@@ -454,7 +454,7 @@
    * 
    */
   function see_ok() {
-    if ( $this->ref != -1 ) {
+    if ( is_object($this->ref) ) {
       return $this->ref->see_ok();
     } else {
       return 0;
@@ -474,25 +474,25 @@
    * Return a url that displays this timetrack fraction
    */
   function getURL() {
-    return "timetrack_overview.php?id=". $this->id;
+    return 'timetrack_overview.php?id='. $this->id;
   }
   /**
    * Return a url that allows modification of this timetrack fraction
    */
   function getModURL() {
-    return "timetrack_new.php?id=". $this->id;
+    return 'timetrack_new.php?id='. $this->id;
   }
   /**
    * Return a url that deletes this timetrack fraction
    */
   function getDelURL() {
-    return "timetrack_del.php?id=". $this->id;
+    return 'timetrack_del.php?id='. $this->id;
   }
   /**
    * Return a url that displays this timetrack fraction
    */
   function getFullName() {
-    return $this->volume ."@" . $this->wday->getDate();
+    return $this->volume .'@' . $this->wday->getDate();
   }
   /**
    * Return a link to this timefragement

Index: database_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_show.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- database_show.php	2 Jan 2007 19:59:56 -0000	1.39
+++ database_show.php	30 Jul 2007 18:50:27 -0000	1.40
@@ -158,7 +158,7 @@
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
      }
-     if ( ($this->obj == -1) || (! $this->obj->see_ok()) ) {
+     if ( !is_object($obj) || ($this->obj == -1) || (! $this->obj->see_ok()) ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else if ( $this->obj->id < 0 ) {

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

Modified Files:
	db.pinc db_mysql.pinc db_pg.pinc 
Log Message:
first test of backup and restore

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- db_mysql.pinc	15 Jul 2007 07:48:13 -0000	1.36
+++ db_mysql.pinc	30 Jul 2007 18:49:32 -0000	1.37
@@ -111,13 +111,35 @@
     }
   }
   /**
+   * restore a backup from a given file
+   * returns true on success
+   */
+  function restore_from_file($filename,$method = 0) {
+    global $tutos;
+
+    $cmd = "mysql ";
+    $cmd .= " -v ";
+    $cmd .= " -u ". $this->db->user;
+    $cmd .= " -p". $this->db->pass;
+    $cmd .= " -h ". $this->db->host;
+    $cmd .= " ". $this->db->name;
+    $cmd .= " < ". $filename;
+    $errout = exec ($cmd . " 2> ". $tutos[sessionpath] ."/restore_from_file",$output,$rt);
+    echo "<br>";
+    echo htmlentities($cmd)."<br />";
+    foreach($output as $i) {
+      echo htmlentities($i)."<br />";
+    }
+
+    return true;
+  }
+  /**
    * make a backup to a given file
    * returns true on success
    */
   function backup2file($filename,$method = 0) {
     global $tutos;
 
-    # mysqldump -C -e -t -c -h mysql15.ixwebhosting.com -u dtr1001_david -pturbocat --lock-tables=false  dtr1001_tutos
     $cmd = "mysqldump ";
     $cmd .= " -C -e --lock-tables=false";
     $cmd .= " -u ". $this->db->user;

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- db_pg.pinc	15 Jul 2007 07:48:13 -0000	1.36
+++ db_pg.pinc	30 Jul 2007 18:49:32 -0000	1.37
@@ -193,16 +193,37 @@
     }
   }
   /**
+   * restore a backup from a given file
+   * returns true on success
+   */
+  function restore_from_file($filename,$method = 0) {
+    global $tutos;
+
+    $cmd = "psql ";
+    $cmd .= " -U ". $this->db->user;
+    $cmd .= " -h ". $this->db->host;
+    $cmd .= " -d ". $this->db->name;
+    $cmd .= " -f ". $filename;
+    $errout = exec ($cmd . " 2> ". $tutos[sessionpath] ."/restore_from_file",$output,$rt);
+    echo "<br>";
+    echo htmlentities($cmd)."<br />";
+    foreach($output as $i) {
+      echo htmlentities($i)."<br />";
+    }
+
+    return true;
+  }
+  /**
    * make a backup to a given file
    * returns true on success
    */
   function backup2file($filename,$method = 0) {
     global $tutos;
 
-    $cmd = "/usr/bin/pg_dump ".
+    $cmd = "pg_dump ";
     $cmd .= " -U ". $this->db->user;
     $cmd .= " -h ". $this->db->host;
-    $cmd .= " --clean --inserts";
+    $cmd .= " --clean ";
     $cmd .= " -f ". $filename;
     $cmd .= " ". $this->db->name;
     $errout = exec ($cmd . " 2> ". $tutos[sessionpath] ."/backup2file",$output,$rt);

Index: db.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db.pinc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- db.pinc	15 Jul 2007 07:48:13 -0000	1.13
+++ db.pinc	30 Jul 2007 18:49:32 -0000	1.14
@@ -28,6 +28,13 @@
     $this->txtlen = -1;
   }
   /**
+   * restore from a given backup file
+   * returns true on success
+   */
+  function restore_from_file($filename,$method = 0) {
+    return false;
+  }
+  /**
    * make a backup to a given file
    * returns true on success
    */

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

Modified Files:
	backup.php 
Added Files:
	restore.php 
Log Message:
first test of backup and restore

Index: backup.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/backup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- backup.php	15 Jul 2007 07:48:13 -0000	1.1
+++ backup.php	30 Jul 2007 18:49:33 -0000	1.2
@@ -88,35 +88,60 @@
    $za->close();
  }
 
+ $zipname  = $tutos[sessionpath] .'/backup.zip';
+ $dbbackup = $tutos[sessionpath] .'/dbbackup';
+
+ @unlink($zipname);
+ @unlink($dbbackup);
+
  echo $dbconn->moreinfo();
+ $dbconn->backup2file($dbbackup,0);
 
- $zipname  = $tutos[sessionpath] .'/test112.zip';
- $dbbackup = $tutos[sessionpath] .'/dbbackup';
 
- unlink($zipname);
- unlink($dbbackup);
+ if (class_exists("ZipArchive")) {
+   $zip = new ZipArchive();
 
- $zip = new ZipArchive();
- if ($zip->open($zipname, ZIPARCHIVE::CREATE)!==TRUE) {
-   exit("cannot open <$filename>\n");
- }
+   if ($zip->open($zipname, 1) !== TRUE) {
+     exit("cannot open <$zipname>\n");
+   }
 
- echo "<br>\n";
- $dbconn->backup2file($dbbackup,0);
- $zip->addFile($dbbackup,basename($dbbackup));
+   echo "<br>\n";
+   $zip->addFile($dbbackup,basename($dbbackup));
 
- zipdir($tutos['base'].'/'.$tutos[repository][$dbnr] .'/14',"/repository/14",$zip);
- echo "numfiles: " . $zip->numFiles . "<br>\r\n";
- echo "<br>\n";
- echo "status:" . $zip->status . "\n";
- echo "<br>\n";
+   zipdir($tutos['base'].'/'.$tutos[repository][$dbnr] .'/',basename($tutos[repository][$dbnr]),$zip);
+   echo "numfiles: " . $zip->numFiles . "<br>\r\n";
+   echo "<br>\n";
+   echo "status:" . $zip->status . "\n";
+   echo "<br>\n";
 
- $zip->setArchiveComment($tutos[dbalias][$dbnr]);
- $zip->close();
+   $zip->setArchiveComment($tutos[dbalias][$dbnr]);
+   $zip->close();
+   showzip($zipname);
+ } else {
+   chdir(dirname($tutos['base'].'/'.$tutos[repository][$dbnr]));
+   $cmd = "zip -r ". $zipname .' '. basename($tutos['base'].'/'.$tutos[repository][$dbnr]);
+   $tfile = $tutos[sessionpath]."/xx";
+   $output = array();
+   $out = exec($cmd . " 2> ".$tfile ,$output,$rt);
+
+   chdir($tutos[sessionpath]);
+   $cmd = "zip -r ". $zipname ." ". basename($dbbackup);
+   $tfile = $tutos[sessionpath]."/xx";
+   $output = array();
+   $out = exec($cmd . " 2> ".$tfile ,$output,$rt);
+
+   foreach($output as $i) {
+     echo htmlentities($i)."<br />";
+   }
+   echo "<pre>";
+   passthru("cat ".$tfile."; rm ".$tfile,$xx);
+   echo "<br>";
+   passthru("zipinfo ".$zipname,$xx);
+   echo "</pre>";
+ }
 
  chmod($zipname , 0666);
  $dbconn->close();
 
- showzip($zipname);
 
-?>
+?>
\ No newline at end of file

--- NEW FILE: restore.php ---
<?php
/**
 * Copyright 2007 by Gero Kohnert
 *
 * Restore repository and Database
 *
 * 
 *
 * @modulegroup ADMIN
 * @module update
 * @package BASE
 */
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 include_once 'webelements.p3';
 include_once 'permission.p3';

 $zipname  = $tutos[sessionpath] .'/backup.zip';
 $dbbackup = $tutos[sessionpath] .'/dbbackup';

 if ( ! isset($_GET['dbnr']) ) {
   $dbnr = 0;
 } else {
   $dbnr = $_GET['dbnr'];
 }
 $_SESSION['dbnr'] = $dbnr;
 $dbconn = DB_Open($dbnr);


 echo $dbconn->moreinfo();
 flush();
 echo '<br />REPOSITORY: '.$tutos['base'].'/'.$tutos[repository][$dbnr] .'<br />';

 if (class_exists("ZipArchive")) {
   $zip = new ZipArchive();

   if ($zip->open($zipname) !== TRUE) {
     exit("cannot open <$zipname>\n");
   }

   echo "<br>\n";
   $zip->extractTo($tutos[sessionpath].'/restore',basename($dbbackup));
 } else {
   $cwd = getcwd();
   mkdir($tutos[sessionpath].'/restore');
   chdir($tutos[sessionpath].'/restore');

   $cmd = 'unzip '. $zipname .' '. basename($dbbackup);
   $tfile = $tutos[sessionpath]."/xx";
   $output = array();
   $out = exec($cmd . " 2> ".$tfile ,$output,$rt);

   echo htmlentities($cmd)."<br />";
   foreach($output as $i) {
     echo htmlentities($i)."<br />";
   }
   echo "<pre>";
   passthru("cat ".$tfile."; rm ".$tfile,$xx);
   echo "</pre>";
   chdir ($cwd);
#   mkdir($tutos['base'].'/'.$tutos[repository][$dbnr]);
   chdir(dirname($tutos['base'].'/'.$tutos[repository][$dbnr]));

   $cmd = 'unzip -u '. $zipname .' "'. basename($tutos[repository][$dbnr]).'/*"';
   $tfile = $tutos[sessionpath]."/xx";
   $output = array();
   $out = exec($cmd . " 2> ".$tfile ,$output,$rt);

   echo htmlentities($cmd)."<br />";
   foreach($output as $i) {
     echo htmlentities($i)."<br />";
   }
   echo "X<pre>";
   passthru("cat ".$tfile."; rm ".$tfile,$xx);
   passthru("pwd;zipinfo ".$zipname);
   echo "</pre>X";
   chdir ($cwd);
 }

 $newfile = $tutos[sessionpath].'/restore/'.basename($dbbackup);
# if (! $dbconn->restore_from_file($newfile)) {
#	 echo '<br>Restore of '. $newfile .' failed !';
# }

 $dbconn->close();

 @unlink($newfile);
 @rmdir($tutos[sessionpath].'/restore/');

?>

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

Modified Files:
	webelements.p3 config_default.pinc 
Log Message:
ovelib fix

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- webelements.p3	2 Jan 2007 19:59:56 -0000	1.308
+++ webelements.p3	15 Jul 2007 07:57:10 -0000	1.309
@@ -578,15 +578,20 @@
     return;
   }
 
-  if ( file_exists(getcwd()."/".$tutos['base']. "/". $tutos[overlib]) && is_readable(getcwd()."/".$tutos['base']."/".$tutos[overlib]) ) {
+  $tutos['overlibargs'] = "FULLHTML,VAUTO,HAUTO";
+  $o1 = getcwd()."/".$tutos['base']. "/". $tutos[overlib] .'/overlib_mini.js';
+  if ( file_exists($o1) && is_readable($o1) ) {
+    $o1 = $tutos['base']. "/". $tutos[overlib] .'/overlib_mini.js';
+    $o1 = $tutos['base']. "/". $tutos[overlib] .'/overlib.js';
     $tutos[useoverlib] = 1;
     echo " <div id=\"overDiv\" style=\"position:absolute; visibility:hidden; z-index:1;\"></div>\n";
-    echo " <script language=\"JavaScript\" src=\"". $tutos['base'] ."/". $tutos[overlib] ."\" type=\"text/javascript\"></script>\n";
-#   $d = dirname(getcwd()."/".$tutos['base']. "/". $tutos[overlib]);
-#   if (file_exists($d."/overlib_shadow.js")) {
-#      echo " <script language=\"JavaScript\" src=\"". dirname($tutos['base'] ."/". $tutos[overlib]) ."/overlib_shadow.js\" type=\"text/javascript\"></script>\n";
-#   } else {
-#   }
+    echo " <script language=\"JavaScript\" src=\"". $o1 ."\" type=\"text/javascript\"></script>\n";
+    $o2 = getcwd()."/".$tutos['base']. "/". $tutos[overlib] .'/overlib_shadow_mini.js';
+    if ( file_exists($o2) && is_readable($o2) ) {
+      $o2 = $tutos['base']. "/". $tutos[overlib] .'/overlib_shadow_mini.js';
+#      echo " <script language=\"JavaScript\" src=\"". $o2 ."\" type=\"text/javascript\"></script>\n";
+#	  $tutos['overlibargs'] += ",SHADOW, SHADOWOPACITY, 60";
+    }
   } else {
     $tutos[useoverlib] = 0;
     echo "\n\n<!-- NO OVERLIB FILE ". getcwd()."/". $tutos['base'] ."/". $tutos[overlib] ."-->\n\n";
@@ -881,7 +886,7 @@
    }
 
    if ( $current_user->feature_ok(useoverlib,PERM_SEE) && ($plus != "") ) {
-     return sprintf ("<a class=\"nodeco\" href=\"%s\" %s  "return overlib('%s',STATUS,'%s',FULLHTML)\" "nd()\">%s</a>",$href,$attr,myentities($plus,1),myentities($info,1),$text);
+     return sprintf ("<a class=\"nodeco\" href=\"%s\" %s  "return overlib('%s',STATUS,'%s',".$tutos['overlibargs'].")\" "nd()\">%s</a>",$href,$attr,myentities($plus,1),myentities($info,1),$text);
    } else {
      return sprintf ("<a class=\"nodeco\" href=\"%s\" %s "self.status='%s' ;return true;\" "self.status='';return true;\" title=\"%s\">%s</a>",$href,$attr,myentities($info,1),myentities($info),$text);
    }
@@ -906,7 +911,7 @@
      $href = $tutos['base'] ."/php/". $href;
    }
    if ( $current_user->feature_ok(useoverlib,PERM_SEE) && ($plus != '') ) {
-     return sprintf ("<a href=\"%s\" $target "return overlib('%s',STATUS,'%s',FULLHTML,VAUTO)\" "nd()\">%s</a>",$href,myentities($plus,1),myentities($info,1),$text);
+     return sprintf ("<a href=\"%s\" $target "return overlib('%s',STATUS,'%s',".$tutos['overlibargs'].")\" "nd()\">%s</a>",$href,myentities($plus,1),myentities($info,1),$text);
    } else {
      return sprintf ("<a href=\"%s\" $target "self.status='%s' ;return true;\" "self.status='';return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info),$text);
    }
@@ -924,7 +929,7 @@
    }
 
    if ( $current_user->feature_ok(useoverlib,PERM_SEE) && ($plus != "") ) {
-     return sprintf ("<a class=\"nodeco\" href=\"%s\" "return overlib('%s',STATUS,'%s',FULLHTML)\" "nd()\" title=\"%s\">%s</a>",$href,myentities($plus),myentities($info),myentities($info),$text);
+     return sprintf ("<a class=\"nodeco\" href=\"%s\" "return overlib('%s',STATUS,'%s',".$tutos['overlibargs'].")\" "nd()\" title=\"%s\">%s</a>",$href,myentities($plus),myentities($info),myentities($info),$text);
    } else {
      return sprintf ("<a class=\"nodeco\" href=\"%s\" "if (! confirm('%s ?')) { return false };\" "self.status='%s' ;return true;\" "self.status='';return true;\" title=\"%s\">%s</a>",$href,myentities($info,1),myentities($info,1),myentities($info),$text);
    }

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- config_default.pinc	5 Apr 2007 16:14:55 -0000	1.114
+++ config_default.pinc	15 Jul 2007 07:57:10 -0000	1.115
@@ -388,12 +388,13 @@
 #
 #
 #
-# Path to overlib javascript package (used for small popup windows)
+# DirPath to overlib javascript package (used for small popup windows)
 # See http://www.bosrup.com/web/overlib/
 #
 # Path is relative to [tutoshome]/
+# default is "html"  tutos will look there vor overlib_mini.js
 #
-$tutos[overlib]  = 'html/overlib.js';
+$tutos[overlib]  = 'html';
 #
 #
 # Path to freemind java applet (used to display freemind mindmap files in browser)
@@ -798,6 +799,6 @@
 #
 # The TUTOS Version number
 #
-$tutos[version] = '1.3.20070317';
+$tutos[version] = '1.3.20070715';
 #
 ?>
\ No newline at end of file

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

Modified Files:
	new_layout.pinc 
Log Message:
ovelib fix

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- new_layout.pinc	1 Jun 2007 19:08:36 -0000	1.71
+++ new_layout.pinc	15 Jul 2007 07:57:10 -0000	1.72
@@ -456,7 +456,6 @@
   function PrintHeader($name = "") {
     $this->name = $name;
     $this->HTML_Start();
-    Overlib_Header();
   }
   /**
    * foot of a printable page
@@ -554,6 +553,7 @@
 
 
   Function HTML_Stop() {
+	  //    Overlib_Header();
     echo " </body>\n";
     echo "</html>\n";
   }

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

Modified Files:
	Date.pinc 
Log Message:
fix

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- Date.pinc	16 Dec 2006 13:08:16 -0000	1.120
+++ Date.pinc	15 Jul 2007 07:55:35 -0000	1.121
@@ -583,7 +583,7 @@
    *
    */
   function setDateTime($str,$notz = 0) {
-    global $current_user , $tutos;
+    global $current_user , $tutos, $message;
 
     if ( ! isset ($str) ) return;
     if ( empty ($str) ) return;
@@ -695,6 +695,7 @@
       $this->format = 16;
     } else {
       echo "<br />DT: Unknown DateTimeFormat <span class=\"warn\">". $str ."</span> fix it in Date.pinc or register a DB specific format<br />";
+      $this->setNoTime();
       return;
     }
 

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

Modified Files:
	hu.p3 
Log Message:
updated translation

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/palm/hu.p3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hu.p3	10 Mar 2004 09:17:45 -0000	1.1
+++ hu.p3	15 Jul 2007 07:54:54 -0000	1.2
@@ -9,12 +9,17 @@
 # =======================================================
 
 $lang['PalmExport']        = "Export PALM-ra";
-$lang['PalmImport']        = "Import PALM-ról";
-$lang['PalmFile']          = "Fájlnév";
-$lang['PalmType']          = "Típus";
-$lang['PalmTypes'][2]      = "Címek";
-$lang['PalmTypes'][3]      = "Idõpontok";
+$lang['PalmImport']        = "Import PALM-ról";
+$lang['PalmFile']          = "Fájlnév";
+$lang['PalmType']          = "Típus";
+$lang['PalmTypes'][2]      = "Címek";
+$lang['PalmTypes'][3]      = "Idõpontok";
 $lang['PalmTypes'][4]      = "Feladatok";
 
-$lang['perm'][usepalm]     = "PALM export használata";
+$lang['perm'][usepalm]     = "PALM export használata";
+
+### Local Variables: ***
+### mode:iso-accents ***
+### coding:utf-8 ***
+### End: ***
 ?>
\ No newline at end of file

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

Modified Files:
	hu.p3 
Log Message:
updated translation

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/merge/hu.p3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hu.p3	10 Mar 2004 08:46:49 -0000	1.1
+++ hu.p3	15 Jul 2007 07:54:54 -0000	1.2
@@ -8,29 +8,34 @@
 # using the same format like here
 # =======================================================
 
-$lang['MergeDocuments']  = "Dokumentumok összefésülése";
-$lang['DocCreate']       = "Összefésülendõ dokumentum";
-$lang['DocCreateInfo']   = "Új dokumentum létrehozása %s-nak";
-$lang['MergeWith']       = "Összefésülendõ";
-$lang['CurrentContact']  = "Aktuális kapcsolat";
-$lang['CurrentLookup']   = "Aktuális választás";
-$lang['AllContacts']     = "Összes kapcsolat";
-$lang['SelectedGroup']   = "Kiválasztott csoport";
+$lang['MergeDocuments']  = "Dokumentumok összefésülése";
+$lang['DocCreate']       = "Összefésülendõ dokumentum";
+$lang['DocCreateInfo']   = "Új dokumentum létrehozása %s-nak";
+$lang['MergeWith']       = "Összefésülendõ";
+$lang['CurrentContact']  = "Aktuális kapcsolat";
+$lang['CurrentLookup']   = "Aktuális választás";
+$lang['AllContacts']     = "Összes kapcsolat";
+$lang['SelectedGroup']   = "Kiválasztott csoport";
 $lang['Template']        = "Sablon";
 $lang['SendOutputTo']    = "Kimenet";
-$lang['Printer']         = "Nyomtató";
+$lang['Printer']         = "Nyomtató";
 $lang['Email']           = "E-mail";
 $lang['Fax']             = "Fax";
-$lang['WordProcessor']   = "Szövegszerkesztõ";
+$lang['WordProcessor']   = "Szövegszerkesztõ";
 $lang['Nowhere']         = "Sehova";
-$lang['ReturnReceipt']   = "Elismervény";
-$lang['AttachToContacts']  = "Hozzáadás a kapcsolatokhoz";
-$lang['AddCompanyHistory'] = "Hozzáadás a cégtörténethez";
-$lang['Regarding']       = "Vonatkozólag";
-$lang['Merge']           = "Összefésülés";
+$lang['ReturnReceipt']   = "Elismervény";
+$lang['AttachToContacts']  = "Hozzáadás a kapcsolatokhoz";
+$lang['AddCompanyHistory'] = "Hozzáadás a cégtörténethez";
+$lang['Regarding']       = "Vonatkozólag";
+$lang['Merge']           = "Összefésülés";
 
-$lang['Err0050']         = "Nincs kiválasztott sablon!";
+$lang['Err0050']         = "Nincs kiválasztott sablon!";
+
+$lang['perm'][usemerge] = "összefésülés használata"; 
 
-$lang['perm'][usemerge] = "összefésülés használata"; 
 
+### Local Variables: ***
+### mode:iso-accents ***
+### coding:utf-8 ***
+### End: ***
 ?>
\ No newline at end of file

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

Modified Files:
	hu.p3 
Log Message:
updated translation

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/phpweather/hu.p3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hu.p3	10 Mar 2004 09:05:06 -0000	1.1
+++ hu.p3	15 Jul 2007 07:54:54 -0000	1.2
@@ -8,6 +8,11 @@
 # using the same format like here
 # =======================================================
 
-$lang['WeatherReport'] = "Idõjárás-jelentés";
+$lang['WeatherReport'] = "Idõjárás-jelentés";
 
+
+### Local Variables: ***
+### mode:iso-accents ***
+### coding:utf-8 ***
+### End: ***
 ?>
\ No newline at end of file

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

Modified Files:
	db.pinc db_mysql.pinc db_pg.pinc 
Log Message:
first steps towrads backup script

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- db_mysql.pinc	1 Apr 2007 17:39:13 -0000	1.35
+++ db_mysql.pinc	15 Jul 2007 07:48:13 -0000	1.36
@@ -111,6 +111,30 @@
     }
   }
   /**
+   * make a backup to a given file
+   * returns true on success
+   */
+  function backup2file($filename,$method = 0) {
+    global $tutos;
+
+    # mysqldump -C -e -t -c -h mysql15.ixwebhosting.com -u dtr1001_david -pturbocat --lock-tables=false  dtr1001_tutos
+    $cmd = "mysqldump ";
+    $cmd .= " -C -e --lock-tables=false";
+    $cmd .= " -u ". $this->db->user;
+    $cmd .= " -h ". $this->db->host;
+    $cmd .= " -p". $this->db->pass;
+    $cmd .= " -r ". $filename;
+    $cmd .= " ". $this->db->name;
+    $errout = exec ($cmd . " 2> ". $tutos[sessionpath] ."/backup2file",$output,$rt);
+    echo "<br>";
+    echo htmlentities($cmd)."<br />";
+    foreach($output as $i) {
+      echo htmlentities($i)."<br />";
+    }
+
+    return true;
+  }
+  /**
    * return more info about server client etcc
    */
   function moreinfo() {
@@ -348,8 +372,8 @@
     }
     $q .= ")";
     $q .= " ENGINE=MyISAM";
-# Does not work on older mysql
-#    $q .= " DEFAULT CHARSET=latin1";
+# Does not work on older mysql (< 4.1)
+    $q .= " CHARACTER SET utf8";
     $q .= " COMMENT='". $tbl[Desc] ."'";
     return $this->exec($q,0);
   }
@@ -457,6 +481,7 @@
     $c = ereg_replace("NN","not null",$c);
     $q .= $this->colname($colname) ." ". $t ." ". $c;
     $q .= ")";
+    $q .= " CHARACTER SET utf8";
     $x =  $this->exec($q,0);
     # fix sizes if column already exists or some other problem appears
     if ($x == -1) {

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- db_pg.pinc	5 Apr 2007 16:14:56 -0000	1.35
+++ db_pg.pinc	15 Jul 2007 07:48:13 -0000	1.36
@@ -172,6 +172,7 @@
 
     pg_exec($c,"SET DATESTYLE TO ISO,US");
 
+    pg_exec($c,"SET CLIENT_ENCODING TO UNICODE");
 
     $this->conn = &$c;
 
@@ -192,14 +193,41 @@
     }
   }
   /**
+   * make a backup to a given file
+   * returns true on success
+   */
+  function backup2file($filename,$method = 0) {
+    global $tutos;
+
+    $cmd = "/usr/bin/pg_dump ".
+    $cmd .= " -U ". $this->db->user;
+    $cmd .= " -h ". $this->db->host;
+    $cmd .= " --clean --inserts";
+    $cmd .= " -f ". $filename;
+    $cmd .= " ". $this->db->name;
+    $errout = exec ($cmd . " 2> ". $tutos[sessionpath] ."/backup2file",$output,$rt);
+    echo "<br>";
+    echo htmlentities($cmd)."<br />";
+    foreach($output as $i) {
+      echo htmlentities($i)."<br />";
+    }
+
+    return true;
+  }
+  /**
    * return more info about server client etc
    */
   function moreinfo() {
+    $r =  "Encoding = ". $this->encoding ;
     if ( ! empty($this->db->host) ) {
-      return "Encoding = ". $this->encoding ."&nbsp;&nbsp;&nbsp;Host:Port = ". pg_host($this->conn) .":". pg_port($this->conn) ." ". pg_options($this->conn);
-    } else  {
-      return "Encoding = ". $this->encoding ."&nbsp;&nbsp;&nbsp;". pg_options($this->conn);
+      $r .= "&nbsp;&nbsp;&nbsp;Host:Port = ". pg_host($this->conn) .":". pg_port($this->conn);
     }
+    $r .= "&nbsp;&nbsp;&nbsp;". pg_options($this->conn);
+    $x = pg_version($this->conn);
+    $r .= "&nbsp;&nbsp;&nbsp;Version Client: ". $x['client'];
+    $r .= "&nbsp;&nbsp;&nbsp;Version Server: ". $x['server'];
+    $r .= "&nbsp;&nbsp;&nbsp;Version Protocoll: ". $x['protocol'];
+    return $r;
   }
   /* ---------------------------------------------------------------------------
    */
@@ -689,4 +717,4 @@
   }
 
 }
-?>
\ No newline at end of file
+?>

Index: db.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- db.pinc	16 Dec 2006 13:08:23 -0000	1.12
+++ db.pinc	15 Jul 2007 07:48:13 -0000	1.13
@@ -28,6 +28,13 @@
     $this->txtlen = -1;
   }
   /**
+   * make a backup to a given file
+   * returns true on success
+   */
+  function backup2file($filename,$method = 0) {
+    return false;
+  }
+  /**
    * return more info about server client etcc
    */
   function moreinfo() {
@@ -474,4 +481,4 @@
     return  $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Added Files:
	backup.php 
Log Message:
first steps towrads backup script

--- NEW FILE: backup.php ---
<?php
/**
 * Copyright 2007 by Gero Kohnert
 *
 * Backup repository and Database
 *
 * 
 *
 * @modulegroup ADMIN
 * @module update
 * @package BASE
 */
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 include_once 'webelements.p3';
 include_once 'permission.p3';

 if ( ! isset($_GET['dbnr']) ) {
   $dbnr = 0;
 } else {
   $dbnr = $_GET['dbnr'];
 }
 $_SESSION['dbnr'] = $dbnr;
 $dbconn = DB_Open($dbnr);

 function zipdir($dir,$base,$zip) {
   if (! is_dir($dir)) return;
   if (! is_readable($dir)) return;
   $zip->addFile($dir,$base);
   $zip->setCommentName($base,$dir);
   if (! $dh = opendir($dir)) return;
   while (($entry = readdir($dh)) !== false) {
     if ($entry == '.') continue;
     if ($entry == '..') continue;
     if (! is_readable($dir.'/'.$entry)) return;
     if (is_dir($dir.'/'.$entry))  {
       zipdir($dir.'/'.$entry,$base.'/'.$entry,$zip);
     } else {
       $zip->addFile($dir .'/'.$entry,$base.'/'.$entry);
     }
   }
   closedir($dh);
 }

 function showzip($zipname) {
   $za = new ZipArchive();
   $za->open($zipname);
   echo "<br>\n";
   #print_r($za);
   echo "<br>\n";
   #var_dump($za);
   echo "<br>\n";
   echo "numFiles: " . $za->numFiles . "\n";
   echo "<br>\n";
   echo "status: " . $za->status  . "\n";
   echo "<br>\n";
   echo "statusSys: " . $za->statusSys . "\n";
   echo "<br>\n";
   echo "filename: " . $za->filename . "\n";
   echo "<br>\n";
   echo "comment: " . $za->comment . "\n";
   echo "<br>\n";

   echo '<table border="1">';
   for ($i=0; $i<$za->numFiles;$i++) {
     $d = $za->statIndex($i);
     echo '<tr>';
     echo '<td>';
     echo $d['index']."&nbsp;";
     echo '</td><td>';
     echo $d['name']."&nbsp;";
     echo '</td><td align="right">';
     echo $d['size']." bytes&nbsp;";
     echo '</td><td>';
     echo strftime("%D %T",$d['mtime'])."&nbsp;";
     echo '</td><td>';
     echo $d['comp_size']."&nbsp;";
     echo '</td><td>';
     echo $d['comp_method']."&nbsp;";
     echo '</td>'."\r\n";
     echo '</tr>';
     #  print_r($d);
   }
   echo '</table>'."\r\n";
   echo "<br>";
   echo "numFile:" . $za->numFiles . "\n";
   echo "<br>\n";
   $za->close();
 }

 echo $dbconn->moreinfo();

 $zipname  = $tutos[sessionpath] .'/test112.zip';
 $dbbackup = $tutos[sessionpath] .'/dbbackup';

 unlink($zipname);
 unlink($dbbackup);

 $zip = new ZipArchive();
 if ($zip->open($zipname, ZIPARCHIVE::CREATE)!==TRUE) {
   exit("cannot open <$filename>\n");
 }

 echo "<br>\n";
 $dbconn->backup2file($dbbackup,0);
 $zip->addFile($dbbackup,basename($dbbackup));

 zipdir($tutos['base'].'/'.$tutos[repository][$dbnr] .'/14',"/repository/14",$zip);
 echo "numfiles: " . $zip->numFiles . "<br>\r\n";
 echo "<br>\n";
 echo "status:" . $zip->status . "\n";
 echo "<br>\n";

 $zip->setArchiveComment($tutos[dbalias][$dbnr]);
 $zip->close();

 chmod($zipname , 0666);
 $dbconn->close();

 showzip($zipname);

?>

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

Modified Files:
	checkfield.pinc 
Log Message:
fix

Index: checkfield.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/checkfield.pinc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- checkfield.pinc	16 Dec 2006 13:08:23 -0000	1.21
+++ checkfield.pinc	10 Jul 2007 11:37:38 -0000	1.22
@@ -144,7 +144,7 @@
     $this->value_t      = StripSlashes($r->get($pos, "f_val_t"));
     $this->creation     = new TUTOS_Date_Time($r->get($pos, "creation"));
     $this->modificator  = $this->modificator->read($r->get($pos, "modificator"),$this->modificator);
-    $this->modification= new TUTUOS_Date_Time($r->get($pos, "modification"));
+    $this->modification= new TUTOS_Date_Time($r->get($pos, "modification"));
     $this->deleted= new TUTOS_Date_Time($r->get($pos, "deleted"));
 
     if ( ! $this->pos ) {
@@ -627,4 +627,4 @@
   }
 
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
      Tag: BRANCH-2-0
	product_new.tpl 
Log Message:
ADD new role fields for product

Index: product_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_new.tpl,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -d -r1.1.2.16 -r1.1.2.17
--- product_new.tpl	16 Aug 2006 14:17:03 -0000	1.1.2.16
+++ product_new.tpl	3 Jul 2007 12:40:29 -0000	1.1.2.17
@@ -166,18 +166,12 @@
 {if $r1fn.select}
   {html_options name=$r1l.name options=$r1l.options}
 {else}
-  <input id="{$r1fn.id}" size="20" maxlength="40" name="{$r1fn.name}"
-         value="{$r1fn.value}">
+  <input id="{$r1fn.id}" size="20" maxlength="40" name="{$r1fn.name}" value="{$r1fn.value}">
 {/if}
 </td>
-<td>
- {html_options name=$role1.name
-               options=$role1.options selected=$role1.selected}
-</td>
-
+<td>{html_options name=$role1.name options=$role1.options selected=$role1.selected}</td>
 <td colspan="2">
-  <input id="{$r1desc.name}" name="{$r1desc.name}" value="{$r1desc.value}"
-         size="{r1desc.size}" maxlength="{$r1desc.maxl}">
+  <input id="{$r1desc.name}" name="{$r1desc.name}" value="{$r1desc.value}" size="{r1desc.size}" maxlength="{$r1desc.maxl}">
 </td>
 </tr>
 
@@ -187,18 +181,42 @@
 {if $r1afn.select}
   {html_options name=$r1al.name options=$r1al.options}
 {else}
-  <input id="{$r1afn.id}" size="20" maxlength="40" name="{$r1afn.name}"
-         value="{$r1afn.value}">
+  <input id="{$r1afn.id}" size="20" maxlength="40" name="{$r1afn.name}" value="{$r1afn.value}">
 {/if}
 </td>
+<td>{html_options name=$role1a.name options=$role1a.options selected=$role1a.selected}</td>
+<td colspan="2">
+  <input id="{$r1adesc.name}" name="{$r1adesc.name}" value="{$r1adesc.value}" size="{r1adesc.size}" maxlength="{$r1adesc.maxl}">
+</td>
+</tr>
+
+<tr>
+<td class="desc" >{$ProdRolesNew}</td>
 <td>
- {html_options name=$role1a.name
-               options=$role1a.options selected=$role1a.selected}
+{if $r1bfn.select}
+  {html_options name=$r1bl.name options=$r1bl.options}
+{else}
+  <input id="{$r1bfn.id}" size="20" maxlength="40" name="{$r1bfn.name}" value="{$r1bfn.value}">
+{/if}
 </td>
+<td>{html_options name=$role1b.name options=$role1b.options selected=$role1b.selected}</td>
+<td colspan="2">
+  <input id="{$r1bdesc.name}" name="{$r1bdesc.name}" value="{$r1bdesc.value}" size="{r1bdesc.size}" maxlength="{$r1bdesc.maxl}">
+</td>
+</tr>
 
+<tr>
+<td class="desc" >{$ProdRolesNew}</td>
+<td>
+{if $r1cfn.select}
+  {html_options name=$r1cl.name options=$r1cl.options}
+{else}
+  <input id="{$r1cfn.id}" size="20" maxlength="40" name="{$r1cfn.name}" value="{$r1cfn.value}">
+{/if}
+</td>
+<td>{html_options name=$role1c.name options=$role1c.options selected=$role1c.selected}</td>
 <td colspan="2">
-  <input id="{$r1adesc.name}" name="{$r1adesc.name}" value="{$r1adesc.value}"
-         size="{r1adesc.size}" maxlength="{$r1adesc.maxl}">
+  <input id="{$r1cdesc.name}" name="{$r1cdesc.name}" value="{$r1cdesc.value}" size="{r1cdesc.size}" maxlength="{$r1cdesc.maxl}">
 </td>
 </tr>
 

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

Modified Files:
      Tag: BRANCH-2-0
	timetrack_new.php product_ins.php product_new.php 
Log Message:
ADD new role fields for product

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.10
retrieving revision 1.53.2.11
diff -u -d -r1.53.2.10 -r1.53.2.11
--- product_ins.php	3 Jul 2007 08:11:17 -0000	1.53.2.10
+++ product_ins.php	3 Jul 2007 12:33:40 -0000	1.53.2.11
@@ -84,6 +84,36 @@
  $gotourl= addUrlParameter($gotourl,"role1a=". $_POST['role1a'],true);
  $gotourl= addUrlParameter($gotourl,"r1adesc=". UrlEncode($_POST['r1adesc']),true);
 
+ # Add Third given People Role
+ if ( isset($_POST['r1bfn']) ) {
+   $m = check_field(StripSlashes($_POST['r1bfn']),"r1bfn","r1bl",$tutos[rolecheck][$_POST['role1b']]);
+   error_log("product_ins: ".$_POST['role1b']." ".$tutos[rolecheck][$_POST['role1b']]." ".$m);
+   if ( $m->id > 0 ) {
+     $p->setRole($m,$_POST['role1b'],StripSlashes($_POST['r1bdesc']));
+   }
+ }
+ if ( isset($_POST['r1bid']) ) {
+   $m = getObject($dbconn,$_POST['r1bid']);
+   $p->setRole($m,$_POST['role1b'],StripSlashes($_POST['r1bdesc']));
+ }
+ $gotourl= addUrlParameter($gotourl,"role1b=". $_POST['role1b'],true);
+ $gotourl= addUrlParameter($gotourl,"r1bdesc=". UrlEncode($_POST['r1bdesc']),true);
+
+  # Add Forth given People Role
+ if ( isset($_POST['r1cfn']) ) {
+   $m = check_field(StripSlashes($_POST['r1cfn']),"r1cfn","r1cl",$tutos[rolecheck][$_POST['role1c']]);
+   error_log("product_ins: ".$_POST['role1c']." ".$tutos[rolecheck][$_POST['role1c']]." ".$m);
+   if ( $m->id > 0 ) {
+     $p->setRole($m,$_POST['role1c'],StripSlashes($_POST['r1cdesc']));
+   }
+ }
+ if ( isset($_POST['r1cid']) ) {
+   $m = getObject($dbconn,$_POST['r1cid']);
+   $p->setRole($m,$_POST['role1c'],StripSlashes($_POST['r1cdesc']));
+ }
+ $gotourl= addUrlParameter($gotourl,"role1c=". $_POST['role1c'],true);
+ $gotourl= addUrlParameter($gotourl,"r1cdesc=". UrlEncode($_POST['r1cdesc']),true);
+
  # Manage parent project
  if ( isset($_POST['parent']) ) {
  

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.50.2.15
retrieving revision 1.50.2.16
diff -u -d -r1.50.2.15 -r1.50.2.16
--- timetrack_new.php	5 Jun 2007 13:06:56 -0000	1.50.2.15
+++ timetrack_new.php	3 Jul 2007 12:33:40 -0000	1.50.2.16
@@ -82,7 +82,7 @@
 
             $parents = array();
             $x = $this->obj->ref;
-            $limit = 2;
+            $limit = 3;
             while ( isset ( $x ) && $limit) {
                 // echo $pre . $lang[$x->gettype()] . " " . $x->getLink();
                 $parents[] = array('label' => $x->getFullName(),

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.76.2.18
retrieving revision 1.76.2.19
diff -u -d -r1.76.2.18 -r1.76.2.19
--- product_new.php	16 Aug 2006 14:17:02 -0000	1.76.2.18
+++ product_new.php	3 Jul 2007 12:33:40 -0000	1.76.2.19
@@ -186,8 +186,9 @@
      $this->assign("roles", $roles);
 
      /**
-      * New role
-      */
+ 	  * New role
+   	  */
+
      $proles = array();
      foreach ($lang['ProdRole'] as $role => $x) {
        # No Product Roles
@@ -196,10 +197,9 @@
        }
        $proles[$role] = myentities($lang['ProdRole'][$role]);
      }
-
      $r1desc_size = $table['product2']['description'][size];
      $this->assign("r1desc",
-		   array('name'  => 'r1desc',
+		   array('name'  => "r1desc",
 			 'value' => myentities($this->r1desc),
 			 'size'  => min(30, $r1desc_size),
 			 'maxl'  => $r1desc_size));
@@ -243,49 +243,106 @@
      /**
       * Second new role
       */
-     $this->assign("r1adesc",
-		   array('name'  => 'r1adesc',
-			 'value' => myentities($this->r1adesc),
-			 'size'  => min(30, $r1adesc_size),
-			 'maxl'  => $r1adesc_size));
-
-
+     $this->assign("r1adesc", array('name'  => 'r1adesc',
+			                        'value' => myentities($this->r1adesc),
+			                        'size'  => min(30, $r1adesc_size),
+			                        'maxl'  => $r1adesc_size));
      if( count($roles) == 0 && $this->obj->rsel1a == $tutos[default_role] )
        $default_role = $tutos[default_first_role];
      else
        $default_role = $this->obj->rsel1a;
-
-     $this->assign("role1a",
-		   array('name'     => 'role1a',
-			 'label'    => $lang['ProdRolesNew'],
-			 'options'  => $proles,
-			 'selected' => $default_role));
-
+     $this->assign("role1a", array('name'     => 'role1a',
+			                       'label'    => $lang['ProdRolesNew'],
+			                       'options'  => $proles,
+			                       'selected' => $default_role));
      if( isset($this->obj->xl['r1a']) ) {
        $r1afns = array();
        foreach( $this->obj->xl['r1a'] as $i => $f )
-	 $r1afns[$i] = myentities($f->getFullName());
-
-       $this->assign("r1al",
-		     array('id'      => "r1a",
-			   'name'    => "r1aid",
-			   'options' => $r1afns));
+	     $r1afns[$i] = myentities($f->getFullName());
+       $this->assign("r1al", array('id'      => "r1a",
+			                       'name'    => "r1aid",
+			                       'options' => $r1afns));
      }
-
      $r1afn = "";
      if( $this->obj->xfn['r1a'] != "" )
        $r1fn = $this->obj->xfn['r1a'];
      else
        if( isset($this->obj->r1a) )
 	 $r1fn = myentities($this->obj->r1a->getFullName());
+     $this->assign("r1afn", array('id'      => "r1a",
+			                      'name'    => "r1afn",
+			                      'value'   => $r1afn,
+			                      'select'  => isset($this->obj->xl['r1a'])));
 
-     $this->assign("r1afn",
-		   array('id'      => "r1a",
-			 'name'    => "r1afn",
-			 'value'   => $r1afn,
-			 'select'  => isset($this->obj->xl['r1a'])));
+     /**
+      * third new role
+      */
+     $this->assign("r1bdesc", array('name'  => 'r1bdesc',
+			                        'value' => myentities($this->r1bdesc),
+			                        'size'  => min(30, $r1bdesc_size),
+			                        'maxl'  => $r1bdesc_size));
+     if( count($roles) == 0 && $this->obj->rsel1b == $tutos[default_role] )
+       $default_role = $tutos[default_first_role];
+     else
+       $default_role = $this->obj->rsel1b;
+     $this->assign("role1b", array('name'     => 'role1b',
+			                       'label'    => $lang['ProdRolesNew'],
+			                       'options'  => $proles,
+			                       'selected' => $default_role));
+     if( isset($this->obj->xl['r1b']) ) {
+       $r1bfns = array();
+       foreach( $this->obj->xl['r1b'] as $i => $f )
+	     $r1bfns[$i] = myentities($f->getFullName());
+       $this->assign("r1bl", array('id'      => "r1b",
+			                       'name'    => "r1bid",
+			                       'options' => $r1bfns));
+     }
+     $r1bfn = "";
+     if( $this->obj->xfn['r1b'] != "" )
+       $r1fn = $this->obj->xfn['r1b'];
+     else
+       if( isset($this->obj->r1b ) )
+	 $r1fn = myentities($this->obj->r1b->getFullName());
+     $this->assign("r1bfn", array('id'      => "r1b",
+			                      'name'    => "r1bfn",
+			                      'value'   => $r1bfn,
+			                      'select'  => isset($this->obj->xl['r1b'])));
 
+     /**
+      * forth new role
+      */
+     $this->assign("r1cdesc", array('name'  => 'r1cdesc',
+			                        'value' => myentities($this->r1cdesc),
+			                        'size'  => min(30, $r1cdesc_size),
+			                        'maxl'  => $r1cdesc_size));
+     if( count($roles) == 0 && $this->obj->rsel1c == $tutos[default_role] )
+       $default_role = $tutos[default_first_role];
+     else
+       $default_role = $this->obj->rsel1c;
+     $this->assign("role1c", array('name'     => 'role1c',
+			                       'label'    => $lang['ProdRolesNew'],
+			                       'options'  => $proles,
+			                       'selected' => $default_role));
+     if( isset($this->obj->xl['r1c']) ) {
+       $r1cfns = array();
+       foreach( $this->obj->xl['r1c'] as $i => $f )
+	     $r1cfns[$i] = myentities($f->getFullName());
+       $this->assign("r1cl", array('id'      => "r1c",
+			                       'name'    => "r1cid",
+			                       'options' => $r1cfns));
+     }
+     $r1cfn = "";
+     if( $this->obj->xfn['r1c'] != "" )
+       $r1fn = $this->obj->xfn['r1c'];
+     else
+       if( isset($this->obj->r1c) )
+	 $r1fn = myentities($this->obj->r1c->getFullName());
+     $this->assign("r1cfn", array('id'      => "r1c",
+			                      'name'    => "r1cfn",
+			                      'value'   => $r1cfn,
+			                      'select'  => isset($this->obj->xl['r1c'])));
 
+			                      
      
      /**
       * Relations to other Products
@@ -498,6 +555,8 @@
      $this->obj = new product($this->dbconn);
      $this->r1desc  = "";
      $this->r1adesc = "";
+     $this->r1bdesc = "";
+     $this->r1cdesc = "";
      $this->r2desc  = "";
 
      $this->template = false;
@@ -624,6 +683,18 @@
        $this->obj->rsel1a = $tutos[default_role];
      }
 
+     if ( isset($_GET['role1b']) ) {
+       $this->obj->rsel1b = $_GET['role1b'];
+     } else {
+       $this->obj->rsel1b = $tutos[default_role];
+     }
+
+     if ( isset($_GET['role1c']) ) {
+       $this->obj->rsel1c = $_GET['role1c'];
+     } else {
+       $this->obj->rsel1c = $tutos[default_role];
+     }
+
      # Product Relations
      if ( isset($_GET['r2id']) ) {
        $this->obj->role[1]->id = $_GET['r2id'];

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

Modified Files:
      Tag: BRANCH-2-0
	bug_new.php 
Log Message:
BUGFIX: error setDateTime on new bug

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.5.2.18
retrieving revision 1.5.2.19
diff -u -d -r1.5.2.18 -r1.5.2.19
--- bug_new.php	23 May 2007 10:06:42 -0000	1.5.2.18
+++ bug_new.php	3 Jul 2007 09:50:51 -0000	1.5.2.19
@@ -298,6 +298,7 @@
        $this->obj->volume = $_GET['volume'];
      }
      if ( isset($_GET['wd']) ) {
+       $this->obj->wday = new TutosDateTime();
        $this->obj->wday->setDateTime($_GET['wd']);
      }
      if ( isset($_GET['short']) ) {

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

Modified Files:
      Tag: BRANCH-2-0
	product_ins.php product.pinc 
Log Message:
BUGFIX: can't delete the product parent

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.53.2.9
retrieving revision 1.53.2.10
diff -u -d -r1.53.2.9 -r1.53.2.10
--- product_ins.php	23 May 2007 10:05:19 -0000	1.53.2.9
+++ product_ins.php	3 Jul 2007 08:11:17 -0000	1.53.2.10
@@ -87,22 +87,27 @@
  # Manage parent project
  if ( isset($_POST['parent']) ) {
  
+     
    /* check if parent has changed */ 
    if (isset($_POST['cur_parent']) && isset($_POST['cur_parent_id']) && !strcmp($_POST['cur_parent'], $_POST['parent'])) {
-    $p->parent = getObject($dbconn, $_POST['cur_parent_id']);
+       $p->parent = getObject($dbconn, $_POST['cur_parent_id']);
    
    } else {
-    $m = check_field(StripSlashes($_POST['parent']),
-                      "parents","parents",$tutos[rolecheck][$_POST['role2']]);
-    if ( $m->id > 0 ) {
-      if ( $m->id == $p->id ) {
-        $msg .= $lang['Err0056']."<br />";
-      } else {
-        $p->parent = getObject($dbconn, $m->id);
-      }
+       if ($_POST['parent'] == "") {
+        $p->parent = NULL;
+    } else {
+        $m = check_field(StripSlashes($_POST['parent']), "parents","parents",$tutos[rolecheck][$_POST['role2']]);
+        if ( $m->id > 0 ) {
+            if ( $m->id == $p->id ) {
+                $msg .= $lang['Err0056']."<br />";
+            } else {
+                $p->parent = getObject($dbconn, $m->id);
+            }
+        }
     }
    }
  }
+ 
  if ( isset($_POST['parent_id']) ) {
    if ( $_POST['parent_id'] == $p->id ) {
      $msg .= $lang['Err0056']."<br />";

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.133.2.20
retrieving revision 1.133.2.21
diff -u -d -r1.133.2.20 -r1.133.2.21
--- product.pinc	23 May 2007 10:05:20 -0000	1.133.2.20
+++ product.pinc	3 Jul 2007 08:11:18 -0000	1.133.2.21
@@ -721,14 +721,14 @@
     }
     $q->addFV("state_date",$this->state_date,"DATETIME");
 
-    error_log('product.pinc: parent id '.$this->parent->id);
-
     if( $this->parent != -1 && is_object($this->parent) ) {
       if ($this->parent->id != $this->id) {
         $q->addFV("p_id",$this->parent->id,"INT");
       } else {
         $msg .= $lang['Err0056']."<br />";
       }
+    } elseif ( $this->parent != -1 ) {
+        $q->addFV("p_id","null","");
     }
 
     if ( $this->id < 0 ) {