tutos-commits Mailing List for TUTOS

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

Modified Files:
	user_new.php 
Log Message:
cosmetics

Index: user_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user_new.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- user_new.php	8 Mar 2003 17:07:11 -0000	1.67
+++ user_new.php	27 Mar 2003 06:57:40 -0000	1.68
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * Editing of TUTOS users and their permissions
  *
@@ -261,7 +261,7 @@
        echo "  <input id=\"h[]\" type=\"checkbox\" name=\"h[]\" value=\"". strtolower($i) ."\" ". ($this->obj->holiday[strtolower($i)] == 1 ? "checked":"") .">". $i;
        if ( 0 == ($xx % 6) ) {
          echo "<br>\n";
-	   } else {
+       } else {
          echo "&nbsp;&nbsp;";
        }
        $xx++;
@@ -283,7 +283,7 @@
          echo "<br>\n";
        } else {
          echo "&nbsp;&nbsp;";
-	   }
+       }
        $xx++;
      }
      echo " </td>\n";
@@ -364,7 +364,7 @@
      }
 
      if ( $this->obj->uid != -1 ) {
-       $this->name = $lang['UserModify'];
+       $this->name = $lang['UserModify'] .": ". $this->obj->login;
      } else {
        $this->name = $lang['UserCreate'];
      }
@@ -424,4 +424,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	installation_new.php 
Log Message:
cosmetics

Index: installation_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_new.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- installation_new.php	12 Jan 2003 09:24:48 -0000	1.7
+++ installation_new.php	27 Mar 2003 06:57:40 -0000	1.8
@@ -121,7 +121,7 @@
      $this->obj = new installation($this->dbconn);
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
-       $this->name = $lang['InstModify'] ." ". $this->obj->getFullName();
+       $this->name = $lang['InstModify'] .": ". $this->obj->getFullName();
        $this->addHidden("id",$this->obj->id);
      } else {
        $this->name = $lang['InstCreate'];
@@ -142,7 +142,7 @@
      }
      if ( isset($_GET['desc']) ) {
        $this->obj->description = $_GET['desc'];
-	 }
+     }
 
      # Installer
      preset_from_array_or_input($this->obj,'installer',"i");
@@ -205,4 +205,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	group_new.php group_show.php 
Log Message:
cosmetics

Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- group_new.php	1 Mar 2003 19:12:44 -0000	1.18
+++ group_new.php	27 Mar 2003 06:57:00 -0000	1.19
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2003 by Gero Kohnert
  *
  * Group of Interest Management
  *
@@ -68,7 +68,7 @@
      }
      echo $this->DataTableEnd();
      hiddenFormElements();
-	 echo $this->getHidden();
+     echo $this->getHidden();
      echo "</form>\n";
      echo $this->setfocus("groupnew.name");
      echo $lang['FldsRequired'] ."\n";
@@ -88,13 +88,13 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
-       $this->name = $lang['GroupModify'] ." : ". $this->obj->getFullName();
+       $this->name = $lang['GroupModify'] .": ". $this->obj->getFullName();
      } else {
        $this->name = $lang['GroupCreate'];
      }
 
      if ( isset($_GET['name']) ) {
-	   $this->obj->name = StripSlashes($_GET['name']);
+       $this->obj->name = StripSlashes($_GET['name']);
      }
      if ( isset($_GET['desc']) ) {
        $this->obj->desc = StripSlashes($_GET['desc']);

Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- group_show.php	1 Mar 2003 23:04:29 -0000	1.21
+++ group_show.php	27 Mar 2003 06:57:00 -0000	1.22
@@ -127,8 +127,8 @@
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else {
-       $this->name .=" :". $this->obj->getFullName();
-	 }
+       $this->name .=": ". $this->obj->getFullName();
+     }
      # menu
      $m = group::getOverviewLink($this->user,$lang['Search']);
      $this->addMenu($m);

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

Modified Files:
	webelements.p3 team_show.php team_new.php task_show.php 
	product_show.php product_new.php department_show.php 
	department_new.php database_ins.php company_show.php 
	company_new.php bug_show.php bug_new.php base.pinc 
	app_show.php address_show.php address_select.php 
Log Message:
cosmetics

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- webelements.p3	25 Mar 2003 15:40:41 -0000	1.210
+++ webelements.p3	25 Mar 2003 19:18:25 -0000	1.211
@@ -404,7 +404,7 @@
   global $current_user,$lang,$tutos,$dbconn,$HTTP_POST_FILES;
 
   if ( ! headers_sent() ) {
-    @ob_end_clean();
+#    @ob_end_clean();
     loadlayout();
     $l = new layout($current_user);
     $l->PageHeader("FATAL ERROR");

Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- team_show.php	24 Mar 2003 10:19:54 -0000	1.42
+++ team_show.php	25 Mar 2003 19:18:27 -0000	1.43
@@ -65,18 +65,18 @@
 
      $line = 0;
 
-	 usort($this->obj->member,"member_sort");
+     usort($this->obj->member,"member_sort");
 
-	 foreach ($this->obj->member as  $obj) {
+     foreach ($this->obj->member as  $obj) {
        echo $this->OverviewRowStart($line);
-	   if ($obj->getType() == "team") {
+       if ($obj->getType() == "team") {
          echo "<td colspan=\"2\">". $lang[$obj->getType()]." ".$obj->getLink() ."</td>\n";
-	   } else {
+       } else {
          echo "<td>". $obj->getLink() ."</td>\n";
          echo "<td>". AsEmail($obj->default_email(),$obj->default_email(),$obj->getFullName()) ."</td>\n";
-	   }
+       }
        echo $this->OverviewRowStart($line++);
-	 }
+     }
 
 
      product::infolist($this->user,$this->obj,2,$this->format);
@@ -112,6 +112,7 @@
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else {
+       $this->name .= ": ".$this->obj->getFullName();
        $this->obj->read_member();
      }
      # menu
@@ -139,7 +140,7 @@
                    category => array("timetrack","module")
                  );
        $this->addMenu($x);
-	 }
+     }
      if ( ($this->obj->id > 0) && $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
        $x = array( url => "task_overview.php?id=".$this->obj->id,
                    text => $lang['TaskOverview'],
@@ -147,31 +148,31 @@
                    category => array("task","module")
                  );
        $this->addMenu($x);
-	 }
+     }
      if ( ($this->obj->id > 0) 
-		  && $this->user->feature_ok(usetaskmanagement,PERM_SEE) 
-		  && $this->user->feature_ok(usetimetrack,PERM_SEE) 
-		  ) {
+          && $this->user->feature_ok(usetaskmanagement,PERM_SEE) 
+          && $this->user->feature_ok(usetimetrack,PERM_SEE) 
+          ) {
        $x = array( url => "res_cal.php?id=".$this->obj->id,
                    text => $lang['ResCal'],
                    info => $lang['ResCal'],
                    category => array("timetrack","task","module")
                  );
        $this->addMenu($x);
-	 }
+     }
      if ( $this->obj->id > 0) {
-	   $x = $this->obj->getMailLink($this->user);
+       $x = $this->obj->getMailLink($this->user);
        $this->addMenu($x);
-	 }
+     }
      if ( ($this->obj->id > 0) && $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-	   $x = $this->obj->getCalLink($this->user);
+       $x = $this->obj->getCalLink($this->user);
        $this->addMenu($x);
      }
 
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 
@@ -182,4 +183,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- team_new.php	9 Mar 2003 19:13:37 -0000	1.39
+++ team_new.php	25 Mar 2003 19:18:27 -0000	1.40
@@ -193,7 +193,7 @@
        $this->obj->read($_GET['id']);
        $this->obj->read_member();
        $this->obj->read_permissions();
-       $this->name = $lang['TeamModify'] ." : ". $this->obj->getFullName();
+       $this->name = $lang['TeamModify'] .": ". $this->obj->getFullName();
        team::obj_read($this->obj);
      } else {
        $this->obj->name = $lang['PlsChangeName'];

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- task_show.php	18 Feb 2003 05:25:45 -0000	1.54
+++ task_show.php	25 Mar 2003 19:18:28 -0000	1.55
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * @modulegroup task
  * @module task_show
@@ -50,7 +50,7 @@
 #       echo $pre.$i." ". $x;
        echo $pre.$this->obj->worker[$i]->getLink();
        $pre = "<br>\n";
-	 }
+     }
      echo " </td>\n";
      echo " </tr>\n";
 
@@ -123,7 +123,7 @@
        $rows = 0;
        if ( $this->obj->timetracksum > 0) {
          $rows++;
-	   }
+       }
        @reset ($this->obj->tsum);
        while( list ($i,$f) = @each ($this->obj->tsum)) {
          if ( $this->obj->tsum[$i] > 0 ) {
@@ -148,7 +148,7 @@
            echo "</tr>\n";
            $r = 1;
            $timesum += $this->obj->timetracksum;
-	     }
+         }
          @reset ($this->obj->tsum);
          while( list ($i,$f) = @each ($this->obj->tsum)) {
            if ( $this->obj->tsum[$i] > 0 ) {
@@ -244,8 +244,8 @@
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else {
-       $this->name .=" : ". $this->obj->getFullName();
-	 }
+       $this->name .=": ". $this->obj->getFullName();
+     }
      # menu
 
      $x = task::getaddlink($this->user,$this->obj,$lang['NewEntry']);
@@ -272,13 +272,13 @@
      if ( $this->obj->mod_ok() ) {
        $x = bug::getaddlink($this->user,$this->obj);
        $this->addMenu($x);
-	 }
+     }
      $x = timetrack::getaddlink($this->user,$this->obj);
      $this->addMenu($x);
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- product_show.php	8 Mar 2003 17:07:10 -0000	1.76
+++ product_show.php	25 Mar 2003 19:18:28 -0000	1.77
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * display all product info
  *
@@ -174,16 +174,16 @@
          $x = count($this->obj->tasklist);
 
          if ( $this->format == "paper" ) {
-	       $rows = count($this->obj->tasklist);
+           $rows = count($this->obj->tasklist);
          } else {
-	       $rows = $tutos[maxshort];
+           $rows = $tutos[maxshort];
          }
 
          while ( list ($i,$f) = @each ($this->obj->tasklist) ) {
-	       if ( ($n >= $rows) && ( $x != $rows ) ) {
-	         echo  $this->theme->getImage(folder,'list') ." ". makelink("task_overview.php?id=". $this->obj->id,sprintf($lang['AllEntries'], count($this->obj->tasklist)));
-		     break;
-		   }
+           if ( ($n >= $rows) && ( $x != $rows ) ) {
+             echo  $this->theme->getImage(folder,'list') ." ". makelink("task_overview.php?id=". $this->obj->id,sprintf($lang['AllEntries'], count($this->obj->tasklist)));
+             break;
+           }
            echo $this->theme->getImage(paper,'list') ." ". $f->getLink() ."<br>\n";
            $n++;
          }
@@ -203,7 +203,7 @@
        $rows = 0;
        if ( $this->obj->timetracksum > 0) {
          $rows++;
-	   }
+       }
        @reset ($this->obj->tsum);
        while( list ($i,$f) = @each ($this->obj->tsum)) {
          if ( $this->obj->tsum[$i] > 0 ) {
@@ -228,7 +228,7 @@
            echo "</tr>\n";
            $r = 1;
            $timesum += $this->obj->timetracksum;
-	     }
+         }
          @reset ($this->obj->tsum);
          while( list ($i,$f) = @each ($this->obj->tsum)) {
            if ( $this->obj->tsum[$i] > 0 ) {
@@ -294,7 +294,7 @@
        }
 
        echo "</td></tr>\n<tr><td>\n";
-	   //       echo checklist::getaddlink($this->user,$this->obj);
+       //       echo checklist::getaddlink($this->user,$this->obj);
      }
      echo "</td></tr>\n";
    }
@@ -316,8 +316,8 @@
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else {
-       $this->name = $lang['ProductsDetail']." :". $this->obj->getFullName();
-	 }
+       $this->name = $lang['ProductsDetail'].": ". $this->obj->getFullName();
+     }
 
      # Menu      
      $x = product::getSelectLink($this->user,$lang['Search']);
@@ -348,7 +348,7 @@
        $this->addMenu($x);
      }
      if ( ($this->obj->id > 0) && $this->user->feature_ok(usetimetrack,PERM_NEW) ) {
-	   $x = array( url =>"timetrack_new.php?mode=1&amp;lid=".$this->obj->id,
+       $x = array( url =>"timetrack_new.php?mode=1&amp;lid=".$this->obj->id,
                    text => $lang['TTRecord'],
                    info => $lang['TTRecord'],
                    category => array("timetrack","module","new"),
@@ -369,7 +369,7 @@
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 
@@ -380,4 +380,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- product_new.php	8 Mar 2003 17:35:18 -0000	1.67
+++ product_new.php	25 Mar 2003 19:18:28 -0000	1.68
@@ -272,7 +272,7 @@
          $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
          $this->stop = true;
        }
-       $this->name = $lang['ProdModifyT'] ." : ". $this->obj->getFullName();
+       $this->name = $lang['ProdModifyT'] .": ". $this->obj->getFullName();
        $this->obj->readroles();
      } else {
        $this->name = $lang['ProdCreateT'];

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- department_show.php	23 Dec 2002 10:01:35 -0000	1.48
+++ department_show.php	25 Mar 2003 19:18:29 -0000	1.49
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * @modulegroup department
  * @module department_show
@@ -150,7 +150,7 @@
      }
 
      if ( $this->obj->id > 0 ) {
-       $this->name .= " :". $this->obj->getFullName();
+       $this->name .= ": ". $this->obj->getFullName();
      }
      # menu
      $x = tutos_address::getSelectLink($this->user,$lang['Search']);
@@ -170,12 +170,12 @@
      if ( class_exists( 'appointment') ) {
        $x = appointment::getaddlink($this->user,$this->obj);
        $this->addMenu($x);
-	 }
+     }
 
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 
@@ -186,4 +186,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- department_new.php	8 Mar 2003 19:20:08 -0000	1.46
+++ department_new.php	25 Mar 2003 19:18:29 -0000	1.47
@@ -142,7 +142,7 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
-       $this->name = $lang['DepartmentModify'] ." : ". $this->obj->getFullName();
+       $this->name = $lang['DepartmentModify'] .": ". $this->obj->getFullName();
      } else {
        $this->name = $lang['DepartmentCreate'];
        $this->obj->name     = $lang['PlsChangeName'];

Index: database_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_ins.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- database_ins.php	10 Mar 2003 18:11:18 -0000	1.13
+++ database_ins.php	25 Mar 2003 19:18:29 -0000	1.14
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2001 - 2002 by Gero Kohnert
+ * Copyright 2001 - 2003 by Gero Kohnert
  *
  */
  include_once 'webelements.p3';
@@ -8,7 +8,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("database");
+ loadmodules("database","ins");
 
  $gotourl = "database_new.php";
  $msg = "";
@@ -100,4 +100,4 @@
   *  CVS Info:  $Id$
   *  $Author$
   */
-?>
+?>
\ No newline at end of file

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- company_show.php	23 Dec 2002 10:01:34 -0000	1.54
+++ company_show.php	25 Mar 2003 19:18:30 -0000	1.55
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * @modulegroup company
  * @module company_show
@@ -156,7 +156,7 @@
      }
 
      if ( $this->obj->id > 0 ) {
-       $this->name .= " :". $this->obj->getFullName();
+       $this->name .= ": ". $this->obj->getFullName();
      }
      #menu
      $x = tutos_address::getSelectLink($this->user,$lang['Search']);
@@ -183,7 +183,7 @@
      if ( class_exists( 'appointment') ) {
        $x = appointment::getaddlink($this->user,$this->obj);
        $this->addMenu($x);
-	 }
+     }
      if ( class_exists( 'checklist') ) {
        $x = checklist::getaddlink($this->user,$this->obj);
        $this->addMenu($x);
@@ -191,7 +191,7 @@
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 

Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- company_new.php	8 Mar 2003 19:20:08 -0000	1.51
+++ company_new.php	25 Mar 2003 19:18:30 -0000	1.52
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * @modulegroup company
  * @module company_new
@@ -97,7 +97,7 @@
      echo "<tr><td>\n";
 
      if ( $this->obj->mod_ok()  ) {
-	   if (count($this->obj->location) > 0) {
+       if (count($this->obj->location) > 0) {
          DoubleTableStart();
          foreach($this->obj->location as $i => $f) {
            echo "<tr><th colspan=\"2\">". sprintf($lang['AdrLocTitle'],$f->lname) ."</th></tr>\n";
@@ -118,7 +118,7 @@
            echo "</tr>\n";
          }
          DoubleTableEnd();
-	   }
+       }
        if ( $this->obj->id > 0  ) {
          echo menulink("company_new.php?id=". $this->obj->id ."&loc_id=-1",$lang['AdrLNew'],sprintf($lang['AdrLNewInfo'],$this->obj->getFullName())) ."<br>";
        }
@@ -136,7 +136,7 @@
      $this->obj = new company($this->dbconn);
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
-       $this->name = $lang['CompanyModify'] ." : ". $this->obj->getFullName();
+       $this->name = $lang['CompanyModify'] .": ". $this->obj->getFullName();
        if ($this->obj->id < 0) {
          $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
          $this->stop = true;

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_show.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- bug_show.php	8 Mar 2003 13:33:02 -0000	1.52
+++ bug_show.php	25 Mar 2003 19:18:30 -0000	1.53
@@ -130,7 +130,7 @@
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else {
-       $this->name .=" :". $this->obj->getFullName();
+       $this->name .=": ". $this->obj->getFullName();
      }
      # menu
      $x = bug::getSelectLink($this->user,$lang['Search']);
@@ -159,7 +159,7 @@
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 
@@ -170,4 +170,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_new.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- bug_new.php	8 Mar 2003 19:20:07 -0000	1.56
+++ bug_new.php	25 Mar 2003 19:18:30 -0000	1.57
@@ -193,10 +193,10 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
-	   if ($this->obj->id < 0) {
+       if ($this->obj->id < 0) {
          $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
          $this->stop = true;
-	   }
+       }
        $this->name = sprintf($lang['BugModifyI'],$this->obj->getFullName());
      } else {
        $this->name = $lang['BugCreate'];

Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- base.pinc	9 Mar 2003 19:13:14 -0000	1.43
+++ base.pinc	25 Mar 2003 19:18:31 -0000	1.44
@@ -338,7 +338,7 @@
     $ret = "";
     if ( $current_user->feature_ok(usehistory,PERM_SEE) ) {
       $ret .= "<tr>\n";
-      $ret .= " <td colspan=\"". $cols ."\">". makelink("history_show.php?id=". $this->id,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$this->getFullname())) ."</td>\n";
+      $ret .= " <td colspan=\"". $cols ."\"><br>". makelink("history_show.php?id=". $this->id,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$this->getFullname())) ."</td>\n";
       $ret .= "</tr>\n";
     }
     return $ret;

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- app_show.php	8 Mar 2003 17:07:10 -0000	1.38
+++ app_show.php	25 Mar 2003 19:18:31 -0000	1.39
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -46,8 +46,8 @@
        Header("Content-Disposition: attachment; filename=\"appointment.ics\"");
        Header("Content-Description: Upload from TUTOS" );
        echo $this->obj->getIcal();
-	   return;
-	 }
+       return;
+     }
 
      echo $this->DataTableStart();
      echo "<tr>\n";
@@ -164,7 +164,7 @@
          } else {
            echo "<td>&nbsp;</td>";
          }
-	     if ( $this->obj->trace == 1 ) {
+         if ( $this->obj->trace == 1 ) {
            echo " <td colspan=\"2\">". $f->getLink() ."</td>";
            echo "<td>". $lang['AppState'][$this->obj->participant_state[$i]] ."</td>";
          } else {
@@ -251,7 +251,7 @@
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- address_show.php	8 Mar 2003 17:07:10 -0000	1.71
+++ address_show.php	25 Mar 2003 19:18:31 -0000	1.72
@@ -172,7 +172,7 @@
        $this->format = "html";
      } else {
        $this->obj->read_locs_data();
-       $this->name = $lang['AddressDetail']." :".$this->obj->getFullName();
+       $this->name = $lang['AddressDetail'].": ".$this->obj->getFullName();
 	 }
      # Menu      
      $x = tutos_address::getSelectLink($this->user,$lang['Search']);

Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- address_select.php	24 Mar 2003 10:21:31 -0000	1.32
+++ address_select.php	25 Mar 2003 19:18:31 -0000	1.33
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  * @modulegroup address
  * @module address_select
@@ -64,7 +64,7 @@
        echo "  &nbsp;<input type=\"checkbox\" value=\"city\" name=\"ext[]\"". $c['city'] .">&nbsp;". $lang['City'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"street\" name=\"ext[]\"". $c['street'] .">&nbsp;". $lang['Street'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"email\" name=\"ext[]\"". $c['email'] .">&nbsp;". $lang['AdrEmail'] ."<br>\n";
-       echo "  &nbsp;<input type=\"checkbox\" value=\"phone\" name=\"ext[]\"". $c['phone'] .">&nbsp;". $lang['Phone'] ."/". $lang['AdrFax']."\n";
+       echo "  &nbsp;<input type=\"checkbox\" value=\"phone\" name=\"ext[]\"". $c['phone'] .">&nbsp;". $lang['Phone'] ."/". $lang['AdrFax']."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"desc\" name=\"ext[]\"". $c['desc'] .">&nbsp;". $lang['Description']."\n";
        echo " </td>\n";
      }
@@ -91,7 +91,7 @@
          echo "<td colspan=2>\n";
          echo "<select name=\"sv\">\n";
          foreach($tutos[ldapserver] as $i => $t) {
-	       echo "<option value=\"". $i ."\"". ($this->ldapserver==$i ? " selected":"") .">". $t ."</option>\n";
+           echo "<option value=\"". $i ."\"". ($this->ldapserver==$i ? " selected":"") .">". $t ."</option>\n";
          }
          echo "</select>\n";
          echo "</td>\n";
@@ -153,7 +153,7 @@
        $this->ldapserver = $_SESSION['ldapserver'];
      } else {
        $this->ldapserver = 0;
-	 }
+     }
      if ( ! $this->user->feature_ok(useaddressbook,PERM_SEL) ) {
        $this->stop = true;
      }
@@ -190,4 +190,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	file_new.php file_show.php 
Log Message:
cosmetics

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- file_new.php	8 Mar 2003 19:20:09 -0000	1.6
+++ file_new.php	25 Mar 2003 19:18:37 -0000	1.7
@@ -119,7 +119,7 @@
      hiddenFormElements();
      $this->addHidden("gotourl","file/file_new.php");
      $this->addHidden("link_id", $this->obj->link_id);
-	 echo $this->getHidden();
+     echo $this->getHidden();
      echo "</form>\n";
      echo $lang['FldsRequired'] ."\n";
      echo $this->setfocus("fileadd.name");
@@ -146,6 +146,7 @@
          $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
          $this->stop = true;
        }
+       $this->name .= ": ".$this->obj->getFullName();
      } else {
        $this->name = $lang['FileCreation'];
        if ( isset($_GET['link_id']) ){
@@ -192,4 +193,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_show.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- file_show.php	8 Mar 2003 19:20:10 -0000	1.5
+++ file_show.php	25 Mar 2003 19:18:38 -0000	1.6
@@ -84,13 +84,13 @@
      if ( $this->format == "thumbnail" ) {
        $this->info_thumb();
        return;
-	 } else if ( $this->format == "show" ) {
+     } else if ( $this->format == "show" ) {
        $this->obj->show($this->version);
        return;
-	 } else if ( $this->format == "download" ) {
+     } else if ( $this->format == "download" ) {
        $this->info_download($this->version);
        return;
-	 }
+     }
 
      echo $this->DataTableStart();
      echo "<tr><th colspan=\"4\">". $lang['FileDetail'] ."</th></tr>\n";
@@ -195,6 +195,7 @@
 
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
+       $this->name .= ": ".$this->obj->getFullName();
      }
      if ( ! $this->obj->see_ok() ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
@@ -204,7 +205,7 @@
        $this->stop = true;
      } else {
        $this->obj->read_reference();
-	 }
+     }
      if ( ! isset($_GET['version']) ) {
        $this->version = $this->obj->version;
      } else {
@@ -240,7 +241,7 @@
      }
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 

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

Modified Files:
	resource_new.php resource_show.php 
Log Message:
cosmetics

Index: resource_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- resource_new.php	9 Mar 2003 19:13:17 -0000	1.16
+++ resource_new.php	25 Mar 2003 19:18:36 -0000	1.17
@@ -86,7 +86,7 @@
          $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
          $this->stop = true ;
        } else {
-         $this->name = $lang['ResModify'] ." : ". $this->obj->getFullName();
+         $this->name = $lang['ResModify'] .": ". $this->obj->getFullName();
        }
      } else {
        $this->name = $lang['ResCreate'];

Index: resource_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_show.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- resource_show.php	2 Dec 2002 20:47:06 -0000	1.18
+++ resource_show.php	25 Mar 2003 19:18:36 -0000	1.19
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2001 - 2002 by Gero Kohnert
+ * Copyright 2001 - 2003 by Gero Kohnert
  *
  * @modulegroup resource
  * @module resource_show
@@ -134,7 +134,7 @@
      $this->obj = new resource($this->dbconn);
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
-	 } else {
+     } else {
        $msg .= $lang['Err0048'] ."<br>";
        $this->stop = true;
      }
@@ -145,7 +145,7 @@
        $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
        $this->stop = true;
      } else {
-       $this->name .=" : ". $this->obj->getFullName();
+       $this->name .=": ". $this->obj->getFullName();
      }
      # menu
      $m = resource::getOverviewLink($this->user,$lang['Resources']);
@@ -177,7 +177,7 @@
      add_module_addlinks($this,$this->obj);
 
      # add this page to the browsehistory of the users session
-	 $this->addtohistory();
+     $this->addtohistory();
    }
  }
 
@@ -188,4 +188,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	invoice.pinc invoice_new.php invoice_show.php 
Log Message:
cosmetics

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- invoice.pinc	3 Mar 2003 19:51:53 -0000	1.35
+++ invoice.pinc	25 Mar 2003 19:18:34 -0000	1.36
@@ -709,11 +709,13 @@
     pdf_begin_page($pdf, 595, 842);
     pdf_add_outline($pdf, "Page 1");
 
-     if ( isset($tutos[logo]) && ereg("png",$logo) ) {
-       $pdfimage = pdf_open_image_file($pdf, "png",$tutos[logo]);
- 	   if ( $pdfimage ) {
-         pdf_place_image($pdf, $pdfimage, 30, 750, 1);
-         pdf_close_image($pdf,$pdfimage);
+    if ( isset($this->dbconn->db->logo) && 
+         ereg("png",$this->dbconn->db->logo) && 
+         file_exists(getcwd()."/".$tutos['base'] ."/". $this->dbconn->db->logo) ) {
+      $pdfimage = pdf_open_image_file($pdf, "png",$tutos['base'] ."/". $this->dbconn->db->logo);
+      if ( $pdfimage ) {
+        pdf_place_image($pdf, $pdfimage, 30, 750, 1);
+        pdf_close_image($pdf,$pdfimage);
  	  }
  	}
     pdf_moveto($pdf, 30, 750);
@@ -723,13 +725,13 @@
     $y = 760;
 	pdf_set_font($pdf, "Times-Roman", 16, "host");
 	pdf_add_weblink($pdf,0,0,10,10,dirname(getBaseUrl()) ."/". $this->getUrl());
-    pdf_show_xy($pdf, $lang['Invoice']." ". $this->getFullName(), 150, $y);
+    pdf_show_xy($pdf, $lang['Invoice']." ". $this->getFullName() .getcwd()."/".$tutos['base'] ."/". $this->dbconn->db->logo , 150, $y);
     $y -= 40;
 
     # Customer
     # Accountant
 	$x = 50;
-    if (is_object($this->obj->customer) ) {
+    if (is_object($this->customer) ) {
   	  pdf_show_xy($pdf,$this->customer->getFullName(), $x, $y);
 	}
 	$x = 450;
@@ -1105,4 +1107,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- invoice_new.php	28 Feb 2003 15:30:28 -0000	1.27
+++ invoice_new.php	25 Mar 2003 19:18:35 -0000	1.28
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2003 by Gero Kohnert
  *
  * create a new invoice or modify an existing one
  *
@@ -341,7 +341,7 @@
          $msg .= sprintf($lang['Err0040'],$lang[$i->getType()]) . "<br>";
          $this->stop = true;
        }
-       $this->name .= " : ". $this->obj->getFullName();
+       $this->name .= ": ". $this->obj->getFullName();
        $this->obj->read_ref();
      } else {
        $this->name = $lang['InvoiceCreate'];

Index: invoice_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_show.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- invoice_show.php	2 Mar 2003 19:11:02 -0000	1.23
+++ invoice_show.php	25 Mar 2003 19:18:36 -0000	1.24
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2003 by Gero Kohnert
  *
  * show an invoice
  *
@@ -205,7 +205,7 @@
        $msg .= sprintf($lang['Err0040'],$lang[$i->getType()]);
        $this->stop = true;
      } else {
-       $this->name .= " : ". $this->obj->getFullName();
+       $this->name .= ": ". $this->obj->getFullName();
        $this->obj->read_pos();
        $this->obj->read_ref();
      }
@@ -246,4 +246,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
+-->
\ No newline at end of file

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

Modified Files:
	classic_base.pinc 
Log Message:
cosmetics

Index: classic_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/classic_base.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- classic_base.pinc	23 Mar 2003 22:11:15 -0000	1.34
+++ classic_base.pinc	25 Mar 2003 19:18:33 -0000	1.35
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2002 by Gero Kohnert
+ * Copyright 2002 - 2003 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -74,9 +74,12 @@
       echo "\n<!-- NO THEME ". $this->theme->name ." found -->\n";
     }
 
-	foreach ($tutos[themes] as $i) {
+    $x = $_SERVER['REQUEST_URI'];
+    $x = delUrlParameter($x,"th");
+    foreach ($tutos[themes] as $i) {
       echo " <link rel=\"alternate stylesheet\" title=\"TUTOS ". $i ." ". $lang['UserTheme'] ."\" href=\"". $tutos['base'] ."/html/".$i.".css\" type=\"text/css\">\n";
-	}
+      echo " <link rel=\"Alternate\" href=\"". addUrlParaMeter($x,"th=".$i) ."\" title=\"".  myentities($lang['UserTheme'] .": ".$i) ."\">\n";
+    }
 
     echo " <meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\">\n";
     echo " <link rel=\"icon\" href=\"". $tutos['base'] ."/html/tutos_small.gif\" type=\"image/gif\">\n";
@@ -84,11 +87,11 @@
     echo " <link rel=\"Copyright\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"Copyright\">\n";
     echo " <link rel=\"Help\" href=\"".  make_helplink() ."\" title=\"". $lang['Help']."\">\n";
     echo " <link rev=\"Made\" href=\"https://sourceforge.net/project/memberlist.php?group_id=8047\" hreflang=\"en\" target=\"url\" title=\"TUTOS Team\">\n";
-	$x = $_SERVER['REQUEST_URI'];
-	$x = delUrlParameter($x,"lg");
+    $x = $_SERVER['REQUEST_URI'];
+    $x = delUrlParameter($x,"lg");
     foreach($lang['lang'] as $i => $f) {
-      echo " <link rel=\"Alternate\" href=\"". addUrlParaMeter($x,"lg=".$i) ."\" title=\"". myentities($f) ."\">\n";
-	}
+      echo " <link rel=\"Alternate\" href=\"". addUrlParaMeter($x,"lg=".$i) ."\" title=\"".  myentities($lang['UserLanguage'] .": ".$f) ."\">\n";
+    }
     echo " <title>TUTOS: ". myentities($this->name) ."</title>\n";
     echo "</head>\n";
   }
@@ -263,7 +266,7 @@
       $l =  addUrlParameter($base,"xo=1",true);
       if ( isset ($_GET['xo']) && $_GET['xo'] == 1 &&  ($_GET['xf'] == $oname) ) {
         $r .= "(". makelink($l ,$this->theme->getImage(up,'list'),sprintf($lang['OrderBy'], $link)) .")";
-	  } else {
+      } else {
         $r .= makelink($l ,$this->theme->getImage(up,'list'),sprintf($lang['OrderBy'], $link));
       }
       if ( isset ($_GET['xo']) && ($_GET['xf'] == $oname) ) {
@@ -276,7 +279,7 @@
         $r .= "(". makelink($l ,$this->theme->getImage(down,'list'),sprintf($lang['RevOrderBy'],$link)) .")";
       } else {
         $r .= makelink($l ,$this->theme->getImage(down,'list'),sprintf($lang['RevOrderBy'],$link));
-	  }
+      }
     }
     $r .= "</th>\n";
     return $r;
@@ -289,10 +292,10 @@
 
     if ( ! isset($this->user->id) || ($this->user->id == -1) ) {
       return;
-	}
+    }
     if ( "help.php" == basename($_SERVER['PHP_SELF']) ) {
       return;
-	}
+    }
     if (! method_exists($this->user,"feature_ok") ) {
       return;
     }
@@ -308,16 +311,16 @@
     }
     if ( $this->user->feature_ok(useaddressbook,PERM_SEL) ) {
       $x = tutos_address::getSelectLink($this->user);
-	  $x[category][] = "default";
+      $x[category][] = "default";
       if ( basename($_SERVER['PHP_SELF']) == "address_select.php" ) {
         $x[url] = "";
       }
       $this->addMenu($x);
-	}
+    }
     if ( $this->user->feature_ok(usebugtracking,PERM_SEL) ) {
       require_once 'bug.pinc';
       $x = bug::getSelectLink($this->user,$lang['BugTrack']);
-	  $x[category][] = "default";
+      $x[category][] = "default";
       if ( basename($_SERVER['PHP_SELF']) == "bug_select.php" ) {
         $x[url] = "";
       }
@@ -326,7 +329,7 @@
     if ( $this->user->feature_ok(useprojects,PERM_SEL) ) {
       require_once 'product.pinc';
       $x = product::getSelectLink($this->user,$lang['ProductMenu']);
-	  $x[category][] = "default";
+      $x[category][] = "default";
       if ( basename($_SERVER['PHP_SELF']) == "product_select.php" ) {
         $x[url] = "";
       }
@@ -335,7 +338,7 @@
 
     if ( $this->user->feature_ok(useteams,PERM_SEL) ) {
       $x = team::getSelectLink($this->user);
-	  $x[category][] = "default";
+      $x[category][] = "default";
       if ( basename($_SERVER['PHP_SELF']) == "team_select.php" ) {
         $x[url] = "";
       }
@@ -391,7 +394,7 @@
         $urllist = array();
         foreach ( $this->user->teams as $idx => $val ) {
           url::obj_read($this->user->teams[$idx]);
-	      $urllist = array_merge($urllist,$this->user->teams[$idx]->urllist);
+          $urllist = array_merge($urllist,$this->user->teams[$idx]->urllist);
         }
         if ( count($urllist) > 0 ) {
           foreach ( $urllist as $idx => $val ) {

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

Modified Files:
	blue.css white.css 
Log Message:
cosmetics

Index: blue.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/blue.css,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- blue.css	10 Mar 2003 18:54:10 -0000	1.36
+++ blue.css	25 Mar 2003 19:18:31 -0000	1.37
@@ -42,7 +42,7 @@
 
 .warn {
 	font-weight: bold;
-	color: red;
+	color: #FF4080;
 }
 
 /* preformatted text */
@@ -367,7 +367,6 @@
 SPAN.warn {
 	font-weight: bold;
 	font-size: 14px;
-	color: red;
 }
 
 IMG.menu {
@@ -378,4 +377,4 @@
 	border: 0;
 }
 
-/* EOF */
+/* EOF */
\ No newline at end of file

Index: white.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/white.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- white.css	10 Mar 2003 18:54:14 -0000	1.13
+++ white.css	25 Mar 2003 19:18:32 -0000	1.14
@@ -40,14 +40,9 @@
 }
 */
 
-div.message {
-	margin-top: 20px;
-	text-align: center;
-}
-
 .warn {
 	font-weight: bold;
-	color: red;
+	color: #FF4080;
 }
 
 /* preformatted text */
@@ -369,9 +364,14 @@
 	background: #E8E8E8;
 }
 
+div.message {
+	margin-top: 20px;
+	text-align: center;
+}
+
 SPAN.warn {
 	font-weight: bold;
-	color: red;
+	font-size: 14px;
 }
 
 IMG.menu {

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

Modified Files:
	webelements.p3 
Log Message:
do not show passwords in fatal_error and debug output


Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- webelements.p3	23 Mar 2003 22:11:14 -0000	1.209
+++ webelements.p3	25 Mar 2003 15:40:41 -0000	1.210
@@ -350,13 +350,18 @@
   $msg .= "URL:\t\t". $_SERVER["PHP_SELF"] ."\n";
   $msg .= "Request:\t". $_SERVER["REQUEST_URI"] ."\n";
   if ( count($_POST) ) {
-    @reset($_POST);
-    while ( list ($i,$f) = @each ($_POST) ) {
+    foreach($_POST as $i => $f) {
       if ( is_Array($f) ) {
         foreach ($f as $i1 => $f1) {
+          if ($i1 == "pw") {
+            $f1 = "xxx";
+          }
           $msg .= "POST:\t\t". $i ."[". $i1 ."]\t--> ". $f1 ."\n";
         }
       } else {
+        if ($i == "pw") {
+          $f = "xxx";
+        }
         $msg .= "POST:\t\t". $i . "\t--> ". $f ."\n";
       }
     }
@@ -440,13 +445,18 @@
     echo "<b>Called from:</b>&nbsp;<a href=\"". $_SERVER['HTTP_REFERER'] ."\">". $_SERVER['HTTP_REFERER'] ."</a><br>\n";
   }
   if ( count($_POST) ) {
-    @reset($_POST);
-    while ( list ($i,$f) = @each ($_POST) ) {
+    foreach($_POST as $i => $f) {
       if ( is_Array($f) ) {
         foreach ($f as $i1 => $f1) {
+          if ($i1 == "pw") {
+            $f1 = "xxx";
+          }
           echo "<b>POST:</b>&nbsp;". $i ."[". $i1 ."]&nbsp = ". $f1 ."<br>\n";
         }
       } else {
+        if ($i == "pw") {
+          $f = "xxx";
+        }
         echo "<b>POST:</b>&nbsp;". $i . "&nbsp; = ". $f ."<br>\n";
       }
     }

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

Modified Files:
	mail.pinc 
Log Message:
fix uninitialized array

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mail.pinc	14 Mar 2003 07:00:44 -0000	1.51
+++ mail.pinc	24 Mar 2003 10:27:19 -0000	1.52
@@ -159,7 +159,7 @@
     $pre = "";
     if ( count($this->cc) ) {
       foreach($this->cc  as $i => $obj) {
-        if ( $this->sent[$obj->id] == 1 ) {
+        if ( isset($this->sent[$obj->id]) && ($this->sent[$obj->id] == 1) ) {
           continue;
         }
         $t = $obj->default_email();
@@ -194,7 +194,7 @@
     $x = array();
     if ( count($this->cc) ) {
       foreach($this->cc as $i => $obj) {
-        if ( $this->sent[$obj->id] == 1 ) {
+        if ( isset($this->sent[$obj->id]) && ($this->sent[$obj->id] == 1) ) {
           continue;
         }
         if (!is_object($obj)){
@@ -250,7 +250,7 @@
     $pre = "";
     if ( count($this->bcc) ) {
       foreach($this->bcc  as $i => $obj) {
-        if ( $this->sent[$obj->id] == 1 ) {
+        if ( isset($this->sent[$obj->id]) && ($this->sent[$obj->id] == 1) ) {
           continue;
         }
         $t = $obj->default_email();
@@ -285,7 +285,7 @@
     $x = array();
     if ( count($this->bcc) ) {
       foreach($this->bcc as $i => $obj) {
-        if ( $this->sent[$obj->id] == 1 ) {
+        if ( isset($this->sent[$obj->id]) && ($this->sent[$obj->id] == 1) ) {
           continue;
         }
         if (!is_object($obj)){

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

Modified Files:
	address_select.php 
Log Message:
fix

Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- address_select.php	22 Mar 2003 19:28:35 -0000	1.31
+++ address_select.php	24 Mar 2003 10:21:31 -0000	1.32
@@ -50,6 +50,8 @@
        $c['city'] = "";
        $c['street'] = "";
        $c['email'] = "";
+       $c['desc'] = "";
+       $c['phone'] = "";
        if ( isset($tutos[adrsearch]) ) {
          @reset($tutos[adrsearch]);
          while( list ($i,$f) = @each ($tutos[adrsearch])) {
@@ -58,12 +60,12 @@
        }
 
        echo " <td colspan=\"3\">\n";
-       echo "  &nbsp;<input type=\"checkbox\" value=\"name\" name=\"ext[]\"". $c['name'] .">&nbsp;". $lang['AdrLastName'] ." & ". $lang['AdrFirstName'] ."<br>\n";
+       echo "  &nbsp;<input type=\"checkbox\" value=\"name\" name=\"ext[]\"". $c['name'] .">&nbsp;". $lang['AdrLastName'] ." &amp; ". $lang['AdrFirstName'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"city\" name=\"ext[]\"". $c['city'] .">&nbsp;". $lang['City'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"street\" name=\"ext[]\"". $c['street'] .">&nbsp;". $lang['Street'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"email\" name=\"ext[]\"". $c['email'] .">&nbsp;". $lang['AdrEmail'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"phone\" name=\"ext[]\"". $c['phone'] .">&nbsp;". $lang['Phone'] ."/". $lang['AdrFax']."\n";
-       echo "  &nbsp;<input type=\"checkbox\" value=\"desc\" name=\"ext[]\"". $c['desc'] .">&nbsp;". $lang['Desc']."\n";
+       echo "  &nbsp;<input type=\"checkbox\" value=\"desc\" name=\"ext[]\"". $c['desc'] .">&nbsp;". $lang['Description']."\n";
        echo " </td>\n";
      }
 

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

Modified Files:
	installation_ins.php 
Log Message:
fix

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- installation_ins.php	12 Jan 2003 09:24:47 -0000	1.6
+++ installation_ins.php	24 Mar 2003 10:21:31 -0000	1.7
@@ -58,7 +58,7 @@
  }
 
  $money = 0.0;
- sscanf($_POST['money'],"%f",&$money);
+ list($money) = sscanf($_POST['money'],"%f");
  if ( !empty($money) && !is_double($money) ) {
    $msg .= sprintf($lang['Err0017'],$lang['Money']) ."<br>";
  }

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

Modified Files:
	team_show.php 
Log Message:
sorted team members

Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- team_show.php	8 Mar 2003 17:07:10 -0000	1.41
+++ team_show.php	24 Mar 2003 10:19:54 -0000	1.42
@@ -17,6 +17,16 @@
  loadmodules("team","show");
  loadlayout();
 
+ function member_sort(&$a,&$b) {
+   if ( ($a->gettype() == 'team') && ($b->gettype() != 'team') ) {
+     return 1;
+   }
+   if ( ($b->gettype() == 'team') && ($a->gettype() != 'team') ) {
+     return -1;
+   }
+   # both are the same type, so we can compare
+   return ($a->getFullName() < $b->getFullName()) ? -1 : 1;
+ }
  /**
   * display an overview of installations
   */
@@ -54,7 +64,10 @@
      echo "</tr>\n";
 
      $line = 0;
-	 foreach ($this->obj->member as $i => $obj) {
+
+	 usort($this->obj->member,"member_sort");
+
+	 foreach ($this->obj->member as  $obj) {
        echo $this->OverviewRowStart($line);
 	   if ($obj->getType() == "team") {
          echo "<td colspan=\"2\">". $lang[$obj->getType()]." ".$obj->getLink() ."</td>\n";

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

Modified Files:
	url.pinc url_new.php 
Log Message:
multiple fixes

Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- url.pinc	10 Mar 2003 18:11:36 -0000	1.6
+++ url.pinc	23 Mar 2003 22:11:15 -0000	1.7
@@ -99,6 +99,7 @@
       $q->addFV("creator",$this->creator,"OBJ");
       $q->addFV("creation",$this->creation,"DATETIME");
       $query = $q->getInsert();
+      acl_default($this,$current_user);
     } else {
       $q->addWC("id",$this->id,"");
       $query = $q->getUpdate();

Index: url_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_new.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- url_new.php	9 Mar 2003 19:13:18 -0000	1.5
+++ url_new.php	23 Mar 2003 22:11:15 -0000	1.6
@@ -88,6 +88,7 @@
        $this->name = $lang['URLMod'];
        $this->addHidden("id",$this->obj->id);
        $this->ref = getObject($this->dbconn,$this->obj->link_id);
+       $this->addHidden("link_id",$this->ref->id);
        if ($this->obj->id < 0) {
          $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]);
          $this->stop = true;
@@ -96,6 +97,7 @@
        $this->name = $lang['URLCreate'];
        if ( isset($_GET['link_id']) ){
          $this->ref = getObject($this->dbconn,$_GET['link_id']);
+         $this->addHidden("link_id",$this->ref->id);
        } else {
          $this->stop = true;
        }
@@ -109,8 +111,7 @@
      }
 
 
-     $this->addHidden("link_id",$this->ref->id);
-
+ 
      if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
        $x = array( url => "url/url_del.php?id=". $this->obj->id,
                    text => $lang['Delete'],

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

Modified Files:
	classic_base.pinc 
Log Message:
multiple fixes

Index: classic_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/classic_base.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- classic_base.pinc	14 Mar 2003 18:16:21 -0000	1.33
+++ classic_base.pinc	23 Mar 2003 22:11:15 -0000	1.34
@@ -59,7 +59,7 @@
     } else {
       echo "<html dir=\"ltr\">\n";
     }
-    echo "<!-- Copyright 1999 - 2002 by Gero Kohnert gok...@us... -->\n";
+    echo "<!-- Copyright 1999 - 2003 by Gero Kohnert gok...@us... -->\n";
     echo "<!-- all rights reserved -->\n";
     echo "<head>\n";
     echo " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=". $lang['content_encoding'] ."\">\n";
@@ -82,6 +82,13 @@
     echo " <link rel=\"icon\" href=\"". $tutos['base'] ."/html/tutos_small.gif\" type=\"image/gif\">\n";
     echo " <link rel=\"SHORTCUT ICON\" href=\"". $tutos['base'] ."/html/tutos.ico\">\n";
     echo " <link rel=\"Copyright\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"Copyright\">\n";
+    echo " <link rel=\"Help\" href=\"".  make_helplink() ."\" title=\"". $lang['Help']."\">\n";
+    echo " <link rev=\"Made\" href=\"https://sourceforge.net/project/memberlist.php?group_id=8047\" hreflang=\"en\" target=\"url\" title=\"TUTOS Team\">\n";
+	$x = $_SERVER['REQUEST_URI'];
+	$x = delUrlParameter($x,"lg");
+    foreach($lang['lang'] as $i => $f) {
+      echo " <link rel=\"Alternate\" href=\"". addUrlParaMeter($x,"lg=".$i) ."\" title=\"". myentities($f) ."\">\n";
+	}
     echo " <title>TUTOS: ". myentities($this->name) ."</title>\n";
     echo "</head>\n";
   }

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

Modified Files:
	address_tools.p3 bug.pinc config_default.pinc 
	team_overview.php webelements.p3 
Log Message:
multiple fixes

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- address_tools.p3	22 Mar 2003 19:28:35 -0000	1.59
+++ address_tools.p3	23 Mar 2003 22:11:14 -0000	1.60
@@ -167,6 +167,7 @@
    echo "<tr>\n";
 
    $needloc = 0;
+   $col = 0;
    if ( $ashow['f_name'] ) {
      echo $layout->orderHeader("f_name",$lang['AdrFirstName'],$atool['link2']);
      $col++;

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- bug.pinc	13 Mar 2003 10:28:06 -0000	1.101
+++ bug.pinc	23 Mar 2003 22:11:14 -0000	1.102
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 1999 - 2002 by Gero Kohnert
+ * Copyright 1999 - 2003 by Gero Kohnert
  *
  *  CVS Info:  $Id$
  *  $Author$
@@ -192,8 +192,8 @@
     if ( $this->solver == -1 ) {
       # set default
       if ( $this->parent->getType() == "product" ) {
-          $this->parent->readroles();
-          if ( count($this->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
+        $this->parent->readroles();
+        if ( count($this->parent->role[PROD_ROLE_MANAGER]) > 0 ) {
           $this->solver = current($this->parent->role[PROD_ROLE_MANAGER]);
         }else if ( count($this->parent->role[PROD_ROLE_MANAGER2]) > 0 ) {
           $this->solver = current($this->parent->role[PROD_ROLE_MANAGER2]);
@@ -573,13 +573,13 @@
       # Prepare the mail list
       if ( $this->parent->getType() == "product" ) {
         $this->parent->readroles();
-	    foreach($tutos['bugnew_prod_mail'] as $r) {
+        foreach($tutos['bugnew_prod_mail'] as $r) {
           if ( count($this->parent->role[$r]) > 0 ) {
             foreach($this->parent->role[$r] as $i => $o) {
               $ml[$o->id] = $o;
             }
           }
-	    }
+        }
       }
     } else {
       $q->addWC("id",$this->id,"");
@@ -612,13 +612,13 @@
       # Prepare the mail list
       if ( $this->parent->getType() == "product" ) {
         $this->parent->readroles();
-	    foreach($tutos['bugmod_prod_mail'] as $r) {
+        foreach($tutos['bugmod_prod_mail'] as $r) {
           if ( count($this->parent->role[$r]) > 0 ) {
             foreach($this->parent->role[$r] as $i => $o) {
               $ml[$o->id] = $o;
             }
           }
-	    }
+        }
       }
     }
 
@@ -949,4 +949,4 @@
     return $r;
   }
 }
-?>
+?>
\ No newline at end of file

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- config_default.pinc	12 Mar 2003 05:52:21 -0000	1.54
+++ config_default.pinc	23 Mar 2003 22:11:14 -0000	1.55
@@ -560,7 +560,7 @@
 # (For products, files, installations, bugs)
 # 0 = everybody can see it
 # 1 = all teams of the creator can see it
-# 2 = no default-acl, defaultgroups from db     __this is alpha__ 
+# 2 = no default-acl, defaultgroups from db
 #
 $tutos[defaultacl] = 2;
 #
@@ -603,10 +603,10 @@
 # this is alpha and only tested within mozilla 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.1a) Gecko/20020610'
 # at time, there only a few debug-tags in sourcecode
 #
-$tutos[debugConsole]=1;
+$tutos[debugConsole]=0;
 #
 # The TUTOS Version number
 #
-$tutos[version]="1.1beta.20030311";
+$tutos[version]="1.1beta.20030314";
 #
 ?>

Index: team_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_overview.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- team_overview.php	14 Mar 2003 18:16:05 -0000	1.39
+++ team_overview.php	23 Mar 2003 22:11:14 -0000	1.40
@@ -176,7 +176,7 @@
      order_parse($this->q,$this->link1,$xxx,$xxx,"name");
 
      # Menu      
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
+     $x = team::getSelectLink($this->user,$lang['Search']);
      $this->addMenu($x);
 
      if ( $this->user->isAdmin() ) {

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- webelements.p3	8 Mar 2003 19:20:09 -0000	1.208
+++ webelements.p3	23 Mar 2003 22:11:14 -0000	1.209
@@ -596,7 +596,17 @@
 }
 
 
-/* ---------------------------------------------------------------------------
+/**
+ * remove a key from a url
+ *
+ */
+ Function delUrlParameter($href,$key) {
+
+   $href = ereg_replace("[&]". $key ."=[^&]*","",$href);
+   $href = ereg_replace("[?]". $key ."=[^&]*[&]","?",$href);
+   return $href;
+ }
+/**
  * add keys to a url
  *
  */

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

Modified Files:
	about.html 
Log Message:
multiple fixes

Index: about.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/about.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- about.html	1 Mar 2003 19:12:33 -0000	1.16
+++ about.html	23 Mar 2003 22:11:14 -0000	1.17
@@ -44,7 +44,7 @@
  <li>English (us,british)
  <li>German
  <li>Italian
- <li>Spanish (castelano,nicaruga and mexican)
+ <li>Spanish (castellano,nicaruga and mexican)
  <li>French
  <li>Traditional Chinese
  <li>Simplified Chinese

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

Modified Files:
	Makefile 
Log Message:
multiple fixes

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile	10 Feb 2003 04:59:13 -0000	1.58
+++ Makefile	23 Mar 2003 22:11:13 -0000	1.59
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.59  2003/03/23 22:11:13  gokohnert
+# multiple fixes
+#
 # Revision 1.58  2003/02/10 04:59:13  gokohnert
 # added missing picture
 #
@@ -711,7 +714,7 @@
 	@cd .. ; ls -1 tutos/documentation/book0/* >> tutos/tmp.$@
 	@cat tmp.$@ | grep -v "custom.p3" | grep -v "ja.p3" | grep -v "hu.p3" | grep -v "ca.p3"|  grep -v php/config.pinc | sort -u > $@
 
-download-php: php.list
+download-php: php.list additional
 	@cd ..;tar -T tutos/php.list -cjf tutos/tutos-php-${FULLVERSION}.tar.bz2; cd tutos
 	@cd ..;tar -T tutos/php.list -czf tutos/tutos-php-${FULLVERSION}.tar.gz; cd tutos 
 	@cd ..;cat tutos/php.list | zip -@ tutos/tutos-php-${FULLVERSION}.zip; cd tutos
@@ -941,7 +944,22 @@
 	HDL_fax.zip \
 	HDL_sms.zip \
 	HDL_phpweather.zip
-
+	@mv nuke.zip nuke-${FULLVERSION}.zip
+	@mv visual.zip visual-${FULLVERSION}.zip
+	@mv sqli.zip sqli-${FULLVERSION}.zip
+	@mv japanese.zip japanese-${FULLVERSION}.zip
+	@mv catalan.zip catalan-${FULLVERSION}.zip
+	@mv hungarian.zip hungarian-${FULLVERSION}.zip
+	@mv czech.zip czech-${FULLVERSION}.zip
+	@mv ticker.zip ticker-${FULLVERSION}.zip
+	@mv merge.zip merge-${FULLVERSION}.zip
+	@mv checklist.zip checklist-${FULLVERSION}.zip
+	@mv palm.zip palm-${FULLVERSION}.zip
+	@mv requirements.zip requirements-${FULLVERSION}.zip
+	@mv HDL_cia_factbook.zip HDL_cia_factbook-${FULLVERSION}.zip
+	@mv HDL_mapquest.zip HDL_mapquest-${FULLVERSION}.zip
+	@mv HDL_sms.zip HDL_sms-${FULLVERSION}.zip
+	@mv HDL_phpweather.zip HDL_phpweather-${FULLVERSION}.zip
 
 THEMENUKE   = README.nuke \
 	html/nuke.css \

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

Modified Files:
	ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es.p3 fr.p3 
	hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 ru.p3 sv.p3 tw.p3 
	zh.p3 
Log Message:
added missing bcc lang variable

Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ca.p3	14 Mar 2003 18:16:09 -0000	1.23
+++ ca.p3	23 Mar 2003 08:26:13 -0000	1.24
@@ -391,6 +391,7 @@
 $lang['MailFrom']        = "De";
 $lang['MailTo']          = "Per";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Assumpte";
 $lang['MailSent']        = "enviant missatge %s a %s.";
 $lang['MailSentCc']      = "enviant copia de missatge %s a %s.";

Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cs.p3	14 Mar 2003 18:16:10 -0000	1.23
+++ cs.p3	23 Mar 2003 08:26:14 -0000	1.24
@@ -394,6 +394,7 @@
 $lang['MailFrom']        = "Od";
 $lang['MailTo']          = "Pro";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Obsah";
 $lang['MailSent']        = "posílám e-mail %s pro %s.";
 $lang['MailSentCc']      = "posílám e-mail %s (Cc) pro %s.";

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- de.p3	14 Mar 2003 18:16:10 -0000	1.25
+++ de.p3	23 Mar 2003 08:26:14 -0000	1.26
@@ -393,6 +393,7 @@
 $lang['MailFrom']        = "Von";
 $lang['MailTo']          = "An";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Betreff";
 $lang['MailSent']        = "Verschicke E-mail %s an %s.";
 $lang['MailSentCc']      = "Verschicke E-mail %s (Cc) an %s.";

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- el.p3	14 Mar 2003 18:16:10 -0000	1.24
+++ el.p3	23 Mar 2003 08:26:14 -0000	1.25
@@ -392,6 +392,7 @@
 $lang['MailFrom']        = "Áðü";
 $lang['MailTo']          = "Óå";
 $lang['MailCc']          = "ÁêñéâÝò áíôßãñáöï";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "ÈÝìá";
 $lang['MailSent']        = "áðïóôïëÞ mail %s óå %s.";
 $lang['MailSentCc']      = "áðïóôïëÞ mail %s (Cc) óå %s.";

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- en.p3	14 Mar 2003 18:16:11 -0000	1.26
+++ en.p3	23 Mar 2003 08:26:14 -0000	1.27
@@ -393,6 +393,7 @@
 $lang['MailFrom']        = "From";
 $lang['MailTo']          = "To";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Subject";
 $lang['MailSent']        = "sending mail %s to %s.";
 $lang['MailSentCc']      = "sending mail %s (Cc) to %s.";

Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- es-mx.p3	14 Mar 2003 18:16:11 -0000	1.22
+++ es-mx.p3	23 Mar 2003 08:26:14 -0000	1.23
@@ -390,6 +390,7 @@
 $lang['MailFrom']        = "De";
 $lang['MailTo']          = "Para";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Asunto";
 $lang['MailSent']        = "enviando correo %s a %s.";
 $lang['MailSentCc']      = "enviando correo %s (Cc) a %s.";

Index: es-ni.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- es-ni.p3	14 Mar 2003 18:16:12 -0000	1.22
+++ es-ni.p3	23 Mar 2003 08:26:14 -0000	1.23
@@ -391,6 +391,7 @@
 $lang['MailFrom']        = "De";
 $lang['MailTo']          = "Para";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Asunto";
 $lang['MailSent']        = "enviando correo %s a %s.";
 $lang['MailSentCc']      = "Enviando copia de correo %s (Cc) a %s.";

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- es.p3	14 Mar 2003 18:16:13 -0000	1.23
+++ es.p3	23 Mar 2003 08:26:14 -0000	1.24
@@ -390,6 +390,7 @@
 $lang['MailFrom']        = "De";
 $lang['MailTo']          = "Para";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Asunto";
 $lang['MailSent']        = "enviando mensaje %s a %s.";
 $lang['MailSentCc']      = "enviando copia de mensaje %s a %s.";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fr.p3	14 Mar 2003 18:16:15 -0000	1.22
+++ fr.p3	23 Mar 2003 08:26:14 -0000	1.23
@@ -390,6 +390,7 @@
 $lang['MailFrom']        = "De";
 $lang['MailTo']          = "À";
 $lang['MailCc']          = "Copie";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Sujet";
 $lang['MailSent']        = "Envoie de l'email %s à %s.";
 $lang['MailSentCc']      = "Envoie de l'email %s (Cc) à %s.";

Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- hu.p3	14 Mar 2003 18:16:15 -0000	1.20
+++ hu.p3	23 Mar 2003 08:26:14 -0000	1.21
@@ -394,6 +394,7 @@
 $lang['MailFrom']        = "tól";
 $lang['MailTo']          = "An";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Tárgy";
 $lang['MailSent']        = "E-mail küldés %s - %s.";
 $lang['MailSentCc']      = "E-mail küldés %s (Cc) - %s.";

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- it.p3	14 Mar 2003 18:16:15 -0000	1.23
+++ it.p3	23 Mar 2003 08:26:14 -0000	1.24
@@ -388,6 +388,7 @@
 $lang['MailFrom']        = "Da";
 $lang['MailTo']          = "A";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Oggetto";
 $lang['MailSent']        = "Sto inviando l'e-mail %s a %s.";
 $lang['MailSentCc']      = "Sto inviando l'e-mail %s (Cc) a %s.";

Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ja.p3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ja.p3	14 Mar 2003 18:16:15 -0000	1.22
+++ ja.p3	23 Mar 2003 08:26:14 -0000	1.23
@@ -387,6 +387,7 @@
 $lang['MailFrom']        = "From";
 $lang['MailTo']          = "To";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Subject";
 $lang['MailSent']        = "¥á¥¤¥ë %s ¤ò %s ¤ËÁ÷¿®Ãæ";
 $lang['MailSentCc']      = "¥á¥¤¥ë%s ¤ò (Cc)¤Ç %s.¤ËÁ÷¿®Ãæ";

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ko.p3	14 Mar 2003 18:16:16 -0000	1.22
+++ ko.p3	23 Mar 2003 08:26:15 -0000	1.23
@@ -390,6 +390,7 @@
 $lang['MailFrom']        = "º¸³½»ç¶÷";
 $lang['MailTo']          = "¹Þ´Â»ç¶÷";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Á¦¸ñ";
 $lang['MailSent']        = "ÆíÁö %s¸¦ %s¿¡°Ô º¸³À´Ï´Ù.";
 $lang['MailSentCc']      = "sending mail %s (Cc) to %s.";

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nl.p3	14 Mar 2003 18:16:16 -0000	1.26
+++ nl.p3	23 Mar 2003 08:26:15 -0000	1.27
@@ -397,6 +397,7 @@
 $lang['MailFrom']        = "Van";
 $lang['MailTo']          = "Aan";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Onderwerp";
 $lang['MailSent']        = "mail verzenden %s aan %s.";
 $lang['MailSentCc']      = "mail verzenden %s (Cc) aan %s.";

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pl.p3	14 Mar 2003 18:16:18 -0000	1.26
+++ pl.p3	23 Mar 2003 08:26:15 -0000	1.27
@@ -395,6 +395,7 @@
 $lang['MailFrom']        = "Od";
 $lang['MailTo']          = "Do";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Temat";
 $lang['MailSent']        = "wysy³anie poczty %s do %s.";
 $lang['MailSentCc']      = "wysy³anie poczty %s (Cc) do %s.";

Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pt-br.p3,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pt-br.p3	14 Mar 2003 18:16:19 -0000	1.23
+++ pt-br.p3	23 Mar 2003 08:26:15 -0000	1.24
@@ -389,6 +389,7 @@
 $lang['MailFrom']        = "De";
 $lang['MailTo']          = "Para";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Assunto";
 $lang['MailSent']        = "mandando mensagem %s para %s.";
 $lang['MailSentCc']      = "mandando mensagem %s (Cc) %s.";

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ru.p3	14 Mar 2003 18:16:20 -0000	1.27
+++ ru.p3	23 Mar 2003 08:26:15 -0000	1.28
@@ -391,6 +391,7 @@
 $lang['MailFrom']        = "ïÔ";
 $lang['MailTo']          = "ëÏÍÕ";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "ôÅÍÁ";
 $lang['MailSent']        = "ÏÔÐÒÁ×ËÁ ÐÏÞÔÙ %s × %s.";
 $lang['MailSentCc']      = "ÏÔÐÒÁ×ËÁ ÐÏÞÔÙ %s (Cc) × %s.";

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sv.p3	14 Mar 2003 18:16:20 -0000	1.24
+++ sv.p3	23 Mar 2003 08:26:15 -0000	1.25
@@ -386,6 +386,7 @@
 $lang['MailFrom']        = "Från";
 $lang['MailTo']          = "Till";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Angående";
 $lang['MailSent']        = "skickar E-post %s till %s.";
 $lang['MailSentCc']      = "skickar E-post %s (Cc) till %s.";

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/tw.p3,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tw.p3	14 Mar 2003 18:16:20 -0000	1.24
+++ tw.p3	23 Mar 2003 08:26:15 -0000	1.25
@@ -391,6 +391,7 @@
 $lang['MailFrom']        = "µo«H¤H";
 $lang['MailTo']          = "¦¬«H¤H";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "¥D¦®";
 $lang['MailSent']        = "±H°e«H¥ó %s µ¹ %s.";
 $lang['MailSentCc']      = "±H°e«H¥ó %s (Cc) µ¹ %s.";

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/zh.p3,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zh.p3	14 Mar 2003 18:16:21 -0000	1.24
+++ zh.p3	23 Mar 2003 08:26:15 -0000	1.25
@@ -393,6 +393,7 @@
 $lang['MailFrom']        = "From";
 $lang['MailTo']          = "To";
 $lang['MailCc']          = "Cc";
+$lang['MailBcc']         = "Bcc";
 $lang['MailSubject']     = "Ö÷Ö¼";
 $lang['MailSent']        = "sending mail %s to %s.";
 $lang['MailSentCc']      = "sending mail %s (Cc) to %s.";

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

Modified Files:
      Tag: BRANCH-1-0
	ja.p3 
Log Message:
several fixes

Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/ja.p3,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ja.p3	18 Dec 2002 14:26:09 -0000	1.1.2.7
+++ ja.p3	23 Mar 2003 07:38:53 -0000	1.1.2.8
@@ -94,7 +94,7 @@
 $lang['lang']['en']      = "english";
 $lang['lang']['en-US']   = "english US";
 $lang['lang']['de']      = "german";
-$lang['lang']['ja']      = "japanaese";
+$lang['lang']['ja']      = "japanese";
 $lang['lang']['fr']      = "french";
 $lang['lang']['es']      = "spanish";
 $lang['lang']['es-MX']   = "spanish/Mexico";
@@ -457,10 +457,10 @@
 $lang['TaskName']        = "¥¿¥¹¥¯Ì¾";
 $lang['TaskState']       = "¾õ¶·";
 $lang['TaskDesc']        = "ToDo";
-$lang['TaskWorker']      = "´üÆü¤Þ¤Ç¤Ë¹Ô¤¦";
-$lang['TaskVolumeFull']  = "ϫƯÎÌ";
+$lang['TaskWorker']      = "¥¢¥µ¥¤¥ó";
+$lang['TaskVolumeFull']  = "ɬÍפÊÁíϫƯÎÌ";
 $lang['TaskVolumeDone']  = "¤Ê¤µ¤ì¤¿Ï«Æ¯";
-$lang['TaskSubTask']     = "¥µ¥Ö¥¿¥¹¥¯ ";
+$lang['TaskSubTask']     = "±¦¤Î¥µ¥Ö¥¿¥¹¥¯";
 $lang['hours']           = "»þ´Ö";
 $lang['TaskCreation']    = "%s ¤¬ %s ¤ËºîÀ®";
 $lang['TaskStates'][0]   = "Á°Ãʳ¬";
@@ -477,8 +477,8 @@
 $lang['Reschedule']      = "ºÆ·×²è";
 $lang['Reschedule_s']    = "ºÆ·×²è¾å¤Î³«»Ï";
 $lang['Reschedule_e']    = "ºÆ·×²è¾å¤Î½ªÎ»";
-$lang['TaskGantt']       = "¥¬¥ó¥È¡¦¥À¥¤¥¢¥°¥é¥à";
-$lang['TaskImport']      = "¥¿¥¹¥¯: CSV¤«¤é¥¤¥ó¥Ý¡¼¥È";
+$lang['TaskGantt']       = "Gantt diagram";
+$lang['TaskImport']      = "¥¿¥¹¥¯: CVS¤«¤é¥¤¥ó¥Ý¡¼¥È";
 $lang['ImportSrcFile']   = "¥½¡¼¥¹¥Õ¥¡¥¤¥ë";
 $lang['ImportColNames']  = "CSV¥Õ¥¡¥¤¥ë¤Ç¤Î¥«¥é¥à̾";
 $lang['ImportIndex']     = "WBS¥¤¥ó¥Ç¥Ã¥¯¥¹";
@@ -711,9 +711,9 @@
 # Timetrack
 $lang['Timetrack']         = "Ï«ÎÏ";
 $lang['Timetracks']        = "Ï«ÎÏ";
-$lang['TimetrackCreate']   = "ͽÄê¤òÆþ¤ì¤ë";
-$lang['TimetrackCreateI']  = "%s ¤ÎͽÄê¤òÆþ¤ì¤ë";
-$lang['TimetrackDelI']     = "%s ¤ÎͽÌó¤òºï½ü";
+$lang['TimetrackCreate']   = "¥¿¥¤¥à¥È¥é¥Ã¥¯";
+$lang['TimetrackCreateI']  = "%s ¤Î¥¿¥¤¥à¥È¥é¥Ã¥¯";
+$lang['TimetrackDelI']     = "%s ¤Î¥¿¥¤¥à¥È¥é¥Ã¥¯¤òºï½ü";
 $lang['TimetrackNew']      = "¥¿¥¤¥à¥È¥é¥Ã¥¯¿·µ¬";
 $lang['TimetrackModify']   = "¥¿¥¤¥à¥È¥é¥Ã¥¯Êѹ¹";
 $lang['TimetrackOverview'] = "¥¿¥¤¥à¥È¥é¥Ã¥¯³µÍ×";
@@ -734,7 +734,7 @@
 $lang['TTStates'][2]       = "²Ý¶âºÑ¤ß";
 $lang['TTStates'][3]       = "»Ùʧ¤¤ºÑ¤ß";
 $lang['TTStates'][4]       = "²Ý¶âÉÔ²Äǽ";
-$lang['TTRecord']          = "»þ´Ö¥ì¥³¡¼¥É";
+$lang['TTRecord']          = "¥¿¥¤¥à¥ì¥³¡¼¥É";
 $lang['TTfinish']          = "½ªÎ»";
 
 # Fax

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

Modified Files:
	address_overview.php address_select.php address_tools.p3 
Log Message:
feature request 707324 and 707315

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- address_overview.php	8 Feb 2003 16:37:28 -0000	1.30
+++ address_overview.php	22 Mar 2003 19:28:35 -0000	1.31
@@ -54,6 +54,8 @@
        $this->atool['start'] = 0;
      }
 
+     $this->atool['format'] = $this->format;
+
      if ( isset($_GET['name']) ) {
        $name = $_GET['name'];
        $this->atool['link1'] = addUrlParameter($this->atool['link1'],"name=".UrlEncode($name));
@@ -67,14 +69,13 @@
      $e['name'] = 0;
 
      #
-     # extended search includeing locations
+     # extended search including locations
      #
      if ( isset($ext) && ($name != "*") && ($name != "") ) {
        $q = "SELECT a.adr_id FROM ". $this->dbconn->prefix ."location l, ". $this->dbconn->prefix ."adrloc a WHERE l.id = a.loc_id ";
        $pre = " AND (";
        $aids = "0";
 
-#       session_register('adrsearch');
        $_SESSION['adrsearch'] = $ext;
 
        @reset($ext);
@@ -90,7 +91,10 @@
            $q .= " ". $pre ." ". $this->dbconn->Like("phone_1",$name) ." ";
            $pre = "OR";
            $q .= " ". $pre ." ". $this->dbconn->Like("phone_2",$name) ." ";
+           $pre = "OR";
+           $q .= " ". $pre ." ". $this->dbconn->Like("fax_1",$name) ." ";
            $this->ashow[$f] = 1;
+           $this->ashow['fax'] = 1;
            $this->atool['search'][$f] = $name;
          }
          if ( $f == "city" ) {
@@ -106,6 +110,12 @@
            $this->ashow[$f] = 1;
            $this->atool['search'][$f] = $name;
          }
+         if ( $f == "desc" ) {
+           $q .= " ". $pre ." ". $this->dbconn->Like("desc1",$name) ." ";
+           $pre = "OR";
+           $this->ashow['desc1'] = 1;
+           $this->atool['search']['desc1'] = $name;
+         }
          if ( $f == "name" ) {
            $e['name'] = 1;
          }
@@ -180,6 +190,15 @@
                    text => $lang['NewEntry'],
                    info => $lang['AdrCreateInfo'],
                    category => array("address","new","obj")
+                 );
+       $this->addMenu($x);
+     }
+     if ( $this->format != "paper" ) {
+       $ll = addUrlParameter($this->atool['link1'],"format=paper");
+       $x = array( url => $ll,
+                   text => $lang['Printable'],
+                   info => $lang['PrintableInfo'],
+                   category => array("address","view")
                  );
        $this->addMenu($x);
      }

Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- address_select.php	23 Dec 2002 10:01:33 -0000	1.30
+++ address_select.php	22 Mar 2003 19:28:35 -0000	1.31
@@ -61,7 +61,9 @@
        echo "  &nbsp;<input type=\"checkbox\" value=\"name\" name=\"ext[]\"". $c['name'] .">&nbsp;". $lang['AdrLastName'] ." & ". $lang['AdrFirstName'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"city\" name=\"ext[]\"". $c['city'] .">&nbsp;". $lang['City'] ."<br>\n";
        echo "  &nbsp;<input type=\"checkbox\" value=\"street\" name=\"ext[]\"". $c['street'] .">&nbsp;". $lang['Street'] ."<br>\n";
-       echo "  &nbsp;<input type=\"checkbox\" value=\"email\" name=\"ext[]\"". $c['email'] .">&nbsp;". $lang['AdrEmail'] ."\n";
+       echo "  &nbsp;<input type=\"checkbox\" value=\"email\" name=\"ext[]\"". $c['email'] .">&nbsp;". $lang['AdrEmail'] ."<br>\n";
+       echo "  &nbsp;<input type=\"checkbox\" value=\"phone\" name=\"ext[]\"". $c['phone'] .">&nbsp;". $lang['Phone'] ."/". $lang['AdrFax']."\n";
+       echo "  &nbsp;<input type=\"checkbox\" value=\"desc\" name=\"ext[]\"". $c['desc'] .">&nbsp;". $lang['Desc']."\n";
        echo " </td>\n";
      }
 

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- address_tools.p3	1 Mar 2003 23:04:23 -0000	1.58
+++ address_tools.p3	22 Mar 2003 19:28:35 -0000	1.59
@@ -52,7 +52,7 @@
              echo $l->$name;
            }
          } elseif ( $name == "city" ) {
-   		   echo handle('city',$l,$l->$name);
+           echo handle('city',$l,$l->$name);
          } elseif ( $name == "lname" ) {
            $url =  "address_show.php";
            $url = addUrlParameter($url,"lid=". $l->id);
@@ -121,6 +121,7 @@
   $ashow['location'] = 0;
   $ashow['desc1'] = 0;
 
+  $atool['format'] = 'html';
   $atool['start'] = 0;
   $atool['maxshow'] = 0;
   $atool['search']['name'] = "";
@@ -168,53 +169,68 @@
    $needloc = 0;
    if ( $ashow['f_name'] ) {
      echo $layout->orderHeader("f_name",$lang['AdrFirstName'],$atool['link2']);
+     $col++;
    }
    if ( $ashow['l_name'] ) {
      echo $layout->orderHeader("l_name",$lang['AdrLastName'],$atool['link2']);
+     $col++;
    }
    if ( $ashow['birthday'] ) {
      echo $layout->orderHeader("birthday",$lang['AdrBirthday'],$atool['link2']);
+     $col++;
    }
    if ( $ashow['location'] ) {
      echo "<th>". $lang['Location'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['desc1'] ) {
      echo "<th>". $lang['Description'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['email'] ) {
      echo "<th>". $lang['AdrEmail'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['phone'] ) {
      echo "<th>". $lang['Phone'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['fax'] ) {
      echo "<th>". $lang['AdrFax'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['street'] ) {
      echo "<th>". $lang['Street'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['city'] ) {
      echo "<th>". $lang['City'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['c_id'] ) {
-     echo "<th colspan=\"1\">". $lang['Company'] ."</th>\n";
+     echo "<th>". $lang['Company'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    if ( $ashow['d_id'] ) {
-     echo "<th colspan=\"1\">". $lang['Department'] ."</th>\n";
+     echo "<th>". $lang['Department'] ."</th>\n";
      $needloc++;
+     $col++;
    }
    echo "</tr>\n";
    echo "</thead>\n";
 
-   if ( $atool['start'] == -1 ) {
+   if ( $atool['format'] == "paper" ) {
+     $a = 0;
+     $end = $n;
+   } else if ( $atool['start'] == -1 ) {
      $a = $n - $atool['maxshow'];
      $end = $n;
      $atool['start'] = $a;
@@ -275,7 +291,11 @@
            echo " <td>&nbsp;". $address->loc[$i] ."</td>\n";
          }
          if ( $ashow['desc1'] ) {
-           echo " <td>&nbsp;". $location->desc1 ."</td>\n";
+           $b = $location->desc1;
+           if ( $atool['search']['desc1'] != "" ) {
+             $b = eregi_replace("(". $atool['search']['desc1'] .")","<span class=\"found\">\\1</span>",$b);
+           }
+           echo " <td>&nbsp;". $b ."</td>\n";
          }
          if ( $ashow['email'] ) {
            echo " <td nowrap>&nbsp;";
@@ -405,8 +425,8 @@
    }
    echo "</tbody>\n";
 
-   echo $layout->list_navigation($atool['link1'],8,$atool['start'],$a,$n,'astart');
+   echo $layout->list_navigation($atool['link1'],$col,$atool['start'],$a,$n,'astart');
 
    echo $layout->OverviewTableEnd();
  }
-?>
+?>
\ No newline at end of file

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

Modified Files:
	mconfig.pinc 
Log Message:
feature request 707273

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/mconfig.pinc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mconfig.pinc	10 Feb 2003 16:59:10 -0000	1.10
+++ mconfig.pinc	22 Mar 2003 19:25:32 -0000	1.11
@@ -30,6 +30,7 @@
 #
 $tutos[modulesinc]['watchlist'] = array(
 	"check",
+	"company",
 	"mytutos",
 	"product",
 	"installation",

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

Modified Files:
	mail_new.php 
Log Message:
minor fix

Index: mail_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail_new.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mail_new.php	14 Mar 2003 06:53:10 -0000	1.23
+++ mail_new.php	19 Mar 2003 21:30:28 -0000	1.24
@@ -62,7 +62,7 @@
      echo " <td colspan=\"3\">\n";
      echo "  <input size=\"40\" maxlength=\"200\" name=\"to\" value=\"". $this->obj->getToAscii() ."\">\n";
      echo " </td>\n";
-     echo "</tr>\n";
+     echo "</tr>\n"; 
 
      echo "<tr>\n";
      echo $this->showfieldc($lang['MailCc'],0,"cc");
@@ -142,7 +142,6 @@
        }
      } 
      if ( isset($_GET['toid']) ) {
-       $this->addHidden("toid",$_GET['toid']);
        $this->to = getObject($this->dbconn,$_GET['toid']);
        if ( $this->to->getType() == "team" ) {
           // team members are sent in bcc

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

Modified Files:
	mconfig.pinc 
Log Message:
fixes

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/mconfig.pinc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mconfig.pinc	26 Feb 2003 18:36:32 -0000	1.5
+++ mconfig.pinc	14 Mar 2003 19:24:39 -0000	1.6
@@ -23,7 +23,8 @@
 #
 # globally enable this module
 #
-$tutos[useurl] = 1; 
+if (!isset($tutos[useurl]))
+  $tutos[useurl] = 1; 
 #
 # List of objects/modules where we do something with this module
 # and need to include this module