tutos-commits Mailing List for TUTOS

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

Modified Files:
      Tag: BRANCH-2-0
	fr.p3 
Log Message:
* Some more timetrack templates
* Bug not fixed with the new minical (year selection)


Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
diff -u -r1.40.2.3 -r1.40.2.4
--- fr.p3	12 May 2004 16:32:18 -0000	1.40.2.3
+++ fr.p3	29 Jun 2004 16:07:01 -0000	1.40.2.4
@@ -608,9 +608,9 @@
 $lang['TimetrackWorker']   = "Personne";
 $lang['TimetrackRef']      = "Référence";
 $lang['TimetrackDate']     = "Date";
-$lang['TimetrackSearch']   = "Rechercher dans journal";
-$lang['SearchForTT']       = "Rechercher journal";
-$lang['SearchForTTExt']    = "Recherche journal etendue";
+$lang['TimetrackSearch']   = "Rechercher dans le journal";
+$lang['SearchForTT']       = "Rechercher dans le journal";
+$lang['SearchForTTExt']    = "Recherche journal étendue";
 $lang['TimetrackBetween']  = "Entre";
 $lang['TimetrackBooked']   = "Enregistrement";
 $lang['TimetrackBookedI']  = "Enregistrement pour %s";

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

Modified Files:
      Tag: BRANCH-2-0
	address_show.php minical.php timetrack_new.php 
	timetrack_overview.php timetrack_select.php 
Log Message:
* Some more timetrack templates
* Bug not fixed with the new minical (year selection)


Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.85.2.3
retrieving revision 1.85.2.4
diff -u -r1.85.2.3 -r1.85.2.4
--- address_show.php	11 May 2004 13:43:43 -0000	1.85.2.3
+++ address_show.php	29 Jun 2004 16:06:52 -0000	1.85.2.4
@@ -228,15 +228,67 @@
     * navigation
     */
    Function navigate() {
-     # Menu      
+     // $this->menuPrint('address', True);
+     // $this->menuPrint('task', True);
+   }
+
+   /**
+    * prepare
+    */
+   Function prepare() {
+     global $msg,$lang,$g_hash;
+
+     $this->name = $lang['AddressDetail'];
+     $this->lif = -1;
+     $this->obj = new tutos_address($this->dbconn);
+     if ( isset($_GET['id']) ) {       
+       $this->obj->read($_GET['id']);
+     }
+     if ( isset($_GET['lid']) ) {
+       $this->lid = $_GET['lid'];
+       $q = "SELECT adr_id FROM ". $this->dbconn->prefix ."adrloc WHERE loc_id = ". $this->lid;
+       $r = $this->dbconn->Exec($q);
+       if ($r->numrows() == 1) {
+         $id = $r->get(0, "adr_id");
+         $this->obj->read($id);
+         if ( $this->obj->id < 0 ) {
+           $this->obj = new company($this->dbconn);
+           $this->obj->read($id);
+         }
+         if ( $this->obj->id < 0 ) {
+           $this->obj = new department($this->dbconn);
+           $this->obj->read($id);
+         }
+       }
+       $r->free();
+     }
+
+     if ( ! $this->obj->see_ok() ) {
+       $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
+       $this->stop = true;
+       $this->format = "html";
+     } else if ( $this->obj->id < 0 ) {
+       $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
+       $this->stop = true;
+       $this->format = "html";
+     } else {
+       $this->obj->read_locs_data();
+       $this->name = $lang['AddressDetail'].": ".myentities($this->obj->getFullName());
+     }
+
+
+     /**
+      * Menu      
+      */
      $x = tutos_address::getSelectLink($this->user,$lang['Search']);
      $x['category'][] = "obj";
      $x['image'] = 'addresses';
      // $this->addMenu($x);
 
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
-       $x = array('url'  => "address_new.php",
-                  'text' => $lang['NewEntry'],
+       $x = array('url'   => "address_new.php",
+                  'text'  => $lang['NewEntry'],
+		  'image' => 'new',
                   'info' => $lang['AdrCreateInfo'],
                   'category' => array("address","new","obj")
                  );
@@ -251,9 +303,10 @@
          } else {
            $url = "address_new.php?id=". $this->obj->id;
          }
-         $x = array('url'  => $url,
-                    'text' => $lang['Modify'],
-                    'info' => $lang['Modify'],
+         $x = array('url'   => $url,
+                    'text'  => $lang['Modify'],
+		    'image' => 'modify',
+                    'info'  => $lang['Modify'],
                     'category' => array("address","new","obj")
                    );
          $this->addMenu($x);
@@ -277,6 +330,17 @@
      }
 
      if ($this->obj->id > 0) {
+       if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
+         $x = array('url'   => "task_overview.php?id=".$this->obj->id,
+                    'text'  => $lang['TaskOverview'],
+		    'image' => 'task_overview',
+                    'info'  => sprintf($lang['TaskOverviewInfo'],
+				       $this->obj->getFullName()),
+                    'category' => array("task","module", "overview")
+                   );
+         $this->addMenu($x);
+       }
+
        if ( $this->user->feature_ok(usevcard,PERM_SEE) ) {
          $x = array('url'  => $this->obj->getUrl() ."&amp;format=vcard",
                     'text' => $lang['AdrGetVcard'],
@@ -295,15 +359,6 @@
          $this->addMenu($x);
        }
 
-       if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
-         $x = array('url'  => "task_overview.php?id=".$this->obj->id,
-                    'text' => $lang['TaskOverview'],
-                    'info' => sprintf($lang['TaskOverviewInfo'],
-				      $this->obj->getFullName()),
-                    'category' => array("task","module")
-                   );
-         $this->addMenu($x);
-       }
        if ( $this->user->feature_ok(usetaskmanagement, PERM_SEE) 
 	    && $this->user->feature_ok(usecalendar,PERM_SEE) ) {
 
@@ -328,54 +383,6 @@
      }
      add_module_addlinks($this, $this->obj);
 
-     // $this->menuPrint('module');
-   }
-
-   /**
-    * prepare
-    */
-   Function prepare() {
-     global $msg,$lang,$g_hash;
-
-     $this->name = $lang['AddressDetail'];
-     $this->lif = -1;
-     $this->obj = new tutos_address($this->dbconn);
-     if ( isset($_GET['id']) ) {       
-       $this->obj->read($_GET['id']);
-     }
-     if ( isset($_GET['lid']) ) {
-       $this->lid = $_GET['lid'];
-       $q = "SELECT adr_id FROM ". $this->dbconn->prefix ."adrloc WHERE loc_id = ". $this->lid;
-       $r = $this->dbconn->Exec($q);
-       if ($r->numrows() == 1) {
-         $id = $r->get(0, "adr_id");
-         $this->obj->read($id);
-         if ( $this->obj->id < 0 ) {
-           $this->obj = new company($this->dbconn);
-           $this->obj->read($id);
-         }
-         if ( $this->obj->id < 0 ) {
-           $this->obj = new department($this->dbconn);
-           $this->obj->read($id);
-         }
-       }
-       $r->free();
-     }
-
-     if ( ! $this->obj->see_ok() ) {
-       $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
-       $this->stop = true;
-       $this->format = "html";
-     } else if ( $this->obj->id < 0 ) {
-       $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
-       $this->stop = true;
-       $this->format = "html";
-     } else {
-       $this->obj->read_locs_data();
-       $this->name = $lang['AddressDetail'].": ".myentities($this->obj->getFullName());
-     }
-
-
      # add this page to the browsehistory of the users session
      // $this->addtohistory();
      web_StackStartLayoutObj($this);

Index: minical.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/minical.php,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- minical.php	24 Jun 2004 16:20:41 -0000	1.20.2.1
+++ minical.php	29 Jun 2004 16:07:00 -0000	1.20.2.2
@@ -158,7 +158,7 @@
 }
 
 $l = new minical($current_user);
-$l->PrintHeader("MiniCal");
+//$l->PrintHeader("MiniCal");
 $l->display($withmenu = False);
 
 

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
diff -u -r1.50.2.1 -r1.50.2.2
--- timetrack_new.php	14 Apr 2004 17:39:17 -0000	1.50.2.1
+++ timetrack_new.php	29 Jun 2004 16:07:00 -0000	1.50.2.2
@@ -11,10 +11,11 @@
  include_once 'timetrack.pinc';
  include_once 'task.pinc';
 
+ include_once 'layout/layout.pinc';
+
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("timetrack","new");
- loadlayout();
 
  /**
   * change/modify a timetrack entry
@@ -62,120 +63,88 @@
        }
      }
 
-     echo "<form name=\"ttadd\" action=\"timetrack_ins.php\" method=\"POST\">\n";
-     $this->addHidden("mode",$this->mode);
-     echo $this->DataTableStart();
-     echo "<tr><th colspan=\"4\">";
-     echo "&nbsp;";
-     echo "</th></tr>\n";
-
-     if ( $this->obj->id > 0 ) {
-       $this->addHidden("id",$this->obj->id);
-     }
-     echo "<tr>\n";
-     echo $this->showfield($lang['TimetrackRef']);
-     echo " <td colspan=\"2\">\n";
-     echo "<select id=\"lid\" name=\"pid\">\n";
-     foreach ($this->obj->plist as $i => $f) {
-       echo "<option value=\"". $i ."\"". ($i == $this->obj->ref->id ? " selected>* ":">") . $lang[$f->getType()] .": ". $f->getFullName() ."</option>\n";
-     }
-     echo "</select>\n";
-
-     echo " </td>\n";
-     echo " <td align=\"right\">". acl_link($this->obj) ."</td>";
-     echo "</tr>\n";
-     echo "<tr>\n";
-     echo $this->showfieldc($lang['TimetrackWorker'],1,"wfn");
-     echo " <td colspan=\"3\">\n";
-     if ( $this->mode == 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);
-     }
-     echo " </td>\n";
-     echo "</tr>\n";
+     /**
+      * Here begins the template stuff
+      *
+      * Note for the moment just one mode is implemented, other ways
+      * of displaying a timetrack are to be reviewed before to be
+      * re-implemented « as is » in the v2.
+      */
+
+     $this->assign('action', 'timetrack_ins.php');
+     $this->assign('mode', $mode);
+     $this->assign('id', $id);
+
+     $this->assign('hours', $lang['hours']);
+
+     $this->assign('ref',
+		   array('id'    => $this->obj->ref->id,
+			 'label' => $lang['TimetrackRef'],
+			 'value' => $this->obj->ref->getFullName(),
+			 'title' => $this->obj->ref->getFullName(),
+			 'link'  => $this->obj->ref->getUrl()));
+
+     $this->assign('acl_link', acl_link($this->obj));
+
+     $this->assign('worker',
+		   array('id'    => 'w',
+			 'name'  => "wfn",
+			 'label' => $lang['TimetrackWorker'],
+			 'value' => $this->obj->worker->getFullName(),
+			 'title' => $this->obj->worker->getFullName(),
+			 'link'  => $this->obj->worker->getUrl()));
+				   
+
+     $this->assign('volume_done',
+		   array('name'  => 'volume',
+			 'label' => $lang['TaskVolumeDone'],
+			 'value' => number_format($this->obj->volume, 2,
+						  $lang['DecPoint'],
+						  $lang['ThousandPoint'])));
+
+     $this->assign_date($lang['atDateTime'], "wd", $this->obj->wday);
+
+     $this->assign('currency',
+		   array('id'       => 'cph',
+			 'name'     => 'currency',
+			 'label'    => $lang['TTcph'],
+			 'value'    => number_format($this->obj->cph, 2,
+						     $lang['DecPoint'],
+						     $lang['ThousandPoint']),
+			 'options'  => $tutos[currencies],
+			 'currency' => $this->obj->currency));
+
+     $this->assign('state',
+		   array('id'      => 'id',
+			 'name'    => 'state',
+			 'label'   => $lang['TTState'],
+			 'value'   => $this->obj->state,
+			 'options' => $lang['TTStates']));
+
+     $this->assign('desc',
+		   array('name'  => 'desc',
+			 'label' => $lang['Description'],
+			 'value' => $this->obj->desc,
+			 'size'  => $table['timetrack']['description'][size]));
+
+     $this->assign('InputOk',   $lang['InputOk']);
+     $this->assign('ChangesOk', $lang['ChangesOk']);
+     $this->assign('Enter', $lang['Enter']);
+     $this->assign('Reset', $lang['Reset']);
 
-     if ( $this->obj->t_start->notime != 0 ) {
-       echo "<tr>\n";
-       echo $this->showfieldc($lang['TaskVolumeDone'],1,"volume");
-       echo " <td colspan=\"1\"><input size=\"10\" maxlength=\"10\" name=\"volume\" value=\"". number_format($this->obj->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) ."\">". $lang['hours'] ."</td>\n";
-       echo $this->showfieldc($lang['atDateTime'],1,"wd");
-       echo " <td>\n";
-       $this->obj->wday->EnterDate("wd",1);
-       echo " </td>\n";
-       echo "</tr>\n";
-     } else {
-       echo "<tr>\n";
-       echo $this->showfieldc($lang['AppStart'],1,"start");
-       echo " <td>\n";
-       $this->obj->t_start->EnterDateTime("start",1);
-       echo " </td>\n";
-       echo $this->showfieldc($lang['AppEnd'],0,"end");
-       echo " <td>\n";
-       $this->obj->t_end->EnterDateTime("end",1);
-       echo " </td>\n";
-       echo "</tr>\n";
-     }
-
-     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 {
-         $volume_todo = $this->obj->ref->volume_todo;
-       }
-       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 colspan=\"2\"> <i>". $lang['TaskVolumeTodo'] .": ". $volume_todo ." ". $lang['hours'] ."</i></td>";
-
-       echo "</tr>";
-     }
-
-     if (!isset($this->obj->ratelist) || (count($this->obj->ratelist) == 0) ) {
-       echo "<tr>\n";
-       echo $this->showfieldc($lang['TTcph'],0,"cph");
-       echo " <td colspan=\"1\"><input size=\"10\" maxlength=\"10\" name=\"cph\" value=\"". number_format($this->obj->cph,2,$lang['DecPoint'],$lang['ThousandPoint'])  ."\">\n";
-       Currency_Select("currency",$this->obj->currency);
-       echo "</td>\n";
-       echo $this->showfieldc($lang['TTState'],1,"state");
-       echo " <td><select name=\"state\">\n";
-       foreach($lang['TTStates'] as $s => $x) {
-         echo "   <option value=\"". $s ."\"". ($this->obj->state == $s ? " selected" : "") .">". $lang['TTStates'][$s] ."</option>\n";
-       }
-       echo "</select></td>\n";
-       echo "</tr>\n";
-     }
+     $this->assign('focus', "ttadd.name");
 
-     # References to modules
-     module_addforms($this->user,$this->obj,4);
+     $this->assign('FldsRequired', $lang['FldsRequired']);
 
-     echo "<tr>\n";
-     echo $this->showfield($lang['Description'],1,"desc");
-     echo $this->textarea("desc",3,$table['timetrack']['description'][size], $this->obj->desc );
-     echo "</tr>\n";
-
-     echo "<tr>\n";
-     if ( $this->obj->id != -1 ) {
-       submit_reset(0,1,1,1,1,0);
-     } else {
-       submit_reset(0,-1,1,1,1,0);
-     }
-     echo "</tr>\n";
-
-     echo $this->DataTableEnd();
-     hiddenFormElements();
-     echo $this->getHidden();
-     echo "</form>\n";
-     echo $this->setfocus("ttadd.desc");
-     echo $lang['FldsRequired'] ."\n";
+     $this->template('timetrack_new');
    }
+
    /**
-    * naviagte
+    * navigate
     */
    Function navigate() {
    }
+
    /**
     * prepare
     */

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.81
retrieving revision 1.81.2.1
diff -u -r1.81 -r1.81.2.1
--- timetrack_overview.php	26 Jan 2004 09:01:04 -0000	1.81
+++ timetrack_overview.php	29 Jun 2004 16:07:00 -0000	1.81.2.1
@@ -15,10 +15,11 @@
  include_once 'permission.p3';
  include_once 'timetrack.pinc';
 
+ include_once 'layout/layout.pinc';
+
  /* Check if user is allowed to use it */
  check_user();
  loadmodules('timetrack','overview');
- loadlayout();
 
  /**
   * show a overview of timetracks
@@ -30,7 +31,6 @@
    Function info() {
      global $lang,$tutos;
 
-
      $n = $this->result->numrows();
      
      if ( $this->format == "xml" ) {
@@ -48,8 +48,9 @@
          }
          echo "</timetrack_set>\n";
        }
-	   return;		
-     } else if ($this->format == "excel") {
+       return;		
+     }
+     else if ($this->format == "excel") {
        include_once 'excel/Worksheet.php';
        include_once 'excel/Workbook.php';
 
@@ -113,37 +114,30 @@
        fclose($fh);
        @unlink($tmpname);
        return;		
-     } else if ($this->format == "stat") {
+     }
+     else if ($this->format == "stat") {
        $this->statinfo();
        $this->result->free();
          return;
-     } else if ($this->format == "csv") {
+     }
+     else if ($this->format == "csv") {
        $this->exportinfo();
        $this->result->free();
        return;
      }
 
-     $cols = 9;
-     echo $this->actionformStart("timetrack_overview.php");
-     echo $this->OverviewTableStart();
-     echo "<thead>\n";
-     echo "<tr>\n";
-     echo $this->orderHeader("","#",$this->link2);
-     echo $this->orderHeader("",$lang['TimetrackRef'],$this->link2);
-     echo $this->orderHeader("",$lang['TimetrackWorker'],$this->link2);
-     echo $this->orderHeader("volume",$lang['TaskVolumeDone'],$this->link2);
-     echo $this->orderHeader("volume_todo",$lang['TaskVolumeTodo'],$this->link2);
-     echo $this->orderHeader("vtime",$lang['TimetrackDate'],$this->link2);
-     echo $this->orderHeader("description",$lang['Description'],$this->link2); 
-     echo $this->orderHeader("state",$lang['TTState'],$this->link2);
-     echo $this->orderHeader("",$lang['ProdCost'],$this->link2);
-     $cols += show_module_overviewheader($this->user,"timetrack");
-     if ( $tutos[massupdate] == 1 ) {
-       $cols++;
-       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
-     }
-     echo "</tr>\n";
-     echo "</thead>\n";
+     $this->assign('action', "timetrack_overview.php");
+
+     $this->assign('TimetrackRef',    $lang['TimetrackRef']);
+     $this->assign('TimetrackWorker', $lang['TimetrackWorker']);
+     $this->assign('TaskVolumeDone',  $lang['TaskVolumeDone']);
+     $this->assign('TaskVolumeTodo',  $lang['TaskVolumeTodo']);
+     $this->assign('TimetrackDate',   $lang['TimetrackDate']);
+     $this->assign('Description',     $lang['Description']);
+     $this->assign('TTState',         $lang['TTState']);
+     $this->assign('ProdCost',        $lang['ProdCost']);
+
+     // $cols = 9;
   
      $sum['v'] = 0.0;
      $sum[''] = 0.0;
@@ -156,79 +150,77 @@
        $a = $n - $tutos[maxshow];
        $end = $n;
        $this->start = $a;
-     } else {
+     }
+     else {
        $a = $this->start;
        $end = $this->start + $tutos[maxshow];
      }
   
-     # Fill the sum
+     // Fill the sum
      $x = 0;
      while ( $x < $a ) {
        $sum['v'] += $this->result->get($x, "volume");
-       $sum[$this->result->get($x, "currency")] += ( $this->result->get($x, "cph") * $this->result->get($x, "volume") );
+       $sum[$this->result->get($x, "currency")] +=
+	  ( $this->result->get($x, "cph") * $this->result->get($x, "volume") );
        $x++;
      }
+
+     $tts = array();
   
      $line = 0;
      while ( ($a < $n) && ($a < $end) ) {
        $tt = new timetrack($this->dbconn);
        $tt->read_result($this->result,$a);
-       echo $this->OverviewRowStart($line);
+
+       $cur_tt = array();
+
        if ( $tt->mod_ok() ) {
-         echo " <td align=\"right\">". makelink($tt->getModURL() ,sprintf("%03d",($a + 1)),$lang['TimetrackModify']) ."</td>\n";
-       } else {
-         echo " <td align=\"right\">". sprintf("%03d",($a + 1)) ."</td>\n";
-       }
-       if ( $tt->ref ==  -1 ) {
-         echo " <td><i>". makelink("history_show.php?id=". $tt->link_id ,$lang['HistoryDeleted']) ."</i></td>\n";
-       } else {
-         echo " <td>". $tt->ref->getLink() ."</td>\n";
+	 $cur_tt['id'] = array('name'  => sprintf("%03d",($a + 1)),
+			      'link'  => $tt->getModURL(),
+			      'title' => $lang['TimetrackModify']);
        }
-       if ( $tt->worker->id ==  -1 ) {
-         echo " <td><i>". makelink("history_show.php?id=". $tt->wid ,$lang['HistoryDeleted']) ."</i></td>\n";
-       } else {
-         echo " <td>". $tt->worker->getLink() ."</td>\n";
-       }
-       echo " <td align=\"right\">". hour_format($tt->volume) ."</td>\n";
-       if ($tt->volume_todo != 0) {
-         echo " <td align=\"right\">". hour_format($tt->volume_todo) ."</td>\n";
-       } else {
-         echo " <td align=\"right\">&nbsp;</td>\n";
+       else {
+	 $cur_tt['id'] = sprintf("%03d",($a + 1));
        }
+
+       $cur_tt['name'] = array('name'  => $tt->ref->getFullName(),
+			       'link'  => $tt->ref->getUrl(),
+			       'title' => $tt->ref->getFullName());
+
+       $cur_tt['worker'] = array('name'  => $tt->worker->getFullName(),
+				  'link'  => $tt->worker->getUrl(),
+				  'title' => $tt->worker->getFullName());
+
+       $cur_tt['volume_done'] = hour_format($tt->volume);
+       $cur_tt['volume_todo'] = hour_format($tt->volume_todo);
+
        $sum['v'] += $tt->volume;
        $sum[$tt->currency] += ( $tt->cph * $tt->volume );
-       echo " <td align=\"right\" nowrap>\n";
-       echo $tt->wday->getDate();
-       if ( $tt->t_start->notime != 1) {
-         echo "<br>". $tt->t_start->getDateTimeShort() ." - ". $tt->t_end->getDateTimeShort() ."</td>\n";
-       } else {
-         echo "&nbsp;</td>\n";
-       }
-       echo " <td>". myentities($tt->desc) ."&nbsp;</td>\n";
-       echo " <td>". $lang['TTStates'][$tt->state] ."</td>\n";
 
-       $x= array($tt->cph * $tt->volume,$tt->currency);
-       echo " <td align=\"right\">". handle('money',$x,number_format($tt->cph * $tt->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". myentities($tt->currency)) ."</td>\n";
-
-       show_module_overviewdata($this->user,$tt);
-       if ( $tutos[massupdate] == 1 ) {
-         echo " <td align=\"center\">\n";
-         if ( $tt->mod_ok() ) {
-           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $tt->id ."\">\n";
-         } else {
-           echo "-\n";
-         }
-         echo "</td>\n";
-       }
-  
-       echo $this->OverviewRowEnd($line++);
+       $cur_tt['date']  = $tt->wday->getDate();
+       $cur_tt['desc']  = myentities($tt->desc);
+       $cur_tt['state'] = $lang['TTStates'][$tt->state];
+
+       $x= array($tt->cph * $tt->volume, $tt->currency);
+       $cur_tt['currency'] =
+	  array('val' => handle('money', $x,
+				  number_format($tt->cph * $tt->volume,2,
+						$lang['DecPoint'],
+						$lang['ThousandPoint'])),
+		'cur' => myentities($tt->currency));
+						     
        $a++;
        unset($tt);
+
+       $tts[] = $cur_tt;
      }
-  
+     $this->assign('tts', $tts);
+     // $this->debug($tts[0]);
+
+     /*
      echo $this->list_navigation($this->link1,$cols ,$this->start,$a,$n);
   
-     # Fill the sum
+     // Fill the sum
      while ( $a < $n ) {
        $sum['v'] += $this->result->get($a, "volume");
        $sum[$this->result->get($a, "currency")] += ( $this->result->get($a, "cph") * $this->result->get($a, "volume") );
@@ -270,7 +262,10 @@
   
      echo $this->DataTableEnd();
      echo $this->actionformEnd("timetrack_overview.php");
+     */
      $this->result->free();
+
+     $this->template('timetrack_overview');
    }
 
    /**
@@ -470,7 +465,7 @@
        $q .= $pre . "id =" . $_GET['id'];
        $pre = " AND ";
        $this->link1 = addUrlParameter($this->link1,"id=".$_GET['id']);
-       $this->addHidden("id", $_GET['id']);
+       // $this->addHidden("id", $_GET['id']);
      }
      if ( isset($_GET['link_id']) ) {
        if (false == is_numeric($_GET['link_id'])) {
@@ -486,22 +481,22 @@
          $sep = ",";
        } else if ( $_GET['show'] == "Tasks" ) {
          $this->link1 = addUrlParameter($this->link1,"show=". $_GET['show']);
-         $this->addHidden("show",$_GET['show']);
+         // $this->addHidden("show",$_GET['show']);
          add_task_ids($ref,$q,$sep);
          $sep = ",";
        } else if ( $_GET['show'] == "Bugs" ) {
          $this->link1 = addUrlParameter($this->link1,"show=". $_GET['show']);
-         $this->addHidden("show",$_GET['show']);
+         // $this->addHidden("show",$_GET['show']);
          add_bugs_ids($ref,$q,$sep);
          $sep = ",";
        } else if ( $_GET['show'] == "Installations" ) {
          $this->link1 = addUrlParameter($this->link1,"show=". $_GET['show']);
-         $this->addHidden("show",$_GET['show']);
+         // $this->addHidden("show",$_GET['show']);
          add_inst_ids($ref,$q,$sep);
          $sep = ",";
        } else if ( $_GET['show'] == "all" ) {
          $this->link1 = addUrlParameter($this->link1,"show=". $_GET['show']);
-         $this->addHidden("show",$_GET['show']);
+         // $this->addHidden("show",$_GET['show']);
          $q .= $sep . $_GET['link_id'];
          $sep = ",";
          add_task_ids($ref,$q,$sep);
@@ -511,14 +506,14 @@
        $q .= ")";
        $pre = " AND ";
        $this->link1 = addUrlParameter($this->link1,"link_id=". $_GET['link_id']);
-       $this->addHidden("link_id",$_GET['link_id']);
+       // $this->addHidden("link_id",$_GET['link_id']);
      }
      # Search in description
      if ( isset($_GET['name']) && ! empty($_GET['name']) ) {
        $q .= $pre . $this->dbconn->Like("description",$_GET['name']);
        $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
        $pre = " AND ";
-       $this->addHidden("name",$_GET['name']);
+       // $this->addHidden("name",$_GET['name']);
      }
      # Start Date for search
      $from = new DateTime(0);
@@ -534,7 +529,7 @@
        $q .= $pre ."( vtime >= ". $this->dbconn->Date($from) .")";
        $pre = "AND ";
        $this->link1 = addUrlParameter($this->link1,"fd=".$from->getYYYYMMDD());
-       $this->addHidden("fd",$from->getYYYYMMDD());
+       // $this->addHidden("fd",$from->getYYYYMMDD());
      }
      # End Date for search
      $to = new DateTime(0);
@@ -550,7 +545,7 @@
        $q .= $pre ."( vtime <= ". $this->dbconn->Date($to) .")";
        $pre = " AND ";
        $this->link1 = addUrlParameter($this->link1,"td=".$to->getYYYYMMDD());
-       $this->addHidden("td",$to->getYYYYMMDD());
+       // $this->addHidden("td",$to->getYYYYMMDD());
      }
      # Search for state
      if ( isset($_GET['state']) && ($_GET['state'] != -2) ) {
@@ -563,7 +558,7 @@
        $this->link1 = addUrlParameter($this->link1,"state=".$_GET['state']);
 #       session_register('ttsearchstate');
        $_SESSION['ttsearchstate'] = $_GET['state'];
-       $this->addHidden("state",$_GET['state']);
+       // $this->addHidden("state",$_GET['state']);
      }
      # Search for worker
      if ( isset($_GET['worker']) ) {
@@ -588,7 +583,7 @@
        }
        $pre = " AND ";
        $this->link1 = addUrlParameter($this->link1,"worker=".$_GET['worker']);
-       $this->addHidden("worker",$_GET['worker']);
+	   // $this->addHidden("worker",$_GET['worker']);
      }
 
      check_dbacl( $q, $this->user->id);

Index: timetrack_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_select.php,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -r1.20.2.1 -r1.20.2.2
--- timetrack_select.php	24 Jun 2004 16:20:41 -0000	1.20.2.1
+++ timetrack_select.php	29 Jun 2004 16:07:01 -0000	1.20.2.2
@@ -26,7 +26,7 @@
    Function info() {
      global $lang , $tutos;
 
-     $this->assign('action', "template_overview.php");
+     $this->assign('action', "timetrack_overview.php");
      $this->assign('ext', $this->ext);
 
      // if( $this->ext == 0 ) {

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

Modified Files:
      Tag: BRANCH-2-0
	product_overview.tpl 
Added Files:
      Tag: BRANCH-2-0
	timetrack_new.tpl timetrack_overview.tpl 
Log Message:
* Some more timetrack templates
* Bug not fixed with the new minical (year selection)


--- NEW FILE: timetrack_new.tpl ---
{* Timetrack Editing *}
{* $Id: timetrack_new.tpl,v 1.1.2.1 2004/06/29 16:07:02 tapoueh Exp $ *}

<!-- timetrack_new start -->

<form name="ttadd" action="{$action}" method="POST">

<input id="mode" type="hidden" name="mode" value="{$mode}">
<input id="id" type="hidden" name="id" value="{$id}">
<input id="lid" type="hidden" name="lid" value="{$lid}">

<table class="single">
<tr><th colspan="4">&nbsp;</th></tr>

<tr>
<td class="desc" valign="top">{$ref.label}</td>
<td colspan="2">
 <a href="{$ref.link}" title="{$ref.title}">{$ref.value}</a>
</td>
<td align="right">{$acl_link}</td>
</tr>

<tr>
<td class="desc">
 <label for="{$worker.name}">{$worker.label}</label>
 <font color="red">(*)</font>
</td>
<td colspan="3">
 <input id="{$worker.id}" size="20" maxlength="40"
        name="{$worker.name}" value="{$worker.value}">
</td>
</tr>

<tr>
<td class="desc">
  <label for="{volume_done.name}">{$volume_done.label}</label>
  <font color="red">(*)</font>
</td>
<td>
  <input size="10" maxlength="10" 
         name="{$volume_done.name}" value="{$volume_done.value}">{$hours}
</td>

<td class="desc" >
  <label for="{$wd_d.name}">{$wd_d.label}</label>
  <font color="red">(*)</font>
</td>
<td colspan="4">
{html_options name=$wd_d.name
      values=$wd_d.options output=$wd_d.options selected=$wd_d.selected}
<b>.</b>&nbsp;
{html_options name=$wd_m.name
      values=$wd_m.options output=$wd_m.options selected=$wd_m.selected}
<b>.</b>&nbsp;
{html_options name=$wd_y.name
      values=$wd_y.options output=$wd_y.options selected=$wd_y.selected}

<a href="JavaScript:
var d = document.forms[0];
mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
mywindow.location.href = '{$base}/php/minical.php?f={$wd_d.f}&amp;n=0&amp;d={$wd_d.selected}&amp;m={$wd_m.selected}&amp;y={$wd_y.selected}&amp;SID';
mywindow.focus();" title="MiniCal">MiniCal</a>

</td>
</tr>

<tr>
<td class="desc">
  <label for="{$currency.id}">{$currency.label}</label>
</td>
<td>
 <input size="10" maxlength="10"
        name="{$currency.id}" value="{$currency.value}">
 {html_options name=$currency.name values=$currency.options
             output=$currency.options selected=$currency.selected}
</td>

<td class="desc">
  <label for="{$state.id}">{$state.label}</label>
  <font color="red">(*)</font>
</td>
<td>
  {html_options name=$state.name options=$state.options selected=$state.value}
</td>
</tr>

<tr>
<td class="desc">
  <label for="{$desc.name}">{$desc.label}</label>
  <font color="red">(*)</font>
</td>
<td colspan="3">
  <input size="{$desc.size}" maxlength="60" name="{$desc.name}"
        value="{$desc.value}">
</td>
</tr>

<tr>
 <td class="desc" colspan="1">
   <label for="OK">{$InputOk}</label>
 </td>
 <td colspan="1">
   <input id="OK" name="OK" type="submit" value="{$Enter}" title="{$Enter}">
 </td>

 <td class="desc" colspan="1" align="right">
   <label for="RESET">{$Reset}</label>
 </td>
 <td colspan="1">
   <input id="RESET" name="RESET" type="reset"
          value="{$Reset}" title="{$Reset}">
 </td>
 <td colspan="1">&nbsp;</td>
</tr>
</table>
</form>

<script type="text/javascript" language="JavaScript">
   document.{$focus}.focus();
</script>

{$FldsRequired}

<!-- timetrack_new stop -->

--- NEW FILE: timetrack_overview.tpl ---
{* Timetrack Overview *}
{* $Id: timetrack_overview.tpl,v 1.1.2.1 2004/06/29 16:07:02 tapoueh Exp $ *}

<!-- timetrack overview start -->
<form name="actionform" method="GET" action="timetrack_overview.php">

<table class="overview" cellpadding="0" cellspacing="0" width="100%">

<thead>
<tr>
<th nowrap="nowrap" colspan="1">#</th>
<th nowrap="nowrap" colspan="1">{$TimetrackRef}</th>
<th nowrap="nowrap" colspan="1">{$TimetrackWorker}</th>
<th nowrap="nowrap" colspan="1">{$TaskVolumeDone}</th>
<th nowrap="nowrap" colspan="1">{$TaskVolumeTodo}</th>
<th nowrap="nowrap" colspan="1">{$TimetrackDate}</th>
<th nowrap="nowrap" colspan="1">{$Description}</th>
<th nowrap="nowrap" colspan="1">{$TTState}</th>
<th nowrap="nowrap" colspan="1">{$ProdCost}</th>
<th nowrap>
  <input type="checkbox" name="checkit" >
</th>
</tr>
</thead>

<tbody>

{foreach from=$tts item=tt}
<tr>
 <td><a href="{$tt.id.link}" title="{$tt.id.title}">{$tt.id.name}</a></td>
 <td>
  <a href="{$tt.name.link}" title="{$tt.name.title}">{$tt.name.name}</a>
 </td>
 <td>
  <a href="{$tt.worker.link}" title="{$tt.worker.title}">{$tt.worker.name}</a>
 </td>
 <td class="data">{$tt.volume_done}</td>
 <td class="data">
   {if $tt.volume_todo != ""}{$tt.volume_todo}{else}&nbsp;{/if}
 </td>
 <td class="data">{$tt.date}</td>
 <td>{$tt.desc}</td>
 <td class="data">{$tt.state}</td>
 <td class="data">{$tt.currency.val}&nbsp;{$tt.currency.cur}</td>
 <td>&nbsp;</td>
</tr>
{/foreach}

</tbody>
</table>
</form>

<!-- timetrack overview stop -->

Index: product_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_overview.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- product_overview.tpl	11 May 2004 13:43:44 -0000	1.1.2.4
+++ product_overview.tpl	29 Jun 2004 16:07:02 -0000	1.1.2.5
@@ -37,6 +37,4 @@
 
 </form>
 
-<!-- task_overview stop -->
-
 <!-- product_overview stop -->
\ No newline at end of file

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

Modified Files:
	de.p3 
Log Message:
Language adjustments.

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/expense/de.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- de.p3	1 Jun 2004 08:20:23 -0000	1.5
+++ de.p3	28 Jun 2004 07:44:20 -0000	1.6
@@ -11,24 +11,24 @@
 # Expenses
 $lang['Expense']               = "Spesen";
 $lang['Expenses']              = "Spesen";
-$lang['ExpenseCreate']         = "Spesensatz anlegen";
-$lang['ExpenseCreateInfo']     = "Einen neuen Spesensatz zu %s anlegen";
-$lang['ExpenseDelete']         = "Spesensatz löschen";
+$lang['ExpenseCreate']         = "Spesen buchen";
+$lang['ExpenseCreateInfo']     = "Neuen Spesen zu %s anlegen";
+$lang['ExpenseDelete']         = "Spesen löschen";
 $lang['ExpenseDescription']    = "Beschreibung";
 $lang['ExpenseName']           = "Bezeichnung";
-$lang['ExpenseDetail']         = "Spesensatz anzeigen";
+$lang['ExpenseDetail']         = "Spesen anzeigen";
 $lang['ExpenseOverview']       = "Spesenübersicht";
-$lang['ExpenseCreation']       = "Spesensatz anlegen";
-$lang['ExpenseMod']            = "Spesensatz ändern";
+$lang['ExpenseCreation']       = "Spesen buchen";
+$lang['ExpenseMod']            = "Spesen ändern";
 $lang['ExpenseReference']      = "Referenz";
-$lang['ModOldExpense']         = "Alten Spesensatz ändern";
+$lang['ModOldExpense']         = "Alte Spesen ändern";
 $lang['ExpenseCreator']        = "Erzeugt von";
 $lang['ExpenseAddress']        = "Empfänger";
-$lang['ExpenseAdrInfo']        = "Ein Spesensatz von %s";
-$lang['ExpenseSearch']         = "Spesensatz suchen";
-$lang['SearchForExpense']      = "Suche nach einem Spesensatz";
-$lang['SearchForExpenseExt']   = "Erweiterte Suche nach einem Spesensatz";
-$lang['ExpenseSelInfo']        = "(Leer zeigt alle Spesensätze)";
+$lang['ExpenseAdrInfo']        = "Spesen von %s";
+$lang['ExpenseSearch']         = "Spesen suchen";
+$lang['SearchForExpense']      = "Suche nach Spesen";
+$lang['SearchForExpenseExt']   = "Erweiterte Suche nach Spesen";
+$lang['ExpenseSelInfo']        = "(Leer zeigt alle Spesen)";
 $lang['ExpenseRefType']        = "Referenztyp";
 $lang['ExpenseRefName']        = "Referenzname";
 $lang['ExpenseBetween']        = "Erzeugt zwischen";

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

Modified Files:
	note_ins.php note_new.php 
Log Message:
Short notes (without description) are possible, too!

Index: note_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_ins.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- note_ins.php	28 May 2004 14:16:11 -0000	1.15
+++ note_ins.php	28 Jun 2004 07:42:48 -0000	1.16
@@ -41,9 +41,7 @@
    $u->setEventType($_POST['etype']);
    $gotourl= addUrlParameter($gotourl,"etype=". UrlEncode($u->etype),true);
  }
- if ( empty($_POST['note']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['NoteDescription']) ."<br>";
- } else {
+ if ( isset($_POST['note']) ) {
    $u->setText(StripSlashes($_POST['note']));
    $gotourl= addUrlParameter($gotourl,"note=". UrlEncode($u->note),true);
  }

Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- note_new.php	22 Jun 2004 14:35:53 -0000	1.27
+++ note_new.php	28 Jun 2004 07:42:48 -0000	1.28
@@ -70,7 +70,7 @@
      echo "</tr>\n";
 
      echo "<tr>\n";
-     echo $this->showfield($lang['NoteDescription'],1,"note");
+     echo $this->showfield($lang['NoteDescription'],0,"note");
      echo " <td colspan=\"5\"><textarea id=\"note\"  rows=\"20\" cols=\"80\" name=\"note\">". $this->obj->note ."</textarea></td>\n";
      echo "</tr>\n";
 

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/de.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.p3	26 Feb 2003 18:36:29 -0000	1.3
+++ de.p3	27 Jun 2004 11:04:57 -0000	1.4
@@ -11,15 +11,15 @@
 # URL
 $lang['URLName']         = "Beschreibung";
 $lang['URL']             = "URL";
-$lang['URLAdd']          = "Neuer Link";
-$lang['URLDel']          = "URLs löschen";
+$lang['URLAdd']          = "URL anlegen";
+$lang['URLDel']          = "URL löschen";
 $lang['URLMod']          = "URL ändern";
 $lang['URLCreate']       = "URL anlegen";
-$lang['URLOverview']     = "URL Übersicht";
-$lang['URLSearch']       = "URL Suche";
-$lang['SearchForURL']    = "Suche nach URLs";
+$lang['URLOverview']     = "URL-Übersicht";
+$lang['URLSearch']       = "URL-Suche";
+$lang['SearchForURL']    = "Suche nach einer URL";
 
-$lang['perm'][useurl]            = "URL-Datenbank";
+$lang['perm'][useurl]            = "URL-Nutzung";
 $lang['url'] = &$lang['URL'];
 
 ### Local Variables: ***

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/rate/de.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- de.p3	16 Mar 2004 11:26:20 -0000	1.4
+++ de.p3	27 Jun 2004 11:04:57 -0000	1.5
@@ -18,10 +18,10 @@
 $lang['RateDescription']    = "Beschreibung";
 $lang['RatePriority']       = "Priorität";
 $lang['RateName']           = "Bezeichnung";
-$lang['RateDetail']         = "Stundensatz anzeigen";
+$lang['RateDetail']         = "Stundensatzdetails";
 $lang['RateInfo']           = "Stundensatz %s anzeigen";
 $lang['RateOverview']       = "Stundensatzübersicht";
-$lang['RateCreation']       = "Stundensatz erzeugen";
+$lang['RateCreation']       = "Stundensatz anlegen";
 $lang['RateMod']            = "Stundensatz ändern";
 $lang['RateModInfo']        = "Stundensatz %s ändern";
 $lang['RateReference']      = "Referenz";
@@ -30,7 +30,7 @@
 $lang['RateVat']            = "MwSt (%)";
 $lang['RateCreator']        = "Erzeugt von";
 $lang['RateLinkInfo']       = "Ein Stundensatz von %s";
-$lang['RateSearch']         = "Stundensatz suchen";
+$lang['RateSearch']         = "Stundensatzsuche";
 $lang['SearchForRate']      = "Suche nach einem Stundensatz";
 $lang['SearchForRateExt']   = "Erweiterte Suche nach einem Stundensatz";
 $lang['RateSelInfo']        = "(Leer zeigt alle Stundensätze)";

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- de.p3	22 Jun 2004 14:37:50 -0000	1.60
+++ de.p3	27 Jun 2004 11:05:00 -0000	1.61
@@ -31,7 +31,7 @@
 $lang['StartDate']       = "Anfangsdatum";
 $lang['StartTime']       = "Anfangsuhrzeit";
 $lang['AppStart']        = "Anfang";
-$lang['AppCreatedBy']    = "Erzeugt von";
+$lang['AppCreatedBy']    = "Angelegt von";
 $lang['EndDate']         = "Enddatum";
 $lang['EndTime']         = "Enduhrzeit";
 $lang['AppEnd']          = "Ende";
@@ -174,10 +174,10 @@
 # Appointments
 $lang['Appointment']     = "Termin";
 $lang['Appointments']    = "Termine";
-$lang['NewAppoint']      = "Neuer Termin";
+$lang['NewAppoint']      = "Termin anlegen";
 $lang['NewAppointR']     = "Neu (wiederholend)";
-$lang['NewAppointInfo']  = "Einen neuen Termin eingeben";
-$lang['NewAppointInfoR'] = "Einen neuen sich wiederholenden Termin eingeben";
+$lang['NewAppointInfo']  = "Einen neuen Termin anlegen";
+$lang['NewAppointInfoR'] = "Einen neuen sich wiederholenden Termin anlegen";
 $lang['AppointDetail']   = "Termindetails";
 $lang['AppointModify']   = "Termin ändern";
 $lang['AppointCreate']   = "Termin anlegen";
@@ -188,8 +188,8 @@
 $lang['VisitAt']         = "Besuch bei";
 $lang['VisitFrom']       = "Besuch von";
 $lang['Visits']          = "Besuche";
-$lang['ModOldAppoint']   = "Bestehenden Termin ändern";
-$lang['CreateAppoint']   = "Einen neuen Termin anlegen";
+$lang['ModOldAppoint']   = "Termin ändern";
+$lang['CreateAppoint']   = "Termin anlegen";
 $lang['AppFirstDate']    = "Erster Termin";
 $lang['AppLastDate']     = "Letzter Termin";
 $lang['AppNoLastDate']   = "Kein Ende";
@@ -221,9 +221,9 @@
 $lang['AppLoc'][1]       = "Auswärts";
 $lang['AppLoc'][2]       = "Urlaub";
 $lang['AppLoc'][3]       = "Krank";
-$lang['AppLoc'][4]       = "verschoben";
-$lang['AppLoc'][5]       = "Option";
-$lang['AppLoc'][6]       = "privat";
+$lang['AppLoc'][4]       = "Verschoben";
+$lang['AppLoc'][5]       = "Optional";
+$lang['AppLoc'][6]       = "Privat";
 $lang['AppState'][0]     = "???";
 $lang['AppState'][1]     = "JA";
 $lang['AppState'][2]     = "NEIN";
@@ -232,7 +232,7 @@
 $lang['AppVoteState']    = "Aktueller Stand";
 $lang['AppVoteHead']     = "Terminabstimmung für (%s)";
 $lang['AppVoteSelect']   = "Bitte wählen";
-$lang['AppsSearch']      = "Suche im Kalender";
+$lang['AppsSearch']      = "Terminsuche";
 $lang['SearchForAppExt'] = "Erweiterte Suche nach einem Termin";
 $lang['SearchForApp']    = "Suche nach einem Termin";
 $lang['AppUserSearch']   = "Nur Termine an denen ich teilnehme";
@@ -345,7 +345,7 @@
 $lang['ProdProb']        = "Wahrscheinlichkeit";
 $lang['ProdModifyT']     = "Das Produkt/Projekt %s ändern";
 $lang['ProdCreateT']     = "Ein neues Produkt/Projekt anlegen";
-$lang['ProdCloneT']      = "Eine neues Projekt mit den Daten von %s erzeugen";
+$lang['ProdCloneT']      = "Eine neues Projekt mit den Daten von %s anlegen";
 $lang['ProdSelInfo']     = "(Leer zeigt alle Produkte/Projekte)";
 $lang['ProdLinkInfo']    = "Produkt/Projekt %s anzeigen";
 $lang['ProdBetween']     = "Angelegt zwischen";
@@ -406,10 +406,10 @@
 # Tasks
 $lang['Task']            = "Aufgabe";
 $lang['Tasks']           = "Aufgaben";
-$lang['TaskDetail']      = "Aufgabe anzeigen";
-$lang['TaskCreate']      = "Aufgabe erzeugen";
+$lang['TaskDetail']      = "Aufgabendetails";
+$lang['TaskCreate']      = "Aufgabe anlegen";
 $lang['TaskNewSubtask']  = "Neue Teilaufgabe";
-$lang['TaskCreateInfo']  = "Neue Teilaufgabe von %s erzeugen";
+$lang['TaskCreateInfo']  = "Eine neue Teilaufgabe von %s anlegen";
 $lang['TaskDelete']      = "Aufgabe %s löschen";
 $lang['TaskModify']      = "Aufgabe %s ändern";
 $lang['TaskOverview']    = "Aufgabenübersicht";
@@ -507,7 +507,7 @@
 $lang['TeamMail']           = "E-mail an Gruppe";
 $lang['TeamMailInfo']       = "E-mail an die Gruppe %s verschicken";
 $lang['TeamApps']           = "Termine der Gruppe %s ansehen";
-$lang['TeamLinkInfo']       = "Info zur Gruppe %s";
+$lang['TeamLinkInfo']       = "Gruppe %s anzeigen";
 $lang['TeamManager']        = "Gruppenverwalter";
 $lang['TeamName']           = "Gruppenname";
 $lang['TeamCreation']       = "Erzeugt am";
@@ -517,7 +517,7 @@
 $lang['TeamDeleteI']        = "Die Gruppe %s löschen";
 $lang['TeamModifyI']        = "Die Gruppe %s ändern";
 $lang['TeamSearch']         = "Gruppensuche";
-$lang['SearchForTeam']      = "Nach einer Gruppe suchen";
+$lang['SearchForTeam']      = "Suche nach einer Gruppe";
 
 # Address
 $lang['AddressSearch']   = "Adresssuche";
@@ -579,7 +579,7 @@
 $lang['AdrLinks']        = "Verweise";
 $lang['AdrCategory']     = "Kategorie";
 $lang['AdrDescription']  = "Name des Eintrags";
-$lang['ShowCal']         = "Zum Kalender von %s";
+$lang['ShowCal']         = "Kalender von %s anzeigen";
 $lang['SearchForAdr']    = "Suche im Adressbuch";
 $lang['SearchForAdrExt'] = "Erweiterte Suche im Adressbuch";
 $lang['SearchForCmp']    = "Suche nach einer Firma";
@@ -606,11 +606,11 @@
 $lang['Certificate']     = "Zertifikat";
 
 # MAP
-$lang['MapSearch']       = "Suche nach einer Karte";
+$lang['MapSearch']       = "Kartensuche";
 $lang['MapHeader']       = "Eine Karte von %s beziehen";
 
 # History
-$lang['HistoryDetail']   = "%s Historie";
+$lang['HistoryDetail']   = "Historie von %s";
 $lang['HistoryShow']     = "Historie von %s %s";
 $lang['HistoryFld']      = "Feld";
 $lang['HistoryOldV']     = "Alter Wert";
@@ -633,7 +633,7 @@
 $lang['TimetrackDate']     = "Datum";
 $lang['TimetrackSearch']   = "Aufwandssuche";
 $lang['SearchForTT']       = "Suche nach Aufwand";
-$lang['SearchForTTExt']    = "Erweiterte Auswahl";
+$lang['SearchForTTExt']    = "Erweiterte Suche nach Aufwand";
 $lang['TimetrackBetween']  = "Zwischen";
 $lang['TimetrackBooked']   = "Gebuchter Aufwand";
 $lang['TimetrackBookedI']  = "Gebuchter Aufwand für %s";
@@ -649,10 +649,10 @@
 $lang['TTfinish']          = "abschliessen";
 
 # Fax
-$lang['FaxCreate']         = "FAX Neu";
+$lang['FaxCreate']         = "Fax anlegen";
 $lang['FaxSendTo']         = "Ein FAX an %s senden";
 $lang['FaxTo']             = "An:";
-$lang['FaxNr']             = "FAX Nr:";
+$lang['FaxNr']             = "Fax Nr:";
 $lang['FaxNote']           = "Dieses Fax als Notiz bei %s speichern";
 $lang['FaxSpooledTo']      = "Fax wurde in die Sende-Warteschlange für/bei %s eingereiht";
 
@@ -693,7 +693,7 @@
 $lang['DBInit']            = "Datenbankinitialisierung";
 $lang['DBModify']          = "Datenbank ändern";
 $lang['DBModifyI']         = "Datenbank %s ändern";
-$lang['DBCreate']          = "Datenbank erzeugen";
+$lang['DBCreate']          = "Datenbank anlegen";
 $lang['DBDetail']          = "Datenbankdetails";
 $lang['DBLastDate']        = "Letzte Synchronisation";
 $lang['DBCurrID']          = "ID";
@@ -738,8 +738,8 @@
 $lang['perm'][useoverlib]        = "Minifenster";
 $lang['perm'][useaddressbook]    = "Adressbuchnutzung";
 $lang['perm'][usemail]           = "Mailnutzung";
-$lang['perm'][usehistory]        = "Historie anzeigen";
-$lang['perm'][useteams]          = "Teams";
+$lang['perm'][usehistory]        = "Historienanzeige";
+$lang['perm'][useteams]          = "Teamnutzung";
 $lang['FeatureOff']              = "Funktion global abgeschaltet";
 
 # Error Messages

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/de.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.p3	5 Nov 2002 19:47:06 -0000	1.3
+++ de.p3	27 Jun 2004 11:05:00 -0000	1.4
@@ -22,7 +22,7 @@
 $lang['Invoice']           = "Rechnung";
 $lang['Invoices']          = "Rechnungen";
 $lang['InvoiceCreate']     = "Rechnung anlegen";
-$lang['InvoiceCreateI']    = "Rechnung für %s anlegen";
+$lang['InvoiceCreateI']    = "Eine neue Rechnung für %s anlegen";
 $lang['InvoiceCreation']   = "Erzeugt von %s am %s";
 $lang['InvoiceName']       = "Rechnungs-ID";
 $lang['InvoiceCustomer']   = "Kunde";
@@ -46,7 +46,7 @@
 $lang['InvPossiblePos']    = "Mögliche Positionen";
 $lang['InvExistingPos']    = "Positionen";
 $lang['InvAddPos']         = "Position aktivieren";
-$lang['InvDelPos']         = "Position entfernen";
+$lang['InvDelPos']         = "Position löschen";
 $lang['InvModInfo']        = "Rechnung %s ändern";
 $lang['InvDelInfo']        = "Rechnung %s löschen";
 $lang['InvOverview']       = "Rechnungsübersicht";
@@ -59,8 +59,8 @@
 $lang['InvDatePayed']      = "Bezahlt am";
 $lang['InvDateCancel']     = "Storniert am";
 $lang['InvLinkInfo']       = "Rechnung %s anzeigen";
-$lang['InvoiceSearch']     = "Rechnungen suchen";
-$lang['SearchForInv']      = "Nach einer Rechnung suchen";
+$lang['InvoiceSearch']     = "Rechnungssuche";
+$lang['SearchForInv']      = "Suche nach einer Rechnung";
 $lang['SearchForInvExt']   = "Erweiterte Suche nach einer Rechnung";
 $lang['InvSelInfo']        = "(Leer zeigt alle Rechnungen)";
 $lang['Accountant']        = "Rechnungssteller";

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/de.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- de.p3	10 Mar 2004 10:28:14 -0000	1.5
+++ de.p3	27 Jun 2004 11:04:59 -0000	1.6
@@ -13,7 +13,7 @@
 $lang['Installations']   = "Installationen";
 $lang['InstDetail']      = "Installationsdetails";
 $lang['InstModify']      = "Installation ändern";
-$lang['InstCreate']      = "Installation erzeugen";
+$lang['InstCreate']      = "Installation anlegen";
 $lang['InstOverview']    = "Installationsübersicht";
 $lang['InstVersion']     = &$lang['ProdVersion'];
 $lang['InstSerial']      = "Seriennummer";

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

Modified Files:
	company_new.php company_overview.php company_show.php 
	department_new.php department_show.php 
Log Message:
merged changes of Boris

Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- company_new.php	25 May 2004 19:24:52 -0000	1.60
+++ company_new.php	27 Jun 2004 11:04:58 -0000	1.61
@@ -168,7 +168,7 @@
      }
 
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",
@@ -207,4 +207,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: company_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_overview.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- company_overview.php	26 Mar 2004 11:01:23 -0000	1.45
+++ company_overview.php	27 Jun 2004 11:04:58 -0000	1.46
@@ -210,7 +210,7 @@
 	 }
      }  
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- company_show.php	20 Apr 2004 13:15:47 -0000	1.68
+++ company_show.php	27 Jun 2004 11:04:58 -0000	1.69
@@ -204,7 +204,7 @@
        $this->name .= ": ". $this->obj->getFullName();
      }
      #menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",
@@ -251,4 +251,4 @@
  $l = new company_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- department_new.php	25 May 2004 19:24:52 -0000	1.52
+++ department_new.php	27 Jun 2004 11:04:58 -0000	1.53
@@ -174,7 +174,7 @@
      preset_from_array_or_input($this->obj,'company',"c");
 
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
 
      if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
@@ -207,4 +207,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- department_show.php	21 Mar 2004 16:55:48 -0000	1.55
+++ department_show.php	27 Jun 2004 11:04:58 -0000	1.56
@@ -178,7 +178,7 @@
        $this->name .= ": ".$this->obj->getFullName();
      }
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
 
      $x =  department::getaddlink($this->user,$this->obj,$lang['NewEntry']);
@@ -219,4 +219,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/de.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- de.p3	15 Mar 2004 10:27:14 -0000	1.6
+++ de.p3	27 Jun 2004 11:05:00 -0000	1.7
@@ -26,17 +26,17 @@
 $lang['MailboxSearch']   = "Mailboxsuche";
 $lang['MailboxDetail']   = "Mailbox E-mail-anzeige";
 $lang['MailboxModify']   = "Mailbox ändern";
-$lang['MailboxCreate']   = "Mailbox definieren";
+$lang['MailboxCreate']   = "Mailbox anlegen";
 $lang['MailboxModifyI']  = "Mailbox für %s ändern";
-$lang['MailboxCreateI']  = "Neue Mailbox für %s definieren";
+$lang['MailboxCreateI']  = "Eine neue Mailbox für %s anlegen";
 $lang['MailboxDelI']     = "Entferne Mailbox %s";
 $lang['SearchForMail']   = "%s Mailbox %s durchsuchen";
 $lang['MailboxSelInfo']  = "(Leer zeigt alle E-mails)";
 
 $lang['Mail']            = "E-mail";
 $lang['Mails']           = "E-mails";
-$lang['MailNewFolder']   = "Neues Mailverzeichnis";
-$lang['MailDelFolderI']  = "Mailverzeichnis %s löschen";
+$lang['MailNewFolder']   = "Neues E-mail-Verzeichnis";
+$lang['MailDelFolderI']  = "E-mail-Verzeichnis %s löschen";
 $lang['MailCountInfo']   = "%d E-mail(s) gefunden";
 $lang['MailCountInfoS']  = "%d E-mail(s) gefunden welche %s enthalten";
 $lang['MailCountInfo0']  = "Keine E-mails im Verzeichnis %s gefunden";
@@ -48,12 +48,12 @@
 $lang['MailActionGoto']  = "Zum Verzeichnis:";
 
 $lang['MailNoSubject']      = "OHNE BETREFF";
-$lang['MailDeleted']        = "email gelöscht";
-$lang['MailFolderDeleted']  = "Verzeichnis %s entfernt";
+$lang['MailDeleted']        = "E-Mail gelöscht";
+$lang['MailFolderDeleted']  = "Verzeichnis %s gelöscht";
 $lang['MailFolderCreated']  = "Verzeichnis %s angelegt";
 $lang['MailShowHeaders']    = "Kopfzeilen anzeigen";
 $lang['MailHideHeaders']    = "Kopfzeilen verstecken";
-$lang['MailHeaders']        = "E-mail Kopfzeilen";
+$lang['MailHeaders']        = "E-mail-Kopfzeilen";
 $lang['MailDownload']       = "Download";
 
 $lang['mailbox']     = &$lang['Mailbox'];

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

Modified Files:
	de.p3 resource.pinc 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/de.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- de.p3	28 Feb 2003 09:17:19 -0000	1.5
+++ de.p3	27 Jun 2004 11:04:58 -0000	1.6
@@ -11,13 +11,13 @@
 # Resource
 $lang['Resource']          = "Ressource";
 $lang['Resources']         = "Ressourcen";
-$lang['ResDetail']         = "Ressourcenanzeige";
-$lang['ResCreate']         = "Ressource erzeugen";
+$lang['ResDetail']         = "Ressourcendetails";
+$lang['ResCreate']         = "Ressource anlegen";
 $lang['ResModify']         = "Ressource ändern";
 $lang['ResModifyI']        = "Ändern der Ressource %s";
 $lang['ResName']           = "Name";
 $lang['ResDesc']           = "Beschreibung";
-$lang['ResShow']           = "Zeige Ressource %s";
+$lang['ResShow']           = "Ressource %s anzeigen";
 $lang['ResUsage']          = "Ressourcennutzung";
 $lang['ResOverview']       = "Ressourcenübersicht";
 $lang['ResDelI']           = "Ressource %s löschen";

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- resource.pinc	26 Mar 2004 18:05:27 -0000	1.34
+++ resource.pinc	27 Jun 2004 11:04:58 -0000	1.35
@@ -504,7 +504,7 @@
     }
     return array( url => "resource/resource_overview.php",
                   image => $user->layout->theme->getImage(resource::getHtmlIcon(),'menu'),
-                  text => ($text == "" ?  $lang['Resources']: $text),
+                  text => ($text == "" ?  $lang['ResOverview']: $text),
                   info => $lang['ResOverview'],
                   category => array("overview","resource","module")
                 );
@@ -538,4 +538,4 @@
     return $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/de.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- de.p3	27 May 2004 10:01:55 -0000	1.6
+++ de.p3	27 Jun 2004 11:04:59 -0000	1.7
@@ -30,8 +30,8 @@
 $lang['BugAssignedTo']   = "Zu lösen von";
 $lang['BugModify']       = "Fehler ändern";
 $lang['BugModifyI']      = "Fehler %s ändern";
-$lang['BugCreate']       = "Fehler eintragen";
-$lang['BugCreateInfo']   = "Einen Fehler zu %s eintragen";
+$lang['BugCreate']       = "Fehler anlegen";
+$lang['BugCreateInfo']   = "Einen Fehler zu %s anlegen";
 $lang['BugDeleteI']      = "Fehler %s löschen";
 $lang['BugStates']       = array();
 $lang['BugClasses']      = array();
@@ -52,7 +52,7 @@
 $lang['BugMediums'][6]   = "Telefon";
 $lang['SearchForBug']    = "Suche nach einer Fehlermeldung";
 $lang['SearchForBugExt'] = "Erweiterte Suche nach Fehlermeldung";
-$lang['CreateNewBug']    = "Einen neuen Fehler eintragen";
+$lang['CreateNewBug']    = "Einen neuen Fehler anlegen";
 $lang['BugShow']         = "Fehler %s anzeigen";
 $lang['BugAdditional']   = "Zusätzliche Information";
 $lang['BugHistory']      = "Historie";

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/checklist/de.p3,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- de.p3	10 Apr 2003 11:49:06 -0000	1.10
+++ de.p3	27 Jun 2004 11:04:59 -0000	1.11
@@ -41,7 +41,7 @@
 $lang['ModOldChecklist']         = "Alte Checkliste ändern";
 $lang['ChecklistCreator']        = "Erzeugt von";
 $lang['ChecklistLinkInfo']       = "Eine Checkliste von %s";
-$lang['ChecklistSearch']         = "Checklistesuche";
+$lang['ChecklistSearch']         = "Checklistensuche";
 $lang['SearchForChecklist']      = "Suche nach einer Checkliste";
 $lang['SearchForChecklistExt']   = "Erweiterte Suche nach einer Checkliste";
 $lang['ChecklistSelInfo']        = "(Leer zeigt alle Checklisten)";
@@ -72,7 +72,7 @@
 $lang['CheckfieldCreator']       = "Erzeugt von";
 $lang['CheckfieldModify']        = "Checkfeld ändern";
 $lang['CheckfieldDelete']        = "Checkfeld %s löschen";
-$lang['CheckfieldShow']          = "checkfield %s anzeigen";
+$lang['CheckfieldShow']          = "Checkfeld %s anzeigen";
 $lang['CheckfieldName']          = "Name";
 $lang['CheckfieldPos']           = "Pos";
 $lang['CheckfieldPosUp']         = "Position rauf";

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

Modified Files:
	de.p3 file.pinc 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/de.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- de.p3	22 Apr 2004 10:38:41 -0000	1.6
+++ de.p3	27 Jun 2004 11:04:59 -0000	1.7
@@ -15,10 +15,10 @@
 $lang['FileOverview']    = "Dokumentübersicht";
 $lang['FileMod']         = "Dokument ändern";
 $lang['FileModifyI']     = "Dokument %s ändern";
-$lang['FileDeleteI']     = "Dokument %s entfernen";
-$lang['FileCreation']    = "Neues Dokument";
-$lang['FileCreate']      = "Neues Dokument";
-$lang['FileCreateInfo']  = "Neues Dokument zu %s";
+$lang['FileDeleteI']     = "Dokument %s löschen";
+$lang['FileCreation']    = "Dokument anlegen";
+$lang['FileCreate']      = "Dokument anlegen";
+$lang['FileCreateInfo']  = "Ein neues Dokument zu %s anlegen";
 $lang['FileNameDoc']     = "Dokumentname";
 $lang['FileName']        = "Originalname";
 $lang['FileSize']        = "Größe";
@@ -45,13 +45,13 @@
 $lang['FileVersioning']  = "Versionskontrolle";
 $lang['FileVersioningI'] = "Wenn oben ein Dateiname angegeben ist.";
 $lang['FileSearch']      = "Dokumentsuche";
-$lang['SearchForFile']   = "Suche nach Dokument";
-$lang['SearchForFileExt']= "Erweiterte Suche nach Dokument";
-$lang['FileLockedByI']   = "Document locked by %s";
-$lang['FileUnlockedByI'] = "Document unlocked by %s";
-$lang['FileChanged']     = "Changed %s from %s to %s";
+$lang['SearchForFile']   = "Suche nach einem Dokument";
+$lang['SearchForFileExt']= "Erweiterte Suche nach einem Dokument";
+$lang['FileLockedByI']   = "Dokument gesperrt von %s";
+$lang['FileUnlockedByI'] = "Dokument entsperrt von %s";
+$lang['FileChanged']     = "%s verändert von %s zu %s";
 $lang['FileDelSuccess']  = "Dokument \"%s\" gelöscht";
-$lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
+$lang['File_Err001']     = "Temporäre Datei %s fehlt. Vielleicht zu groß";
 
 $lang['perm'][usedocmanagement]  = "Dokumentmanagement";
 $lang['file']  = &$lang['File']

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- file.pinc	22 Jun 2004 14:35:53 -0000	1.44
+++ file.pinc	27 Jun 2004 11:04:59 -0000	1.45
@@ -75,7 +75,7 @@
        $nf->tablename = $dbconn->prefix ."files";
        $oldacl        = $f->acl;
        $nf->save();
-       
+
        $nf->acl = $oldacl;
        acl_save($nf);
 
@@ -132,7 +132,7 @@
   /**
    * fill the object data with a given resultset
    *
-   * @param Object $r    a result set object 
+   * @param Object $r    a result set object
    * @param int    $pos  a index in the resultset
    */
   function read_result(&$r, $pos ) {
@@ -201,8 +201,8 @@
     }
   }
   /**
-   * fill the internal neighbour list with possible objects where a object
-   * currently attached/referncing to THIS could be reattached
+   * fill the internal neighbour list with possible objects where an object
+   * currently attached/referencing to THIS could be reattached
    */
   function getNeighbours () {
     global $lang;
@@ -222,7 +222,7 @@
     return $this->neighbours;
   }
   /**
-   * get a list of possible new parents foreach existing parent
+   * get a list of possible new parents for each existing parent
    */
   function read_relations ( ) {
     global $lang;
@@ -244,13 +244,19 @@
     return $this->name ." ". $this->version;
   }
   /**
-   * Return a url to this file
+   * Return an URL to show this file
    */
   function getURL() {
     return "file/file_show.php?id=".$this->id ;
   }
   /**
-   * Return a URL to delete this address
+   * Return an URL to modify this file
+   */
+  function getModURL() {
+    return "file/file_new.php?id=".$this->id ;
+  }
+  /**
+   * Return an URL to delete this file
    */
   function getDelURL() {
     return "file/file_del.php?id=". $this->id;
@@ -315,7 +321,7 @@
         while(list($key, $val) = each($exif)) {
             if (gettype($val) == "array") {
               echo "\t". $key ."\n";
-              foreach($val as $k2 => $v2) { 
+              foreach($val as $k2 => $v2) {
                 if ($k2 == "MakerNote") {
                   echo "\t\t". $k2 ." => ". gettype($v2)."\n";
                 } else if ($k2 == "UserComment") {
@@ -492,12 +498,12 @@
       $fp = fopen($this->base ."/". $this->fileloc, "r");
       @fpassthru ($fp);
       return;
-    } else if ( (($this->filetype == "application/msword") || ($this->filetype == "application/doc")) 
+    } else if ( (($this->filetype == "application/msword") || ($this->filetype == "application/doc"))
                 && file_exists($tutos[wvHtml]) && is_executable($tutos[wvHtml]) ) {
       Header("Content-type: text/html");
       Header("Content-Description: ". $this->name );
       Header("Content-Disposition: inline; filename=\"". $this->filename .".html\"");
-      @passthru($tutos[wvHtml] ." -x /usr/local/share/wv/wvHtml.xml --dir ". $tutos[sessionpath] ."\"". $this->base ."/". $this->fileloc ."\"");
+      @passthru($tutos[wvHtml] ." \"". $this->base ."/". $this->fileloc ."\"");
       return;
     } else if ( eregi("\.doc$",$this->filename) && (($this->filetype == "application/msword") || ($this->filetype == "application/octet-stream")) ) {
       Header("Content-type: ". $this->filetype);
@@ -569,7 +575,7 @@
     return acl_del_ok($this);
   }
   /**
-   * Are Modifiacations allowed ?
+   * Are modifications allowed ?
    */
   function mod_ok() {
     global $current_user,$tutos;
@@ -586,7 +592,6 @@
   }
   /**
    * make a list of _old_ versions
-   *
    */
   function make_vlist() {
     $xx =  $this->base ."/". $this->fileloc;
@@ -632,7 +637,7 @@
     return $this->setStrField("name",$value,"FileNameDoc");
   }
   /**
-   * set the files name
+   * set the file's name
    */
   function setFilename($value) {
     return $this->setStrField("filename",$value,"FileName");
@@ -664,7 +669,7 @@
     return;
   }
   /**
-   * Save Filereference to DB
+   * Save file reference to DB
    * Copy file to repository
    */
   function save() {
@@ -723,7 +728,7 @@
       $msg .= "<br>FILE NOT SAVED";
       return $msg;
     }
-    
+
     $q->addFV("name",$this->name,"STRING",$table['file']['name'][size]);
     $q->addFV("filename",$this->filename,"STRING",$table['file']['filename'][size]);
     $q->addFV("logtxt",$this->logtxt,"TEXT");
@@ -755,7 +760,7 @@
         } else {
           @move_uploaded_file ($this->tmploc , $this->base ."/". $this->fileloc);
         }
-      }   
+      }
       if (!file_exists($this->base ."/". $this->fileloc)) die('missing file '. $this->base ."/". $this->fileloc);
       @chmod ($this->base ."/". $this->fileloc, $this->fileperm);
       if ( $this->vsys == FILE_NOVERS ) {
@@ -839,7 +844,7 @@
     return $msg;
   }
   /**
-   * delete the database entry 
+   * delete the database entry
    */
   function delete() {
     global $current_user;
@@ -900,7 +905,7 @@
     return usedocmanagement;
   }
   /**
-   * get the type id of object
+   * get the icon type
    */
   function getHtmlIcon () {
     return 'paper';
@@ -913,7 +918,7 @@
    * Read all urls related to given id
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( ! isset($obj->id) )  return;
 
@@ -964,7 +969,7 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
+    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -992,7 +997,7 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $lang;
 
-     if ( $obj == -1 ) return ""; 
+     if ( $obj == -1 ) return "";
      if (! is_object($obj) ) return "";
      if ( $obj->id == -1 ) return "";
      if (! $user->feature_ok(usedocmanagement,PERM_NEW) ) return "";
@@ -1007,7 +1012,7 @@
      return $x;
   }
   /**
-   * delete file entries for a object
+   * delete file entries for an object
    */
   Function obj_delete(&$user,&$obj) {
     $msg = "";
@@ -1020,7 +1025,7 @@
     return $msg;
   }
   /**
-   * create a link to a overview page
+   * create a link to an overview page
    */
   function getSelectLink (&$user,$text = "") {
     global $lang,$tutos;
@@ -1029,13 +1034,13 @@
     }
     return array( url => "file/file_select.php",
                   image => $user->layout->theme->getImage(tutos_file::getHtmlIcon(),'menu'),
-                  text => ($text == "" ? $lang['Files'] : $text),
+                  text => ($text == "" ? $lang['FileSearch'] : $text),
                   info => $lang['SearchForFile'],
                   category => array("search","file","module")
                 );
   }
   /**
-   * show the mytutos info about notes
+   * show the mytutos info about files
    */
   function mytutos (&$user) {
     global $tutos,$lang,$current_user;
@@ -1054,7 +1059,7 @@
 
     $r = info_table_start();
     $r .= " <tr>\n";
-    $m = tutos_file::getSelectLink($current_user);
+    $m = tutos_file::getSelectLink($current_user,$lang['Files']);
     $r .= " <th colspan=\"3\">".  $current_user->layout->theme->getImage(tutos_file::getHtmlIcon(),'list') ." ". menulink($m[url],$m[text],$m[info]) ."</th>\n";
     $r .= " </tr>\n";
     $r .= " <tr>\n";
@@ -1093,4 +1098,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-serv26864/note

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/de.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- de.p3	1 Jun 2004 08:42:10 -0000	1.6
+++ de.p3	27 Jun 2004 11:04:58 -0000	1.7
@@ -17,9 +17,9 @@
 $lang['NoteDescription']    = "Beschreibung";
 $lang['NoteRemember']       = "Erinnern am:";
 $lang['NoteName']           = "Thema";
-$lang['NoteDetail']         = "Notiz anzeigen";
+$lang['NoteDetail']         = "Notizdetails";
 $lang['NoteOverview']       = "Notizübersicht";
-$lang['NoteCreation']       = "Notiz erzeugen";
+$lang['NoteCreation']       = "Notiz anlegen";
 $lang['NoteMod']            = "Notiz ändern";
 $lang['NoteReference']      = "Referenz";
 $lang['ModOldNote']         = "Alte Notiz ändern";

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

Modified Files:
	de.p3 
Log Message:
merged changes of Boris

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/reminder/de.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.p3	4 Jun 2004 17:45:47 -0000	1.3
+++ de.p3	27 Jun 2004 11:04:58 -0000	1.4
@@ -15,26 +15,26 @@
 # Reminder
 $lang['Reminder']          = "Wiedervorlage";
 $lang['Reminders']         = "Wiedervorlagen";
-$lang['ReminderShow']      = "Details Woedervorlage";
-$lang['ReminderShowI']     = "zeige Wiedervorlage %s";
-$lang['ReminderSearch']    = "Wiedervorlagen suchen";
-$lang['ReminderOverview']  = "Übersicht Wiedervorlagen";
-$lang['ReminderCreate']    = "Wiedervorlage einrichten";
-$lang['ReminderCreateI']   = "Add a reminder for %s";
+$lang['ReminderShow']      = "Wiedervorlagen anzeigen";
+$lang['ReminderShowI']     = "Zur Anzeige der Wiedervorlage %s";
+$lang['ReminderSearch']    = "Wiedervorlagensuche";
+$lang['ReminderOverview']  = "Wiedervorlagenübersicht";
+$lang['ReminderCreate']    = "Wiedervorlage anlegen";
+$lang['ReminderCreateI']   = "Eine neue Wiedervorlage für %s anlegen";
 $lang['ReminderModify']    = "Modify";
 $lang['ReminderModI']      = "Modify %s";
 $lang['ReminderDeleteI']   = "Wiedervorlage '%s' löschen";
-$lang['ReminderDetail']    = "Wiedervorlage";
+$lang['ReminderDetail']    = "Wiedervorlagendetails";
 $lang['ReminderReference'] = "Referenz";
 $lang['ReminderDesc']      = "Anmerkung";
 $lang['ReminderTo']        = "Erinnerung an";
 $lang['ReminderAt']        = "wann ?";
 $lang['ReminderDate']      = "an bestimmten Datum";
 $lang['ReminderEvent']     = "bei einem Ereignis";
-$lang['ReminderUseMail']   = "via email";
+$lang['ReminderUseMail']   = "per E-mail";
 $lang['ReminderType']      = "Ereignis-Typ";
 $lang['ReminderOffset']    = "Abweichung";
-$lang['ReminderRepeat']    = "Widerholung";
+$lang['ReminderRepeat']    = "Wiederholung";
 $lang['ReminderRepeatI']   = "(nach der ersten Erinnerung)";
 $lang['ReminderInHours']   = "(in %s Stunden)";
 $lang['ReminderAgoHours']   = "(vor %s Stunden)";
@@ -45,7 +45,7 @@
 $lang['Reminder_Err001']   = "gewählter Ereignistyp ist mit %s %s nicht möglich";
 
 $lang['reminder']   = &$lang['Reminder'];
-$lang['perm'][usereminder] = "Wiedervorlagen benutzen";
+$lang['perm'][usereminder] = "Wiedervorlagennutzung";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

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

Modified Files:
      Tag: BRANCH-2-0
	minical.php mytutos.php timetrack.pinc timetrack_select.php 
Log Message:
* Rewrite of minical using templates
* Work begins on timetrack templating


Index: minical.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/minical.php,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- minical.php	6 Jan 2004 19:35:23 -0000	1.20
+++ minical.php	24 Jun 2004 16:20:41 -0000	1.20.2.1
@@ -5,163 +5,162 @@
 include_once 'webelements.p3';
 include_once 'permission.p3';
 
+include_once 'layout/layout.pinc';
+
 /* Check if user is allowed to use it */
 check_user();
 session_write_close();
-loadlayout();
-
-$d = Date("d");
-$m = Date("n");
-$y = Date("Y");
-$f = "default";
-
-$l = new layout($current_user);
-echo $l->PrintHeader("MiniCal");
-
-if (isset($_GET['f']) ) {
-  $f = $_GET['f'];
-}
-if (isset($_GET['d']) ) {
-  $d = $_GET['d'];
-}
-if (isset($_GET['m']) ) {
-  $m = $_GET['m'];
-}
-if (isset($_GET['y']) ) {
-  $y = $_GET['y'];
-}
-if (isset($_GET['n']) ) {
-  $n = $_GET['n'];
-}
-if ( $d == -1 ) {
-  $d = Date("d");
-}
-if ( $m == -1 ) {
-  $m = Date("n");
-}
-if ( $y == -1 ) {
-  $y = Date("Y");
-}
-
 
-echo "<script language='JavaScript'>\n";
-echo " function closeandaway (d, m, y) { \n";
-echo "  var x = opener.document.forms[0]; \n";
-echo "  \n";
-echo "  x.". $f ."_d.selectedIndex = d-1; \n";
-echo "  x.". $f ."_m.selectedIndex = m-1; \n";
-echo "  x.". $f ."_y.selectedIndex = y; \n";
-# echo "  d.EventDT.value = mo + '/' + dy + '/' + yr; \n";
-echo "  window.close(); \n";
-echo " }\n";
-echo " function noneandaway () { \n";
-echo "  var x = opener.document.forms[0]; \n";
-echo "  \n";
-echo "  x.". $f ."_d.selectedIndex = 0; \n";
-echo "  x.". $f ."_m.selectedIndex = 0; \n";
-echo "  x.". $f ."_y.selectedIndex = 0; \n";
-# echo "  d.EventDT.value = mo + '/' + dy + '/' + yr; \n";
-echo "  window.close(); \n";
-echo " }\n";
-echo "</script>\n";
-
-
-$yoff =  Date("Y") + 10;
-echo "<table class=\"single\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"100%\">\n";
-echo "<tr>\n";
-echo "\n";
-$nm = $m + 1;
-$ny = $y;
-if ( $nm == 13 ) {
-  $nm = 1;
-  $ny = $y + 1;
-}
-$lm = $m - 1;
-$ly = $y;
-if ( $lm == 0 ) {
-  $lm = 12;
-  $ly = $y -1;
-}
-echo "<th colspan=\"2\" align=\"left\"><font size=\"-1\"><a class=\"nodeco\" href=\"".$_SERVER['PHP_SELF'] ."?f=".$f."&n=".$n."&m=".$lm."&d=".$d."&y=".$ly."\">". $lang['NavBack'] ."</a></th>\n";
-echo "<th colspan=\"4\" align=\"center\">". $m ."/". $y ."</th>\n";
-echo "<th colspan=\"2\" align=\"right\"><font size=\"-1\"><a class=\"nodeco\" href=\"". $_SERVER['PHP_SELF'] ."?f=$f&n=$n&m=$nm&d=$d&y=$ny\">". $lang['NavNext'] ."</a></th>\n";
-echo "</tr>\n";
-echo "<tr>\n";
-echo "<th><font size=\"-1\">". $lang['week'] ."</th>\n";
-
-$WeekDayName=array('SSunday','SMonday','STuesday','SWednesday','SThursday','SFriday','SSaturday');
- 
-for ( $i = $current_user->weekstart;$i<=6;$i++ ) { 
-  echo "<th><font size=\"-1\">". $lang[$WeekDayName[$i]] ."</th>\n";
-}
- 
-for ( $i = 0;$i<$current_user->weekstart;$i++ ) {
-  echo "<th><font size=\"-1\">". $lang[$WeekDayName[$i]] ."</th>\n";
-}
-
-echo "</tr>\n";
-
-$ts = mktime(12,0,0,$m,1,$y);
-
-$today=Date("Ymd",time());
-
-/* Back to last weekstart before ts */
-while ( Date("w",$ts) != $l->user->weekstart ) {
-  $ts -= 86400;
-}
-
-$go = 1;
-$a = 0;
-$w = 0;
-while ( $go == 1 ) {
- $wd = Date("w",$ts);
- $xd = Date("j",$ts);
- $xxd = Date("d",$ts);
- $xm = Date("n",$ts);
- $xy = Date("Y",$ts);
- if ( $wd == $l->user->weekstart ) {
-   # new week
-   echo "<tr>\n";
-   $w0 =  (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3;
-   $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
-   echo " <td align=\"right\" class=\"week\">". $wn ."&nbsp;</td>\n";
- }
-
- $col = "";
- if ( $today == Date("Ymd",$ts) ) {
-   $col = "today";
- } else if ($xm != $m ) {
-   $col = "appday";
- } else if ($wd == 0 ) {
-   $col = "holiday";
- } 
- echo "<td align=\"right\" class=\"". $col ."\">\n";
- echo " <font size=\"-1\">\n";
- echo "  <a href=\"JavaScript:closeandaway(". ($xd + $n) .",". ($xm + $n) .",". ($yoff - $xy + $n) .")\">". $xxd ."</a>";
- echo " </font>\n";
- echo "</td>\n";
-
- if ( $wd == ($l->user->weekstart+6)%7   ) {
-   # end week
-   echo "</tr>\n";
-   if ( ($xm > $m) || ($xy > $y)  ) {
-     break;
-   }
- }
- $a++;
- $w++;
- $ts += 86400;
-}
-if ( $n == 1 ) {
-  echo "<tr><th colspan=\"8\"><a class=\"nodeco\" href=\"JavaScript:noneandaway()\">NONE</a></th></tr>";
-}
 
-echo "</table>\n";
-# selection of none allowed
+class minical extends layout {
+  function info() {
+    global $lang, $current_user;
+
+    $this->assign('f', $this->f);
+
+    $yoff =  Date("Y") + 10;
+    $nm = $this->m + 1;
+    $ny = $this->y;
+    if ( $nm == 13 ) {
+      $nm = 1;
+      $ny = $this->y + 1;
+    }
+    $lm = $this->m - 1;
+    $ly = $this->y;
+    if ( $lm == 0 ) {
+      $lm = 12;
+      $ly = $this->y -1;
+    }
+
+    $this->assign('self', $_SERVER['PHP_SELF']);
+    $this->assign('NavBack', $lang['NavBack']);
+    $this->assign('NavNext', $lang['NavNext']);
+    $this->assign('week', $lang['week']);
+
+    $this->assign('n', $this->n);
+    $this->assign('d', $this->d);
+    $this->assign('m', $this->m);
+    $this->assign('y', $this->y);
+    $this->assign('lm', $lm);
+    $this->assign('ly', $ly);
+    $this->assign('nm', $nm);
+    $this->assign('ny', $ny);
+
+    $WeekDayName = array('SSunday', 'SMonday', 'STuesday',
+			 'SWednesday', 'SThursday', 'SFriday', 'SSaturday');
+
+    $wdays = array();
+    for( $i = $current_user->weekstart; $i<=6; $i++ ) { 
+      $wdays[] = $lang[$WeekDayName[$i]];
+    }
+    for( $i = 0; $i<$current_user->weekstart; $i++ ) {
+      $wdays[] = $lang[$WeekDayName[$i]];
+    }
+    $this->assign('wdays', $wdays);
+
+    $ts = mktime(12,0,0,$this->m,1,$this->y);
+
+    $today=Date("Ymd",time());
+
+    // Back to last weekstart before ts
+    while( Date("w", $ts) != $current_user->weekstart ) {
+      $ts -= 86400;
+    }
+
+    $weeks = array();
+
+    $go = 1;
+    $a = 0;
+    $w = 0;
+    while ( $go == 1 ) {
+      $wd = Date("w",$ts);
+      $xd = Date("j",$ts);
+      $xxd = Date("d",$ts);
+      $xm = Date("n",$ts);
+      $xy = Date("Y",$ts);
+      if ( $wd == $current_user->weekstart ) {
+	// new week
+	$week = array();
+	$w0 =  (( 1 + Date("w",mktime(12,0,0,1,1, Date("Y",$ts) ) )) % 7) > 3;
+	$wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
+
+	$week = array();
+	$week['wn'] = $wn;
+	$week['days'] = array();
+      }
+
+      $col = "";
+      if ( $today == Date("Ymd",$ts) ) {
+	$col = "today";
+      } else if ($xm != $this->m ) {
+	$col = "appday";
+      } else if ($wd == 0 ) {
+	$col = "holiday";
+      } 
+
+      $week['days'][] = array('col' => $col,
+			      'd'   => $xd + $this->n,
+			      'm'   => $xm + $this->n,
+			      'y'   => $yoff - $xy + $this->n,
+			      'val' => $xxd);
+
+      if ( $wd == ($current_user->weekstart+6)%7   ) {
+	// end week
+	$weeks[] = $week;
+	$week = array();
+	if ( ($xm > $this->m) || ($xy > $this->y)  ) {
+	  break;
+	}
+      }
+      $a++;
+      $w++;
+      $ts += 86400;
+    }
+    if ( $this->n == 1 ) {
+      // echo "<tr><th colspan=\"8\"><a class=\"nodeco\" href=\"JavaScript:noneandaway()\">NONE</a></th></tr>";
+    }
+    $this->assign('weeks', $weeks);
+
+    $this->template('minical');
+  }
+
+  function prepare() {
+    $this->d = Date("d");
+    $this->m = Date("n");
+    $this->y = Date("Y");
+    $this->f = "default";
+
+    if (isset($_GET['f']) ) {
+      $this->f = $_GET['f'];
+    }
+    if (isset($_GET['d']) ) {
+      $this->d = $_GET['d'];
+    }
+    if (isset($_GET['m']) ) {
+      $this->m = $_GET['m'];
+    }
+    if (isset($_GET['y']) ) {
+      $this->y = $_GET['y'];
+    }
+    if (isset($_GET['n']) ) {
+      $this->n = $_GET['n'];
+    }
+    if ( $d == -1 ) {
+      $this->d = Date("d");
+    }
+    if ( $m == -1 ) {
+      $this->m = Date("n");
+    }
+    if ( $y == -1 ) {
+      $this->y = Date("Y");
+    }
+  }
+}
+
+$l = new minical($current_user);
+$l->PrintHeader("MiniCal");
+$l->display($withmenu = False);
 
-echo "<br>\n";
-echo "</body>\n";
-echo "</html>\n";
 
 ?>
 <!--

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.84.2.8
retrieving revision 1.84.2.9
diff -u -r1.84.2.8 -r1.84.2.9
--- mytutos.php	13 May 2004 16:23:53 -0000	1.84.2.8
+++ mytutos.php	24 Jun 2004 16:20:41 -0000	1.84.2.9
@@ -257,6 +257,7 @@
 
      // FIXME: The menu points to parts not yet implemented
      // $this->menuprint("mytutos", true);
+     // $this->menuprint("timetrack", true);
    }
 
    /**

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.64.2.2
retrieving revision 1.64.2.3
diff -u -r1.64.2.2 -r1.64.2.3
--- timetrack.pinc	16 Apr 2004 14:43:14 -0000	1.64.2.2
+++ timetrack.pinc	24 Jun 2004 16:20:41 -0000	1.64.2.3
@@ -603,6 +603,7 @@
       $x = array('url'      => "timetrack_new.php?mode=1&amp;lid=". $obj->id,
                  'confirm'  => false,
                  'text'     => ($text == "" ? $lang['TTRecord']:$text),
+		 'image'    => 'timetrack',
                  'info'     => $lang['TTRecord'],
                  'category' => array("timetrack","new","module")
 		  );
@@ -611,6 +612,7 @@
       $x = array('url'      => "timetrack_new.php?lid=". $obj->id,
                  'confirm'  => false,
                  'text'     => ($text == "" ? $lang['TimetrackCreate']:$text),
+		 'image'    => 'timetrack',
                  'info'     => sprintf($lang['TimetrackCreateI'],
 				       $obj->getFullName()),
                  'category' => array("timetrack","new","module")
@@ -628,7 +630,7 @@
       return;
     }
     return array('url'      => "timetrack_select.php",
-                 'image'    => timetrack::getHtmlIcon(),
+                 'image'    => 'timetrack',
                  'text'     => ($text == "" ?  $lang['Search']: $text),
                  'info'     => $lang['SearchForTT'],
                  'category' => array("search","timetrack","obj")

Index: timetrack_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_select.php,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- timetrack_select.php	22 Aug 2003 17:49:10 -0000	1.20
+++ timetrack_select.php	24 Jun 2004 16:20:41 -0000	1.20.2.1
@@ -10,10 +10,11 @@
  include_once 'permission.p3';
  include_once 'timetrack.pinc';
 
+include_once 'layout/layout.pinc';
+
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("timetrack","select");
- loadlayout();
 
  /**
   * display a timetrack selection form
@@ -25,63 +26,28 @@
    Function info() {
      global $lang , $tutos;
 
-     echo "<br><br><center>\n";
-     echo "<form name=\"ttsearch\" action=\"timetrack_overview.php\" method=\"get\">\n";
-     DoubleTableStart();
-
-     echo "<tr>\n";
-     if ( $this->ext == 0 ) {
-       echo "<th colspan=\"3\">". $lang['SearchForTT'] ."</th>\n";
-       echo "</tr><tr>\n";
-
-       echo $this->showfieldc($lang['AdrName']);
-       echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
-       echo " <td align=\"center\">\n";
-       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForTT'] ."\"></td>\n";
-       echo "</tr><tr>\n";
-       echo " <td colspan=\"2\" align=\"center\"><font size=\"-1\">&nbsp;</font></td>\n";
-       echo " <td align=\"center\">". makelink("timetrack_select.php?ext=1",$lang['extended']) ."</td>\n";
-     } else {
-       echo "<th colspan=\"3\">". $lang['SearchForTTExt'] ."</th>\n";
+     $this->assign('action', "template_overview.php");
+     $this->assign('ext', $this->ext);
 
-       echo "</tr><tr>\n";
-       echo $this->showfieldc($lang['AdrName']);
-       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">";
-       echo " </td>\n";
-       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchForTTExt'] ."\"></td>\n";
-
-       echo "</tr><tr>\n";
-       echo " <td rowspan=\"2\" class=\"desc\">". $lang['TimetrackBetween'] ."</td>\n";
-       echo " <td colspan=\"2\">&nbsp;";
-       $this->fd->EnterDate("f",1);
-       echo "&nbsp;</td>\n";
-
-       echo "</tr><tr>\n";
-       echo " <td colspan=\"2\">&nbsp;";
-       $this->td->EnterDate("t",1);
-       echo "&nbsp;</td>\n";
-
-       echo "</tr><tr>\n";
-       echo $this->showfieldc($lang['TTState']);
-       echo " <td colspan=\"2\"><select name=\"state\">";
-       echo "   <option value=\"-2\">". $lang['any'] ."</option>\n";
-       foreach ($lang['TTStates'] as $s => $x) {
-         echo "   <option value=\"". $s ."\"". ($this->state == $s ? " selected" : "") .">". $lang['TTStates'][$s] ."</option>\n";
-       }
-       echo "</select></td>\n";
-
-       echo "</tr><tr>\n";
-       echo $this->showfieldc($lang['TimetrackWorker']);
-       echo " <td colspan=\"2\">\n";
-       echo $this->user->askPeople("worker",$this->user->id,0);
-       echo " </td>\n";
-     }
-     echo "</tr>\n";
-     DoubleTableEnd();
-     hiddenFormElements();
-     echo "</form>\n";
-     echo "</center>\n";
-     echo $this->setfocus("ttsearch.name");
+     // if( $this->ext == 0 ) {
+       $this->assign('title', $lang['SearchForTT']);
+       
+       $this->assign('name',
+		     array('id'    => 'name',
+			   'label' => $lang['AdrName'],
+			   'value' => $this->lookfor));
+     
+       $this->assign('search',
+		     array('label' => $lang['Search'],
+			   'title' => $lang['SearchForTT']));
+     
+       $this->assign('extlink',
+		     array('label' => $lang['extended'],
+			   'link'  => "timetrack_select.php?ext=1",
+			   'title' => $lang['extended']));
+     // }
+     
+     $this->template('timetrack_select');
    }
    /**
     * naviagte

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

Modified Files:
      Tag: BRANCH-2-0
	task_new.tpl 
Added Files:
      Tag: BRANCH-2-0
	minical.tpl timetrack_select.tpl 
Log Message:
* Rewrite of minical using templates
* Work begins on timetrack templating


--- NEW FILE: minical.tpl ---
{* The mini calendar *}
{* $Id: minical.tpl,v 1.1.2.1 2004/06/24 16:20:42 tapoueh Exp $ *}

<div id="overDiv" style="position:absolute; visibility:hide; z-index:1;">
</div>

<script language="JavaScript" src="../html/overlib.js" type="text/javascript">
</script>

{literal}
<script language='JavaScript'>
 function closeandaway (d, m, y) { 
  var x = opener.document.forms[0]; 

{/literal}
  x.{$f}_d.selectedIndex = d; 
  x.{$f}_m.selectedIndex = m; 
  x.{$f}_y.selectedIndex = y; 
  window.close(); 
{literal}
 }
 function noneandaway () { 
  var x = opener.document.forms[0]; 
{/literal}
  
  x.{$f}_d.selectedIndex = 0; 
  x.{$f}_m.selectedIndex = 0; 
  x.{$f}_y.selectedIndex = 0; 
{literal}
  window.close(); 
 }
{/literal}
</script>

<table class="single" border="0" cellpadding="2" cellspacing="0" width="100%">
<tr>

<th colspan="2" align="left">
 <font size="-1">
 <a class="nodeco"
    href="{$base}/php/minical.php?f={$f}&n={$n}&m={$lm}&d={$d}&y={$ly}">{$NavBack}</a>
 </font>
</th>
<th colspan="4" align="center">{$m}/{$y}</th>
<th colspan="2" align="right">
 <font size="-1">
 <a class="nodeco"
    href="{$base}/php/minical.php?f={$f}&n={$n}&m={$nm}&d={$d}&y={$ny}">{$NavNext}</a>
</th>
</tr>

<tr>
<th><font size="-1">{$week}</font></th>
{foreach from=$wdays item=day}
<th><font size="-1">{$day}</font></th>
{/foreach}
</tr>

{section loop=$weeks name=w}
<tr>
 <td align="right" class="week">{$weeks[w].wn}</td>

 {foreach from=$weeks[w].days item=day}
 <td align="right" class="{$day.col}">
   <a href="JavaScript:closeandaway({$day.d},{$day.m},{$day.y})">{$day.val}</a>
 </td>
 {/foreach}
</tr>
{/section}
</table>

--- NEW FILE: timetrack_select.tpl ---
{* TimeTrack selection form *}
{* $Id: timetrack_select.tpl,v 1.1.2.1 2004/06/24 16:20:42 tapoueh Exp $ *}

<form name="ttsearch" method="get" action="{$action}">

<table class="summary">
<thead>
<tr>
<th colspan="3"><img src="{$base}/html/classic/timetrack.png">{$title}</th>
</tr>
</thead>

<tbody>
<tr>
<td class="desc">
  <label for="{$name.id}">{$name.label}</label>
</td>
<td align="center">
  <input id="{$name.id}" type="text" value="{$name.value}" name="{$name.id}">
</td>
<td align="center">
 <input type="submit" value="{$search.label}" title="{$search.title}">
</td>
</tr>

{*
<tr>
<td colspan="3" align="right">
 <a href="{$extlink.link}" title="{$extlink.title}">{$extlink.label}</a>
</td>
</tr>
*}
</tbody>
</table>
</form>
Index: task_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_new.tpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- task_new.tpl	18 Jun 2004 15:23:31 -0000	1.1.2.6
+++ task_new.tpl	24 Jun 2004 16:20:42 -0000	1.1.2.7
@@ -160,6 +160,13 @@
 {html_options name=$s_start_y.name
       values=$s_start_y.options output=$s_start_y.options
       selected=$s_start_y.selected}
+
+<a href="JavaScript:
+var d = document.forms[0];
+mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
+mywindow.location.href = '{$base}/php/minical.php?f={$s_start_d.f}&amp;n=0&amp;d={$s_start_d.selected}&amp;m={$s_start_m.selected}&amp;y={$s_start_y.selected}&amp;SID';
+mywindow.focus();" title="MiniCal">MiniCal</a>
+
  </td>
 </tr>
 
@@ -180,6 +187,13 @@
 {html_options name=$s_end_y.name
       values=$s_end_y.options output=$s_end_y.options
       selected=$s_end_y.selected}
+
+<a href="JavaScript:
+var d = document.forms[0];
+mywindow = window.open('', 'calendar', 'resizable=yes,width=300,height=200,top=100,left=100');
+mywindow.location.href = '{$base}/php/minical.php?f={$s_end_d.f}&amp;n=0&amp;d={$s_end_d.selected}&amp;m={$s_end_m.selected}&amp;y={$s_end_y.selected}&amp;SID';
+mywindow.focus();" title="MiniCal">MiniCal</a>
+
  </td>
 </tr>
 

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* Rewrite of minical using templates
* Work begins on timetrack templating


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- layout.pinc	8 Jun 2004 09:55:36 -0000	1.1.2.1
+++ layout.pinc	24 Jun 2004 16:20:41 -0000	1.1.2.2
@@ -441,35 +441,45 @@
     $this->template("layout_start");
 
     // Now the menus
-    $this->template("menu_start");
 
-    // Include per module navigation first
-    $this->navigate();
+    if( $this->withmenu ) {
+      if( $tutos[debug] )
+	error_log('Menu start');
 
-    // I comment out most of menu entries, as I don't think they
-    // should be printed out...
+      $this->template("menu_start");
 
-    // $this->menuprint("mytutos", true);
-    // $this->menuprint("help",    true);
+      // Include per module navigation first
+      $this->navigate();
 
-    if ( $this->nomenu == false ) {
-      $this->menuprint("obj",  true);
-      //$this->menuprint("view", false);
+      // I comment out most of menu entries, as I don't think they
+      // should be printed out...
 
-      $this->menuprint("default", true);
+      // $this->menuprint("mytutos", true);
+      // $this->menuprint("help",    true);
 
-      $this->menuprint("overview", false);
-      // $this->menuprint("search",   false);
+      if ( $this->nomenu == false ) {
+	$this->menuprint("obj",  true);
+	//$this->menuprint("view", false);
 
-      // $this->menuprint("support", false);
-      // $this->menuprint("module",  false);
-      // $this->menuprint("admin",   false);
+	$this->menuprint("default", true);
 
-      // $this->menuprint("url", false);
-    }
+	$this->menuprint("overview", false);
+	// $this->menuprint("search",   false);
+
+	// $this->menuprint("support", false);
+	// $this->menuprint("module",  false);
+	// $this->menuprint("admin",   false);
 
-    //$this->menuprint("logout",  true);
-    $this->template("menu_stop");
+	// $this->menuprint("url", false);
+      }
+
+      //$this->menuprint("logout",  true);
+      $this->template("menu_stop");
+    }
+    else {
+      if( $tutos[debug] )
+	error_log('Menu stop');
+    }
 
     # the remaining parts are put into an table field
     if ($msg != "") {
@@ -498,9 +508,11 @@
   /**
    * display the screen
    */
-  function display () {
+  function display ($withmenu = True) {
     global $msg;
 
+    $this->withmenu = $withmenu;
+
     if( $tutos[debug] )
       error_log('Layout display');
 
@@ -509,9 +521,14 @@
       $this->action = $this->action();
     }
 
-    if( $tutos[debug] )
-      error_log('Layout mainmenu');
-    $this->mainmenu();
+    if( $this->withmenu ) {
+      if( $tutos[debug] )
+	error_log('Layout mainmenu');
+      $this->mainmenu();
+    }
+    else
+      if( $tutos[debug] )
+	error_log('Layout skipping mainmenu ($withmenu False)');
 
     if( $tutos[debug] )
       error_log('Layout prepare');
@@ -582,18 +599,21 @@
      for( $i=1; $i<11; $i++ ) $opty[] = sprintf("%02d", date("Y")-5+$i);
 
      $this->assign($date.'_d',
-		   array('name'     => $date.'_d',
+		   array('f'        => $date, // field basename
+			 'name'     => $date.'_d',
 			 'label'    => $label,
 			 'options'  => $optd,
 			 'selected' => $selected->day));
 
      $this->assign($date.'_m',
-		   array('name'    => $date.'_m',
+		   array('f'        => $date, // field basename
+			 'name'    => $date.'_m',
 			 'options' => $optm,
 			 'selected' => $selected->month));
 
      $this->assign($date.'_y',
-		   array('name'    => $date.'_y',
+		   array('f'        => $date, // field basename
+			 'name'    => $date.'_y',
 			 'options' => $opty,
 			 'selected' => $selected->year));
 

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18418/html/classic

Added Files:
      Tag: BRANCH-2-0
	timetrack.png 
Log Message:
* Rewrite of minical using templates
* Work begins on timetrack templating


--- NEW FILE: timetrack.png ---
‰PNG




YŠÜ­
¥-íéyñ¨d8X–ø¿~þŸ<ÿžßÿ㶭ð¼W¯nLÜs0	·VÁY0®WúO;«ãç€ÌíàOüÈ[ûŸ}î•ûÛý;jpe‘º@*ç㳟¦¯öŸxƒjöÌ
ÒÍàÚ]‡Ï}óݗö=¸Cmj$êU4É%R	ûEÅ¥£ó`9òøSÓcß±r÷„+uo?ÿú©—n÷“lÒÐU™Ÿ]S$	E“qM›ÙTšÄ}m,j]eFϏy};<¹ûœ§ºjU’M*¡€†ì‘YwÁÀª‚+Â`ŠúˆŸ–x€u5,\Ê·WæGNÖߐ¸©ëȞ::÷èÍ
ª""IàJàœÀ;5€o?¿BmÐK×¾6DZêÀ—ì½¼n´6á5­=â

± B,ìAA×!¨Ø´À¥¡)ª¦M÷IJëôkìjR‰&ÚjZ÷n‰{ëwÆuÕ×B@l–Ó9~Zòêlg/dè=t7š
•»L_¬)kê¬T5Œ¼ÄØl‰áësNß{¯
]>â®Õ{+üHzO¨qçÞ@(ÒlÛ¶³œ3ŠÙéïÁ¾”ovñOŕ;.ƒÛô„

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

Modified Files:
      Tag: BRANCH-1-2
	file.pinc 
Log Message:
Display header on mytutos page as other modules do


Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.5
diff -u -r1.41.2.4 -r1.41.2.5
--- file.pinc	24 Jun 2004 10:22:01 -0000	1.41.2.4
+++ file.pinc	24 Jun 2004 11:01:37 -0000	1.41.2.5
@@ -1056,7 +1056,7 @@
 
     $r = info_table_start();
     $r .= " <tr>\n";
-    $m = tutos_file::getSelectLink($current_user);
+    $m = tutos_file::getSelectLink($current_user,$lang['Files']);
     $r .= " <th colspan=\"3\">".  $current_user->layout->theme->getImage(tutos_file::getHtmlIcon(),'list') ." ". menulink($m[url],$m[text],$m[info]) ."</th>\n";
     $r .= " </tr>\n";
     $r .= " <tr>\n";

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

Modified Files:
      Tag: BRANCH-1-2
	file.pinc 
Log Message:
added getModURL needed for showGuiIcons
cleanups


Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- file.pinc	23 Jun 2004 13:01:12 -0000	1.41.2.3
+++ file.pinc	24 Jun 2004 10:22:01 -0000	1.41.2.4
@@ -75,7 +75,7 @@
        $nf->tablename = $dbconn->prefix ."files";
        $oldacl        = $f->acl;
        $nf->save();
-       
+
        $nf->acl = $oldacl;
        acl_save($nf);
 
@@ -132,7 +132,7 @@
   /**
    * fill the object data with a given resultset
    *
-   * @param Object $r    a result set object 
+   * @param Object $r    a result set object
    * @param int    $pos  a index in the resultset
    */
   function read_result(&$r, $pos ) {
@@ -201,8 +201,8 @@
     }
   }
   /**
-   * fill the internal neighbour list with possible objects where a object
-   * currently attached/referncing to THIS could be reattached
+   * fill the internal neighbour list with possible objects where an object
+   * currently attached/referencing to THIS could be reattached
    */
   function getNeighbours () {
     global $lang;
@@ -222,7 +222,7 @@
     return $this->neighbours;
   }
   /**
-   * get a list of possible new parents foreach existing parent
+   * get a list of possible new parents for each existing parent
    */
   function read_relations ( ) {
     global $lang;
@@ -244,13 +244,19 @@
     return $this->name ." ". $this->version;
   }
   /**
-   * Return a url to this file
+   * Return an URL to show this file
    */
   function getURL() {
     return "file/file_show.php?id=".$this->id ;
   }
   /**
-   * Return a URL to delete this address
+   * Return an URL to modify this file
+   */
+  function getModURL() {
+    return "file/file_new.php?id=".$this->id ;
+  }
+  /**
+   * Return an URL to delete this file
    */
   function getDelURL() {
     return "file/file_del.php?id=". $this->id;
@@ -315,7 +321,7 @@
         while(list($key, $val) = each($exif)) {
             if (gettype($val) == "array") {
               echo "\t". $key ."\n";
-              foreach($val as $k2 => $v2) { 
+              foreach($val as $k2 => $v2) {
                 if ($k2 == "MakerNote") {
                   echo "\t\t". $k2 ." => ". gettype($v2)."\n";
                 } else if ($k2 == "UserComment") {
@@ -492,7 +498,7 @@
       $fp = fopen($this->base ."/". $this->fileloc, "r");
       @fpassthru ($fp);
       return;
-    } else if ( (($this->filetype == "application/msword") || ($this->filetype == "application/doc")) 
+    } else if ( (($this->filetype == "application/msword") || ($this->filetype == "application/doc"))
                 && file_exists($tutos[wvHtml]) && is_executable($tutos[wvHtml]) ) {
       Header("Content-type: text/html");
       Header("Content-Description: ". $this->name );
@@ -509,8 +515,8 @@
       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
       myreadfile ($this->base ."/". $this->fileloc);
       return;
-    } else if ( eregi("\.mm$",$this->filename) && 
-              (($this->filetype == "application/freemin") || ($this->filetype == "application/octet-stream")) && 
+    } else if ( eregi("\.mm$",$this->filename) &&
+              (($this->filetype == "application/freemin") || ($this->filetype == "application/octet-stream")) &&
               (file_exists($tutos[base]."/".$tutos[freemind]))) {
       Header("Content-type: text/html");
       echo '<html><head><title>'.$this->getFullname().'</title></head><body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">'."\n";
@@ -567,7 +573,7 @@
     return acl_del_ok($this);
   }
   /**
-   * Are Modifiacations allowed ?
+   * Are modifications allowed ?
    */
   function mod_ok() {
     global $current_user,$tutos;
@@ -584,7 +590,6 @@
   }
   /**
    * make a list of _old_ versions
-   *
    */
   function make_vlist() {
     $xx =  $this->base ."/". $this->fileloc;
@@ -630,7 +635,7 @@
     return $this->setStrField("name",$value,"FileNameDoc");
   }
   /**
-   * set the files name
+   * set the file's name
    */
   function setFilename($value) {
     return $this->setStrField("filename",$value,"FileName");
@@ -662,7 +667,7 @@
     return;
   }
   /**
-   * Save Filereference to DB
+   * Save file reference to DB
    * Copy file to repository
    */
   function save() {
@@ -721,7 +726,7 @@
       $msg .= "<br>FILE NOT SAVED";
       return $msg;
     }
-    
+
     $q->addFV("name",$this->name,"STRING",$table['file']['name'][size]);
     $q->addFV("filename",$this->filename,"STRING",$table['file']['filename'][size]);
     $q->addFV("logtxt",$this->logtxt,"TEXT");
@@ -752,7 +757,7 @@
         } else {
           @move_uploaded_file ($this->tmploc , $this->base ."/". $this->fileloc);
         }
-      }   
+      }
       if (!file_exists($this->base ."/". $this->fileloc)) die('missing file '. $this->base ."/". $this->fileloc);
       @chmod ($this->base ."/". $this->fileloc, $this->fileperm);
       if ( $this->vsys == FILE_NOVERS ) {
@@ -836,7 +841,7 @@
     return $msg;
   }
   /**
-   * delete the database entry 
+   * delete the database entry
    */
   function delete() {
     global $current_user;
@@ -897,7 +902,7 @@
     return usedocmanagement;
   }
   /**
-   * get the type id of object
+   * get the icon type
    */
   function getHtmlIcon () {
     return 'paper';
@@ -910,7 +915,7 @@
    * Read all urls related to given id
    */
   function obj_read(&$obj) {
-    if ( $obj == -1 ) return; 
+    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( ! isset($obj->id) )  return;
 
@@ -961,7 +966,7 @@
   function infolist (&$user,&$obj,$cols,$format = "html") {
     global $lang;
 
-    if ( $obj == -1 ) return; 
+    if ( $obj == -1 ) return;
     if (! is_object($obj) ) return;
     if ( $obj->id < 1000 ) return;
 
@@ -989,7 +994,7 @@
   function getaddlink (&$user,&$obj,$text = "") {
      global $lang;
 
-     if ( $obj == -1 ) return ""; 
+     if ( $obj == -1 ) return "";
      if (! is_object($obj) ) return "";
      if ( $obj->id == -1 ) return "";
      if (! $user->feature_ok(usedocmanagement,PERM_NEW) ) return "";
@@ -1004,7 +1009,7 @@
      return $x;
   }
   /**
-   * delete file entries for a object
+   * delete file entries for an object
    */
   Function obj_delete(&$user,&$obj) {
     $msg = "";
@@ -1017,7 +1022,7 @@
     return $msg;
   }
   /**
-   * create a link to a overview page
+   * create a link to an overview page
    */
   function getSelectLink (&$user,$text = "") {
     global $lang,$tutos;
@@ -1032,7 +1037,7 @@
                 );
   }
   /**
-   * show the mytutos info about notes
+   * show the mytutos info about files
    */
   function mytutos (&$user) {
     global $tutos,$lang,$current_user;

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

Modified Files:
      Tag: BRANCH-1-2
	company_new.php company_overview.php company_show.php 
	department_new.php department_show.php 
Log Message:
Search links without clear target shouldn't be called just "Search"


Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.59.2.1
retrieving revision 1.59.2.2
diff -u -r1.59.2.1 -r1.59.2.2
--- company_new.php	25 May 2004 19:04:13 -0000	1.59.2.1
+++ company_new.php	24 Jun 2004 09:27:46 -0000	1.59.2.2
@@ -168,7 +168,7 @@
      }
 
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",
@@ -207,4 +207,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: company_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_overview.php,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -u -r1.45 -r1.45.2.1
--- company_overview.php	26 Mar 2004 11:01:23 -0000	1.45
+++ company_overview.php	24 Jun 2004 09:27:46 -0000	1.45.2.1
@@ -210,7 +210,7 @@
 	 }
      }  
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -u -r1.68 -r1.68.2.1
--- company_show.php	20 Apr 2004 13:15:47 -0000	1.68
+++ company_show.php	24 Jun 2004 09:27:46 -0000	1.68.2.1
@@ -204,7 +204,7 @@
        $this->name .= ": ". $this->obj->getFullName();
      }
      #menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",
@@ -251,4 +251,4 @@
  $l = new company_show($current_user);
  $l->display();
  $dbconn->Close();
-?>
\ No newline at end of file
+?>

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -u -r1.51.2.1 -r1.51.2.2
--- department_new.php	25 May 2004 19:04:28 -0000	1.51.2.1
+++ department_new.php	24 Jun 2004 09:27:46 -0000	1.51.2.2
@@ -174,7 +174,7 @@
      preset_from_array_or_input($this->obj,'company',"c");
 
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
 
      if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
@@ -207,4 +207,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.55
retrieving revision 1.55.2.1
diff -u -r1.55 -r1.55.2.1
--- department_show.php	21 Mar 2004 16:55:48 -0000	1.55
+++ department_show.php	24 Jun 2004 09:27:46 -0000	1.55.2.1
@@ -178,7 +178,7 @@
        $this->name .= ": ".$this->obj->getFullName();
      }
      # menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = tutos_address::getSelectLink($this->user,$lang['AddressSearch']);
      $this->addMenu($x);
 
      $x =  department::getaddlink($this->user,$this->obj,$lang['NewEntry']);
@@ -219,4 +219,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->