tutos-commits Mailing List for TUTOS

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

Modified Files:
	pl.p3 
Log Message:
- updated to current status.

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pl.p3,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pl.p3	28 May 2002 13:37:20 -0000	1.49
+++ pl.p3	30 May 2002 20:50:58 -0000	1.50
@@ -24,7 +24,7 @@
 $lang['Username']        = "Nazwa u¿ytkownika";
 $lang['MOTD']            = "Wiadomo¶æ dnia";
 $lang['Login']           = "Login";
-$lang['LostPassword']    = "zgubione has³o ?";
+$lang['LostPassword']    = "zgubi³e¶ has³o ?";
 $lang['LoggedIn']        = "Jeste¶ zalogowany. Dokonaj wyboru w menu z lewej strony ekranu.";
 $lang['ReadOnlyAppoint'] = "Nie masz praw do zmian parametrów tego spotkania!";
 $lang['StartDate']       = "Data rozpoczêcia";
@@ -479,13 +479,13 @@
 $lang['Reschedule']      = "Przesuniête";
 $lang['Reschedule_s']    = "Przesuniête od";
 $lang['Reschedule_e']    = "Przesuniête do";
-$lang['TaskGantt']       = "Gantt diagram";
-$lang['TaskImport']      = "Task: CVS Import";
-$lang['ImportSrcFile']   = "Source file";
-$lang['ImportColNames']  = "Columns name in CSV file";
-$lang['ImportIndex']     = "WBS Index";
+$lang['TaskGantt']       = "Wykres Ganta";
+$lang['TaskImport']      = "Zadanie: import z CVS";
+$lang['ImportSrcFile']   = "Plik ¼ród³owy";
+$lang['ImportColNames']  = "Nazwy kolumn w pliku CSV";
+$lang['ImportIndex']     = "Indeks WBS";
 $lang['ImportValid']     = "Import";
-$lang['ImportConfirm']   = "Confirm Import";
+$lang['ImportConfirm']   = "Potwierd¼ import";
 
 
 # Gantt Diagramm
@@ -974,8 +974,8 @@
 $lang['Err0047']         = "Nie mogê usun±æ praw administratora. Musi istnieæ przynajmniej jeden administrator systemu!";
 $lang['Err0048']         = "Nic nie znaleziono!";
 $lang['Err0049']         = "Konto %s jest wy³±czone!";
-$lang['Err0050']         = "Could not find CSV contents !";
-$lang['Err0051']         = "Could not find CSV Separator";
+$lang['Err0050']         = "Nie potrafiê odnale¼æ zawarto¶ci CSV !";
+$lang['Err0051']         = "Nie potrafiê odnale¼æ separatora CSV";
 
 ### Local Variables: ***
 ### End: ***

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

Modified Files:
	task_overview.php 
Log Message:
Navigation

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- task_overview.php	26 May 2002 18:11:55 -0000	1.26
+++ task_overview.php	30 May 2002 14:05:31 -0000	1.27
@@ -157,12 +157,14 @@
   // The PNG Gantt fonctionnality, using JpGraph Tools, to be installed
   if( $tutos[usejpgraph] ) {
     echo menulink("task_gantt.php?id=". $p->id, $lang['TaskGantt']);
-    echo "&nbsp;<BR>\n";
+    echo "<BR>\n";
   }
 
-  /* TODO:
-   * Get the project id/name and add the link to project here
-   */
+  if( $p != -1 ) {
+    echo "<BR>\n";
+    echo $lang['Project']." ".menulink($p->getURL(), $p->getFullName());
+    echo "<BR>\n";
+  }
 
   echo "</TD></TR>";
 

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

Modified Files:
	history_show.php product_show.php task_gantt.php 
Log Message:
Navigation

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- history_show.php	27 Apr 2002 16:05:43 -0000	1.31
+++ history_show.php	30 May 2002 14:03:51 -0000	1.32
@@ -253,11 +253,16 @@
  /* ---------------------------------------------------------------------------
   *
   */
- Function navigate() {
+ Function navigate($obj) {
    global $lang;
 
    echo "<TABLE>";
    echo "<TR><TD>";
+   
+   echo $lang['Project']." ".menulink($obj->getURL(),$obj->getFullName());
+   echo "<BR>\n";
+
+   echo "</TD><TR>";
    HTML_Select();
  }
 
@@ -296,7 +301,7 @@
  }
 
  HTML_Base1();
- navigate();
+ navigate($obj);
  HTML_Base2($msg);
  if ( $msg == "") {
    info($obj,$id,$start,$xf,$xo);

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- product_show.php	29 May 2002 19:52:00 -0000	1.33
+++ product_show.php	30 May 2002 14:03:51 -0000	1.34
@@ -381,55 +381,109 @@
    global $tutos,$lang, $current_user;
 
    echo "<TABLE>";
-   echo "<TR><TD>";
+   echo "<TR><TH>".$lang['Product']."</TH></TR>\n";
+   echo "<TR><TD>\n";
+
    if ( $current_user->feature_ok(useprojects,PERM_SEL) ) {
-     echo menulink("product_select.php",$lang['Search'],$lang['SearchForProd']) ."<BR>\n";
+     echo menulink("product_select.php", $lang['Search'],
+		   $lang['SearchForProd']);
+
+     echo "</TD></TR>\n<TR><TD>\n";
    }
    if ( $current_user->feature_ok(useprojects,PERM_NEW) ) {
-     echo menulink("product_new.php",$lang['NewEntry'],$lang['ProdCreateInfo']) ."<BR>\n";
+     echo menulink("product_new.php", $lang['NewEntry'],
+		   $lang['ProdCreateInfo']);
+     echo "</TD></TR>\n<TR><TD>\n";
    }
    if ( $current_user->feature_ok(useprojects,PERM_MOD) ) {
      if ( ($obj->id > 0) && $obj->mod_ok() ) {
-       echo menulink("product_new.php?id=". $obj->id ,$lang['Modify'],sprintf($lang['ProdModInfo'],$obj->getFullname())) ."&nbsp;<BR>";
+       echo menulink("product_new.php?id=".$obj->id, $lang['Modify'],
+		     sprintf($lang['ProdModInfo'],
+			     $obj->getFullname()));
+       echo "</TD></TR>\n<TR><TD>\n";
      }
    }
    if ( $current_user->feature_ok(useprojects,PERM_DEL) ) {
      if ( ($obj->id > 0) && $obj->del_ok() ) {
-       echo confirmlink("product_del.php?id=". $obj->id ,$lang['Delete'],sprintf($lang['ProdDelInfo'],$obj->getFullname())) ."&nbsp;<BR>";
+       echo confirmlink("product_del.php?id=".$obj->id,
+			$lang['Delete'],
+			sprintf($lang['ProdDelInfo'],
+				$obj->getFullname()));
+       echo "</TD></TR>\n<TR><TD>\n";
      }
    }
-   echo "<BR><BR>\n";
 
-   echo "<BR>\n";
+   echo "</TD></TR>\n";
+   echo "<TR><TH>".$lang['Tasks']."</TH></TR>\n";
+   echo "<TR><TD>\n";
 
    if ( ($obj->id > 0) && $obj->see_ok() ) {
+     if ( $current_user->feature_ok(usetaskmanagement,PERM_SEE) ) {
+       echo makelink("task_overview.php?id=".$obj->id,
+		     $lang['TaskOverview'],
+		     sprintf($lang['TaskOverviewInfo'], $obj->getFullName()));
+       echo "</TD></TR>\n<TR><TD>\n";
+     }
+     if( $tutos[usejpgraph] ) {
+       echo menulink("task_gantt.php?id=".$obj->id, $lang['TaskGantt']);
+       echo "</TD></TR>\n<TR><TD>\n";
+     }
      if ( $current_user->feature_ok(usebugtracking,PERM_NEW) ) {
-       echo menulink("bug_new.php?pid=$obj->id",$lang['BugCreate'],sprintf($lang['BugCreateInfo'],$obj->getFullName())) ."&nbsp;<BR>\n";
+       echo menulink("bug_new.php?pid=$obj->id",
+		     $lang['BugCreate'],
+		     sprintf($lang['BugCreateInfo'], $obj->getFullName()));
+       echo "</TD></TR>\n<TR><TD>\n";
      }
      if ( $current_user->feature_ok(useinstmanagement,PERM_NEW) ) {
-       echo menulink("installation_new.php?pid=". $obj->id ,$lang['InstCreate'],$lang['InstCreateI']) ."&nbsp;<BR>\n";
+       echo menulink("installation_new.php?pid=".$obj->id,
+		     $lang['InstCreate'],
+		     $lang['InstCreateI'])."&nbsp;\n";
+       echo "</TD></TR>\n<TR><TD>\n";
      }
      if ( $current_user->feature_ok(usetaskmanagement,PERM_NEW) ) {
        if ( $obj->mod_ok() > 0 ) {
-         echo menulink("task_new.php?p_id=". $obj->id ,$lang['TaskCreate'],sprintf($lang['TaskCreateInfo'],$obj->getFullName())) ."&nbsp;<BR>\n";
+         echo menulink("task_new.php?p_id=".$obj->id,
+		       $lang['TaskCreate'],
+		       sprintf($lang['TaskCreateInfo'],
+			       $obj->getFullName()))."&nbsp;\n";
+	 echo "</TD></TR>\n<TR><TD>\n";
+
+	 echo menulink("task_import_csv?p_id=".$obj->id, "Import CSV");
+	 echo "</TD></TR>\n<TR><TD>\n";
        }
      }
      if ( $current_user->feature_ok(usenotes,PERM_NEW) ) {
-       echo menulink("note_new.php?link_id=". $obj->id ,$lang['NoteCreate'],sprintf($lang['NoteCreateInfo'],$obj->getFullName())) ."&nbsp;<BR>\n";
+       echo menulink("note_new.php?link_id=".$obj->id,
+		     $lang['NoteCreate'],
+		     sprintf($lang['NoteCreateInfo'], $obj->getFullName()));
+       echo "</TD></TR>\n<TR><TD>\n";
      }
      if ( $current_user->feature_ok(usedocmanagement,PERM_NEW) ) {
-       echo menulink("file_new.php?link_id=". $obj->id ,$lang['FileCreate'],sprintf($lang['FileCreateInfo'],$obj->getFullName())) ."&nbsp;<BR>\n";
+       echo menulink("file_new.php?link_id=".$obj->id,
+		     $lang['FileCreate'],
+		     sprintf($lang['FileCreateInfo'], $obj->getFullName()));
+       echo "</TD></TR>\n<TR><TD>\n";
      }
      if ( $current_user->feature_ok(usetimetrack,PERM_NEW) ) {
-       echo menulink("timetrack_new.php?link_id=". $obj->id ,$lang['TimetrackCreate'],sprintf($lang['TimetrackCreateI'],$obj->getFullName())) ."&nbsp;<BR>\n";
+       echo menulink("timetrack_new.php?link_id=".$obj->id,
+		     $lang['TimetrackCreate'],
+		     sprintf($lang['TimetrackCreateI'], $obj->getFullName()));
+       echo "</TD></TR>\n<TR><TD>\n";
      }
      if ( $current_user->feature_ok(useinvoice,PERM_NEW) ) {
-       echo menulink("invoice_new.php?link_id=". $obj->id ,$lang['InvoiceCreate'],sprintf($lang['InvoiceCreateI'],$obj->getFullName())) ."&nbsp;<BR>\n";
-	 }
-     echo "<BR>\n";
+       echo menulink("invoice_new.php?link_id=".$obj->id,
+		     $lang['InvoiceCreate'],
+		     sprintf($lang['InvoiceCreateI'], $obj->getFullName()));
+       echo "</TD></TR>\n<TR><TD>\n";
+     }
+
+     echo "</TD></TR>\n<TR><TD>&nbsp;</TD></TR>\n";
+     echo "<TR><TD>\n";
      watchlist_link($obj,$current_user);
-     echo "<BR>\n";
-     echo menulink("product_show.php?format=paper&id=". $obj->id ,$lang['Printable'],$lang['PrintableInfo']);
+ 
+     echo "</TD></TR>\n<TR><TD>\n";
+     echo menulink("product_show.php?format=paper&id=".$obj->id,
+		   $lang['Printable'], $lang['PrintableInfo']);
    }
    echo "</TD></TR>";
 

Index: task_gantt.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_gantt.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- task_gantt.php	22 May 2002 17:59:50 -0000	1.2
+++ task_gantt.php	30 May 2002 14:03:51 -0000	1.3
@@ -41,6 +41,13 @@
   echo menulink("task_overview.php?id=". $p->id, $lang['TaskOverview']);
   echo "<BR>\n";
 
+  if( $p != -1 ) {
+    echo "<BR>\n";
+    echo $lang['Project']." ".menulink($p->getURL(), $p->getFullName());
+    echo "<BR>\n";
+  }
+
+
   echo "</TD></TR>";
 
   HTML_Select();

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

Modified Files:
	gantt_png.php 
Log Message:
Added a space in the depth prefix.


Index: gantt_png.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gantt_png.php	29 May 2002 13:07:06 -0000	1.4
+++ gantt_png.php	30 May 2002 13:53:45 -0000	1.5
@@ -31,8 +31,8 @@
   $vol   = $task->volume_done;
   $comp  = $task->getcompletion();
 
-  for ($i = 0; $i <= $depth; $i++) {
-    $name = " ".$name;
+  for ($i = 1; $i < $depth; $i++) {
+    $name = "  ".$name;
   }
   $bar = new GanttBar($n, $name, $start, $end,
 		      sprintf("[%.0f %%]", $comp), 0.5);

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

Modified Files:
	ldap_getdata.php 
Log Message:
Debug company data creation


Index: ldap_getdata.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap_getdata.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ldap_getdata.php	17 May 2002 11:22:53 -0000	1.1
+++ ldap_getdata.php	30 May 2002 13:50:24 -0000	1.2
@@ -15,7 +15,6 @@
  * Feel free to generalize this code if you know how to !
  *
  */
-
 include("webelements.p3");
 include("permission.p3");
 include("resource.pinc");
@@ -126,7 +125,6 @@
     $tutos[demo] = 0;
 
     $cvf = new company($dbconn);
-    $cvf->id   = $cvf_id;
     $cvf->name = "CVF";
     $msg .= $cvf->save();
     echo $lang[$cvf->getType()].":". $cvf->getFullName() ."<BR>\n";

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

Modified Files:
	task_import_csv.php 
Log Message:
Do not import MS Project Milestones. These are presented as tasks wich
begin and end same day, but with a 0 lenght.


Index: task_import_csv.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_import_csv.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- task_import_csv.php	28 May 2002 15:31:29 -0000	1.2
+++ task_import_csv.php	30 May 2002 13:49:41 -0000	1.3
@@ -226,7 +226,17 @@
        * Only if the presentation page was confirmed, of course !
        */
       if( isset($import) ) {
-	if( $t->name != "" ) {
+	/* There's a MS Project way of doing things we have to
+	 * care about.
+	 * Milestones are exported as tasks with s_start == s_end and
+	 * volume = 0.
+	 * We won't import such tasks
+	 */
+	$is_ms_milestone =
+	   ( $t->s_start->getYYYYMMDD() == $t->s_end->getYYYYMMDD() )
+	   && $t->volume == 0;
+
+	if( $t->name != "" && ! $is_ms_milestone ) {
 	  $dbconn->Begin("WORK");
 	  $t->save();
 	  $dbconn->Commit("WORK");

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

Modified Files:
	nl.p3 
Log Message:


typo



Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- nl.p3	30 May 2002 10:04:38 -0000	1.52
+++ nl.p3	30 May 2002 10:06:03 -0000	1.53
@@ -350,7 +350,7 @@
 $lang['ProdClass2']      = "Classificatie 2";
 $lang['ProdClasses2'][1] = "Noordelijke regio";
 $lang['ProdClasses2'][2] = "Zuidelijke regio";
-$$lang['ProdPrice']       = "Prijs";
+$lang['ProdPrice']       = "Prijs";
 $lang['ProdCost']        = "Kosten";
 $lang['ProdNotes']       = "Notities";
 $lang['ProdTasks']       = "Taken";

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

Modified Files:
	nl.p3 
Log Message:


rolled back some changes.



Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nl.p3	30 May 2002 09:34:04 -0000	1.51
+++ nl.p3	30 May 2002 10:04:38 -0000	1.52
@@ -344,16 +344,13 @@
 $lang['ProdStates'][5]   = "Offerte geannuleerd";
 $lang['ProdStates'][-2]  = "Elk niet gereed of geannuleerd";
 $lang['ProdClass1']      = "Classificatie 1";
-$lang['ProdClasses1'][1] = "Ontwikkeling";
-$lang['ProdClasses1'][2] = "Onderhoud";
+$lang['ProdClasses1'][1] = "Marketing";
+$lang['ProdClasses1'][2] = "BTL";
 $lang['ProdClasses1'][3] = "Consultancy";
 $lang['ProdClass2']      = "Classificatie 2";
-$lang['ProdClasses2'][1] = "C code";
-$lang['ProdClasses2'][2] = "PHP/HTML code";
-$lang['ProdClasses2'][3] = "Python code";
-$lang['ProdClasses2'][4] = "sh scripts";
-$lang['ProdClasses2'][5] = "Overige code";
-$lang['ProdPrice']       = "Prijs";
+$lang['ProdClasses2'][1] = "Noordelijke regio";
+$lang['ProdClasses2'][2] = "Zuidelijke regio";
+$$lang['ProdPrice']       = "Prijs";
 $lang['ProdCost']        = "Kosten";
 $lang['ProdNotes']       = "Notities";
 $lang['ProdTasks']       = "Taken";

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

Modified Files:
	ChangeLog 
Log Message:



Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog	26 May 2002 18:25:59 -0000	1.79
+++ ChangeLog	30 May 2002 09:43:55 -0000	1.80
@@ -1,4 +1,7 @@
 $Header$
+May 30 2002
+	* Added some new dutch special dates. 
+	  Contributed by Robert Brouwer <rbrouwer at wise-guys dot nl>
 May 26 2002
 	* new: CRM Group module
 May 25 2002

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

Modified Files:
	holiday_nl.pinc 
Log Message:


And last but not least the last file to make the set complete.



Index: holiday_nl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_nl.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- holiday_nl.pinc	11 Mar 2002 20:44:37 -0000	1.3
+++ holiday_nl.pinc	30 May 2002 09:38:34 -0000	1.4
@@ -11,20 +11,28 @@
 
     $tutos[cal][] = array(
        array( Date => "01-01",           type => 1,    Desc => "Nieuwjaardsdag (NL)"),
-       array( Date => "29-03",           type => 0,    Desc => "Goede Vrijdag (NL)"),
-       array( Date => "31-04",           type => 0,    Desc => "Eerste paasdag (NL)"),
-       array( Date => "01-04",           type => 1,    Desc => "Tweede paasdag (NL)"),
+       array( Date => "06-01",           type => 0,    Desc => "Driekoningen (NL)"),
+       array( Date => "14-02",           type => 0,    Desc => "Valentijnsdag (NL)"),
+       array( Date => "CARNAVALMON",     type => 0,    Desc => "Carnaval (NL)"),
+       array( Date => "CARNAVALTUE",     type => 0,    Desc => "Carnaval (NL)"),
+       array( Date => "CARNAVALWED",     type => 0,    Desc => "Aswoensdag (NL)"),
+       array( Date => "GOODFRIDAY",      type => 0,    Desc => "Goede Vrijdag (NL)"),
+       array( Date => "EASTERSUNDAY",    type => 1,    Desc => "Eerste paasdag (NL)"),
+       array( Date => "EASTERMONDAY",    type => 1,    Desc => "Tweede paasdag (NL)"),
+       array( Date => "1-04",            type => 0,    Desc => "1 april!! (NL)"),
        array( Date => "30-04",           type => 1,    Desc => "Koninginnedag (NL)"),
        array( Date => "01-05",           type => 0,    Desc => "Dag van de Arbeid (NL)"),
        array( Date => "04-05",           type => 0,    Desc => "Dodenherdenking (NL)"),
-       array( Date => "05-05",           type => 0,    Desc => "Nationale Bevrijdingsdag (NL)"),
-       array( Date => "09-05",           type => 1,    Desc => "Hemelvaartsdag (NL)"),
-       array( Date => "19-06",           type => 1,    Desc => "Eerste Pinksterdag (NL)"),
-       array( Date => "20-06",           type => 1,    Desc => "Tweede Pinksterdag (NL)"),
+       array( Date => "05-05",           type => 1,    Desc => "Nationale Bevrijdingsdag (NL)"),
+       array( Date => "MOTHERDAY",       type => 0,    Desc => "Moederdag (NL)"),
+       array( Date => "FATHERDAY",       type => 0,    Desc => "Vaderdag (NL)"),
+       array( Date => "ASCENSIONDAY",    type => 1,    Desc => "Hemelvaartsdag (NL)"),
+       array( Date => "WHITSUNDAY",      type => 1,    Desc => "Eerste Pinksterdag (NL)"),
+       array( Date => "WHITMONDAY",      type => 1,    Desc => "Tweede Pinksterdag (NL)"),
+       array( Date => "PRINSDAY",        type => 0,    Desc => "Prinsjesdag (NL)"),
+       array( Date => "5-12",            type => 0,    Desc => "Sinterklaas (NL)"),
        array( Date => "25-12",           type => 1,    Desc => "Eerste Kerstdag (NL)"),
        array( Date => "26-12",           type => 1,    Desc => "Tweede Kerstdag (NL)"),
-
-
-
+       array( Date => "31-12",           type => 0,    Desc => "Oudejaar (NL)"),
     );
 ?>

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

Modified Files:
	nl.p3 
Log Message:


I reluctantly have to admit that there were some flaws in my
translation... :-)
Thankfully someone else stepped in and set the record straight.



Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- nl.p3	29 May 2002 09:03:23 -0000	1.50
+++ nl.p3	30 May 2002 09:34:04 -0000	1.51
@@ -10,6 +10,7 @@
 #
 # Translation by Marcel <mvisscher at mac.com>
 #  and Jeroen Baten <jbaten at i2rs dot nl>
+#  and Robert Brouwer <rbrouwer at wise-guys dot nl>
 #
 $lang['content_encoding'] = "iso-8859-1";
 setlocale(LC_TIME,'nl_NL');
@@ -74,8 +75,8 @@
 #
 $lang['Printable']       = "Printbaar formaat";
 $lang['PrintableInfo']   = "Toon als printbare pagina";
-$lang['managedProd']     = "Beheerde Opdrachten & Projecten";
-$lang['soldProd']        = "Verkochte Opdrachten & Projecten";
+$lang['managedProd']     = "Beheerde Producten & Projecten";
+$lang['soldProd']        = "Verkochte Producten & Projecten";
 $lang['Enter']           = "Enter";
 $lang['Reset']           = "Reset";
 $lang['Remove']          = "Verwijder";
@@ -299,19 +300,19 @@
 $lang['UserBugSearch']   = "assigned to %s";
 
 # Product/Projects
-$lang['ProductP']        = "Opdracht/Project";
-$lang['ProductPs']       = "Opdrachten/Projecten";
-$lang['Product']         = "Opdracht";
-$lang['Products']        = "Opdrachten";
+$lang['ProductP']        = "Product/Project";
+$lang['ProductPs']       = "Producten/Projecten";
+$lang['Product']         = "Product";
+$lang['Products']        = "Producten";
 $lang['Project']         = "Project";
 $lang['Projects']        = "Projecten";
-$lang['ProductsSearch']  = "Opdrachten/Projecten Zoeken";
-$lang['ProductsOverview']= "Opdrachten/Projecten Overzicht";
-$lang['ProductsDetail']  = "Opdracht/Project Info";
+$lang['ProductsSearch']  = "Producten/Projecten Zoeken";
+$lang['ProductsOverview']= "Producten/Projecten Overzicht";
+$lang['ProductsDetail']  = "Producten/Project Info";
 $lang['ProdApps']        = "Gerelateerde afspraken";
-$lang['ProdName']        = "Opdracht/Project";
+$lang['ProdName']        = "Product/Project";
 $lang['ProdVersion']     = "Versie";
-$lang['ProdProd']        = "related Projects";
+$lang['ProdProd']        = "Gerelateerde Projecten";
 $lang['ProdProdNew']     = "new relation";
 $lang['ProdRoles']       = "Rollen";
 $lang['ProdFunc']        = "Functie";
@@ -322,59 +323,62 @@
 $lang['ProdRole'][4]     = "Verkoop";
 $lang['ProdRole'][5]     = "Ontwikkeling";
 $lang['ProdRole'][6]     = "Klant";
-$lang['ProdRole'][7]     = "Supplier";
+$lang['ProdRole'][7]     = "Leverancier";
 $lang['ProdRole'][8]     = "Reseller";
 $lang['ProdRole'][9]     = "Partner";
 $lang['ProdRole'][10]    = "Project Basis";
 $lang['ProdRole'][11]    = "Ancestor (stam) Project";
 $lang['ProdRole'][12]    = "Succesor (vervolg) Project";
 $lang['ProdRole'][13]    = "Sub Project";
-$lang['ProdPath']        = "Filepad";
+$lang['ProdPath']        = "Bestand locatie";
 $lang['ProdDesc']        = "Omschrijving";
 $lang['ProdDesc1']       = "Omschrijving 1";
 $lang['ProdDesc2']       = "Omschrijving 2";
 $lang['ProdState']       = "Status";
 $lang['ProdState_']      = "Onbekende Status";
-$lang['ProdStates'][0]   = "PrePlanning";
-$lang['ProdStates'][1]   = "In bewerking";
+$lang['ProdStates'][0]   = "Acquisitie";
+$lang['ProdStates'][1]   = "In behandeling";
 $lang['ProdStates'][2]   = "Gereed";
 $lang['ProdStates'][3]   = "Geannuleerd";
 $lang['ProdStates'][4]   = "Offerte stadium";
 $lang['ProdStates'][5]   = "Offerte geannuleerd";
 $lang['ProdStates'][-2]  = "Elk niet gereed of geannuleerd";
 $lang['ProdClass1']      = "Classificatie 1";
-$lang['ProdClasses1'][1] = "Marketing";
-$lang['ProdClasses1'][2] = "BTL";
+$lang['ProdClasses1'][1] = "Ontwikkeling";
+$lang['ProdClasses1'][2] = "Onderhoud";
 $lang['ProdClasses1'][3] = "Consultancy";
 $lang['ProdClass2']      = "Classificatie 2";
-$lang['ProdClasses2'][1] = "Noordelijke regio";
-$lang['ProdClasses2'][2] = "Zuidelijke regio";
+$lang['ProdClasses2'][1] = "C code";
+$lang['ProdClasses2'][2] = "PHP/HTML code";
+$lang['ProdClasses2'][3] = "Python code";
+$lang['ProdClasses2'][4] = "sh scripts";
+$lang['ProdClasses2'][5] = "Overige code";
 $lang['ProdPrice']       = "Prijs";
 $lang['ProdCost']        = "Kosten";
 $lang['ProdNotes']       = "Notities";
 $lang['ProdTasks']       = "Taken";
 $lang['ProdFiles']       = "Documenten";
-$lang['SearchForProd']   = "Zoek naar een opdracht of project";
-$lang['SearchForProdExt']= "Uitgebreid zoeken naar een opdracht of project";
-$lang['ProdCreateInfo']  = "Maak een nieuwe opdracht of project";
+$lang['SearchForProd']   = "Zoek naar een product of project";
+$lang['SearchForProdExt']= "Uitgebreid zoeken naar een product of project";
+$lang['ProdCreateInfo']  = "Maak een nieuw product of project";
 $lang['ProdDelInfo']     = "Wis project %s";
-$lang['ProdModInfo']     = "Wijzig Opdracht/Project %s";
+$lang['ProdModInfo']     = "Wijzig Product/Project %s";
 $lang['ProdCreator']     = "aangemaakt door";
 $lang['ProdCreation']    = "aangemaakt door %s op %s";
 $lang['ProdCreationS']   = "aangemaakt op";
-$lang['ProdStart']       = "gesch. start";
-$lang['ProdEnd']         = "gesch. eind";
-$lang['ProdProb']        = "Orderkans";
-$lang['ProdModifyT']     = "Wijzig deze Opdracht / Project";
-$lang['ProdCreateT']     = "Maak een nieuwe Opdracht / Project";
-$lang['ProdSelInfo']     = "(laat leeg om alle opdrachten/projecten te tonen)";
-$lang['ProdLinkInfo']    = "Toon Opdracht/Project %s";
+$lang['ProdStart']       = "Verw.begin";
+$lang['ProdEnd']         = "Verw.klaar";
+$lang['ProdProb']        = "Waarschijnlijkheid";
+$lang['ProdModifyT']     = "Wijzig dit Product/Project";
+$lang['ProdCreateT']     = "Maak een nieuw Product/Project";
+$lang['ProdSelInfo']     = "(laat leeg om alle producten/projecten te tonen)";
+$lang['ProdLinkInfo']    = "Toon Product/Project %s";
 $lang['ProdBetween']     = "aangemaakt tussen";
 $lang['ProdLinks']       = "Links";
 $lang['ProdMailbox']     = "Mailbox";
 $lang['ProdStats']       = "Statistieken";
-$lang['ProdStatsInfo']   = "Statistieken van deze Opdrachten/Projecten";
-$lang['ProdStatsTitle']  = "Opdracht/Project Statistieken";
+$lang['ProdStatsInfo']   = "Statistieken van deze Producten/Projecten";
+$lang['ProdStatsTitle']  = "Product/Project Statistieken";
 $lang['ProdFields']      = "Velden";
 
 # Mailboxes
@@ -661,12 +665,12 @@
 $lang['Calendar']        = "Kalender";
 $lang['Addresses']       = "Adressen";
 $lang['BugTrack']        = "Foutregistratie";
-$lang['ProductMenu']     = "Opdrachten & Projecten";
+$lang['ProductMenu']     = "Producten & Projecten";
 $lang['Logout']          = "Uitloggen";
 $lang['CalendarInfo']    = "Kalender van Vandaag";
 $lang['AddressesInfo']   = "Zoek naar adressen";
 $lang['BugTrackInfo']    = "Bug Tracking Database";
-$lang['ProductInfo']     = "Opdrachten & Projecten";
+$lang['ProductInfo']     = "Producten & Projecten";
 $lang['LogoutInfo']      = "Uitloggen";
 
 # Help
@@ -925,8 +929,8 @@
 $lang['Err0001']         = "Geen deelnemers !";
 $lang['Err0002']         = "start ligt na einde !";
 $lang['Err0003']         = "De beschrijving ontbreekt bij de afspraak !";
-$lang['Err0004']         = "Onbekende Opdracht <I>%s</I> !";
-$lang['Err0005']         = "Opdrachtenbeschrijving <I>%s</I> is geldig voor <B>%d</B> opdrachten !";
+$lang['Err0004']         = "Onbekend product <I>%s</I> !";
+$lang['Err0005']         = "Product omschrijving <I>%s</I> is geldig voor <B>%d</B> producten !";
 $lang['Err0006']         = "Maak aub een gedetailleerde selectie";
 $lang['Err0007']         = "Onbekende bezoeker. <I>%s</I> was niet gevonden in de <A HREF=address_select.php>addressboeken</A>";
 $lang['Err0008']         = "Bezoekersnaam <I>%s</I> is geldig voor %d Invoeren";
@@ -949,15 +953,15 @@
 $lang['Err0025']         = "Ontbrekende of Wachtwoord";
 $lang['Err0026']         = "Login niet mogelijk";
 $lang['Err0027']         = "Login mislukt";
-$lang['Err0028']         = "Geen Opdrachten/Projecten gedefinieerd";
-$lang['Err0029']         = "Geen Opdrachten/Projecten zichtbaar";
+$lang['Err0028']         = "Geen Producten/Projecten gedefinieerd";
+$lang['Err0029']         = "Geen Producten/Projecten zichtbaar";
 $lang['Err0030']         = "Fax is niet gespoold !";
 $lang['Err0031']         = "Ontbrekend Faxnummer !";
 $lang['Err0032']         = "Sturen van Faxen is afgesloten !";
 $lang['Err0033']         = "Mail sturen is afgesltoen ! Mail \"%s\" is <U>niet</U> verzonden.";
 $lang['Err0034']         = "mail is niet verzonden ! ontbrekende verzender \"%s\" e-mail.";
 $lang['Err0035']         = "mail is niet verzonden ! geen ontvangers of is al verzonden.";
-$lang['Err0036']         = "Opdracht/Project bestaat al (%s) met deze naam en versie !";
+$lang['Err0036']         = "Product/Project bestaat al (%s) met deze naam en versie !";
 $lang['Err0037']         = "mail '%s' is niet verzonden ! Ontbrekend Mail Prototypebestand (%s) !";
 $lang['Err0038']         = "Ongeldige Datum in veld %s!";
 $lang['Err0039']         = "Addresinvoer bestaat al (%s) !";

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

Modified Files:
	Date.pinc 
Log Message:


Merged extra calculations for Dutch special dates as contributed bij
Robert Brouwer.



Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Date.pinc	3 May 2002 08:25:55 -0000	1.52
+++ Date.pinc	30 May 2002 09:20:29 -0000	1.53
@@ -154,8 +154,18 @@
 
        /* Holidays defined by Weekday */
        if ( $wd == "Mon" ) {
-
-         if ($tutos[cal][$ii][$ij][Date] == "EASTERMONDAY") {
+         /* Date calculation for Dutch carnaval monday by Robert Brouwer */
+         if ($tutos[cal][$ii][$ij][Date] == "CARNAVALMON") {
+           $tp = mktime (0,0,0,$OM,$OT,$J);
+           $tp -= (7*7) * 86400;
+           $tp += 2*86400;
+           $pday = Date("d-m",$tp);
+           if ( $day == $pday ) {
+             $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+             $mark += $tutos[cal][$ii][$ij][type];
+           }
+	 }
+         elseif ($tutos[cal][$ii][$ij][Date] == "EASTERMONDAY") {
            $tp = mktime (0,0,0,$OM,$OT,$J);
            $tp += 86400;
            $pday = Date("d-m",$tp);
@@ -200,6 +210,38 @@
            $mark += $tutos[cal][$ii][$ij][type];
          }
        }
+       elseif ( $wd == "Tue" ) {
+         /* Date calculation for Dutch 'Prinsjesdag' by Robert Brouwer */
+         if ($tutos[cal][$ii][$ij][Date] == "PRINSDAY" && ($month == "09") && 
+		($today['mday'] == nthday(3, $today['wday'], $today['mon'], $today['year']))) {
+           $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+           $mark += $tutos[cal][$ii][$ij][type];
+	 }
+         /* Date calculation for Dutch carnaval tuesday by Robert Brouwer */
+         elseif ($tutos[cal][$ii][$ij][Date] == "CARNAVALTUE") {
+           $tp = mktime (0,0,0,$OM,$OT,$J);
+           $tp -= (7*7) * 86400;
+           $tp += 3* 86400;
+           $pday = Date("d-m",$tp);
+           if ( $day == $pday ) {
+             $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+             $mark += $tutos[cal][$ii][$ij][type];
+           }
+         }
+       }
+       elseif ( $wd == "Wed" ) {
+         /* Date calculation for Dutch carnaval wednesday by Robert Brouwer */
+         if ($tutos[cal][$ii][$ij][Date] == "CARNAVALWED") {
+           $tp = mktime (0,0,0,$OM,$OT,$J);
+           $tp -= (7*7) * 86400;
+           $tp += 4 * 86400;
+           $pday = Date("d-m",$tp);
+           if ( $day == $pday ) {
+             $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+             $mark += $tutos[cal][$ii][$ij][type];
+           }
+         }
+       }
        elseif ( $wd == "Thu" ) {
          # Christ Himmelfahrt
          if ($tutos[cal][$ii][$ij][Date] == "ASCENSIONDAY") {
@@ -243,8 +285,17 @@
              $desc .= $tutos[cal][$ii][$ij][Desc].$br;
              $mark += $tutos[cal][$ii][$ij][type];
            }
-         }
-         elseif ($tutos[cal][$ii][$ij][Date] == "WHITSUNDAY") {
+         /* Date calculation for Dutch 'Moederdag' (Mothersday') by Robert Brouwer */
+         } elseif ($tutos[cal][$ii][$ij][Date] == "MOTHERDAY" && 
+		($month == "5") && ($today['mday'] == nthday(2, $today['wday'], $today['mon'], $today['year'])) ) {
+           $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+           $mark += $tutos[cal][$ii][$ij][type];
+         /* Date calculation for Dutch 'Vaderdag' (Fathersday') by Robert Brouwer */
+         } elseif ($tutos[cal][$ii][$ij][Date] == "FATHERDAY" && 
+		($month == "6") && ($today['mday'] == nthday(3, $today['wday'], $today['mon'], $today['year'])) ) {
+           $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+           $mark += $tutos[cal][$ii][$ij][type];
+         } elseif ($tutos[cal][$ii][$ij][Date] == "WHITSUNDAY") {
            $tp = mktime (0,0,0,$OM,$OT,$J);
            $tp += 7 * 7 * 86400;
            $pday = Date("d-m",$tp);

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

Modified Files:
	holiday_au.pinc 
Log Message:
Extended Holiday file
contributed by "Hugh Blandford" <hugh at island.net.au>

Index: holiday_au.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/holiday_au.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- holiday_au.pinc	16 Feb 2002 14:48:32 -0000	1.2
+++ holiday_au.pinc	30 May 2002 07:15:46 -0000	1.3
@@ -10,7 +10,28 @@
  */
 
      $tutos[cal][] = array(
-        array( Date => "26-01",          type => 1,    Desc => "National Holiday (AU)"),
-        array( Date => "01-10",          type => 1,    Desc => "Public Holiday (AU)"),
+        array( Date => "01-01",          type => 1,    Desc => "New Year's Day (AU)"),
+        array( Date => "26-01",          type => 1,    Desc => "Australia Day (AU)"),
+        array( Date => "28-01",          type => 1,    Desc => "Australia Day Holiday(AU ex NSW,Vic)"),
+        array( Date => "04-03",          type => 0,    Desc => "Labour Day (AU WA)"),
+        array( Date => "11-03",          type => 0,    Desc => "Labour Day (AU Vic)"),
+        array( Date => "11-03",          type => 0,    Desc => "8 Hours Day (AU Tas)"),
+        array( Date => "18-03",          type => 0,    Desc => "Canberra Day (AU ACT)"),
+        array( Date => "25-04",          type => 1,    Desc => "Anzac Day (AU)"),
+        array( Date => "06-05",          type => 0,    Desc => "Labour Day (AU Qld)"),
+        array( Date => "06-05",          type => 0,    Desc => "May Day (AU NT)"),
+        array( Date => "20-05",          type => 0,    Desc => "Adelaide Cup (AU SA)"),
+        array( Date => "03-06",          type => 0,    Desc => "Foundation Day (AU WA)"),
+        array( Date => "10-06",          type => 1,    Desc => "Queen's Birthday (AU ex-WA)"),
+        array( Date => "05-08",          type => 0,    Desc => "Picnic Day (AU NT)"),
+        array( Date => "30-09",          type => 0,    Desc => "Queen's Birthday (AU WA)"),
+        array( Date => "07-10",          type => 0,    Desc => "Labour Day (AU ACT,NSW,SA)"),
+        array( Date => "05-11",          type => 0,    Desc => "Melbourne Cup (AU Vic)"),
+        array( Date => "25-12",          type => 1,    Desc => "Christmas Day (AU)"),
+        array( Date => "26-12",          type => 1,    Desc => "Boxing Day (AU ex-SA)"),
+        array( Date => "26-12",          type => 1,    Desc => "Proclamation Day (AU SA)"),
+        array( Date => "GOODFRIDAY",     type => 1,    Desc => "Good Friday (AU)"),
+        array( Date => "EASTERSUNDAY",   type => 1,    Desc => "Easter Saturday (AU)"),
+        array( Date => "EASTERMONDAY",   type => 1,    Desc => "Easter Monday (AU)"),
         );
 ?>

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

Modified Files:
	check.php 
Log Message:
bugfix

Index: check.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/check.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- check.php	25 Mar 2002 18:47:54 -0000	1.20
+++ check.php	29 May 2002 19:53:25 -0000	1.21
@@ -30,6 +30,7 @@
  $current_user = new tutos_user($dbconn);
  $current_user->f_name = "TUTOS";
  $current_user->l_name = "(remember service)";
+ $current_user->admin = 1;
  $d = new DateTime();
  $msg = "";
 
@@ -199,7 +200,6 @@
    $m->addBody($x->note,"text/plain",$lang['NoteDescription'],"",$x->creator->lg['content_encoding']);
 
    $msg .= $m->send();
-
    $x->remember = new DateTime(0);
    $x->save();
    $a++;

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

Modified Files:
	permission.p3 address.pinc mail.pinc timetrack.pinc 
Log Message:
other stuff

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- permission.p3	26 May 2002 17:58:38 -0000	1.65
+++ permission.p3	29 May 2002 19:52:55 -0000	1.66
@@ -524,6 +524,8 @@
     set_error_handler("PHP_Error");
   }
 
+  $tutos[activemodules] = array();
+
   set_magic_quotes_runtime(0);
 
   if ( isset($HTTP_POST_VARS['dbnr']) ) {
@@ -554,6 +556,8 @@
     $action = $HTTP_POST_VARS['login'];
   } elseif ( isset($HTTP_GET_VARS['login']) ) {
     $action = $HTTP_GET_VARS['login'];
+  } else {
+    $action = "";
   }
 
 

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- address.pinc	26 May 2002 18:16:51 -0000	1.62
+++ address.pinc	29 May 2002 19:52:55 -0000	1.63
@@ -302,20 +302,20 @@
     if ( isset($this->location) ) {
       @reset($this->location);
       while( list ($i,$f) = @each ($this->location)) {
-	if ( $f->email_1 != "") {
-	  $e = $f->email_1;
-	  if ( $f->category == 2 ) {
-	    return "$e";
-	  }
-	} elseif ( $f->email_2 != "" ) {
-	  $e = $f->email_1;
-	  if ( $f->category == 2 ) {
-	    return "$e";
-	  }
-	}
+        if ( $f->email_1 != "") {
+          $e = $f->email_1;
+          if ( $f->category == 2 ) {
+            return $e;
+          }
+        } elseif ( $f->email_2 != "" ) {
+          $e = $f->email_1;
+          if ( $f->category == 2 ) {
+            return $e;
+          }
+        }
       }
     }
-    return "$e";
+    return $e;
   }
   /** ---------------------------------------------------------------------------
    * Return a URL to this address

Index: mail.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mail.pinc	24 Mar 2002 19:15:35 -0000	1.22
+++ mail.pinc	29 May 2002 19:52:55 -0000	1.23
@@ -28,7 +28,7 @@
    * a reply to will also set to the same name (TUTOS can not be addressed directly)
    */
   function setFrom(&$obj) {
-    $this->from = $obj;
+    $this->from = &$obj;
   }
   function setFromTxt($from) {
     $this->from_adr = $from;

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- timetrack.pinc	26 May 2002 18:11:55 -0000	1.32
+++ timetrack.pinc	29 May 2002 19:52:55 -0000	1.33
@@ -76,7 +76,7 @@
   /* ---------------------------------------------------------------------------
    */
   function timetrack(&$dbconn) {
-    global $current_user;
+    global $tutos,$current_user;
 
     $this->init($dbconn);
 
@@ -89,13 +89,12 @@
     $this->creation = new DateTime();
     # number of invoice
     $this->invoice  = -1;
-    $this->currency = $lang[currency][0];
+    $this->currency = $tutos[currencies][0];
     # Costs per hour ("" == default)
     $this->cph = 0.0;
     # State (-1 == unknown , 1 == checke 2 == billed)
     $this->state = -1;
     $this->inv_id = -1;
-    $this->invoice = -1;
 
     $this->tablename = "timetrack";
   }

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

Modified Files:
	invoice.pinc invoice_new.php invoice_show.php product_show.php 
	task_show.php 
Log Message:
invoice imporvement

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice.pinc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- invoice.pinc	26 May 2002 18:11:56 -0000	1.10
+++ invoice.pinc	29 May 2002 19:52:00 -0000	1.11
@@ -193,7 +193,20 @@
       $this->sum_single = $obj->cph;
       $this->description = $lang[$obj->getType()] ."\n". $obj->desc;
       $this->currency = $obj->currency;
-      $this->itype = $lang['hours'];
+	} else
+    if ( $obj->gettype() == "task" ) {
+      $this->items = 1;
+      $this->itype = $lang['pcs'];
+      $this->description = $lang[$obj->getType()] ."\n". $obj->desc;
+      $this->sum_single = 0;
+	  $obj->readtimetrack();
+      @reset($obj->ttlist) ;
+	  while ( list ($i2,$f2) = @each ($obj->ttlist) ) {
+        $this->sum_single += $f2->volume * $f2->cph;
+        $this->currency = $f2->currency;
+        $this->description .= "\n". $f2->wday->getDate() ." ". $f2->volume ." ". $lang['hours'] ." ". $lang['InvPosSingle'] ." ". $f2->cph ." ". $f2->currency;
+      }
+
 	} else {
 	}
   }
@@ -742,6 +755,9 @@
 	pdf_set_font($pdf, "Times-Roman", 12, "host");
     @reset($this->pos) ;
     while ( list ($i,$f) = @each ($this->pos) ) {
+      # Default line height
+      $h = 20;
+
       $sum[$f->currency] += $f->getTotal();
       $x = 40;
       pdf_show_xy($pdf, $f->pos, $x, $y);
@@ -750,25 +766,31 @@
       $x += 30;
       pdf_show_xy($pdf, $f->itype, $x, $y);
       $x += 50;
-      pdf_show_xy($pdf, $f->description, $x, $y);
+	  $l = explode("\n",$f->description);
+
+      while ( list ($i,$line) = @each ($l) ) {
+        pdf_show_xy($pdf, $line, $x, $y - ($i * 20));
+		if ( $i > 0 ) $h += 20;
+	  }
       $x += 200;
       pdf_show_xy($pdf, number_format($f->sum_single ,2,$lang['DecPoint'],$lang['ThousandPoint']), $x, $y);
       $x += 40;
       pdf_show_xy($pdf, number_format($f->getTotal(),2,$lang['DecPoint'],$lang['ThousandPoint']), $x, $y);
-      $x += 50;
+      $x += 90;
       pdf_show_xy($pdf, $f->currency , $x, $y);
       $x += 60;
 
-	  $y -= 3;
-      pdf_moveto($pdf, 30, $y);
-      pdf_lineto($pdf, $x, $y);
-      pdf_lineto($pdf, $x, $y+23);
-      pdf_moveto($pdf, 30, $y);
-      pdf_lineto($pdf, 30, $y+23);
-      pdf_lineto($pdf, $x, $y+23);
+      # BOX
+      pdf_moveto($pdf, 30, $y +17);
+      pdf_lineto($pdf, $x, $y +17);
+#      pdf_lineto($pdf, $x, $y+ $h +3);
+#      pdf_moveto($pdf, 30, $y);
+#      pdf_lineto($pdf, 30, $y+ $h +3);
+#      pdf_lineto($pdf, $x, $y+ $h +3);
       pdf_stroke($pdf);
 
-      $y -= 20;
+      $y -= 3;
+      $y -= $h;
     }
 
     # Summary
@@ -778,7 +800,7 @@
      if ( $sum[$c] != 0 ) {
        $x = 390;
        pdf_show_xy($pdf,number_format($sum[$c],2,$lang['DecPoint'],$lang['ThousandPoint']),$x,$y);
-       $x += 50;
+       $x += 90;
        pdf_show_xy($pdf, $c,$x,$y);
        $y -= 20;
      }

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice_new.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- invoice_new.php	26 May 2002 18:11:56 -0000	1.9
+++ invoice_new.php	29 May 2002 19:52:00 -0000	1.10
@@ -68,7 +68,7 @@
 	 if ( is_object($f->ref) && ($f->ref->getType() == "timetrack") ) {
        echo " <TD ALIGN=left VALIGN=top>\n";
        if ( $f->ref->state != 1 ) {
-         echo $f->ref->getLink( $lang['TTStates'][$f->ref->state]);
+         echo $f->ref->getLink( $lang['TTState']." ".$lang['TTStates'][$f->ref->state]);
        } else {
          echo "<CENTER><INPUT TYPE=checkbox NAME=\"add[]\" VALUE=\"". $f->ref_id ."\"></CENTER>";
 	   }
@@ -240,13 +240,13 @@
        show_invpos($p,$obj);
      }
 
+     # Time directly booked on the parent object
      $obj->ref->readtimetrack();
      @reset($obj->ref->ttlist) ;
      while ( list ($i,$f) = @each ($obj->ref->ttlist) ) {
        if ( ($f->inv_id == $obj->id) && ($obj->id != -1) ) {
          continue;
        }
-       echo "<TR>\n";
        $p = new invpos($obj->dbconn);
        $p->set($obj,$f);
        $p->read_ref();
@@ -256,6 +256,17 @@
        unset($p);
        unset($f);
      }
+
+     # Time booked on tasks
+     $obj->ref->readtasks();
+     @reset($obj->ref->tasklist) ;
+     while ( list ($i,$f) = @each ($obj->ref->tasklist) ) {
+	   $p = new invpos($obj->dbconn);
+       $p->set($obj,$f);
+       show_invpos($p,$obj);
+       unset($p);
+	 }
+
    }
 
    #

Index: invoice_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice_show.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- invoice_show.php	26 May 2002 18:11:56 -0000	1.9
+++ invoice_show.php	29 May 2002 19:52:00 -0000	1.10
@@ -10,10 +10,7 @@
  */
  include("webelements.p3");
  include("permission.p3");
- include("product.pinc");
  include("installation.pinc");
- include("timetrack.pinc");
- include("note.pinc");
  include("invoice.pinc");
 
 
@@ -40,7 +37,7 @@
    echo " <TD ALIGN=right VALIGN=top>".  number_format($f->sum_single ,2,$lang['DecPoint'],$lang['ThousandPoint']) ."</TD>";
    echo " <TD ALIGN=right VALIGN=top>".  number_format($f->tax ,2,$lang['DecPoint'],$lang['ThousandPoint']) ."</TD>";
    echo " <TD ALIGN=right VALIGN=top>". number_format($f->getTotal(),2,$lang['DecPoint'],$lang['ThousandPoint']) ."</TD>";
-   echo " <TD ALIGN=right VALIGN=top>&nbsp;". $f->currency ."</TD>";
+   echo " <TD ALIGN=left VALIGN=top>&nbsp;". $f->currency ."</TD>";
    echo "</TR>\n";
  }
  /* ---------------------------------------------------------------------------

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- product_show.php	26 May 2002 18:16:52 -0000	1.32
+++ product_show.php	29 May 2002 19:52:00 -0000	1.33
@@ -1,6 +1,6 @@
 <?
 /**
- * Copyright 1999/2000 by Gero Kohnert
+ * Copyright 1999 - 2002 by Gero Kohnert
  *
  * display all product info
  *
@@ -377,7 +377,7 @@
  /* ---------------------------------------------------------------------------
   *
   */
- Function navigate($obj) {
+ Function navigate(&$obj) {
    global $tutos,$lang, $current_user;
 
    echo "<TABLE>";

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- task_show.php	26 May 2002 18:11:55 -0000	1.24
+++ task_show.php	29 May 2002 19:52:00 -0000	1.25
@@ -41,7 +41,7 @@
    echo "  <TD COLSPAN=3>". $lang['TaskStates'][$t->state] ."</TD>\n";
    echo " </TR>\n";
 
-   if ( $t->parent->gettype() != "address" ) {
+   if ( ($t->parent != -1) && ($t->parent->gettype() != "address") ) {
      echo " <TR>\n";
 	 showfield($lang['TaskSubTask']);
 	 echo "  <TD COLSPAN=3>\n";

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

Modified Files:
	acl_overview.php module_base.pinc webelements.p3 
Log Message:
module stuff

Index: acl_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_overview.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- acl_overview.php	3 May 2002 08:25:55 -0000	1.12
+++ acl_overview.php	29 May 2002 19:50:42 -0000	1.13
@@ -5,26 +5,12 @@
  include("permission.p3");
 
  include("acl.pinc");
- include("appointment.pinc");
- include("bug.pinc");
- include("company.pinc");
- include("config.pinc");
  include("Date.pinc");
- include("department.pinc");
- include("file.pinc");
  include("history.pinc");
- include("installation.pinc");
  include("location.pinc");
  include("mailbox.pinc");
  include("mail.pinc");
- include("note.pinc");
- include("product.pinc");
- include("resource.pinc");
- include("task.pinc");
  include("team.pinc");
- include("timetrack.pinc");
- include("url.pinc");
- include("user.pinc");
 
  check_user();
 
@@ -36,32 +22,8 @@
      return;
    }
 
-   if ( $type == "address"  ) {
-     $query = "SELECT DISTINCT id FROM addresses ORDER by id";
-   } else if ( $type == "file" ) {
-     $query = "SELECT DISTINCT id FROM files ORDER by id";
-   } else if ( $type == "bug" ) {
-     $query = "SELECT DISTINCT id FROM bugs ORDER by id";
-   } else if ( $type == "note" ) {
-     $query = "SELECT DISTINCT id FROM notes ORDER by id";
-   } else if ( $type == "appointment" ) {
-     $query = "SELECT DISTINCT id FROM calendar ORDER by id";
-   } else if ( $type == "task" ) {
-     $query = "SELECT DISTINCT id FROM tasks ORDER by id";
-   } else if ( $type == "user" ) {
-     $query = "SELECT DISTINCT id FROM people ORDER by id";
-   } else if ( $type == "company" ) {
-     $query = "SELECT DISTINCT id FROM companies ORDER by id";
-   } else if ( $type == "department" ) {
-     $query = "SELECT DISTINCT id FROM departments ORDER by id";
-   } else if ( $type == "product" ) {
-     $query = "SELECT DISTINCT id FROM products ORDER by id";
-   } else if ( $type == "resource" ) {
-     $query = "SELECT DISTINCT id FROM resources ORDER by id";
-   } else if ( $type == "installation" ) {
-     $query = "SELECT DISTINCT id FROM installations ORDER by id";
-   } else if ( $type == "url" ) {
-     $query = "SELECT DISTINCT id FROM urls ORDER by id";
+   if ( $type != ""  ) {
+     $query = "SELECT DISTINCT id FROM ". $type ." ORDER by id";
    } else {
      $query = "SELECT DISTINCT obj_id as id FROM acl WHERE obj_id > 0 ORDER by obj_id";
    }
@@ -219,25 +181,32 @@
  }
 
  Function navigate() {
-   global $lang;
+   global $lang,$tutos;
 
    echo "<TABLE>\n";
    echo "<TR><TD>\n";
    echo "<SPAN CLASS=nodeco>".$lang['show'] ."</SPAN><BR><UL>\n";
    echo "<LI>". menulink("acl_overview.php",$lang['AppEverything'],$lang['AppEverything']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=address","Addresses","Addresses") ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=bug",$lang['Bugs'],$lang['Bugs']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=file",$lang['Files'],$lang['Files']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=note",$lang['Notes'],$lang['Notes']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=appointment",$lang['Appointments'],$lang['Appointments']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=task",$lang['Tasks'],$lang['Tasks']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=user",$lang['User'],$lang['User']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=company",$lang['Company'],$lang['Company']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=department",$lang['Departments'],$lang['Departments']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=product",$lang['ProductPs'],$lang['ProductPs']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=resource",$lang['Resources'],$lang['Resources']) ."\n";
-   echo "<LI>". menulink("acl_overview.php?type=installation",$lang['Installations'],$lang['Installations']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=addresses","Addresses","Addresses") ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=bugs",$lang['Bugs'],$lang['Bugs']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=files",$lang['Files'],$lang['Files']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=notes",$lang['Notes'],$lang['Notes']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=calendar",$lang['Appointments'],$lang['Appointments']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=tasks",$lang['Tasks'],$lang['Tasks']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=people",$lang['User'],$lang['User']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=companies",$lang['Company'],$lang['Company']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=departments",$lang['Departments'],$lang['Departments']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=products",$lang['ProductPs'],$lang['ProductPs']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=resources",$lang['Resources'],$lang['Resources']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=installations",$lang['Installations'],$lang['Installations']) ."\n";
+   echo "<LI>". menulink("acl_overview.php?type=invoice",$lang['Invoice'],$lang['Invoice']) ."\n";
 #   echo "<LI>". menulink("acl_overview.php?type=url",$lang['URL'],$lang['URL']) ."\n";
+   @reset($tutos[modules]);
+   while ( list ($r,$x) = @each ($tutos[modules])) {
+     loadmodules($r);
+     $ref = new $x[name]($r);
+     echo "<LI>". menulink("acl_overview.php?type=". $ref->tablename,$lang[$ref->getType()],$lang[$ref->getType()]) ."\n";
+   }
    echo "</UL></TD></TR>\n";
 
    HTML_Select();

Index: module_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/module_base.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- module_base.pinc	26 May 2002 18:21:03 -0000	1.2
+++ module_base.pinc	29 May 2002 19:50:42 -0000	1.3
@@ -8,6 +8,43 @@
  */
 
 /**
+ * load modules that want to work here
+ */
+Function loadmodules($key) {
+  global $tutos,$lang;
+
+  @reset($tutos[modulesinc]);
+  while ( list ($r,$x) = @each ($tutos[modulesinc])) {
+    @reset($tutos[modulesinc][$r]);
+    while ( list ($r2,$x2) = @each ($tutos[modulesinc][$r])) {
+      if ( ($x2 == $key) && !isset($tutos[activemodules][$r]) ) {
+        include($tutos['base'] ."/". $tutos[modules][$r][file]);
+        ReadLang1($lang,$tutos['base'] ."/php/". $r);
+        $tutos[activemodules][$r] = $r;
+      }
+    }
+  }
+}
+
+/**
+ * show links to overview and select pages of the modules
+ */
+Function show_module_links(&$user) {
+   global $tutos;
+  if ( isset($tutos[activemodules]) ) {
+    echo "\n<!-- =============== Start the module navigation =============== -->\n";
+    echo "<TR VALIGN=bottom>\n";
+    echo " <TD NOWRAP>\n";
+    @reset($tutos[activemodules]);
+    while( list ($i,$f) = @each ($tutos[activemodules])) {
+      $x = new $f($c->dbconn);
+      echo $x->getSelectLink($user);
+      echo $x->getOverviewLink($user);
+    }
+    echo "</TD></TR>\n";
+  }
+}
+/**
  * INTERFACE !!
  * This class extends tutos_base with those
  * methods that make a module

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- webelements.p3	26 May 2002 17:58:38 -0000	1.115
+++ webelements.p3	29 May 2002 19:50:42 -0000	1.116
@@ -30,25 +30,6 @@
 }
 
 /**
- * load modules that want to work here
- */
-Function loadmodules($key) {
-  global $tutos,$lang;
-
-  @reset($tutos[modulesinc]);
-  while ( list ($r,$x) = @each ($tutos[modulesinc])) {
-    @reset($tutos[modulesinc][$r]);
-    while ( list ($r2,$x2) = @each ($tutos[modulesinc][$r])) {
-      if ( ($x2 == $key) && !isset($tutos[activemodules][$r]) ) {
-        include($tutos['base'] ."/". $tutos[modules][$r][file]);
-        ReadLang1($lang,$tutos['base'] ."/php/". $r);
-        $tutos[activemodules][$r] = $r;
-      }
-    }
-  }
-}
-
-/**
  * Read ISO Country Codes.  * HC *
  */
 Function ReadISOCntryCde(&$lang) {
@@ -555,18 +536,7 @@
 Function HTML_Select () {
   global $PHP_SELF, $current_user, $tutos, $lang;
 
-  if ( isset($tutos[activemodules]) ) {
-    echo "\n<!-- =============== Start the module navigation =============== -->\n";
-    echo "<TR VALIGN=bottom>\n";
-    echo " <TD NOWRAP>\n";
-    @reset($tutos[activemodules]);
-    while( list ($i,$f) = @each ($tutos[activemodules])) {
-      $x = new $f($c->dbconn);
-      echo $x->getSelectLink($current_user);
-      echo $x->getOverviewLink($current_user);
-    }
-    echo "</TD></TR>\n";
-  }
+  show_module_links($current_user);
   echo "\n<!-- =============== Start the standard navigation =============== -->\n";
   # Check if logged in
   if ( $current_user->id == -1 ) {
@@ -1285,7 +1255,6 @@
 
    switch ($type) {
      case -1:
-       $r->free();
        # search modules
        @reset($tutos[modules]);
        while ( list ($r,$x) = @each ($tutos[modules])) {

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

Modified Files:
	group.pinc 
Log Message:
module stuff

Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- group.pinc	26 May 2002 18:25:44 -0000	1.2
+++ group.pinc	29 May 2002 19:50:42 -0000	1.3
@@ -410,6 +410,9 @@
     if ( "group_overview.php" == basename($PHP_SELF) ) {
       return;
 	}
+    if ( ereg("^acl",basename($PHP_SELF) )) {
+      return;
+	}
     return menulink("group/group_overview.php" ,($text == "" ? $lang['GroupOverview']: $text),$lang['GroupOverview']);
   }
 }

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

Modified Files:
	task.pinc 
Log Message:
bugfix

I wonder why nobody has seen this before

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- task.pinc	26 May 2002 18:11:55 -0000	1.64
+++ task.pinc	29 May 2002 15:46:41 -0000	1.65
@@ -1,5 +1,5 @@
 <?
-if ( isset ($includes['task.pinc']) ) {$includes['product.pinc']++;return;}
+if ( isset ($includes['task.pinc']) ) {$includes['task.pinc']++;return;}
 /*
  * Copyright 1999 - 2002 by Gero Kohnert
  *
@@ -595,7 +595,7 @@
 
      echo " <TR>\n";
      if ( ($parent->getType() == "address")||($parent->getType() == "team")) {
-       echo "  <TD VALIGN=top COLSPAN=2 NOWRAP>&nbsp;". $this->parent->getLink() ."&nbsp;--&gt; ". $this->getLink()."&nbsp;</TD>\n";
+       echo "  <TD VALIGN=top COLSPAN=2 NOWRAP>&nbsp;". $parent->getLink() ."&nbsp;--&gt; ". $this->getLink()."&nbsp;</TD>\n";
      } else {
        echo "  <TD ALIGN=right VALIGN=top>&nbsp;". $depth ."&nbsp;</TD>\n";
        echo "  <TD VALIGN=top NOWRAP>&nbsp;";

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

Modified Files:
	gantt_png.php 
Log Message:
DEBUG: the graph now reprensent subtasks
FUNC:  it also outine first level tasks

TODO:  find a system allowing to clearly see ended tasks (!= volume_done).


Index: gantt_png.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gantt_png.php	28 May 2002 16:02:56 -0000	1.3
+++ gantt_png.php	29 May 2002 13:07:06 -0000	1.4
@@ -24,19 +24,41 @@
 /* Check if user is allowed to use it */
 check_user();
 
-function get_bar($n, &$task) {
+function get_bar(&$task, $n, $depth) {
   $name  = $task->name;
   $start = $task->s_start->getYYYYMMDD();
   $end   = $task->s_end->getYYYYMMDD();
   $vol   = $task->volume_done;
   $comp  = $task->getcompletion();
 
+  for ($i = 0; $i <= $depth; $i++) {
+    $name = " ".$name;
+  }
   $bar = new GanttBar($n, $name, $start, $end,
-		      sprintf("[%.2f %%]", $comp), 0.5);
+		      sprintf("[%.0f %%]", $comp), 0.5);
+
+  /* Outline first level tasks */
+  if( $depth == 1 ) {
+    $bar->title->SetFont(FF_FONT1, FS_BOLD, 8);
+  }
   $bar->progress->Set($comp/100.0);
   return $bar;
 }
 
+/* Recursive adding of project tasks */
+function addTasks(&$parent, &$graph, &$count, $depth) {
+  if ( $parent->getType() == "task" ) {
+    $graph->Add(get_bar($parent, $count++, $depth));
+  }
+
+  $parent->readTasks();
+  @reset($parent->tasklist);
+  while( list($i, $f) = @each($parent->tasklist) ) {
+    $graph = addTasks($f, $graph, $count, $depth+1);
+  }
+  return $graph;
+}
+
 Function draw_gantt(&$parent) {
   global $lang , $tutos;
 
@@ -63,19 +85,13 @@
   $graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12);
 
   $count = 0;
-  if ( $parent->getType() == "task" ) {
-    $graph->Add(get_bar($count++, $parent));
-  } else {
-    @reset($parent->tasklist);
-    while ( list($i, $f) = @each($parent->tasklist) ) {
-      $graph->Add(get_bar($count++, $f));
-    }
-  }
+  $graph = addTasks(&$parent, &$graph, $count, 0);
 
   // Add a vertical line for the current day
   $vline = new GanttVLine(strftime("%Y-%m-%d", time()));
   $vline->SetDayOffset(0.5);
   $graph->Add($vline);
+
   $graph->Stroke();
 }
 

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

Modified Files:
	nl.p3 
Log Message:


small translations


Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nl.p3	28 May 2002 13:37:19 -0000	1.49
+++ nl.p3	29 May 2002 09:03:23 -0000	1.50
@@ -477,12 +477,12 @@
 $lang['Reschedule_s']    = "Opnieuw plannen start";
 $lang['Reschedule_e']    = "Opnieuw plannen einde";
 $lang['TaskGantt']       = "Gantt diagram";
-$lang['TaskImport']      = "Task: CVS Import";
+$lang['TaskImport']      = "Taak: CVS Import";
 $lang['ImportSrcFile']   = "Source file";
-$lang['ImportColNames']  = "Columns name in CSV file";
+$lang['ImportColNames']  = "Kolom namen in CSV file";
 $lang['ImportIndex']     = "WBS Index";
 $lang['ImportValid']     = "Import";
-$lang['ImportConfirm']   = "Confirm Import";
+$lang['ImportConfirm']   = "Bevestig Import";
 
 
 # Gantt Diagramm
@@ -971,11 +971,10 @@
 $lang['Err0047']         = "Kon de adminrechten niet verwijderen. Er moet tenminste 1 admin zijn in het systeem !";
 $lang['Err0048']         = "Niets gevonden !";
 $lang['Err0049']         = "Account %s is geblokkeerd !";
-$lang['Err0050']         = "Could not find CSV contents !";
-$lang['Err0051']         = "Could not find CSV Separator";
+$lang['Err0050']         = "Kon geen CSV inhoud vinden !";
+$lang['Err0051']         = "Kon geen CSV separator vinden !";
 
 ### Local Variables: ***
 ### End: ***
-
 
 ?>

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

Modified Files:
	gantt_png.php 
Log Message:
Added a vertical line showing the current date in the Chart.
I still have to fix the tasks reading to show all project tasks.


Index: gantt_png.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gantt_png.php	22 May 2002 17:59:49 -0000	1.2
+++ gantt_png.php	28 May 2002 16:02:56 -0000	1.3
@@ -31,12 +31,12 @@
   $vol   = $task->volume_done;
   $comp  = $task->getcompletion();
 
-  $bar = new GanttBar($n, $name, $start, $end, sprintf("[%.2f %%]", $comp) , 0.5);
+  $bar = new GanttBar($n, $name, $start, $end,
+		      sprintf("[%.2f %%]", $comp), 0.5);
   $bar->progress->Set($comp/100.0);
   return $bar;
 }
 
-
 Function draw_gantt(&$parent) {
   global $lang , $tutos;
 
@@ -47,8 +47,10 @@
   //$graph->SetShadow();
   $graph->SetBox();
   // Titles for chart
-  $graph->title->Set($lang['TaskGantt']." ". $lang['forphrase'] ." " . $parent->getFullName());
-#  $graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
+  $graph->title->Set($lang['TaskGantt']." ". $lang['forphrase'] ." " .
+		     $parent->getFullName());
+
+  //$graph->title->SetFont(FF_ARIAL,FS_BOLD,12);
 
   // For illustration we enable all headers. 
   $graph->ShowHeaders(GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK);
@@ -69,6 +71,11 @@
       $graph->Add(get_bar($count++, $f));
     }
   }
+
+  // Add a vertical line for the current day
+  $vline = new GanttVLine(strftime("%Y-%m-%d", time()));
+  $vline->SetDayOffset(0.5);
+  $graph->Add($vline);
   $graph->Stroke();
 }
 

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

Modified Files:
	task_import_csv.php 
Log Message:
DEBUG: no more checking of existing task with same name !

Added volume management in the CVS import.


Index: task_import_csv.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_import_csv.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- task_import_csv.php	28 May 2002 13:36:48 -0000	1.1
+++ task_import_csv.php	28 May 2002 15:31:29 -0000	1.2
@@ -27,11 +27,11 @@
 check_user();
 loadmodules("task");
 
-Function getTaskByName(&$t, $name) {
+Function getTask(&$t, $name, $p_id) {
   global $dbconn;
 
   $qt = "SELECT * FROM ".$t->tablename.
-     " WHERE ".$dbconn->Like("name", $name);
+     " WHERE ".$dbconn->Like("name", $name)." AND p_id = '".$p_id."'";
   $rt = $dbconn->Exec($qt);
 	  
   if ( $rt->numrows() == 1 ) {
@@ -46,7 +46,7 @@
 
 Function import( $p ) {
   global $tutos, $lang, $current_user, $dbconn;
-  global $userfile, $contents, $name, $index, $s_start, $s_end;
+  global $userfile, $contents, $name, $index, $s_start, $s_end, $volume;
   global $import;
 
   $gotourl="task_import_csv.php?";
@@ -98,6 +98,7 @@
   $t_fields = array($name    => "name",
 		    $s_start => "s_start",
 		    $s_end   => "s_end",
+		    $volume  => "volume",
 		    $index   => "index"
 		    );
 
@@ -115,6 +116,7 @@
     echo "<INPUT TYPE=\"hidden\" name=\"index\"   value=\"".$index."\">\n";
     echo "<INPUT TYPE=\"hidden\" name=\"s_start\" value=\"".$s_start."\">\n";
     echo "<INPUT TYPE=\"hidden\" name=\"s_end\"   value=\"".$s_end."\">\n";
+    echo "<INPUT TYPE=\"hidden\" name=\"volume\"  value=\"".$volume."\">\n";
   }
   echo "<TABLE>\n";
 
@@ -139,7 +141,7 @@
 	  switch( $t_fields[$fnames[$j]] ) {
 	  case "name": {
 	    $name = $fields[$j];
-	    getTaskByName(&$t, $name);
+	    $t->setName($name);
 
 	    $val = $t->name;
 	    break;
@@ -159,6 +161,21 @@
 	    break;
 	  }
 
+	  case "volume": {
+	    $vol = trim($fields[$j]);
+	    if( ereg("([0-9]+).*(jour|day)", $vol, $regs) ) {
+	      // FIXME: use a localized number of worked hours (8)
+	      $t->setVolume(8*(int)$regs[1]);
+	    }
+	    elseif( ereg("([0-9]+).*(heure|hour)", $vol, $regs) ) {
+	      $t->setVolume((int)$regs[1]);
+	    }
+	    else
+	      $t->setVolume(0);
+
+	    $val = $t->volume." h";
+	    break;
+	  }
 	    /* Here it's a special case :
 	     * MS Project exports dependency field as WBS Index
 	     * The index is on the form: 1 1.1 1.2 2 2.1 2.1.1 2.1.2 2.2
@@ -215,7 +232,7 @@
 	  $dbconn->Commit("WORK");
 
 	  // We need to get the task id
-	  $t = getTaskByName(&$t, $name);
+	  $t = getTask(&$t, $name, $t->p_id);
 
 	  // Let the $indexes table up-to-date
 	  $indexes[$index] = $t;
@@ -300,12 +317,10 @@
   echo " </TR>\n";
   */
 
-  /*
   echo " <TR>\n";
   echo "  <TD class=\"desc\">".$lang['TaskVolumeFull']."</TD>\n";
   echo "  <TD><INPUT name=\"volume\"></TD>\n";
   echo " <TR>\n";
-  */
 
   /*
   echo " <TR>\n";

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

Modified Files:
	de.p3 el.p3 en.p3 es.p3 fr.p3 it.p3 ko.p3 nl.p3 pl.p3 ru.p3 
	sv.p3 tw.p3 zh.p3 
Log Message:
Adding the CSV Import new items in the language files.



Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- de.p3	26 May 2002 18:25:43 -0000	1.95
+++ de.p3	28 May 2002 13:37:18 -0000	1.96
@@ -474,6 +474,12 @@
 $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";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Gantt-Diagramm anzeigen";
@@ -961,6 +967,8 @@
 $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";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/el.p3,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- el.p3	22 May 2002 17:59:50 -0000	1.6
+++ el.p3	28 May 2002 13:37:18 -0000	1.7
@@ -478,6 +478,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "ÄéÜãñáììá Gantt ";
+$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";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Äåò Gantt";
@@ -965,6 +971,8 @@
 $lang['Err0047']         = "Äåí ìðïñåß íá ìåôáêéíçèåß ï äéá÷åéñéóôÞò äåîéÜ. ÐñÝðåé íá õðÜñ÷åé ôïõëÜ÷éóôïí Ýíáò äéá÷åéñéóôÞò!";
 $lang['Err0048']         = "Äå âñÝèçêå ôßðïôå!";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/en.p3,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- en.p3	22 May 2002 17:59:50 -0000	1.88
+++ en.p3	28 May 2002 13:37:18 -0000	1.89
@@ -474,6 +474,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";
@@ -961,6 +967,8 @@
 $lang['Err0047']         = "Could not remove the admin right. There must be at least one admin !";
 $lang['Err0048']         = "Nothing found !";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 #

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/es.p3,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- es.p3	22 May 2002 17:59:50 -0000	1.70
+++ es.p3	28 May 2002 13:37:18 -0000	1.71
@@ -476,6 +476,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Diagrama de Gantt";
+$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";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "Ver diagrama de Gantt";
@@ -963,6 +969,8 @@
 $lang['Err0047']         = "No se puede quitar el derecho de administrador. Debe haber al menos un administrador!";
 $lang['Err0048']         = "No se ha encontrado nada!";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fr.p3,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- fr.p3	22 May 2002 15:57:51 -0000	1.74
+++ fr.p3	28 May 2002 13:37:19 -0000	1.75
@@ -465,7 +465,7 @@
 $lang['TaskStates'][1]   = "En cours";
 $lang['TaskStates'][2]   = "Terminée";
 $lang['TaskStates'][3]   = "Overdue";
-$lang['TaskS_Start']     = "Demarrage prévu";
+$lang['TaskS_Start']     = "Démarrage prévu";
 $lang['TaskS_End']       = "Fin prévue";
 $lang['TaskSched']       = "Plannifiée";
 $lang['TaskReal']        = "réel";
@@ -476,6 +476,12 @@
 $lang['Reschedule_s']    = "Décaler le début";
 $lang['Reschedule_e']    = "Décaler la fin";
 $lang['TaskGantt']       = "Diagramme de Gantt";
+$lang['TaskImport']      = "Tâches: Import CSV";
+$lang['ImportSrcFile']   = "Fichier Source CSV";
+$lang['ImportColNames']  = "Nom des colonnes dans le fichier CSV";
+$lang['ImportIndex']     = "Index WBS";
+$lang['ImportValid']     = "Importer";
+$lang['ImportConfirm']   = "Confirmer l'import";
 
 # Gantt Diagramm
 $lang['GanttLink']       = "See the Gantt";
@@ -963,6 +969,8 @@
 $lang['Err0047']         = "Impossible de supprimer les droits administrateur. Vous devez en définir au moins un !";
 $lang['Err0048']         = "Aucun élément trouvé !";
 $lang['Err0049']         = "Compte %s désactivé !";
+$lang['Err0050']         = "Contenu du fichier CSV introuvable !";
+$lang['Err0051']         = "Séparateur du fichier CSV introuvable !";
 
 ### Local Variables: ***
 ### End: ***

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/it.p3,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- it.p3	22 May 2002 15:57:51 -0000	1.77
+++ it.p3	28 May 2002 13:37:19 -0000	1.78
@@ -474,6 +474,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -962,6 +968,8 @@
 $lang['Err0047']         = "Non puoi rimuovere i privilegi di Amministrazione. Deve esserci almeno un 'admin'!";
 $lang['Err0048']         = "Non ho trovato nulla!";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ko.p3,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ko.p3	22 May 2002 15:57:51 -0000	1.45
+++ ko.p3	28 May 2002 13:37:19 -0000	1.46
@@ -476,6 +476,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -964,6 +970,8 @@
 $lang['Err0047']         = "Could not remove the admin right. There must be at least one admin !";
 $lang['Err0048']         = "Nothing found !";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 #

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nl.p3	23 May 2002 08:25:22 -0000	1.48
+++ nl.p3	28 May 2002 13:37:19 -0000	1.49
@@ -477,6 +477,12 @@
 $lang['Reschedule_s']    = "Opnieuw plannen start";
 $lang['Reschedule_e']    = "Opnieuw plannen einde";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -965,6 +971,8 @@
 $lang['Err0047']         = "Kon de adminrechten niet verwijderen. Er moet tenminste 1 admin zijn in het systeem !";
 $lang['Err0048']         = "Niets gevonden !";
 $lang['Err0049']         = "Account %s is geblokkeerd !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pl.p3,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- pl.p3	22 May 2002 15:57:51 -0000	1.48
+++ pl.p3	28 May 2002 13:37:20 -0000	1.49
@@ -480,6 +480,12 @@
 $lang['Reschedule_s']    = "Przesuniête od";
 $lang['Reschedule_e']    = "Przesuniête do";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -968,6 +974,8 @@
 $lang['Err0047']         = "Nie mogê usun±æ praw administratora. Musi istnieæ przynajmniej jeden administrator systemu!";
 $lang['Err0048']         = "Nic nie znaleziono!";
 $lang['Err0049']         = "Konto %s jest wy³±czone!";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ru.p3,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ru.p3	22 May 2002 15:57:51 -0000	1.63
+++ ru.p3	28 May 2002 13:37:20 -0000	1.64
@@ -476,6 +476,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -964,6 +970,8 @@
 $lang['Err0047']         = "îÅ ÍÏÇÕ ÏÔÎÑÔØ ÐÒÁ×Á ÁÄÍÉÎÉÓÔÒÁÔÏÒÁ. îÕÖÅÎ ÈÏÔÑ ÂÙ ÏÄÉÎ ÁÄÍÉÎÉÓÔÒÁÔÏÒ!";
 $lang['Err0048']         = "îÅ ÎÁÊÄÅÎÏ!";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/sv.p3,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sv.p3	22 May 2002 15:57:51 -0000	1.7
+++ sv.p3	28 May 2002 13:37:20 -0000	1.8
@@ -472,6 +472,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -960,5 +966,7 @@
 $lang['Err0047']         = "Kunde inte ta bort administratörs rättigheter. Det måste finnas minst en administratör !";
 $lang['Err0048']         = "Fann inget !";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ?>

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/tw.p3,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- tw.p3	22 May 2002 15:57:51 -0000	1.63
+++ tw.p3	28 May 2002 13:37:20 -0000	1.64
@@ -478,6 +478,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -966,6 +972,8 @@
 $lang['Err0047']         = "Could not remove the admin right. There must be at least one admin !";
 $lang['Err0048']         = "Nothing found !";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/zh.p3,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- zh.p3	22 May 2002 15:57:52 -0000	1.63
+++ zh.p3	28 May 2002 13:37:20 -0000	1.64
@@ -478,6 +478,12 @@
 $lang['Reschedule_s']    = "Reschedule start";
 $lang['Reschedule_e']    = "Reschedule end";
 $lang['TaskGantt']       = "Gantt diagram";
+$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";
 
 
 # Gantt Diagramm
@@ -966,6 +972,8 @@
 $lang['Err0047']         = "Could not remove the admin right. There must be at least one admin !";
 $lang['Err0048']         = "Nothing found !";
 $lang['Err0049']         = "Account %s is disabled !";
+$lang['Err0050']         = "Could not find CSV contents !";
+$lang['Err0051']         = "Could not find CSV Separator";
 
 ### Local Variables: ***
 ### End: ***

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

Added Files:
	task_import_csv.php 
Log Message:
This feature allow you to import CSV files containing tasks info.
Supported infos are (for now) :
  name, s_start, s_end

  index : this is a MS Project info, wich permits to get the task hierarchy
          (1 1.1 1.2 1.2.1 1.2.2 1.3 2 2.1 ...)

We'll use this module to import PS Project plannings (via the text export of
this tool).

It should be easy to add more fields !


--- NEW FILE: task_import_csv.php ---
<?
/**
 * This module allows you to import tasks definitions from CSV file.
 * It will certainly support more field later, but for now just allow
 * you to import your MSProject planning, for example.
 *
 * By Dimitri Fontaine <dfo...@cv...>
 *
 * $Id: task_import_csv.php,v 1.1 2002/05/28 13:36:48 tapoueh Exp $
 * $Author: tapoueh $
 *
 * @modulegroup task
 * @module task_import_csv
 * @package task
 */

include("webelements.p3");
include("permission.p3");
include("note.pinc");
include("url.pinc");
include("task.pinc");
include("product.pinc");
include("timetrack.pinc");
include("resource.pinc");

/* Check if user is allowed to use it */
check_user();
loadmodules("task");

Function getTaskByName(&$t, $name) {
  global $dbconn;

  $qt = "SELECT * FROM ".$t->tablename.
     " WHERE ".$dbconn->Like("name", $name);
  $rt = $dbconn->Exec($qt);
	  
  if ( $rt->numrows() == 1 ) {
    $t->read_result($rt, 0);
    // echo "getTaskByName: $name [".$t->id."]<BR>\n";
  }
  else
    $t->setName($name);

  return $t;
}

Function import( $p ) {
  global $tutos, $lang, $current_user, $dbconn;
  global $userfile, $contents, $name, $index, $s_start, $s_end;
  global $import;

  $gotourl="task_import_csv.php?";
  $gotourl= addUrlParameter($gotourl, "p_id=". $p->id);

  if( isset($import) ) {
    if( ! isset($contents) ) {
      $msg = $lang['Err0050'];
      $gotourl = addUrlParameter($gotourl, "msg=". UrlEncode($msg));
      $gotourl = addSessionKey($gotourl);

      Header("Status: 302 Moved Temporarily");
      Header("Location: ". $gotourl);
      return;
    }
  }
  else {
    if( isset($userfile) ) {
      $filename = $_FILES['userfile']['tmp_name'];

      $fd = fopen($filename, "r");
      $contents = fread($fd, filesize($filename));
      fclose ($fd);
    }
  }
  // echo "<pre>$contents</pre>\n";
  $lines  = explode("\n", $contents);
  $header = $lines[0];

  // Guess the separator
  $seplist = array(":", "\t", ";", ",");
  $fnames  = $header;

  for($i=0; $i < count($seplist) && count($fnames) == 1; $i++) {
    $sep = $seplist[$i];
    $fnames = explode($sep, trim($header));
  }
  if( count($fnames) < 2 ) {
    $msg = $lang['Err0051'];
    $gotourl = addUrlParameter($gotourl, "msg=". UrlEncode($msg));
    $gotourl = addSessionKey($gotourl);

    Header("Status: 302 Moved Temporarily");
    Header("Location: ". $gotourl);
    return;
  }

  // Prepare an association table
  $t_fields = array($name    => "name",
		    $s_start => "s_start",
		    $s_end   => "s_end",
		    $index   => "index"
		    );

  // Show what we read

  if( ! isset($import) ) {
    // Will have to confirm the import
    echo "<FORM name=\"import\" enctype=\"multipart/form-data\"";
    echo " action=\"task_import_csv.php\" method=\"POST\">\n";
    hiddenFormElements();
    echo "<INPUT TYPE=\"hidden\" name=\"p_id\" value=\"".$p->id."\">\n";
    echo "<INPUT TYPE=\"hidden\" name=\"contents\" value=\"".$contents."\">\n";

    echo "<INPUT TYPE=\"hidden\" name=\"name\"    value=\"".$name."\">\n";
    echo "<INPUT TYPE=\"hidden\" name=\"index\"   value=\"".$index."\">\n";
    echo "<INPUT TYPE=\"hidden\" name=\"s_start\" value=\"".$s_start."\">\n";
    echo "<INPUT TYPE=\"hidden\" name=\"s_end\"   value=\"".$s_end."\">\n";
  }
  echo "<TABLE>\n";

  for($i=0; $i<count($lines); $i++) {
    $line = $lines[$i];

    if( trim($line) != "" ) {
      echo " <TR>\n";
      $fields = explode($sep, trim($line));

      $t = new task($dbconn);
      $t->id = -1;
      $t->creator = $current_user;
      $t->p_id = $p->id;

      for($j=0; $j < count($fields); $j++) {
	if( $i == 0 )
	  echo "<TH>".$fields[$j]."</TH>";

	else {
	  // Here we look what the field is
	  switch( $t_fields[$fnames[$j]] ) {
	  case "name": {
	    $name = $fields[$j];
	    getTaskByName(&$t, $name);

	    $val = $t->name;
	    break;
	  }

	  case "s_start": {
	    $s_start = new DateTime(reformat_date($fields[$j]));
	    $t->setSStart($s_start);
	    $val = $t->s_start->getYYYYMMDD();
	    break;
	  }

	  case "s_end": {
	    $s_end = new DateTime(reformat_date($fields[$j]));
	    $t->setSEnd($s_end);
	    $val = $t->s_end->getYYYYMMDD();
	    break;
	  }

	    /* Here it's a special case :
	     * MS Project exports dependency field as WBS Index
	     * The index is on the form: 1 1.1 1.2 2 2.1 2.1.1 2.1.2 2.2
	     * So we keep some info and associate a parent task
	     *
	     * This is based upon the fact that the tasks in the CSV file
	     * are sorted on this field.
	     */
	  case "index": {
	    $index = trim($fields[$j]);
	    $indexes[$index] = $t;

	    /* find the parent task with the index */
	    if( ereg("^([0-9.]*)\.[0-9]*$", $index, $regs) ) {
	      $p_task = $indexes[$regs[1]];
	      // echo "p_task: ".$p_task->name." [".$p_task->id."]<BR>\n";

	      $t->p_id   = $p_task->id;
	      $t->parent = getObject($dbconn, $p_task->id);

	      if( $p_task->id == -1 ) {
		$val = "$index : id(".$regs[1].")";
	      }
	      else {
		$val = "$index : <tt>".$p_task->id."</tt>";
	      }
	    }
	    else {
	      $t->parent = getObject($dbconn, $t->p_id);
	      $val = "$index";
	    }
	    break;
	  }

	  default:{
	    $val = "<i>Not Used</i> [".$t_fields[$fnames[$j]]."]".
	       " [".$fnames[$j].".]";
	    break;
	  }
	  }
	  // And we print it
	  echo "<TD>".$val."</TD>";
	}
      }
      echo " </TR>\n";

      /* Now we have registered the task fields, save the task
       * Only if the presentation page was confirmed, of course !
       */
      if( isset($import) ) {
	if( $t->name != "" ) {
	  $dbconn->Begin("WORK");
	  $t->save();
	  $dbconn->Commit("WORK");

	  // We need to get the task id
	  $t = getTaskByName(&$t, $name);

	  // Let the $indexes table up-to-date
	  $indexes[$index] = $t;

	  //echo "saved ($index): ".$t->name." [<tt>".$t->id."</tt>]<BR>\n";
	}
      }
    }
  }
  if( ! isset($import) ) {
    echo " <TR><TD colspan=\"".count($fields)."\" align=\"center\">";
    echo "<HR><BR>\n";
    echo "<INPUT type=\"submit\" name=\"import\"";
    echo " value=\"".$lang['ImportConfirm']."\">";
    echo " </TD></TR>\n";
  }
  echo "</TABLE>";
  echo "</FORM>";
}

/* The date format I had here is the one used by french version of MSProject.
 * As I'm not sure the format DD/MM/YY is widely used, i've prefered not to
 * add it to the DateTime class.
 */
Function reformat_date($date) {
  $datestr = explode(" ", $date);
  if( ereg("^([0-3][0-9])/([0-1][0-9])/([0-9]{2})$", $datestr[1], $regs) ) {
    // date format DD/MM/YY, transform to YYYYMMDD
    $d = "20".$regs[3].$regs[2].$regs[1];
  }
  else
    $d = $datestr[1];

  return $d;
}



Function info($p) {
  global $tutos, $lang, $current_user;

  echo "<FORM name=\"import\" enctype=\"multipart/form-data\"";
  echo " action=\"task_import_csv.php\" method=\"POST\">\n";
  hiddenFormElements();
  echo "<INPUT TYPE=\"hidden\" name=\"p_id\" value=\"".$p->id."\">";
  

  echo "<TABLE CLASS=single BORDER=0 CELLSPACING=0>\n";
  echo " <TR><TH COLSPAN=4>";
  echo "Import CSV";
  echo " </TH></TR>\n";

  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['ImportSrcFile']."</TD>\n";
  echo "  <TD><INPUT type=\"file\" accept=\"*.csv\" name=\"userfile\"></TD>\n";
  echo " </TR>\n";

  echo " <TR><TD colspan=\"2\"><HR></TD></TR>\n";
  echo " <TR><TH colspan=\"2\">".$lang['ImportColNames']."</TH></TR>\n";

  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['TaskName']."</TD>\n";
  echo "  <TD><INPUT name=\"name\"></TD>\n";
  echo " </TR>\n";

  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['ImportIndex']."</TD>\n";
  echo "  <TD><INPUT name=\"index\"></TD>\n";
  echo " </TR>\n";

  /*
  echo " <TR>\n"; 
  echo "  <TD class=\"desc\">".$lang['TaskState']."</TD>\n";
  echo "  <TD><INPUT name=\"state\"></TD>\n";
  echo " </TR>\n";
  */

  /*
  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['TaskDesc']."</TD>\n";
  echo "  <TD><INPUT name=\"desc\"></TD>\n";
  echo " </TR>\n";
  */

  /*
  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['TaskVolumeFull']."</TD>\n";
  echo "  <TD><INPUT name=\"volume\"></TD>\n";
  echo " <TR>\n";
  */

  /*
  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['TaskVolumeDone']."</TD>\n";
  echo "  <TD><INPUT name=\"volume_done\"></TD>\n";
  echo " <TR>\n";
  */

  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['TaskS_Start']."</TD>\n";
  echo "  <TD><INPUT name=\"s_start\"></TD>\n";
  echo " <TR>\n";

  echo " <TR>\n";
  echo "  <TD class=\"desc\">".$lang['TaskS_End']."</TD>\n";
  echo "  <TD><INPUT name=\"s_end\"></TD>\n";
  echo " <TR>\n";

  if ( ($p->mod_ok()) || ($p->id == -1) ) {
    echo "<TR>\n";
    echo "  <TD colspan=\"2\" align=\"center\">";
    echo "<INPUT type=\"submit\" name=\"valid\" value=\"".
      $lang['ImportValid']."\"></TD>\n";
    echo "</TR>\n";
  }
  echo "</TABLE>\n";
  echo "</FORM>\n";
}

Function navigate($p = -1) {
  global $tutos, $lang;

  echo "<TABLE>";
  echo "<TR><TD>";

  if( $p != -1 ) {
    echo "<BR>\n";
    echo $lang['Project']." ".menulink($p->getURL(), $p->getFullName());
    echo "<BR>\n";
  }

  echo "</TD></TR>";

  HTML_Select();
}

HTML_Header($lang['TaskImport']);

if ( isset($p_id) ) {
  $obj = GetObject($dbconn, $p_id);
  $stop = 0;
} else {
  $msg .= $lang['Err0048'];
  $stop = 1;
  $obj = -1;
}

HTML_Base1();
navigate($obj);
HTML_Base2($msg);

if ( $stop != 1 ) {
  if( isset($valid) || isset($import) ) {
    import($obj);
  }
  else {
    info($obj);
  }
}

HTML_Base3();

$dbconn->Close();
?>