tutos-commits Mailing List for TUTOS

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

Modified Files:
	new_layout.pinc 
Log Message:
fix

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- new_layout.pinc	13 Jun 2005 19:20:20 -0000	1.58
+++ new_layout.pinc	28 Jun 2005 06:55:32 -0000	1.59
@@ -588,9 +588,20 @@
           $href = $tutos['base'] ."/php/". $href;
         }
         if (!isset($m['target'])) {
-          $b = ereg_replace('%ONCLICK%','',$before);
+          $b = ereg_replace('%ONCLICK%','',$before);
+          if ( isset($m[confirm]) && ($m[confirm] == true) ) {
+            $b = ereg_replace('%X%','if (! confirm(\''. $m[info].' ?\')) { return false };',$b);
+          } else {
+            $b = ereg_replace('%X%','',$before);
+	  }
         } else {
-          $b = ereg_replace('%ONCLICK%','',$before);
+          #$b = ereg_replace('%ONCLICK%','%X%',$before);
+          $b = ereg_replace('%ONCLICK%','',$before);
+          if ( isset($m[confirm]) && ($m[confirm] == true) ) {
+            $b = ereg_replace('%X%','if (! confirm(\' ?\')) { return false };"',$b);
+          } else {
+            $b = ereg_replace('%X%','',$before);
+	  }
         }
         if ( isset($m[confirm]) && ($m[confirm] == true) ) {
           $r .= $b. confirmlink($m[url],$t,$m[info],'',$attr) .$after .$sep;
@@ -927,4 +938,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	note.pinc 
Log Message:
fix

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- note.pinc	1 May 2005 13:37:58 -0000	1.58
+++ note.pinc	28 Jun 2005 06:30:11 -0000	1.59
@@ -435,7 +435,7 @@
 
     if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
-    if ( $obj->id < 1000 ) return;
+    if ( $obj->id < 0 ) return;
 
     if ( ! $user->feature_ok(usenotes,PERM_SEE) ) {
       return;
@@ -463,7 +463,7 @@
 
     if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
-    if ( $obj->id < 1000 ) return;
+    if ( $obj->id < 0 ) return;
 
     if ( ! $user->feature_ok(usenotes,PERM_SEE) ) {
       return;
@@ -488,7 +488,7 @@
 
     if ( $obj == -1 ) return ""; 
     if (! is_object($obj) ) return "";
-    if ( $obj->id < 1000 ) return "";
+    if ( $obj->id < 0 ) return "";
     if (! $user->feature_ok(usenotes,PERM_NEW) ) return "";
     if (! $obj->see_ok() ) return "";
     if ($obj->getType() == "note" ) return "";
@@ -507,7 +507,7 @@
   function obj_read(&$obj) {
     if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
-    if ( $obj->id < 1000 ) return;
+    if ( $obj->id < 0 ) return;
 
     if ( isset($obj->list[usenotes]) ) {
       return;
@@ -701,4 +701,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

Update of /cvsroot/tutos/tutos/php/ldap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32427/ldap

Modified Files:
	de.p3 
Log Message:
fixes

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/de.p3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- de.p3	27 Nov 2002 17:54:57 -0000	1.2
+++ de.p3	28 Jun 2005 04:45:10 -0000	1.3
@@ -13,12 +13,12 @@
 $lang['LDAPOverview']   = "LDAP Suchergebniss";
 $lang['LDAPDetail']     = "LDAP Eintrag";
 $lang['LDAPSearchFor']  = "Suche nach %s bei %s";
-$lang['LDAPFound']      = "%s gelieferte Eintraege";
+$lang['LDAPFound']      = "%s gelieferte Einträge";
 $lang['LDAPServer']     = "Server";
 $lang['LDAPNotSynced']  = "Eintrag bisher nicht mit TUTOS abgeglichen";
 $lang['LDAPImport']     = "Importieren";
 $lang['LDAPUpdate']     = "erneut abgleichen";
-$lang['LDAP_Err001']    = "LDAP Fehler: Kein Verbindungsaufbau moeglich";
+$lang['LDAP_Err001']    = "LDAP Fehler: Kein Verbindungsaufbau möglich";
 
 $lang['perm'][useldap]  = "LDAP benutzen";
 ?>

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

Modified Files:
	invoice.pinc invoice_del.php invoice_new.php 
Log Message:
fixes

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- invoice.pinc	14 May 2005 18:29:15 -0000	1.52
+++ invoice.pinc	28 Jun 2005 04:45:10 -0000	1.53
@@ -533,6 +533,18 @@
     return "invoice/invoice_show.php?id=". $this->id;
   }
   /**
+   * Return a url to the mod page
+   */
+  function getModURL() {
+    return "invoice/invoice_new.php?id=". $this->id;
+  }
+  /**
+   * Return a url to the delete page
+   */
+  function getDelURL() {
+    return "invoice/invoice_del.php?id=". $this->id;
+  }
+  /**
    * Return the sum of all positions
    */
   function getSum() {
@@ -1046,7 +1058,7 @@
   function get_overview_header (&$layout,$objtype) {
     global $lang;
 
-	$r = '';
+    $r = '';
     if ( ! $layout->user->feature_ok(useinvoice,PERM_SEE) ) {
       return $r;
     }
@@ -1065,7 +1077,7 @@
   function get_overview_data (&$layout,&$obj) {
     global $tutos,$lang;
 
-	$r = '';
+    $r = '';
     if ( ! $layout->user->feature_ok(useinvoice,PERM_SEE) ) {
       return $r;
     }

Index: invoice_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_del.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- invoice_del.php	17 Apr 2005 18:17:02 -0000	1.14
+++ invoice_del.php	28 Jun 2005 04:45:10 -0000	1.15
@@ -33,9 +33,8 @@
    $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br />";
  } else {
    $obj = $obj->read($_GET['id'],$obj);
-   $obj->read_pos();
    if ( $obj->id < 1 ) {
-     $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) . "<br />";
+     $msg .= sprintf($lang['Err0040'],$lang['invoice']) . "<br />";
    } else {
      $gotourl = $obj->getUrl();
    }
@@ -46,6 +45,7 @@
 
  if ( $msg == "" ) {
    $dbconn->Begin("WORK");
+   $obj->read_pos();
    $msg .= $obj->delete();
    $dbconn->Commit("WORK");
 

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- invoice_new.php	23 May 2005 15:44:12 -0000	1.42
+++ invoice_new.php	28 Jun 2005 04:45:10 -0000	1.43
@@ -406,6 +406,11 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj = $this->obj->read($_GET['id'],$this->obj);
+       if ( $this->obj < 0 ) {
+         $msg .= sprintf($lang['Err0040'],$lang['invoice']);
+         $this->stop = true;
+         return;
+       }
        $this->name .= ": ". myentities($this->obj->getFullName());
        $this->obj->read_ref();
      } else {
@@ -452,7 +457,7 @@
      add_module_newlinks($this,$this->obj);
 
      if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
-       $x = array( url => "invoice/invoice_del.php?id=". $this->obj->id,
+       $x = array( url => $this->obj->getDelUrl(),
                    text => $lang['Delete'],
                    info => sprintf($lang['InvDelInfo'],$this->obj->getFullname()),
                    confirm => true,

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

Modified Files:
      Tag: BRANCH-1-2
	bug.pinc 
Log Message:
fix

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.26.2.4
retrieving revision 1.26.2.5
diff -u -r1.26.2.4 -r1.26.2.5
--- bug.pinc	2 Sep 2004 19:05:58 -0000	1.26.2.4
+++ bug.pinc	26 Jun 2005 01:55:39 -0000	1.26.2.5
@@ -496,9 +496,9 @@
     global $lang;
 
     if ( ! empty($s) ) {
-      return "<font color=\"". $this->c_state[$s] ."\">". $lang['BugStates'][$s] ."</font>";
+      return "<span style=\"color: ". $this->c_state[$s] .";\">". $lang['BugStates'][$s] ."</span>";
     }
-    return "<font color=\"". $this->c_state[$this->state] ."\">". $lang['BugStates'][$this->state] ."</font>";
+    return "<span style=\"color: ". $this->c_state[$this->state] .";\">". $lang['BugStates'][$this->state] ."</span>";
   }
   /** ---------------------------------------------------------------------------
    */
@@ -513,9 +513,9 @@
     global $lang;
 
     if ( ! empty($c) ) {
-      return "<font color=\"". $this->c_class[$c] ."\">". $lang['BugClasses'][$c] ."</font>";
+      return "<span style=\"color: ". $this->c_class[$c] .";\">". $lang['BugClasses'][$c] ."</span>";
     }
-    return "<font color=\"". $this->c_class[$this->class] ."\">". $lang['BugClasses'][$this->class] ."</font>";
+    return "<span style=\"color :". $this->c_class[$this->class] .";\">". $lang['BugClasses'][$this->class] ."</span>";
   }
   /**
    * ask for a class

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

Modified Files:
      Tag: BRANCH-1-2
	db_mysql.pinc 
Log Message:
fix

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -u -r1.21.2.5 -r1.21.2.6
--- db_mysql.pinc	7 Jun 2005 21:32:19 -0000	1.21.2.5
+++ db_mysql.pinc	26 Jun 2005 01:55:39 -0000	1.21.2.6
@@ -453,6 +453,8 @@
    * handle reserved words in this database type
    */
   function colname($col) {
+    if ($col == "*") return $col;
+
     $d = false;
     if (ereg("^DISTINCT (.*)",$col,$regs)) {
       $col = $regs[1];

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

Modified Files:
      Tag: BRANCH-1-2
	user.pinc 
Log Message:
fix

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.135.2.8
retrieving revision 1.135.2.9
diff -u -r1.135.2.8 -r1.135.2.9
--- user.pinc	16 Mar 2005 20:32:40 -0000	1.135.2.8
+++ user.pinc	26 Jun 2005 01:55:38 -0000	1.135.2.9
@@ -917,14 +917,13 @@
    */
   function update($initial = false) {
 
-    if ( isset($_SERVER['REMOTE_ADDR']) ) {
-      $lh = $_SERVER['REMOTE_ADDR'];
-    } else {
-      $lh = "not set";
-    }
+    $lh = "not set";
     if ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ) {
       $lh =  $_SERVER['HTTP_X_FORWARDED_FOR'];
     }
+    if ( isset($_SERVER['REMOTE_ADDR']) ) {
+      $lh = $_SERVER['REMOTE_ADDR'];
+    }
     $this->setLastSeen(new DateTime());
     $this->setLastHost($lh);
 

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

Modified Files:
	rate.pinc 
Log Message:
bugfix

Index: rate.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/rate.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- rate.pinc	3 Apr 2005 18:32:16 -0000	1.28
+++ rate.pinc	23 Jun 2005 18:27:52 -0000	1.29
@@ -702,11 +702,15 @@
    */
   Function obj_delete(&$user,&$obj) {
     $msg = "";
+    if ($obj->gettype() == "timetrack") {
+      return $msg;
+    }
     rate::obj_read($obj);
       
     if ( count($obj->ratelist) > 0 ) {
       @reset ($obj->ratelist);
       while ( list ($i,$f) = @each ($obj->ratelist) ) {
+#         $msg .= " ".$i." ". $f."<br>";
         $msg .= $f->delete();
       }
     }
@@ -789,4 +793,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

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

Modified Files:
	base.pinc timetrack.pinc timetrack_del.php timetrack_new.php 
Log Message:
bugfix

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- base.pinc	21 May 2005 15:38:07 -0000	1.88
+++ base.pinc	23 Jun 2005 18:27:51 -0000	1.89
@@ -102,11 +102,11 @@
       if ($x[type] == 'float') {
         $this->$fld = 0.0;
       } else if ($x[type] == 'TS_TYPE') {
-		if (isset($x['default_today']) && ($x['default_today'] == true) ) {
+        if (isset($x['default_today']) && ($x['default_today'] == true) ) {
           $this->$fld = new DateTime();
-		} else {
+        } else {
           $this->$fld = new DateTime(0);
-		}
+        }
       } else {
         $this->$fld = '';
       }
@@ -133,7 +133,7 @@
 #die ("CACHE failed for ".$id ."(". $g_hash[$id]->getFullName() .") got ". $obj->id ." ". $obj->gettype() ."<br />\n");
 
 #      PHP_ERROR("8888",$_SERVER["REQUEST_URI"] ." > CACHE failed for ".$id ."(". $g_hash[$id]->getFullName() .") got ". $obj->id ." ". $obj->gettype() .":\n",3,$tutos[errlog],"see","backtrace");
-#		  echo $id ." ". $g_hash[$id]->getFullName() ." ###<br />";
+#         echo $id ." ". $g_hash[$id]->getFullName() ." ###<br />";
 #      } else {
         $g_hash['hits']++;
         $obj = &$g_hash[$id];
@@ -152,7 +152,7 @@
     }
     $obj->read_result($r,0);
     $r->free();
-	return $obj;
+    return $obj;
   }
   /**
    * read the custom fields of a resultset 
@@ -248,9 +248,9 @@
       if ($this->force_insert) {
         $this->id = -1;
       } else {  
-	    $tutos['nohash'] =1 ;
+        $tutos['nohash'] =1 ;
         $this->read($data,$this);
-	    unset($tutos['nohash']);
+        unset($tutos['nohash']);
         if ( ($this->id != $data) )  {
           die ($this->gettype() ." with id ". $data. " does not exist");
         }
@@ -742,4 +742,4 @@
     return '';
   }
 }
-?>
+?>
\ No newline at end of file

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- timetrack.pinc	30 Apr 2005 09:36:30 -0000	1.77
+++ timetrack.pinc	23 Jun 2005 18:27:51 -0000	1.78
@@ -161,7 +161,7 @@
     # a timetrack object could be attached to all projects and tasks where we play a role
     if ( $current_user->feature_ok(useprojects,PERM_SEE) ) {
       require_once 'product.pinc';
-	  $q = "SELECT p.* from ". $this->dbconn->prefix."products p,". $this->dbconn->prefix ."projectroles r ";
+      $q = "SELECT p.* from ". $this->dbconn->prefix."products p,". $this->dbconn->prefix ."projectroles r ";
       $pre = " WHERE ";
       if ($this->worker->id > 0) {
         $q .= $pre ." r.adr_id in(". $this->worker->id;
@@ -175,7 +175,7 @@
       $result = $this->dbconn->Exec($q);
       $n = $result->numrows();
       $a = 0;
-#	  echo $n." ".$q;
+#     echo $n." ".$q;
       while ( $a < $n ) {
         $p = new product($this->dbconn);
         $p->read_result($result,$a);
@@ -186,9 +186,9 @@
         unset($p);
       }
       $result->free();
-	}
+    }
     if ( $current_user->feature_ok(usetaskmanagement,PERM_SEE) ) {
-	  $q = "SELECT t.* from ". $this->dbconn->prefix."tasks t,". $this->dbconn->prefix ."taskworker w ";
+      $q = "SELECT t.* from ". $this->dbconn->prefix."tasks t,". $this->dbconn->prefix ."taskworker w ";
       $pre = " WHERE ";
       if ($this->worker->id > 0) {
         $q .= $pre ." w.w_id in(". $this->worker->id;
@@ -201,7 +201,7 @@
       $result = $this->dbconn->Exec($q);
       $n = $result->numrows();
       $a = 0;
-#	  echo $n." ".$q;
+#     echo $n." ".$q;
       while ( $a < $n ) {
         $p = new task($this->dbconn);
         $p->read_result($result,$a);
@@ -212,7 +212,7 @@
         unset($p);
       }
       $result->free();
-	}
+    }
   }
   /**
    * set the Description
@@ -331,7 +331,7 @@
         // the planned volume as the volume_todo
         $ref_todo = $this->ref->volume;
       } else {
-	    // the diff will be zero
+        // the diff will be zero
         $ref_todo = $this->volume;
       }
       // And the calculated volume_todo is the volume todo before this
@@ -357,7 +357,7 @@
     $q->addFV("currency",$this->currency,"STRING",4);
     $q->addFV("t_start",$this->t_start,"DATETIME");
     $q->addFV("t_end",$this->t_end,"DATETIME");
-	$this->save_custom_fields($q);
+    $this->save_custom_fields($q);
 
     if ( $this->id < 0 ) {
       $this->modified = array();
@@ -435,7 +435,7 @@
                                 "old" => $this->volume ,
                                 "new" => "0",
                                 "obj_id" => $this->link_id
-                                );
+                              );
     $msg .= parent::delete();
 
     return $msg;
@@ -627,13 +627,13 @@
     if (! $user->feature_ok(usetimetrack,PERM_NEW) ) return "";
     if (! $obj->use_ok() ) return "";
 
-	if ($obj->gettype() == "product") {
+    if ($obj->gettype() == "product") {
       if ($obj->state == PROD_STATE_CANCEL) return "";
       if ($obj->state == PROD_STATE_QCANCEL) return "";
-	}
-	if ($obj->gettype() == "task") {
+    }
+    if ($obj->gettype() == "task") {
       if ($obj->state == TASK_FINISH) return "";
-	}
+    }
 
     if ($user->id == $obj->id ) {
       $x = array( url => "timetrack_new.php?mode=1&amp;lid=". $obj->id,
@@ -668,4 +668,4 @@
                 );
   }
 }
-?>
+?>
\ No newline at end of file

Index: timetrack_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_del.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- timetrack_del.php	3 Apr 2005 18:31:55 -0000	1.22
+++ timetrack_del.php	23 Jun 2005 18:27:52 -0000	1.23
@@ -18,10 +18,10 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("timetrack","del");
+ loadmodules('timetrack','del');
 
  /* Check Input */
- $msg = "";
+ $msg = '';
  $obj = new timetrack($dbconn);
 
  if ( !isset($_GET['id']) ) {
@@ -30,9 +30,8 @@
    $obj = $obj->read($_GET['id'],$obj);
  }
  if ( $obj->id < 1 ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br />";
- }
- if ( ! $obj->del_ok() ) {
+   $msg .= sprintf($lang['Err0040'],$lang['timetrack']) ."<br />";
+ } else if ( ! $obj->del_ok() ) {
    $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br />";
  }
 

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- timetrack_new.php	20 Jun 2005 19:19:32 -0000	1.63
+++ timetrack_new.php	23 Jun 2005 18:27:52 -0000	1.64
@@ -106,7 +106,7 @@
        echo "<tr>\n";
        echo $this->showfieldc($lang['TaskVolumeDone'],1,"volume");
        echo ' <td><input size="10" maxlength="10" id="volume" name="volume" value="'. number_format($this->obj->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) .'" />'. $lang['hours'] ."</td>\n";
-	   # added by J. baten to facilitate travel distance
+       # added by J. baten to facilitate travel distance
 
        echo $this->showfieldc($lang['Distance'],0,"distance");
        echo "<td><input size=\"10\" maxlength=\"10\" name=\"distance\" value=\"". number_format($this->obj->distance,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />". $lang['DistanceUnit'] ."</td>\n";
@@ -163,7 +163,7 @@
      #
      # Edit additional custom fields
      #
-	 edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
+     edit_custom_fields($this,$this->obj->gettype(),$this->obj,6);
      # References to modules
      module_addforms($this->user,$this->obj,6);
 
@@ -216,8 +216,8 @@
        if ( ($this->obj->t_start->notime == 0) && ( $this->mode != 2) ) {
          $this->mode = 1;
        }
-       if ( ($this->obj->id < 0) ) {
-         $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       if ( ($this->obj < 0) || ($this->obj->id < 0) ) {
+         $msg .= sprintf($lang['Err0040'],$lang['timetrack']);
          $this->stop = true;
        }
      } else {
@@ -241,6 +241,8 @@
        $this->name = $lang['TimetrackNew'];
      }
 
+     if (true == $this->stop) return;
+
      if ( isset($_GET['reftype']) ) {
        $this->obj->reftype = StripSlashes($_GET['reftype']);
      } else {
@@ -278,11 +280,11 @@
      preset_from_array_or_input($this->obj,'ref',"l");
      $this->obj->read_relations();
 
-	 if ($this->obj->ref == -1) {
+     if ($this->obj->ref == -1) {
        $this->obj->link_id = -1;
-	 } else {
+     } else {
        $this->obj->link_id = $this->obj->ref->id;
-	 }
+     }
      if ( $this->obj->link_id == -1 ) {
        $msg .= "Unknown reference";
        $this->stop = true;
@@ -326,4 +328,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Update of /cvsroot/tutos/tutos/php/ticker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16099/ticker

Modified Files:
	rsslib.pinc 
Log Message:
bugfix

Index: rsslib.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ticker/rsslib.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rsslib.pinc	30 Apr 2005 09:36:31 -0000	1.12
+++ rsslib.pinc	23 Jun 2005 18:27:52 -0000	1.13
@@ -1,8 +1,16 @@
 <?php
-#
-#    CVS Info:  $Id$
-#    $Author$
-#
+/**
+ *  Copyright 1999 - 2005 by Gero Kohnert
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
+ *
+ *
+ *  CVS Info:  $Id$
+ *  $Author$
+ *
+ */
 function getrdf($rdf, $cachefile, $agelimit = 10, $timeout = 10) {
   global $tutos;
   // convert agelimit to seconds
@@ -55,6 +63,13 @@
   $link = ereg_replace("</link>.*","",$link);
   $title = ereg_replace(".*<title>","",$item);
   $title = ereg_replace("</title>.*","",$title);
+  // by s.s...@it...
+  if (substr($title,0,9)=="<![CDATA[")  // CDATA meta tag handling
+  {
+    $title = substr($title,9);
+    $title = substr($title,0,strlen($title)-3);
+  }
+  
   if ($title)
     echo '      <li><a class="tickerlink" target="map" href="'. $link .'">'. htmlentities(html_entity_decode($title)) ."</a></li>\n";
 }
@@ -90,4 +105,4 @@
     makebullet($items[$i]);
   echo "</ul>\n";
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	Date.pinc timetrack_ins.php timetrack_new.php 
Log Message:
fix

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Date.pinc	7 Jun 2005 17:45:15 -0000	1.111
+++ Date.pinc	20 Jun 2005 19:19:31 -0000	1.112
@@ -814,7 +814,7 @@
    * none = 0  (no date not allowed)
    * none = 1  (allowed to enter nothing)
    */
-  function EnterDate($name,$none = 0,$future_only = false) {
+  function EnterDate($name,$none = 0,$future_only = false,$show_minical = false) {
     global $tutos,$lang;
 
     if ($tutos[jscalendar] == 1) {
@@ -857,7 +857,9 @@
     echo "<b>.</b>&nbsp;";
     echo $this->EnterYear($name,$none,$future_only);
 
-    echo $this->ShowMinical($name, $none);
+    if ($show_minical) {
+      echo $this->ShowMinical($name, $none);
+	}
   }
   /**
    * enter a time into a form
@@ -879,28 +881,18 @@
   function EnterDateTime($name,$none = 0,$future_only = false) {
     global $tutos;
 
-    if ( $tutos['df'] == 1 ) {
-      echo $this->EnterMonth($name,$none);
-    } else {
-      echo $this->EnterDay($name,$none);
-    }
-    echo "<b>.</b>&nbsp;";
-    if ( $tutos['df'] == 1 ) {
-      echo $this->EnterDay($name,$none);
-    } else {
-      echo $this->EnterMonth($name,$none);
-    }
-    echo "<b>.</b>&nbsp;";
-    echo $this->EnterYear($name,$none,$future_only);
+    $this->EnterDate($name,$none,$future_only,false);
 
     $h = sprintf("%s_H",$name );
     $m = sprintf("%s_M",$name );
     
-    echo "<input maxlength=\"2\" size=\"2\" name=\"". $h ."\" value=\"". ($this->hour == -1 ? "--":$this->hour)  ."\" />\n";
+    echo "&nbsp;<input maxlength=\"2\" size=\"2\" name=\"". $h ."\" value=\"". ($this->hour == -1 ? "--":$this->hour)  ."\" />\n";
     echo "&nbsp;<b>:</b>&nbsp;";
     echo "<input maxlength=\"2\" size=\"2\" name=\"". $m ."\" value=\"". ($this->min == -1 ? "--":$this->min) ."\" />\n";
     
-    echo $this->ShowMinical($name, $none);
+    if ($tutos[jscalendar] != 1) {
+      echo $this->ShowMinical($name, $none);
+	}
   }
   /* ---------------------------------------------------------------------------
    */

Index: timetrack_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_ins.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- timetrack_ins.php	18 Mar 2005 08:07:24 -0000	1.48
+++ timetrack_ins.php	20 Jun 2005 19:19:31 -0000	1.49
@@ -1,6 +1,11 @@
 <?php
 /**
- * Copyright 1999 - 2003 by Gero Kohnert
+ *  Copyright 1999 - 2005 by Gero Kohnert
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
+ *
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -91,9 +96,9 @@
  }
 
  # Read the Work Day
- $wd = new DateTime(0);
- if ( isset($_POST['wd_d']) ) {
-   $wd->setDateTimeF("wd",1);
+ if (isset($_POST['jsc_wd']) || isset($_POST['wd_d'])) {
+   $wd = new DateTime(0);
+   $wd->setDateTimeF('wd',1);
    if ( !$wd->checkDMY() ) {
      $msg .= sprintf($lang['Err0038'],$lang['Date']) ."<br />";
    } else {
@@ -101,30 +106,29 @@
    }
    $tt->setWorkday($wd);
  }
-
- if ( isset($_POST['start_d']) ) {
+ if (isset($_POST['jsc_start']) || isset($_POST['start_d'])) {
    $start = new DateTime();
-   $start->setDateTimeF("start",0);
+   $start->setDateTimeF('start',0);
    if ( !$start->checkDMY() ) {
      $msg .= sprintf($lang['Err0038'],$lang['AppStart']) ."<br />";
    } else {
-    $gotourl= addUrlParameter($gotourl,"start=". $start->getYYYYMMDDHHMM(),true);
+     $gotourl= addUrlParameter($gotourl,'start='. $start->getYYYYMMDDHHMM(),true);
    }
    $tt->setStart($start);
  }
- if ( isset($_POST['end_d']) ) {
-   $end   = new DateTime();
-   $end->setDateTimeF("end",0);
-   if ( !$end->checkDMY(true) ) {
-     $msg .= sprintf($lang['Err0038'],$lang['AppEnd']) ."<br />";
-   } else {
-     $gotourl= addUrlParameter($gotourl,"end=". $end->getYYYYMMDDHHMM(),true);
-   }
-   $tt->setEnd($end);
-   if ( $tt->t_end->notime == 0 ) {
-     $tt->setVolume( ($tt->t_end->getTimeStamp() - $tt->t_start->getTimeStamp()) / 3600.0);
-   }
+ $end   = new DateTime();
+ $end->setDateTimeF("end",0);
+ if ( !$end->checkDMY(true) ) {
+   $msg .= sprintf($lang['Err0038'],$lang['AppEnd']) ."<br />";
+ } else {
+   $gotourl= addUrlParameter($gotourl,"end=". $end->getYYYYMMDDHHMM(),true);
+ }
+ $tt->setEnd($end);
+
+ if ( $tt->t_end->notime == 0 ) {
+   $tt->setVolume( ($tt->t_end->getTimeStamp() - $tt->t_start->getTimeStamp()) / 3600.0);
  }
+
  # volume
  if ( $tt->t_start->notime == 1 ) {
    if ( !checkfloat($_POST['volume'],false) ) {

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- timetrack_new.php	21 May 2005 18:51:12 -0000	1.62
+++ timetrack_new.php	20 Jun 2005 19:19:32 -0000	1.63
@@ -18,7 +18,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("timetrack","new");
+ loadmodules('timetrack','new');
  loadlayout();
 
  /**
@@ -33,18 +33,18 @@
 
      if ( $this->mode == 1 ) {
        # if we are in time record mode we first give a list of all OPEN records
-       $q = "SELECT * from ". $this->obj->tablename ." WHERE t_start is not null AND t_end is NULL and adr_id = ". $this->obj->worker->id;
+       $q = 'SELECT * from '. $this->obj->tablename .' WHERE t_start is not null AND t_end is NULL and adr_id = '. $this->obj->worker->id;
        $r = $this->dbconn->Exec($q);
        $n = $r->numrows();
        $a = 0;
        if ( $n > 0 ) {
          echo $this->DataTableStart();
          echo "<tr>\n";
-         echo "<th>". $lang['Timetrack'] ."</th>\n";
-         echo "<th>". $lang['AppStart'] ."</th>\n";
-         echo "<th>". $lang['TimetrackRef'] ."</th>\n";
-         echo "<th>". $lang['TimetrackModify'] ."</th>\n";
-         echo "<th>". $lang['TTfinish'] ."</th>\n";
+         echo ' <th>'. $lang['Timetrack'] ."</th>\n";
+         echo ' <th>'. $lang['AppStart'] ."</th>\n";
+         echo ' <th>'. $lang['TimetrackRef'] ."</th>\n";
+         echo ' <th>'. $lang['TimetrackModify'] ."</th>\n";
+         echo ' <th>'. $lang['TTfinish'] ."</th>\n";
          echo "</tr>\n";
        }
        $line = 0 ;
@@ -53,11 +53,11 @@
          $f->read_result($r,$a);
          $a++;
          echo $this->OverviewRowStart($line);
-         echo "<td>". $f->getLink() ."</td>";
-         echo "<td>". $f->t_start->getDateTime() ."</td>";
-         echo "<td>". $f->ref->getLink() ."</td>";
-         echo "<td>". makelink("timetrack_new.php?mode=2&id=". $f->id,$lang['Modify'],$lang['TimetrackModify']) ."</td>";
-         echo "<td>". makelink("timetrack_finish.php?id=". $f->id,$lang['TTfinish'],$lang['TTfinish']) ."</td>";
+         echo ' <td>'. $f->getLink() ."</td>";
+         echo ' <td>'. $f->t_start->getDateTime() ."</td>";
+         echo ' <td>'. $f->ref->getLink() ."</td>";
+         echo ' <td>'. makelink("timetrack_new.php?mode=2&id=". $f->id,$lang['Modify'],$lang['TimetrackModify']) ."</td>";
+         echo ' <td>'. makelink("timetrack_finish.php?id=". $f->id,$lang['TTfinish'],$lang['TTfinish']) ."</td>";
          echo $this->OverviewRowEnd($line++);
        }
        $r->free();
@@ -88,13 +88,13 @@
 
      echo " </td>\n";
      echo ' <td align="right">'. acl_link($this->obj) .'</td>';
-     echo "</tr>\n";
+     echo "\n</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfieldc($lang['TimetrackWorker'],1,"w");
+     echo $this->showfieldc($lang['TimetrackWorker'],1,'w');
      echo " <td colspan=\"5\">\n";
      if ( $this->mode == 0 ) {
-       select_from_array_or_input($this->obj,"w",$this->obj->worker,0);
+       select_from_array_or_input($this->obj,'w',$this->obj->worker,0);
      } else {
        echo $this->obj->worker->getLink();
        $this->addHidden("wid",$this->obj->worker->id);
@@ -105,7 +105,7 @@
      if ( $this->obj->t_start->notime != 0 ) {
        echo "<tr>\n";
        echo $this->showfieldc($lang['TaskVolumeDone'],1,"volume");
-       echo " <td><input size=\"10\" maxlength=\"10\" id=\"volume\" name=\"volume\" value=\"". number_format($this->obj->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\" />". $lang['hours'] ."</td>\n";
+       echo ' <td><input size="10" maxlength="10" id="volume" name="volume" value="'. number_format($this->obj->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) .'" />'. $lang['hours'] ."</td>\n";
 	   # added by J. baten to facilitate travel distance
 
        echo $this->showfieldc($lang['Distance'],0,"distance");
@@ -120,16 +120,16 @@
        echo "<tr>\n";
        echo $this->showfieldc($lang['AppStart'],1,"start_d");
        echo " <td colspan=\"2\">\n";
-       $this->obj->t_start->EnterDateTime("start",1);
+       $this->obj->t_start->EnterDateTime('start',1);
        echo " </td>\n";
        echo $this->showfieldc($lang['AppEnd'],0,"end_d");
        echo " <td colspan=\"2\">\n";
-       $this->obj->t_end->EnterDateTime("end",1);
+       $this->obj->t_end->EnterDateTime('end',1);
        echo " </td>\n";
        echo "</tr>\n";
      }
 
-     if ($this->obj->ref->getType() == "task") {
+     if ($this->obj->ref->getType() == 'task') {
        if( $this->obj->ref->volume_todo == -1 ) {
          $volume_todo = $this->obj->ref->volume - $this->obj->ref->volume_done;
        } else {
@@ -137,11 +137,11 @@
        }
        echo "<tr>\n";
        echo $this->showfieldc($lang['TaskVolumeTodo'],0,"volume_todo");
-       echo " <td><input size=\"10\" maxlength=\"10\" name=\"volume_todo\" />". $lang['hours'] ."</td>\n";
+       echo ' <td><input size="10" maxlength="10" name="volume_todo" />'. $lang['hours'] ."</td>\n";
 
-       echo "<td colspan=\"4\"> <i>". $lang['TaskVolumeTodo'] .": ". $volume_todo ." ". $lang['hours'] ."</i></td>";
+       echo ' <td colspan="4"><i>'. $lang['TaskVolumeTodo'] .': '. $volume_todo .' '. $lang['hours'] .'</i></td>';
 
-       echo "</tr>";
+       echo "\n</tr>\n";
      }
 
      if (!isset($this->obj->ratelist) || (count($this->obj->ratelist) == 0) ) {

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

Modified Files:
      Tag: BRANCH-2-0
	hu.p3 
Log Message:
Hungarian language update


Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- hu.p3	6 Oct 2004 15:47:35 -0000	1.2.2.2
+++ hu.p3	18 Jun 2005 11:12:05 -0000	1.2.2.3
@@ -11,7 +11,6 @@
 #
 # Hungarian Texts for this module
 #
-
 # Bugs
 $lang['Bug']             = "Hiba";
 $lang['Bugs']            = "hibák";
@@ -34,6 +33,8 @@
 $lang['BugCreate']       = "Hiba létrehozása";
 $lang['BugCreateInfo']   = "Hiba létrehozása %s számára";
 $lang['BugDeleteI']      = "%s hiba törlése";
+$lang['BugStates'] = array();
+$lang['BugClasses'] = array();
 $lang['BugStates'][1]    = "NYITOTT";
 $lang['BugStates'][2]    = "FELDOLGOZÁS ALATT";
 $lang['BugStates'][3]    = "MEGOLDVA";
@@ -73,4 +74,6 @@
 
 $lang['perm'][usebugtracking]    = "hibakezelõ használata";
 $lang['bug'] = &$lang['Bug'];
+
+$lang['menu']['bug'] = "Hibák";
 ?>

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

Modified Files:
      Tag: BRANCH-2-0
	hu.p3 
Log Message:
Hungarian language update


Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/hu.p3,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- hu.p3	14 Apr 2004 17:39:23 -0000	1.4.2.1
+++ hu.p3	18 Jun 2005 11:09:26 -0000	1.4.2.2
@@ -21,6 +21,5 @@
 $lang['perm'][useurl]            = "URL-adatbázis használata";
 $lang['url'] = &$lang['URL'];
 
-### Local Variables: ***
-### End: ***
-?>
\ No newline at end of file
+$lang['menu']['url'] = 'URL';
+?>

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

Modified Files:
      Tag: BRANCH-2-0
	hu.p3 
Log Message:
Hungarian language update


Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/hu.p3,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- hu.p3	14 Apr 2004 17:39:19 -0000	1.3.2.1
+++ hu.p3	18 Jun 2005 10:47:09 -0000	1.3.2.2
@@ -8,6 +8,7 @@
 # using the same format like here
 # =======================================================
 
+# Filehandling
 $lang['File']            = "Dokumentum";
 $lang['Files']           = "Dokumentumok";
 $lang['FileDetail']      = "Dokumentum tulajdonságai";
@@ -21,6 +22,7 @@
 $lang['FileNameDoc']     = "Dokumentum neve";
 $lang['FileName']        = "eredeti név";
 $lang['FileSize']        = "Méret";
+$lang['FileSizeBytes']   = "byte";
 $lang['FileType']        = "Típus";
 $lang['FileAuthor']      = "Szerzõ";
 $lang['FileMore']        = "További infó";
@@ -48,11 +50,11 @@
 $lang['FileLockedBy']    = "A dokumentumot %s zárolta";
 $lang['FileUnlockedBy']  = "A dokumentum zárolását %s feloldotta";
 $lang['FileChanged']     = "%s megváltozott %s-ról %s-ra";
+$lang['FileDelSuccess']  = "%s fájl törölve";
 $lang['File_Err001']     = "A(z) %s átmeneti fájl hiányzik. Talán túl nagy";
 
 $lang['perm'][usedocmanagement]  = "dokumentumkezelés használata";
-$lang['file']  = &$lang['File']
+$lang['file']  = &$lang['File'];
 
-### Local Variables: ***
-### End: ***
-?>
\ No newline at end of file
+$lang['menu']['file'] = "Fájlok";
+?>

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25345

Modified Files:
      Tag: BRANCH-2-0
	en.p3 hu.p3 
Log Message:
Hungarian language update


Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.12
retrieving revision 1.47.2.13
diff -u -r1.47.2.12 -r1.47.2.13
--- en.p3	27 May 2005 15:34:29 -0000	1.47.2.12
+++ en.p3	18 Jun 2005 09:45:10 -0000	1.47.2.13
@@ -110,6 +110,7 @@
 $lang['lang']['nl']      = "dutch";
 $lang['lang']['sv']      = "swedish";
 $lang['lang']['el']      = "greek";
+$lang['lang']['hu']      = "hungarian";
 
 # Common
 $lang['ChangesOk']       = "Changes OK ?";

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -u -r1.36.2.3 -r1.36.2.4
--- hu.p3	6 Oct 2004 15:50:36 -0000	1.36.2.3
+++ hu.p3	18 Jun 2005 09:45:11 -0000	1.36.2.4
@@ -24,6 +24,9 @@
 $lang['Welcome_1']       = "Üdvözlet, %s";
 $lang['Welcome_2']       = "Utolsó bejelentkezés: %s %s IP-címrõl";
 $lang['Password']        = "Jelszó";
+$lang['OldPassword']     = "Régi jelszó";
+$lang['NewPassword']     = "Új jelszó";
+$lang['ConfirmPassword'] = "Jelszó megerõsítése";
 $lang['Username']        = "Felhasználónév";
 $lang['MOTD']            = "A mai nap üzenete";
 $lang['Login']           = "Bejelentkezés";
@@ -161,6 +164,7 @@
 $lang['ActionNil']       = "semmit sem módosítani";
 $lang['Reference']       = "Hivatkozás";
 $lang['pageof']          = "%s/%s oldal";
+$lang['legend']          = "Jelmagyarázat";
 
 # Appointments
 $lang['Appointment']     = "Idõpont";
@@ -344,6 +348,9 @@
 $lang['ProdStatsTitle']  = "Termék/projekt statisztika";
 $lang['ProdFields']      = "Mezõk";
 $lang['ProdRoleAddT']    = "Egy szerep hozzáadása %s-ban";
+$lang['SubProject']      = "Alprojekt";
+$lang['SubProjects']     = "Alprojektek";
+$lang['ProdSubNew']      = "Új alprojekt";
 
 # Mail
 $lang['MailboxEmail']    = "E-mail";
@@ -403,6 +410,7 @@
 $lang['TaskModify']      = "%s feladat módosítása";
 $lang['TaskOverview']    = "Feladatok áttekintése";
 $lang['TaskOverviewInfo']= "%s feladatainak áttekintése";
+$lang['TaskSummary']     = "Következõ összegzése :";
 $lang['TaskName']        = "Név";
 $lang['TaskState']       = "Állapot";
 $lang['TaskDesc']        = "Feladatok leírása";
@@ -411,6 +419,7 @@
 $lang['TaskVolumeDone']  = "Elvégzett munkamennyiség";
 $lang['TaskVolumeTodo']  = "Elvégzendõ munkamennyiség";
 $lang['TaskVolumeTodoC'] = "Elvégzendõ munkamennyiség (automatikusan)";
+$lang['TaskVolumeLabel'] = "Elvégzett / elvégzendõ / tervezett munkamennyiség";
 $lang['TaskSubTask']     = "Alfeladatai:";
 $lang['hours']           = "óra";
 $lang['TaskCreation']    = "Létrehozta %s %s-kor.";
@@ -439,6 +448,8 @@
 $lang['SearchForTask']     = "Feladat keresése";
 $lang['SearchForTaskExt']  = "Feladat bõvített keresése";
 $lang['TaskBetween']       = "Idõben közte";
+$lang['TaskLogical']       = "Logikai feladat";
+$lang['TaskMilestone']     = "Mérföldkõ";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Gantt-Diagram megtekintése";
@@ -724,6 +735,13 @@
 $lang['perm'][useteams]          = "csapatok használata";
 $lang['FeatureOff']              = "ez a funkció globálisan tiltott";
 
+# Menu category entries
+$lang['menu']['module']    = 'Modulok';
+$lang['menu']['task']      = 'Feladat';
+$lang['menu']['timetrack'] = 'Ráfordítás';
+$lang['menu']['obj']       = 'Ezen objektum';
+
+
 # Error Messages
 $lang['Err0001']         = "Az ön számára nem engedélyezett a %s használata: %s";
 $lang['Err0002']         = "A kezdõ idõpont a befejezési idõpont utánra van megadva!";
@@ -768,6 +786,7 @@
 $lang['Err0052']         = "Meg kell adnia egy osztályzást";
 $lang['Err0053']         = "Nem törölheti a saját felhasználó-bejegyzését";
 $lang['Err0054']         = "Nem hozhat létre a megállapított jogosultságok miatt egy %s-t!";
+$lang['Err0055']         = "Az adatbázisban a jelszavak kódolatlanok. Ne használja a megszokott jelszavát!";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

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

Modified Files:
	address_new.php admin_show.php history.pinc history_show.php 
	logout.php user.pinc 
Log Message:
small changes

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- address_new.php	23 Apr 2005 13:18:18 -0000	1.71
+++ address_new.php	13 Jun 2005 19:20:15 -0000	1.72
@@ -145,6 +145,10 @@
        # References to modules
        module_addforms($this->user,$this->obj,4);
      }
+     #
+     # Edit additional custom fields
+     #
+     edit_custom_fields($this,$this->obj->gettype(),$this->obj,4);
 
    }
    /**

Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- admin_show.php	3 Jun 2005 19:32:53 -0000	1.80
+++ admin_show.php	13 Jun 2005 19:20:16 -0000	1.81
@@ -252,21 +252,21 @@
          continue;
        }
        echo $this->OverviewRowStart($line);
-       echo "<td colspan=\"1\">". makelink("address_show.php?id=".$data['userid'],$data['username']) ."</td>\n";
-       echo "<td colspan=\"1\">". $data['path'] ."</td>\n";
-       echo "<td colspan=\"1\">". $data['server'] ."</td>\n";
-       echo "<td colspan=\"1\" align=\"right\">". ($ts - $data['lastseen']) ." seconds ago</td>\n";
+       echo ' <td colspan="1">'. makelink("address_show.php?id=".$data['userid'],$data['username']) ."</td>\n";
+       echo ' <td colspan="1">'. $data['path'] ."</td>\n";
+       echo ' <td colspan="1">'. $data['server'] ."</td>\n";
+       echo ' <td colspan="1" align="right">'. ($ts - $data['lastseen']) ." seconds ago</td>\n";
        $x1 =  $data['lasthost'];
        if (strstr($x1,".") && !strstr($x1," ")) {
          $x2 =  @gethostbyaddr($x1);
        } else {
          $x2=$x1;
        }
-       echo "<td colspan=\"1\">". $x1.($x2 != $x1 ? "<br />(".$x2.")":"") ."</td>\n";
-       echo "<td colspan=\"1\">". $data['client'] ."</td>\n";
+       echo ' <td colspan="1">'. $x1.($x2 != $x1 ? "<br />(".$x2.")":"") ."</td>\n";
+       echo ' <td colspan="1">'. $data['client'] ."&nbsp;</td>\n";
        $u= addUrlParameter($this->link2,"action=kill");
        $u= addUrlParameter($u,"mark=".$file);
-       echo "<td colspan=\"1\" align=\"center\">&nbsp;". makelink($u,"kill") ."</td>\n";
+       echo ' <td colspan="1" align="center">&nbsp;'. makelink($u,"kill") ."</td>\n";
        echo $this->OverviewRowEnd($line++);
 #       print_r ($data);
      }

Index: history.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- history.pinc	21 Feb 2004 17:24:56 -0000	1.45
+++ history.pinc	13 Jun 2005 19:20:16 -0000	1.46
@@ -1,6 +1,10 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ *  Copyright 1999 - 2005 by Gero Kohnert
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  *  CVS Info:  $Id$
  *  $Author$

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- history_show.php	9 Dec 2004 17:12:46 -0000	1.71
+++ history_show.php	13 Jun 2005 19:20:16 -0000	1.72
@@ -1,6 +1,10 @@
 <?php
 /**
- * Copyright 1999 - 2004 by Gero Kohnert
+ *  Copyright 1999 - 2005 by Gero Kohnert
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  * @modulegroup BASE
  * @module history_show
@@ -388,12 +392,14 @@
      }
      if ( ! isset($_GET['xf']) ) {
        $this->xf = "m_time";
+	   $_GET['xf'] = $this->xf;
      } else {
        $this->xf = $_GET['xf'];
        $this->link1 = addUrlParameter($this->link1,"xf=".$this->xf);       
      }
      if ( ! isset($_GET['xo']) ) {
-       $this->xo = 1;
+       $this->xo = 2;
+	   $_GET['xo'] = $this->xo;
      } else {
        $this->xo = $_GET['xo'];
        $this->link1 = addUrlParameter($this->link1,"xo=".$this->xo);       

Index: logout.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/logout.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- logout.php	17 Oct 2003 14:06:10 -0000	1.16
+++ logout.php	13 Jun 2005 19:20:17 -0000	1.17
@@ -1,6 +1,10 @@
 <?php
-/*
- * Copyright 1999/2000 by Gero Kohnert
+/**
+ *  Copyright 1999 - 2005 by Gero Kohnert
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  * CVS Info:  $Id$
  * $Author$

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- user.pinc	23 Apr 2005 13:18:21 -0000	1.148
+++ user.pinc	13 Jun 2005 19:20:17 -0000	1.149
@@ -912,14 +912,13 @@
    */
   function update($initial = false) {
 
-    if ( isset($_SERVER['REMOTE_ADDR']) ) {
-      $lh = $_SERVER['REMOTE_ADDR'];
-    } else {
-      $lh = "not set";
-    }
+    $lh = "not set";
     if ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ) {
       $lh =  $_SERVER['HTTP_X_FORWARDED_FOR'];
     }
+    if ( isset($_SERVER['REMOTE_ADDR']) ) {
+      $lh = $_SERVER['REMOTE_ADDR'];
+    }
     $this->setLastSeen(new DateTime());
     $this->setLastHost($lh);
 

Update of /cvsroot/tutos/tutos/php/auth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9624/auth

Modified Files:
	auth.pinc auth_db.pinc 
Log Message:
small changes

Index: auth.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/auth/auth.pinc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- auth.pinc	25 Mar 2005 20:38:47 -0000	1.10
+++ auth.pinc	13 Jun 2005 19:20:19 -0000	1.11
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  *  Copyright 1999 - 2005 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 

Index: auth_db.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/auth/auth_db.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- auth_db.pinc	17 Oct 2003 12:57:49 -0000	1.4
+++ auth_db.pinc	13 Jun 2005 19:20:20 -0000	1.5
@@ -1,6 +1,10 @@
 <?php
-/*
- * Copyright 1999 - 2003 by Gero Kohnert
+/**
+ *  Copyright 1999 - 2005 by Gero Kohnert
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  * CVS Info:  $Id$
  * $Author$
@@ -52,7 +56,7 @@
     $r = array();
     if ( ! $result ) {
       ReadLang($lang);
-      $r[0] = "No Result for ". $this->getuname() ." / ". $this->getpw();
+      $r[0] = 'No Result for "'. $this->getuname() .'"/"'. $this->getpw();
       $r[1] = $lang['Err0026'];
       return $r;
     }
@@ -60,7 +64,7 @@
     /* OK there is a user and a Password so lets check */
     if ( 1 != $result->numrows()) {
       ReadLang($lang);
-      $r[0] = "not unique ". $result->numrows() ." Result for ". $this->getuname() ." / ". $this->getpw() ." (". $_SERVER['REMOTE_ADDR'] .")";
+      $r[0] = 'not unique "'. $result->numrows() .'" Result for "'. $this->getuname() .'"/"'. $this->getpw() .'" ('. $_SERVER['REMOTE_ADDR'] .')';
       $r[1] = $lang['Err0027'];
       $result->free();
       return $r;

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9624/localization

Modified Files:
	it.p3 
Log Message:
small changes

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- it.p3	9 Jun 2005 14:07:03 -0000	1.56
+++ it.p3	13 Jun 2005 19:20:21 -0000	1.57
@@ -15,12 +15,12 @@
 #
 $lang['PleaseLogin']     = "Effettuate il login, prego";
 $lang['Welcome_1']       = "Welcome %s";
-$lang['Welcome_2']       = "last login was %s from %s";
+$lang['Welcome_2']       = "l'ultimo login il %s da %s";
 $lang['Password']        = "Password";
 $lang['Username']        = "Username";
 $lang['MOTD']            = "Messaggio del Giorno";
 $lang['Login']           = "Login";
-$lang['LostPassword']    = "lost password ?";
+$lang['LostPassword']    = "Dimenticato la password?";
 $lang['LoggedIn']        = "Siete entrati nel sistema. Scegliete l'operazione dal men&ugrave a sinistra.";
 $lang['ReadOnlyAppoint'] = "Appuntamento in sola lettura";
 $lang['StartDate']       = "Data di Inizio";

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

Modified Files:
	new_layout.pinc 
Log Message:
small changes

Index: new_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- new_layout.pinc	8 Jun 2005 14:32:03 -0000	1.57
+++ new_layout.pinc	13 Jun 2005 19:20:20 -0000	1.58
@@ -233,7 +233,7 @@
     global $tutos, $lang;
 
     $base =  addUrlParameter($base,"xf=".$oname,false);
-    $r = "<th nowrap=\"nowrap\" colspan=\"". $cols ."\">\n";
+    $r = '<th nowrap="nowrap" colspan="'. $cols ."\">\n";
     if ( $ "" ) {
       $r .= $link;
     } else {
@@ -244,13 +244,13 @@
         $r .= makelink($l ,$this->theme->getImage(up,'list'),sprintf($lang['OrderBy'], $link));
       }
       if ( isset ($_GET['xo']) && ($_GET['xf'] == $oname) ) {
-        $r .= "<b>". $link ."</b>";
+        $r .= '<b>'. $link .'</b>';
       } else {
         $r .= $link;
       }
       $l =  addUrlParameter($base,"xo=2",false);
       if ( isset ($_GET['xo']) && $_GET['xo'] == 2  &&  ($_GET['xf'] == $oname) ) {
-        $r .= "(". makelink($l ,$this->theme->getImage(down,'list'),sprintf($lang['RevOrderBy'],$link)) .")";
+        $r .= '('. makelink($l ,$this->theme->getImage(down,'list'),sprintf($lang['RevOrderBy'],$link)) .')';
       } else {
         $r .= makelink($l ,$this->theme->getImage(down,'list'),sprintf($lang['RevOrderBy'],$link));
       }

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

Modified Files:
      Tag: BRANCH-2-0
	task.pinc 
Log Message:
* DEBUG: ordering in task_overview seems good, at last


Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.130.2.34
retrieving revision 1.130.2.35
diff -u -r1.130.2.34 -r1.130.2.35
--- task.pinc	9 Jun 2005 17:38:39 -0000	1.130.2.34
+++ task.pinc	13 Jun 2005 13:09:47 -0000	1.130.2.35
@@ -1047,19 +1047,16 @@
 	 * - we do not break any filiation
 	 */
 	$i = -1;
-	$mark = $found = False;
+	$found = False;
 	$current_depth = $subtasks[$ptask][0]['depth'];
 
 	do {
 	  $i++;
 
-	  if( ! $mark )
-	    $mark = ( $sub_tmp[0]['s_start_ts']
-		      < $subtasks[$ptask][$i]['s_start_ts'] );
-	  
-	  $found = $mark
-	    && ( $subtasks[$ptask][$i]['depth'] <= $current_depth );
-
+	  // Only consider not nested task dates 
+	  if( $subtasks[$ptask][$i]['depth'] <= $current_depth )
+	    $found = ( $sub_tmp[0]['s_start_ts']
+		       < $subtasks[$ptask][$i]['s_start_ts'] );
 	}
 	while( (! $found) && ($i < count($subtasks[$ptask])) );
 	    

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

Modified Files:
	message_del.php message_overview.php 
Log Message:
fix

Index: message_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/message_del.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- message_del.php	24 Aug 2003 09:50:46 -0000	1.10
+++ message_del.php	12 Jun 2005 09:19:25 -0000	1.11
@@ -1,6 +1,10 @@
 <?php
 /**
- * Copyright 2001 Boris Wesslowski
+ *  Copyright 2001 Boris Wesslowski
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  * @modulegroup BASE
  * @module message_del
@@ -11,23 +15,24 @@
 
  check_user();
 
- $gotourl = "mytutos.php";
+ $gotourl = 'mytutos.php';
 
  if ( ! $current_user->isadmin() ) {
-   Header("Status: 302 Moved Temporarily");
-   Header("Location: ". getBaseUrl() . $gotourl);
+   Header('Status: 302 Moved Temporarily');
+   Header('Location: '. getBaseUrl() . $gotourl);
    return;
  }
 
- $gotourl = "admin_show.php";
-
- $msg = $dbconn->truncatetable("messages");
+ $gotourl = 'admin_show.php';
 
+ $dbconn->truncatetable("messages");
+ $msg = "Deleted old messages";
  $gotourl = addMessage($gotourl,$msg,true);
  $gotourl = addSessionKey($gotourl,true);
 
- Header("Status: 302 Moved Temporarily");
- Header("Location: ". getBaseUrl() . $gotourl);
+
+ Header('Status: 302 Moved Temporarily');
+ Header('Location: '. getBaseUrl() . $gotourl);
 
  $dbconn->Close();
  /*

Index: message_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/message_overview.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- message_overview.php	23 Dec 2002 10:01:35 -0000	1.18
+++ message_overview.php	12 Jun 2005 09:19:25 -0000	1.19
@@ -1,6 +1,10 @@
 <?php
 /**
- * Copyright 2001 Boris Wesslowski
+ *  Copyright 2001 Boris Wesslowski
+ *
+ *  This program is free software; you can redistribute it and/or modify it 
+ *  under the terms of the GNU General Public License as published by the   
+ *  Free Software Foundation; version 2 of the License.                     
  *
  * @modulegroup BASE
  * @module message_overview
@@ -10,7 +14,7 @@
  include_once 'permission.p3';
 
  check_user();
- loadmodules("message","overview");
+ loadmodules('message','overview');
  loadlayout();
 
  /**
@@ -54,8 +58,8 @@
 	 $line = 0;
      while ( ($a < $n) && ($a < $end) ) {
        echo $this->OverviewRowStart($line);
-       echo " <td>". $result->get($a, "ts") ."</td>\n";
-       echo " <td>". $result->get($a, "message") ."</td>\n";
+       echo " <td>". $result->get($a, 'ts') ."</td>\n";
+       echo " <td>". myentities($result->get($a, 'message')) ."</td>\n";
        echo $this->OverviewRowEnd($line++);
        $a++;
      }

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

Modified Files:
	db_mysql.pinc 
Log Message:
bugfix


Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- db_mysql.pinc	7 Jun 2005 21:33:39 -0000	1.26
+++ db_mysql.pinc	10 Jun 2005 12:13:12 -0000	1.27
@@ -490,6 +490,8 @@
    * handle reserved words in this database type
    */
   function colname($col) {
+    if ($col == "*") return $col;
+
     $d = false;
     if (ereg("^DISTINCT (.*)",$col,$regs)) {
       $col = $regs[1];

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

Modified Files:
	address.pinc address_ins.php address_overview.php 
	address_show.php address_tools.p3 
Log Message:
custom fields in addresses

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- address.pinc	25 Mar 2005 20:38:45 -0000	1.115
+++ address.pinc	10 Jun 2005 11:18:09 -0000	1.116
@@ -267,6 +267,7 @@
     $q->addFV("m_name",$this->m_name,"STRING",$table['address']['m_name'][size]);
     $q->addFV("l_name",$this->l_name,"STRING",$table['address']['l_name'][size]);
     $q->addFV("pic_id",$this->pic_id,"INT");
+    $this->save_custom_fields($q);
 
     if ( $this->id < 0 ) {
       $this->modified = array();

Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- address_ins.php	3 Apr 2005 18:31:52 -0000	1.54
+++ address_ins.php	10 Jun 2005 11:18:09 -0000	1.55
@@ -152,6 +152,10 @@
  }
 
 
+ #
+ # Parse additional custom fields
+ #
+ $msg .= parse_custom_fields($a->gettype(),$a);
  # other modules
  $msg .= module_parseforms($current_user,$a,$gotourl);
 

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- address_overview.php	3 Apr 2005 18:31:52 -0000	1.48
+++ address_overview.php	10 Jun 2005 11:18:09 -0000	1.49
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  *  Copyright 1999 - 2005 by Gero Kohnert
  *
  *  This program is free software; you can redistribute it and/or modify it 
@@ -20,7 +20,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("address","overview");
+ loadmodules('address','overview');
  loadlayout();
 
  /**

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- address_show.php	10 Jun 2005 10:09:56 -0000	1.98
+++ address_show.php	10 Jun 2005 11:18:09 -0000	1.99
@@ -114,6 +114,10 @@
      Show_LocFields($this->user,$lang['AdrLastName'],$this->obj,"l_name",0);
      Show_LocFields($this->user,$lang['AdrBirthday'],$this->obj,"birthday",0);
 
+     #
+     # Show additional custom fields
+     #
+	 show_custom_fields($this,$this->obj->gettype(),$this->obj,$cols);
      # References to modules
      show_module_infolists($this->user,$this->obj,$cols,$this->format);
      

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- address_tools.p3	21 May 2005 18:51:12 -0000	1.82
+++ address_tools.p3	10 Jun 2005 11:18:09 -0000	1.83
@@ -18,7 +18,7 @@
  Function Show_LocFields($user,$title,&$a,$name,$typ) {
    global $tutos,$lang,$current_user;
 
-   $line = "";
+   $line = '';
    echo "<tr>\n";
    echo $user->layout->showfield( ($title == "" ? "&nbsp;":$title));
 
@@ -31,10 +31,9 @@
      }
      $line = 0;
      if ( count($a->location) > 0 ) {
-       @reset($a->location);
-       while ( list ($j,$l) = @each ($a->location) ) {
-         echo " <td colspan=\"". $s ."\" valign=\"top\" class=\"line". (($line % 2)+1) ."\">&nbsp;\n";
+  	   foreach($a->location as $j => $l) {
          $line++;
+         echo ' <td colspan="'. $s .'" valign="top" class="line'. ($line % 2) ."\">&nbsp;\n";
          if ( $name == "email_1" ) {
            echo AsEmail($l->$name,$l->$name,$a->getFullname());
          } elseif ( $name == "email_2" ) {
@@ -76,12 +75,11 @@
        }
      }
      if ( $set == 0 ) {
-       echo " <td colspan=\"". $s ."\">&nbsp;</td>\n";
+       echo ' <td colspan="'. $s ."\">&nbsp;</td>\n";
      }
    } elseif ( $typ == 9 ) {
       if ( count($a->obj->location) > 0 ) {
-       	@reset($a->obj->location);
-        while ( list ($j,$l) = @each ($a->obj->location) ) {
+        foreach($a->location as $j => $l) {
           if ( $name == "ModifyDelete" ) {            
             echo $current_user->layout->showGuiIcons('<th colspan="'.$s.'" align="right">'. myentities($l->lname) .'&nbsp;'. $lang['Address'] .'&nbsp;&nbsp;','</th>',$l,$a->obj,array('mod','del'),false);
           }
@@ -98,21 +96,22 @@
        $s--;
      }
      if ( $name == "birthday" ) {
-       echo " <td colspan=\"". $s ."\">&nbsp;". $a->$name->getLinkDate() ."&nbsp;</td>\n";
+       echo ' <td colspan="'. $s .'">&nbsp;'. $a->$name->getLinkDate() ."&nbsp;</td>\n";
      } elseif ( $name == "title" ) {
-        echo " <td colspan=\"". $s ."\">&nbsp;". myentities($a->$name) ."&nbsp;</td>\n";
-        if ( class_exists('tutos_file') && ($a->pic_id > 1) && $current_user->feature_ok(usedocmanagement,PERM_SEE) ) {
-          $x = new tutos_file($a->dbconn);
-          $x->id = $a->pic_id;
-          echo " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">\n";
-          echo makelink($x->getUrl() ."&amp;format=show",
-              "<img alt=\"". $a->getFullName() ."\" height=\"100\" border=\"0\" src=\"". addSessionKey($x->getUrl()."&amp;format=show") ."\">",$a->getFullName());
-          echo "</td>\n";
-        } else {
-          echo " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">&nbsp;</td>\n";
-        }
+       echo ' <td colspan="'. $s .'">&nbsp;'. myentities($a->$name) ."&nbsp;</td>\n";
+       if ( class_exists('tutos_file') && ($a->pic_id > 1) && $current_user->feature_ok(usedocmanagement,PERM_SEE) ) {
+         $x = new tutos_file($a->dbconn);
+         $x->id = $a->pic_id;
+         echo " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">\n";
+         echo makelink($x->getUrl() ."&amp;format=show",
+             '<img alt="'. $a->getFullName() .'" height="100" border="0" src="'. addSessionKey($x->getUrl().'&amp;format=show') .'">',
+             $a->getFullName());
+         echo "</td>\n";
+       } else {
+         echo " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">&nbsp;</td>\n";
+       }
      } else {
-        echo " <td colspan=\"". $s ."\">&nbsp;". myentities($a->$name) ."&nbsp;</td>\n";
+       echo ' <td colspan="'. $s .'">&nbsp;'. myentities($a->$name) ."&nbsp;</td>\n";
      }
    }
    echo "</tr>\n";
@@ -201,75 +200,78 @@
    echo "<tr>\n";
 
    $needloc = 0;
-   $col = 0;
+   $layout->flds = 0;
    if ( $ashow['icon_before'] ) {
      echo "<th>&nbsp;</th>\n";
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['f_name'] ) {
      echo $layout->orderHeader("f_name",$lang['AdrFirstName'],$atool['link2']);
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['l_name'] ) {
      echo $layout->orderHeader("l_name",$lang['AdrLastName'],$atool['link2']);
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['birthday'] ) {
      echo $layout->orderHeader("birthday",$lang['AdrBirthday'],$atool['link2']);
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['location'] ) {
      echo "<th>". $lang['Location'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['desc1'] ) {
      echo "<th>". $lang['Description'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['email'] ) {
      echo "<th>". $lang['AdrEmail'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['phone'] ) {
      echo "<th>". $lang['Phone'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['fax'] ) {
      echo "<th>". $lang['AdrFax'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['street'] ) {
      echo "<th>". $lang['Street'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['city'] ) {
      echo "<th>". $lang['City'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['c_id'] ) {
      echo "<th>". $lang['Company'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['d_id'] ) {
      echo "<th>". $lang['Department'] ."</th>\n";
      $needloc++;
-     $col++;
+     $layout->flds++;
    }
    if ( $ashow['icon_after'] ) {
      echo "<th>&nbsp;</th>\n";
-     $col++;
+     $layout->flds++;
    }
+
+   echo show_custom_overview_headers($layout,'address');
+
    if ( ($tutos[massupdate] == 1) && !empty($target) ) {
      echo "  <th nowrap=\"nowrap\"><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\" /></th>\n";
-     $col++;
+     $layout->flds++;
    }
    echo "</tr>\n";
    echo "</thead>\n";
@@ -428,6 +430,8 @@
            # myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank.
            echo $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">","&nbsp;</td>\n",$address,$address,$current_user->get_preficons(2),false);
          }
+         echo show_custom_overview_data($layout,'address',$address);
+
          if ( ($row == 0) && ($tutos[massupdate] == 1) && !empty($target)) {
            echo " <td align=\"center\" rowspan=\"". $c ."\">\n";
            if ( $address->mod_ok() ) {
@@ -473,6 +477,9 @@
        if ( $ashow['icon_after'] ) {
          echo $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">","</td>\n",$address,$address,$current_user->get_preficons(2),false);
        }
+
+       echo show_custom_overview_data($layout,'address',$address);
+
        if ( ($tutos[massupdate] == 1) && !empty($target) ) {
          echo " <td align=\"center\">\n";
          if ( $address->mod_ok() ) {
@@ -488,10 +495,10 @@
      $a++;
    }
 
-   echo $layout->list_navigation($atool['link1'],$col,$atool['start'],$a,$n,'astart');
+   echo $layout->list_navigation($atool['link1'],$layout->flds,$atool['start'],$a,$n,'astart');
   
    if ( ($tutos[massupdate] == 1) && !empty($target) ) {
-     echo $layout->UpdateRowStart($col -2);
+     echo $layout->UpdateRowStart($layout->flds -2);
      echo sprintf($lang['withmarked'],$lang['Addresses']);
      echo "<select name=\"action\">\n";
      echo " <option value=\"-1\" selected=\"selected\">". $lang['ActionNil'] ."</option>\n";

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

Modified Files:
	table_custom_example.pinc 
Log Message:
custom fields in addresses

Index: table_custom_example.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/table_custom_example.pinc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- table_custom_example.pinc	8 Jun 2005 16:52:34 -0000	1.11
+++ table_custom_example.pinc	10 Jun 2005 11:18:10 -0000	1.12
@@ -195,5 +195,19 @@
 # Old entries that are no longer valid
 # index 11 and 2 are outdated
 $tutos['deprecated']['DOCSTATUS_'] = array(123);
+
 #
+#
+# Example for address
+#
+$table['address']['lastsale']   = array('custom'     => true,
+                                   type         => "VARCHAR",
+                                   size         => 4,
+                                   constraints  => "",
+                                   Desc         => "Year of last sale",
+                                   'lang'       => "Year of Last Sale",
+                                   'overview'   => true,                 # show in overview
+                                   'required'   => false
+                                  );
+
 ?>
\ No newline at end of file

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

Modified Files:
	address_show.php 
Log Message:
bugfix


Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- address_show.php	22 May 2005 14:23:32 -0000	1.97
+++ address_show.php	10 Jun 2005 10:09:56 -0000	1.98
@@ -286,7 +286,7 @@
          $this->addMenu($x);
        }
        if ( $this->obj->isUser()  &&  $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-         $x = array( url => "calendar.php?team=". $this->obj->id,
+         $x = array( url => "calendar.php?team[]=". $this->obj->id,
                      text => $lang['Calendar'],
                      info => sprintf($lang['ShowCal'], $this->obj->getFullName()),
                      category => array("app","module")