tutos-commits Mailing List for TUTOS

Hi,

My name is David Grant, and I'd like to introduce you to my company, Busy Data.
Busy Data is a small business that provides other small businesses with
websites and website hosting.

I would like the opportunity to earn your business. As an introduction, we
are offering chamber members the following opportunity:

20% OFF Web Hosting
FREE Setup and Configuration
FREE Domain Registration for 1 year

This is a savings of $100.00! I know we have the best web hosting in the country!
Let me prove it to you!

Call 888 820 0071
or go to www.busydata.net

I encourage you to shop around, you'll find we are both reasonable and
professional. Our goal is to be the only company you require for your
website needs.

If you do not wish to receive any e-mails from me, please type UNSUBSCRIBE
in the subject line and reply.

Thank you for your consideration, I look forward to hearing from you.

Sincerely,

David Grant
Busy Data LLC

Update of /cvsroot/tutos/tutos/php/invoice
In directory usw-pr-cvs1:/tmp/cvs-serv16848/invoice

Modified Files:
      Tag: BRANCH-1-0
	invoice_overview.php 
Log Message:
trivial check

Index: invoice_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_overview.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- invoice_overview.php	25 Jul 2002 07:45:16 -0000	1.5
+++ invoice_overview.php	31 Jul 2002 13:52:59 -0000	1.5.2.1
@@ -229,6 +229,9 @@
 
  if ( isset($HTTP_GET_VARS['start']) ) {
    $start = $HTTP_GET_VARS['start'];
+   if ( $start < -1 ) {
+     $start = 0;
+   }
  } else {
    $start = 0;
  }

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv16284

Modified Files:
      Tag: BRANCH-1-0
	gantt_png.php graph_bars.php 
Log Message:
close session will perform things

Index: gantt_png.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- gantt_png.php	10 Jul 2002 13:10:14 -0000	1.8
+++ gantt_png.php	31 Jul 2002 13:51:13 -0000	1.8.2.1
@@ -21,6 +21,7 @@
 
 /* Check if user is allowed to use it */
 check_user();
+session_write_close();
 
 function get_bar(&$task, $n, $depth) {
   $name  = $task->name;

Index: graph_bars.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/graph_bars.php,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- graph_bars.php	19 Jul 2002 05:53:13 -0000	1.14
+++ graph_bars.php	31 Jul 2002 13:51:13 -0000	1.14.2.1
@@ -12,6 +12,7 @@
  include "permission.p3";
 
  check_user();
+ session_write_close();
 
 
  function basic (&$f,&$t0,&$t1) {

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv15968

Modified Files:
      Tag: BRANCH-1-0
	permission.p3 
Log Message:
reorder: first set the path

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.78.2.1
retrieving revision 1.78.2.2
diff -u -r1.78.2.1 -r1.78.2.2
--- permission.p3	31 Jul 2002 13:26:14 -0000	1.78.2.1
+++ permission.p3	31 Jul 2002 13:50:13 -0000	1.78.2.2
@@ -44,8 +44,8 @@
 # On Server Clusters (LoadBalancing) you should
 # change savepath to some path all your servers share
 #
-session_start();
 session_save_path($tutos[sessionpath]);
+session_start();
 
 /**
  * check php version

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv7900/php

Modified Files:
      Tag: BRANCH-1-0
	permission.p3 
Log Message:
diable use of session_register (see http://www.php.net/manual/en/function.session-register.php)

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.78
retrieving revision 1.78.2.1
diff -u -r1.78 -r1.78.2.1
--- permission.p3	25 Jul 2002 12:43:12 -0000	1.78
+++ permission.p3	31 Jul 2002 13:26:14 -0000	1.78.2.1
@@ -25,6 +25,7 @@
 include 'url.pinc';
 
 
+ini_set("session.auto_start",0);
 # Cookie lifetime is double lifetime of login seesion
 ini_set("session.cookie_lifetime",(2 * 60 * $tutos[timetolive]));
 ini_set("session.gc_maxlifetime",(2 * 60 * $tutos[timetolive]));
@@ -32,17 +33,19 @@
 $xxxx = split("/",$HTTP_SERVER_VARS['REQUEST_URI']);
 ini_set("session.cookie_path","/". $xxxx[1]);
 ini_set("session.name","PHPSESSID");
+ini_set("session.use_cookies",1);
 
-ini_set("file_uploads","On");
-ini_set("register_global","On");
-# echo var_dump($GLOBALS);
+
+ini_set("file_uploads",1);
+ini_set("register_global","Off");
+ini_set("register_argc_argv","Off");
+ini_set("short_open_tag","On");
 #
 # On Server Clusters (LoadBalancing) you should
 # change savepath to some path all your servers share
 #
+session_start();
 session_save_path($tutos[sessionpath]);
-session_register('userid');
-session_register('dbnr');
 
 /**
  * check php version
@@ -67,8 +70,6 @@
   global $current_user, $HTTP_SESSION_VARS;
 
   logmessage("logout: ". $HTTP_SESSION_VARS['userid']);
-  @session_unregister('userid');
-  @session_unregister('dbnr');
   $HTTP_SESSION_VARS['userid'] = -1;
   $HTTP_SESSION_VARS['dbnr']   = -1;
   @session_destroy();
@@ -248,7 +249,7 @@
 
   $x = strpos($HTTP_SERVER_VARS['PHP_SELF'],"help.php");
   if ( $x == "" ) {
-	return 0;
+    return 0;
   }
 
   $current_user= new tutos_user($dbconn);
@@ -660,17 +661,17 @@
   if ( isset($tutos['PHPSESSID']) ) {
     // there is a session
     session_id($tutos['PHPSESSID']);
-	if ( isset ($HTTP_SESSION_VARS['userid']) ) {
+    if ( isset ($HTTP_SESSION_VARS['userid']) ) {
       $userid = $HTTP_SESSION_VARS['userid'];
     } else {
       $userid = -1;
-	}
-	if ( isset ($HTTP_SESSION_VARS['dbnr']) ) {
+    }
+    if ( isset ($HTTP_SESSION_VARS['dbnr']) ) {
       $dbnr = $HTTP_SESSION_VARS['dbnr'];
     } else {
       $dbnr = -1;
-	}
-	if ( ($dbnr == -1) || ($userid == -1) ) {
+    }
+    if ( ($dbnr == -1) || ($userid == -1) ) {
       $userid = -1;
     }
     #echo  "check_user:     session ". session_id() ." :". $HTTP_SERVER_VARS['PHP_SELF'] .": userid=". $userid;
@@ -794,6 +795,7 @@
 #  logmessage($y ." - ". $x ." ". $current_user->tz ." ". getenv("TZ"));
 
   if ( session_id() == "" ) {
+    logout();
     login_form($HTTP_SERVER_VARS['PHP_SELF'],"No Session");
   }
 

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv2836

Modified Files:
      Tag: BRANCH-1-0
	timetrack_overview.php 
Log Message:
bugfix: handle missing worker ids

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -r1.38.2.1 -r1.38.2.2
--- timetrack_overview.php	26 Jul 2002 08:37:53 -0000	1.38.2.1
+++ timetrack_overview.php	31 Jul 2002 06:06:13 -0000	1.38.2.2
@@ -265,10 +265,12 @@
        $val = 0;
      }
      $worker = getObject($dbconn,$i);
-     $link = addUrlParameter($link,"f[". $c ."]=".$val);
-     $link = addUrlParameter($link,"t0[". $c  ."]=". UrlEncode($worker->getShortName()));
-     $link = addUrlParameter($link,"t1[". $c ."]=". UrlEncode($f ." ". $lang['hours']));
-     $c ++;
+     if ( $worker != -1 ) {
+       $link = addUrlParameter($link,"f[". $c ."]=".$val);
+       $link = addUrlParameter($link,"t0[". $c  ."]=". UrlEncode($worker->getShortName()));
+       $link = addUrlParameter($link,"t1[". $c ."]=". UrlEncode( hour_format($f) ." ". $lang['hours']));
+       $c ++;
+     }
    }
    echo "<TR>\n";
    echo " <TD COLSPAN=5 VALIGN=top><IMG SRC=\"". $link ."\"></TD>";
@@ -294,7 +296,7 @@
      } else {
        $links[$r] = addUrlParameter($links[$r],"t0[". $c  ."]=". UrlEncode($pp->getFullName()));
      }
-     $links[$r] = addUrlParameter($links[$r],"t1[". $c ."]=". UrlEncode($f ." ". $lang['hours']));
+     $links[$r] = addUrlParameter($links[$r],"t1[". $c ."]=". UrlEncode( hour_format($f) ." ". $lang['hours']));
      $c++;
      if ( $c == 5 ) {
        $c = 0;

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv11576

Modified Files:
      Tag: BRANCH-1-0
	adr_ldap_overview.php address_select.php 
Log Message:
bugfix: ldap search stuff was not running with register_globals set to off

Index: adr_ldap_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/adr_ldap_overview.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- adr_ldap_overview.php	10 Jul 2002 19:36:58 -0000	1.12
+++ adr_ldap_overview.php	30 Jul 2002 13:26:46 -0000	1.12.2.1
@@ -222,28 +222,30 @@
    $atool['start'] = 0;
  }
 
- if ( isset($sv) ) {
+ if ( isset($HTTP_GET_VARS['sv']) ) {
    # remember this
-   $ldapserver = $sv;
+   $ldapserver = $HTTP_GET_VARS['sv'];
    session_register('ldapserver');
- } else if ( isset($ldapserver) ) {
-   $sv = $ldapserver;
+   $sv = $HTTP_GET_VARS['sv'];
+ } else if ( isset($HTTP_SESSION_VARS['ldapserver']) ) {
+   $sv = $HTTP_SESSION_VARS['ldapserver'];
  } else {
-   $msg = "NO Server defined !";
+   $msg .= "NO Server defined !";
  }
 
- if ( isset($name) ) {
+ if ( isset($HTTP_GET_VARS['name']) ) {
    # remember this
-   $adrlook = $name;
+   $adrlook = $HTTP_GET_VARS['name'];
    session_register('adrlook');
- } else if ( isset($adrlook) ) {
-   $name = $adrlook;
+   $name = $HTTP_GET_VARS['name'];
+ } else if ( isset($HTTP_SESSION_VARS['adrlook']) ) {
+   $name = $HTTP_SESSION_VARS['adrlook'];
  } else {
-   $msg = "NO Searchstring defined !";
+   $msg .= "NO Searchstring defined !";
  }
 
- if ( isset($HTTP_GET_VARS['name']) ) {
-   $n =str_replace(" ","*",$HTTP_GET_VARS['name']);
+ if ( isset($name) ) {
+   $n =str_replace(" ","*",$name);
    $n = $n . "*";
    $filter="(|(sn=". $n .")(givenname=". $n .")(cn=". $n ."))";
    $search = $n;

Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- address_select.php	8 Jul 2002 19:57:35 -0000	1.20
+++ address_select.php	30 Jul 2002 13:26:46 -0000	1.20.2.1
@@ -83,15 +83,15 @@
        echo "<SELECT NAME=\"sv\">\n";
        while( list ($i,$t) = @each ($tutos[ldapserver])) {
 	 echo "<OPTION VALUE=". $i . ($ldapserver==$i ? " selected":"") .">". $t ."</OPTION>\n";
+       }
+       echo "</SELECT>\n";
+       echo "</TD>\n";
+     } else {
+       echo "<INPUT TYPE=\"hidden\" NAME=\"sv\" VALUE=\"0\">\n";
      }
-     echo "</SELECT>\n";
-     echo "</TD>\n";
-   } else {
-     echo "<INPUT TYPE=\"hidden\" NAME=\"sv\" VALUE=\"0\">\n";
-   }
-   echo "</TR>\n";
-   DoubleTableEnd();
-   echo "</FORM>\n";
+     echo "</TR>\n";
+     DoubleTableEnd();
+     echo "</FORM>\n";
    }
 
    echo "<FORM NAME=\"cmpsearch1\" METHOD=\"GET\" action=\"company_overview.php\">\n";

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv4605

Modified Files:
      Tag: BRANCH-1-0
	de.p3 
Log Message:
Backport from development branch


Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.106
retrieving revision 1.106.2.1
diff -u -r1.106 -r1.106.2.1
--- de.p3	20 Jul 2002 13:14:44 -0000	1.106
+++ de.p3	30 Jul 2002 11:53:45 -0000	1.106.2.1
@@ -245,7 +245,7 @@
 $lang['UserNamedays']    = "Namenstage";
 $lang['UserWorkdays']    = "Arbeitstage";
 $lang['UserWeekstart']   = "Wochenanfang";
-$lang['UserDisabled']    = "anmelden sperren";
+$lang['UserDisabled']    = "Anmeldung sperren";
 
 # Bugs
 $lang['Bug']             = "Fehler";
@@ -474,16 +474,16 @@
 $lang['TaskLinkInfo']    = "Aufgabe %s anzeigen";
 $lang['TaskCompleted']   = "%3.2f %% abgeschlossen";
 $lang['Completed']       = "Abgeschlossen";
-$lang['Reschedule']      = "verschieben";
+$lang['Reschedule']      = "Verschieben";
 $lang['Reschedule_s']    = "Start verschieben";
 $lang['Reschedule_e']    = "Ende verschieben";
-$lang['TaskGantt']       = "Gantt Diagramm";
-$lang['TaskImport']      = "Task: CVS Import";
-$lang['ImportSrcFile']   = "Source file";
-$lang['ImportColNames']  = "Columns name in CSV file";
-$lang['ImportIndex']     = "WBS Index";
-$lang['ImportValid']     = "Import";
-$lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskGantt']       = "Gantt-Diagramm";
+$lang['TaskImport']      = "Aufgabe: CSV Importieren";
+$lang['ImportSrcFile']   = "Quelldatei";
+$lang['ImportColNames']  = "Spaltennamen in CSV-Datei";
+$lang['ImportIndex']     = "WBS-Index";
+$lang['ImportValid']     = "Importieren";
+$lang['ImportConfirm']   = "Import bestätigen";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Gantt-Diagramm anzeigen";
@@ -750,7 +750,7 @@
 $lang['SMSSendTo']         = "Eine SMS an %s senden";
 
 #Email Subject Lines
-$lang['EmailNewBug']       = "Neue Fehlermeldung fuer %s";
+$lang['EmailNewBug']       = "Neue Fehlermeldung für %s";
 $lang['EmailChangesBug']   = "Aenderungen am Fehler %s";
 $lang['EmailRememberApp']  = "Erinnerung: Termin am %s";
 $lang['EmailStillOpen']    = "Fehler %s ist %s";
@@ -882,9 +882,9 @@
 $lang['Err0047']         = "Adminrecht kann nicht gelöscht werden. Es muss immer mindestens einen Administrator geben !";
 $lang['Err0048']         = "Nichts gefunden !";
 $lang['Err0049']         = "Benutzer %s ist gesperrt !";
-$lang['Err0050']         = "Could not find CSV contents !";
-$lang['Err0051']         = "Could not find CSV Separator";
-$lang['Err0052']         = "Eine Klassifikation muss angegeben werden";
+$lang['Err0050']         = "CSV-Inhalt konnte nicht gefunden werden !";
+$lang['Err0051']         = "CSV-Trennzeichen konnte nicht gefunden werden !";
+$lang['Err0052']         = "Eine Klassifikation muss angegeben werden !";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv13016

Modified Files:
      Tag: BRANCH-1-0
	mailbox.pinc mailbox_new.php mailbox_overview.php 
	mailbox_select.php mailbox_show.php 
Log Message:
bugfix: mailbox stuff was not running with register_globals set to off

Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox.pinc,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- mailbox.pinc	20 Jul 2002 13:14:44 -0000	1.36
+++ mailbox.pinc	30 Jul 2002 10:35:58 -0000	1.36.2.1
@@ -195,13 +195,13 @@
    * make a connection string
    */
   function getConnString () {
-    return sprintf("{%s/%s:%d}%s",$this->host,$this->type,$this->port,$this->path);
+    return sprintf("{%s:%d/%s}%s",$this->host,$this->port,$this->type,$this->path);
   }
   /* ---------------------------------------------------------------------------
    * make a connection string
    */
   function getConnString2 () {
-    return sprintf("{%s/%s:%d}%s",$this->host,$this->type,$this->port,$this->orgpath);
+    return sprintf("{%s:%d/%s}%s",$this->host,$this->port,$this->type,$this->orgpath);
   }
   /* ---------------------------------------------------------------------------
    * create a new folder
@@ -211,12 +211,12 @@
     $r = @imap_createmailbox($this->mbox,imap_utf7_encode($c ."/". $name));
     $this->errors("imap_createmailbox");
     if ( $r == false ) {
-      echo "CREATING $c/$name  failed<BR>";
+      echo "CREATING ". $c ."/". $name ." failed<BR>";
     }
     $r = @imap_subscribe($this->mbox,imap_utf7_encode($c ."/". $name));
     $this->errors("imap_subscribe");
     if ( $r == false ) {
-      echo "SUBSCRIBE $c/$name  failed<BR>";
+      echo "SUBSCRIBE ". $c ."/". $name ." failed<BR>";
     }
     return;
   }
@@ -228,7 +228,7 @@
     $r = @imap_deletemailbox($this->mbox,imap_utf7_encode($c . $name));
     $this->errors("imap_deletemailbox");
     if ( $r == false ) {
-      echo "DELETE $c/$name  failed<BR>";
+      echo "DELETE ". $c ."/". $name ." failed<BR>";
     }
     return;
   }
@@ -313,7 +313,7 @@
   function open () {
     $c = $this->getConnString();
 #    $this->mbox = @imap_open($c, $this->user, $this->pw,OP_READONLY);
-    $this->mbox = @imap_open($c, $this->user, $this->pw);
+    $this->mbox = imap_open($c, $this->user, $this->pw);
 #	echo $c ."<BR>";
     return $this->errors("open");
   }
@@ -341,7 +341,7 @@
     $e =  imap_errors();
     if ( $e ) {
       while (list ($key,$val) = each ($e)) {
-        echo "<SPAN CLASS=warn><FONT SIZE=-1>ERROR : ". $where ." ". $this->mbox ." - ". $val ."</FONT></SPAN><BR>";
+        echo "<SPAN CLASS=warn><FONT SIZE=-1>ERROR : ". $where ." ". $this->mbox ." - ". $val . " ". $this->getConnString() ."</FONT></SPAN><BR>";
         $r = false;
       }
     }
@@ -365,7 +365,7 @@
     $this->orgpath = $this->path ;
 
     if ( $this->port == "" ) {
-      if ( $this->type == "imap" ) {
+      if ( ereg("imap",$this->type) ) {
         $this->port = 143;
       }
       if ( $this->type == "pop3" ) {

Index: mailbox_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_new.php,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- mailbox_new.php	29 Jul 2002 14:52:21 -0000	1.15.2.1
+++ mailbox_new.php	30 Jul 2002 10:35:58 -0000	1.15.2.2
@@ -49,8 +49,9 @@
    showfieldc($lang['MailboxProt'],1);
    echo " <TD>\n";
    echo "  <SELECT name=type>\n";
-   echo "   <OPTION value=imap>imap</OPTION>\n";
-   echo "   <OPTION value=pop3>pop3</OPTION>\n";
+   echo "   <OPTION value=\"imap\">imap</OPTION>\n";
+   echo "   <OPTION value=\"imap/notls\">imap NOTLS</OPTION>\n";
+   echo "   <OPTION value=\"pop3\">pop3</OPTION>\n";
    echo "  </SELECT>\n";
    echo " </TD>\n";
    showfieldc($lang['MailboxPort']);
@@ -149,4 +150,4 @@
 <!--
     CVS Info:  $Id$
     $Author$
--->
\ No newline at end of file
+-->

Index: mailbox_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_overview.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- mailbox_overview.php	12 Jun 2002 21:04:22 -0000	1.23
+++ mailbox_overview.php	30 Jul 2002 10:35:58 -0000	1.23.2.1
@@ -256,8 +256,8 @@
  HTML_Header($lang['MailboxOverview']);
 
  $m = new mailbox($dbconn);
- if ( isset($id) ) {
-   $m->read($id);
+ if ( isset($HTTP_GET_VARS['id']) ) {
+   $m->read($HTTP_GET_VARS['id']);
  } else {
    $stop = 1;
    $msg .= sprintf($lang['Err0040'],$lang[$m->getType()]);
@@ -267,29 +267,33 @@
  }
 
  $x = sprintf("mpw%d",$m->id);
- if ( isset($mbpw) ) {
-   $m->pw = $mbpw;
-   $$x = $mbpw;
+ if ( isset($HTTP_POST_VARS['mbpw']) ) {
+   $m->pw = $HTTP_POST_VARS['mbpw'];
    session_register($x);
- } else if ( isset($$x) ) {
-   $m->pw = $$x;
+   $HTTP_SESSION_VARS[$x] = $m->pw;
+ } else if ( isset($HTTP_SESSION_VARS[$x]) ) {
+   $m->pw = $HTTP_SESSION_VARS[$x];
  }
 
 # if ( isset($parent) ) {
 #   $m->parent = GetObject($dbconn,$parent);
 # }
- if ( isset($path) ) {
-   $path = base64_Decode($path);
+ if ( isset($HTTP_GET_VARS['path']) ) {
+   $path = base64_Decode($HTTP_GET_VARS['path']);
    $m->setPath($path);
  } else {
    $path = "";
  }
 
- if ( (! isset($start)) || ($start < -1) ) {
+ if ( (! isset($HTTP_GET_VARS['start'])) || ($HTTP_GET_VARS['start'] < -1) ) {
    $start = 0;
+ } else {
+   $start = $HTTP_GET_VARS['start'];
  }
- if (! isset($search) ) {
+ if (! isset($HTTP_GET_VARS['search']) ) {
    $search = "";
+ } else {
+   $search = $HTTP_GET_VARS['search'];
  }
 
  if ( ! $m->see_ok() ) {
@@ -299,34 +303,36 @@
 
  # Open the box
  if ( ($stop == 0) ) {
-   $m->open();
+   if (false == $m->open()) {
+     $stop = 1;
+   }
  }
  # Delete a mail
- if ( ($stop == 0) && isset($del) ) {
-   $m->delete_mail($del);
+ if ( ($stop == 0) && isset($HTTP_GET_VARS['del']) ) {
+   $m->delete_mail($HTTP_GET_VARS['del']);
    $msg .= $lang['MailboxEmail']. " deleted";
  }
  # Delete a folder
- if ( ($stop == 0) && isset($delfolder) ) {
-   if ( $delfolder != "" ){
-     $m->deletefolder(base64_Decode($delfolder));
-     $msg .= "Folder ". base64_Decode($delfolder) ." deleted";
+ if ( ($stop == 0) && isset($HTTP_GET_VARS['delfolder']) ) {
+   if ( $HTTP_GET_VARS['delfolder'] != "" ){
+     $m->deletefolder(base64_Decode($HTTP_GET_VARS['delfolder']));
+     $msg .= "Folder ". base64_Decode($HTTP_GET_VARS['delfolder']) ." deleted";
    }
  }
  # Create new folder
- if ( ($stop == 0) && isset($new) ) {
-   if ( $new != "" ){
-     $m->createfolder($new);
-     $msg .= "Folder $new created";
+ if ( ($stop == 0) && isset($HTTP_GET_VARS['new']) ) {
+   if ( $HTTP_GET_VARS['new'] != "" ){
+     $m->createfolder($HTTP_GET_VARS['new']);
+     $msg .= "Folder ". $HTTP_GET_VARS['new'] ." created";
    }
  }
  # Some action
- if ( ($stop == 0) && isset($mtarget) ) {
-   if ( $mtarget != -1 ) {
-     $mtarget = base64_decode($mtarget);
+ if ( ($stop == 0) && isset($HTTP_GET_VARS['mtarget']) ) {
+   if ( $HTTP_GET_VARS['mtarget'] != -1 ) {
+     $mtarget = base64_decode($HTTP_GET_VARS['mtarget']);
 #     $msg .= "action ". $mtarget ."<BR>\n";
-     @reset($mark);
-     while (list ($key,$val) = @each ($mark)) {
+     @reset($HTTP_GET_VARS['mark']);
+     while (list ($key,$val) = @each ($HTTP_GET_VARS['mark'])) {
        if ( $mtarget == "FLAG" ) {
          $m->flag_mail($val,"\\Flagged");
        } else if ( $mtarget == "UNFLAG" ) {
@@ -352,6 +358,7 @@
 
  HTML_Base1();
  navigate($m);
+
  HTML_Base2($msg);
  if ( $stop == 0 ) {
    if ( ($m->id > 0) ) {

Index: mailbox_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_select.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- mailbox_select.php	12 Jun 2002 21:04:22 -0000	1.8
+++ mailbox_select.php	30 Jul 2002 10:35:58 -0000	1.8.2.1
@@ -62,7 +62,7 @@
 
 
  $m = new mailbox($dbconn);
- $m->read($id);
+ $m->read($HTTP_GET_VARS['id']);
 
  if ( $m->id < 0 ) {
    $msg .= sprintf($lang['Err0040'],$lang[$m->getType()]);
@@ -72,8 +72,8 @@
    $m->parent = GetObject($dbconn,$parent);
  }
 
- if ( isset($path) ) {
-   $path = base64_decode($path);
+ if ( isset($HTTP_GET_VARS['path']) ) {
+   $path = base64_decode($HTTP_GET_VARS['path']);
    $m->setPath($path);
  } else {
    $path = "";

Index: mailbox_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_show.php,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- mailbox_show.php	20 Jul 2002 13:14:44 -0000	1.19
+++ mailbox_show.php	30 Jul 2002 10:35:58 -0000	1.19.2.1
@@ -390,12 +390,12 @@
  }
 
  $x = sprintf("mpw%d",$m->id);
- if ( isset($HTTP_GET_VARS['mbpw']) ) {
-   $m->pw = $HTTP_GET_VARS['mbpw'];
+ if ( isset($HTTP_POST_VARS['mbpw']) ) {
+   $m->pw = $HTTP_POST_VARS['mbpw'];
    session_register($x);
    $HTTP_SESSION_VARS[$x] = $m->pw;
- } else if ( isset($$x) ) {
-   $m->pw = $$x;
+ } else if ( isset($HTTP_SESSION_VARS[$x]) ) {
+   $m->pw = $HTTP_SESSION_VARS[$x];
  }
 
  if ( $m->id < 1 ) {
@@ -416,12 +416,16 @@
    $format = "";
  }
 
+ if ( $HTTP_GET_VARS['t'] == "" ) {
+   $t = 0 ;
+ } else {
+   $t = $HTTP_GET_VARS['t'] ;
+ }
  if ( $format == "show" ) {
-   if ( $t == "" ) { $t = 0 ;}
+   $ctype = strtolower($type[$t] ."/". strtolower($HTTP_GET_VARS['s']));
    # Show without decoration
-   $ctype = strtolower($type[$t] ."/". strtolower($s));
 
-   $b = show_data($m,$mno,$part,$t,$e);
+   $b = show_data($m,$HTTP_GET_VARS['mno'],$HTTP_GET_VARS['part'],$t,$HTTP_GET_VARS['e']);
    if ( ($ctype == "application/msword") || ($ctype == "application/doc") ) {
      if ( is_executable($tutos[wvHtml])) {
        $fd = fopen("../tmp/xx.doc","w+") ;
@@ -444,20 +448,20 @@
    }
  } else if ( $format == "download" ) {
    # Show without decoration
-   $ctype = strtolower($type[$t] ."/". strtolower($s));
+   $ctype = strtolower($type[$t] ."/". strtolower($HTTP_GET_VARS['s']));
    Header("Content-type: ". $ctype);
-   Header("Content-Disposition: attachment; filename=\"". $fn ."\"");
+   Header("Content-Disposition: attachment; filename=\"". $HTTP_GET_VARS['fn'] ."\"");
    Header("Content-Description: Upload from TUTOS" );
-   $b = show_data($m,$mno,$part,$t,$e);
+   $b = show_data($m,$HTTP_GET_VARS['mno'],$HTTP_GET_VARS['part'],$t,$HTTP_GET_VARS['e']);
    echo $b;
  } else {
    HTML_Header($lang['MailboxDetail']);
 
    HTML_Base1();
-   navigate($m,$mno);
+   navigate($m,$HTTP_GET_VARS['mno']);
    HTML_Base2($msg);
    if ( $m->id > 0 ) {
-     info($m,$mno,$header);
+     info($m,$HTTP_GET_VARS['mno'],$header);
    }
    HTML_Base3();
  }

Update of /cvsroot/tutos/tutos/php/note
In directory usw-pr-cvs1:/tmp/cvs-serv17005

Modified Files:
      Tag: BRANCH-1-0
	note.pinc 
Log Message:
bugfix: missingh notes in calendar

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- note.pinc	21 Jul 2002 10:55:04 -0000	1.8
+++ note.pinc	30 Jul 2002 09:25:17 -0000	1.8.2.1
@@ -404,9 +404,9 @@
     note::obj_read($obj);
     if ( count($obj->notelist) > 0 ) {
       $sep = "";
-      @reset($this->notelist);
+      @reset($obj->notelist);
       echo "  <TR><TD CLASS=". $class ." COLSPAN=". $cols ." ALIGN=left>";
-      while ( list ($i,$f) = @each ($this->notelist) ) {
+      while ( list ($i,$f) = @each ($obj->notelist) ) {
         echo $sep . "-" . $f->getLink();
         $sep = "<BR>\n";
       }

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv30611

Modified Files:
      Tag: BRANCH-1-0
	mailbox_new.php 
Log Message:
bugfix: missing functionality with register_globals = off


Index: mailbox_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_new.php,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- mailbox_new.php	20 Jul 2002 13:14:44 -0000	1.15
+++ mailbox_new.php	29 Jul 2002 14:52:21 -0000	1.15.2.1
@@ -18,33 +18,33 @@
  /* ---------------------------------------------------------------------------
   *
   */
- Function info($m) {
+ Function info(&$obj) {
    global $lang , $current_user;
 
    echo "<TABLE CLASS=single BORDER=0 CELLSPACING=0 CELLPADDING=3>\n";
    echo "<FORM action=\"mailbox_ins.php\" method=\"POST\">\n";
    hiddenFormElements();
-   if ( $m->id > 0 ) {
-     echo "<INPUT type=\"hidden\" value=\"". $m->id ."\" name=\"id\">\n";
+   if ( $obj->id > 0 ) {
+     echo "<INPUT type=\"hidden\" value=\"". $obj->id ."\" name=\"id\">\n";
    }
-   echo "<INPUT type=\"hidden\" value=\"". $m->parent->id ."\" name=\"parent\">\n";
+   echo "<INPUT type=\"hidden\" value=\"". $obj->parent->id ."\" name=\"parent\">\n";
    echo "<TR><TH COLSPAN=6>";
-   if ( $m->id > 0  ) {
-     echo sprintf($lang['MailboxModifyI'],menulink($m->parent->getURL(),$m->parent->getFullName()));
+   if ( $obj->id > 0  ) {
+     echo sprintf($lang['MailboxModifyI'],menulink($obj->parent->getURL(),$obj->parent->getFullName()));
    } else {
-     echo sprintf($lang['MailboxCreateI'],menulink($m->parent->getURL(),$m->parent->getFullName()));
+     echo sprintf($lang['MailboxCreateI'],menulink($obj->parent->getURL(),$obj->parent->getFullName()));
    }
    echo "</TH></TR>\n";
 
    echo "<TR>\n";
    echo " <TD COLSPAN=5>&nbsp</TD>";
-   echo " <TD ALIGN=right COLSPAN=1>". acl_link($m) ."</TD>\n";
+   echo " <TD ALIGN=right COLSPAN=1>". acl_link($obj) ."</TD>\n";
    echo "</TR>\n";
 
    echo "<TR>\n";
    showfieldc($lang['MailboxHost'],1);
    echo " <TD>\n";
-   echo "  <INPUT size=40 maxlength=40 name=host value=". $m->host .">\n";
+   echo "  <INPUT size=40 maxlength=40 name=host value=\"". $obj->host ."\">\n";
    echo " </TD>\n";
    showfieldc($lang['MailboxProt'],1);
    echo " <TD>\n";
@@ -55,14 +55,14 @@
    echo " </TD>\n";
    showfieldc($lang['MailboxPort']);
    echo " <TD>\n";
-   echo "  <INPUT size=5 maxlength=5 name=port value=\"". $m->port ."\">\n";
+   echo "  <INPUT size=5 maxlength=5 name=port value=\"". $obj->port ."\">\n";
    echo " </TD>\n";
    echo "</TR>\n";
 
    echo "<TR>\n";
    showfieldc($lang['MailboxPath'],1);
    echo " <TD COLSPAN=5>\n";
-   echo "  <INPUT size=60 maxlength=60 name=\"path\" value=\"". $m->path ."\">\n";
+   echo "  <INPUT size=60 maxlength=60 name=\"path\" value=\"". $obj->path ."\">\n";
    echo " </TD>\n";
 
    echo "</TR>\n";
@@ -70,23 +70,23 @@
    echo "<TR>\n";
    showfieldc($lang['MailboxUser'],1);
    echo " <TD COLSPAN=1>\n";
-   echo "  <INPUT size=20 maxlength=20 name=user value=\"". $m->user ."\">\n";
+   echo "  <INPUT size=20 maxlength=20 name=user value=\"". $obj->user ."\">\n";
    echo " </TD>\n";
    showfieldc($lang['MailboxPass'],0);
    echo " <TD COLSPAN=3>\n";
-   echo "  <INPUT type=password name=mpw value=". $m->pw .">\n";
+   echo "  <INPUT type=password name=mpw value=\"". $obj->pw ."\">\n";
    echo "</TR>\n";
 
    echo "<TR>\n";
    showfieldc($lang['MailboxEmail']);
    echo " <TD COLSPAN=5>\n";
-   echo "  <INPUT size=60 maxlength=60 name=email value=\"". $m->email ."\">\n";
+   echo "  <INPUT size=60 maxlength=60 name=email value=\"". $obj->email ."\">\n";
    echo " </TD>\n";
    echo "</TR>\n";
 
-   if ( $m->mod_ok() != 0 ) {
+   if ( $obj->mod_ok() != 0 ) {
      echo "<TR>\n";
-     if ($m->id > 0 ) {
+     if ($obj->id > 0 ) {
        submit_reset(0,1,2,1,2,0);
      } else {
        submit_reset(0,-1,2,1,2,0);
@@ -101,13 +101,13 @@
  /* ---------------------------------------------------------------------------
   *
   */
- Function navigate($m) {
+ Function navigate(&$obj) {
    global $lang;
 
    echo "<TABLE>";
    echo "<TR><TD>";
-   if ( $m->del_ok() ) {
-     echo menulink("mailbox_del.php?id=". $m->id ,$lang['Delete'],sprintf($lang['MailboxDelI'],$m->getFullname())) ."&nbsp;<BR>";
+   if ( $obj->del_ok() ) {
+     echo menulink("mailbox_del.php?id=". $obj->id ,$lang['Delete'],sprintf($lang['MailboxDelI'],$obj->getFullname())) ."&nbsp;<BR>";
    }
    echo "&nbsp;\n";
    echo "</TD></TR>";
@@ -120,15 +120,15 @@
 
  $m = new mailbox($dbconn);
 
- if ( $id > 0 ) {
+ if ( isset($HTTP_GET_VARS['id']) ) {
    HTML_Header($lang['MailboxModify']);
-   $m->read($id);
+   $m->read($HTTP_GET_VARS['id']);
  } else {
    HTML_Header($lang['MailboxCreate']);
-   if ( ! isset($parent) ) {
+   if ( ! isset($HTTP_GET_VARS['parent']) ) {
      $msg .= " Missing parameter<BR>";
    } else {
-     $m->parent = GetObject($dbconn,$parent);
+     $m->parent = GetObject($dbconn,$HTTP_GET_VARS['parent']);
    }
  }
 

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv7580

Modified Files:
	company_new.php department_new.php 
Log Message:
rejoin fix from stable branch

Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- company_new.php	19 Jul 2002 09:12:20 -0000	1.35
+++ company_new.php	29 Jul 2002 06:44:40 -0000	1.36
@@ -172,13 +172,13 @@
        echo "<TR>";
        echo "<TD>";
        if ( $f->mod_ok() ) {
-         echo menulink("company_new.php?id=". $c->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $c->getFullName()));
+         echo menulink("company_new.php?id=". $c->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f->lname, $c->getFullName()));
        } else {
           echo $lang['Change'];
        }
        echo "</TD><TD>\n";
        if ( $f->del_ok() ) {
-         echo confirmlink("location_del.php?ref=". $c->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $c->getFullName()));
+         echo confirmlink("location_del.php?ref=". $c->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f->lname, $c->getFullName()));
        } else {
           echo $lang['Delete'];
        }

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- department_new.php	19 Jul 2002 09:12:20 -0000	1.32
+++ department_new.php	29 Jul 2002 06:44:40 -0000	1.33
@@ -163,13 +163,13 @@
          echo "<TR>";
          echo "<TD>";
          if ( $f->mod_ok() ) {
-           echo menulink("department_new.php?id=". $d->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $d->getFullName()));
+           echo menulink("department_new.php?id=". $d->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f->lname, $d->getFullName()));
          } else {
             echo $lang['Change'];
          }
          echo "</TD><TD>\n";
          if ( $f->del_ok() ) {
-           echo confirmlink("location_del.php?ref=". $d->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $d->getFullName()));
+           echo confirmlink("location_del.php?ref=". $d->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f->lname, $d->getFullName()));
          } else {
             echo $lang['Delete'];
          }

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv6889

Modified Files:
	address_show.php address_tools.p3 
Log Message:
add a link ro show a popup when click on location name (wish of Ludwig Raffler

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- address_show.php	17 Jul 2002 07:27:13 -0000	1.42
+++ address_show.php	29 Jul 2002 06:43:52 -0000	1.43
@@ -23,6 +23,21 @@
  /* ---------------------------------------------------------------------------
   *
   */
+ Function popinfo(&$a,$lid) {
+   global $tutos, $lang,$current_user;
+   Printable_Header($a->getFullName());
+   echo "<H2><P>\n";
+   echo $a->getFullName() ."<BR>\n";
+   echo $a->location[$lid]->street1 ."<BR>\n";
+   echo $a->location[$lid]->street2 ."<BR>\n";
+   echo $a->location[$lid]->city ."<BR>\n";
+   echo $a->location[$lid]->zip ."<BR>\n";
+#   var_dump ($a->location[$lid]);
+   HTML_Close();
+ }
+ /* ---------------------------------------------------------------------------
+  *
+  */
  Function info(&$a) {
    global $tutos, $lang,$current_user;
 
@@ -231,6 +246,8 @@
  if ( $format == "vcard" ) {
    Header("Content-type: text/x-vcard");
    echo $a->getIcard();
+ } else if ( $format == "popup" ) {
+   popinfo($a,$lid);
  } else {
    if ( $a->id > 0 ) {
      HTML_Header($lang['AddressDetail']." :".$a->getFullName());

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- address_tools.p3	25 Jul 2002 12:07:11 -0000	1.40
+++ address_tools.p3	29 Jul 2002 06:43:52 -0000	1.41
@@ -47,18 +47,19 @@
            echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". $l->company->getLink() ."&nbsp;</TD>\n";
          } elseif ( $name == "d_id" ) {
            echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". $l->department->getLink($l->department->name) ."&nbsp;</TD>\n";
-         } elseif ( $name == "country" ) {
-           if (isset($lang['countrycde'][$l->$name]) ) {
-             echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". $lang['countrycde'][$l->$name] ." (". $l->$name .")</TD>\n";
-		   } else {
-             echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". $l->$name ."&nbsp;</TD>\n";
-		   }
-         } elseif ( $name == "city" ) {
-           if ( $current_user->feature_ok(usemaplink,PERM_SEE) ) {
-             echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". makelink("map_select.php?id=". $l->id ,$l->$name,$l->$name) ."&nbsp;</TD>\n";
-           } else {
-             echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". myentities($l->$name) ."&nbsp;</TD>\n";
-           }
+         } elseif ( ($name == "country") && isset($lang['countrycde'][$l->$name] ) ) {
+           echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". $lang['countrycde'][$l->$name] ." (". $l->$name .")</TD>\n";
+         } elseif ( ($name == "city") && ($current_user->feature_ok(usemaplink,PERM_SEE) ) ) {
+           echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". makelink("map_select.php?id=". $l->id ,$l->$name,$l->$name) ."&nbsp;</TD>\n";
+         } elseif ( $name == "lname" ) {
+           $url =  "address_show.php";
+           $url = addUrlParameter($url,"lid=". $l->id);
+           $url = addUrlParameter($url,"format=popup");
+           $url = addSessionKey($url);
+           echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;<A HREF=\"JavaScript:
+     mywindow = window.open('". $l ."', 'help', 'width=300,height=300,top=200,left=200,scrollbars=1');
+     mywindow.location.href = '". $url ."'; mywindow.focus();\" "self.status='". $l->$name ."' ;return true\" TITLE=\"". $l->$name ."\">";
+           echo $l->$name ."</A>&nbsp;</TD>\n";
          } else {
            echo " <TD COLSPAN=". $s ." VALIGN=top CLASS=line". $line .">&nbsp;". myentities($l->$name) ."&nbsp;</TD>\n";
          }

Update of /cvsroot/tutos/tutos/debian
In directory usw-pr-cvs1:/tmp/cvs-serv2890

Modified Files:
      Tag: BRANCH-1-0
	changelog conffiles postinst 
Log Message:
Add Dimitris changes to the 1-0 Branch


Index: changelog
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/changelog,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- changelog	1 Jul 2002 11:41:59 -0000	1.2
+++ changelog	29 Jul 2002 06:37:35 -0000	1.2.2.1
@@ -1,3 +1,10 @@
+tutos (1.0.20020726-1) unstable; urgency=low
+
+  * Manage new config files
+  * Create optionnal config files with help text
+
+ -- Dimitri Fontaine <dfo...@cv...>  Fri, 26 Jul 2002 13:58:13 +0200
+
 tutos (0.0.20020606-2) unstable; urgency=low
 
   * Makefile install target bugfix

Index: conffiles
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/conffiles,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- conffiles	17 Jun 2002 13:02:10 -0000	1.1
+++ conffiles	29 Jul 2002 06:37:35 -0000	1.1.2.1
@@ -1,2 +1,4 @@
+/etc/tutos/config_default.pinc
 /etc/tutos/config.pinc
 /etc/tutos/apache.conf
+/etc/tutos/lang_custom.p3

Index: postinst
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/postinst,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- postinst	17 Jun 2002 13:02:10 -0000	1.1
+++ postinst	29 Jul 2002 06:37:35 -0000	1.1.2.1
@@ -24,14 +24,15 @@
 case "$1" in
     configure)
 	# care about config file
-	if [ -r /etc/tutos/config.pinc ]; then
-		rm /var/www/tutos/php/config.pinc
-		ln -s /etc/tutos/config.pinc /var/www/tutos/php/config.pinc
-	fi
-	if [ -r /etc/tutos/apache.conf ]; then
-		rm /var/www/tutos/apache.conf
-		ln -s /etc/tutos/apache.conf /var/www/tutos/apache.conf
-	fi
+	tutosdir=/var/www/tutos
+
+	for f in php/config_default.pinc apache.conf config.pinc lang_custom.p3
+	do
+	  if [ -r /etc/tutos/$f ]; then
+	      [ -f $tutosdir/$f ] && rm $tutosdir/$f
+	      ln -s /etc/tutos/$f $tutosdir/$f
+	  fi
+	done
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Update of /cvsroot/tutos/tutos/php/invoice
In directory usw-pr-cvs1:/tmp/cvs-serv1548/php/invoice

Modified Files:
      Tag: BRANCH-1-0
	invoice_show.php 
Log Message:
Fixes on the current release


Index: invoice_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_show.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- invoice_show.php	25 Jul 2002 07:45:16 -0000	1.8
+++ invoice_show.php	29 Jul 2002 06:31:48 -0000	1.8.2.1
@@ -150,6 +150,7 @@
    while( list ($i,$c) = @each ($tutos[currencies])) {
      $sum[$c] = 0.0;
    }
+   $sum["?"] = 0.0;
    @reset($obj->pos) ;
    while ( list ($i,$f) = @each ($obj->pos) ) {
      show_invpos($f);

Update of /cvsroot/tutos/tutos/homepage
In directory usw-pr-cvs1:/tmp/cvs-serv1548/homepage

Modified Files:
      Tag: BRANCH-1-0
	require.html 
Log Message:
Fixes on the current release


Index: require.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/require.html,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- require.html	12 Jul 2002 17:35:06 -0000	1.8
+++ require.html	29 Jul 2002 06:31:48 -0000	1.8.2.1
@@ -11,7 +11,7 @@
  <LI><A HREF=http://www.apache.org>Apache</A><FONT SIZE=-1> (external link)</FONT>
  <LI>You wil need <U>one</U> of these Databases
  <UL>
-  <LI><A HREF=http://www.postgresql.org>Postgres Database</A> <FONT SIZE=-1>(external link)</FONT>
+  <LI><A HREF=http://www.postgresql.org>PostgreSQL Database</A> <FONT SIZE=-1>(external link)</FONT>
   <LI><A HREF=http://www.mysql.com>MySQL Database</A> (I use  <A HREF=" rel="nofollow">http://sourceforge.net/projects/mysql> MySQL-3.23.21-1.i386.rpm</A>) <FONT SIZE=-1>(external link)</FONT> 
   <LI><A HREF=http://www.oracle.com>Oracle Database</A><FONT SIZE=-1>(external link)</FONT> 
   <LI><A HREF=Borland" rel="nofollow">http://www.borland.com/interbase>Borland Interbase 5</A><FONT SIZE=-1>(external link)</FONT> 

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv1548/php

Modified Files:
      Tag: BRANCH-1-0
	company_new.php config_default.pinc department_new.php 
Log Message:
Fixes on the current release


Index: company_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_new.php,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- company_new.php	19 Jul 2002 09:12:20 -0000	1.35
+++ company_new.php	29 Jul 2002 06:31:48 -0000	1.35.2.1
@@ -172,13 +172,13 @@
        echo "<TR>";
        echo "<TD>";
        if ( $f->mod_ok() ) {
-         echo menulink("company_new.php?id=". $c->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $c->getFullName()));
+         echo menulink("company_new.php?id=". $c->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f->lname, $c->getFullName()));
        } else {
           echo $lang['Change'];
        }
        echo "</TD><TD>\n";
        if ( $f->del_ok() ) {
-         echo confirmlink("location_del.php?ref=". $c->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $c->getFullName()));
+         echo confirmlink("location_del.php?ref=". $c->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f->lname, $c->getFullName()));
        } else {
           echo $lang['Delete'];
        }

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- config_default.pinc	26 Jul 2002 09:09:04 -0000	1.3.2.1
+++ config_default.pinc	29 Jul 2002 06:31:48 -0000	1.3.2.2
@@ -1,5 +1,5 @@
 <?
-if ( isset ($includes['config_dafault.pinc']) ) {$includes['config_default.pinc']++;return;}
+if ( isset ($includes['config_default.pinc']) ) {$includes['config_default.pinc']++;return;}
 /*
  * Copyright 1999 - 2002 by Gero Kohnert
  *

Index: department_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_new.php,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- department_new.php	19 Jul 2002 09:12:20 -0000	1.32
+++ department_new.php	29 Jul 2002 06:31:48 -0000	1.32.2.1
@@ -163,13 +163,13 @@
          echo "<TR>";
          echo "<TD>";
          if ( $f->mod_ok() ) {
-           echo menulink("department_new.php?id=". $d->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $d->getFullName()));
+           echo menulink("department_new.php?id=". $d->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f->lname, $d->getFullName()));
          } else {
             echo $lang['Change'];
          }
          echo "</TD><TD>\n";
          if ( $f->del_ok() ) {
-           echo confirmlink("location_del.php?ref=". $d->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $d->getFullName()));
+           echo confirmlink("location_del.php?ref=". $d->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f->lname, $d->getFullName()));
          } else {
             echo $lang['Delete'];
          }

Update of /cvsroot/tutos/tutos/documentation
In directory usw-pr-cvs1:/tmp/cvs-serv1548/documentation

Modified Files:
      Tag: BRANCH-1-0
	tutos_admin.sgml 
Log Message:
Fixes on the current release


Index: tutos_admin.sgml
===================================================================
RCS file: /cvsroot/tutos/tutos/documentation/tutos_admin.sgml,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- tutos_admin.sgml	10 Jul 2002 20:40:43 -0000	1.15
+++ tutos_admin.sgml	29 Jul 2002 06:31:48 -0000	1.15.2.1
@@ -157,7 +157,7 @@
 <listitem><para>Reload the new access rights to all databases with the command 'mysqladmin reload'.  </para></listitem>
 <listitem><para>You can test access to the database by issueing the command 'mysql -ututos -ppassword tutos' (where 'tutos' is de user id and 'password' is the password you used). If you get something like <programlisting>"ERROR 1045: Access denied for user: 'tutos@localhost' (Using password: YES)"</programlisting> you obviously can't get access and should look if you made a typo somewhere.</para></listitem>
 <listitem><para>Now adjust the config.pinc file in the php subdirectory and enter the database name ('tutos'), the user that will access the database ('tutos') and the password that is associated ('password') at the apropriate place. (Be advised to use "pwencrypt='1'" for enhanced security!> </para></listitem>
-<listitem><para>Now initialise the database by using the scheme.php program as mentioned in the <filename>easy_install.html</filename> file. (see also next section)  </para></listitem>
+<listitem><para>Now initialise the database by using the scheme.php program as mentioned in the <filename>install_easy.html</filename> file. (see also next section)  </para></listitem>
 <listitem><para>If all fails got to the projectpage for tutos on the SourceForge site and (politely) ask for help.  </para></listitem>
 </itemizedlist>
 

Update of /cvsroot/tutos/tutos
In directory usw-pr-cvs1:/tmp/cvs-serv1548

Modified Files:
      Tag: BRANCH-1-0
	Makefile upload.sh 
Log Message:
Fixes on the current release


Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -r1.25.2.1 -r1.25.2.2
--- Makefile	26 Jul 2002 09:09:04 -0000	1.25.2.1
+++ Makefile	29 Jul 2002 06:31:47 -0000	1.25.2.2
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.25.2.2  2002/07/29 06:31:47  gokohnert
+# Fixes on the current release
+#
 # Revision 1.25.2.1  2002/07/26 09:09:04  gokohnert
 # release
 #
@@ -542,7 +545,7 @@
 	chmod 755 /net/zaphod/home/gero/src/tutos /net/zaphod/home/gero/src/tutos/html /net/zaphod/home/gero/src/tutos/homepage
 	chmod 755 /net/zaphod/home/gero/src/tutos/html/visual /net/zaphod/home/gero/src/tutos/html/blue
 
-	cp ChangeLog ToDo createdb.sh example.sh scheme.sh inittutos.sh shellfunc.sh /net/zaphod/home/gero/src/tutos
+	cp ChangeLog ToDo createdb.sh shellfunc.sh /net/zaphod/home/gero/src/tutos
 	cp ${PHP} ${LANGFILES} /net/zaphod/home/gero/src/tutos/php
 	cp html/*html html/*css html/*png html/*gif html/*ico /net/zaphod/home/gero/src/tutos/html
 	cp ${HELP} /net/zaphod/home/gero/src/tutos/html/help

Index: upload.sh
===================================================================
RCS file: /cvsroot/tutos/tutos/upload.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- upload.sh	25 Jul 2002 16:58:47 -0000	1.1
+++ upload.sh	29 Jul 2002 06:31:48 -0000	1.1.2.1
@@ -17,10 +17,11 @@
 cd incoming
 put tutos-${TYPE}-${DATE}.tar.bz2
 put tutos-${TYPE}-${DATE}.tar.gz
+put tutos-${TYPE}-${DATE}.zip
 EOF
 echo "Ftp DONE"
 # Alternative Download Area
-scp tutos-${TYPE}-${DATE}.tar.bz2 tutos-${TYPE}-${DATE}.tar.gz gok...@sh...:/home/group/htdocs/download
+scp tutos-${TYPE}-${DATE}.tar.bz2 tutos-${TYPE}-${DATE}.tar.gz gok...@sh...:/home/groups/t/tu/tutos/htdocs/download
 #
 # 
 # EOF

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv32154

Modified Files:
	de.p3 
Log Message:
Fixed spelling mistake
Another untranslated string: "Known Modules" in admin_show.php


Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- de.p3	28 Jul 2002 16:04:35 -0000	1.107
+++ de.p3	28 Jul 2002 16:13:21 -0000	1.108
@@ -882,7 +882,7 @@
 $lang['Err0047']         = "Adminrecht kann nicht gelöscht werden. Es muss immer mindestens einen Administrator geben !";
 $lang['Err0048']         = "Nichts gefunden !";
 $lang['Err0049']         = "Benutzer %s ist gesperrt !";
-$lang['Err0050']         = "CSV-Inhalt konnte nicht gefunen werden !";
+$lang['Err0050']         = "CSV-Inhalt konnte nicht gefunden werden !";
 $lang['Err0051']         = "CSV-Trennzeichen konnte nicht gefunden werden !";
 $lang['Err0052']         = "Eine Klassifikation muss angegeben werden !";
 

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv29686

Modified Files:
	de.p3 
Log Message:
Fixed missing and wrong translations
Remaining problems: Untranslated "Import CSV" in product_show and
                    task_import_csv, misspelled 'CVS' in most translations


Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- de.p3	20 Jul 2002 13:14:44 -0000	1.106
+++ de.p3	28 Jul 2002 16:04:35 -0000	1.107
@@ -245,7 +245,7 @@
 $lang['UserNamedays']    = "Namenstage";
 $lang['UserWorkdays']    = "Arbeitstage";
 $lang['UserWeekstart']   = "Wochenanfang";
-$lang['UserDisabled']    = "anmelden sperren";
+$lang['UserDisabled']    = "Anmeldung sperren";
 
 # Bugs
 $lang['Bug']             = "Fehler";
@@ -474,16 +474,16 @@
 $lang['TaskLinkInfo']    = "Aufgabe %s anzeigen";
 $lang['TaskCompleted']   = "%3.2f %% abgeschlossen";
 $lang['Completed']       = "Abgeschlossen";
-$lang['Reschedule']      = "verschieben";
+$lang['Reschedule']      = "Verschieben";
 $lang['Reschedule_s']    = "Start verschieben";
 $lang['Reschedule_e']    = "Ende verschieben";
-$lang['TaskGantt']       = "Gantt Diagramm";
-$lang['TaskImport']      = "Task: CVS Import";
-$lang['ImportSrcFile']   = "Source file";
-$lang['ImportColNames']  = "Columns name in CSV file";
-$lang['ImportIndex']     = "WBS Index";
-$lang['ImportValid']     = "Import";
-$lang['ImportConfirm']   = "Confirm Import";
+$lang['TaskGantt']       = "Gantt-Diagramm";
+$lang['TaskImport']      = "Aufgabe: CSV Importieren";
+$lang['ImportSrcFile']   = "Quelldatei";
+$lang['ImportColNames']  = "Spaltennamen in CSV-Datei";
+$lang['ImportIndex']     = "WBS-Index";
+$lang['ImportValid']     = "Importieren";
+$lang['ImportConfirm']   = "Import bestätigen";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Gantt-Diagramm anzeigen";
@@ -750,7 +750,7 @@
 $lang['SMSSendTo']         = "Eine SMS an %s senden";
 
 #Email Subject Lines
-$lang['EmailNewBug']       = "Neue Fehlermeldung fuer %s";
+$lang['EmailNewBug']       = "Neue Fehlermeldung für %s";
 $lang['EmailChangesBug']   = "Aenderungen am Fehler %s";
 $lang['EmailRememberApp']  = "Erinnerung: Termin am %s";
 $lang['EmailStillOpen']    = "Fehler %s ist %s";
@@ -882,9 +882,9 @@
 $lang['Err0047']         = "Adminrecht kann nicht gelöscht werden. Es muss immer mindestens einen Administrator geben !";
 $lang['Err0048']         = "Nichts gefunden !";
 $lang['Err0049']         = "Benutzer %s ist gesperrt !";
-$lang['Err0050']         = "Could not find CSV contents !";
-$lang['Err0051']         = "Could not find CSV Separator";
-$lang['Err0052']         = "Eine Klassifikation muss angegeben werden";
+$lang['Err0050']         = "CSV-Inhalt konnte nicht gefunen werden !";
+$lang['Err0051']         = "CSV-Trennzeichen konnte nicht gefunden werden !";
+$lang['Err0052']         = "Eine Klassifikation muss angegeben werden !";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv31881/php

Modified Files:
	config_default.pinc 
Log Message:
Spelling fix


Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config_default.pinc	26 Jul 2002 06:13:33 -0000	1.3
+++ config_default.pinc	27 Jul 2002 20:06:06 -0000	1.4
@@ -1,5 +1,5 @@
 <?
-if ( isset ($includes['config_dafault.pinc']) ) {$includes['config_default.pinc']++;return;}
+if ( isset ($includes['config_default.pinc']) ) {$includes['config_default.pinc']++;return;}
 /*
  * Copyright 1999 - 2002 by Gero Kohnert
  *

Update of /cvsroot/tutos/tutos/php/watchlist
In directory usw-pr-cvs1:/tmp/cvs-serv31650/watchlist

Modified Files:
      Tag: BRANCH-1-0
	watchlist_overview.php 
Log Message:
bugfix

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_overview.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- watchlist_overview.php	20 Jul 2002 13:14:45 -0000	1.4
+++ watchlist_overview.php	26 Jul 2002 15:57:50 -0000	1.4.2.1
@@ -91,8 +91,8 @@
        } else {
          echo " <TD NOWRAP ALIGN=right>". $aobj->getLink() ."</TD>\n";
        }
-	 }
-     if ( ($current_user->id == $aid) || ($obj->mod_ok()) ) {
+     }
+     if ( ($current_user->id == $aid) || (($obj != -1 ) && $obj->mod_ok()) ) {
        $url = confirmlink("watchlist/watchlist_del.php?id=". $oid ."&adr=". $aid ."&gotourl=". $link1 ,$lang['Delete'],$lang['WatchDel']);
        echo " <TD NOWRAP ALIGN=right>". $url ."</TD>\n";
      } else {

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv32009

Modified Files:
	team.pinc team_overview.php 
Log Message:
merge back to development branch

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- team.pinc	20 Jul 2002 13:14:45 -0000	1.51
+++ team.pinc	26 Jul 2002 12:44:00 -0000	1.52
@@ -340,8 +340,8 @@
     $q = "DELETE FROM ". $this->tablename2 ." WHERE team_id = ". $this->id;
     $this->dbconn->Exec($q);
 
-	$msg .= product::obj_delete($current_user,$this);
-	$msg .= appointment::obj_delete($current_user,$this);
+    $msg .= product::obj_delete($current_user,$this);
+    $msg .= appointment::obj_delete($current_user,$this);
     $msg .= parent::delete();
     return $msg;
   }

Index: team_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_overview.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- team_overview.php	20 Jul 2002 13:14:44 -0000	1.19
+++ team_overview.php	26 Jul 2002 12:44:00 -0000	1.20
@@ -8,6 +8,8 @@
  */
  include("webelements.p3");
  include("permission.p3");
+ include 'appointment.pinc';
+ include 'product.pinc';
 
  /* Check if user is allowed to use it */
  check_user();
@@ -149,13 +151,13 @@
        $obj->read($val);
        if ( $obj->id != $val ) {
          continue;
-	   }
+       }
        if ( $obj->del_ok() ) {
          $msg .= $lang['Delete'] ."&nbsp;". $obj->getFullName() ."<BR>";
          $msg .= $obj->delete();
-	   } else {
-         $msg .= $obj->getLink() .": ". sprintf($lang['Err0023'],$lang[$obj->getType()]);
-	   }
+       } else {
+         $msg .= $obj->getLink() .": ". sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
+       }
        unset($obj);
      }
      $dbconn->Commit("WORK");

Update of /cvsroot/tutos/tutos/php
In directory usw-pr-cvs1:/tmp/cvs-serv31026/php

Modified Files:
      Tag: BRANCH-1-0
	team.pinc team_overview.php 
Log Message:
bugfix: unable to delete teams via massupdate

Index: team.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team.pinc,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- team.pinc	20 Jul 2002 13:14:45 -0000	1.51
+++ team.pinc	26 Jul 2002 12:40:55 -0000	1.51.2.1
@@ -340,8 +340,8 @@
     $q = "DELETE FROM ". $this->tablename2 ." WHERE team_id = ". $this->id;
     $this->dbconn->Exec($q);
 
-	$msg .= product::obj_delete($current_user,$this);
-	$msg .= appointment::obj_delete($current_user,$this);
+    $msg .= product::obj_delete($current_user,$this);
+    $msg .= appointment::obj_delete($current_user,$this);
     $msg .= parent::delete();
     return $msg;
   }

Index: team_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_overview.php,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- team_overview.php	20 Jul 2002 13:14:44 -0000	1.19
+++ team_overview.php	26 Jul 2002 12:40:56 -0000	1.19.2.1
@@ -8,6 +8,8 @@
  */
  include("webelements.p3");
  include("permission.p3");
+ include 'appointment.pinc';
+ include 'product.pinc';
 
  /* Check if user is allowed to use it */
  check_user();
@@ -149,13 +151,13 @@
        $obj->read($val);
        if ( $obj->id != $val ) {
          continue;
-	   }
+       }
        if ( $obj->del_ok() ) {
          $msg .= $lang['Delete'] ."&nbsp;". $obj->getFullName() ."<BR>";
          $msg .= $obj->delete();
-	   } else {
-         $msg .= $obj->getLink() .": ". sprintf($lang['Err0023'],$lang[$obj->getType()]);
-	   }
+       } else {
+         $msg .= $obj->getLink() .": ". sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
+       }
        unset($obj);
      }
      $dbconn->Commit("WORK");