tutos-commits Mailing List for TUTOS (Page 462)

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

Modified Files:
	appointment.pinc check.php 
Log Message:
Added space after arrow


Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** appointment.pinc	2001/08/20 08:40:49	1.44
--- appointment.pinc	2001/08/21 14:03:16	1.45
***************
*** 159,163 ****
      echo $f->getLink();
      if ( ($ext == 1) && ($f->product->id != -1) ) {
!       echo " -->". $f->product->getLink();
      }
      if ( ($ext == 2) && ($f->visitor->id != -1) ) {
--- 159,163 ----
      echo $f->getLink();
      if ( ($ext == 1) && ($f->product->id != -1) ) {
!       echo " --> ". $f->product->getLink();
      }
      if ( ($ext == 2) && ($f->visitor->id != -1) ) {
***************
*** 978,982 ****
  		if ( $this->product->id != -1 ) {
  		  echo "  <TR><TD CLASS=". $class ." COLSPAN=3 ALIGN=right>";
! 		  echo "--&gt;". $this->product->getLink() ."";
  		  echo "</TD></TR>\n";
  		}
--- 978,982 ----
  		if ( $this->product->id != -1 ) {
  		  echo "  <TR><TD CLASS=". $class ." COLSPAN=3 ALIGN=right>";
! 		  echo "--&gt;&nbsp;". $this->product->getLink();
  		  echo "</TD></TR>\n";
  		}

Index: check.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/check.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** check.php	2001/08/11 19:11:25	1.11
--- check.php	2001/08/21 14:03:16	1.12
***************
*** 229,233 ****
   if ( ($tutos[debug] == 1) && ($msg != "") ) {
     echo $msg ."<BR>";
!    echo "--&gt;". $current_user->getFullName() ."<BR>";
   }
   DB_Close($conn);
--- 229,233 ----
   if ( ($tutos[debug] == 1) && ($msg != "") ) {
     echo $msg ."<BR>";
!    echo "--&gt;&nbsp;". $current_user->getFullName() ."<BR>";
   }
   DB_Close($conn);

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

Modified Files:
	file.pinc 
Log Message:
pdf extension is already part of filename


Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** file.pinc	2001/08/11 19:11:25	1.32
--- file.pinc	2001/08/20 08:48:59	1.33
***************
*** 329,333 ****
        Header("Content-type: ". $this->filetype);
        Header("Content-Length: ". filesize($this->base ."/". $this->fileloc));
!       Header("Content-Disposition: inline; filename=\"". $this->filename .".pdf\"");
        $fp = fopen($this->base ."/". $this->fileloc, "r");
        @fpassthru ($fp);
--- 329,333 ----
        Header("Content-type: ". $this->filetype);
        Header("Content-Length: ". filesize($this->base ."/". $this->fileloc));
!       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
        $fp = fopen($this->base ."/". $this->fileloc, "r");
        @fpassthru ($fp);

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

Modified Files:
	appointment.pinc 
Log Message:
Added missing space


Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** appointment.pinc	2001/08/11 19:11:25	1.43
--- appointment.pinc	2001/08/20 08:40:49	1.44
***************
*** 164,170 ****
        echo " ";
        if ( $f->outside ) {
! 	echo $lang['VisitAt'] .":";
        } else {
! 	echo $lang['VisitFrom'] .":";
        }
        echo $f->visitor->getLink();
--- 164,170 ----
        echo " ";
        if ( $f->outside ) {
! 	echo $lang['VisitAt'] .": ";
        } else {
! 	echo $lang['VisitFrom'] .": ";
        }
        echo $f->visitor->getLink();
***************
*** 968,972 ****
          echo "  <TR><TD CLASS=". $class ." COLSPAN=3>";
  		if ( $this->outside ) {
! 	      echo $lang['VisitAt'] .":";
  		} else {
  		  echo $lang['VisitFrom'] .":";
--- 968,972 ----
          echo "  <TR><TD CLASS=". $class ." COLSPAN=3>";
  		if ( $this->outside ) {
! 		  echo $lang['VisitAt'] .":";
  		} else {
  		  echo $lang['VisitFrom'] .":";
***************
*** 1005,1007 ****
  }
  $includes[appointment.pinc] = 1;
! ?>
\ No newline at end of file
--- 1005,1007 ----
  }
  $includes[appointment.pinc] = 1;
! ?>

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

Modified Files:
	install_easy.html 
Log Message:
prepare relaes 200108?? II

Index: install_easy.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/install_easy.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** install_easy.html	2001/07/26 17:14:49	1.1
--- install_easy.html	2001/08/19 18:13:35	1.2
***************
*** 10,18 ****
  This way of installation is currently beta. Please give feedback !!<BR>
  <OL>
! <LI>get the latest tarball from <A HREF=TUTOS" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=8047>TUTOS Project</A>
  <LI>if you got the bzip version<BR>
  	<TT>tar xvIf tutos.....bz2</TT><BR>
  	or<BR>
  	<TT>cat tutos.....bz2 | bunzip | tar xvf -</TT>
  <LI>Change to the newly created tutos directory<BR>
  <LI>if you are updating: Read the ChangeLog file in your base directory<BR>
--- 10,24 ----
  This way of installation is currently beta. Please give feedback !!<BR>
  <OL>
! <LI>get the latest tarball from <A
! HREF=TUTOS" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=8047>TUTOS
! Project</A>. Go to the directory where you like to install the software.<BR>
  <LI>if you got the bzip version<BR>
  	<TT>tar xvIf tutos.....bz2</TT><BR>
  	or<BR>
  	<TT>cat tutos.....bz2 | bunzip | tar xvf -</TT>
+ <LI>if you got the gzip version<BR>
+ 	<TT>tar xvzf tutos.....gz</TT><BR>
+ 	or<BR>
+ 	<TT>cat tutos.....gz | gunzip | tar xvf -</TT>
  <LI>Change to the newly created tutos directory<BR>
  <LI>if you are updating: Read the ChangeLog file in your base directory<BR>
***************
*** 20,24 ****
  	You will find patches at <A HREF="http://sourceforge.net/patch/?group_id=8047" rel="nofollow">http://sourceforge.net/patch/?group_id=8047">http://sourceforge.net/patch/?group_id=8047</A>
  
! <LI>edit [tutosdir]/php/config.pinc according to your Database Server
  <LI>edit apache.conf and include it into your apache httpd.conf
  <LI>run http://[yourserver]/tutos/php/scheme.php
--- 26,31 ----
  	You will find patches at <A HREF="http://sourceforge.net/patch/?group_id=8047" rel="nofollow">http://sourceforge.net/patch/?group_id=8047">http://sourceforge.net/patch/?group_id=8047</A>
  
! <LI>edit [tutosdir]/php/config.pinc according to your Database Server. Read it
! completly and change everything as you like it.
  <LI>edit apache.conf and include it into your apache httpd.conf
  <LI>run http://[yourserver]/tutos/php/scheme.php

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

Modified Files:
	mailbox_overview.php product_show.php 
Log Message:
prepare relaes 200108?? II

Index: mailbox_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_overview.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** mailbox_overview.php	2001/08/11 19:11:25	1.10
--- mailbox_overview.php	2001/08/19 18:13:35	1.11
***************
*** 23,26 ****
--- 23,31 ----
  
     $m->getfolders();
+    echo "<FORM METHOD=GET ACTION=\"mailbox_overview.php\">\n";
+    hiddenFormElements();
+    echo "<INPUT type=hidden name=id value=\"". $m->id ."\">\n";
+ 
+    echo "<SELECT NAME=path>\n";
     while (list ($key, $val) = @each($m->folders)) {
  #     echo imap_utf7_decode($val->name)."  '".$val->delimiter."'  ".$val->attributes ."<BR>\n";
***************
*** 31,38 ****
       $nx = eregi_replace("&-","&",$nx);
       if ( $val->attributes == 0 ) {
!        echo makelink("mailbox_overview.php?id=".$m->id ."&path=". UrlEncode($n),$tutos[image][folder] . $nx,$nx);
!        echo "<BR>\n";
       }
     }
  
  #   $search = "Re:";
--- 36,45 ----
       $nx = eregi_replace("&-","&",$nx);
       if ( $val->attributes == 0 ) {
!        echo "<OPTION VALUE=\"". $nx ."\">".$nx."</OPTION>\n";
       }
     }
+    echo "</SELECT>\n";
+    echo "<input type=\"submit\" value=\"OK\" TITLE=\"OK\">\n";
+    echo "</FORM>\n";
  
  #   $search = "Re:";

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** product_show.php	2001/08/11 19:11:25	1.14
--- product_show.php	2001/08/19 18:13:35	1.15
***************
*** 304,314 ****
     if ( ($current_user->p[usetimetrack] == 1) && ($tutos[usetimetrack] == 1) ) {
       $p->readTimetrackSum();
       if ( $p->timetracksum > 0) {
         echo "<TR>\n";
!        showfield($lang['Timetrack']);
!        echo " <TD VALIGN=top COLSPAN=3>\n";
!        echo makelink("timetrack_overview.php?link_id=". $p->id ,number_format($p->timetracksum,2),$lang['TimetrackOverview']);
!        echo "&nbsp;". $lang['hours'] ."</TD>\n";
!        echo "</TR>\n";
       }
     }
--- 304,345 ----
     if ( ($current_user->p[usetimetrack] == 1) && ($tutos[usetimetrack] == 1) ) {
       $p->readTimetrackSum();
+      $rows = 0;
       if ( $p->timetracksum > 0) {
+        $rows++;
+ 	 }
+      @reset ($p->tsum);
+      while( list ($i,$f) = @each ($p->tsum)) { 
+        if ( $p->tsum[$i] > 0 ) {
+          $rows++;
+        }
+      }
+      $r = 0;
+      if ( $rows > 0 ) {
         echo "<TR>\n";
!        echo "<TD CLASS=\"desc\" VALIGN=\"top\" ROWSPAN=". $rows .">". $lang['Timetrack'] ;
!        echo "</TD>\n";
! 
!        if ( $p->timetracksum > 0) {
!          echo " <TD VALIGN=top ALIGN=right>\n";
!          echo makelink("timetrack_overview.php?link_id=". $p->id ,number_format($p->timetracksum,2),$lang['TimetrackOverview']);
!          echo " </TD>\n";
!          echo " <TD ALIGN=left>". $lang['hours'] ."</TD>\n";
!          echo " <TD>&nbsp;</TD>\n";
!          echo "</TR>\n";
!          $r = 1;
! 	   }
!        @reset ($p->tsum);
!        while( list ($i,$f) = @each ($p->tsum)) { 
!          if ( $p->tsum[$i] > 0 ) {
!            if ( $r == 1 ) {
!              echo "<TR>\n";
!            }
!            echo " <TD ALIGN=right>". $p->tsum[$i] ."</TD>\n";
!            echo " <TD ALIGN=left>". $lang['hours'] ."</TD>\n";
!            echo " <TD>(". $lang[$i] .")</TD>\n";
!            echo "</TR>\n";
!            $r = 1;
!          }
!        }
       }
     }

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

Modified Files:
	task.pinc task_overview.php timetrack.pinc 
Log Message:
prepare relaes 200108?? II

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** task.pinc	2001/08/11 19:11:25	1.28
--- task.pinc	2001/08/19 18:12:19	1.29
***************
*** 89,92 ****
--- 89,93 ----
    }
    $obj->tasklist = array();
+   $obj->tsum['Tasks'] = 0;
  
    $q = "SELECT * from tasks WHERE ";
***************
*** 111,114 ****
--- 112,121 ----
      $t = new task($obj->conn);
      $t->read_result($r,$a);
+     $t->readTasks();
+ 	$t->readTimetrackSum();
+     $obj->tsum['Tasks'] += $t->timetracksum;
+     # Add Subtask-Sum
+     $obj->tsum['Tasks'] += $t->tsum['Tasks'];
+     $obj->tsum['Tasks'] += $t->tsum['Bugs'];
  #    if ( $t->see_ok() ) {
        $obj->tasklist[$t->id] = $t;
***************
*** 585,588 ****
--- 592,602 ----
    function readRes() {
      readRes($this);
+     return;
+   }
+   /* ---------------------------------------------------------------------------
+    * Return Info about the total time spent for this tasks
+    */
+   function readTimetrackSum() {
+     readTimetrackSum($this);
      return;
    }

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** task_overview.php	2001/08/11 19:11:25	1.3
--- task_overview.php	2001/08/19 18:12:19	1.4
***************
*** 8,11 ****
--- 8,13 ----
   include("url.pinc");
   include("task.pinc");
+  include("product.pinc");
+  include("timetrack.pinc");
  
   /* Check if user is allowed to use it */

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** timetrack.pinc	2001/08/11 19:11:25	1.12
--- timetrack.pinc	2001/08/19 18:12:19	1.13
***************
*** 21,24 ****
--- 21,25 ----
   */
  function readTimetrackSum (&$obj) {
+   $obj->timetracksum = 0;
    $q = "SELECT SUM(volume) as XX FROM timetrack";
    $pre = " WHERE ";

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

Modified Files:
	installation.pinc installation_show.php address.pinc 
	address_del.php address_new.php admin_show.php bug.pinc 
Log Message:
prepare relaes 200108?? II

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation.pinc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** installation.pinc	2001/08/11 19:11:25	1.25
--- installation.pinc	2001/08/19 18:11:30	1.26
***************
*** 58,61 ****
--- 58,62 ----
  
    $obj->instlist = array();
+   $obj->tsum['Installations'] = 0;
  
    if ( $obj->getType() == "product" ) {
***************
*** 72,75 ****
--- 73,80 ----
      $inst = new installation($obj->conn);
      $inst->read_result($r,$a);
+     $inst->readBugs();
+     $inst->readTimetrackSum();
+     $obj->tsum['Installations'] += $inst->timetracksum;
+     $obj->tsum['Installations'] += $inst->tsum['Bugs'];
      $obj->instlist[$inst->id] = $inst;
      $a++;

Index: installation_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation_show.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** installation_show.php	2001/08/11 19:11:25	1.9
--- installation_show.php	2001/08/19 18:11:30	1.10
***************
*** 134,144 ****
     if ( ($current_user->p[usetimetrack] == 1) && ($tutos[usetimetrack] == 1) ) {
       $obj->readTimetrackSum();
!      if ( isset($obj->timetracksum) && ($obj->timetracksum > 0) ) {
         echo "<TR>\n";
!        showfield($lang['Timetrack']);
!        echo " <TD VALIGN=top COLSPAN=3>\n";
!        echo makelink("timetrack_overview.php?link_id=". $obj->id ,number_format($obj->timetracksum,2),$lang['TimetrackOverview']);
!        echo "&nbsp;". $lang['hours'] ."</TD>\n";
!        echo "</TR>\n";
       }
     }
--- 134,175 ----
     if ( ($current_user->p[usetimetrack] == 1) && ($tutos[usetimetrack] == 1) ) {
       $obj->readTimetrackSum();
!      $rows = 0;
!      if ( $obj->timetracksum > 0) {
!        $rows++;
! 	 }
!      @reset ($obj->tsum);
!      while( list ($i,$f) = @each ($obj->tsum)) { 
!        if ( $obj->tsum[$i] > 0 ) {
!          $rows++;
!        }
!      }
!      $r = 0;
!      if ( $rows > 0 ) {
         echo "<TR>\n";
!        echo "<TD CLASS=\"desc\" VALIGN=\"top\" ROWSPAN=". $rows .">". $lang['Timetrack'] ;
!        echo "</TD>\n";
! 
!        if ( $obj->timetracksum > 0) {
!          echo " <TD VALIGN=top ALIGN=right>\n";
!          echo makelink("timetrack_overview.php?link_id=". $obj->id ,number_format($obj->timetracksum,2),$lang['TimetrackOverview']);
!          echo " </TD>\n";
!          echo " <TD ALIGN=left>". $lang['hours'] ."</TD>\n";
!          echo " <TD>&nbsp;</TD>\n";
!          echo "</TR>\n";
!          $r = 1;
! 	   }
!        @reset ($obj->tsum);
!        while( list ($i,$f) = @each ($obj->tsum)) { 
!          if ( $obj->tsum[$i] > 0 ) {
!            if ( $r == 1 ) {
!              echo "<TR>\n";
!            }
!            echo " <TD ALIGN=right>". $obj->tsum[$i] ."</TD>\n";
!            echo " <TD ALIGN=left>". $lang['hours'] ."</TD>\n";
!            echo " <TD>(". $lang[$i] .")</TD>\n";
!            echo "</TR>\n";
!            $r = 1;
!          }
!        }
       }
     }

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** address.pinc	2001/08/11 19:11:25	1.36
--- address.pinc	2001/08/19 18:11:30	1.37
***************
*** 462,466 ****
      if ( ($current_user->p[useaddressbook] == 1) && ($tutos[useaddressbook] == 1) ) {
        if ( $current_user->id == $this->creator->id ) {
! 	return $tutos[delok];
        }
        return acl_del_ok($this);
--- 462,466 ----
      if ( ($current_user->p[useaddressbook] == 1) && ($tutos[useaddressbook] == 1) ) {
        if ( $current_user->id == $this->creator->id ) {
!         return $tutos[delok];
        }
        return acl_del_ok($this);
***************
*** 477,484 ****
      if ( ($current_user->p[useaddressbook] == 1) && ($tutos[useaddressbook] == 1) ) {
        if ( $current_user->id == $this->creator->id ) {
! 	return $tutos[delok];
        }
        if ( $current_user->id == $this->id ) {
! 	return $tutos[modok];
        }
        return acl_mod_ok($this);
--- 477,484 ----
      if ( ($current_user->p[useaddressbook] == 1) && ($tutos[useaddressbook] == 1) ) {
        if ( $current_user->id == $this->creator->id ) {
!         return $tutos[delok];
        }
        if ( $current_user->id == $this->id ) {
!         return $tutos[modok];
        }
        return acl_mod_ok($this);

Index: address_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_del.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** address_del.php	2001/08/11 19:11:25	1.5
--- address_del.php	2001/08/19 18:11:30	1.6
***************
*** 11,27 ****
   /* Check if user is allowed to use it */
   check_user();
  
   $a = new tutos_address($conn);
   $a->read($id);
  
!  if ( $a->del_ok() ) {
     $a->delete();
     $gotourl = "address_select.php";
-  } else {
-    $msg = sprintf($lang['Err0023'],$lang[$a->getType()]);
-    $gotourl = $a->getUrl();
-    $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
   }
! 
   $gotourl = addSessionKey($gotourl);
  
--- 11,33 ----
   /* Check if user is allowed to use it */
   check_user();
+  $msg = "";
  
   $a = new tutos_address($conn);
   $a->read($id);
+  $gotourl = $a->getUrl();
  
!  if ( $a->isUser() == 1 ) {
!    $msg .= "Please remove Userentry first";
!  }
! 
!  if ( $a->del_ok() == 0 ) {
!    $msg .= sprintf($lang['Err0023'],$lang[$a->getType()]);
!  }
! 
!  if ( $msg == "" ) {
     $a->delete();
     $gotourl = "address_select.php";
   }
!  $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
   $gotourl = addSessionKey($gotourl);
  

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** address_new.php	2001/08/11 19:11:25	1.11
--- address_new.php	2001/08/19 18:11:30	1.12
***************
*** 209,213 ****
         echo makelink("address_new.php?id=". $a->id,$lang['AdrBMod'],sprintf($lang['AdrBModInfo'],$a->getFullName())) ."<BR>";
       }
!      if ( $a->del_ok() ) {
         echo confirmlink("address_del.php?id=". $a->id,$lang['AdrBDel'],sprintf($lang['AdrBDelInfo'],$a->getFullName())) ."<BR>";
       }
--- 209,213 ----
         echo makelink("address_new.php?id=". $a->id,$lang['AdrBMod'],sprintf($lang['AdrBModInfo'],$a->getFullName())) ."<BR>";
       }
!      if ( $a->del_ok() && ($a->isUser() == 0) ) {
         echo confirmlink("address_del.php?id=". $a->id,$lang['AdrBDel'],sprintf($lang['AdrBDelInfo'],$a->getFullName())) ."<BR>";
       }
***************
*** 218,232 ****
         DoubleTableStart();
         if ( isset($a->loc) ) {
! 	 @reset($a->loc);
! 	 while( list ($i,$f) = @each ($a->loc)) {
! 	   echo "<TR><TH COLSPAN=2>". sprintf($lang['AdrLocTitle'],$f) ."</TH></TR>\n";
! 	   echo "<TR>";
! 	   echo "<TD>";
! 	   echo makelink("address_new.php?id=". $a->id ."&loc_id=$i",$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $a->getFullName()));
! 	   echo "</TD><TD>\n";
! 	   echo confirmlink("location_del.php?ref=". $a->id ."&id=$i",$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $a->getFullName()));
! 	   echo "</TD>\n";
! 	   echo "</TR>\n";
! 	 }
         }
         DoubleTableEnd();
--- 218,232 ----
         DoubleTableStart();
         if ( isset($a->loc) ) {
!          @reset($a->loc);
!          while( list ($i,$f) = @each ($a->loc)) {
!            echo "<TR><TH COLSPAN=2>". sprintf($lang['AdrLocTitle'],$f) ."</TH></TR>\n";
!            echo "<TR>";
!            echo "<TD>";
!            echo makelink("address_new.php?id=". $a->id ."&loc_id=$i",$lang['Change'],sprintf($lang['ChangeLocInfo'],$f, $a->getFullName()));
!            echo "</TD><TD>\n";
!            echo confirmlink("location_del.php?ref=". $a->id ."&id=$i",$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f, $a->getFullName()));
!            echo "</TD>\n";
!            echo "</TR>\n";
!          }
         }
         DoubleTableEnd();

Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** admin_show.php	2001/08/09 10:32:03	1.6
--- admin_show.php	2001/08/19 18:11:30	1.7
***************
*** 129,132 ****
--- 129,133 ----
       $adr = new tutos_address($conn);
       $adr->read(DB_Result($r, $a, "adr_id"));
+      $uid = DB_Result($r, $a, "id");
       echo " <TD>". $adr->getLink() ."</TD>";
       echo " <TD ALIGN=right>". makelink("user_new.php?id=".$adr->id ,DB_Result($r, $a, "login")) ."</TD>";

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** bug.pinc	2001/08/11 19:11:25	1.34
--- bug.pinc	2001/08/19 18:11:30	1.35
***************
*** 58,61 ****
--- 58,63 ----
    }
    $obj->buglist = array();
+   $obj->tsum['Bugs'] = 0;
+ 
    $q = "SELECT * from bugs where product_id = ". $obj->id;
    $r = @DB_Exec($obj->conn,$q);
***************
*** 66,69 ****
--- 68,72 ----
      $b->read_result($r,$a);
  	$b->readTimetrackSum();
+     $obj->tsum['Bugs'] += $b->timetracksum;
      $obj->buglist[$b->id] = $b;
      $a++;

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

Added Files:
	.cvsignore book-decl.sgml tutos.dsl tutos.sgml 
	tutos_admin.sgml tutos_prog.sgml tutos_user.sgml 
Log Message:
Initial Docu Package

--- NEW FILE: .cvsignore ---
#
# $Id: .cvsignore,v 1.1 2001/08/19 18:01:13 gokohnert Exp $
#
book0
book1
book2
book3

--- NEW FILE: book-decl.sgml ---
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [

<!ENTITY gokohnert "Gero Kohnert">
<!entity % set-of-books "IGNORE">
<!entity % single-book "INCLUDE">

]>

<!--
$Header: 
-->

--- NEW FILE: tutos.dsl ---
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % html "IGNORE">
<![%html;[
<!ENTITY % print "IGNORE">
<!ENTITY docbook.dsl SYSTEM "docbook.dsl" CDATA dsssl>
]]>
<!ENTITY % print "INCLUDE">
<![%print;[
<!ENTITY docbook.dsl SYSTEM "docbook.dsl" CDATA dsssl>
]]>
]>
<!-- 
$Header: /cvsroot/tutos/tutos/documentation/tutos.dsl,v 1.1 2001/08/19 18:01:13 gokohnert Exp $
-->
<style-sheet>

<style-specification id="print" use="docbook">
<style-specification-body> 

;; ==============================
;; customize the print stylesheet
;; ==============================

(declare-characteristic preserve-sdata?
  ;; this is necessary because right now jadetex does not understand
  ;; symbolic entities, whereas things work well with numeric entities.
  "UNREGISTERED::James Clark//Characteristic::preserve-sdata?"
  #f)

(define %generate-article-toc%
  ;; Should a Table of Contents be produced for Articles?
  #t)

(define (toc-depth nd)
  2)

(define %generate-article-titlepage-on-separate-page%
  ;; Should the article title page be on a separate page?
  #t)

(define %section-autolabel%
  ;; Are sections enumerated?
  #t)

(define %footnote-ulinks%
  ;; Generate footnotes for ULinks?
  #f)

(define %bop-footnotes%
  ;; Make "bottom-of-page" footnotes?
  #f)

(define %body-start-indent%
  ;; Default indent of body text
  0pi)

(define %para-indent-firstpara%
  ;; First line start-indent for the first paragraph
  0pt)

(define %para-indent%
  ;; First line start-indent for paragraphs (other than the first)
  0pt)

(define %block-start-indent%
  ;; Extra start-indent for block-elements
  0pt)

(define formal-object-float
  ;; Do formal objects float?
  #t)

(define %hyphenation%
  ;; Allow automatic hyphenation?
  #t)

(define %admon-graphics%
  ;; Use graphics in admonitions?
  #f)

</style-specification-body>
</style-specification>


<!--
;; ===================================================
;; customize the html stylesheet; borrowed from Cygnus
;; at http://sourceware.cygnus.com/ (cygnus-both.dsl)
;; ===================================================
-->

<style-specification id="html" use="docbook">
<style-specification-body> 

(declare-characteristic preserve-sdata?
  ;; this is necessary because right now jadetex does not understand
  ;; symbolic entities, whereas things work well with numeric entities.
  "UNREGISTERED::James Clark//Characteristic::preserve-sdata?"
  #f)

(define %generate-legalnotice-link%
  ;; put the legal notice in a separate file
  #t)

(define %admon-graphics-path%
  ;; use graphics in admonitions, set their
  "../images/")

(define %admon-graphics%
  #f)

(define %funcsynopsis-decoration%
  ;; make funcsynopsis look pretty
  #t)

(define %html-ext%
  ;; when producing HTML files, use this extension
  ".html")

(define %generate-book-toc%
  ;; Should a Table of Contents be produced for books?
  #t)

(define %generate-article-toc% 
  ;; Should a Table of Contents be produced for articles?
  #t)

(define %generate-part-toc%
  ;; Should a Table of Contents be produced for parts?
  #t)

(define %generate-book-titlepage%
  ;; produce a title page for books
  #t)

(define %generate-article-titlepage%
  ;; produce a title page for articles
  #t)

(define (chunk-skip-first-element-list)
  ;; forces the Table of Contents on separate page
  '())

(define (list-element-list)
  ;; fixes bug in Table of Contents generation
  '())

(define %root-filename%
  ;; The filename of the root HTML document (e.g, "index").
  "index")

(define %shade-verbatim%
  ;; verbatim sections will be shaded if t(rue)
  #t)

(define %use-id-as-filename%
  ;; Use ID attributes as name for component HTML files?
  #t)

(define %graphic-extensions%
  ;; graphic extensions allowed
  '("gif" "png" "jpg" "jpeg" "tif" "tiff" "eps" "epsf" ))

(define %graphic-default-extension% 
  "gif")

(define %section-autolabel%
  ;; For enumerated sections (1.1, 1.1.1, 1.2, etc.)
  #t)

(define (toc-depth nd)
  ;; more depth (2 levels) to toc; instead of flat hierarchy
  ;; 2)
  4)

(element emphasis
  ;; make role=strong equate to bold for emphasis tag
  (if (equal? (attribute-string "role") "strong")
     (make element gi: "STRONG" (process-children))
     (make element gi: "EM" (process-children))))

(define (book-titlepage-recto-elements)
  ;; elements on a book's titlepage
  ;; note: added revhistory to the default list
  (list (normalize "title")
        (normalize "subtitle")
        (normalize "graphic")
        (normalize "mediaobject")
        (normalize "corpauthor")
        (normalize "authorgroup")
        (normalize "author")
        (normalize "editor")
        (normalize "copyright")
        (normalize "revhistory")
        (normalize "abstract")
        (normalize "legalnotice")))

(define (article-titlepage-recto-elements)
  ;; elements on an article's titlepage
  ;; note: added othercredit to the default list
  (list (normalize "title")
        (normalize "subtitle")
        (normalize "authorgroup")
        (normalize "author")
        (normalize "othercredit")
        (normalize "releaseinfo")
        (normalize "copyright")
        (normalize "pubdate")
        (normalize "revhistory")
        (normalize "abstract")))

(mode article-titlepage-recto-mode

 (element contrib
  ;; print out with othercredit information; for translators, etc.
  (make sequence
    (make element gi: "SPAN"
          attributes: (list (list "CLASS" (gi)))
          (process-children))))

 (element othercredit
  ;; print out othercredit information; for translators, etc.
  (let ((author-name  (author-string))
        (author-contrib (select-elements (children (current-node))
                                          (normalize "contrib"))))
    (make element gi: "P"
         attributes: (list (list "CLASS" (gi)))
         (make element gi: "B"  
              (literal author-name)
              (literal " - "))
         (process-node-list author-contrib))))
)

(define (article-title nd)
  (let* ((artchild  (children nd))
         (artheader (select-elements artchild (normalize "artheader")))
         (artinfo   (select-elements artchild (normalize "articleinfo")))
         (ahdr (if (node-list-empty? artheader)
                   artinfo
                   artheader))
         (ahtitles  (select-elements (children ahdr)
                                     (normalize "title")))
         (artitles  (select-elements artchild (normalize "title")))
         (titles    (if (node-list-empty? artitles)
                        ahtitles
                        artitles)))
    (if (node-list-empty? titles)
        ""
        (node-list-first titles))))


;; Redefinition of $verbatim-display$
;; Origin: dbverb.dsl
;; Different foreground and background colors for verbatim elements
;; Author: Philippe Martin (fe...@fr...) 2001-04-07

(define ($verbatim-display$ indent line-numbers?)
  (let ((verbatim-element (gi))
        (content (make element gi: "PRE"
                       attributes: (list
                                    (list "CLASS" (gi)))
                       (if (or indent line-numbers?)
                           ($verbatim-line-by-line$ indent line-numbers?)
                           (process-children)))))
    (if %shade-verbatim%
        (make element gi: "TABLE"
              attributes: (shade-verbatim-attr-element verbatim-element)
              (make element gi: "TR"
                    (make element gi: "TD"
                          (make element gi: "FONT" 
                                attributes: (list
                                             (list "COLOR" (car (shade-verbatim-element-colors
                                                                 verbatim-element))))
                                content))))
        content)))

;;
;; Customize this function
;; to change the foreground and background colors
;; of the different verbatim elements
;; Return (list "foreground color" "background color")
;;
(define (shade-verbatim-element-colors element)
  (case element
    (("SYNOPSIS") (list "#000000" "#6495ED"))
    ;; ...
    ;; Add your verbatim elements here
    ;; ...
    (else (list "#000000" "#E0E0E0"))))

(define (shade-verbatim-attr-element element)
  (list
   (list "BORDER" 
	(cond
		((equal? element (normalize "SCREEN")) "1")
		(else "0")))
   (list "BGCOLOR" (car (cdr (shade-verbatim-element-colors element))))
   (list "WIDTH" ($table-width$))))

;; End of $verbatim-display$ redefinition

</style-specification-body>
</style-specification>

<external-specification id="docbook" document="docbook.dsl">

</style-sheet>


--- NEW FILE: tutos.sgml ---
<!DOCTYPE set PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
<!ENTITY gokohnert "Gero Kohnert">
<!ENTITY book1 SYSTEM "tutos_user.sgml">
<!ENTITY book2 SYSTEM "tutos_admin.sgml">
<!ENTITY book3 SYSTEM "tutos_prog.sgml">
<!ENTITY % single-book "IGNORE">                                                                                                           
]> 
<!-- $Header: -->

<set>
<title>TUTOS</title>
<setinfo>
<author>
  <firstname>Gero</firstname>
  <surname>Kohnert</surname>
</author>
<copyright>
  <year>2001</year>
  <holder>&gokohnert;</holder>
</copyright>
</setinfo>

&book1;
&book2;
&book3;
</set>



--- NEW FILE: tutos_admin.sgml ---
<!--
$Header: 
-->
<book id="admin">

<title>TUTOS Admin Guide</title>
<bookinfo>
<author>
  <firstname>Gero</firstname>
  <surname>Kohnert</surname>
</author>
<copyright>
  <year>2001</year>
  <holder>&gokohnert;</holder>
</copyright>
<mediaobject>
<imageobject>
<imagedata fileref="../../html/tutos.gif" format="gif">
</imageobject>
<textobject>
<phrase>TUTOS</phrase>
</textobject>
</mediaobject>
</bookinfo>

<!-- ***************************************************** -->
<chapter label=1>
<title>Intro</title>
<para>
This book will give you all information that is neccessary for installation and
administration of a <productname>TUTOS</productname> system.
</para>
</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Mail</title>
<para>
</para>
</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Persmissions</title>
<para>
</para>
</chapter>
<!-- ***************************************************** -->
<chapter>
<title>automated Reminders</title>
<para>
</para>
</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Database Administration</title>
<sect1>
<title>Backup</title>
<para>
</para>
</sect1>
</chapter>


</book>
<!-- Keep this comment at the end of the file
Local variables:
mode:sgml
End:
-->

--- NEW FILE: tutos_prog.sgml ---
<!-- 
$Header:
 -->
<book id="prog">

<title>TUTOS Programming Guide</title>
<bookinfo>
<author>
  <firstname>Gero</firstname>
  <surname>Kohnert</surname>
</author>
<copyright>
  <year>2001</year>
  <holder>&gokohnert;</holder>
</copyright>
<mediaobject>
<imageobject>
<imagedata fileref="../../html/tutos.gif" format="gif">
</imageobject>
<textobject>
<phrase>TUTOS</phrase>
</textobject>
</mediaobject>
</bookinfo>

<chapter label=1>
<title>Intro</title>

<para>
This book will give you all information that is neccessary for extending or
programming inside of <productname>TUTOS</productname>.
</para>
</chapter>

</book>

--- NEW FILE: tutos_user.sgml ---
<!-- 
$Header: 
-->
<book id="user">

<title>TUTOS Users Guide</title>
<bookinfo>
<author>
  <firstname>Gero</firstname>
  <surname>Kohnert</surname>
</author>
<copyright>
  <year>2001</year>
  <holder>&gokohnert;</holder>
</copyright>
<mediaobject>
<imageobject>
<imagedata fileref="../../html/tutos.gif" format="gif">
</imageobject>
<textobject>
<phrase>TUTOS</phrase>
</textobject>
</mediaobject>
</bookinfo>

<chapter>
<title>Intro</title>

<para>
This book will show you how to work with <productname>TUTOS</productname>.
</para>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>The Addressbook(s)</title>
<para>
The addressbooks are the main part of TUTOS.
</para>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
<mediaobject>
<imageobject>
<imagedata fileref="../../homepage/address.png" format="png">
</imageobject>
<textobject>
<phrase>A TUTOS addressbook entry</phrase>
</textobject>
<caption>
<para>
A addressbook entry
</para>
</caption>
</mediaobject>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Appointments</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
<mediaobject><imageobject>
<imagedata fileref="../../homepage/calendar.png" format="png">
</imageobject>
<textobject>
<phrase>A TUTOS calendar</phrase>
</textobject>
<caption>
<para>
A calendar
</para>
</caption>
</mediaobject>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter label=3>
<title>Projects and Products</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
<mediaobject>
<imageobject>
<imagedata fileref="../../homepage/product.png" format="png">
</imageobject>
<textobject>
<phrase>A TUTOS product/project entry</phrase>
</textobject>
<caption>
<para>
A product entry
</para>
</caption>
</mediaobject>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Tasks</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
<mediaobject>
<imageobject>
<imagedata fileref="../../homepage/task.png" format="png">
</imageobject>
<textobject>
<phrase>A TUTOS task overview</phrase>
</textobject>
<caption>
<para>
A task overview
</para>
</caption>
</mediaobject>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Bugs</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
<mediaobject>
<imageobject>
<imagedata fileref="../../homepage/bugtrack.png" format="png">
</imageobject>
<textobject>
<phrase>A TUTOS bug overview</phrase>
</textobject>
<caption>
<para>
A bug entry
</para>
</caption>
</mediaobject>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Installations</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
<mediaobject>
<imageobject>
<imagedata fileref="../../homepage/installations.png" format="png">
</imageobject>
<textobject>
<phrase>A TUTOS installation entry</phrase>
</textobject>
<caption>
<para>
A installation entry
</para>
</caption>
</mediaobject>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Files</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Notes</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Timetrack</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>
<!-- ***************************************************** -->
<chapter>
<title>Resources</title>

<sect1><title>Create</title>
<para>
</para>
</sect1>

<sect1><title>Display</title>
<para>
</para>
</sect1>

<sect1><title>Modify</title>
<para>
</para>
</sect1>

<sect1><title>Delete</title>
<para>
</para>
</sect1>

</chapter>


















</book>

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

Modified Files:
	Makefile.in 
Log Message:
Initial Docu Package

Index: Makefile.in
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** Makefile.in	2001/08/11 19:11:25	1.53
--- Makefile.in	2001/08/19 18:01:13	1.54
***************
*** 11,14 ****
--- 11,17 ----
  #
  # $Log$
+ # Revision 1.54  2001/08/19 18:01:13  gokohnert
+ # Initial Docu Package
+ #
  # Revision 1.53  2001/08/11 19:11:25  gokohnert
  # prepare relaes 200108?? I
***************
*** 547,550 ****
--- 550,564 ----
  
  #
+ # Documentation
+ #
+ DOCFILES= \
+ 	documentation/tutos.dsl \
+ 	documentation/book-decl.sgml \
+ 	documentation/tutos.sgml \
+ 	documentation/tutos_user.sgml \
+ 	documentation/tutos_admin.sgml \
+ 	documentation/tutos_prog.sgml
+ 
+ #
  # Additional Files only for the php version
  #
***************
*** 645,648 ****
--- 659,694 ----
  configure: configure.in
  	autoconf
+ 
+ # /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/html
+ # Creating the books
+ SGMLBASE=/usr/share/sgml
+ JADE=/usr/bin/jade
+ JADEARGS=-V html-backend -ihtml -t sgml
+ CATALOGS=-c ${SGMLBASE}/CATALOG.jade_dsl -c ${SGMLBASE}/CATALOG.docbook_4 -c ${SGMLBASE}/CATALOG.docbook-dsssl-stylesheets
+ #DSLFILE=${SGMLBASE}/docbook-toys/suse-both.dsl\#html
+ DSLFILE=../tutos.dsl\#html
+ 
+ book0: documentation/tutos.sgml
+ 	@mkdir -p documentation/book0
+ 	(cd documentation/book0; ${JADE} ${JADEARGS} ${CATALOGS} -D ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/html -d ${DSLFILE}  ../tutos.sgml)
+ 	@CHMOD@ 755 documentation/book0
+ 
+ book1: documentation/tutos_user.sgml
+ 	@mkdir -p documentation/book1
+ 	(cd documentation/book1; ${JADE} ${JADEARGS} ${CATALOGS} -D ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/html -d ${DSLFILE}  ../book-decl.sgml ../tutos_user.sgml)
+ 	@CHMOD@ 755 documentation/book1
+ 
+ book2: documentation/tutos_admin.sgml
+ 	@mkdir -p documentation/book2
+ 	(cd documentation/book2; ${JADE} ${JADEARGS} ${CATALOGS} -D ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/html -d ${DSLFILE}  ../book-decl.sgml ../tutos_admin.sgml)
+ 	@CHMOD@ 755 documentation/book2
+ 
+ book3: documentation/tutos_prog.sgml
+ 	@mkdir -p documentation/book3
+ 	(cd documentation/book3; ${JADE} ${JADEARGS} ${CATALOGS} -D ${SGMLBASE}/docbook/docbook-dsssl-stylesheets-1.64/html -d ${DSLFILE}  ../book-decl.sgml ../tutos_prog.sgml)
+ 	@CHMOD@ 755 documentation/book3
+ 
+ book: book0 book1 book2 book3
+ 
  
  docs:

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

Log Message:
Directory /cvsroot/tutos/tutos/documentation added to the repository

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

Modified Files:
	webelements.p3 
Log Message:
Added a link to mytutos to the footline


Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** webelements.p3	2001/08/14 12:36:39	1.55
--- webelements.p3	2001/08/14 13:22:06	1.56
***************
*** 596,600 ****
  }
  /*
!  * Print an Footline
   */
  Function HTML_Footer () {
--- 596,600 ----
  }
  /*
!  * Print a footline
   */
  Function HTML_Footer () {
***************
*** 605,609 ****
    echo " <TR>\n";
    if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"15%\">". makelink("calendar.php",$tutos[image][appointments] . $lang['Calendar'],$lang['CalendarInfo']) ."</TD>\n";
      if ( basename($PHP_SELF) == "calendar.php") {
        echo "  <TD valign=bottom align=center width=\"10%\">". makelink("calendar_select.php",$lang['AppsSearch'],$lang['SearchForApp']) ."</TD>\n";
--- 605,609 ----
    echo " <TR>\n";
    if ( ($current_user->p[usecalendar] == 1) && ($tutos[usecalendar] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"12%\">". makelink("calendar.php",$tutos[image][appointments] . $lang['Calendar'],$lang['CalendarInfo']) ."</TD>\n";
      if ( basename($PHP_SELF) == "calendar.php") {
        echo "  <TD valign=bottom align=center width=\"10%\">". makelink("calendar_select.php",$lang['AppsSearch'],$lang['SearchForApp']) ."</TD>\n";
***************
*** 611,623 ****
    }
    if ( ($current_user->p[useaddressbook] == 1) && ($tutos[useaddressbook] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"15%\">". makelink("address_select.php",$tutos[image][addresses] . $lang['Addresses'],$lang['AddressesInfo']) ."</TD>\n";
    }
    if ( ($current_user->p[usebugtracking] == 1) && ($tutos[usebugtracking] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"15%\">". makelink("bug_select.php",$tutos[image][bugs] . $lang['BugTrack'],$lang['BugTrackInfo']) ."</TD>\n";
    }
    if ( ($current_user->p[useprojects] == 1) && ($tutos[useprojects] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"15%\">". makelink("product_select.php",$tutos[image][projects] . $lang['Product'],$lang['ProductInfo']) ."</TD>\n";
    }
!   echo "  <TD valign=bottom align=center width=\"15%\">". makelink("logout.php",$tutos[image][logout] . $lang['Logout'],$lang['LogoutInfo']) ."</TD>\n";
  
    make_helplink(2);
--- 611,624 ----
    }
    if ( ($current_user->p[useaddressbook] == 1) && ($tutos[useaddressbook] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"12%\">". makelink("address_select.php",$tutos[image][addresses] . $lang['Addresses'],$lang['AddressesInfo']) ."</TD>\n";
    }
    if ( ($current_user->p[usebugtracking] == 1) && ($tutos[usebugtracking] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"12%\">". makelink("bug_select.php",$tutos[image][bugs] . $lang['BugTrack'],$lang['BugTrackInfo']) ."</TD>\n";
    }
    if ( ($current_user->p[useprojects] == 1) && ($tutos[useprojects] == 1) ) {
!     echo "  <TD valign=bottom align=center width=\"12%\">". makelink("product_select.php",$tutos[image][projects] . $lang['Product'],$lang['ProductInfo']) ."</TD>\n";
    }
!   echo "  <TD valign=bottom align=center width=\"12%\">". makelink("mytutos.php",$tutos[image][user] . $lang['PersonalPage'],$lang['PersonalPage']) ."</TD>\n";
!   echo "  <TD valign=bottom align=center width=\"12%\">". makelink("logout.php",$tutos[image][logout] . $lang['Logout'],$lang['LogoutInfo']) ."</TD>\n";
  
    make_helplink(2);

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

Modified Files:
	de.p3 
Log Message:
Erst mal ein paar offensichtliche Rechtschreibfehler beseitigt


Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** de.p3	2001/08/11 19:11:25	1.49
--- de.p3	2001/08/14 13:04:32	1.50
***************
*** 11,15 ****
  $lang['Password']        = "Passwort";
  $lang['Username']        = "Benutzername";
! $lang['MOTD']            = "The message of today";
  $lang['Login']           = "Anmelden";
  $lang['LoggedIn']        = "Sie sind angemeldet. Bitte wählen Sie auf der linken Seite.";
--- 11,15 ----
  $lang['Password']        = "Passwort";
  $lang['Username']        = "Benutzername";
! $lang['MOTD']            = "Die Meldung des Tages";
  $lang['Login']           = "Anmelden";
  $lang['LoggedIn']        = "Sie sind angemeldet. Bitte wählen Sie auf der linken Seite.";
***************
*** 65,69 ****
  $lang['managedProd']     = "geleitete Produkte & Projekte";
  $lang['soldProd']        = "vertriebene Produkte & Projekte";
! $lang['Enter']           = "Enter";
  $lang['Reset']           = "Zurücksetzen";
  $lang['Remove']          = "Entfernen";
--- 65,69 ----
  $lang['managedProd']     = "geleitete Produkte & Projekte";
  $lang['soldProd']        = "vertriebene Produkte & Projekte";
! $lang['Enter']           = "Eingeben";
  $lang['Reset']           = "Zurücksetzen";
  $lang['Remove']          = "Entfernen";
***************
*** 84,92 ****
  $lang['lang']['es']      = "spanisch";
  $lang['lang']['it']      = "italienisch";
! $lang['lang']['tw']      = "Traditional Chinese";
! $lang['lang']['zh']      = "Simplify Chinese";
  $lang['lang']['ru']      = "russisch";
! $lang['lang']['pt']      = "português";
! $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
  $lang['lang']['nl']      = "niederländisch";
--- 84,92 ----
  $lang['lang']['es']      = "spanisch";
  $lang['lang']['it']      = "italienisch";
! $lang['lang']['tw']      = "traditionelles chinesisch";
! $lang['lang']['zh']      = "vereinfachtes chinesisch";
  $lang['lang']['ru']      = "russisch";
! $lang['lang']['pt']      = "portugiesisch";
! $lang['lang']['pl']      = "polnisch";
  $lang['lang']['ko']      = "korean";
  $lang['lang']['nl']      = "niederländisch";
***************
*** 116,121 ****
  $lang['PlsChangeName']   = "Bitte den Namen ändern";
  $lang['State_0']         = "???";
! $lang['State_1']         = "YES";
! $lang['State_2']         = "NO";
  $lang['SeeAddress']      = "zur Karteikarte von %s";
  $lang['NavFirst']        = "Anfang";
--- 116,121 ----
  $lang['PlsChangeName']   = "Bitte den Namen ändern";
  $lang['State_0']         = "???";
! $lang['State_1']         = "JA";
! $lang['State_2']         = "NEIN";
  $lang['SeeAddress']      = "zur Karteikarte von %s";
  $lang['NavFirst']        = "Anfang";
***************
*** 132,137 ****
  $lang['OrderBy']         = "nach %s sortieren";
  $lang['RevOrderBy']      = "umgekehrt nach %s sortieren";
! $lang['Export']          = "Export";
! $lang['ExportInfo']      = "Export data as file";
  
  # Appointments
--- 132,137 ----
  $lang['OrderBy']         = "nach %s sortieren";
  $lang['RevOrderBy']      = "umgekehrt nach %s sortieren";
! $lang['Export']          = "Exportieren";
! $lang['ExportInfo']      = "Daten als Datei exportieren";
  
  # Appointments
***************
*** 196,200 ****
  $lang['AppVoteHead']     = "Terminabstimmung für (%s)";
  $lang['AppVoteSelect']   = "Bitte wählen";
! $lang['AppsSearch']      = "Kalendar Suche";
  $lang['SearchForAppExt'] = "Erweiterte Suche nach einen Termin";
  $lang['SearchForApp']    = "Suche nach einen Termin";
--- 196,200 ----
  $lang['AppVoteHead']     = "Terminabstimmung für (%s)";
  $lang['AppVoteSelect']   = "Bitte wählen";
! $lang['AppsSearch']      = "Suche im Kalender";
  $lang['SearchForAppExt'] = "Erweiterte Suche nach einen Termin";
  $lang['SearchForApp']    = "Suche nach einen Termin";
***************
*** 220,227 ****
  $lang['UserLastHost']    = "letzter Rechner";
  $lang['UserAdmin']       = "Administrator";
! $lang['UserUseOverlib']  = "use popups";
  $lang['UserLanguage']    = "Sprache";
  $lang['UserTimezone']    = "Zeitzone";
! $lang['UserTheme']       = "Theme";
  
  # Bugs
--- 220,227 ----
  $lang['UserLastHost']    = "letzter Rechner";
  $lang['UserAdmin']       = "Administrator";
! $lang['UserUseOverlib']  = "Popups benutzen";
  $lang['UserLanguage']    = "Sprache";
  $lang['UserTimezone']    = "Zeitzone";
! $lang['UserTheme']       = "Oberfläche";
  
  # Bugs
***************
*** 241,245 ****
  $lang['BugClosedBy']     = "geschlossen von";
  $lang['BugAssignedTo']   = "zu lösen von";
! $lang['BugHistory']      = "Bescreibung & Historie";
  $lang['Bugs']            = "Fehler";
  $lang['BugModify']       = "Fehler ändern";
--- 241,245 ----
  $lang['BugClosedBy']     = "geschlossen von";
  $lang['BugAssignedTo']   = "zu lösen von";
! $lang['BugHistory']      = "Beschreibung & Historie";
  $lang['Bugs']            = "Fehler";
  $lang['BugModify']       = "Fehler ändern";
***************
*** 335,339 ****
  $lang['ProdCreateT']     = "Ein neues neues Produkt / Projekt anlegen";
  $lang['ProdSelInfo']     = "(leer zeigt alle Produkte/Projekte)";
! $lang['ProdLinkInfo']    = "Product/Project %s anzeigen";
  $lang['ProdBetween']     = "angelegt zwischen";
  $lang['ProdLinks']       = "Links";
--- 335,339 ----
  $lang['ProdCreateT']     = "Ein neues neues Produkt / Projekt anlegen";
  $lang['ProdSelInfo']     = "(leer zeigt alle Produkte/Projekte)";
! $lang['ProdLinkInfo']    = "Produkt/Project %s anzeigen";
  $lang['ProdBetween']     = "angelegt zwischen";
  $lang['ProdLinks']       = "Links";
***************
*** 341,345 ****
  $lang['ProdStats']       = "Statistik";
  $lang['ProdStatsInfo']   = "Statistik für diese Produkte/Projekte";
! $lang['ProdStatsTitle']  = "Product/Project Statistik";
  $lang['ProdFields']      = "Felder";
  
--- 341,345 ----
  $lang['ProdStats']       = "Statistik";
  $lang['ProdStatsInfo']   = "Statistik für diese Produkte/Projekte";
! $lang['ProdStatsTitle']  = "Produkt/Project Statistik";
  $lang['ProdFields']      = "Felder";
  
***************
*** 503,507 ****
  
  # Notes
! $lang['Note']               = "Notitz";
  $lang['Notes']              = "Notizen";
  $lang['NoteCreate']         = "Notiz anlegen";
--- 503,507 ----
  
  # Notes
! $lang['Note']               = "Notiz";
  $lang['Notes']              = "Notizen";
  $lang['NoteCreate']         = "Notiz anlegen";
***************
*** 509,516 ****
  $lang['NoteDelete']         = "Notiz löschen";
  $lang['NoteDescription']    = "Beschreibung";
! $lang['NoteRemember']       = "Errinnern am:";
  $lang['NoteName']           = "Thema";
! $lang['NoteDetail']         = "Notitz Anzeige";
! $lang['NoteOverview']       = "Notitz Übersicht";
  $lang['NoteCreation']       = "Notiz Erzeugung";
  $lang['NoteMod']            = "Notiz ändern";
--- 509,516 ----
  $lang['NoteDelete']         = "Notiz löschen";
  $lang['NoteDescription']    = "Beschreibung";
! $lang['NoteRemember']       = "Erinnern am:";
  $lang['NoteName']           = "Thema";
! $lang['NoteDetail']         = "Notiz Anzeige";
! $lang['NoteOverview']       = "Notiz Übersicht";
  $lang['NoteCreation']       = "Notiz Erzeugung";
  $lang['NoteMod']            = "Notiz ändern";
***************
*** 526,530 ****
  $lang['NoteRefName']        = "Referenz name";
  $lang['NoteBetween']        = "erzeugt zwischen";
! $lang['NotesOverview']      = "Notitz Übersicht";
  
  # Address
--- 526,530 ----
  $lang['NoteRefName']        = "Referenz name";
  $lang['NoteBetween']        = "erzeugt zwischen";
! $lang['NotesOverview']      = "Notiz Übersicht";
  
  # Address
***************
*** 539,543 ****
  $lang['AdrBModInfo']     = "Basis Eintrag von %s ändern";
  $lang['AdrBDel']         = "Basis löschen";
! $lang['AdrBDelInfo']     = "Basis Eintrag und alle Addresseinträge von %s löschen";
  $lang['AdrBNew']         = "Neuer Eintrag";
  $lang['AdrBNewInfo']     = "neuen Basiseintrag anlegen";
--- 539,543 ----
  $lang['AdrBModInfo']     = "Basis Eintrag von %s ändern";
  $lang['AdrBDel']         = "Basis löschen";
! $lang['AdrBDelInfo']     = "Basis Eintrag und alle Adresseinträge von %s löschen";
  $lang['AdrBNew']         = "Neuer Eintrag";
  $lang['AdrBNewInfo']     = "neuen Basiseintrag anlegen";
***************
*** 551,557 ****
  $lang['AdrSeeEntry']     = "Eintrag ansehen";
  $lang['AdrSeeEntryI']    = "Den Eintrag von %s aus dem Adressbuch anzeigen";
! $lang['AdrLocTitle']     = "%s Addresse";
  $lang['AdrBNewTitle']    = "neue Adresse (Basis) eintragen";
! $lang['AdrBChangeTitle'] = "Addressen (Basis) ändern";
  
  $lang['Location']        = "Anschrift";
--- 551,557 ----
  $lang['AdrSeeEntry']     = "Eintrag ansehen";
  $lang['AdrSeeEntryI']    = "Den Eintrag von %s aus dem Adressbuch anzeigen";
! $lang['AdrLocTitle']     = "%s Adresse";
  $lang['AdrBNewTitle']    = "neue Adresse (Basis) eintragen";
! $lang['AdrBChangeTitle'] = "Adressen (Basis) ändern";
  
  $lang['Location']        = "Anschrift";
***************
*** 579,586 ****
  $lang['AdrDescription']  = "Name des Eintrags";
  $lang['ShowCal']         = "Zum Kalender von '%s'";
! $lang['SearchForAdr']    = "Suchen im Addressbuch";
! $lang['SearchForAdrExt'] = "erweitertes Suchen im Addressbuch";
  $lang['SearchForCmp']    = "Suchen nach einer Firma";
! $lang['SearchLdapAdr']   = "Suchen im Internet Addressbuch";
  $lang['LDAPServer']      = "Server";
  
--- 579,586 ----
  $lang['AdrDescription']  = "Name des Eintrags";
  $lang['ShowCal']         = "Zum Kalender von '%s'";
! $lang['SearchForAdr']    = "Suchen im Adressbuch";
! $lang['SearchForAdrExt'] = "erweitertes Suchen im Adressbuch";
  $lang['SearchForCmp']    = "Suchen nach einer Firma";
! $lang['SearchLdapAdr']   = "Suchen im Internet Adressbuch";
  $lang['LDAPServer']      = "Server";
  
***************
*** 608,613 ****
  
  # Resource
! $lang['ResCal']          = "Resourcen";
! $lang['ResCalDetail']    = "Resourcenplan für %s in %s";
  
  # Filehandling
--- 608,613 ----
  
  # Resource
! $lang['ResCal']          = "Ressourcen";
! $lang['ResCalDetail']    = "Ressourcenplan für %s in %s";
  
  # Filehandling
***************
*** 697,716 ****
  $lang['WatchDelI']         = "Änderungen bei %s nicht länger verfolgen";
  $lang['WatchOverview']     = "Beobachterliste";
! $lang['WatchOverviewI']    = "Zur Beobachteliste für %s";
  $lang['Watcher']           = "Beobachter";
  
  # Resource
! $lang['Resource']          = "Resource";
! $lang['Resources']         = "Resourcen";
! $lang['ResDetail']         = "Resource Anzeige";
! $lang['ResCreate']         = "Resource erzeugen";
! $lang['ResModify']         = "Resource ändern";
! $lang['ResModifyI']        = "Ändern der Resource %s";
  $lang['ResName']           = "Name";
  $lang['ResDesc']           = "Beschreibung";
! $lang['ResShow']           = "Zeige Resource %s";
! $lang['ResUsage']          = "Resourcen Nutzung";
! $lang['ResOverview']       = "Resourcen Übersicht";
! $lang['ResDelI']           = "Resource %s löschen";
  
  # Admin Pages
--- 697,716 ----
  $lang['WatchDelI']         = "Änderungen bei %s nicht länger verfolgen";
  $lang['WatchOverview']     = "Beobachterliste";
! $lang['WatchOverviewI']    = "Zur Beobachterliste für %s";
  $lang['Watcher']           = "Beobachter";
  
  # Resource
! $lang['Resource']          = "Ressource";
! $lang['Resources']         = "Ressourcen";
! $lang['ResDetail']         = "Ressource Anzeige";
! $lang['ResCreate']         = "Ressource erzeugen";
! $lang['ResModify']         = "Ressource ändern";
! $lang['ResModifyI']        = "Ändern der Ressource %s";
  $lang['ResName']           = "Name";
  $lang['ResDesc']           = "Beschreibung";
! $lang['ResShow']           = "Zeige Ressource %s";
! $lang['ResUsage']          = "Ressourcen Nutzung";
! $lang['ResOverview']       = "Ressourcen Übersicht";
! $lang['ResDelI']           = "Ressource %s löschen";
  
  # Admin Pages
***************
*** 740,744 ****
  $lang['perm'][useoverlib]        = "Minifenster";
  $lang['perm'][usewatchlist]      = "Änderungsverfolgung";
! $lang['perm'][useresource]       = "Resourcen";
  $lang['perm'][useaddressbook]    = "Adressbuch";
  $lang['perm'][usemailboxes]      = "use mailboxes";
--- 740,744 ----
  $lang['perm'][useoverlib]        = "Minifenster";
  $lang['perm'][usewatchlist]      = "Änderungsverfolgung";
! $lang['perm'][useresource]       = "Ressourcen";
  $lang['perm'][useaddressbook]    = "Adressbuch";
  $lang['perm'][usemailboxes]      = "use mailboxes";
***************
*** 754,758 ****
  $lang['Err0005']         = "Produktbeschreibung <I>%s</I> passt zu <B>%d</B> Produkten oder Projekten !";
  $lang['Err0006']         = "Bitte geben Sie ein genauere Beschreibung";
! $lang['Err0007']         = "Unbekannter Besucher. <I>%s</I> konnte nicht im <A HREF=address_select.php>Addressbuch</A> gefunden werden";
  $lang['Err0008']         = "Besuchername <I>%s</I> trifft auf %d Einträge zu";
  $lang['Err0009']         = "Bitte füllen sie das Feld <I>%s</I>";
--- 754,758 ----
  $lang['Err0005']         = "Produktbeschreibung <I>%s</I> passt zu <B>%d</B> Produkten oder Projekten !";
  $lang['Err0006']         = "Bitte geben Sie ein genauere Beschreibung";
! $lang['Err0007']         = "Unbekannter Besucher. <I>%s</I> konnte nicht im <A HREF=address_select.php>Adressbuch</A> gefunden werden";
  $lang['Err0008']         = "Besuchername <I>%s</I> trifft auf %d Einträge zu";
  $lang['Err0009']         = "Bitte füllen sie das Feld <I>%s</I>";
***************
*** 763,767 ****
  $lang['Err0014']         = "Bitte wählen sie im Feld <I>%s</I>";
  $lang['Err0015']         = "Änderung nicht erlaubt !";
! $lang['Err0016']         = "Sie dürfen diese Notitz nicht löschen !";
  $lang['Err0017']         = "Bitte geben Sie eine Zahl im <I>%s</I> Feld ein !";
  $lang['Err0018']         = "Name <I>%s</I> trifft auf %d Einträge zu";
--- 763,767 ----
  $lang['Err0014']         = "Bitte wählen sie im Feld <I>%s</I>";
  $lang['Err0015']         = "Änderung nicht erlaubt !";
! $lang['Err0016']         = "Sie dürfen diese Notiz nicht löschen !";
  $lang['Err0017']         = "Bitte geben Sie eine Zahl im <I>%s</I> Feld ein !";
  $lang['Err0018']         = "Name <I>%s</I> trifft auf %d Einträge zu";
***************
*** 781,790 ****
  $lang['Err0032']         = "Fax Versand ist abgeschaltet !";
  $lang['Err0033']         = "Email Versand ist abgeschaltet ! Email \"%s\" wurde <U>nicht</U> abgeschickt.";
! $lang['Err0034']         = "Email wurde nicht verschickt ! Email Addresse des Absenders \"%s\" fehlt.";
  $lang['Err0035']         = "Email wurde nicht verschickt ! Empfänger fehlen.";
  $lang['Err0036']         = "Es existiert bereits ein Produkt oder Projekt (%s) mit diesen Namen unde dieser Versionsnummer !";
  $lang['Err0037']         = "Email '%s' wurde nicht verschickt ! Prototypp Text (%s) fehlt !";
  $lang['Err0038']         = "Ungültiges Datum im Feld %s!";
! $lang['Err0039']         = "Address Eintrag existiert bereits hier (%s) !";
  $lang['Err0040']         = "%s nicht gefunden !";
  $lang['Err0041']         = "Passwörter sind nicht gleich !";
--- 781,790 ----
  $lang['Err0032']         = "Fax Versand ist abgeschaltet !";
  $lang['Err0033']         = "Email Versand ist abgeschaltet ! Email \"%s\" wurde <U>nicht</U> abgeschickt.";
! $lang['Err0034']         = "Email wurde nicht verschickt ! Email Adresse des Absenders \"%s\" fehlt.";
  $lang['Err0035']         = "Email wurde nicht verschickt ! Empfänger fehlen.";
  $lang['Err0036']         = "Es existiert bereits ein Produkt oder Projekt (%s) mit diesen Namen unde dieser Versionsnummer !";
  $lang['Err0037']         = "Email '%s' wurde nicht verschickt ! Prototypp Text (%s) fehlt !";
  $lang['Err0038']         = "Ungültiges Datum im Feld %s!";
! $lang['Err0039']         = "Adress Eintrag existiert bereits hier (%s) !";
  $lang['Err0040']         = "%s nicht gefunden !";
  $lang['Err0041']         = "Passwörter sind nicht gleich !";
***************
*** 800,802 ****
  ### mode:iso-accents ***
  ### End: ***
! ?>
\ No newline at end of file
--- 800,802 ----
  ### mode:iso-accents ***
  ### End: ***
! ?>

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

Modified Files:
	address_show.php config.pinc webelements.p3 
Log Message:
HTML fix: some browsers fail on entities in URLs


Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** address_show.php	2001/08/11 19:11:25	1.12
--- address_show.php	2001/08/14 12:36:39	1.13
***************
*** 160,164 ****
       }	
  	 if ( ($current_user->p[usevcard] == 1) && ($tutos[usevcard] == 1) ) {
!        echo  makelink($a->getUrl() ."&format=vcard" ,$lang['AdrGetVcard'],$lang['AdrGetVcardI']) . "<BR>\n";
  	 }
       echo "<BR>\n";
--- 160,164 ----
       }	
  	 if ( ($current_user->p[usevcard] == 1) && ($tutos[usevcard] == 1) ) {
!        echo  makelink($a->getUrl() ."&amp;format=vcard" ,$lang['AdrGetVcard'],$lang['AdrGetVcardI']) . "<BR>\n";
  	 }
       echo "<BR>\n";

Index: config.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config.pinc,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** config.pinc	2001/08/11 19:11:25	1.59
--- config.pinc	2001/08/14 12:36:39	1.60
***************
*** 360,364 ****
  # $tutos[logo] = "../html/tutos_small.gif";
  # $tutos[logolink] = "http://www.tutos.org";
! $tutos[logo] = "http://sourceforge.net/sflogo.php?group_id=8047&type=1";
  $tutos[logolink] = "http://www.tutos.org";
  #
--- 360,364 ----
  # $tutos[logo] = "../html/tutos_small.gif";
  # $tutos[logolink] = "http://www.tutos.org";
! $tutos[logo] = "http://sourceforge.net/sflogo.php?group_id=8047&amp;type=1";
  $tutos[logolink] = "http://www.tutos.org";
  #
***************
*** 368,370 ****
  #
  $includes[config.pinc] = 1;
! ?>
\ No newline at end of file
--- 368,370 ----
  #
  $includes[config.pinc] = 1;
! ?>

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** webelements.p3	2001/08/11 19:11:25	1.54
--- webelements.p3	2001/08/14 12:36:39	1.55
***************
*** 730,734 ****
      return makelink("mailto:". $email ."(". $fn .")?subject=".$subject ,$fn,sprintf($lang['MailSendTo'],$email) );
    } else {
!     return makelink("mail_new.php?to[]=". UrlEncode($email)."&subject=".UrlEncode($subject) ,$fn,sprintf($lang['MailSendTo'],$email));
    }
  }
--- 730,734 ----
      return makelink("mailto:". $email ."(". $fn .")?subject=".$subject ,$fn,sprintf($lang['MailSendTo'],$email) );
    } else {
!     return makelink("mail_new.php?to[]=". UrlEncode($email)."&amp;subject=".UrlEncode($subject) ,$fn,sprintf($lang['MailSendTo'],$email));
    }
  }
***************
*** 742,746 ****
    if ( ($current_user->p[usefax] == 1) && ($tutos[usefax] == 1) ) {
  	if ( getType($adr) == "object" ) {
! 	  return makelink("fax_new.php?nr=". UrlEncode($faxnr) ."&a=".$adr->id ."&l=".$loc->id,$faxnr,sprintf($lang['FaxSendTo'],$adr->getFullname()));
  	} else {
  	  return makelink("fax_new.php?nr=". UrlEncode($faxnr),$faxnr,sprintf($lang['FaxSendTo'],$faxnr));
--- 742,746 ----
    if ( ($current_user->p[usefax] == 1) && ($tutos[usefax] == 1) ) {
  	if ( getType($adr) == "object" ) {
! 	  return makelink("fax_new.php?nr=". UrlEncode($faxnr) ."&amp;a=".$adr->id ."&amp;l=".$loc->id,$faxnr,sprintf($lang['FaxSendTo'],$adr->getFullname()));
  	} else {
  	  return makelink("fax_new.php?nr=". UrlEncode($faxnr),$faxnr,sprintf($lang['FaxSendTo'],$faxnr));
***************
*** 1408,1410 ****
     return $r;
   }
! ?>
\ No newline at end of file
--- 1408,1410 ----
     return $r;
   }
! ?>

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

Modified Files:
	calendar.php 
Log Message:
HTML fix: inline elements may not contain block-level elements


Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** calendar.php	2001/08/09 14:58:57	1.17
--- calendar.php	2001/08/14 11:11:38	1.18
***************
*** 201,205 ****
             $hastable = 1;
           } else {
!            echo "  <TR><TD CLASS=app COLSPAN=3><FONT COLOR=black SIZE=-5><HR NOSHADE SIZE=1></FONT></TD></TR>\n";
           }
  	 
--- 201,205 ----
             $hastable = 1;
           } else {
!            echo "  <TR><TD CLASS=app COLSPAN=3><HR NOSHADE SIZE=1></TD></TR>\n";
           }
  	 
***************
*** 409,411 ****
      CVS Info:  $Id$
      $Author$
! -->
\ No newline at end of file
--- 409,411 ----
      CVS Info:  $Id$
      $Author$
! -->

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

Modified Files:
	nl.p3 
Log Message:
Update from Marcel

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/nl.p3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** nl.p3	2001/08/11 19:11:25	1.2
--- nl.p3	2001/08/13 16:53:23	1.3
***************
*** 57,68 ****
  #
  $lang['DateFormatTitle'] = "%A, %e. %B %Y";
! $lang['DateFormatStr']   = "%d/%m/%Y";
! $lang['DateFormat']      = "%s/%s/%s";
! $lang['DateShortFormat'] = "%s/%s";
  #
  $lang['Printable']       = "Printbaar formaat";
  $lang['PrintableInfo']   = "Toon als printbare pagina";
! $lang['managedProd']     = "Beheerde Producten & Projecten";
! $lang['soldProd']        = "Verkochte Producten & Projecten";
  $lang['Enter']           = "Enter";
  $lang['Reset']           = "Reset";
--- 57,68 ----
  #
  $lang['DateFormatTitle'] = "%A, %e. %B %Y";
! $lang['DateFormatStr']   = "%d.%m.%Y";
! $lang['DateFormat']      = "%s.%s.%s";
! $lang['DateShortFormat'] = "%s.%s";
  #
  $lang['Printable']       = "Printbaar formaat";
  $lang['PrintableInfo']   = "Toon als printbare pagina";
! $lang['managedProd']     = "Beheerde Opdrachten & Projecten";
! $lang['soldProd']        = "Verkochte Opdrachten & Projecten";
  $lang['Enter']           = "Enter";
  $lang['Reset']           = "Reset";
***************
*** 150,154 ****
  $lang['AppNotes']        = "Notities";
  $lang['AppChangeOrDel']  = "wie mag deze wissen of wijzigen";
! $lang['VisitAt']         = "Bezoek op";
  $lang['VisitFrom']       = "Bezoek van";
  $lang['Visits']          = "Bezoeken";
--- 150,154 ----
  $lang['AppNotes']        = "Notities";
  $lang['AppChangeOrDel']  = "wie mag deze wissen of wijzigen";
! $lang['VisitAt']         = "Op bezoek bij/";
  $lang['VisitFrom']       = "Bezoek van";
  $lang['Visits']          = "Bezoeken";
***************
*** 175,187 ****
  $lang['AppRemind'][1440] = "1 dag vantevoren";
  $lang['AppRemind'][10080]= "1 week before";
! $lang['AppAllSee']       = "alles wat je kan zien";
! $lang['AppAllTeams']     = "leden van al je teams";
  $lang['AppEverything']   = "alles";
! $lang['AppGetIcal']      = "Get Ical File";
  # You can expand this as you like
  # AppLocDesc = 1 shows Description in calendar
  # AppLocDesc = 0 does not show Description in calendar
  # colors depend on style sheets
! $lang['AppLoc'][0]       = "Kantoor";
  $lang['AppLocDesc'][0]   = 1;
  $lang['AppLoc'][1]       = "Afwezig";
--- 175,187 ----
  $lang['AppRemind'][1440] = "1 dag vantevoren";
  $lang['AppRemind'][10080]= "1 week before";
! $lang['AppAllSee']       = "alles wat u mag zien";
! $lang['AppAllTeams']     = "leden van al uw teams";
  $lang['AppEverything']   = "alles";
! $lang['AppGetIcal']      = "Download Ical File";
  # You can expand this as you like
  # AppLocDesc = 1 shows Description in calendar
  # AppLocDesc = 0 does not show Description in calendar
  # colors depend on style sheets
! $lang['AppLoc'][0]       = "Afspraak";
  $lang['AppLocDesc'][0]   = 1;
  $lang['AppLoc'][1]       = "Afwezig";
***************
*** 202,206 ****
  
  # Personal Page
! $lang['PersonalPage']      = "PROMEZ projectmanagement";
  $lang['PersonalPageFor']   = "Persoonlijke pagina van %s";
  $lang['PersonalSettings']  = "Gebruikersinstellingen";
--- 202,206 ----
  
  # Personal Page
! $lang['PersonalPage']      = "TUTOS projectmanagement";
  $lang['PersonalPageFor']   = "Persoonlijke pagina van %s";
  $lang['PersonalSettings']  = "Gebruikersinstellingen";
***************
*** 236,240 ****
  $lang['BugCreator']      = "Aangemaakt door";
  $lang['BugCreation']     = "aangemaakt door %s op %s";
! $lang['BugProduct']      = "Product/Project";
  $lang['BugReference']    = "Referentie";
  $lang['BugSolvedBy']     = "opgelost door";
--- 236,240 ----
  $lang['BugCreator']      = "Aangemaakt door";
  $lang['BugCreation']     = "aangemaakt door %s op %s";
! $lang['BugProduct']      = "Opdacht/Project";
  $lang['BugReference']    = "Referentie";
  $lang['BugSolvedBy']     = "opgelost door";
***************
*** 278,289 ****
  
  # Product/Projects
! $lang['ProductP']        = "Product/Project";
! $lang['Product']         = "Product";
  $lang['Project']         = "Project";
! $lang['ProductsSearch']  = "Producten/Projecten Zoeken";
! $lang['ProductsOverview']= "Producten/Projecten Overzicht";
! $lang['ProductsDetail']  = "Product/Project Info";
  $lang['ProdApps']        = "Gerelateerde afspraken";
! $lang['ProdName']        = "Product/Project";
  $lang['ProdVersion']     = "Versie";
  $lang['ProdRoles']       = "Rollen";
--- 278,289 ----
  
  # Product/Projects
! $lang['ProductP']        = "Opdracht/Project";
! $lang['Product']         = "Opdracht";
  $lang['Project']         = "Project";
! $lang['ProductsSearch']  = "Opdrachten/Projecten Zoeken";
! $lang['ProductsOverview']= "Opdrachten/Projecten Overzicht";
! $lang['ProductsDetail']  = "Opdracht/Project Info";
  $lang['ProdApps']        = "Gerelateerde afspraken";
! $lang['ProdName']        = "Opdracht/Project";
  $lang['ProdVersion']     = "Versie";
  $lang['ProdRoles']       = "Rollen";
***************
*** 312,316 ****
  $lang['ProdClasses1'][1] = "Marketing";
  $lang['ProdClasses1'][2] = "BTL";
! $lang['ProdClasses1'][3] = "ATL";
  $lang['ProdClass2']      = "Classificatie 2";
  $lang['ProdClasses2'][1] = "Noordelijke regio";
--- 312,316 ----
  $lang['ProdClasses1'][1] = "Marketing";
  $lang['ProdClasses1'][2] = "BTL";
! $lang['ProdClasses1'][3] = "Consultancy";
  $lang['ProdClass2']      = "Classificatie 2";
  $lang['ProdClasses2'][1] = "Noordelijke regio";
***************
*** 321,329 ****
  $lang['ProdTasks']       = "Taken";
  $lang['ProdFiles']       = "Documenten";
! $lang['SearchForProd']   = "Zoek naar een product or project";
! $lang['SearchForProdExt']= "Uitgebreid zoeken naar een product or project";
! $lang['ProdCreateInfo']  = "Maak een nieuw product of project";
  $lang['ProdDelInfo']     = "Wis project %s";
! $lang['ProdModInfo']     = "Wijzig Product/Project %s";
  $lang['ProdCreator']     = "aangemaakt door";
  $lang['ProdCreation']    = "aangemaakt door %s op %s";
--- 321,329 ----
  $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['ProdDelInfo']     = "Wis project %s";
! $lang['ProdModInfo']     = "Wijzig Opdracht/Project %s";
  $lang['ProdCreator']     = "aangemaakt door";
  $lang['ProdCreation']    = "aangemaakt door %s op %s";
***************
*** 332,349 ****
  $lang['ProdEnd']         = "gesch. eind";
  $lang['ProdProb']        = "Kans op order";
! $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 Products/Projects";
! $lang['ProdStatsTitle']  = "Product/Project Statistieken";
  $lang['ProdFields']      = "Velden";
  
  # Mailboxes
! $lang['MailboxName']     = "Mailbox Name";
  $lang['MailboxHost']     = "Hostnaam";
  $lang['MailboxPort']     = "Poort";
--- 332,349 ----
  $lang['ProdEnd']         = "gesch. eind";
  $lang['ProdProb']        = "Kans op order";
! $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['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['ProdFields']      = "Velden";
  
  # Mailboxes
! $lang['MailboxName']     = "Mailbox Naam";
  $lang['MailboxHost']     = "Hostnaam";
  $lang['MailboxPort']     = "Poort";
***************
*** 455,460 ****
  $lang['CompanyDetail']     = "Bedrijfsinformatie";
  $lang['CompanyModify']     = "Wijzig bedrijf";
! $lang['CompanyCreate']     = "Maak bedrijf";
! $lang['CompanyCreateInfo'] = "maak een nieiuw bedrijf";
  $lang['CompanyApps']       = "Afspraken met dit bedrijf";
  $lang['CompanyLinks']      = "Links";
--- 455,460 ----
  $lang['CompanyDetail']     = "Bedrijfsinformatie";
  $lang['CompanyModify']     = "Wijzig bedrijf";
! $lang['CompanyCreate']     = "Maak Bedrijf";
! $lang['CompanyCreateInfo'] = "maak een nieuw bedrijf";
  $lang['CompanyApps']       = "Afspraken met dit bedrijf";
  $lang['CompanyLinks']      = "Links";
***************
*** 483,487 ****
  $lang['Team']               = "Team";
  $lang['Teams']              = "Teams";
! $lang['TeamOverview']       = "Team Overzicht";
  $lang['TeamDetail']         = "Team Info";
  $lang['TeamModify']         = "Wijzig Team";
--- 483,487 ----
  $lang['Team']               = "Team";
  $lang['Teams']              = "Teams";
! $lang['TeamOverview']       = "Overzicht Teams";
  $lang['TeamDetail']         = "Team Info";
  $lang['TeamModify']         = "Wijzig Team";
***************
*** 493,497 ****
  $lang['TeamApps']           = "Toon afspraken van team %s";
  $lang['TeamLinkInfo']       = "toon Team %s";
! $lang['TeamManager']        = "Lijstmanager";
  $lang['TeamName']           = "Teamnaam";
  $lang['TeamCreation']       = "aangemaakt op";
--- 493,497 ----
  $lang['TeamApps']           = "Toon afspraken van team %s";
  $lang['TeamLinkInfo']       = "toon Team %s";
! $lang['TeamManager']        = "Team-manager";
  $lang['TeamName']           = "Teamnaam";
  $lang['TeamCreation']       = "aangemaakt op";
***************
*** 513,517 ****
  $lang['NoteDetail']         = "Notitie Weergave";
  $lang['NoteOverview']       = "Notitieoverzicht";
! $lang['NoteCreation']       = "Notitie aanmaakdatum";
  $lang['NoteMod']            = "Wijzig notitie";
  $lang['NoteReference']      = "Referentie";
--- 513,517 ----
  $lang['NoteDetail']         = "Notitie Weergave";
  $lang['NoteOverview']       = "Notitieoverzicht";
! $lang['NoteCreation']       = "Notitie aanmaken";
  $lang['NoteMod']            = "Wijzig notitie";
  $lang['NoteReference']      = "Referentie";
***************
*** 555,560 ****
  $lang['AdrBChangeTitle'] = "Wijzig een basisadres";
  
! $lang['Location']        = "Locatie";
! $lang['Location2']       = "Locatie";
  $lang['AdrFirstName']    = "Voornaam";
  $lang['AdrMiddleName']   = "Initaal";
--- 555,560 ----
  $lang['AdrBChangeTitle'] = "Wijzig een basisadres";
  
! $lang['Location']        = "Lokatie";
! $lang['Location2']       = "Soort";
  $lang['AdrFirstName']    = "Voornaam";
  $lang['AdrMiddleName']   = "Initaal";
***************
*** 564,568 ****
  $lang['AdrCat1']         = "Thuis";
  $lang['AdrCat2']         = "Kantoor";
! $lang['AdrCpLoc']        = "Kopieer bedrijfsadres";
  $lang['ZIP']             = "Postcode";
  $lang['State']           = "Provincie";
--- 564,568 ----
  $lang['AdrCat1']         = "Thuis";
  $lang['AdrCat2']         = "Kantoor";
! $lang['AdrCpLoc']        = "Kopieer uit bedrijfsadres";
  $lang['ZIP']             = "Postcode";
  $lang['State']           = "Provincie";
***************
*** 595,604 ****
  $lang['Addresses']       = "Adressen";
  $lang['BugTrack']        = "Foutregistratie";
! $lang['Product']         = "Producten & Projecten";
  $lang['Logout']          = "Uitloggen";
  $lang['CalendarInfo']    = "Kalender van Vandaag";
  $lang['AddressesInfo']   = "Zoek naar adressen";
  $lang['BugTrackInfo']    = "Bug Tracking Database";
! $lang['ProductInfo']     = "Producten & Projecten";
  $lang['LogoutInfo']      = "Uitloggen";
  
--- 595,604 ----
  $lang['Addresses']       = "Adressen";
  $lang['BugTrack']        = "Foutregistratie";
! $lang['Product']         = "Opdrachten & Projecten";
  $lang['Logout']          = "Uitloggen";
  $lang['CalendarInfo']    = "Kalender van Vandaag";
  $lang['AddressesInfo']   = "Zoek naar adressen";
  $lang['BugTrackInfo']    = "Bug Tracking Database";
! $lang['ProductInfo']     = "Opdrachten & Projecten";
  $lang['LogoutInfo']      = "Uitloggen";
  
***************
*** 692,702 ****
  
  # WatchList
! $lang['WatchAdd']          = "Voeg toe aan watchlijst";
! $lang['WatchAddI']         = "Voeg %s toe aan watchlijst";
! $lang['WatchDel']          = "Wis uit watchlijst";
! $lang['WatchDelI']         = "Wis %s uit uw watchlijst";
! $lang['WatchOverview']     = "Watchlijst";
! $lang['WatchOverviewI']    = "Toon de watchlijst van %s";
! $lang['Watcher']           = "Observeerder";
  
  # Resource
--- 692,702 ----
  
  # WatchList
! $lang['WatchAdd']          = "Voeg toe aan observatielijst";
! $lang['WatchAddI']         = "Voeg %s toe aan observatielijst";
! $lang['WatchDel']          = "Wis uit observatielijst";
! $lang['WatchDelI']         = "Wis %s uit uw observatielijst";
! $lang['WatchOverview']     = "Observatielijst";
! $lang['WatchOverviewI']    = "Toon de observatielijst van %s";
! $lang['Watcher']           = "Observerende";
  
  # Resource
***************
*** 739,748 ****
  $lang['perm'][usesms]            = "gebruik sms";
  $lang['perm'][useoverlib]        = "gebruik popups";
! $lang['perm'][usewatchlist]      = "gebruik watchlist";
  $lang['perm'][useresource]       = "gebruik resources";
  $lang['perm'][useaddressbook]    = "gebruik adresboek";
  $lang['perm'][usemailboxes]      = "gebruik mailboxen";
! $lang['perm'][usemail]           = "gebruik mail";
! $lang['perm'][useldap]           = "gebruik LDAP";
  $lang['FeatureOff'] = "Feature globaal gedisabled";
  
--- 739,748 ----
  $lang['perm'][usesms]            = "gebruik sms";
  $lang['perm'][useoverlib]        = "gebruik popups";
! $lang['perm'][usewatchlist]      = "gebruik observatielijst";
  $lang['perm'][useresource]       = "gebruik resources";
  $lang['perm'][useaddressbook]    = "gebruik adresboek";
  $lang['perm'][usemailboxes]      = "gebruik mailboxen";
! $lang['perm'][usemail]           = "use mail";
! $lang['perm'][useldap]           = "use LDAP";
  $lang['FeatureOff'] = "Feature globaal gedisabled";
  
***************
*** 751,756 ****
  $lang['Err0002']         = "start ligt na einde !";
  $lang['Err0003']         = "De beschrijving ontbreekt bij de afspraak !";
! $lang['Err0004']         = "Onbekend Product <I>%s</I> !";
! $lang['Err0005']         = "Productbeschrijving <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>";
--- 751,756 ----
  $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['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>";
***************
*** 775,780 ****
  $lang['Err0026']         = "Login niet mogelijk";
  $lang['Err0027']         = "Login mislukt";
! $lang['Err0028']         = "No Producten/Projecten gedefinieerd";
! $lang['Err0029']         = "No Producten/Projecten zichtbaar";
  $lang['Err0030']         = "Fax is niet gespoold !";
  $lang['Err0031']         = "Ontbrekend Faxnummer !";
--- 775,780 ----
  $lang['Err0026']         = "Login niet mogelijk";
  $lang['Err0027']         = "Login mislukt";
! $lang['Err0028']         = "Geen Opdrachten/Projecten gedefinieerd";
! $lang['Err0029']         = "Geen Opdrachten/Projecten zichtbaar";
  $lang['Err0030']         = "Fax is niet gespoold !";
  $lang['Err0031']         = "Ontbrekend Faxnummer !";
***************
*** 783,787 ****
  $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']         = "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!";
--- 783,787 ----
  $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['Err0037']         = "mail '%s' is niet verzonden ! Ontbrekend Mail Prototypebestand (%s) !";
  $lang['Err0038']         = "Ongeldige Datum in veld %s!";

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

Modified Files:
	acl.pinc acl_ins.php acl_new.php acl_show.php address.pinc 
	address_del.php address_ins.php address_new.php 
	address_show.php appointment.pinc bug.pinc bug_del.php 
	bug_ins.php bug_new.php bug_show.php calendar_del.php 
	calendar_do_vote.php calendar_ins.php calendar_new.php 
	calendar_new_r.php calendar_show.php check.php company.pinc 
	company_del.php company_show.php config.pinc db.p3 de.p3 
	department.pinc department_del.php department_show.php en.p3 
	es.p3 fax_ins.php file.pinc file_del.php file_ins.php 
	file_new.php file_show.php fr.p3 history.pinc history_show.php 
	installation.pinc installation_del.php installation_ins.php 
	installation_new.php installation_overview.php 
	installation_show.php it.p3 ko.p3 location.pinc 
	location_ins.php mail.pinc mail_ins.php mail_new.php 
	mailbox.pinc mailbox_del.php mailbox_new.php 
	mailbox_overview.php mailbox_show.php mytutos.php nl.p3 
	note.pinc note_del.php note_ins.php note_new.php 
	note_select.php note_show.php permission.p3 pl.p3 product.pinc 
	product_del.php product_ins.php product_new.php 
	product_show.php pt-br.p3 resource.pinc resource_ins.php 
	resource_new.php resource_show.php ru.p3 task.pinc 
	task_del.php task_ins.php task_new.php task_overview.php 
	task_show.php team.pinc team_del.php team_ins.php 
	team_overview.php team_show.php timetrack.pinc 
	timetrack_del.php timetrack_ins.php timetrack_new.php tw.p3 
	url.pinc url_del.php url_ins.php user.pinc user_del.php 
	user_ins.php user_new.php watchlist_del.php watchlist_ins.php 
	webelements.p3 zh.p3 
Added Files:
	resource_del.php 
Log Message:
prepare relaes 200108?? I

--- NEW FILE: resource_del.php ---
<?
/*
 * Copyright 2001 by Gero Kohnert
 *
 */
 include("webelements.p3");
 include("permission.p3");
 include("resource.pinc");
 include("note.pinc");

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

 /* Check Input */
 $msg = "";
 $gotourl = "resource_overview.php";
 $obj = new resource($conn);

 if ( !isset($id) ) {
   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<BR>";
 } else {
   $obj->read($id);
   $gotourl = $obj->getUrl();
 }
 if ( ! $obj->del_ok() ) {
   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
 }
 if ( $msg == "" ) {
   $gotourl = "resource_overview.php";
   $msg .= $obj->delete();
 }

 $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
 $gotourl = addSessionKey($gotourl);

 Header("Status: 302 Moved Temporarily");
 Header("Location:". $gotourl);
 DB_Close($conn);
 /*
  *  CVS Info:  $Id: resource_del.php,v 1.1 2001/08/11 19:11:25 gokohnert Exp $
  *  $Author: gokohnert $
  */
?>
Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** acl.pinc	2001/08/09 10:32:03	1.11
--- acl.pinc	2001/08/11 19:11:25	1.12
***************
*** 99,102 ****
--- 99,103 ----
   */
  Function acl_delete_obj(&$obj) {
+   $msg = "";
    $q = "DELETE FROM acl WHERE obj_id = ". $obj->id;
    $r = @DB_Exec($obj->conn,$q);
***************
*** 108,111 ****
--- 109,113 ----
      # DB_FreeResult ($r);
    }
+   return $msg;
  }
  /* ---------------------------------------------------------------------------

Index: acl_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_ins.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acl_ins.php	2001/08/09 10:32:03	1.5
--- acl_ins.php	2001/08/11 19:11:25	1.6
***************
*** 13,16 ****
--- 13,17 ----
   include("resource.pinc");
   include("mailbox.pinc");
+  include("appointment.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 21,30 ****
  
   if ( empty($id) ) {
!    $msg = $msg ."Missing ID<BR>";
     $gotourl = $HTTP_REFERER;
   } else {
     $obj = getObject($id);
     if ( $obj->del_ok() == 0 ) {
!      $msg = $msg ."Not allowed !<BR>";
       $gotourl = $obj->getURL();
     }
--- 22,31 ----
  
   if ( empty($id) ) {
!    $msg .= "Missing ID<BR>";
     $gotourl = $HTTP_REFERER;
   } else {
     $obj = getObject($id);
     if ( $obj->del_ok() == 0 ) {
!      $msg .= "Not allowed !<BR>";
       $gotourl = $obj->getURL();
     }

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** acl_new.php	2001/08/09 10:32:03	1.8
--- acl_new.php	2001/08/11 19:11:25	1.9
***************
*** 12,15 ****
--- 12,17 ----
   include("mailbox.pinc");
   include("resource.pinc");
+  include("installation.pinc");
+  include("appointment.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 164,172 ****
  
   if ( $obj == -1 ) {
!    $msg = $msg . sprintf($lang['Err0040'],"Object");
     unset($obj);
   } else {
     if ( ! $obj->del_ok() ) {
!      $msg = $msg . sprintf($lang['Err0023'],$lang[$obj->getType()]);
       unset($obj);
     }
--- 166,174 ----
  
   if ( $obj == -1 ) {
!    $msg .= sprintf($lang['Err0040'],"Object");
     unset($obj);
   } else {
     if ( ! $obj->del_ok() ) {
!      $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]);
       unset($obj);
     }

Index: acl_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_show.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acl_show.php	2001/08/09 10:32:03	1.4
--- acl_show.php	2001/08/11 19:11:25	1.5
***************
*** 96,100 ****
  
   if ( ! $obj ) {
!    $msg = $msg ."Object <I>$id</I> not found!<BR>";
   }
   HTML_Base1();
--- 96,100 ----
  
   if ( ! $obj ) {
!    $msg .= "Object <I>$id</I> not found!<BR>";
   }
   HTML_Base1();

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** address.pinc	2001/08/09 10:32:03	1.35
--- address.pinc	2001/08/11 19:11:25	1.36
***************
*** 330,334 ****
     */
    function delete () {
!     $this->read_locs();
  
      @DB_Begin($this->conn,"WORK");
--- 330,335 ----
     */
    function delete () {
!     $msg = "";
!     $this->read_locs_data();
  
      @DB_Begin($this->conn,"WORK");
***************
*** 340,364 ****
      @DB_Lock($this->conn,"files");
  
      $q1 = "DELETE FROM addresses WHERE id = ". $this->id;
      $r = @DB_Exec($this->conn,$q1);
  
-     if ( isset($this->loc) ) {
-       @reset($this->loc);
-       while( list ($i,$f) = @each ($this->loc)) {
- 	$q1 = "DELETE FROM location WHERE id = ". $i;
- 	$r = @DB_Exec($this->conn,$q1);
- 	$q1 = "DELETE FROM adrloc WHERE loc_id = ". $i ." AND adr_id = ". $this->id;
- 	$r = @DB_Exec($this->conn,$q1);
-       }
-     }
      $q = "DELETE FROM projectroles WHERE adr_id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
  
-     $q = "DELETE FROM urls WHERE link_id = ". $this->id;
-     $r = @DB_Exec($this->conn,$q);
- 
-     $q = "DELETE FROM notes WHERE link_id = ". $this->id;
-     $r = @DB_Exec($this->conn,$q);
- 
      $q = "DELETE FROM watchlist WHERE adr_id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
--- 341,355 ----
      @DB_Lock($this->conn,"files");
  
+     @reset($this->location);
+     while( list ($i,$f) = @each ($this->location)) {
+       $msg .= $f->delete();
+     }
+ 
      $q1 = "DELETE FROM addresses WHERE id = ". $this->id;
      $r = @DB_Exec($this->conn,$q1);
  
      $q = "DELETE FROM projectroles WHERE adr_id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
  
      $q = "DELETE FROM watchlist WHERE adr_id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
***************
*** 368,378 ****
        $r = @DB_Exec($this->conn,$q);
      }
      #
      # To Do    bugs / products ...
      #
!     acl_delete_obj($this);
  
      @DB_Commit($this->conn,"WORK");
!     DB_FreeResult ($r);
    }
    /* ---------------------------------------------------------------------------
--- 359,379 ----
        $r = @DB_Exec($this->conn,$q);
      }
+ 
+     $msg .= note_delete_obj($this);
+     $msg .= url_delete_obj($this);
+     $msg .= history_delete($this);
+     $msg .= watchlist_delete($this);
      #
      # To Do    bugs / products ...
      #
!     $msg .= acl_delete_obj($this);
  
+     $this->modified[] = array ( "field" => "Delete" , "old" => $this->getType() , "new" => -1 );
+     $msg .= history_save($this);
+ 
      @DB_Commit($this->conn,"WORK");
!     # DB_FreeResult ($r);
! 
! 	return $msg;
    }
    /* ---------------------------------------------------------------------------

Index: address_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_del.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** address_del.php	2001/02/14 20:57:05	1.4
--- address_del.php	2001/08/11 19:11:25	1.5
***************
*** 6,9 ****
--- 6,11 ----
   include("webelements.p3");
   include("permission.p3");
+  include("note.pinc");
+  include("url.pinc");
  
   /* Check if user is allowed to use it */

Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** address_ins.php	2001/08/09 10:32:03	1.10
--- address_ins.php	2001/08/11 19:11:25	1.11
***************
*** 6,12 ****
   include("webelements.p3");
   include("permission.p3");
-  include("history.pinc");
  
- 
   /* Check if user is allowed to use it */
   check_user();
--- 6,10 ----
***************
*** 23,27 ****
     if ( ! $a->mod_ok() ) {
       # Not allowed
!      $msg = $msg . sprintf($lang['Err0015']) ."<BR>";
     }
     $new = 0;
--- 21,25 ----
     if ( ! $a->mod_ok() ) {
       # Not allowed
!      $msg .= sprintf($lang['Err0015']) ."<BR>";
     }
     $new = 0;
***************
*** 36,45 ****
  
   if ( 1 != $birthday->checkDMY() ) {
!    $msg = $msg . sprintf($lang['Err0038'],$lang['AdrBirthday']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"bd=". $birthday->getYYYYMMDD());
   }
   if ( empty($f_name) || ($f_name == "Unknown" ) || !isset($f_name) ) {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['AdrFirstName']) ."<BR>";
   } else {
     $f_name = trim($f_name);
--- 34,43 ----
  
   if ( 1 != $birthday->checkDMY() ) {
!    $msg .= sprintf($lang['Err0038'],$lang['AdrBirthday']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"bd=". $birthday->getYYYYMMDD());
   }
   if ( empty($f_name) || ($f_name == "Unknown" ) || !isset($f_name) ) {
!    $msg .= sprintf($lang['Err0009'],$lang['AdrFirstName']) ."<BR>";
   } else {
     $f_name = trim($f_name);
***************
*** 48,52 ****
  
   if ( empty($l_name) || !isset($l_name) ) {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['AdrLastName']) ."<BR>";
   } else {
     $l_name = trim($l_name);
--- 46,50 ----
  
   if ( empty($l_name) || !isset($l_name) ) {
!    $msg .= sprintf($lang['Err0009'],$lang['AdrLastName']) ."<BR>";
   } else {
     $l_name = trim($l_name);
***************
*** 79,83 ****
         $x = new tutos_address($conn);
         $x->read_result($r,0);
!        $msg = $msg . sprintf($lang['Err0039'],$x->getLink()) ."<BR>";
       }
     }
--- 77,81 ----
         $x = new tutos_address($conn);
         $x->read_result($r,0);
!        $msg .= sprintf($lang['Err0039'],$x->getLink()) ."<BR>";
       }
     }
***************
*** 96,100 ****
       $a->pic_file->savemode = 0;
       if ( isset($farr['size']) ) {
!        $msg = $msg . $a->pic_file->save();
       }
     }
--- 94,98 ----
       $a->pic_file->savemode = 0;
       if ( isset($farr['size']) ) {
!        $msg .= $a->pic_file->save();
       }
     }

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** address_new.php	2001/08/09 10:32:03	1.10
--- address_new.php	2001/08/11 19:11:25	1.11
***************
*** 435,439 ****
  
   if ( ! $address->mod_ok() ) {
!    $msg = $msg . sprintf($lang['Err0024'],$lang[$address->getType()]);
   }
   HTML_Base1();
--- 435,439 ----
  
   if ( ! $address->mod_ok() ) {
!    $msg .= sprintf($lang['Err0024'],$lang[$address->getType()]);
   }
   HTML_Base1();

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** address_show.php	2001/08/09 10:32:03	1.11
--- address_show.php	2001/08/11 19:11:25	1.12
***************
*** 10,13 ****
--- 10,14 ----
   include("address_tools.p3");
   include("mailbox.pinc");
+  include("product.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 184,191 ****
     $a->read_locs_data();
   } else {
!    $msg = $msg . sprintf($lang['Err0040'],$lang[$a->getType()]);
   }
   if ( ! $a->see_ok() ) {
!    $msg = $msg . sprintf($lang['Err0022'],$lang[$a->getType()]);
     $format = "";
   }
--- 185,192 ----
     $a->read_locs_data();
   } else {
!    $msg .= sprintf($lang['Err0040'],$lang[$a->getType()]);
   }
   if ( ! $a->see_ok() ) {
!    $msg .= sprintf($lang['Err0022'],$lang[$a->getType()]);
     $format = "";
   }

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** appointment.pinc	2001/08/09 14:55:29	1.42
--- appointment.pinc	2001/08/11 19:11:25	1.43
***************
*** 509,512 ****
--- 509,513 ----
     */
    function delete() {
+     $msg = "";
      @DB_Begin($this->conn,"WORK");
      @DB_Lock($this->conn,"calendar");
***************
*** 519,532 ****
      $r = @DB_Exec($this->conn,$q);
  
!     $q = "DELETE FROM notes WHERE link_id = ". $this->id;
!     $r = @DB_Exec($this->conn,$q);
! 
!     $q = "DELETE FROM res_use WHERE obj_id = ". $this->id;
!     $r = @DB_Exec($this->conn,$q);
  
!     acl_delete_obj($this);
  
      @DB_Commit($this->conn,"WORK");
!     DB_FreeResult ($r);
    }
    /* ---------------------------------------------------------------------------
--- 520,537 ----
      $r = @DB_Exec($this->conn,$q);
  
!     $msg .= resource_delete_obj($this);
!     $msg .= note_delete_obj($this);
!     $msg .= url_delete_obj($this);
!     $msg .= history_delete($this);
!     $msg .= watchlist_delete($this);
!     $msg .= acl_delete_obj($this);
  
!     $this->modified[] = array ( "field" => "Delete" , "old" => $this->getType() , "new" => -1 );
!     $msg .= history_save($this);
  
      @DB_Commit($this->conn,"WORK");
!     #DB_FreeResult ($r);
! 
!     return $msg;
    }
    /* ---------------------------------------------------------------------------

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** bug.pinc	2001/08/09 10:32:03	1.33
--- bug.pinc	2001/08/11 19:11:25	1.34
***************
*** 80,105 ****
    @reset($lang['BugStates']);
    while ( list ($i,$f) = @each ($lang['BugStates']) ) {
!     $r = $r ."<OPTION value=". $i ." ";
      if ( $i == $default ) {
!       $r = $r ." SELECTED ";
      }
!     $r = $r .">$f</OPTION>\n";
    }
    if ( $any > 0 ) {
!     $r = $r ."<OPTION value=-1";
      if ( -1 == $default ) {
!       $r = $r ." SELECTED ";
      }
!     $r = $r .">". $lang['any'] ."</OPTION>";
    }
    # Any but not closed
    if ( $any == 2 ) {
!     $r = $r ."<OPTION value=-2";
      if ( -2 == $default ) {
!       $r = $r ." SELECTED ";
      }
!     $r = $r .">". $lang['BugAnyButClosed'] ."</OPTION>";
    }
!   $r = "$r\n</SELECT>";
    return $r;
  }
--- 80,105 ----
    @reset($lang['BugStates']);
    while ( list ($i,$f) = @each ($lang['BugStates']) ) {
!     $r .= "<OPTION value=". $i ." ";
      if ( $i == $default ) {
!       $r .= " SELECTED ";
      }
!     $r .= ">". $f ."</OPTION>\n";
    }
    if ( $any > 0 ) {
!     $r .= "<OPTION value=-1";
      if ( -1 == $default ) {
!       $r .= " SELECTED ";
      }
!     $r .= ">". $lang['any'] ."</OPTION>";
    }
    # Any but not closed
    if ( $any == 2 ) {
!     $r .= "<OPTION value=-2";
      if ( -2 == $default ) {
!       $r .= " SELECTED ";
      }
!     $r .= ">". $lang['BugAnyButClosed'] ."</OPTION>";
    }
!   $r .= "\n</SELECT>";
    return $r;
  }
***************
*** 112,129 ****
    @reset($lang['BugClasses']);
    while ( list ($i,$f) = @each ($lang['BugClasses']) ) {
!     $r = $r ."<OPTION value=". $i ." ";
      if ( $i == $default ) {
!       $r = $r ." SELECTED ";
      }
!     $r = "$r >$f</OPTION>\n";
    }
    if ( $any == 1 ) {
!     $r = $r ."<OPTION value=-1";
      if ( -1 == $default ) {
!       $r = $r ." SELECTED ";
      }
!     $r = $r .">". $lang['any'] ."</OPTION>";
    }
!   $r = "$r\n</SELECT>";
    return $r;
  }
--- 112,129 ----
    @reset($lang['BugClasses']);
    while ( list ($i,$f) = @each ($lang['BugClasses']) ) {
!     $r .= "<OPTION value=". $i ." ";
      if ( $i == $default ) {
!       $r .= " SELECTED ";
      }
!     $r .= ">". $f ."</OPTION>\n";
    }
    if ( $any == 1 ) {
!     $r .= "<OPTION value=-1";
      if ( -1 == $default ) {
!       $r .= " SELECTED ";
      }
!     $r .= ">". $lang['any'] ."</OPTION>";
    }
!   $r .= "\n</SELECT>";
    return $r;
  }
***************
*** 165,168 ****
--- 165,173 ----
      $this->short       = StripSlashes(DB_Result($result, $pos, "short"));
      $this->parent      = getObject(DB_result($result, $pos, "product_id"));
+ 
+ 	if ( $this->parent == -1 ) {
+ 		echo MIST;
+ 		exit;
+ 	}
      $this->class       = DB_Result($result, $pos, "class");
      $this->state       = DB_Result($result, $pos, "state");
***************
*** 562,583 ****
        if ( $this->parent->getType() == "product" ) {
          # Set the permissions
! 	if ( isset($this->parent->role[1]) && is_array($this->parent->role[1]) ) {
! 	  @reset ($this->parent->role[1]) ;
! 	  while ( list ($i,$o) = @each ($this->parent->role[1]) ) {
! 	    acl_raise($this,$o->id,$tutos[modok]);
! 	  }
! 	}
! 	if ( isset($this->parent->role[3]) && is_array($this->parent->role[3]) ) {
! 	  @reset ($this->parent->role[3]) ;
! 	  while ( list ($i,$o) = @each ($this->parent->role[3]) ) {
! 	    acl_raise($this,$o->id,$tutos[modok]);
! 	  }
! 	}
! 	if ( isset($this->parent->role[4]) && is_array($this->parent->role[4]) ) {
! 	  @reset ($this->parent->role[4]) ;
! 	  while ( list ($i,$o) = @each ($this->parent->role[4]) ) {
! 	    acl_raise($this,$o->id,$tutos[modok]);
! 	  }
! 	}
        }
  
--- 567,588 ----
        if ( $this->parent->getType() == "product" ) {
          # Set the permissions
!         if ( isset($this->parent->role[1]) && is_array($this->parent->role[1]) ) {
!           @reset ($this->parent->role[1]) ;
!           while ( list ($i,$o) = @each ($this->parent->role[1]) ) {
!             acl_raise($this,$o->id,$tutos[modok]);
!           }
!         }
!         if ( isset($this->parent->role[3]) && is_array($this->parent->role[3]) ) {
!           @reset ($this->parent->role[3]) ;
!           while ( list ($i,$o) = @each ($this->parent->role[3]) ) {
!             acl_raise($this,$o->id,$tutos[modok]);
!           }
!         }
!         if ( isset($this->parent->role[4]) && is_array($this->parent->role[4]) ) {
!           @reset ($this->parent->role[4]) ;
!           while ( list ($i,$o) = @each ($this->parent->role[4]) ) {
!             acl_raise($this,$o->id,$tutos[modok]);
!           }
!         }
        }
  
***************
*** 589,609 ****
        # Prepare the mail
        if ( isset($this->parent->role[1]) && is_array($this->parent->role[1]) ) {
! 	@reset ($this->parent->role[1]) ;
! 	while ( list ($i,$o) = @each ($this->parent->role[1]) ) {
! 	  $ml[$o->id] = $o;
! 	}
        }
        if ( isset($this->parent->role[3]) && is_array($this->parent->role[3]) ) {
! 	@reset ($this->parent->role[3]) ;
! 	while ( list ($i,$o) = @each ($this->parent->role[3]) ) {
! 	  $ml[$o->id] = $o;
! 	}
        }
        # The developers
        if ( isset($this->parent->role[5]) && is_array($this->parent->role[5]) ) {
! 	@reset ($this->parent->role[5]) ;
! 	while ( list ($i,$o) = @each ($this->parent->role[5]) ) {
! 	  $ml[$o->id] = $o;
! 	}
        }
      }
--- 594,614 ----
        # Prepare the mail
        if ( isset($this->parent->role[1]) && is_array($this->parent->role[1]) ) {
!         @reset ($this->parent->role[1]) ;
!         while ( list ($i,$o) = @each ($this->parent->role[1]) ) {
!           $ml[$o->id] = $o;
!         }
        }
        if ( isset($this->parent->role[3]) && is_array($this->parent->role[3]) ) {
!         @reset ($this->parent->role[3]) ;
!         while ( list ($i,$o) = @each ($this->parent->role[3]) ) {
!           $ml[$o->id] = $o;
!         }
        }
        # The developers
        if ( isset($this->parent->role[5]) && is_array($this->parent->role[5]) ) {
!         @reset ($this->parent->role[5]) ;
!         while ( list ($i,$o) = @each ($this->parent->role[5]) ) {
!           $ml[$o->id] = $o;
!         }
        }
      }
***************
*** 619,644 ****
  
        if ( $f->getType() == "address" ) {
! 	$u = new tutos_user($this->conn);
! 	$u->read($f->id);
! 	$mailtxt = $bugmailtxt . $u->lang;
        } else if ( $f->getType() == "user" ) {
! 	$mailtxt = $bugmailtxt . $f->lang;
        } else {
! 	$mailtxt = $bugmailtxt . $current_user->lang;
        }
        if ( ! file_exists($mailtxt) ) {
! 	$mailtxt = $bugmailtxt . "en";
        }
        if ( ! file_exists($mailtxt) ) {
! 	$msg = $msg . sprintf($lang['Err0037'],$mail->subject,$mailtxt) ."<BR>\n";
! 	continue;
        }
        if ( count($this->modified) > 0 ) {
! 	$body = join ('', file ($mailtxt));
! 	$this->make_mail_body($body,$f);
  
! 	$mail->addBody($body,"text/plain",$lang['BugsDetail']);
! 	$mail->addBody("<PRE>". $this->description ."</PRE>","text/html" , $lang['BugHistory']);
! 	$msg = $msg. $mail->send();
        }
      }
--- 624,649 ----
  
        if ( $f->getType() == "address" ) {
!         $u = new tutos_user($this->conn);
!         $u->read($f->id);
!         $mailtxt = $bugmailtxt . $u->lang;
        } else if ( $f->getType() == "user" ) {
!         $mailtxt = $bugmailtxt . $f->lang;
        } else {
!         $mailtxt = $bugmailtxt . $current_user->lang;
        }
        if ( ! file_exists($mailtxt) ) {
!         $mailtxt = $bugmailtxt . "en";
        }
        if ( ! file_exists($mailtxt) ) {
!         $msg .= sprintf($lang['Err0037'],$mail->subject,$mailtxt) ."<BR>\n";
!         continue;
        }
        if ( count($this->modified) > 0 ) {
!         $body = join ('', file ($mailtxt));
!         $this->make_mail_body($body,$f);
  
!         $mail->addBody($body,"text/plain",$lang['BugsDetail']);
!         $mail->addBody("<PRE>". $this->description ."</PRE>","text/html" , $lang['BugHistory']);
!         $msg .= $mail->send();
        }
      }
***************
*** 647,652 ****
      @DB_Begin($this->conn,"WORK");
      $r = @DB_Exec($this->conn,$q);
!     acl_save($this);
!     $msg = $msg . history_save($this);
      @DB_Commit($this->conn,"WORK");
      # DB_FreeResult ($r);
--- 652,657 ----
      @DB_Begin($this->conn,"WORK");
      $r = @DB_Exec($this->conn,$q);
!     $msg .= acl_save($this);
!     $msg .= history_save($this);
      @DB_Commit($this->conn,"WORK");
      # DB_FreeResult ($r);
***************
*** 669,678 ****
      $r = @DB_Exec($this->conn,$q);
  
-     $q = "DELETE FROM notes WHERE link_id = $this->id";
-     $r = @DB_Exec($this->conn,$q);
- 
-     $q = "DELETE FROM timetrack WHERE link_id = ". $this->id;
-     $r = @DB_Exec($this->conn,$q);
- 
      $q = "DELETE FROM bugremember WHERE id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
--- 674,677 ----
***************
*** 680,690 ****
      $q = "DELETE FROM bugs WHERE id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
  
!     acl_delete_obj($this);
!     history_delete($this);
!     watchlist_delete($this);
  
      @DB_Commit($this->conn,"WORK");
!     DB_FreeResult ($r);
  
      return $msg;
--- 679,694 ----
      $q = "DELETE FROM bugs WHERE id = ". $this->id;
      $r = @DB_Exec($this->conn,$q);
+ 
+     $msg .= timetrack_delete_obj($this);
+     $msg .= note_delete_obj($this);
+     $msg .= history_delete($this);
+     $msg .= watchlist_delete($this);
+     $msg .= acl_delete_obj($this);
  
!     $this->modified[] = array ( "field" => "Delete" , "old" => $this->getType() , "new" => -1 );
!     $msg .= history_save($this);
  
      @DB_Commit($this->conn,"WORK");
!     # DB_FreeResult ($r);
  
      return $msg;
***************
*** 695,698 ****
--- 699,718 ----
    function getFullName() {
      return sprintf("#%06d", $this->id);
+   }
+   /* ---------------------------------------------------------------------------
+    * get all data as text
+    */
+   function getTextDump() {
+     global $lang;
+     $msg = "";
+     $msg .= "\n". $lang['Bug']          .":  ". $this->getFullName();
+     $msg .= "\n". $lang['BugShort']     .":  ". $this->short;
+     $msg .= "\n". $lang['BugLong']      .":  ". $this->description;
+     $msg .= "\n". $lang['BugState']     .":  ". $lang['BugStates'][$this->state];
+     $msg .= "\n". $lang['BugClass']     .":  ". $lang['BugClasses'][$this->class];
+     $msg .= "\n". $lang['BugAssignedTo'].":  ". $this->solver->getFullName();
+     $msg .= "\n". $lang['createdby']    .":  ". $this->creator->getFullName();
+     $msg .= "\n". $lang['atDateTime']   .":  ". $this->creation->getDatetime();
+     return $msg;
    }
    /* ---------------------------------------------------------------------------

Index: bug_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_del.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bug_del.php	2001/08/09 10:32:03	1.3
--- bug_del.php	2001/08/11 19:11:25	1.4
***************
*** 6,11 ****
   include("webelements.p3");
   include("permission.p3");
!  include("history.pinc");
   include("bug.pinc");
  
   /* Check if user is allowed to use it */
--- 6,15 ----
   include("webelements.p3");
   include("permission.p3");
!  include("note.pinc");
   include("bug.pinc");
+  include("product.pinc");
+  include("task.pinc");
+  include("installation.pinc");
+  include("timetrack.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 18,32 ****
  
   if ( !isset($id) ) {
!    $msg = $msg . sprintf($lang['Err0040'],$lang[$b->getType()]);
   } else {
     $b->read($id);
!    $gotourl = $b->product->getUrl();
   }
   if ( ! $b->del_ok() ) {
!    $msg = sprintf($lang['Err0023'],$lang[$b->getType()]);
     $gotourl = $b->getUrl();
   }
   if ($msg == "") {
!    $msg = $b->delete();
   }
   $gotourl = addUrlParameter($gotourl,"msg=". UrlEncode($msg));
--- 22,36 ----
  
   if ( !isset($id) ) {
!    $msg .= sprintf($lang['Err0040'],$lang[$b->getType()]);
   } else {
     $b->read($id);
!    $gotourl = $b->parent->getUrl();
   }
   if ( ! $b->del_ok() ) {
!    $msg .= sprintf($lang['Err0023'],$lang[$b->getType()]);
     $gotourl = $b->getUrl();
   }
   if ($msg == "") {
!    $msg .= $b->delete();
   }
   $gotourl = addUrlParameter($gotourl,"msg=". UrlEncode($msg));

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_ins.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** bug_ins.php	2001/08/09 10:32:03	1.5
--- bug_ins.php	2001/08/11 19:11:25	1.6
***************
*** 8,18 ****
   include("appointment.pinc");
   include("location.pinc");
-  include("history.pinc");
   include("bug.pinc");
-  include("mail.pinc");
   include("product.pinc");
   include("task.pinc");
   include("installation.pinc");
  
   /* Check if user is allowed to use it */
   check_user();
--- 8,17 ----
   include("appointment.pinc");
   include("location.pinc");
   include("bug.pinc");
   include("product.pinc");
   include("task.pinc");
   include("installation.pinc");
  
+ 
   /* Check if user is allowed to use it */
   check_user();
***************
*** 28,37 ****
  
   if ( empty($description) || !isset($description) ) {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['BugAdditional']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"description=". UrlEncode($description));
   }
   if ( empty($short) || !isset($short) ) {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['BugShort']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"short=". UrlEncode($short));
--- 27,36 ----
  
   if ( empty($description) || !isset($description) ) {
!    $msg .= sprintf($lang['Err0009'],$lang['BugAdditional']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"description=". UrlEncode($description));
   }
   if ( empty($short) || !isset($short) ) {
!    $msg .= sprintf($lang['Err0009'],$lang['BugShort']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"short=". UrlEncode($short));
***************
*** 42,55 ****
     $b->parent = getObject($pid);
   } else {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['Product']) ."<BR>";
   }
  
   if ( empty($state) || !isset($state) ) {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['BugState']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"state=". $state);
   }
   if ( empty($class) || !isset($class) ) {
!    $msg = $msg . sprintf($lang['Err0009'],$lang['BugClass']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"class=". $class);
--- 41,54 ----
     $b->parent = getObject($pid);
   } else {
!    $msg .= sprintf($lang['Err0009'],$lang['Product']) ."<BR>";
   }
  
   if ( empty($state) || !isset($state) ) {
!    $msg .= sprintf($lang['Err0009'],$lang['BugState']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"state=". $state);
   }
   if ( empty($class) || !isset($class) ) {
!    $msg .= sprintf($lang['Err0009'],$lang['BugClass']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"class=". $class);
***************
*** 137,141 ****
   }
  
!  $msg = $b->save();
  
  
--- 136,140 ----
   }
  
!  $msg .= $b->save();
  
  

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_new.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** bug_new.php	2001/08/09 10:32:03	1.11
--- bug_new.php	2001/08/11 19:11:25	1.12
***************
*** 138,142 ****
    */
   Function navigate($b) {
!    global $tutos,$lang;
  
     echo "<TABLE>";
--- 138,142 ----
    */
   Function navigate($b) {
!    global $tutos,$lang,$current_user;
  
     echo "<TABLE>";
***************
*** 149,153 ****
       }
       echo "<BR>\n";
!      echo makelink("watchlist_overview.php?id=".$b->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$b->getFullname())) ."<BR>\n";
     }
     echo "&nbsp;\n";
--- 149,155 ----
       }
       echo "<BR>\n";
!      if ( $tutos[usewatchlist] == 1 )  {
!        echo makelink("watchlist_overview.php?id=".$b->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$b->getFullname())) ."<BR>\n";
! 	 }
     }
     echo "&nbsp;\n";
***************
*** 204,208 ****
  
   if ( ! $b->mod_ok() ) {
!    $msg = $msg . sprintf($lang['Err0024'],$lang[$b->getType()]);
   }
  
--- 206,210 ----
  
   if ( ! $b->mod_ok() ) {
!    $msg .= sprintf($lang['Err0024'],$lang[$b->getType()]);
   }
  

Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_show.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** bug_show.php	2001/08/09 10:32:03	1.10
--- bug_show.php	2001/08/11 19:11:25	1.11
***************
*** 5,12 ****
   include("webelements.p3");
   include("permission.p3");
   include("note.pinc");
   include("file.pinc");
   include("timetrack.pinc");
-  include("history.pinc");
  
   /* Check if user is allowed to use it */
--- 5,15 ----
   include("webelements.p3");
   include("permission.p3");
+  include("bug.pinc");
+  include("product.pinc");
+  include("installation.pinc");
+  include("task.pinc");
   include("note.pinc");
   include("file.pinc");
   include("timetrack.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 160,167 ****
  
   if ( ! $b->see_ok() ) {
!    $msg = $msg . sprintf($lang['Err0022'],$lang[$b->getType()]);
   } else {
     if ( $b->id < 0 ) {
!      $msg = $msg . sprintf($lang['Err0040'],$lang[$b->getType()]);
     }
   }
--- 163,170 ----
  
   if ( ! $b->see_ok() ) {
!    $msg .= sprintf($lang['Err0022'],$lang[$b->getType()]);
   } else {
     if ( $b->id < 0 ) {
!      $msg .= sprintf($lang['Err0040'],$lang[$b->getType()]);
     }
   }

Index: calendar_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_del.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** calendar_del.php	2001/02/14 20:57:05	1.3
--- calendar_del.php	2001/08/11 19:11:25	1.4
***************
*** 8,11 ****
--- 8,14 ----
   include("appointment.pinc");
   include("product.pinc");
+  include("note.pinc");
+  include("resource.pinc");
+  include("url.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 15,19 ****
  
   if ( !isset($id) ) {
!    $msg = $msg . sprintf($lang['Err0040'],$lang[$a->getType()]) ."<BR>";
   } else {
     $a->read($id);
--- 18,22 ----
  
   if ( !isset($id) ) {
!    $msg .= sprintf($lang['Err0040'],$lang[$a->getType()]) ."<BR>";
   } else {
     $a->read($id);
***************
*** 23,27 ****
   /* Check for existance and rights */
   if ( ! $a->del_ok() ) {
!    $msg = $msg . sprintf($lang['Err0023'],$lang[$a->getType()]) ."<BR>";
     if ( $a->repeat != 0 ) {
       $gotourl = "calendar_new_r.php?id=".$id."&msg=". urlencode($msg);
--- 26,30 ----
   /* Check for existance and rights */
   if ( ! $a->del_ok() ) {
!    $msg .= sprintf($lang['Err0023'],$lang[$a->getType()]) ."<BR>";
     if ( $a->repeat != 0 ) {
       $gotourl = "calendar_new_r.php?id=".$id."&msg=". urlencode($msg);
***************
*** 31,37 ****
   }
  
!    if ( $msg == "" ) {
     $gotourl = "calendar.php?t=". $a->start->getYYYYMMDD();
!    $a->delete();
   }
   $gotourl = addSessionKey($gotourl);
--- 34,40 ----
   }
  
!  if ( $msg == "" ) {
     $gotourl = "calendar.php?t=". $a->start->getYYYYMMDD();
!    $msg .= $a->delete();
   }
   $gotourl = addSessionKey($gotourl);

Index: calendar_do_vote.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_do_vote.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** calendar_do_vote.php	2001/02/17 17:04:26	1.4
--- calendar_do_vote.php	2001/08/11 19:11:25	1.5
***************
*** 13,17 ****
   $msg = "";
   if ( ! isset($id) ) {
!    $msg = $msg ."Missing Appointment ID<BR>";
     $gotourl = $HTTP_REFERER;
   } else {
--- 13,17 ----
   $msg = "";
   if ( ! isset($id) ) {
!    $msg .= "Missing Appointment ID<BR>";
     $gotourl = $HTTP_REFERER;
   } else {
***************
*** 20,32 ****
   }
   if ( ! isset($adr_id) ) {
!    $msg = $msg ."Missing User ID<BR>";
   }
   if ( ! isset($vote) ) {
!    $msg = $msg ."Missing Vote<BR>";
   }
  
   if ( $msg == "" ) {
!    $query = "UPDATE participants SET state = ". $vote ." WHERE app_id = ". $id ." AND adr_id = ". $adr_id;
!    $result = @DB_Exec($conn,$query);
   }
   $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
--- 20,32 ----
   }
   if ( ! isset($adr_id) ) {
!    $msg .= "Missing User ID<BR>";
   }
   if ( ! isset($vote) ) {
!    $msg .= "Missing Vote<BR>";
   }
  
   if ( $msg == "" ) {
!    $q = "UPDATE participants SET state = ". $vote ." WHERE app_id = ". $id ." AND adr_id = ". $adr_id;
!    $r = @DB_Exec($conn,$q);
   }
   $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));

Index: calendar_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_ins.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** calendar_ins.php	2001/08/09 10:32:03	1.9
--- calendar_ins.php	2001/08/11 19:11:25	1.10
***************
*** 7,11 ****
   include("appointment.pinc");
   include("product.pinc");
-  include("mail.pinc");
   include("resource.pinc");
  
--- 7,10 ----
***************
*** 51,55 ****
   $a->start->setDateTimeF("start");
   if ( 1 != $a->start->checkDMY() ) {
!    $msg = $msg . sprintf($lang['Err0038'],$lang['StartDate']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"start=".$a->start->getYYYYMMDDHHMM() );
--- 50,54 ----
   $a->start->setDateTimeF("start");
   if ( 1 != $a->start->checkDMY() ) {
!    $msg .= sprintf($lang['Err0038'],$lang['StartDate']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"start=".$a->start->getYYYYMMDDHHMM() );
***************
*** 58,62 ****
   $a->end->setDateTimeF("end");
   if ( 1 != $a->end->checkDMY() ) {
!    $msg = $msg . sprintf($lang['Err0038'],$lang['EndDate']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"end=".$a->end->getYYYYMMDDHHMM() );
--- 57,61 ----
   $a->end->setDateTimeF("end");
   if ( 1 != $a->end->checkDMY() ) {
!    $msg .= sprintf($lang['Err0038'],$lang['EndDate']) ."<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"end=".$a->end->getYYYYMMDDHHMM() );
***************
*** 68,77 ****
   if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) {
     # Start after End
!    $msg = $msg . $lang['Err0002'] ."<BR>";
   }
  
   if ( !isset($people) || (count($people) < 1)) {
     # No Participants
!    $msg = $msg . $lang['Err0001'] ."<BR>";
   } else {
     $cnt = 0;
--- 67,76 ----
   if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) {
     # Start after End
!    $msg .= $lang['Err0002'] ."<BR>";
   }
  
   if ( !isset($people) || (count($people) < 1)) {
     # No Participants
!    $msg .= $lang['Err0001'] ."<BR>";
   } else {
     $cnt = 0;
***************
*** 84,92 ****
     }
     if ( $cnt == 0 ) {
!      $msg = $msg . $lang['Err0001'] ."<BR>";
     }
   }
   if ( !isset($mod_allow) ) {
!    $msg = $msg ."Missing mod_allow<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"mod_allow=".$mod_allow );
--- 83,91 ----
     }
     if ( $cnt == 0 ) {
!      $msg .= $lang['Err0001'] ."<BR>";
     }
   }
   if ( !isset($mod_allow) ) {
!    $msg .= "Missing mod_allow<BR>";
   } else {
     $gotourl= addUrlParameter($gotourl,"mod_allow=".$mod_allow );
***************
*** 95,99 ****
  
   if ( !isset($creator) ) {
!    $msg = $msg ."Missing creator<BR>";
   }
   #
--- 94,98 ----
  
   if ( !isset($creator) ) {
!    $msg .= "Missing creator<BR>";
   }
   #
***************
*** 152,156 ****
   #
   if ( !isset($descr) || empty($descr) ) {
!    $msg = $msg . $lang['Err0003'] ."<BR>";
   } else {
     $gotourl="$gotourl&descr=". UrlEncode($descr);
--- 151,155 ----
   #
   if ( !isset($descr) || empty($descr) ) {
!    $msg .= $lang['Err0003'] ."<BR>";
   } else {
     $gotourl="$gotourl&descr=". UrlEncode($descr);
***************
*** 220,224 ****
     }
  
!    $msg = $a->save();
  
     /* Go back to calendar */
--- 219,223 ----
     }
  
!    $msg .= $a->save();
  
     /* Go back to calendar */

Index: calendar_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_new.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** calendar_new.php	2001/08/09 10:32:03	1.18
--- calendar_new.php	2001/08/11 19:11:25	1.19
***************
*** 372,377 ****
  
   if (  ! $a->mod_ok() ) {
!    $msg = $msg . sprintf($lang['Err0024'],$lang[$a->getType()]);
!    $msg = $msg . "<BR>". $a->creator->id ." ". $current_user->id ." ". $a->mod_ok();
   }
   HTML_Base1();
--- 372,377 ----
  
   if (  ! $a->mod_ok() ) {
!    $msg .= sprintf($lang['Err0024'],$lang[$a->getType()]);
!    $msg .= "<BR>". $a->creator->id ." ". $current_user->id ." ". $a->mod_ok();
   }
   HTML_Base1();

Index: calendar_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_new_r.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** calendar_new_r.php	2001/08/09 10:32:03	1.13
--- calendar_new_r.php	2001/08/11 19:11:25	1.14
***************
*** 9,12 ****
--- 9,13 ----
   include("appointment.pinc");
   include("product.pinc");
+  include("resource.pinc");
  
  
***************
*** 346,350 ****
  
   if ( ! $a->mod_ok() ) {
!    $msg = $msg . sprintf($lang['Err0024'],$lang[$a->getType()]);
   }
   HTML_Base1();
--- 347,351 ----
  
   if ( ! $a->mod_ok() ) {
!    $msg .= sprintf($lang['Err0024'],$lang[$a->getType()]);
   }
   HTML_Base1();

Index: calendar_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_show.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** calendar_show.php	2001/08/09 10:32:03	1.10
--- calendar_show.php	2001/08/11 19:11:25	1.11
***************
*** 224,231 ****
   }
   if ( ! $a->see_ok() ) {
!    $msg = $msg . sprintf($lang['Err0022'],$lang[$a->getType()]);
   } else {
     if ( $a->id < 0 ) {
!      $msg = $msg . sprintf($lang['Err0040'],$lang[$a->getType()]);
     }
   }
--- 224,231 ----
   }
   if ( ! $a->see_ok() ) {
!    $msg .= sprintf($lang['Err0022'],$lang[$a->getType()]);
   } else {
     if ( $a->id < 0 ) {
!      $msg .= sprintf($lang['Err0040'],$lang[$a->getType()]);
     }
   }

Index: check.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/check.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** check.php	2001/08/09 10:53:08	1.10
--- check.php	2001/08/11 19:11:25	1.11
***************
*** 84,88 ****
  	   $m->addBody($app->creator->getIcard(),"text/x-vcard",sprintf($lang['MailCard'], $app->creator->getFullName()) );
       }
!      $msg = $msg . $m->send();
       $m->resetBody();
       $m->resetTo();
--- 84,88 ----
  	   $m->addBody($app->creator->getIcard(),"text/x-vcard",sprintf($lang['MailCard'], $app->creator->getFullName()) );
       }
!      $msg .= $m->send();
       $m->resetBody();
       $m->resetTo();
***************
*** 156,160 ****
  	 }
  	 if ( ! file_exists($mailtxt) ) {
! 	   $msg = $msg . sprintf($lang['Err0037'],$m->subject,$mailtxt) ."<BR>\n";
  	   continue;
  	 }
--- 156,160 ----
  	 }
  	 if ( ! file_exists($mailtxt) ) {
! 	   $msg .= sprintf($lang['Err0037'],$m->subject,$mailtxt) ."<BR>\n";
  	   continue;
  	 }
***************
*** 165,169 ****
  	 $m->addBody($body,"text/plain",$lang['BugsDetail']);
  	 $m->addBody("<PRE>". $b->description ."</PRE>","text/html" , $lang['BugHistory']);
! 	 $msg = $msg. $m->send();
         }
       } else {
--- 165,169 ----
  	 $m->addBody($body,"text/plain",$lang['BugsDetail']);
  	 $m->addBody("<PRE>". $b->description ."</PRE>","text/html" , $lang['BugHistory']);
! 	 $msg .= $m->send();
         }
       } else {
***************
*** 206,210 ****
     }
     if ( ! file_exists($mailtxt) ) {
!      $msg = $msg . sprintf($lang['Err0037'],$m->subject,$mailtxt) ."<BR>\n";
       continue;
     }
--- 206,210 ----
     }
     if ( ! file_exists($mailtxt) ) {
!      $msg .= sprintf($lang['Err0037'],$m->subject,$mailtxt) ."<BR>\n";
       continue;
     }
***************
*** 217,221 ****
     $m->addBody($x->note,"text/plain",$lang['NoteDescription']);
  
!    $msg = $msg. $m->send();
  
     $x->remember = new DateTime(0);
--- 217,221 ----
     $m->addBody($x->note,"text/plain",$lang['NoteDescription']);
  
!    $msg .= $m->send();
  
     $x->remember = new DateTime(0);

Index: company.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** company.pinc	2001/08/09 10:32:03	1.20
--- company.pinc	2001/08/11 19:11:25	1.21
***************
*** 129,132 ****
--- 129,134 ----
      if ($this->id == -1) return;
  
+ 	$this->departments = array();
+ 
      $q = "SELECT * FROM departments WHERE c_id = ". $this->id ." ORDER BY name";
      $r = @DB_Exec($this->conn,$q);
***************
*** 213,218 ****
--- 215,228 ----
      $msg = "";
      $this->read_locs();
+     $this->read_departments();
  
      @DB_Begin($this->conn,"WORK");
+ 
+     @reset($this->departments);
+     if ( count($this->departments) > 0 ) {
+       while( list ($i,$f) = @each ($this->departments)) {
+         $msg .= $f->delete();
+       }
+ 	}
      @DB_Lock($this->conn,"companies");
      @DB_Lock($this->conn,"location");
***************
*** 220,232 ****
  
      $r = @DB_Exec($this->conn,"DELETE from companies WHERE id =" .$this->id);
-     $r = @DB_Exec($this->conn,"DELETE from departments WHERE c_id =" .$this->id);
      $r = @DB_Exec($this->conn,"UPDATE location SET c_id = null, d_id=null WHERE c_id =" .$this->id);
  
-     $q = "DELETE FROM urls WHERE link_id = ". $this->id;
-     $r = @DB_Exec($this->conn,$q);
- 
-     $q = "DELETE FROM notes WHERE link_id = ". $this->id;
-     $r = @DB_Exec($this->conn,$q);
- 
      @reset($this->loc);
      while( list ($i,$f) = @each ($this->loc)) {
--- 230,235 ----
***************
*** 237,244 ****
      }
  
!     acl_delete_obj($this);
  
      @DB_Commit($this->conn,"WORK");
!     DB_FreeResult ($r);
      return $msg;
    }
--- 240,254 ----
      }
  
!     $msg .= note_delete_obj($this);
!     $msg .= url_delete_obj($this);
!     $msg .= history_delete($this);
!     $msg .= watchlist_delete($this);
!     $msg .= acl_delete_obj($this);
  
+     $this->modified[] = array ( "field" => "Delete" , "old" => $this->gettype() , "new" => -1 );
+     $msg .= history_save($this);
+ 
      @DB_Commit($this->conn,"WORK");
!     #DB_FreeResult ($r);
      return $msg;
    }

Index: company_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_del.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** company_del.php	2001/02/14 20:57:05	1.3
--- company_del.php	2001/08/11 19:11:25	1.4
***************
*** 6,9 ****
--- 6,11 ----
   include("webelements.p3");
   include("permission.p3");
+  include("note.pinc");
+  include("url.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 14,18 ****
  
   if ( !isset($id) ) {
!    $msg = $msg . "Could not delete company <BR>";
   } else {
     $c->read($id);
--- 16,20 ----
  
   if ( !isset($id) ) {
!    $msg .= "Could not delete company <BR>";
   } else {
     $c->read($id);

Index: company_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_show.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** company_show.php	2001/08/09 10:32:03	1.10
--- company_show.php	2001/08/11 19:11:25	1.11
***************
*** 9,12 ****
--- 9,14 ----
   include("installation.pinc");
   include("address_tools.p3");
+  include("appointment.pinc");
+  include("product.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 41,57 ****
     $c->read_departments();
     $cnt = 0;
!    if (isset($c->departments) ) {
!      @reset($c->departments);
!      if ( count($c->departments) > 0 ) {
!        echo "<TR>\n";
!        showfield($lang['Departments']);
!        echo " <TD ALIGN=top COLSPAN=". ($cols - 1) .">\n";
!        while( list ($i,$f) = @each ($c->departments)) {
! 	 echo "  ". $f->getLink() ."<BR>\n";
! 	 $cnt++;
!        }
!        echo " </TD>\n";
!        echo "</TR>\n";
       }
     }
  
--- 43,57 ----
     $c->read_departments();
     $cnt = 0;
!    @reset($c->departments);
!    if ( count($c->departments) > 0 ) {
!      echo "<TR>\n";
!      showfield($lang['Departments']);
!      echo " <TD ALIGN=top COLSPAN=". ($cols - 1) .">\n";
!      while( list ($i,$f) = @each ($c->departments)) {
!        echo "  ". $f->getLink() ."<BR>\n";
!        $cnt++;
       }
+      echo " </TD>\n";
+      echo "</TR>\n";
     }
  

Index: config.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config.pinc,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** config.pinc	2001/08/09 10:32:03	1.58
--- config.pinc	2001/08/11 19:11:25	1.59
***************
*** 115,119 ****
  # 1 = yes
  #
! $tutos[bugdelete]  = 0;
  #
  # Set tutos[caltable] to 2 for complex calendar sheets
--- 115,119 ----
  # 1 = yes
  #
! $tutos[bugdelete]  = 1;
  #
  # Set tutos[caltable] to 2 for complex calendar sheets
***************
*** 339,343 ****
  # (this will fill the messages table and the file $tutos[errlog])
  #
! $tutos[debug]=0;
  #
  # Where to put the output
--- 339,343 ----
  # (this will fill the messages table and the file $tutos[errlog])
  #
! $tutos[debug]=1;
  #
  # Where to put the output

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** db.p3	2001/08/09 10:32:03	1.37
--- db.p3	2001/08/11 19:11:25	1.38
***************
*** 301,304 ****
--- 301,305 ----
    global $dbtype;
  
+   $r = "";
    if ($conn == "") {
      return;

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** de.p3	2001/08/09 22:08:24	1.48
--- de.p3	2001/08/11 19:11:25	1.49
***************
*** 523,530 ****
  $lang['SearchForNoteExt']   = "extended Search for a note";
  $lang['NoteSelInfo']        = "(leave empty to see all notes)";
! $lang['NoteRefType']        = "Reference type";
! $lang['NoteRefName']        = "Reference name";
! $lang['NoteBetween']        = "created between";
! $lang['NotesOverview']      = "Note Overview";
  
  # Address
--- 523,530 ----
  $lang['SearchForNoteExt']   = "extended Search for a note";
  $lang['NoteSelInfo']        = "(leave empty to see all notes)";
! $lang['NoteRefType']        = "Referenz type";
! $lang['NoteRefName']        = "Referenz name";
! $lang['NoteBetween']        = "erzeugt zwischen";
! $lang['NotesOverview']      = "Notitz Übersicht";
  
  # Address
***************
*** 712,715 ****
--- 712,716 ----
  $lang['ResUsage']          = "Resourcen Nutzung";
  $lang['ResOverview']       = "Resourcen Übersicht";
+ $lang['ResDelI']           = "Resource %s löschen";
  
  # Admin Pages

Index: department.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** department.pinc	2001/08/09 10:32:03	1.19
--- department.pinc	2001/08/11 19:11:25	1.20
***************
*** 195,201 ****
--- 195,203 ----
      $r = @DB_Exec($this->conn,"UPDATE location SET d_id = null WHERE d_id =" .$this->id);
  
+ 	# Notes files urls are moved to company
      $r = @DB_Exec($this->conn,"UPDATE urls SET link_id = ". $this->company->id ." WHERE link_id =" .$this->id);
      $r = @DB_Exec($this->conn,"UPDATE notes SET link_id = ". $this->company->id ." WHERE link_id =" .$this->id);
      $r = @DB_Exec($this->conn,"UPDATE files SET link_id = ". $this->company->id ." WHERE link_id =" .$this->id);
+ 
      $r = @DB_Exec($this->conn,"DELETE FROM participants WHERE adr_id =" .$this->id);
  
***************
*** 207,215 ****
        $r = @DB_Exec($this->conn,$q1);
      }
  
!     acl_delete_obj($this);
  
      @DB_Commit($this->conn,"WORK");
!     DB_FreeResult ($r);
  	return $msg;
    }
--- 209,222 ----
        $r = @DB_Exec($this->conn,$q1);
      }
+ 
+     $msg .= history_delete($this);
+     $msg .= watchlist_delete($this);
+     $msg .= acl_delete_obj($this);
  
!     $this->modified[] = array ( "field" => "Delete" , "old" => $this->gettype() , "new" => -1 );
!     $msg .= history_save($this);
  
      @DB_Commit($this->conn,"WORK");
!     #DB_FreeResult ($r);
  	return $msg;
    }

Index: department_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_del.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** department_del.php	2001/02/14 20:57:05	1.3
--- department_del.php	2001/08/11 19:11:25	1.4
***************
*** 6,9 ****
--- 6,11 ----
   include("webelements.p3");
   include("permission.p3");
+  include("note.pinc");
+  include("url.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 14,18 ****
  
   if ( !isset($id) ) {
!    $msg = $msg . "Could not delete department <BR>";
   } else {
     $d->read($id);
--- 16,20 ----
  
   if ( !isset($id) ) {
!    $msg .= "Could not delete department <BR>";
   } else {
     $d->read($id);

Index: department_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_show.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** department_show.php	2001/08/09 10:32:03	1.7
--- department_show.php	2001/08/11 19:11:25	1.8
***************
*** 8,11 ****
--- 8,13 ----
   include("url.pinc");
   include("address_tools.p3");
+  include("appointment.pinc");
+  include("product.pinc");
  
   /* Check if user is allowed to use it */

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/en.p3,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** en.p3	2001/08/09 22:08:24	1.50
--- en.p3	2001/08/11 19:11:25	1.51
***************
*** 712,715 ****
--- 712,716 ----
  $lang['ResUsage']          = "Resource Usage";
  $lang['ResOverview']       = "Resource Overview";
+ $lang['ResDelI']           = "delete resource %s";
  
  # Admin Pages

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/es.p3,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** es.p3	2001/08/09 22:08:24	1.35
--- es.p3	2001/08/11 19:11:25	1.36
***************
*** 714,717 ****
--- 714,718 ----
  $lang['ResUsage']          = "Resource Usage";
  $lang['ResOverview']       = "Resource Overview";
+ $lang['ResDelI']           = "delete resource %s";
  
  # Admin Pages

Index: fax_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fax_ins.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fax_ins.php	2001/08/09 10:32:03	1.5
--- fax_ins.php	2001/08/11 19:11:25	1.6
***************
*** 7,12 ****
   include("permission.p3");
   include("note.pinc");
-  include("mail.pinc");
-  include("history.pinc");
  
   /* Check if user is allowed to use it */
--- 7,10 ----
***************
*** 18,22 ****
   /* Check Input */
   if ( empty($nr) ) {
!    $msg = $msg . $lang['Err0031'] ."<BR>\n";
   } else {
     $gotourl= addUrlParameter($gotourl,"nr=". UrlEncode($nr));
--- 16,20 ----
   /* Check Input */
   if ( empty($nr) ) {
!    $msg .= $lang['Err0031'] ."<BR>\n";
   } else {
     $gotourl= addUrlParameter($gotourl,"nr=". UrlEncode($nr));
***************
*** 37,41 ****
        || ($current_user->p[usefax] == 0)
        || ($tutos[demo] == 1) ) {
!    $msg = $msg . $lang['Err0032'] ."<BR>\n";
   }
  
--- 35,39 ----
        || ($current_user->p[usefax] == 0)
        || ($tutos[demo] == 1) ) {
!    $msg .= $lang['Err0032'] ."<BR>\n";
   }
  
***************
*** 44,57 ****
     if ( $tutos[faxmode] == 1 ) {
       $cmd = $tutos[faxspool];
!      $cmd = $cmd ." -h ../html/faxheader";
!      $cmd = $cmd ." -f gero";
!      $cmd = $cmd ." -F \"". $current_user->getFullName() ."\"";
!      $cmd = $cmd ." -D \"". $adr ."\"";
!      $cmd = $cmd ." ". $nr;
!      $cmd = $cmd ." - ";
       $fd = popen($cmd ,"w");
       fputs ($fd,$fax);
       pclose($fd);
!      $msg = $msg . sprintf($lang['FaxSpooledTo'], $nr) ."<BR>\n";
     } else if ( $tutos[faxmode] == 2 ) {
       $hdr = "";
--- 42,55 ----
     if ( $tutos[faxmode] == 1 ) {
       $cmd = $tutos[faxspool];
!      $cmd .= " -h ../html/faxheader";
!      $cmd .= " -f gero";
!      $cmd .= " -F \"". $current_user->getFullName() ."\"";
!      $cmd .= " -D \"". $adr ."\"";
!      $cmd .= " ". $nr;
!      $cmd .= " - ";
       $fd = popen($cmd ,"w");
       fputs ($fd,$fax);
       pclose($fd);
!      $msg .= sprintf($lang['FaxSpooledTo'], $nr) ."<BR>\n";
     } else if ( $tutos[faxmode] == 2 ) {
       $hdr = "";
***************
*** 62,77 ****
       $faxmail = eregi_replace("@NR@",$nr,$faxmail);
       $m->addTo($faxmail);
!      $hdr = $hdr ."Fax-No:  ". $nr  ."\n";
!      $hdr = $hdr ."Fax-To:  ". $adr ."\n";
!      $hdr = $hdr ."Fax-User: ". $tutos[faxmail_user] ."\n";
!      $hdr = $hdr ."Fax-Pass: ". $tutos[faxmail_pass] ."\n";
!      $hdr = $hdr ."\n";
       $f = $hdr . $fax ."\n--\n";
       $m->addBody($f);
!      $msg = $msg . $m->send();
!      $msg = $msg . sprintf($lang['FaxSpooledTo'], $faxmail) ."<BR>\n";
     }
   } else {
!    $msg = $msg . $lang['Err0030'] ."<BR>\n";
   }
  
--- 60,75 ----
       $faxmail = eregi_replace("@NR@",$nr,$faxmail);
       $m->addTo($faxmail);
!      $hdr .= "Fax-No:  ". $nr  ."\n";
!      $hdr .= "Fax-To:  ". $adr ."\n";
!      $hdr .= "Fax-User: ". $tutos[faxmail_user] ."\n";
!      $hdr .= "Fax-Pass: ". $tutos[faxmail_pass] ."\n";
!      $hdr .= "\n";
       $f = $hdr . $fax ."\n--\n";
       $m->addBody($f);
!      $msg .= $m->send();
!      $msg .= sprintf($lang['FaxSpooledTo'], $faxmail) ."<BR>\n";
     }
   } else {
!    $msg .= $lang['Err0030'] ."<BR>\n";
   }
  
***************
*** 83,88 ****
     $n->creator = $current_user;
     $n->link_id = $a->id;
!    $msg = $msg . $n->save();
!    $msg = $msg . "Fax was saved as a note for ". $a->getLink() ."\n";
   }
  
--- 81,86 ----
     $n->creator = $current_user;
     $n->link_id = $a->id;
!    $msg .= $n->save();
!    $msg .= "Fax was saved as a note for ". $a->getLink() ."\n";
   }
  

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** file.pinc	2001/08/09 10:32:03	1.31
--- file.pinc	2001/08/11 19:11:25	1.32
***************
*** 604,613 ****
      $r = @DB_Exec($this->conn,$q);
  
!     acl_delete_obj($this);
!     history_delete($this);
!     watchlist_delete($this);
  
      @DB_Commit($this->conn,"WORK");
!     DB_FreeResult ($r);
  
      # Delete the file
--- 604,617 ----
      $r = @DB_Exec($this->conn,$q);
  
!     $msg .= note_delete_obj($this);
!     $msg .= acl_delete_obj($this);
!     $msg .= history_delete($this);
!     $msg .= watchlist_delete($this);
  
+     $this->modified[] = array ( "field" => "Delete" , "old" => $this->getType() , "new" => -1 );
+     $msg .= history_save($this);
+ 
      @DB_Commit($this->conn,"WORK");
!     # DB_FreeResult ($r);
  
      # Delete the file

Index: file_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_del.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** file_del.php	2001/08/09 10:32:03	1.4
--- file_del.php	2001/08/11 19:11:25	1.5
***************
*** 8,13 ****
   include("product.pinc");
   include("file.pinc");
   include("bug.pinc");
-  include("history.pinc");
  
   /* Check if user is allowed to use it */
--- 8,13 ----
   include("product.pinc");
   include("file.pinc");
+  include("note.pinc");
   include("bug.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 19,23 ****
  
   if ( empty($id) ) {
!    $msg = $msg ."No ID given !<BR>";
     $gotourl = $HTTP_REFERER;
   } else {
--- 19,23 ----
  
   if ( empty($id) ) {
!    $msg .= "No ID given !<BR>";
     $gotourl = $HTTP_REFERER;
   } else {
***************
*** 28,32 ****
     }
     if ( ! $f->del_ok() ) {
!      $msg = $msg . sprintf($lang['Err0023'],$lang[$f->getType()]) ."<BR>";
   ...
 
[truncated message content]

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

Added Files:
	watch_del.proto.de watch_del.proto.en 
Log Message:
prepare relaes 200108?? I

--- NEW FILE: watch_del.proto.de ---
Hallo @TO@,

Sie haben @NAME@ auf Ihrer Beobachtungsliste.

@CURRENT@ hat @NAME@ soeben gelöscht.


mit freundlichen Grüßen

 TUTOS notification system

--- NEW FILE: watch_del.proto.en ---
Hi @TO@,

you have set @NAME@ on your watchlist.

@CURRENT@ has deleted @NAME@.

regards

 TUTOS notification system

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

Modified Files:
	ChangeLog Makefile.in 
Log Message:
prepare relaes 200108?? I

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tutos/tutos/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** ChangeLog	2001/07/28 18:21:20	1.55
--- ChangeLog	2001/08/11 19:11:25	1.56
***************
*** 1,3 ****
--- 1,13 ----
  $Header$
+ August 9 2001
+ 	* fixed Product/Project Roles are now extendable by somply adding new descriptions 
+ 	to the language files
+ 	* new Resources can now be added to Projects ,Tasks and Installations
+ 	* new dutch translation thanks to Marcel <mvisscher at mac.com>
+ August 8 2001
+ 	* fixed Translation of Weekday names in title section
+ 	* fixed some HTML errors using a validator
+ July 29 2001
+ 	* ONE YEAR ChangeLog  (Salut !)
  July 28 2001
  	* fixed display order change machanism in file and appointment  overviews

Index: Makefile.in
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** Makefile.in	2001/08/09 22:08:25	1.52
--- Makefile.in	2001/08/11 19:11:25	1.53
***************
*** 11,14 ****
--- 11,17 ----
  #
  # $Log$
+ # Revision 1.53  2001/08/11 19:11:25  gokohnert
+ # prepare relaes 200108?? I
+ #
  # Revision 1.52  2001/08/09 22:08:25  gokohnert
  # New: dutch language files
***************
*** 271,274 ****
--- 274,278 ----
  	php/resource_ins.php \
  	php/resource_overview.php \
+ 	php/resource_del.php \
  	php/show_source.php \
  	php/showobject.php \
***************
*** 448,451 ****
--- 452,457 ----
  	html/watch.proto.en \
  	html/watch.proto.de \
+ 	html/watch_del.proto.en \
+ 	html/watch_del.proto.de \
  	html/copyright.html \
  	html/tutos.css \

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

Modified Files:
	de.p3 en.p3 es.p3 fr.p3 it.p3 ko.p3 pl.p3 ru.p3 tw.p3 zh.p3 
	webelements.p3 
Added Files:
	nl.p3 
Log Message:
New: dutch language files

--- NEW FILE: nl.p3 ---
<?
# $Id: nl.p3,v 1.1 2001/08/09 22:08:24 gokohnert Exp $
#
$lang['content_encoding'] = "iso-8859-1";
setlocale('LC_TIME','nl_NL');
#
# Nederlandse teksten
#
$lang['PleaseLogin']     = "Inloggen AUB";
$lang['PleaseCookies']   = "Zet cookies aan voor deze site";
$lang['Password']        = "Wachtwoord";
$lang['Username']        = "Gebruikersnaam";
$lang['MOTD']            = "Bericht van de dag";
$lang['Login']           = "Login";
$lang['LoggedIn']        = "U bent ingelogd. Maak een keuze uit het menu.";
$lang['ReadOnlyAppoint'] = "U kunt deze afspraak alleen bekijken !";
$lang['StartDate']       = "Startdatum";
$lang['StartTime']       = "Starttijd";
$lang['AppStart']        = "Start";
$lang['AppCreatedBy']    = "Aangemaakt door";
$lang['EndDate']         = "Einddatum";
$lang['EndTime']         = "Eindtijd";
$lang['AppEnd']          = "Eind";
$lang['Participants']    = "Deelnemers";
$lang['everybody']       = "iedereen";
$lang['atDateTime']      = "op";
$lang['createdby']       = "aangemaakt door";
$lang['Description']     = "Beschrijving";
$lang['InfoEmail']       = "Informeer door e-mail";
$lang['InviteEmail']     = "Nodig uit per e-mail";
$lang['IgnoreTime']      = "negeer bovenstaande tijden";
$lang['IgnoreTime2']     = "(i.e.; de afspraak vindt plaats<BR>op een niet bepaalde tijd op deze datum)";
$lang['forphrase']       = "voor";
$lang['nextweek']        = "volgende week";
$lang['lastweek']        = "vorige week";
$lang['plus4weeks']      = "4 weken verder";
$lang['minus4weeks']     = "4 weken terug";
$lang['only']            = "alleen";
$lang['reload']          = "reload";
$lang['tracestate']      = "traceer acceptatiestatus";
$lang['tracestate_desc'] = "(i.e. deelnemers kunnen accepteren of afwijzen)";
$lang['changeapp']       = "deze afspraak zien of wijzigen (%s - %s)";
$lang['seeapp']          = "deze afspraakinfo zien (%s - %s)";
$lang['AllEntries']      = "Toon alle %s ingaves";
#
$lang['DateTimePHP']     = "d/m/Y H:i T";
$lang['DateTimeStr']     = "%d/%m/%Y %H:%M %Z";
$lang['DateTimeFormat']  = "%s/%s/%s %02s:%02s %s";
#
$lang['DateTimeSPHP']    = "d/m H:i";
$lang['DateTimeSStr']    = "%d/%m %H:%M";
$lang['DateTimeSFormat'] = "%s/%s %02s:%02s";
#
$lang['TimeFormatPHP']   = "H:i T";
$lang['TimeFormatStr']   = "%H:%M";
$lang['TimeFormat']      = "%02s:%02s";
#
$lang['DateFormatTitle'] = "%A, %e. %B %Y";
$lang['DateFormatStr']   = "%d/%m/%Y";
$lang['DateFormat']      = "%s/%s/%s";
$lang['DateShortFormat'] = "%s/%s";
#
$lang['Printable']       = "Printbaar formaat";
$lang['PrintableInfo']   = "Toon als printbare pagina";
$lang['managedProd']     = "Beheerde Producten & Projecten";
$lang['soldProd']        = "Verkochte Producten & Projecten";
$lang['Enter']           = "Enter";
$lang['Reset']           = "Reset";
$lang['Remove']          = "Verwijder";
$lang['Delete']          = "Wissen";
$lang['Change']          = "Wijzig";
$lang['Modify']          = "Wijzig";
$lang['created']         = "aangemaakt";
$lang['DateTimeFrom']    = "van";
$lang['DateTimeTill']    = "tot";
$lang['Count']           = "Aantal";
$lang['Showing']         = "Toon %s";
$lang['show']            = "toon";
$lang['lang']['auto']    = "automatisch (door browser)";
$lang['lang']['en']      = "engels";
$lang['lang']['en-US']   = "engels US";
$lang['lang']['de']      = "duits";
$lang['lang']['fr']      = "frans";
$lang['lang']['es']      = "spaans";
$lang['lang']['it']      = "italiaans";
$lang['lang']['tw']      = "Traditioneel chinees";
$lang['lang']['zh']      = "Simplify chinees";
$lang['lang']['ru']      = "russisch";
$lang['lang']['pt']      = "portugees";
$lang['lang']['pl']	     = "polski";
$lang['lang']['ko']      = "korean";
$lang['lang']['nl']      = "nederlands";

# Common
$lang['ChangesOk']       = "Wijzigingen OK ?";
$lang['InputOk']         = "Invoer OK ?";
$lang['Day1']            = "Maandag";
$lang['Day2']            = "Dinsdag";
$lang['Day3']            = "Woensdag";
$lang['Day4']            = "Donderdag";
$lang['Day5']            = "Vrijdag";
$lang['Day6']            = "Zaterdag";
$lang['Day0']            = "Zondag";
$lang['SMonday']         = "Ma";
$lang['STuesday']        = "Di";
$lang['SWednesday']      = "Wo";
$lang['SThursday']       = "Do";
$lang['SFriday']         = "Vr";
$lang['SSaturday']       = "Za";
$lang['SSunday']         = "Zo";
$lang['week']            = "Week";
$lang['weeks']           = "weken";
$lang['Date']            = "Datum";
$lang['NewEntry']        = "Nieuw";
$lang['Search']          = "Zoek";
$lang['PlsChangeName']   = "wijzig dit aub";
$lang['State_0']         = "???";
$lang['State_1']         = "JA";
$lang['State_2']         = "NEE";
$lang['SeeAddress']      = "toon adres van %s";
$lang['NavFirst']        = "eerste";
$lang['NavBack']         = "terug";
$lang['NavNext']         = "volgende";
$lang['NavLast']         = "vorige";
$lang['DecPoint']        = ".";
$lang['ThousandPoint']   = ",";
$lang['yes']             = "ja";
$lang['no']              = "nee";
$lang['FldsRequired']    = "<FONT SIZE=-1>Velden gemarkeerd met <FONT COLOR=red>(*)</FONT> zijn verplicht.</FONT>";
$lang['any']             = "elke";
$lang['extended']        = "uitgebreid";
$lang['OrderBy']         = "sorteer op %s";
$lang['RevOrderBy']      = "keer sortering om op %s";
$lang['Export']          = "Exporteer";
$lang['ExportInfo']      = "Exporteer data als bestand";

# Appointments
$lang['Appointment']     = "Afspraak";
$lang['Appointments']    = "Afspraken";
$lang['NewAppoint']      = "Nieuwe afspraak";
$lang['NewAppointR']     = "Nieuw (repeterend)";
$lang['NewAppointInfo']  = "Maak een nieuwe afspraak";
$lang['NewAppointInfoR'] = "Maak een nieuwe repeterende afspraak";
$lang['AppointDetail']   = "Afspraakinfo";
$lang['AppointModify']   = "Wijzig afspraak";
$lang['AppointCreate']   = "Maak afspraak";
$lang['AppointCommit']   = "Afspraak accepteren";
$lang['AppointOverview'] = "Afspraakoverzicht";
$lang['AppDelInfo']      = "Verwijder deze afspraak";
$lang['AppNotes']        = "Notities";
$lang['AppChangeOrDel']  = "wie mag deze wissen of wijzigen";
$lang['VisitAt']         = "Bezoek op";
$lang['VisitFrom']       = "Bezoek van";
$lang['Visits']          = "Bezoeken";
$lang['ModOldAppoint']   = "Wijzig bestaande afspraak";
$lang['CreateAppoint']   = "Voer een nieuwe afspraak in";
$lang['AppFirstDate']    = "Eerste Datum";
$lang['AppLastDate']     = "Laatste Datum";
$lang['AppNoLastDate']   = "geen einddatum";
$lang['AppRepeatType']   = "Herhaal";
$lang['AppRepeatDay']    = "dagelijks";
$lang['AppRepeatWeek']   = "wekelijks op dezelfde dag als startdag";
$lang['AppRepeatMonth']  = "Iedere maand op een vaste dag";
$lang['AppRepeatYear']   = "ieder jaar op een vaste dag/maand";
$lang['AppRepeatInfo1']  = "iedere %s";
$lang['AppRepeatInfo2']  = "iedere maand op de %d dag";
$lang['AppRepeatInfo3']  = "ieder jaar op %d/%m";
$lang['AppRepeatInfo4']  = "iedere dag";
$lang['AppSeeEntry']     = "toon invoer";
$lang['AppSeeEntryI']    = "toon de afspraak";
$lang['AppEmailRemind']  = "herinner alle deelnemers via e-mail";
$lang['AppRemind'][0]    = "nooit";
$lang['AppRemind'][15]   = "15 minuten voor aanvang";
$lang['AppRemind'][60]   = "1 uur vantevoren";
$lang['AppRemind'][1440] = "1 dag vantevoren";
$lang['AppRemind'][10080]= "1 week before";
$lang['AppAllSee']       = "alles wat je kan zien";
$lang['AppAllTeams']     = "leden van al je teams";
$lang['AppEverything']   = "alles";
$lang['AppGetIcal']      = "Get Ical File";
# You can expand this as you like
# AppLocDesc = 1 shows Description in calendar
# AppLocDesc = 0 does not show Description in calendar
# colors depend on style sheets
$lang['AppLoc'][0]       = "Kantoor";
$lang['AppLocDesc'][0]   = 1;
$lang['AppLoc'][1]       = "Afwezig";
$lang['AppLocDesc'][1]   = 1;
$lang['AppLoc'][2]       = "Vakantie";
$lang['AppLocDesc'][2]   = 0;
$lang['AppLoc'][3]       = "Ziek";
$lang['AppLocDesc'][3]   = 0;
$lang['AppPrivate']      = "prive";
$lang['AppVoteInfo']     = "stem voor deze afspraak";
$lang['AppVoteState']    = "huidige stem";
$lang['AppVoteHead']     = "stem voor deze afspraak (%s)";
$lang['AppVoteSelect']   = "Selecteer je stem";
$lang['AppsSearch']      = "Kalender Zoek";
$lang['SearchForAppExt'] = "Uitgebreid zoeken naar afspraken";
$lang['SearchForApp']    = "Zoek een afspraak";
$lang['AppSelInfo']      = "(laat leeg om alle afspraken te zien)";

# Personal Page
$lang['PersonalPage']      = "PROMEZ projectmanagement";
$lang['PersonalPageFor']   = "Persoonlijke pagina van %s";
$lang['PersonalSettings']  = "Gebruikersinstellingen";
$lang['PersonalSettingsI'] = "Wijzig persoonlijke instellingen van %s";

# User
$lang['User']            = "Gebruiker";
$lang['UserCreate']      = "Maak gebruiker";
$lang['UserModify']      = "Wijzig gebruiker";
$lang['UserDel']         = "Wis gebruiker";
$lang['UserInfo']        = "Gebruikersinfo";
$lang['UserModInfo']     = "Wijzig %s's gebruikersinfo";
$lang['UserNewInfo']     = "Maak gebruikersinfo voor %s";
$lang['UserDelInfo']     = "Wis de gebruikersinfo van %s";
$lang['UserUnknown']     = "Onbekende gebruiker";
$lang['UserLastSeen']    = "Laatst ingelogd op";
$lang['UserLastHost']    = "Laatste host";
$lang['UserAdmin']       = "Admin";
$lang['UserUseOverlib']  = "gebruik popups";
$lang['UserLanguage']    = "Taal";
$lang['UserTimezone']    = "Tijdszone";
$lang['UserTheme']       = "Thema";

# Bugs
$lang['Bug']             = "Fout";
$lang['BugsSearch']      = "Foutregistratie Zoeken";
$lang['BugsOverview']    = "Foutregistratie Overzicht";
$lang['BugsDetail']      = "Foutregistratie Info";
$lang['BugState']        = "Status";
$lang['BugClass']        = "Klasse";
$lang['BugShort']        = "Korte omschrijving";
$lang['BugLong']         = "lange Foutregistratieomschrijving";
$lang['BugCreator']      = "Aangemaakt door";
$lang['BugCreation']     = "aangemaakt door %s op %s";
$lang['BugProduct']      = "Product/Project";
$lang['BugReference']    = "Referentie";
$lang['BugSolvedBy']     = "opgelost door";
$lang['BugClosedBy']     = "gesloten door";
$lang['BugAssignedTo']   = "toegewezen aan";
$lang['BugHistory']      = "Omschrijving & Historie";
$lang['Bugs']            = "Foutregistratie";
$lang['BugModify']       = "Wijzig Foutregistratie";
$lang['BugModifyI']      = "Wijzig Foutregistratie %s";
$lang['BugCreate']       = "Maak Foutregistratie";
$lang['BugCreateInfo']   = "Maak een Foutregistratie voor%s";
$lang['BugDeleteI']      = "delete this bug %s";
$lang['BugStates'][1]    = "OPEN";
$lang['BugStates'][2]    = "IN BEWERKING";
$lang['BugStates'][3]    = "OPGELOST";
$lang['BugStates'][4]    = "GESLOTEN";
$lang['BugClasses'][1]   = "licht";
$lang['BugClasses'][2]   = "zwaar";
$lang['BugClasses'][3]   = "gevaarlijk";
$lang['BugClasses'][4]   = "suggestie";
$lang['SearchForBug']    = "Zoek een Foutregistratie";
$lang['SearchForBugExt'] = "Uitgebreid zoeken naar Foutregistratie";
$lang['CreateNewBug']    = "Voer een nieuwe Foutregistratie in";
$lang['BugShow']         = "Toon Foutregistratie %s";
$lang['BugAdditional']   = "Additionele Info";
$lang['BugHistory']      = "Historie";
$lang['BugSelInfo']      = "(laat leeg om alle Foutregistraties te zien)";
$lang['BugAnyButClosed'] = "Alle niet opgeloste";
$lang['BugBetween']      = "aangemaakt tussen";
$lang['BugStats']        = "Statistieken";
$lang['BugStatsInfo']    = "statisticsche info voor geselcteerde Foutregistraties";
$lang['BugStatsTitle']   = "Foutregistratie Statistieken";
$lang['BugAverage']      = "Performantie";
$lang['BugAvgEnd']       = "Gem. %.2f uur tot einde";
$lang['BugAvgSolve']     = "Gem. %.2f uur om %d foutregistratie(s) op te lossen";
$lang['BugAvgClose']     = "Gem. %.2f uur om %d foutregistratie(s) te sluiten";
$lang['BugID']           = "Foutreg. ID";
$lang['BugAutoID']       = "Automatisch aangemaakt";
$lang['BugAutoState']    = "Initiele status";
$lang['BugAutoSolver']   = "Initieel";

# Product/Projects
$lang['ProductP']        = "Product/Project";
$lang['Product']         = "Product";
$lang['Project']         = "Project";
$lang['ProductsSearch']  = "Producten/Projecten Zoeken";
$lang['ProductsOverview']= "Producten/Projecten Overzicht";
$lang['ProductsDetail']  = "Product/Project Info";
$lang['ProdApps']        = "Gerelateerde afspraken";
$lang['ProdName']        = "Product/Project";
$lang['ProdVersion']     = "Versie";
$lang['ProdRoles']       = "Rollen";
$lang['ProdFunc']        = "Functie";
$lang['ProdRolesNew']    = "Nieuwe Rol";
$lang['ProdRole'][1]     = "Manager";
$lang['ProdRole'][2]     = "Commercieel Manager";
$lang['ProdRole'][3]     = "2. Manager";
$lang['ProdRole'][4]     = "Verkoop";
$lang['ProdRole'][5]     = "Ontwikkeling";
$lang['ProdRole'][6]     = "Klant";
$lang['ProdPath']        = "Filepad";
$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'][2]   = "Gereed";
$lang['ProdStates'][3]   = "Geannuleerd";
$lang['ProdStates'][4]   = "Quote startend";
$lang['ProdStates'][5]   = "Quote geannuleerd";
$lang['ProdStates'][-2]  = "any not finished or cancelled";
$lang['ProdClass1']      = "Classificatie 1";
$lang['ProdClasses1'][1] = "Marketing";
$lang['ProdClasses1'][2] = "BTL";
$lang['ProdClasses1'][3] = "ATL";
$lang['ProdClass2']      = "Classificatie 2";
$lang['ProdClasses2'][1] = "Noordelijke regio";
$lang['ProdClasses2'][2] = "Zuidelijke regio";
$lang['ProdPrice']       = "Prijs";
$lang['ProdCost']        = "Kosten";
$lang['ProdNotes']       = "Notities";
$lang['ProdTasks']       = "Taken";
$lang['ProdFiles']       = "Documenten";
$lang['SearchForProd']   = "Zoek naar een product or project";
$lang['SearchForProdExt']= "Uitgebreid zoeken naar een product or project";
$lang['ProdCreateInfo']  = "Maak een nieuw product of project";
$lang['ProdDelInfo']     = "Wis 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']        = "Kans op order";
$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 Products/Projects";
$lang['ProdStatsTitle']  = "Product/Project Statistieken";
$lang['ProdFields']      = "Velden";

# Mailboxes
$lang['MailboxName']     = "Mailbox Name";
$lang['MailboxHost']     = "Hostnaam";
$lang['MailboxPort']     = "Poort";
$lang['MailboxProt']     = "Protocol";
$lang['MailboxUser']     = "Gebruiker";
$lang['MailboxPass']     = "Wachtwoord";
$lang['MailboxPath']     = "Pad";
$lang['MailboxEmail']    = "e-mail";
$lang['MailboxSender']   = "Verzender";
$lang['MailboxSubject']  = "Onderwerp";
$lang['MailboxSDate']    = "Datum verzonden";
$lang['MailboxFlags']    = "Flags";
$lang['MailboxOverview'] = "Mailbox Overzicht";
$lang['MailboxSearch']   = "Mailbox Zoeken";
$lang['MailboxDetail']   = "Mailbox Mailweergave";
$lang['MailboxModify']   = "Mailbox Wijzig";
$lang['MailboxCreate']   = "Mailbox Aanmaken";
$lang['MailboxModifyI']  = "Wijzig Mailbox van %s";
$lang['MailboxCreateI']  = "Definieer een mailbox voor %s";
$lang['SearchForMail']   = "Zoek %s Mailbox %s";
$lang['MailboxSelInfo']  = "(laat leeg om alle mails te zien)";
$lang['MailSendTo']      = "Stuur een mail aan %s";
$lang['MailDate']        = "Datum";
$lang['MailFrom']        = "Van";
$lang['MailTo']          = "Aan";
$lang['MailCc']          = "Cc";
$lang['MailSubject']     = "Onderwerp";
$lang['MailSize']        = "Grootte";
$lang['MailSent']        = "mail verzenden '%s' aan %s.";
$lang['MailSentCc']      = "mail verzenden '%s' (Cc) aan %s.";
$lang['MailCard']        = "Card van %s";
$lang['MailboxDelI']     = "Verwijder Mailbox %s";

# ACL
$lang['AclModify']       = "Wijzig permissies";
$lang['AclModifyI']      = "wijzig permissies van %s";
$lang['AclDetail']       = "Permissie-info";
$lang['AclDetailI']      = "Toon permissies van %s";
$lang['permissions']     = "permissies";
$lang['ACLsee']          = "Toon permissies";
$lang['ACLmod']          = "wijzig permissies";
$lang['ACLread']         = "Toon";
$lang['ACLmodify']       = "Wijzig";
$lang['ACLdelete']       = "Wis";
$lang['ACLreadI']        = "Bovenstaande gebruikers/teams mogen zien %s";
$lang['ACLmodI']         = "Bovenstaande gebruikers/teams mogen wijzigen %s";
$lang['ACLdelI']         = "Bovenstaande gebruikers/teams mogen wissen %s";

# Tasks
$lang['Task']            = "Taak";
$lang['Tasks']           = "Taken";
$lang['TaskDetail']      = "Taak Info";
$lang['TaskCreate']      = "Taak Maken";
$lang['TaskCreateInfo']  = "Maak een nieuw subtaak in %s";
$lang['TaskDelete']      = "Wis Taak %s";
$lang['TaskModify']      = "Wijzig Taak %s";
$lang['TaskOverview']    = "Taakoverzicht";
$lang['TaskOverviewInfo']= "Toon taken van %s";
$lang['TaskName']        = "Naam";
$lang['TaskState']       = "Status";
$lang['TaskDesc']        = "ToDo";
$lang['TaskWorker']      = "to do door";
$lang['TaskVolumeFull']  = "Werk Volume";
$lang['TaskVolumeDone']  = "Volume gereed";
$lang['TaskSubTask']     = "Subtaak van";
$lang['hours']           = "uren";
$lang['TaskCreation']    = "aangemaakt door %s op %s";
$lang['TaskStates'][0]   = "Pre";
$lang['TaskStates'][1]   = "In bewerking";
$lang['TaskStates'][2]   = "Gereed";
$lang['TaskStates'][3]   = "Te laat";
$lang['TaskS_Start']     = "geplande start";
$lang['TaskS_End']       = "gepland einde";
$lang['TaskSched']       = "gepland";
$lang['TaskReal']        = "real";
$lang['TaskLinkInfo']    = "Toon taak %s";
$lang['TaskCompleted']   = " %3.2f procent gereed";

# Gantt Diagramm
$lang['GanttLink']          = "See the Gantt";
$lang['GanttLinkInfo']      = "Gantt diagramm";
$lang['GanttTitle']         = "GANTT diagramm";
$lang['GanttStart']         = "Begin date";
$lang['GanttEnd']           = "End date";
$lang['GanttVolume']        = "hour volume";
$lang['GanttCompletition']  = "Completed";

# Installations
$lang['Installation']    = "Installatie";
$lang['Installations']   = "Installaties";
$lang['InstDetail']      = "Installatie Info";
$lang['InstModify']      = "Wijzig Installatie";
$lang['InstCreate']      = "Maak Installatie";
$lang['InstOverview']    = "Installatie Overzicht";
$lang['InstalledBy']     = "geinstalleerd door";
$lang['SoldBy']          = "verkocht door";
$lang['Customer']        = "Klant/Gebruiker";
$lang['Money']           = "Som";
$lang['Currency']        = "Valuta";
$lang['InstLinkI']       = "Toon Installaties";
$lang['InstCreateI']     = "Maak een nieuwe Installatie";
$lang['InstModifyI']     = "Wijzig deze installatie";
$lang['InstDelI']        = "Wis installatie %s";

# Company
$lang['Company']           = "Bedrijf";
$lang['CompanySearch']     = "Zoek bedrijf";
$lang['CompanyOverview']   = "Overzicht bedrijven";
$lang['CompanyDetail']     = "Bedrijfsinformatie";
$lang['CompanyModify']     = "Wijzig bedrijf";
$lang['CompanyCreate']     = "Maak bedrijf";
$lang['CompanyCreateInfo'] = "maak een nieiuw bedrijf";
$lang['CompanyApps']       = "Afspraken met dit bedrijf";
$lang['CompanyLinks']      = "Links";
$lang['CompanyChgInfo']    = "Wijzig bedrijf %s";
$lang['CompanyDelInfo']    = "Wis bedrijf %s";
$lang['CompanyMembers']    = "Medewerkers";
$lang['CompanyLinkInfo']   = "Toon bedrijf %s";

# Department
$lang['Department']         = "Afdeling";
$lang['Departments']        = "Afdelingen";
$lang['DepartmentSearch']   = "Zoek Afdeling";
$lang['DepartmentOverview'] = "Overzicht Afdelingen";
$lang['DepartmentDetail']   = "Afdeling Info";
$lang['DepartmentModify']   = "Wijzig Afdeling";
$lang['DepartmentCreate']   = "Maak Afdeling";
$lang['DepCreateInfo']      = "Maak een nieuwe Afdeling";
$lang['DepartmentMembers']  = "Leden van Afdeling";
$lang['DepartmentApps']     = "Afspraken met deze Afdeling";
$lang['DepartmentLinks']    = "Links";
$lang['DepLinkInfo']        = "Toon Afdeling %s op %s";
$lang['DepChgInfo']         = "Wijzig Afdeling %s";
$lang['DepDelInfo']         = "Wis Afdeling %s";

# Team
$lang['Team']               = "Team";
$lang['Teams']              = "Teams";
$lang['TeamOverview']       = "Team Overzicht";
$lang['TeamDetail']         = "Team Info";
$lang['TeamModify']         = "Wijzig Team";
$lang['TeamCreate']         = "Maak Team";
$lang['TeamMember']         = "Teamlid";
$lang['TeamPosMember']      = "Mogelijk teamlid";
$lang['TeamMail']           = "Mail aan team";
$lang['TeamMailInfo']       = "stuur mail aan team %s";
$lang['TeamApps']           = "Toon afspraken van team %s";
$lang['TeamLinkInfo']       = "toon Team %s";
$lang['TeamManager']        = "Lijstmanager";
$lang['TeamName']           = "Teamnaam";
$lang['TeamCreation']       = "aangemaakt op";
$lang['TeamCount']          = "# Leden";
$lang['TeamOverviewInfo']   = "Toon een lijst van alle teams";
$lang['TeamCreateI']        = "maak een nieuw team";
$lang['TeamDeleteI']        = "Wis team %s";
$lang['TeamModifyI']        = "Wijzig team %s";

# Notes
$lang['Note']               = "Notitie";
$lang['Notes']              = "Notities";
$lang['NoteCreate']         = "Maak een notitie";
$lang['NoteCreateInfo']     = "Maak een nieuwe notitie voor %s";
$lang['NoteDelete']         = "Wis deze notitie";
$lang['NoteDescription']    = "Beschrijving";
$lang['NoteRemember']       = "Herinner op:";
$lang['NoteName']           = "Titel";
$lang['NoteDetail']         = "Notitie Weergave";
$lang['NoteOverview']       = "Notitieoverzicht";
$lang['NoteCreation']       = "Notitie aanmaakdatum";
$lang['NoteMod']            = "Wijzig notitie";
$lang['NoteReference']      = "Referentie";
$lang['ModOldNote']         = "Wijzig een oude notitie";
$lang['NoteCreator']        = "aangemaakt door";
$lang['NoteLinkInfo']       = "een notitie van %s";
$lang['NoteSearch']         = "Notitie Zoeken";
$lang['SearchForNote']      = "Zoek een notitie";
$lang['SearchForNoteExt']   = "Uitgebreid zoeken naar notitie";
$lang['NoteSelInfo']        = "(laat leeg om alle notities te zoeken)";
$lang['NoteRefType']        = "Referentietype";
$lang['NoteRefName']        = "Referentienaam";
$lang['NoteBetween']        = "aangemaakt tussen";
$lang['NotesOverview']      = "Notitie Overzicht";

# Address
$lang['AddressSearch']   = "Adressen zoeken";
$lang['AddressOverview'] = "Adressenoverzicht";
$lang['AddressDetail']   = "Adresinfo";
$lang['Address']         = "Adres";
$lang['AddressEntries']  = "Adresboekinhoud";
$lang['AdrLocChange']    = "wijzig adres van %s";
$lang['AdrLocCreate']    = "maak een adres voor %s";
$lang['AdrBMod']         = "Wijzig basis";
$lang['AdrBModInfo']     = "wijzig basisinvoer van %s";
$lang['AdrBDel']         = "Wis basis";
$lang['AdrBDelInfo']     = "Wijzig basis en alle adressen van %s";
$lang['AdrBNew']         = "Nieuwe invoer";
$lang['AdrBNewInfo']     = "Maak een nieuwe basisinvoer";
$lang['AdrCreateInfo']   = "Maak een nieuw adres";
$lang['AdrLNew']         = "Nieuw adres";
$lang['AdrLNewInfo']     = "maak een nieuw adres voor %s";
$lang['AdrName']         = "Naam";
$lang['AdrMailInfo']     = "stuur een mail aan %s";
$lang['AdrGetVcard']     = "Download Vcard";
$lang['AdrGetVcardI']    = "Ontvang dit adres als Vcard";
$lang['AdrSeeEntry']     = "Toon invoer";
$lang['AdrSeeEntryI']    = "Toon adresboekinvoer van %s";
$lang['AdrLocTitle']     = "%s Adres";
$lang['AdrBNewTitle']    = "Voer een nieuw basisadres in";
$lang['AdrBChangeTitle'] = "Wijzig een basisadres";

$lang['Location']        = "Locatie";
$lang['Location2']       = "Locatie";
$lang['AdrFirstName']    = "Voornaam";
$lang['AdrMiddleName']   = "Initaal";
$lang['AdrLastName']     = "Achternaam";
$lang['AdrBirthday']     = "Verjaardag";
$lang['AdrPicture']      = "Foto";
$lang['AdrCat1']         = "Thuis";
$lang['AdrCat2']         = "Kantoor";
$lang['AdrCpLoc']        = "Kopieer bedrijfsadres";
$lang['ZIP']             = "Postcode";
$lang['State']           = "Provincie";
$lang['Country']         = "Land";
$lang['Street']          = "Straat";
$lang['City']            = "Stad";
$lang['Phone']           = "Tel.";
$lang['AdrFax']          = "Fax.";
$lang['AdrEmail']        = "e-mail";
$lang['ChangeLocInfo']   = "Wijzig het '%s' adres van %s";
$lang['DeleteLocInfo']   = "Wis het '%s' adres van %s";
$lang['AdrLinks']        = "Links";
$lang['AdrCategory']     = "Categorie";
$lang['AdrDescription']  = "Naam van Adres";
$lang['ShowCal']         = "Toon kalender van '%s'";
$lang['SearchForAdr']    = "Zoek in het Adresboek";
$lang['SearchForAdrExt'] = "Uitgebreid zoeken in Adresboek";
$lang['SearchForCmp']    = "Zoek een bedrijf";
$lang['SearchLdapAdr']   = "Lookup in Internet";
$lang['LDAPServer']      = "Server";

# URL
$lang['URLName']         = "Omschrijving";
$lang['URL']             = "URL";
$lang['URLAdd']          = "Voeg een URL toe";
$lang['URLDel']          = "Wis URL links";

# Main Menu
$lang['Calendar']        = "Kalender";
$lang['Addresses']       = "Adressen";
$lang['BugTrack']        = "Foutregistratie";
$lang['Product']         = "Producten & Projecten";
$lang['Logout']          = "Uitloggen";
$lang['CalendarInfo']    = "Kalender van Vandaag";
$lang['AddressesInfo']   = "Zoek naar adressen";
$lang['BugTrackInfo']    = "Bug Tracking Database";
$lang['ProductInfo']     = "Producten & Projecten";
$lang['LogoutInfo']      = "Uitloggen";

# Help
$lang['Help']            = "Help";
$lang['HelpInfo']        = "Help voor deze pagina";

# Resource
$lang['ResCal']          = "Resourcegebruik";
$lang['ResCalDetail']    = "Resourcegebruik voor %s in %s";

# Filehandling
$lang['File']            = "Document";
$lang['FileDetail']      = "Documentinfo";
$lang['FileOverview']    = "Documentoverzicht";
$lang['FileMod']         = "Wijzig Document";
$lang['FileModifyI']     = "wijzig Document %s";
$lang['FileDeleteI']     = "Wis Document %s";
$lang['FileCreation']    = "Voeg Document toe";
$lang['FileCreate']      = "Voeg Document toe";
$lang['FileCreateInfo']  = "Voeg Document toe aan %s";
$lang['FileNameDoc']     = "Naam Document";
$lang['FileName']        = "originele Naam";
$lang['FileSize']        = "Grootte";
$lang['FileType']        = "Type";
$lang['FileAuthor']      = "Auteur";
$lang['FileMore']        = "Additionele Info";
$lang['FileLog']         = "Historie";
$lang['FileVersion']     = "Versie";
$lang['FileReference']   = "Referentie";
$lang['FileLockedBy']    = "beveiligd door";
$lang['FileOldVersion']  = "oudere versies";
$lang['FileLocking']     = "Beveiligen";
$lang['FileUnlocked']    = "unlocked";
$lang['FileLocked']      = "document is beveiligd door %s";
$lang['FileOverwrite']   = "overschrijf huidig document %s";
$lang['FileSave']        = "bewaar huidig document %s as versie %s";
$lang['FileShow']        = "Toon Document";
$lang['FileShowI']       = "Toon Document %s";
$lang['FileDownload']    = "Download";
$lang['FileDownloadI']   = "Download Document %s";
$lang['FileVersionType'] = "Versioning Systeem";
$lang['FileVersionTypeI']= "U kunt achteraf het versioningsysteem niet wijzigen !";
$lang['FileVersioning']  = "Versioning";
$lang['FileVersioningI'] = "Als een bestandsnaam hierboven is aangegeven.";

# MAP
$lang['MapSearch']       = "Selecteer Kaart";
$lang['MapHeader']       = "Toon een kaart van %s";

# History
$lang['HistoryDetail']   = "%s Historie";
$lang['HistoryShow']     = "Historie van %s %s";
$lang['HistoryFld']      = "Veld";
$lang['HistoryOldV']     = "Oude waarde";
$lang['HistoryNewV']     = "Nieuwe waarde";
$lang['HistoryLink']     = "toon historie";
$lang['HistoryLinkI']    = "toon historie van %s";
$lang['HistoryDeleted']  = "tussentijds gewist";

# Timetrack
$lang['Timetrack']         = "Tijdspinspanning";
$lang['TimetrackCreate']   = "Geboekte Tijd";
$lang['TimetrackCreateI']  = "geboekte tijd op %s";
$lang['TimetrackDelI']     = "Wis deze geboekte tijd op %s";
$lang['TimetrackNew']      = "Nieuwe Tijdstrack";
$lang['TimetrackModify']   = "Wijzig Tijdstrack";
$lang['TimetrackOverview'] = "Overzicht Tijdstrack";
$lang['TimetrackWorker']   = "medewerker";
$lang['TimetrackRef']      = "Referentie";
$lang['TimetrackDate']     = "Datum";
$lang['TimetrackSearch']   = "Zoek Tijdstrack";
$lang['SearchForTT']       = "Zoek Tijdstrack";
$lang['SearchForTTExt']    = "Uitgebreid Tijdstrack Zoeken";
$lang['TimetrackBetween']  = "tussen";
$lang['TimetrackBooked']   = "Geboekte Tijd";
$lang['TimetrackBookedI']  = "Geboekte tijd van %s";
$lang['TTStatsTitle']      = "Tijdstrack Statistieken";

# Fax
$lang['FaxCreate']         = "Nieuwe FAX";
$lang['FaxSendTo']         = "Stuur een fax aan %s";
$lang['FaxTo']             = "Aan:";
$lang['FaxNr']             = "FAX Nr:";
$lang['FaxNote']           = "Bewaar deze fax als een notitie voor %s";
$lang['FaxSpooledTo']      = "Fax is gespoold naar %s";

# SMS
$lang['SMSCreate']         = "SMS";
$lang['SMSSendTo']         = "Stuur een SMS naar %s";

# WatchList
$lang['WatchAdd']          = "Voeg toe aan watchlijst";
$lang['WatchAddI']         = "Voeg %s toe aan watchlijst";
$lang['WatchDel']          = "Wis uit watchlijst";
$lang['WatchDelI']         = "Wis %s uit uw watchlijst";
$lang['WatchOverview']     = "Watchlijst";
$lang['WatchOverviewI']    = "Toon de watchlijst van %s";
$lang['Watcher']           = "Observeerder";

# Resource
$lang['Resource']          = "Resource";
$lang['Resources']         = "Resources";
$lang['ResDetail']         = "Resource Info";
$lang['ResCreate']         = "Maak Resource";
$lang['ResModify']         = "Wijzig Resource";
$lang['ResModifyI']        = "Wijzig Resource %s";
$lang['ResName']           = "Naam";
$lang['ResDesc']           = "Omschrijving";
$lang['ResShow']           = "Toon Resource %s";
$lang['ResUsage']          = "Resource Gebruik";
$lang['ResOverview']       = "Resource Overzicht";

# Admin Pages
$lang['AdminShow']         = "Administratie";
$lang['AdminDBInfo']       = "Database Info";
$lang['AdminDBTable']      = "Tabel";
$lang['AdminDBCount']      = "Ingaves";
$lang['AdminDBName']       = "Database Naam";
$lang['AdminDBUser']       = "Database Gebruiker";
$lang['AdminDBHost']       = "Host";
$lang['AdminDBPort']       = "Poort";
$lang['AdminLoginInfo']    = "Recente Logins";
$lang['DBInit']            = "Database Initialization";

# Permissions
$lang['perm'][usecalendar]       = "gebruik Kalender";
$lang['perm'][usebugtracking]    = "gebruik bugtracking";
$lang['perm'][usedocmanagement]  = "gebruik docmanagement";
$lang['perm'][useinstmanagement] = "gebruik installaties";
$lang['perm'][usetaskmanagement] = "gebruik taken";
$lang['perm'][usenotes]          = "gebruik notities";
$lang['perm'][usemaplink]        = "gebruik maplink";
$lang['perm'][useprojects]       = "gebruik projecten";
$lang['perm'][usetimetrack]      = "gebruik timetrack";
$lang['perm'][usefax]            = "gebruik fax";
$lang['perm'][usesms]            = "gebruik sms";
$lang['perm'][useoverlib]        = "gebruik popups";
$lang['perm'][usewatchlist]      = "gebruik watchlist";
$lang['perm'][useresource]       = "gebruik resources";
$lang['perm'][useaddressbook]    = "gebruik adresboek";
$lang['perm'][usemailboxes]      = "gebruik mailboxen";
$lang['perm'][usemail]           = "gebruik mail";
$lang['perm'][useldap]           = "gebruik LDAP";
$lang['FeatureOff'] = "Feature globaal gedisabled";

# Error Messages
$lang['Err0001']         = "Geen deelnemers !";
$lang['Err0002']         = "start ligt na einde !";
$lang['Err0003']         = "De beschrijving ontbreekt bij de afspraak !";
$lang['Err0004']         = "Onbekend Product <I>%s</I> !";
$lang['Err0005']         = "Productbeschrijving <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";
$lang['Err0009']         = "Voer aub het <I>%s</I> veld in";
$lang['Err0010']         = "Naam van de afdeling <I>%s</I> is is geldig voor <B>%d</B> afdelingen !";
$lang['Err0011']         = "Bedrijfsnaam <I>%s</I> is geldig voor <B>%d</B> bedrijven !";
$lang['Err0012']         = "Onbekend bedrijf <I>%s</I> !";
$lang['Err0013']         = "Onbekende afdeling <I>%s</I> !";
$lang['Err0014']         = "Selecteer aub in het <I>%s</I> veld";
$lang['Err0015']         = "Wijzigingen niet toegestaan !";
$lang['Err0016']         = "U heeft geen permissies om deze notitie te verwijderen !";
$lang['Err0017']         = "Voer aug een nummer in in het <I>%s</I> veld !";
$lang['Err0018']         = "Naam <I>%s</I> is geldig voor %d Invoer";
$lang['Err0019']         = "Onbekend persoon <I>%s</I> !";
$lang['Err0020']         = "U heeft geen permissies om dit bestand te wissen !";
$lang['Err0021']         = "U kunt viruteel team 0 niet wijzigen";
$lang['Err0022']         = "Sorrie, door de permissies mag u dit niet zien %s";
$lang['Err0023']         = "Sorrie, door de permissies mag u dit niet wissen %s";
$lang['Err0024']         = "Sorrie, door de permissies mag u dit niet wijzigen %s";
$lang['Err0025']         = "Ontbrekende of Wachtwoord";
$lang['Err0026']         = "Login niet mogelijk";
$lang['Err0027']         = "Login mislukt";
$lang['Err0028']         = "No Producten/Projecten gedefinieerd";
$lang['Err0029']         = "No 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']         = "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) !";
$lang['Err0040']         = "%s niet gevonden !";
$lang['Err0041']         = "Wachtwoorden zijn niet gelijk !";
$lang['Err0042']         = "Oude wachtwoord is onjuist !";
$lang['Err0043']         = "e-mail %s is niet in een geldig (xx...@ab...) e-mail formaat !";
$lang['Err0044']         = "Bedrijf bestaat al (%s) !";
$lang['Err0045']         = "Afdeling bestaat al (%s) !";
$lang['Err0046']         = "Team bestaat al (%s) !";
$lang['Err0047']         = "Kon de adminrechten niet verwijderen. Er moet tenminste 1 admin zijn in het systeem !";
$lang['Err0048']         = "Niets gevonden !";

### Local Variables: ***
### End: ***
?>

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/de.p3,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** de.p3	2001/08/09 10:32:03	1.47
--- de.p3	2001/08/09 22:08:24	1.48
***************
*** 90,93 ****
--- 90,94 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "niederländisch";
  
  # Common

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/en.p3,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** en.p3	2001/08/08 16:47:53	1.49
--- en.p3	2001/08/09 22:08:24	1.50
***************
*** 90,93 ****
--- 90,94 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/es.p3,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** es.p3	2001/08/09 10:32:03	1.34
--- es.p3	2001/08/09 22:08:24	1.35
***************
*** 92,95 ****
--- 92,96 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fr.p3,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** fr.p3	2001/08/09 10:32:03	1.33
--- fr.p3	2001/08/09 22:08:24	1.34
***************
*** 90,93 ****
--- 90,94 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/it.p3,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** it.p3	2001/08/09 10:32:03	1.42
--- it.p3	2001/08/09 22:08:24	1.43
***************
*** 90,93 ****
--- 90,94 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: ko.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ko.p3,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** ko.p3	2001/08/08 16:47:53	1.8
--- ko.p3	2001/08/09 22:08:24	1.9
***************
*** 90,93 ****
--- 90,94 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pl.p3,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pl.p3	2001/08/08 16:47:53	1.5
--- pl.p3	2001/08/09 22:08:24	1.6
***************
*** 96,99 ****
--- 96,100 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ru.p3,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** ru.p3	2001/08/08 21:40:45	1.28
--- ru.p3	2001/08/09 22:08:24	1.29
***************
*** 90,93 ****
--- 90,94 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/tw.p3,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** tw.p3	2001/08/09 10:32:03	1.28
--- tw.p3	2001/08/09 22:08:24	1.29
***************
*** 94,97 ****
--- 94,98 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/zh.p3,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** zh.p3	2001/08/09 10:32:03	1.28
--- zh.p3	2001/08/09 22:08:24	1.29
***************
*** 94,97 ****
--- 94,98 ----
  $lang['lang']['pl']	     = "polski";
  $lang['lang']['ko']      = "korean";
+ $lang['lang']['nl']      = "dutch";
  
  # Common

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** webelements.p3	2001/08/09 10:32:03	1.52
--- webelements.p3	2001/08/09 22:08:24	1.53
***************
*** 164,167 ****
--- 164,173 ----
        return;
      }
+     if ( ereg("^nl", "$tok" ) ) {
+       include("nl.p3");
+       $tutos[lang] = $tok;
+       ReadCustomLang($lang,"nl");
+       return;
+     }
      $tok = trim(strtok(","));
    }
***************
*** 328,333 ****
  
    HTML_Head1($text);
! #  echo "<BODY MARGINWIDTH=0 MARGINHEIGHT=0>\n";
!   echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
      $tutos[useoverlib] = 1;
--- 334,340 ----
  
    HTML_Head1($text);
!   /* Margins are needed for Netscape */
!   echo "<BODY MARGINWIDTH=0 MARGINHEIGHT=0>\n";
! #  echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
      $tutos[useoverlib] = 1;
***************
*** 401,406 ****
  
    HTML_Head1($text);
!   echo "<BODY>\n";
! #  echo "<BODY MARGINWIDTH=0 MARGINHEIGHT=0>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
      $tutos[useoverlib] = 1;
--- 408,414 ----
  
    HTML_Head1($text);
!   /* Margins are needed for Netscape */
!   echo "<BODY MARGINWIDTH=0 MARGINHEIGHT=0>\n";
! #  echo "<BODY>\n";
    if ( ($tutos[useoverlib] == 1) && file_exists($tutos[overlib]) && is_readable($tutos[overlib]) ) {
      $tutos[useoverlib] = 1;

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

Modified Files:
	Makefile.in 
Log Message:
New: dutch language files

Index: Makefile.in
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** Makefile.in	2001/07/26 17:14:49	1.51
--- Makefile.in	2001/08/09 22:08:25	1.52
***************
*** 11,14 ****
--- 11,17 ----
  #
  # $Log$
+ # Revision 1.52  2001/08/09 22:08:25  gokohnert
+ # New: dutch language files
+ #
  # Revision 1.51  2001/07/26 17:14:49  gokohnert
  # Prepare Release 2001072x III
***************
*** 315,318 ****
--- 318,322 ----
  	php/ko.p3 \
  	php/pl.p3 \
+ 	php/nl.p3 \
  	php/pt-br.p3
  
***************
*** 775,778 ****
--- 779,783 ----
  	cut -f1 -d "=" php/ko.p3 | grep "^.lang"  > l.ko
  	cut -f1 -d "=" php/pl.p3 | grep "^.lang"  > l.pl
+ 	cut -f1 -d "=" php/nl.p3 | grep "^.lang"  > l.nl
  	cut -f1 -d "=" php/pt-br.p3 | grep "^.lang"  > l.pt
  	@echo "----------------------------------------"
***************
*** 796,799 ****
--- 801,806 ----
  	@echo "----------------------------------------"
  	-diff l.en l.pt
+ 	@echo "----------------------------------------"
+ 	-diff l.en l.nl
  
  #

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

Modified Files:
	blue.css red.css sqli.css tutos.css visual.css 
Log Message:
new week style sheet element 

Index: blue.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/blue.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** blue.css	2001/07/21 16:03:33	1.11
--- blue.css	2001/08/09 14:58:58	1.12
***************
*** 125,142 ****
--- 125,153 ----
  .holiday {
          background-color: #FFD0D0;
+ 	vertical-align: top;
  }
  
  .freeday {
          background-color: #FFE0E0;
+ 	vertical-align: top;
  }
  
  .appday {
          background-color: #E0E0E0;
+ 	vertical-align: top;
  }
  
  .today {
          background-color: #E0F0E0;
+ 	vertical-align: top;
  }
  
+ .week {
+         background-color: #BBCCDD;
+         font-weight: bold;
+ 	width: 5%;
+ 	vertical-align: top;
+ }
+ 
  .privapp {
          background-color: #FFEEEE;
***************
*** 177,179 ****
  }
  
! /* EOF */
\ No newline at end of file
--- 188,190 ----
  }
  
! /* EOF */

Index: red.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/red.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** red.css	2001/07/21 16:03:33	1.5
--- red.css	2001/08/09 14:58:58	1.6
***************
*** 122,137 ****
--- 122,148 ----
  .holiday {
          background-color: #FFD0D0;
+ 	vertical-align: top;
  }
  
  .freeday {
          background-color: #FFE0E0;
+ 	vertical-align: top;
  }
  
  .appday {
          background-color: #E0E0E0;
+ 	vertical-align: top;
  }
  
  .today {
          background-color: #E0F0E0;
+ 	vertical-align: top;
+ }
+ 
+ .week {
+         background-color: #BBCCDD;
+         font-weight: bold;
+ 	width: 5%;
+ 	vertical-align: top;
  }
  

Index: sqli.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/sqli.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** sqli.css	2001/06/22 20:19:07	1.1
--- sqli.css	2001/08/09 14:58:58	1.2
***************
*** 103,120 ****
--- 103,151 ----
  }
  
+ /* OFFICE */
+ .apploc_0 {
+         color: black;
+ }
+ 
+ /* OUT */
+ .apploc_1 {
+         color: black;
+ }
+ 
+ /* VACATION */
+ .apploc_2 {
+         color: green;
+ }
+ 
+ /* SICK */
+ .apploc_3 {
+         color: red;
+ }
+ 
  .holiday {
          background-color: #FFD0D0;
+ 	vertical-align: top;
  }
  
  .freeday {
          background-color: #FFE0E0;
+ 	vertical-align: top;
  }
  
  .appday {
          background-color: #E0E0E0;
+ 	vertical-align: top;
  }
  
  .today {
          background-color: #E0F0E0;
+ 	vertical-align: top;
+ }
+ 
+ .week {
+         background-color: #BBCCDD;
+         font-weight: bold;
+ 	width: 5%;
+ 	vertical-align: top;
  }
  
***************
*** 157,159 ****
  }
  
! /* EOF */
\ No newline at end of file
--- 188,190 ----
  }
  
! /* EOF */

Index: tutos.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/tutos.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** tutos.css	2001/07/21 16:03:33	1.13
--- tutos.css	2001/08/09 14:58:58	1.14
***************
*** 123,138 ****
--- 123,149 ----
  .holiday {
          background-color: #FFD0D0;
+ 	vertical-align: top;
  }
  
  .freeday {
          background-color: #FFE0E0;
+ 	vertical-align: top;
  }
  
  .appday {
          background-color: #E0E0E0;
+ 	vertical-align: top;
  }
  
  .today {
          background-color: #E0F0E0;
+ 	vertical-align: top;
+ }
+ 
+ .week {
+         background-color: #BBCCDD;
+         font-weight: bold;
+ 	width: 5%;
+ 	vertical-align: top;
  }
  

Index: visual.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/visual.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** visual.css	2001/07/21 16:03:33	1.3
--- visual.css	2001/08/09 14:58:58	1.4
***************
*** 131,146 ****
--- 131,157 ----
  .holiday {
          background-color: #FFD0D0;
+ 	vertical-align: top;
  }
  
  .freeday {
          background-color: #FFE0E0;
+ 	vertical-align: top;
  }
  
  .appday {
          background-color: #E0E0E0;
+ 	vertical-align: top;
  }
  
  .today {
          background-color: #E0F0E0;
+ 	vertical-align: top;
+ }
+ 
+ .week {
+         background-color: #BBCCDD;
+         font-weight: bold;
+ 	width: 5%;
+ 	vertical-align: top;
  }
  

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

Modified Files:
	mytutos.php calendar.php 
Log Message:
new week style sheet element 

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** mytutos.php	2001/08/09 10:32:03	1.17
--- mytutos.php	2001/08/09 14:58:57	1.18
***************
*** 62,66 ****
  
     echo " <TR>\n";
!    echo " <TD VALIGN=top WIDTH=\"5%\" BGCOLOR=\"#BBCCDD\"><B>". $wn ."/". $yy ."</B></TD>\n";
     $day = 0;
     while ( $day < 7 ) {
--- 62,66 ----
  
     echo " <TR>\n";
!    echo " <TD CLASS=week WIDTH=\"5%\">". $wn ."/". $yy ."</TD>\n";
     $day = 0;
     while ( $day < 7 ) {
***************
*** 77,81 ****
       readTaskCal($current_user,$from);
  
!      echo "<TD VALIGN=top CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
  
       if ( isset($dinfo[Desc]) ) {
--- 77,81 ----
       readTaskCal($current_user,$from);
  
!      echo "<TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
  
       if ( isset($dinfo[Desc]) ) {

Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** calendar.php	2001/08/09 10:32:03	1.16
--- calendar.php	2001/08/09 14:58:57	1.17
***************
*** 138,142 ****
     $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
     $yy = Date("y",$ts);
!    echo " <TD VALIGN=top WIDTH=\"5%\" BGCOLOR=\"#BBCCDD\"><B>". $wn ."/". $yy ."</B></TD>\n";
  
     $day = 0;
--- 138,142 ----
     $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
     $yy = Date("y",$ts);
!    echo " <TD WIDTH=\"5%\" CLASS=week>". $wn ."/". $yy ."</TD>\n";
  
     $day = 0;
***************
*** 146,150 ****
       $dinfo = GetDaysInfo($ts);
  
!      echo "<TD VALIGN=top CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
  
       if ( isset($dinfo[Desc]) ) {
--- 146,150 ----
       $dinfo = GetDaysInfo($ts);
  
!      echo "<TD CLASS=\"". $dinfo[color] ."\" WIDTH=\"10%\">\n";
  
       if ( isset($dinfo[Desc]) ) {
***************
*** 171,212 ****
         @reset($xxx);
         while( list ($a,$apo) = @each ($xxx)) {
- 	
  		 /* if user is not interessted in - show nothing */
  	     $found = 0;
! 	 if ( ! isset($uids[0])  ) {
! 	   @reset($apo->participant);
! 	   while ( list ($i,$f) = @each ($apo->participant) ) {
! 	     @reset($uids);
! 	     while ( list ($i1,$f1) = @each ($uids) ) {
! 	       if (  ($f->id == $i1) && ($f1 == 1) ) {	
! 		 $found = "$i1";
! 		 break;
! 	       }
! 	     }
! 	   }
! 	 } else {
! 	   $found = 1;
! 	 }
! 	
! 	 if ( $found == 0 ) {
! 	   /* Show nothing */
! 	   $a++;
! 	   continue;
! 	 }
! 	
! 	 if ( $hastable == 0 ) {
! 	   if ( $tutos[caltable] == 2 ) {
! 	     echo "<TABLE BGCOLOR=\"#000000\" CELLSPACING=0 CELLPADDING=1 BORDER=0 WIDTH=\"100%\"><TR><TD>";
! 	   }
! 	   echo "\n <TABLE BGCOLOR=\"white\" CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=\"100%\">\n";
! 	   $hastable = 1;
! 	 } else {
! 	   echo "  <TR><TD CLASS=app COLSPAN=3><FONT COLOR=black SIZE=-5><HR NOSHADE SIZE=1></FONT></TD></TR>\n";
! 	 }
! 	
! 	 $apo->formatted();
! 	
! 	 $a++;
! 	 $apo = 0;
         }
       }
--- 171,211 ----
         @reset($xxx);
         while( list ($a,$apo) = @each ($xxx)) {
  		 /* if user is not interessted in - show nothing */
  	     $found = 0;
!          if ( ! isset($uids[0])  ) {
!            @reset($apo->participant);
!            while ( list ($i,$f) = @each ($apo->participant) ) {
!              @reset($uids);
!              while ( list ($i1,$f1) = @each ($uids) ) { 
!                if (  ($f->id == $i1) && ($f1 == 1) ) {	     
!                  $found = "$i1";
!                  break;
!                }
!              }
!            }
!          } else {
!            $found = 1;
!          }
! 	 
!          if ( $found == 0 ) {
!            /* Show nothing */
!            $a++;
!            continue;
!          }
! 	 
!          if ( $hastable == 0 ) {
!            if ( $tutos[caltable] == 2 ) {
!              echo "<TABLE BGCOLOR=\"#000000\" CELLSPACING=0 CELLPADDING=1 BORDER=0 WIDTH=\"100%\"><TR><TD>";
!            }
!            echo "\n <TABLE BGCOLOR=\"white\" CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=\"100%\">\n";
!            $hastable = 1;
!          } else {
!            echo "  <TR><TD CLASS=app COLSPAN=3><FONT COLOR=black SIZE=-5><HR NOSHADE SIZE=1></FONT></TD></TR>\n";
!          }
! 	 
!          $apo->formatted();
! 	 
!          $a++;
!          $apo = 0;
         }
       }

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

Modified Files:
	appointment.pinc 
Log Message:
changed resource save 

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** appointment.pinc	2001/08/09 10:32:03	1.41
--- appointment.pinc	2001/08/09 14:55:29	1.42
***************
*** 727,745 ****
        }
      }
!     acl_save($this);
      @DB_Commit($this->conn,"WORK");
  
-     # Book Resources
-     $q="DELETE from res_use where obj_id = ". $this->id ;
-     $r = @DB_Exec($this->conn,$q);
-     if ( count($this->res) > 0 ) {
-       @reset($this->res);
-       while ( list ($i,$f) = @each ($this->res) ) {
- 	    if ( $f != "" ) {
- 	      $q = "INSERT INTO res_use (res_id,obj_id) VALUES (". $f .",". $this->id .")";
- 		  $r = @DB_Exec($this->conn,$q);
- 		}
-       }
-     }
  
      # Mail things come here !
--- 727,734 ----
        }
      }
!     $msg .= acl_save($this);
!     $msg .= resource_save($this);
      @DB_Commit($this->conn,"WORK");
  
  
      # Mail things come here !
***************
*** 769,773 ****
  		}
  		if ( ! file_exists($appmailtxt) ) {
! 	      $msg = $msg . sprintf($lang['Err0037'],$m->subject,$appmailtxt) ."<BR>\n";
  	      continue;
  		}
--- 758,762 ----
  		}
  		if ( ! file_exists($appmailtxt) ) {
! 	      $msg .= sprintf($lang['Err0037'],$m->subject,$appmailtxt) ."<BR>\n";
  	      continue;
  		}
***************
*** 783,787 ****
  		}
  
!         $msg = $msg . $m->send();
          $m->resetBody();
          $m->resetTo();
--- 772,776 ----
  		}
  
!         $msg .= $m->send();
          $m->resetBody();
          $m->resetTo();

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

Modified Files:
	resource.pinc resource_show.php 
Log Message:
New: Resource Allocation for products/tasks/installations

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource.pinc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** resource.pinc	2001/08/09 10:32:03	1.8
--- resource.pinc	2001/08/09 14:50:15	1.9
***************
*** 12,15 ****
--- 12,37 ----
   * cols > 0  make sperate rows with cols columns for each note
   */
+ function resource_save(&$obj) {
+   global $tutos,$lang;
+ 
+   $msg = "";
+   # Book Resources
+   $q="DELETE from res_use where obj_id = ". $obj->id ;
+   $r = @DB_Exec($obj->conn,$q);
+   if ( count($obj->res) > 0 ) {
+     @reset($obj->res);
+     while ( list ($i,$f) = @each ($obj->res) ) {
+       if ( $f != "" ) {
+         $q = "INSERT INTO res_use (res_id,obj_id) VALUES (". $f .",". $obj->id .")";
+         $r = @DB_Exec($obj->conn,$q);
+       }
+     }
+   }
+   return $msg;
+ }
+ /* ---------------------------------------------------------------------------
+  * List all resources
+  * cols > 0  make sperate rows with cols columns for each note
+  */
  function showResources(&$obj,$cols,$rows = 0) {
    global $tutos,$lang;

Index: resource_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource_show.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** resource_show.php	2001/08/09 10:32:03	1.3
--- resource_show.php	2001/08/09 14:50:15	1.4
***************
*** 9,12 ****
--- 9,14 ----
   include("task.pinc");
   include("resource.pinc");
+  include("installation.pinc");
+  include("product.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 23,35 ****
     echo " <TH COLSPAN=4>". sprintf($lang['Showing'],$b->getFullName()) ."</TH>\n";
     echo "</TR>\n";
     echo "<TR>\n";
     showfield($lang['createdby']);
     echo " <TD>". $b->creator->getLink() ."</TD>\n";
     echo "</TR><TR>\n";
     showfield($lang['ResName']);
!    echo " <TD>". $b->name ."</TD>\n";
     echo "</TR><TR>\n";
     showfield($lang['ResDesc']);
!    echo " <TD>". $b->desc ."</TD>\n";
  
     # Usage
--- 25,40 ----
     echo " <TH COLSPAN=4>". sprintf($lang['Showing'],$b->getFullName()) ."</TH>\n";
     echo "</TR>\n";
+ 
     echo "<TR>\n";
     showfield($lang['createdby']);
     echo " <TD>". $b->creator->getLink() ."</TD>\n";
+ 
     echo "</TR><TR>\n";
     showfield($lang['ResName']);
!    echo " <TD COLSPAN=3>". $b->name ."</TD>\n";
! 
     echo "</TR><TR>\n";
     showfield($lang['ResDesc']);
!    echo " <TD COLSPAN=3>". $b->desc ."</TD>\n";
  
     # Usage
***************
*** 38,49 ****
       echo "</TR><TR>\n";
       echo "<TH COLSPAN=4>". $lang['ResUsage'] ."</TH>\n";
!      # First all future appointments
       @reset ($b->ulist);
       while ( list ($i,$f) = @each ($b->ulist) ) {
         if ( ($f->getType() == "appointment") && ($f->end->getTimestamp() - time() > 0) ) {
! 	 echo "</TR><TR>\n";
! 	 echo "<TD CLASS=line_2>". $lang[$f->getType()] ."</TD>\n";
! 	 echo "<TD CLASS=line_2>". $f->getLink() ."</TD>\n";
!        }
       }
       # Then some recent appointments
--- 43,70 ----
       echo "</TR><TR>\n";
       echo "<TH COLSPAN=4>". $lang['ResUsage'] ."</TH>\n";
!      # First all future appointments and running projekts/tasks
       @reset ($b->ulist);
       while ( list ($i,$f) = @each ($b->ulist) ) {
         if ( ($f->getType() == "appointment") && ($f->end->getTimestamp() - time() > 0) ) {
!          echo "</TR><TR>\n";
!          echo "<TD CLASS=line_2>". $lang[$f->getType()] ."</TD>\n";
!          echo "<TD COLSPAN=2 CLASS=line_2>". $f->getLink() ."</TD>\n";
!          echo "<TD CLASS=line_2>". "" ."</TD>\n";
!        } else if ( ($f->getType() == "task") && ($f->s_end->getTimestamp() - time() > 0) ) {
!          echo "</TR><TR>\n";
!          echo "<TD CLASS=line_2>". $lang[$f->getType()] ."</TD>\n";
!          echo "<TD COLSPAN=2 CLASS=line_2>". $f->getLink() ."</TD>\n";
!          echo "<TD CLASS=line_2>". $f->getTimespan() ."</TD>\n";
! 	   } else if ( ($f->getType() == "product") &&  ($f->isalive() == 1) ) {
!          echo "</TR><TR>\n";
!          echo "<TD CLASS=line_2>". $lang[$f->getType()] ."</TD>\n";
!          echo "<TD COLSPAN=2 CLASS=line_2>". $f->getLink() ."</TD>\n";
!          echo "<TD CLASS=line_2>". $f->getTimespan() ."</TD>\n";
! 	   } else if ( ($f->getType() == "installation") &&  ($f->instdate->getTimestamp() - time() > 0) ) {
!          echo "</TR><TR>\n";
!          echo "<TD CLASS=line_2>". $lang[$f->getType()] ."</TD>\n";
!          echo "<TD COLSPAN=2 CLASS=line_2>". $f->getLink() ."</TD>\n";
!          echo "<TD CLASS=line_2>". $f->instdate->getDate() ."</TD>\n";
! 	   }
       }
       # Then some recent appointments
***************
*** 52,60 ****
       while ( (list ($i,$f) = @each ($b->ulist)) && ($x < $tutos[maxshort]) ) {
         if ( ($f->getType() == "appointment") && ($f->end->getTimestamp() - time() < 0) ) {
! 	 echo "</TR><TR>\n";
! 	 echo "<TD CLASS=line_1>". $lang[$f->getType()] ."</TD>\n";
! 	 echo "<TD CLASS=line_1><I>". $f->getLink() ."</I></TD>\n";
! 	 $x++;
         }
       }
     }
--- 73,105 ----
       while ( (list ($i,$f) = @each ($b->ulist)) && ($x < $tutos[maxshort]) ) {
         if ( ($f->getType() == "appointment") && ($f->end->getTimestamp() - time() < 0) ) {
!          echo "</TR><TR>\n";
!          echo "<TD CLASS=line_1>". $lang[$f->getType()] ."</TD>\n";
!          echo "<TD COLSPAN=2 CLASS=line_1><I>". $f->getLink() ."</I></TD>\n";
!          echo "<TD CLASS=line_1><I>". "" ."</I></TD>\n";
!          $x++;
         }
+      }
+      # Then the old tasks and projects
+      $x = 0;
+      @reset ($b->ulist);
+      while ( (list ($i,$f) = @each ($b->ulist)) && ($x < $tutos[maxshort]) ) {
+        if ( ($f->getType() == "task") && ($f->s_end->getTimestamp() - time() < 0) ) {
+          echo "</TR><TR>\n";
+          echo "<TD CLASS=line_1>". $lang[$f->getType()] ."</TD>\n";
+          echo "<TD COLSPAN=2 CLASS=line_1><I>". $f->getLink() ."</I></TD>\n";
+          echo "<TD CLASS=line_1>". $f->getTimespan() ."</TD>\n";
+          $x++;
+        } else if ( ($f->getType() == "product") &&  ($f->isalive() == 0) ) {
+          echo "</TR><TR>\n";
+          echo "<TD CLASS=line_1>". $lang[$f->getType()] ."</TD>\n";
+          echo "<TD COLSPAN=2 CLASS=line_1><I>". $f->getLink() ."</I></TD>\n";
+          echo "<TD CLASS=line_1>".  $f->getTimespan() ."</TD>\n";
+          $x++;
+ 	   } else if ( ($f->getType() == "installation") &&  ($f->instdate->getTimestamp() - time() < 0) ) {
+          echo "</TR><TR>\n";
+          echo "<TD CLASS=line_1>". $lang[$f->getType()] ."</TD>\n";
+          echo "<TD COLSPAN=2 CLASS=line_1><I>". $f->getLink() ."</I></TD>\n";
+          echo "<TD CLASS=line_1>". $f->instdate->getDate() ."</TD>\n";
+ 	   }
       }
     }

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

Modified Files:
	product.pinc product_ins.php product_new.php product_show.php 
Log Message:
New: Resource Allocation for products/projects

Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** product.pinc	2001/08/09 10:32:03	1.33
--- product.pinc	2001/08/09 14:49:22	1.34
***************
*** 452,455 ****
--- 452,479 ----
    }
    /* ---------------------------------------------------------------------------
+    * get the timespan
+    */
+   function getTimespan () {
+ 	$r = "";
+     if ( $this->p_start->notime != 1 ) {
+       $r .= $this->p_start->getDate();
+ 	}
+     $r .= " - ";
+     if ( $this->p_end->notime != 1 ) {
+       $r .= $this->p_end->getDate();
+ 	}	
+     return $r;
+   }
+   /* ---------------------------------------------------------------------------
+    * Return true if project is running in some way
+    */
+   function isalive() {
+     if (  ($this->state == 2) || ($this->state == 3) || ($this->state == 5) ) {
+       return 0;
+ 	} else {
+       return 1;
+ 	}
+   }
+   /* ---------------------------------------------------------------------------
     * Return Info about bugs in this product
     */
***************
*** 502,505 ****
--- 526,536 ----
    }
    /* ---------------------------------------------------------------------------
+    * Return Info about resources used by this product
+    */
+   function readRes() {
+     readRes($this);
+     return;
+   }
+   /* ---------------------------------------------------------------------------
     * Return Info about connected tasks of this product
     */
***************
*** 706,710 ****
     */
    function save() {
!     global $tutos, $lang, $current_user;
  
      $msg = "";
--- 737,741 ----
     */
    function save() {
!     global $current_user,$tutos;
  
      $msg = "";
***************
*** 823,828 ****
        $this->saveclassification($cl);
      }
!     acl_save($this);
!     $msg = $msg . history_save($this);
      @DB_Commit($this->conn,"WORK");
      # DB_FreeResult ($r);
--- 854,861 ----
        $this->saveclassification($cl);
      }
!     $msg .= acl_save($this);
!     $msg .= history_save($this);
! 	$msg .= resource_save($this);
! 
      @DB_Commit($this->conn,"WORK");
      # DB_FreeResult ($r);
***************
*** 834,837 ****
--- 867,872 ----
     */
    function delete() {
+     global $lang, $tutos;
+ 
      $msg = "";
  

Index: product_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_ins.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** product_ins.php	2001/08/09 10:32:03	1.12
--- product_ins.php	2001/08/09 14:49:22	1.13
***************
*** 11,14 ****
--- 11,15 ----
   include("history.pinc");
   include("mail.pinc");
+  include("resource.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 113,116 ****
--- 114,129 ----
   }
  
+  #
+  # Resources
+  #
+  if ( isset($res) && (count($res) > 0)) {
+    @reset($res);
+    while ( list ($i,$f) = @each ($res) ) {
+      $gotourl= addUrlParameter($gotourl,"res[]=".$f );
+    }
+  } else {
+    $res = array();
+  }
+ 
   # Classification
   for ( $cl = 1;$cl <= $p->classes; $cl++) {
***************
*** 156,159 ****
--- 169,174 ----
     $p->setPStart($pstart);
     $p->setPEnd($pend);
+ 
+    $p->res = $res;
  
     $msg = $p->save();

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** product_new.php	2001/08/09 10:32:03	1.16
--- product_new.php	2001/08/09 14:49:22	1.17
***************
*** 10,13 ****
--- 10,14 ----
   include("url.pinc");
   include("mailbox.pinc");
+  include("resource.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 69,91 ****
     if ( $p->id > 0 ) {
       $n = 0;
!      for ( $role = 1;$role <= 6; $role++) {
         if ( isset($p->role[$role]) ) {
! 	 @reset ($p->role[$role]) ;
! 	 while ( list ($i,$o) = @each ($p->role[$role]) ) {
! 	   if ( $o->id < 1 ) {
! 	     continue;
! 	   }
! 	   echo "<TR>\n";
! 	   echo " <TD>&nbsp;</TD>\n";
! 	   echo " <TD>". $o->getLink() ."</TD>";
! 	   echo " <TD>". $lang['ProdRole'][$role] ."</TD>";
! 	   $val = $o->id .",". $role;
! 	   if ( ! isset($p->rdel[$val]) ) {
! 	     $p->rdel[$val] = "";
! 	   }
! 	   echo " <TD><INPUT TYPE=checkbox NAME=del[] value=\"". $val ."\"". $p->rdel[$val] .">". $lang['Remove'] ."</TD>";
! 	   $n++;
! 	   echo "</TR>\n";
! 	 }
         }
       }
--- 70,92 ----
     if ( $p->id > 0 ) {
       $n = 0;
!      for ( $role = 1;$role <= count($lang['ProdRole']); $role++) {
         if ( isset($p->role[$role]) ) {
! 	     @reset ($p->role[$role]) ;
!          while ( list ($i,$o) = @each ($p->role[$role]) ) {
!            if ( $o->id < 1 ) {
!              continue;
!            }
!            echo "<TR>\n";
!            echo " <TD>&nbsp;</TD>\n";
!            echo " <TD>". $o->getLink() ."</TD>";
!            echo " <TD>". $lang['ProdRole'][$role] ."</TD>";
!            $val = $o->id .",". $role;
!            if ( ! isset($p->rdel[$val]) ) {
!              $p->rdel[$val] = "";
!            }
!            echo " <TD><INPUT TYPE=checkbox NAME=del[] value=\"". $val ."\"". $p->rdel[$val] .">". $lang['Remove'] ."</TD>";
!            $n++;
!            echo "</TR>\n";
!          }
         }
       }
***************
*** 99,107 ****
     echo " <TD>\n";
     echo "  <SELECT NAME=role>\n";
!    for ( $role = 1;$role <= 6; $role++) {
       $rsel[$role] = "";
     }
     $rsel[$p->rsel] = "SELECTED";
!    for ( $role = 1;$role <= 6; $role++) {
       echo "   <OPTION VALUE=\"". $role ."\" ". $rsel[$role] .">". $lang['ProdRole'][$role] ."</OPTION>\n";
     }
--- 100,108 ----
     echo " <TD>\n";
     echo "  <SELECT NAME=role>\n";
!    for ( $role = 1;$role <= count($lang['ProdRole']); $role++) {
       $rsel[$role] = "";
     }
     $rsel[$p->rsel] = "SELECTED";
!    for ( $role = 1;$role <= count($lang['ProdRole']); $role++) {
       echo "   <OPTION VALUE=\"". $role ."\" ". $rsel[$role] .">". $lang['ProdRole'][$role] ."</OPTION>\n";
     }
***************
*** 147,150 ****
--- 148,163 ----
     echo "</TR>\n";
  
+    #
+    # Resources
+    #
+    if ( ($current_user->p[useresource] == 1) && ($tutos[useresource] == 1) ) {
+      echo "<TR>\n";
+      showfield($lang['Resources']);
+      echo " <TD COLSPAN=3>\n";
+      echo ResAskUse($p,0,0);
+      echo " </TD>\n";
+      echo "</TR>\n";
+    }
+ 
     echo "<TR>\n";
     showfieldc($lang['ProdStart']);
***************
*** 205,209 ****
    */
   Function navigate($p) {
!    global $tutos,$lang;
  
     echo "<TABLE>";
--- 218,222 ----
    */
   Function navigate($p) {
!    global $tutos,$lang,$current_user;
  
     echo "<TABLE>";
***************
*** 218,221 ****
--- 231,237 ----
       echo "<BR><BR>\n";
     }
+    if ( ($current_user->p[useresource] == 1) && ($tutos[useresource] == 1) ) {
+      echo makelink("resource_overview.php",$lang['Resources'],$lang['Resources']) ."<BR>";
+    }
  
     echo "</TD></TR>";
***************
*** 240,243 ****
--- 256,261 ----
     $p->r = $current_user;
   }
+  $p->readRes();
+ 
  
   if ( isset($name) ) {
***************
*** 310,313 ****
--- 328,332 ----
     $msg = $msg . sprintf($lang['Err0024'],$lang[$p->getType()]);
   }
+ 
   HTML_Base1();
   navigate($p);

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** product_show.php	2001/08/09 10:32:03	1.12
--- product_show.php	2001/08/09 14:49:22	1.13
***************
*** 5,8 ****
--- 5,9 ----
   include("webelements.p3");
   include("permission.p3");
+  include("product.pinc");
   include("note.pinc");
   include("file.pinc");
***************
*** 12,15 ****
--- 13,17 ----
   include("timetrack.pinc");
   include("history.pinc");
+  include("resource.pinc");
  
   /* Check if user is allowed to use it */
***************
*** 84,88 ****
     echo "</TR>\n";
  
!    for ( $role = 1;$role <= 6; $role++) {
       showrole($p,$role);
     }
--- 86,90 ----
     echo "</TR>\n";
  
!    for ( $role = 1;$role <= count($lang['ProdRole']); $role++) {
       showrole($p,$role);
     }
***************
*** 248,251 ****
--- 250,269 ----
         }
         echo " </TD>\n";
+        echo "</TR>\n";
+      } 
+    }
+ 
+    #
+    # Resources
+    #
+    if ( ($current_user->p[useresource] == 1) && ($tutos[useresource] == 1) ) {
+      $p->readRes();
+      if ( count($p->resuselist) > 0 ) {
+        @reset($p->reslist);
+        echo "<TR>\n";
+        showfield ($lang['Resources']);
+        echo " <TD VALIGN=top COLSPAN=3>\n";
+        showResources($p,0);
+        echo " </TD>";
         echo "</TR>\n";
       }