tutos-commits Mailing List for TUTOS (Page 454)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

Brought to you by: gokohnert

tutos-commits — SVN commits

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 452 453 454 455 456 .. 464 > >> (Page 454 of 464)

[Tutos-commits] CVS: tutos/php installation_new.php,1.10,1.11 installation_show.php,1.13,1.14

From: Gero K. <gok...@us...> - 2001-09-06 20:21:16

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

Modified Files:
	installation_new.php installation_show.php 
Log Message:
bugfix

Index: installation_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation_new.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** installation_new.php	2001/08/26 12:16:40	1.10
--- installation_new.php	2001/09/06 20:21:14	1.11
***************
*** 120,124 ****
       echo menulink("resource_overview.php",$lang['Resources'],$lang['Resources']) ."<BR>";
     }
!    if ( $i->id > 0 ) {
       if ( $tutos[usewatchlist] == 1 )  {
         echo "<BR>\n";
--- 120,124 ----
       echo menulink("resource_overview.php",$lang['Resources'],$lang['Resources']) ."<BR>";
     }
!    if ( $obj->id > 0 ) {
       if ( $tutos[usewatchlist] == 1 )  {
         echo "<BR>\n";

Index: installation_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation_show.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** installation_show.php	2001/08/30 16:01:58	1.13
--- installation_show.php	2001/09/06 20:21:14	1.14
***************
*** 191,195 ****
  
       if ( $obj->mod_ok() ) {
!        echo menulink("installation_new.php?id=". $obj->id,$lang['Change'],$lang['InstCreateI']) . "<BR>\n";
       }
       if ( $obj->del_ok() ) {
--- 191,195 ----
  
       if ( $obj->mod_ok() ) {
!        echo menulink("installation_new.php?id=". $obj->id,$lang['Modify'],$lang['InstCreateI']) . "<BR>\n";
       }
       if ( $obj->del_ok() ) {

[Tutos-commits] CVS: tutos/php webelements.p3,1.75,1.76

From: Gero K. <gok...@us...> - 2001-09-06 20:19:47

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

Modified Files:
	webelements.p3 
Log Message:
prevent smarttags

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** webelements.p3	2001/09/06 10:52:43	1.75
--- webelements.p3	2001/09/06 20:19:44	1.76
***************
*** 186,190 ****
    # define twodimensional part of languages (don't ask why this is neccessary for php4.0.6)
    $lang['lang'] = array();
-   $lang['lang'] = array();
    $lang['AppRemind'] = array();
    $lang['AppLoc'] = array();
--- 186,189 ----
***************
*** 419,422 ****
--- 418,422 ----
      echo "\n<!-- NO THEME ". $theme ." found -->\n";
    }
+   echo "<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\">";
  
    echo " <LINK REL=\"copyright\" HREF=\"../html/copyright.html\" TITLE=\"Copyright\">\n";

[Tutos-commits] CVS: tutos/php history_show.php,1.13,1.14

From: Gero K. <gok...@us...> - 2001-09-06 20:16:09

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

Modified Files:
	history_show.php 
Log Message:
Support of file history

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** history_show.php	2001/09/04 20:25:11	1.13
--- history_show.php	2001/09/06 20:16:05	1.14
***************
*** 145,148 ****
--- 145,149 ----
                   ||  ($f['field'] == "Customer")
                   ||  ($f['field'] == "SoldBy")
+                  ||  ($f['field'] == "FileAuthor")
                   ||  ($f['field'] == "InstalledBy") ) {
         if ( $f["old"] <= 0 ) {

[Tutos-commits] CVS: tutos/php watchlist_overview.php,1.12,1.13

From: Gero K. <gok...@us...> - 2001-09-06 20:05:34

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

Modified Files:
	watchlist_overview.php 
Log Message:
link to the history of deleted objects

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist_overview.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** watchlist_overview.php	2001/09/04 20:26:58	1.12
--- watchlist_overview.php	2001/09/06 20:05:31	1.13
***************
*** 75,79 ****
         if ( $obj == -1 ) {
           echo " <TD NOWRAP ALIGN=right>ID:". $oid ."</TD>\n";
!          echo " <TD NOWRAP ALIGN=right>". makelink("history_show.php?id=".$oid,$lang['HistoryDeleted']) ."</TD>\n";
         } else {
           echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
--- 75,79 ----
         if ( $obj == -1 ) {
           echo " <TD NOWRAP ALIGN=right>ID:". $oid ."</TD>\n";
!          echo " <TD NOWRAP ALIGN=right><I>". makelink("history_show.php?id=".$oid,$lang['HistoryDeleted']) ."</I></TD>\n";
         } else {
           echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
***************
*** 83,87 ****
       if ( $adr == -1 ) {
         if ( $aobj == -1 ) {
!          echo " <TD NOWRAP ALIGN=right>". $lang['HistoryDeleted'] ."</TD>\n";
         } else {
           echo " <TD NOWRAP ALIGN=right>". $aobj->getLink() ."</TD>\n";
--- 83,87 ----
       if ( $adr == -1 ) {
         if ( $aobj == -1 ) {
!          echo " <TD NOWRAP ALIGN=right><I>". makelink("history_show.php?id=".$aid,$lang['HistoryDeleted']) ."</I></TD>\n";
         } else {
           echo " <TD NOWRAP ALIGN=right>". $aobj->getLink() ."</TD>\n";

[Tutos-commits] CVS: tutos/php file.pinc,1.35,1.36 file_ins.php,1.11,1.12 file_new.php,1.14,1.15 file_show.php,1.12,1.13

From: Gero K. <gok...@us...> - 2001-09-06 20:04:36

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

Modified Files:
	file.pinc file_ins.php file_new.php file_show.php 
Log Message:
history extensions / author checks / filetype support / watchlist support

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** file.pinc	2001/08/26 15:31:26	1.35
--- file.pinc	2001/09/06 20:04:33	1.36
***************
*** 117,121 ****
      $n = DB_NumRows($r);
      if ( 0 == $n) {
-       $this->id = -1;
        return;
      }
--- 117,120 ----
***************
*** 153,156 ****
--- 152,159 ----
      $this->author     = new tutos_address($this->conn);
      $this->author->read($cid);
+     if ( $this->author->id == -1 ) {
+       $this->author     = new team($this->conn);
+       $this->author->read($cid);
+ 	}
  
      acl_read($this);
***************
*** 292,295 ****
--- 295,314 ----
        @passthru("tar tzvf \"". $this->base ."/". $this->fileloc ."\"");
        return;
+     } else if ( ereg("\.rpm$",$this->filename) ) {
+       Header("Expires: 0");
+       Header("Pragma: no-cache");
+       Header("Content-type: text/plain");
+       Header("Content-Description: ". $this->name );
+       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
+       @passthru("rpm -qivlp \"". $this->base ."/". $this->fileloc ."\"");
+       return;
+     } else if ( ereg("\.zip$",$this->filename) ) {
+       Header("Expires: 0");
+       Header("Pragma: no-cache");
+       Header("Content-type: text/plain");
+       Header("Content-Description: ". $this->name );
+       Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
+       @passthru("zipinfo -zl \"". $this->base ."/". $this->fileloc ."\"");
+       return;
      } else if ( ereg("\.tar\.bz2$",$this->filename) ) {
        Header("Expires: 0");
***************
*** 346,350 ****
      }
      HTML_Header("ERROR");
!     echo "Cannot Show files in format <B>" . $this->filetype . " please use download</B> !";
      HTML_Footer("");
      return;
--- 365,369 ----
      }
      HTML_Header("ERROR");
!     echo "<SPAN CLASS=warn>Cannot Show files in format <B>" . $this->filetype . " please use download</B> !</SPAN>";
      HTML_Footer("");
      return;
***************
*** 424,438 ****
    }
    /* ---------------------------------------------------------------------------
     * Save Filereference to DB
     * Copy file to repository
     */
    function save() {
!     global $current_user, $tutos;
  
      $msg = "";
      if ( !is_dir($this->base)) {
!       mkdir($this->base ,0755);
      }
  
      if ( $this->link_id == -1 ) {
        $this->ref = $this->creator;
--- 443,506 ----
    }
    /* ---------------------------------------------------------------------------
+    * set the document name
+    */
+   function setName($name) {
+     if ( $this->name != $name ) {
+       $this->modified[] = array ( "field" => "FileNameDoc" , "old" => $this->name , "new" => $name  );
+       $this->name = $name;
+     }
+     return;
+   }
+   /* ---------------------------------------------------------------------------
+    * set the files name
+    */
+   function setFilename($name) {
+     if ( $this->filename != $name ) {
+       $this->modified[] = array ( "field" => "FileName" , "old" => $this->filename , "new" => $name  );
+       $this->filename = $name;
+     }
+     return;
+   }
+   /* ---------------------------------------------------------------------------
+    * set the version
+    */
+   function setVersion($name) {
+     if ( $this->version != $name ) {
+       $this->modified[] = array ( "field" => "FileVersion", "old" => $this->version , "new" => $name );
+       $this->version = $name;
+     }
+     return;
+   }
+   /* ---------------------------------------------------------------------------
+    * set the author
+    */
+   function setAuthor(&$name) {
+     if ( $this->author->id != $name->id ) {
+       $this->modified[] = array ( "field" => "FileAuthor", "old" => $this->author->id , "new" => $name->id );
+       $this->author = $name;
+     }
+     return;
+   }
+   /* ---------------------------------------------------------------------------
     * Save Filereference to DB
     * Copy file to repository
     */
    function save() {
!     global $current_user, $tutos, $php_errormsg;
  
      $msg = "";
      if ( !is_dir($this->base)) {
!       $x = @mkdir($this->base ,0755);
!       if ( $x == FALSE ) {
!         $msg .= "<BR>Could not create ". $this->base . " ". $php_errormsg;
!       }
      }
+     if ( $msg != "" ) {
+       $this->id = -1;
+       $msg .= "<BR>FILE NOT SAVED";
+   	  return $msg;
+ 	}
  
+ 
      if ( $this->link_id == -1 ) {
        $this->ref = $this->creator;
***************
*** 442,458 ****
      if ( -1 == $this->id ) {
        $this->id = GetNextID($this->conn);
  
!       # Make the Directories
! #      if ( !is_dir($this->base . "/" . $this->link_id)) {
!       if ( !file_exists($this->base . "/" . $this->link_id)) {
!         mkdir($this->base . "/" .$this->link_id ,0755);
!       }
! #      if ( !is_dir($this->base . "/" . $this->link_id ."/". $this->id )) {
!       if ( !file_exists($this->base . "/" . $this->link_id ."/". $this->id )) {
!         mkdir($this->base . "/" .$this->link_id ."/". $this->id ,0755);
        }
  
        # Transfer the file to the repository
-       $this->fileloc =  $this->link_id ."/". $this->id ."/FILE";
        copy ($this->tmploc , $this->base ."/". $this->fileloc);
        chmod ($this->base ."/". $this->fileloc, 0600);
--- 510,541 ----
      if ( -1 == $this->id ) {
        $this->id = GetNextID($this->conn);
+       $this->fileloc =  $this->link_id ."/". $this->id ."/FILE";
+       $newfile = 1;
+     } else {
+       $newfile = 0;
+ 	}
  
!     # Make the Directories
!     if ( ! @file_exists($this->base . "/" . $this->link_id)) {
!       $x = @mkdir($this->base . "/" .$this->link_id ,0755);
!       if ( $x == FALSE ) {
!         $msg .= "<BR>Could not create ". $this->base . "/" .$this->link_id ." ". $php_errormsg;
!       }
!     }
!     if ( ! @file_exists($this->base . "/" . $this->link_id ."/". $this->id )) {
!       $x = @mkdir($this->base . "/" .$this->link_id ."/". $this->id ,0755);
!       if ( $x == FALSE ) {
!         $msg .= "<BR>Could not create ". $this->base . "/" .$this->link_id ."/". $this->id ." ". $php_errormsg;
        }
+     }
  
+     if ( $msg != "" ) {
+       $this->id = -1;
+       $msg .= "<BR>FILE NOT SAVED";
+   	  return $msg;
+ 	}
+ 
+     if ( $newfile == 1 ) {
        # Transfer the file to the repository
        copy ($this->tmploc , $this->base ."/". $this->fileloc);
        chmod ($this->base ."/". $this->fileloc, 0600);
***************
*** 477,510 ****
        $flds .= ",link_id";
        $vals .= "," . $this->link_id;
- 
        $flds .= ",name";
        $vals .= "," . DB_String($this->name);
- 
        $flds .= ",filename";
        $vals .= "," . DB_String($this->filename);
- 
        $flds .= ",loc";
        $vals .= "," . DB_String($this->fileloc);
- 
        $flds .= ",logtxt";
        $vals .= "," . DB_String($this->logtxt);
- 
        $flds .= ",version";
        $vals .= "," . DB_String($this->version);
! 
!       $flds = $flds . ",f_size";
!       $vals = $vals . "," . $this->filesize;
!       $flds = $flds . ",type";
!       $vals = $vals . ",'" . $this->filetype ."'";
!       $flds = $flds . ",creator";
!       $vals = $vals . "," . $this->creator->id;
!       $flds = $flds . ",author";
!       $vals = $vals . "," . $this->author->id;
!       $flds = $flds . ",locked";
!       $vals = $vals . "," . $this->locked;
!       $flds = $flds . ",vsys";
!       $vals = $vals . "," . $this->vsys;
!       $flds = $flds . ",creation";
!       $vals = $vals . "," . $this->creation->DB_DateTime();
        $q = "INSERT INTO files (". $flds .") VALUES(". $vals  .")";
        # Defaut Access Control
--- 560,587 ----
        $flds .= ",link_id";
        $vals .= "," . $this->link_id;
        $flds .= ",name";
        $vals .= "," . DB_String($this->name);
        $flds .= ",filename";
        $vals .= "," . DB_String($this->filename);
        $flds .= ",loc";
        $vals .= "," . DB_String($this->fileloc);
        $flds .= ",logtxt";
        $vals .= "," . DB_String($this->logtxt);
        $flds .= ",version";
        $vals .= "," . DB_String($this->version);
!       $flds .= ",f_size";
!       $vals .= "," . $this->filesize;
!       $flds .= ",type";
!       $vals .= ",'" . $this->filetype ."'";
!       $flds .= ",creator";
!       $vals .= "," . $this->creator->id;
!       $flds .= ",author";
!       $vals .= "," . $this->author->id;
!       $flds .= ",locked";
!       $vals .= "," . $this->locked;
!       $flds .= ",vsys";
!       $vals .= "," . $this->vsys;
!       $flds .= ",creation";
!       $vals .= "," . $this->creation->DB_DateTime();
        $q = "INSERT INTO files (". $flds .") VALUES(". $vals  .")";
        # Defaut Access Control
***************
*** 532,542 ****
        $q .= ",author = " . $this->author->id;
  
- 	  if ( ! file_exists($this->base . "/" . $this->link_id)) {
-         mkdir($this->base . "/" .$this->link_id ,0755);
- 	  }
- 	  if ( ! file_exists($this->base . "/" . $this->link_id ."/". $this->id)) {
-         mkdir($this->base . "/" .$this->link_id."/".$this->id ,0755);
- 	  }
- 	  $this->fileloc =  $this->link_id ."/". $this->id ."/FILE";
        # A file was given
        if ( isset($this->tmploc) ) {
--- 609,612 ----

Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_ins.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** file_ins.php	2001/08/30 10:16:51	1.11
--- file_ins.php	2001/09/06 20:04:33	1.12
***************
*** 20,32 ****
   $log = "";
  
-  if ( isset($id) ) {
-    $gotourl = addUrlParameter($gotourl,"id=". $id );
-    $f->read($id);
-  }
- 
   if ( empty($gotourl) ) {
     $gotourl = "file_new.php";
   }
  
  
   if ( !isset($link_id) ) {
--- 20,31 ----
   $log = "";
  
   if ( empty($gotourl) ) {
     $gotourl = "file_new.php";
   }
  
+  if ( isset($id) ) {
+    $gotourl = addUrlParameter($gotourl,"id=". $id );
+    $f->read($id);
+  }
  
   if ( !isset($link_id) ) {
***************
*** 69,73 ****
   if ( isset($afn) ) {
     # Check the author full name
!    $author = check_address($afn,"afn","al");
   }
  
--- 68,72 ----
   if ( isset($afn) ) {
     # Check the author full name
!    $author = check_address($afn,"afn","al","at");
   }
  
***************
*** 81,89 ****
     }
     $f->oldversion = $f->version;
!    $f->version = $version;
  
     if ( isset($aid) ) {
       $author = new tutos_address($conn);
       $author->read($aid);
     }
     if ( isset($author) ) {
--- 80,92 ----
     }
     $f->oldversion = $f->version;
!    $f->setVersion($version);
  
     if ( isset($aid) ) {
       $author = new tutos_address($conn);
       $author->read($aid);
+      if ( $author->id == -1 ) {
+        $author = new team($conn);
+        $author->read($aid);
+      }
     }
     if ( isset($author) ) {
***************
*** 91,95 ****
         $log = $log . "Changed Author from ". $f->author->getFullName() ." to ". $author->getFullName() ."\n";
       }
!      $f->author = $author;
     }
     if ( $f->locked != $locked ) {
--- 94,98 ----
         $log = $log . "Changed Author from ". $f->author->getFullName() ." to ". $author->getFullName() ."\n";
       }
!      $f->setAuthor($author);
     }
     if ( $f->locked != $locked ) {
***************
*** 123,127 ****
  	 $f->tmploc = $farr['tmp_name'];
  	 $f->filesize = $farr['size'];
! 	 $f->filename = $farr['name'];
  	 $f->filetype = $farr['type'];
     }
--- 126,130 ----
  	 $f->tmploc = $farr['tmp_name'];
  	 $f->filesize = $farr['size'];
! 	 $f->setFilename($farr['name']);
  	 $f->filetype = $farr['type'];
     }
***************
*** 129,133 ****
       $log = $log . "Changed Dokumentname from ". $f->name ." to " . $name ."\n";
     }
!    $f->name = $name;
  
     if ( $log != "" ) {
--- 132,136 ----
       $log = $log . "Changed Dokumentname from ". $f->name ." to " . $name ."\n";
     }
!    $f->setName($name);
  
     if ( $log != "" ) {
***************
*** 135,152 ****
       $f->logtxt = $log. $f->logtxt;
     }
- #echo $f->tmploc ."<BR>\n";
- #phpinfo();
- 
     # Save the new part of logmessage for RCS
     $f->newlog = $log;
- 
-    $msg = $f->save();
  
!    $gotourl = $f->getURL();
! 
! # echo "<PRE>". file_exists($file) ."</PRE>";
! # echo "<PRE>". $file ."</PRE>";
! # echo "<PRE>". readfile($file) ."</PRE>";
! 
   }
  
--- 138,148 ----
       $f->logtxt = $log. $f->logtxt;
     }
     # Save the new part of logmessage for RCS
     $f->newlog = $log;
  
!    $msg .= $f->save();
!    if ( $f->id != -1 ) {
!      $gotourl = $f->getURL();
!    }
   }
  

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** file_new.php	2001/08/30 10:16:51	1.14
--- file_new.php	2001/09/06 20:04:33	1.15
***************
*** 121,140 ****
    *
    */
!  Function navigate(&$f) {
!    global $current_user,$lang;
  
     echo "<TABLE>";
     echo "<TR><TD>";
  
!    if ( ($f->id > 0) && $f->del_ok() ) {
!      if ( $f->locked > 0 ) {
!        if ( $f->locker->id == $current_user->id ) {
!          echo confirmlink("file_del.php?id=". $f->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$f->getFullName())) ."&nbsp;<BR>";
         }
       } else {
!        echo confirmlink("file_del.php?id=". $f->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$f->getFullName())) ."&nbsp;<BR>";
       }
     }
! 
     HTML_Select();
   }
--- 121,144 ----
    *
    */
!  Function navigate(&$obj) {
!    global $current_user,$lang,$tutos;
  
     echo "<TABLE>";
     echo "<TR><TD>";
  
!    if ( ($obj->id > 0) && $obj->del_ok() ) {
!      if ( $obj->locked > 0 ) {
!        if ( $obj->locker->id == $current_user->id ) {
!          echo confirmlink("file_del.php?id=". $obj->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$obj->getFullName())) ."&nbsp;<BR>";
         }
       } else {
!        echo confirmlink("file_del.php?id=". $obj->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$obj->getFullName())) ."&nbsp;<BR>";
       }
     }
!    if ( $obj->id > 0 ) {
!      if ( $tutos[usewatchlist] == 1 ) {
!        echo menulink("watchlist_overview.php?id=".$obj->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$obj->getFullname())) ."<BR>\n";
!      }
!    }
     HTML_Select();
   }

Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** file_show.php	2001/08/26 12:16:40	1.12
--- file_show.php	2001/09/06 20:04:33	1.13
***************
*** 19,23 ****
    *
    */
!  Function info($f) {
     global $lang , $current_user;
  
--- 19,23 ----
    *
    */
!  Function info(&$f) {
     global $lang , $current_user;
  
***************
*** 97,102 ****
     echo "</TR>\n";
  
     echo "</TABLE>\n";
-    echo "</TD></TR></TABLE>\n";
   }
  
--- 97,105 ----
     echo "</TR>\n";
  
+    echo "<TR>\n";
+    echo " <TD COLSPAN=4>". makelink("history_show.php?id=". $f->id,$lang['HistoryLink'],sprintf($lang['HistoryLinkI'],$f->getFullname())) ."</TD>\n";
+    echo "</TR>\n";
+ 
     echo "</TABLE>\n";
   }
  
***************
*** 104,108 ****
    *
    */
!  Function navigate($f) {
     global $lang ,$current_user;
  
--- 107,111 ----
    *
    */
!  Function navigate($obj) {
     global $lang ,$current_user;
  
***************
*** 110,135 ****
     echo "<TR><TD>";
  
!    if ( ($f->id > 0) && $f->see_ok() ) {
!      echo menulink("file_show.php?format=show&id=". $f->id ,$lang['FileShow'],sprintf($lang['FileShowI'],$f->getFullName())) ."&nbsp;<BR>";
     }
!    if ( ($f->id > 0) && $f->mod_ok() ) {
!      echo menulink("file_show.php?format=download&id=". $f->id ,$lang['FileDownload'],sprintf($lang['FileDownloadI'],$f->getFullName())) ."&nbsp;<BR>";
!      if ( $f->locked > 0 ) {
!        if ( $f->locker->id == $current_user->id ) {
!          echo menulink("file_new.php?id=". $f->id ,$lang['Modify'],sprintf($lang['FileModifyI'],$f->getFullName())) ."&nbsp;<BR>";
         }
       } else {
!        echo menulink("file_new.php?id=". $f->id ,$lang['Modify'],sprintf($lang['FileModifyI'],$f->getFullName())) ."&nbsp;<BR>";
       }
     }
!    if ( ($f->id > 0) && $f->del_ok() ) {
!      if ( $f->locked > 0 ) {
!        if ( $f->locker->id == $current_user->id ) {
!          echo confirmlink("file_del.php?id=". $f->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$f->getFullName())) ."&nbsp;<BR>";
         }
       } else {
!        echo confirmlink("file_del.php?id=". $f->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$f->getFullName())) ."&nbsp;<BR>";
       }
     }
     HTML_Select();
   }
--- 113,141 ----
     echo "<TR><TD>";
  
!    if ( ($obj->id > 0) && $obj->see_ok() ) {
!      echo menulink("file_show.php?format=show&id=". $obj->id ,$lang['FileShow'],sprintf($lang['FileShowI'],$obj->getFullName())) ."&nbsp;<BR>";
     }
!    if ( ($obj->id > 0) && $obj->mod_ok() ) {
!      echo menulink("file_show.php?format=download&id=". $obj->id ,$lang['FileDownload'],sprintf($lang['FileDownloadI'],$obj->getFullName())) ."&nbsp;<BR>";
!      if ( $obj->locked > 0 ) {
!        if ( $obj->locker->id == $current_user->id ) {
!          echo menulink("file_new.php?id=". $obj->id ,$lang['Modify'],sprintf($lang['FileModifyI'],$obj->getFullName())) ."&nbsp;<BR>";
         }
       } else {
!        echo menulink("file_new.php?id=". $obj->id ,$lang['Modify'],sprintf($lang['FileModifyI'],$obj->getFullName())) ."&nbsp;<BR>";
       }
     }
!    if ( ($obj->id > 0) && $obj->del_ok() ) {
!      if ( $obj->locked > 0 ) {
!        if ( $obj->locker->id == $current_user->id ) {
!          echo confirmlink("file_del.php?id=". $obj->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$obj->getFullName())) ."&nbsp;<BR>";
         }
       } else {
!        echo confirmlink("file_del.php?id=". $obj->id ,$lang['Delete'],sprintf($lang['FileDeleteI'],$obj->getFullName())) ."&nbsp;<BR>";
       }
     }
+    echo "<BR>\n";
+    watchlist_link($obj,$current_user);
+    echo "<BR>\n";
     HTML_Select();
   }
***************
*** 157,161 ****
   }
   if ( ! isset($version) ) {
!    $version = "";
   }
  
--- 163,167 ----
   }
   if ( ! isset($version) ) {
!    $version = $f->version;
   }
  
***************
*** 163,173 ****
     $f->show($version);
   } else if ( $format == "download" ) {
!    if ( $f->filetype != "" ) {
       Header("Content-type: ". $f->filetype);
     } else {
       Header("Content-type: text/plain");
-    }
-    if ( $version == "" ) {
-      # For older versions content type / name could be wrong
     }
     Header("Content-Disposition: attachment; filename=\"". $f->filename ."\"");
--- 169,176 ----
     $f->show($version);
   } else if ( $format == "download" ) {
!    if ( ($f->filetype != "") && ($f->version == $version) ) {
       Header("Content-type: ". $f->filetype);
     } else {
       Header("Content-type: text/plain");
     }
     Header("Content-Disposition: attachment; filename=\"". $f->filename ."\"");

[Tutos-commits] CVS: tutos/php history.pinc,1.13,1.14

From: Gero K. <gok...@us...> - 2001-09-06 12:47:11

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

Modified Files:
	history.pinc 
Log Message:
use apache datetime instead of database datetime

Index: history.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history.pinc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** history.pinc	2001/08/31 08:57:02	1.13
--- history.pinc	2001/09/06 12:47:08	1.14
***************
*** 73,76 ****
--- 73,78 ----
      return;
    }
+ 
+   $t = new DateTime();
    @reset ($obj->modified);
    while ( list ($i,$f) = @each ($obj->modified) ) {
***************
*** 88,92 ****
      }
      $vals .= "," . DB_String($f["field"]);
!     $vals .= "," . DB_now();
      $vals .= "," . DB_String($f["old"]);
      $vals .= "," . DB_String($f["new"]);
--- 90,94 ----
      }
      $vals .= "," . DB_String($f["field"]);
!     $vals .= "," . $t->DB_DateTime();
      $vals .= "," . DB_String($f["old"]);
      $vals .= "," . DB_String($f["new"]);

[Tutos-commits] CVS: tutos/php timetrack.pinc,1.15,1.16

From: Gero K. <gok...@us...> - 2001-09-06 12:46:23

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

Modified Files:
	timetrack.pinc 
Log Message:
Save original ids

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** timetrack.pinc	2001/08/26 15:31:26	1.15
--- timetrack.pinc	2001/09/06 12:46:20	1.16
***************
*** 53,57 ****
--- 53,59 ----
      $this->conn     = $conn;
      $this->id       = -1;
+     $this->wid      = $current_user->id;
      $this->worker   = $current_user;
+     $this->link_id  = -1;
      $this->desc     = "";
      $this->volume   = 0;
***************
*** 65,78 ****
  
      $this->id          = DB_Result($result, $pos, "id");
!     $wid               = DB_Result($result, $pos, "adr_id");
      $this->worker = new tutos_address($this->conn);
!     $this->worker->read($wid);
      if ( $this->worker->id == -1 ) {
        $this->worker = new team($this->conn);
!       $this->worker->read($wid);
      }
!     $wid               = DB_Result($result, $pos, "link_id");
!     $this->link_id = $wid;
!     $this->ref = getObject($wid);
      $this->desc        = StripSlashes(DB_Result($result, $pos, "description"));
      $this->volume      = DB_Result($result, $pos, "volume");
--- 67,79 ----
  
      $this->id          = DB_Result($result, $pos, "id");
!     $this->wid         = DB_Result($result, $pos, "adr_id");
      $this->worker = new tutos_address($this->conn);
!     $this->worker->read($this->wid);
      if ( $this->worker->id == -1 ) {
        $this->worker = new team($this->conn);
!       $this->worker->read($this->wid);
      }
!     $this->link_id = DB_Result($result, $pos, "link_id");
!     $this->ref = getObject($this->link_id);
      $this->desc        = StripSlashes(DB_Result($result, $pos, "description"));
      $this->volume      = DB_Result($result, $pos, "volume");

[Tutos-commits] CVS: tutos/php product_new.php,1.23,1.24

From: Gero K. <gok...@us...> - 2001-09-06 10:53:48

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

Modified Files:
	product_new.php 
Log Message:
show watchlist link only if supported

Index: product_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_new.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** product_new.php	2001/08/31 20:31:44	1.23
--- product_new.php	2001/09/06 10:53:45	1.24
***************
*** 228,232 ****
       echo  confirmlink("product_del.php?id=". $p->id,$lang['Delete'],sprintf($lang['ProdDelInfo'],$p->getFullname()));
       echo "&nbsp;<BR><BR>\n";
!      echo menulink("watchlist_overview.php?id=".$p->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$p->getFullname())) ."<BR>\n";
     } else {
       echo "<BR><BR>\n";
--- 228,235 ----
       echo  confirmlink("product_del.php?id=". $p->id,$lang['Delete'],sprintf($lang['ProdDelInfo'],$p->getFullname()));
       echo "&nbsp;<BR><BR>\n";
! 
!      if ( $tutos[usewatchlist] == 1 ) {
!        echo menulink("watchlist_overview.php?id=".$p->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$p->getFullname())) ."<BR>\n";
!      }
     } else {
       echo "<BR><BR>\n";

[Tutos-commits] CVS: tutos/php webelements.p3,1.74,1.75

From: Gero K. <gok...@us...> - 2001-09-06 10:52:46

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

Modified Files:
	webelements.p3 
Log Message:
initialize variables

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** webelements.p3	2001/09/04 20:23:18	1.74
--- webelements.p3	2001/09/06 10:52:43	1.75
***************
*** 950,953 ****
--- 950,957 ----
     }
     $n = 0;
+    $n1 = 0;
+    $n2 = 0;
+    $n3 = 0;
+    $n4 = 0;
     if ( strstr($mode,"a") != FALSE ) {
       $q1 = "SELECT * from addresses WHERE". DB_Like ("f_name",$name,"m_name","l_name");

[Tutos-commits] CVS: tutos/php timetrack_overview.php,1.12,1.13 product_overview.php,1.24,1.25 graph_bars.php,1.6,1.7 bug_overview.php,1.18,1.19

From: Gero K. <gok...@us...> - 2001-09-06 10:52:02

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

Modified Files:
	timetrack_overview.php product_overview.php graph_bars.php 
	bug_overview.php 
Log Message:
support of jpgraph charts (initial)

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** timetrack_overview.php	2001/08/24 15:04:00	1.12
--- timetrack_overview.php	2001/09/06 10:51:59	1.13
***************
*** 63,72 ****
       echo " <TD ALIGN=right>". makelink("timetrack_new.php?id=". $tt->id ,($a + 1),$lang['TimetrackModify']) ."</TD>\n";
       if ( $tt->ref ==  -1 ) {
!        echo " <TD>". $lang['HistoryDeleted'] ."</TD>\n";
       } else {
         echo " <TD>". $tt->ref->getLink() ."</TD>\n";
       }
       if ( $tt->worker->id ==  -1 ) {
!        echo " <TD>". $lang['HistoryDeleted'] ."</TD>\n";
       } else {
         echo " <TD>". $tt->worker->getLink() ."</TD>\n";
--- 63,72 ----
       echo " <TD ALIGN=right>". makelink("timetrack_new.php?id=". $tt->id ,($a + 1),$lang['TimetrackModify']) ."</TD>\n";
       if ( $tt->ref ==  -1 ) {
!        echo " <TD><I>". makelink("history_show.php?id=". $tt->link_id ,$lang['HistoryDeleted']) ."</I></TD>\n";
       } else {
         echo " <TD>". $tt->ref->getLink() ."</TD>\n";
       }
       if ( $tt->worker->id ==  -1 ) {
!        echo " <TD><I>". makelink("history_show.php?id=". $tt->wid ,$lang['HistoryDeleted']) ."</I></TD>\n";
       } else {
         echo " <TD>". $tt->worker->getLink() ."</TD>\n";
***************
*** 149,153 ****
  
     $link = "graph_bars.php";
!    $c = 1;
     while ( list ($i,$f) = @each ($w) ) {
       $val = number_format($f * 100.0 / $v ,2);
--- 149,153 ----
  
     $link = "graph_bars.php";
!    $c = 0;
     while ( list ($i,$f) = @each ($w) ) {
       $val = number_format($f * 100.0 / $v ,2);
***************
*** 162,169 ****
     echo "</TR>\n";
  
!    $c = 1;
     $r = 0;
     while ( list ($i,$f) = @each ($p) ) {
!      if ( $c == 1 ) {
         $r++;
         $links[$r] = "graph_bars.php";
--- 162,169 ----
     echo "</TR>\n";
  
!    $c = 0;
     $r = 0;
     while ( list ($i,$f) = @each ($p) ) {
!      if ( $c == 0 ) {
         $r++;
         $links[$r] = "graph_bars.php";
***************
*** 179,184 ****
       $links[$r] = addUrlParameter($links[$r],"t1[". $c ."]=". UrlEncode($f ." ". $lang['hours']));
       $c++;
!      if ( $c == 6 ) {
!        $c = 1;
       }
     }
--- 179,184 ----
       $links[$r] = addUrlParameter($links[$r],"t1[". $c ."]=". UrlEncode($f ." ". $lang['hours']));
       $c++;
!      if ( $c == 5 ) {
!        $c = 0;
       }
     }

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** product_overview.php	2001/08/31 21:29:05	1.24
--- product_overview.php	2001/09/06 10:51:59	1.25
***************
*** 501,504 ****
--- 501,505 ----
     echo "<TR>\n";
     $link = "graph_bars.php";
+    $link = addUrlParameter($link,"type=pie");
     @reset($states);
     if ( !function_exists('ImageCreate') ) {
***************
*** 507,511 ****
       showfield($lang['ProdState']);
     }
!    $c = 1;
     while ( list ($i,$f) = @each ($states) ) {
       $val = number_format($f * 100.0 / $cnt ,2);
--- 508,512 ----
       showfield($lang['ProdState']);
     }
!    $c = 0;
     while ( list ($i,$f) = @each ($states) ) {
       $val = number_format($f * 100.0 / $cnt ,2);
***************
*** 528,531 ****
--- 529,533 ----
       echo "<TR>\n";
       $link = "graph_bars.php";
+      $link = addUrlParameter($link,"type=pie");
       @reset($cl[$c]);
       if ( !function_exists('ImageCreate') ) {
***************
*** 534,554 ****
         showfield($lang['ProdClass'.$c]);
       }
!      $x = 1;
       while ( list ($i,$f) = @each ($cl[$c]) ) {
         $val = number_format($f * 100.0 / $cnt ,2);
         if ( !function_exists('ImageCreate') ) {
! 	 if ( isset($lang['ProdClasses'.$c][$i]) ) {
! 	   echo " <TD>". $lang['ProdClasses'.$c][$i] ."</TD>\n";
! 	 } else {
! 	   echo " <TD>". $i ."</TD>\n";
! 	 }
! 	 echo " <TD ALIGN=right>". $f ."</TD>\n";
! 	 echo " <TD ALIGN=right>". $val ."%</TD>\n";
         }
         $link = addUrlParameter($link,"f[". $x ."]=".$val);
         if ( isset($lang['ProdClasses'.$c][$i]) ) {
! 	 $link = addUrlParameter($link,"t0[". $x ."]=". UrlEncode($lang['ProdClasses'.$c][$i]));
         } else {
! 	 $link = addUrlParameter($link,"t0[". $x ."]=". $i);
         }
         $link = addUrlParameter($link,"t1[". $x ."]=". $f );
--- 536,556 ----
         showfield($lang['ProdClass'.$c]);
       }
!      $x = 0;
       while ( list ($i,$f) = @each ($cl[$c]) ) {
         $val = number_format($f * 100.0 / $cnt ,2);
         if ( !function_exists('ImageCreate') ) {
!          if ( isset($lang['ProdClasses'.$c][$i]) ) {
!            echo " <TD>". $lang['ProdClasses'.$c][$i] ."</TD>\n";
!          } else {
!            echo " <TD>". $i ."</TD>\n";
!          }
!          echo " <TD ALIGN=right>". $f ."</TD>\n";
!          echo " <TD ALIGN=right>". $val ."%</TD>\n";
         }
         $link = addUrlParameter($link,"f[". $x ."]=".$val);
         if ( isset($lang['ProdClasses'.$c][$i]) ) {
!          $link = addUrlParameter($link,"t0[". $x ."]=". UrlEncode($lang['ProdClasses'.$c][$i]));
         } else {
!          $link = addUrlParameter($link,"t0[". $x ."]=". $i);
         }
         $link = addUrlParameter($link,"t1[". $x ."]=". $f );
***************
*** 563,567 ****
  
     # Manager distribution
-    $link = "graph_bars.php";
     @reset($manager);
     echo "<TR>\n";
--- 565,568 ----
***************
*** 571,578 ****
       showfield($lang['ProdRole'][1]);
     }
!    $c = 1;
     $r = 0;
     while ( list ($i,$f) = @each($manager) ) {
!      if ( $c == 1 ) {
         $r++;
         $links[$r] = "graph_bars.php";
--- 572,579 ----
       showfield($lang['ProdRole'][1]);
     }
!    $c = 0;
     $r = 0;
     while ( list ($i,$f) = @each($manager) ) {
!      if ( $c == 0 ) {
         $r++;
         $links[$r] = "graph_bars.php";
***************
*** 595,600 ****
       $links[$r] = addUrlParameter($links[$r],"t1[". $c ."]=". $f );
       $c++;
!      if ( $c == 6 ) {
!        $c = 1;
       }
     }
--- 596,601 ----
       $links[$r] = addUrlParameter($links[$r],"t1[". $c ."]=". $f );
       $c++;
!      if ( $c == 5 ) {
!        $c = 0;
       }
     }

Index: graph_bars.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/graph_bars.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** graph_bars.php	2001/08/27 15:26:35	1.6
--- graph_bars.php	2001/09/06 10:51:59	1.7
***************
*** 11,92 ****
   include "permission.p3";
  
-  define (red,1);
-  define (green,2);
-  define (blue,3);
-  define (yellow,4);
- 
   check_user();
  
-  Header("Expires: 0");
-  Header("Pragma: no-cache");
-  Header("content-type: image/png");
  
!  @reset($f);
!  $x2 = count($f) * 110;
  
!  if ( $x2 == 0 ) {
!    $x2 = 10;
!  }
!  if ( count($t1) > 0 ) {
!    $png = ImageCreate( $x2 , 142);
!  } else {
!    $png = ImageCreate( $x2 , 130);
!  }
!  $c['black'] = ImageColorAllocate($png,0,0,0);
!  $c['white'] = ImageColorAllocate($png,255,255,255);
!  $c['def']   = ImageColorAllocate($png,125,125,125);
!  $c[red]   = ImageColorAllocate($png,255,0,0);
!  $c[green] = ImageColorAllocate($png,0,255,0);
!  $c[blue]  = ImageColorAllocate($png,0,0,255);
!  $c[yellow]= ImageColorAllocate($png,255,255,0);
! 
!  ImageFill($png,0,0,$c['white']);
!  ImageLine($png,5,115,$x2 - 5,115,$c['black']);
!  ImageDashedLine($png,5,65,$x2 - 5,65,$c['black']);
!  ImageLine($png,5,15,$x2 - 5,15,$c['black']);
! 
! 
!  @reset($f);
!  $x = 0;
!  $col = 1;
!  while ( list ($i,$val) = @each ($f) ) {
!    if ( $col > 4 ) {
!      $col = 1;
!    }
!    if ( $c[$col] == "" ) {
!      $cc = $c['def'];
!    } else {
!      $cc = $c[$col];
!    }
!    $col++;
  
!    # Shadow
!    ImageFilledRectangle($png,$x + 13 ,112 - $val ,$x + 103,112,$c['black']);
!    ImageFilledRectangle($png,$x + 12 ,113 - $val ,$x + 102,113,$c['black']);
!    ImageFilledRectangle($png,$x + 11 ,114 - $val ,$x + 101,114,$c['black']);
!    # Bar
!    ImageFilledRectangle($png,$x + 10 ,115 - $val ,$x + 100,115,$cc);
! 
!    # Label
!    if ( isset($t0[$i]) ) {
!      ImageString($png, 3 ,$x + 10,117,$t0[$i] ,$c['black']);
     } else {
!      ImageString($png, 3 ,$x + 10,117,$i ,$c['black']);
     }
!    # Addtional Text
!    if ( isset($t1[$i]) ) {
!      ImageString($png, 3 ,$x + 10,127,$t1[$i],$c['black']);
     }
!    # Value
!    if ( $val > 90 ) {
!      ImageString($png, 3 ,$x + 13,115 - $val,$val ."%",$c['white']);
     } else {
!      ImageString($png, 3 ,$x + 13,98 - $val,$val ."%",$c['black']);
     }
!    $x += 110;
   }
  
-  // send the image
-  ImagePNG($png);
-  ImageDestroy($png);
  ?>
--- 11,162 ----
   include "permission.p3";
  
   check_user();
  
  
!  function basic (&$f,&$t0,&$t1) {
  
!    define (red,1);
!    define (green,2);
!    define (blue,3);
!    define (yellow,4);
! 
  
!    Header("Expires: 0");
!    Header("Pragma: no-cache");
!    Header("content-type: image/png");
! 
!    @reset($f);
!    $x2 = count($f) * 110;
! 
!    if ( $x2 == 0 ) {
!      $x2 = 10;
!    }
!    if ( count($t1) > 0 ) {
!      $png = ImageCreate( $x2 , 142);
     } else {
!      $png = ImageCreate( $x2 , 130);
     }
!    $c['black'] = ImageColorAllocate($png,0,0,0);
!    $c['white'] = ImageColorAllocate($png,255,255,255);
!    $c['def']   = ImageColorAllocate($png,125,125,125);
!    $c[red]   = ImageColorAllocate($png,255,0,0);
!    $c[green] = ImageColorAllocate($png,0,255,0);
!    $c[blue]  = ImageColorAllocate($png,0,0,255);
!    $c[yellow]= ImageColorAllocate($png,255,255,0);
! 
!    ImageFill($png,0,0,$c['white']);
!    ImageLine($png,5,115,$x2 - 5,115,$c['black']);
!    ImageDashedLine($png,5,65,$x2 - 5,65,$c['black']);
!    ImageLine($png,5,15,$x2 - 5,15,$c['black']);
! 
!    @reset($f);
!    $x = 0;
!    $col = 1;
!    while ( list ($i,$val) = @each ($f) ) {
!      if ( $col > 4 ) {
!        $col = 1;
!      }
!      if ( $c[$col] == "" ) {
!        $cc = $c['def'];
!      } else {
!        $cc = $c[$col];
!      }
!      $col++;
! 
!      # Shadow
!      ImageFilledRectangle($png,$x + 13 ,112 - $val ,$x + 103,112,$c['black']);
!      ImageFilledRectangle($png,$x + 12 ,113 - $val ,$x + 102,113,$c['black']);
!      ImageFilledRectangle($png,$x + 11 ,114 - $val ,$x + 101,114,$c['black']);
!      # Bar
!      ImageFilledRectangle($png,$x + 10 ,115 - $val ,$x + 100,115,$cc);
! 
!      # Label
!      if ( isset($t0[$i]) ) {
!        ImageString($png, 3 ,$x + 10,117,$t0[$i] ,$c['black']);
!      } else {
!        ImageString($png, 3 ,$x + 10,117,$i ,$c['black']);
!      }
!      # Addtional Text
!      if ( isset($t1[$i]) ) {
!        ImageString($png, 3 ,$x + 10,127,$t1[$i],$c['black']);
!      }
!      # Value
!      if ( $val > 90 ) {
!        ImageString($png, 3 ,$x + 13,115 - $val,$val ."%",$c['white']);
!      } else {
!        ImageString($png, 3 ,$x + 13,98 - $val,$val ."%",$c['black']);
!      }
!      $x += 110;
     }
! 
!    // send the image
!    ImagePNG($png);
!    ImageDestroy($png);
!  }
! 
!  function pie (&$f,&$t0,&$t1) {
!    $graph = new PieGraph(380,150,"");
!    # $graph->SetShadow();
!    $graph->img->SetAntiAliasing();
! 
!    $p1 = new PiePlot($f);
!    $p1->SetLegends($t0);
!    $graph->Add($p1);
! 
!    $graph->Stroke();
!  }
! 
!  function bar (&$f,&$t0,&$t1) {
!    $graph = new Graph(380,350,"");
!    # $graph->SetShadow();
!    $graph->img->SetAntiAliasing();
!    $graph->img->SetMargin(40,40,40,180);
! 
! 
!    $p1 = new BarPlot($t1);
!    $p2 = new BarPlot($f);
!    $p1->SetColor("orange");
!    $p2->SetColor("blue");
!    $p1->SetFillColor("orange");
!    $p2->SetFillColor("blue");
! 
!    $graph->SetScale("textlin");
!    $graph->SetY2Scale("lin");
!    $graph->yaxis->SetColor("orange");
!    $graph->y2axis->SetColor("blue");
! 
! 
! #   $gbplot = new GroupBarPlot(array($p1,$p2));
! #   $gbplot->SetWidth(0.9);
! 
! #   $p1->SetLegends($t0);
! #   $graph->Add($gbplot);
!     $graph->Add($p1);
!     $graph->AddY2($p1);
! 
! 
! #   $graph->xaxis->title->Set("X-title");
! #   $graph->yaxis->title->Set("Y-title");
!    $graph->xaxis->SetTickLabels($t0);
!    $graph->xaxis->SetLabelAngle(90);
! 
!    $graph->Stroke();
!  }
! 
!  if (file_exists ("jpgraph/jpgraph.php")) {
!    include ("jpgraph/jpgraph.php");
!    include ("jpgraph/jpgraph_pie.php");
!    include ("jpgraph/jpgraph_pie3d.php");
!    include ("jpgraph/jpgraph_bar.php");
!    if ( $type == "pie" ) {
!      pie($f,$t0,$t1);
!    } elseif ( $type == "bar" ) {
!      bar($f,$t0,$t1);
     } else {
!      basic($f,$t0,$t1);
     }
!  } else {
!    basic($f,$t0,$t1);
   }
  
  ?>

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_overview.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** bug_overview.php	2001/08/30 13:21:30	1.18
--- bug_overview.php	2001/09/06 10:51:59	1.19
***************
*** 252,255 ****
--- 252,256 ----
     # State distribution
     $link = "graph_bars.php";
+    $link = addUrlParameter($link,"type=pie");
     @reset($states);
     echo "<TR>\n";
***************
*** 259,263 ****
       showfield($lang['BugState']);
     }
!    $c = 1;
     while ( list ($i,$f) = @each ($states) ) {
       $val = number_format($f * 100.0 / $cnt ,2);
--- 260,264 ----
       showfield($lang['BugState']);
     }
!    $c = 0;
     while ( list ($i,$f) = @each ($states) ) {
       $val = number_format($f * 100.0 / $cnt ,2);
***************
*** 337,340 ****
--- 338,342 ----
     $b = new bug($conn);
     $link = "graph_bars.php";
+    $link = addUrlParameter($link,"type=pie");
     @reset($classes);
     echo "<TR>\n";
***************
*** 344,348 ****
       showfield($lang['BugClass']);
     }
!    $c = 1;
     while ( list ($i,$f) = @each ($classes) ) {
       $val = number_format($f * 100.0 / $cnt ,2);
--- 346,350 ----
       showfield($lang['BugClass']);
     }
!    $c = 0;
     while ( list ($i,$f) = @each ($classes) ) {
       $val = number_format($f * 100.0 / $cnt ,2);

[Tutos-commits] CVS: tutos/php pl.p3,1.18,1.19

From: Sergiusz P. <se...@us...> - 2001-09-05 16:20:55

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

Modified Files:
	pl.p3 
Log Message:
updated.

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/pl.p3,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** pl.p3	2001/08/30 15:54:52	1.18
--- pl.p3	2001/09/05 16:20:52	1.19
***************
*** 41,45 ****
  $lang['InfoEmail']       = "Informuj przez pocztê";
  $lang['InviteEmail']     = "Zawiadom przez e-mail";
! $lang['Invitation']      = "Invitation";
  $lang['IgnoreTime']      = "zignoruj powy¿sze terminy";
  $lang['IgnoreTime2']     = "(je¶li np. spotkanie ma siê odbyæ w nieokre¶lonych godzinach tego dnia)";
--- 41,45 ----
  $lang['InfoEmail']       = "Informuj przez pocztê";
  $lang['InviteEmail']     = "Zawiadom przez e-mail";
! $lang['Invitation']      = "Zaproszenie";
  $lang['IgnoreTime']      = "zignoruj powy¿sze terminy";
  $lang['IgnoreTime2']     = "(je¶li np. spotkanie ma siê odbyæ w nieokre¶lonych godzinach tego dnia)";
***************
*** 103,108 ****
  $lang['lang']['pt']      = "portugalski";
  $lang['lang']['pl']      = "polski";
! $lang['lang']['ko']      = "korean";
! $lang['lang']['nl']      = "dutch";
  
  # Common
--- 103,108 ----
  $lang['lang']['pt']      = "portugalski";
  $lang['lang']['pl']      = "polski";
! $lang['lang']['ko']      = "koreañski";
! $lang['lang']['nl']      = "holenderski";
  
  # Common
***************
*** 297,301 ****
  $lang['ProdName']        = "Produkty/projekty";
  $lang['ProdVersion']     = "Wersja";
! $lang['ProdRoles']       = "Role";
  $lang['ProdFunc']        = "Funkcja";
  $lang['ProdRolesNew']    = "Nowa rola";
--- 297,301 ----
  $lang['ProdName']        = "Produkty/projekty";
  $lang['ProdVersion']     = "Wersja";
! $lang['ProdRoles']       = "Rola";
  $lang['ProdFunc']        = "Funkcja";
  $lang['ProdRolesNew']    = "Nowa rola";
***************
*** 306,311 ****
  $lang['ProdRole'][5]     = "Rozwój";
  $lang['ProdRole'][6]     = "Klient";
! $lang['ProdRole'][7]     = "Supplier";
! $lang['ProdRole'][8]     = "Reseller";
  $lang['ProdRole'][9]     = "Partner";
  $lang['ProdPath']        = "¦cie¿ka pliku";
--- 306,311 ----
  $lang['ProdRole'][5]     = "Rozwój";
  $lang['ProdRole'][6]     = "Klient";
! $lang['ProdRole'][7]     = "Dostawca";
! $lang['ProdRole'][8]     = "Sprzedawca";
  $lang['ProdRole'][9]     = "Partner";
  $lang['ProdPath']        = "¦cie¿ka pliku";
***************
*** 390,394 ****
  $lang['MailCard']        = "Karta %s";
  $lang['MailboxDelI']     = "Usuñ skrzynkê %s";
! $lang['Mail']            = "Message";
  
  # ACL
--- 390,394 ----
  $lang['MailCard']        = "Karta %s";
  $lang['MailboxDelI']     = "Usuñ skrzynkê %s";
! $lang['Mail']            = "Wiadomo¶æ";
  
  # ACL
***************
*** 436,440 ****
  $lang['TaskLinkInfo']    = "Zobacz zadanie %s";
  $lang['TaskCompleted']   = "Ukoñczone w %3.2f procentach";
! $lang['Completed']       = "Completed";
  
  # Gantt Diagramm
--- 436,440 ----
  $lang['TaskLinkInfo']    = "Zobacz zadanie %s";
  $lang['TaskCompleted']   = "Ukoñczone w %3.2f procentach";
! $lang['Completed']       = "Ukoñczone";
  
  # Gantt Diagramm

[Tutos-commits] CVS: tutos/php mailbox_overview.php,1.13,1.14

From: Gero K. <gok...@us...> - 2001-09-04 20:27:34

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

Modified Files:
	mailbox_overview.php 
Log Message:
better readable header

Index: mailbox_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox_overview.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mailbox_overview.php	2001/08/26 17:30:44	1.13
--- mailbox_overview.php	2001/09/04 20:27:32	1.14
***************
*** 63,67 ****
     echo "<TR>\n";
     echo " <TH COLSPAN=6 CLASS=nodeco>";
!    echo  $m->parent->getLink();
     if ( $m->email != "" ) {
       echo  "&nbsp; mails sent to &nbsp; &lt;". AsEmail($m->email,$m->email) ."&gt;\n";
--- 63,67 ----
     echo "<TR>\n";
     echo " <TH COLSPAN=6 CLASS=nodeco>";
!    echo  menulink($m->parent->getUrl(),$m->parent->getFullname());
     if ( $m->email != "" ) {
       echo  "&nbsp; mails sent to &nbsp; &lt;". AsEmail($m->email,$m->email) ."&gt;\n";

[Tutos-commits] CVS: tutos/php watchlist_overview.php,1.11,1.12

From: Gero K. <gok...@us...> - 2001-09-04 20:27:01

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

Modified Files:
	watchlist_overview.php 
Log Message:
link to the history of deleted objects

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist_overview.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** watchlist_overview.php	2001/09/04 19:00:33	1.11
--- watchlist_overview.php	2001/09/04 20:26:58	1.12
***************
*** 75,79 ****
         if ( $obj == -1 ) {
           echo " <TD NOWRAP ALIGN=right>ID:". $oid ."</TD>\n";
!          echo " <TD NOWRAP ALIGN=right>". $lang['HistoryDeleted'] ."</TD>\n";
         } else {
           echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
--- 75,79 ----
         if ( $obj == -1 ) {
           echo " <TD NOWRAP ALIGN=right>ID:". $oid ."</TD>\n";
!          echo " <TD NOWRAP ALIGN=right>". makelink("history_show.php?id=".$oid,$lang['HistoryDeleted']) ."</TD>\n";
         } else {
           echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";

[Tutos-commits] CVS: tutos/php resource.pinc,1.14,1.15

From: Gero K. <gok...@us...> - 2001-09-04 20:26:13

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

Modified Files:
	resource.pinc 
Log Message:
sort resource list

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource.pinc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** resource.pinc	2001/08/27 14:26:41	1.14
--- resource.pinc	2001/09/04 20:26:10	1.15
***************
*** 73,77 ****
    $obj->resuselist = array();
  
!   $q = "SELECT * FROM resources";
  
    $r = @DB_Exec($obj->conn,$q);
--- 73,77 ----
    $obj->resuselist = array();
  
!   $q = "SELECT * FROM resources order by name";
  
    $r = @DB_Exec($obj->conn,$q);

[Tutos-commits] CVS: tutos/php history_show.php,1.12,1.13

From: Gero K. <gok...@us...> - 2001-09-04 20:25:13

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

Modified Files:
	history_show.php 
Log Message:
link to the history of deleted objects

Index: history_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/history_show.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** history_show.php	2001/08/31 08:57:02	1.12
--- history_show.php	2001/09/04 20:25:11	1.13
***************
*** 21,30 ****
    *
    */
!  Function info(&$obj,$start = 0) {
!    global $lang,$tutos,$link1;
  
     echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
     echo "<TR>\n";
!    echo "  <TH COLSPAN=5>". sprintf($lang['HistoryShow'],$lang[$obj->getType()],menulink($obj->getURL(),$obj->getFullName())) ."</TH>\n";
     echo "</TR>\n";
  
--- 21,37 ----
    *
    */
!  Function info(&$obj,$id,$start = 0) {
!    global $conn,$lang,$tutos,$link1;
  
     echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
     echo "<TR>\n";
!    if ( $obj != -1 ) {
!      echo "  <TH COLSPAN=5>". sprintf($lang['HistoryShow'],$lang[$obj->getType()],menulink($obj->getURL(),$obj->getFullName())) ."</TH>\n";
!    } else {
!      echo "  <TH COLSPAN=5>". sprintf($lang['HistoryShow'],"","(". $lang['HistoryDeleted']) .")</TH>\n";
!      # Pseudo empty object
!      $obj = new product($conn);
!      $obj->id = $id;
!    }
     echo "</TR>\n";
  
***************
*** 85,89 ****
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
         }
       } else if ( $f['field'] == "InstCreate" ) {
--- 92,96 ----
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</I></TD>\n";
         }
       } else if ( $f['field'] == "InstCreate" ) {
***************
*** 94,98 ****
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
         }
       } else if ( $f['field'] == "NoteCreate" ) {
--- 101,105 ----
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</I></TD>\n";
         }
       } else if ( $f['field'] == "NoteCreate" ) {
***************
*** 103,107 ****
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
         }
       } else if ( $f['field'] == "FileCreate" ) {
--- 110,114 ----
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</I></TD>\n";
         }
       } else if ( $f['field'] == "FileCreate" ) {
***************
*** 121,125 ****
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
         }
       } else if ( $f['field'] == "TaskCreate" ) {
--- 128,132 ----
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</I></TD>\n";
         }
       } else if ( $f['field'] == "TaskCreate" ) {
***************
*** 130,134 ****
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
         }
       } else if ( $f['field'] == "ProdState" ) {
--- 137,141 ----
           echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
         } else {
!          echo " <TD><I>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</I></TD>\n";
         }
       } else if ( $f['field'] == "ProdState" ) {
***************
*** 146,150 ****
             echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
           } else {
!            echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
           }
         }
--- 153,157 ----
             echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
           } else {
!            echo " <TD><I>". makelink("history_show.php?id=". $f["old"],$lang['HistoryDeleted']) ."</I></TD>\n";
           }
         }
***************
*** 156,160 ****
             echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
           } else {
!            echo " <TD><I>". $lang['HistoryDeleted'] ."</I></TD>\n";
           }
         }
--- 163,167 ----
             echo " <TD>&nbsp;". $b->getLink() ."</TD>\n";
           } else {
!            echo " <TD><I>". makelink("history_show.php?id=". $f["new"],$lang['HistoryDeleted']) ."</I></TD>\n";
           }
         }
***************
*** 186,201 ****
   if ( isset($id) ) {
     $obj = getObject($id);
-    HTML_Header(sprintf($lang['HistoryDetail'],$lang[$obj->getType()]));
-    $id = $obj->id;
     $link1 = addUrlParameter($link1,"id=".$id);
   } else {
     $id = -1;
!  }
! 
!  if ( $id < 1 ) {
!    HTML_Header("ERROR");
     $msg .= "Missing ID";
!    $id = -1;
   }
   if ( ! isset($start) ) {
     $start = 0;
--- 193,210 ----
   if ( isset($id) ) {
     $obj = getObject($id);
     $link1 = addUrlParameter($link1,"id=".$id);
+    if ( $obj != -1 ) {
+      $id = $obj->id;
+      HTML_Header(sprintf($lang['HistoryDetail'],$lang[$obj->getType()]));
+    } else {
+      HTML_Header(sprintf($lang['HistoryDetail']," (". $lang['HistoryDeleted'] ." ". $id .")"));
+    }
   } else {
     $id = -1;
!    $obj = -1;
     $msg .= "Missing ID";
!    HTML_Header("ERROR");
   }
+ 
   if ( ! isset($start) ) {
     $start = 0;
***************
*** 205,210 ****
   navigate();
   HTML_Base2($msg);
!  if ( $id > 0 ) {
!    info($obj,$start);
   }
   HTML_Base3();
--- 214,219 ----
   navigate();
   HTML_Base2($msg);
!  if ( $msg == "") {
!    info($obj,$id,$start);
   }
   HTML_Base3();

[Tutos-commits] CVS: tutos/php mytutos.php,1.34,1.35

From: Gero K. <gok...@us...> - 2001-09-04 20:24:22

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

Modified Files:
	mytutos.php 
Log Message:
new link to personal watchlist

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** mytutos.php	2001/09/03 18:08:06	1.34
--- mytutos.php	2001/09/04 20:24:19	1.35
***************
*** 422,425 ****
--- 422,428 ----
       echo menulink("timetrack_overview.php?link_id=".$adr->id,$lang['TimetrackBooked'],sprintf($lang['TimetrackBookedI'],$adr->getFullName())) ."<BR>\n";
     }
+    if ( $tutos[usewatchlist] == 1 )  {
+      echo menulink("watchlist_overview.php?adr=".$adr->id,$lang['WatchOverview'],sprintf($lang['WatchOverviewI'],$adr->getFullname())) ."<BR>\n";
+    }
  
     echo "<HR NOSHADE SIZE=1>\n";

[Tutos-commits] CVS: tutos/php webelements.p3,1.73,1.74

From: Gero K. <gok...@us...> - 2001-09-04 20:23:21

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

Modified Files:
	webelements.p3 
Log Message:
more info in navigation

Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** webelements.p3	2001/08/30 16:01:58	1.73
--- webelements.p3	2001/09/04 20:23:18	1.74
***************
*** 1389,1393 ****
  
     echo "<TR>\n";
!    echo " <TH COLSPAN=". $cnt .">\n";
     if ( $start > 0 ) {
       $l = addUrlParameter($link,$paraname ."=0");
--- 1389,1394 ----
  
     echo "<TR>\n";
!    echo " <TH align=left COLSPAN=". $cnt .">\n";
!    echo "<DIV ALIGN=left>". $max ." ". $lang['AdminDBCount'] ." (". ($start + 1) ."-". $end .")</DIV><CENTER>";
     if ( $start > 0 ) {
       $l = addUrlParameter($link,$paraname ."=0");
***************
*** 1409,1412 ****
--- 1410,1414 ----
       echo  menulink($l ,$lang['NavLast'],$lang['NavLast']);
     }
+    echo " </CENTER>\n";
     echo " </TH>\n";
     echo "</TR>\n";

[Tutos-commits] CVS: tutos/php installation.pinc,1.27,1.28

From: Gero K. <gok...@us...> - 2001-09-04 20:22:23

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

Modified Files:
	installation.pinc 
Log Message:
bugfix: do not allow display of nonexitent installations

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation.pinc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** installation.pinc	2001/08/26 15:31:26	1.27
--- installation.pinc	2001/09/04 20:22:21	1.28
***************
*** 121,129 ****
  #    echo "\n<!-- INS ". $id ." -->\n";
  
!     $query = "SELECT * FROM installations WHERE id = $id";
      $result = @DB_Exec($this->conn,$query);
      $n = DB_NumRows($result);
      if ( 0 == $n) {
-       $this->id          = $id;
        return;
      }
--- 121,128 ----
  #    echo "\n<!-- INS ". $id ." -->\n";
  
!     $query = "SELECT * FROM installations WHERE id = ". $id;
      $result = @DB_Exec($this->conn,$query);
      $n = DB_NumRows($result);
      if ( 0 == $n) {
        return;
      }

[Tutos-commits] CVS: tutos/php check.php,1.13,1.14

From: Gero K. <gok...@us...> - 2001-09-04 20:21:31

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

Modified Files:
	check.php 
Log Message:
make reminders urgent

Index: check.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/check.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** check.php	2001/08/31 11:07:42	1.13
--- check.php	2001/09/04 20:21:28	1.14
***************
*** 56,59 ****
--- 56,61 ----
       $m->setSubject("Remember: Appointment at ". $app->start->getDate());
     }
+    $m->addHeader("X-PRIORITY","2");
+    $m->addHeader("priority","urgent");
  
     $pl = $app->participant;
***************
*** 84,89 ****
       $m->addBody($app->getIcal(),"text/calendar","ICal Entry");
  
! 	 if ( $tutos[usevcard] == 1 ) {
! 	   $m->addBody($app->creator->getIcard(),"text/x-vcard",sprintf($lang['MailCard'], $app->creator->getFullName()) );
       }
       $msg .= $m->send();
--- 86,91 ----
       $m->addBody($app->getIcal(),"text/calendar","ICal Entry");
  
!      if ( $tutos[usevcard] == 1 ) {
!        $m->addBody($app->creator->getIcard(),"text/x-vcard",sprintf($lang['MailCard'], $app->creator->getFullName()) );
       }
       $msg .= $m->send();
***************
*** 137,140 ****
--- 139,144 ----
         $m->setFrom($b->creator);
         $m->setSubject("BUG: ". $b->getFullName() ." still OPEN");
+        $m->addHeader("X-PRIORITY","1");
+        $m->addHeader("priority","urgent");
         $ml[$b->solver->id] = $b->solver;
         $ml[$b->creator->id] = $b->creator;
***************
*** 142,172 ****
         @reset($ml);
         while ( list ($i,$f) = @each ($ml) ) {
! 	 $m->resetBody();
! 	 $m->resetTo();
! 	 $m->addTo($f);
! 
! 	 if ( $f->getType() == "address" ) {
! 	   $u = new tutos_user($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'],$m->subject,$mailtxt) ."<BR>\n";
! 	   continue;
! 	 }
! 	 $body = join ('', file ($mailtxt));
! 	 $b->make_mail_body($body,$f);
! 	 $body = eregi_replace("@TIME@",$diff_total,$body);
! 
! 	 $m->addBody($body,"text/plain",$lang['BugsDetail']);
! 	 $m->addBody("<PRE>". $b->description ."</PRE>","text/html" , $lang['BugHistory']);
! 	 $msg .= $m->send();
         }
       } else {
--- 146,176 ----
         @reset($ml);
         while ( list ($i,$f) = @each ($ml) ) {
!          $m->resetBody();
!          $m->resetTo();
!          $m->addTo($f);
! 
!          if ( $f->getType() == "address" ) {
!           $u = new tutos_user($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'],$m->subject,$mailtxt) ."<BR>\n";
!            continue;
!          }
!          $body = join ('', file ($mailtxt));
!          $b->make_mail_body($body,$f);
!          $body = eregi_replace("@TIME@",$diff_total,$body);
! 
!          $m->addBody($body,"text/plain",$lang['BugsDetail']);
!          $m->addBody("<PRE>". $b->description ."</PRE>","text/html" , $lang['BugHistory']);
!          $msg .= $m->send();
         }
       } else {

[Tutos-commits] CVS: tutos/php bug.pinc,1.36,1.37

From: Gero K. <gok...@us...> - 2001-09-04 20:21:00

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

Modified Files:
	bug.pinc 
Log Message:
make creation mails urgent

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** bug.pinc	2001/08/26 15:31:26	1.36
--- bug.pinc	2001/09/04 20:20:58	1.37
***************
*** 529,532 ****
--- 529,534 ----
        # Prepare the mail
        $mail->setSubject("New BUG in ". $this->parent->getFullName());
+       $mail->addHeader("X-PRIORITY","1");
+       $mail->addHeader("priority","urgent");
  
        $bugmailtxt = "../html/bug_new.proto.";

[Tutos-commits] CVS: tutos/php file_overview.php,1.7,1.8

From: Gero K. <gok...@us...> - 2001-09-04 19:01:02

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

Modified Files:
	file_overview.php 
Log Message:
added navigation

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_overview.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** file_overview.php	2001/08/09 10:32:03	1.7
--- file_overview.php	2001/09/04 19:01:00	1.8
***************
*** 16,21 ****
    *
    */
!  Function info(&$conn,&$r) {
!    global $lang , $current_user;
  
     $n = DB_NumRows($r);
--- 16,21 ----
    *
    */
!  Function info(&$conn,&$r,$start = 0) {
!    global $lang,$tutos,$current_user,$link1;
  
     $n = DB_NumRows($r);
***************
*** 24,27 ****
--- 24,37 ----
       return;
     }
+ 
+    if ( $start == -1 ) {
+      $a = $n - $tutos[maxshow];
+      $end = $n;
+      $start = $a;
+    } else {
+      $a = $start;
+      $end = $start + $tutos[maxshow];
+    }
+ 
     echo "<TABLE BORDER=1 CELLPADDING=3 CELLSPACING=0>\n";
     echo "<TR>\n";
***************
*** 31,37 ****
     echo order_header("",$lang['FileReference']);
     echo order_header("f_size",$lang['FileSize']);
     echo "</TR>\n";
!    $a = 0;
!    while ( $a < $n ) {
       $f = new file($conn);
       $f->read_result($r,$a);
--- 41,48 ----
     echo order_header("",$lang['FileReference']);
     echo order_header("f_size",$lang['FileSize']);
+    echo order_header("creation",$lang['created']);
     echo "</TR>\n";
! 
!    while ( ($a < $n) && ($a < $end) ) {
       $f = new file($conn);
       $f->read_result($r,$a);
***************
*** 44,51 ****
--- 55,64 ----
       echo " <TD ALIGN=right>". $f->getRefLink() ."</TH>\n";
       echo " <TD ALIGN=right>". $f->filesize ."</TH>\n";
+      echo " <TD ALIGN=right>". $f->creation->getDateTime() ."&nbsp;</TH>\n";
       echo "</TR>\n";
  
       $a++;
     }
+    ShowBackForwardNav($link1,6,$start,$a,$n);
     echo "</TABLE>\n";
   }
***************
*** 70,73 ****
--- 83,90 ----
   $pre = " WHERE" ;
  
+  if ( ! isset($start) ) {
+    $start = 0;
+  }
+ 
   if ( isset($link_id) ) {
     $q .= $pre . " link_id = ". $link_id;
***************
*** 124,128 ****
   navigate();
   HTML_Base2($msg);
!  info($conn,$r);
   HTML_Base3();
  
--- 141,145 ----
   navigate();
   HTML_Base2($msg);
!  info($conn,$r,$start);
   HTML_Base3();

[Tutos-commits] CVS: tutos/php watchlist_overview.php,1.10,1.11

From: Gero K. <gok...@us...> - 2001-09-04 19:00:38

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

Modified Files:
	watchlist_overview.php 
Log Message:
added headline information. removed unneccessary infos

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist_overview.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** watchlist_overview.php	2001/08/27 21:19:10	1.10
--- watchlist_overview.php	2001/09/04 19:00:33	1.11
***************
*** 18,22 ****
    *
    */
!  Function info(&$conn,&$result,$start=0) {
     global $current_user,$lang,$tutos,$link1;
  
--- 18,22 ----
    *
    */
!  Function info(&$conn,$adr,$id,&$result,$start=0) {
     global $current_user,$lang,$tutos,$link1;
  
***************
*** 26,34 ****
       return;
     }
     echo "<TABLE CLASS=single BORDER=1 CELLPADDING=3 CELLSPACING=0>\n";
     echo "<TR>\n";
!    echo order_header("","Typ");
!    echo order_header("","ID");
!    echo order_header("adr_id",$lang['Watcher']);
     echo order_header("","&nbsp;");
     echo "</TR>\n";
--- 26,55 ----
       return;
     }
+ 
+ 
+    $cols = 4;
     echo "<TABLE CLASS=single BORDER=1 CELLPADDING=3 CELLSPACING=0>\n";
+    if ( $id != -1 ) {
+      $obj = getObject($id);
+      $cols -= 2;
+      echo "<TR>\n";
+      echo " <TH COLSPAN=". $cols .">". $lang[$obj->getType()] ." ". menulink($obj->getUrl(),$obj->getFullName()) ."</TH>\n";
+      echo "</TR>\n";
+    }
+    if ( $adr != -1 ) {
+      $obj = getObject($adr);
+      $cols -= 1;
+      echo "<TR>\n";
+      echo " <TH COLSPAN=". $cols .">". $lang['Watcher'] ." ". menulink($obj->getUrl(),$obj->getFullName()) ."</TH>\n";
+      echo "</TR>\n";
+    }
     echo "<TR>\n";
!    if ( $id == -1 ) {
!      echo order_header("","Typ");
!      echo order_header("","ID");
!    }
!    if ( $adr == -1 ) {
!      echo order_header("adr_id",$lang['Watcher']);
!    }
     echo order_header("","&nbsp;");
     echo "</TR>\n";
***************
*** 47,66 ****
       $aid = DB_Result($result, $a, "adr_id");
       $obj = getObject($oid);
!      $adr = getObject($aid);
  
       echo "<TR>\n";
  #     echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
!      if ( $obj == -1 ) {
!        echo " <TD NOWRAP ALIGN=right>ID:". $oid ."</TD>\n";
!        echo " <TD NOWRAP ALIGN=right>". $lang['HistoryDeleted'] ."</TD>\n";
!      } else {
!        echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
!        echo " <TD NOWRAP ALIGN=right>". $obj->getLink() ."</TD>\n";
!      }
       if ( $adr == -1 ) {
!        echo " <TD NOWRAP ALIGN=right>". $lang['HistoryDeleted'] ."</TD>\n";
!      } else {
!        echo " <TD NOWRAP ALIGN=right>". $adr->getLink() ."</TD>\n";
!      }
       if ( ($current_user->id == $aid) || ($obj->mod_ok()) ) {
         $url = confirmlink("watchlist_del.php?id=". $oid ."&adr=". $aid ."&gotourl=". $link1 ,$lang['Delete'],$lang['WatchDel']);
--- 68,91 ----
       $aid = DB_Result($result, $a, "adr_id");
       $obj = getObject($oid);
!      $aobj = getObject($aid);
  
       echo "<TR>\n";
  #     echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
!      if ( $id == -1 ) {
!        if ( $obj == -1 ) {
!          echo " <TD NOWRAP ALIGN=right>ID:". $oid ."</TD>\n";
!          echo " <TD NOWRAP ALIGN=right>". $lang['HistoryDeleted'] ."</TD>\n";
!        } else {
!          echo " <TD NOWRAP ALIGN=right>". $lang[$obj->getType()] ."</TD>\n";
!          echo " <TD NOWRAP ALIGN=right>". $obj->getLink() ."</TD>\n";
!        }
! 	 }
       if ( $adr == -1 ) {
!        if ( $aobj == -1 ) {
!          echo " <TD NOWRAP ALIGN=right>". $lang['HistoryDeleted'] ."</TD>\n";
!        } else {
!          echo " <TD NOWRAP ALIGN=right>". $aobj->getLink() ."</TD>\n";
!        }
! 	 }
       if ( ($current_user->id == $aid) || ($obj->mod_ok()) ) {
         $url = confirmlink("watchlist_del.php?id=". $oid ."&adr=". $aid ."&gotourl=". $link1 ,$lang['Delete'],$lang['WatchDel']);
***************
*** 74,78 ****
     }
  
!    ShowBackForwardNav($link1,7,$start,$a,$n);
  
     echo "</TABLE>\n";
--- 99,103 ----
     }
  
!    ShowBackForwardNav($link1,$cols,$start,$a,$n);
  
     echo "</TABLE>\n";
***************
*** 106,109 ****
--- 131,136 ----
     $qarg .= "&adr=". $adr;
     $link1 = addUrlParameter($link1,"adr=".$adr);
+  } else {
+    $adr = -1;
   }
   if ( isset($id) && ($id != "") ) {
***************
*** 112,115 ****
--- 139,144 ----
     $qarg .= "&id=". $id;
     $link1 = addUrlParameter($link1,"id=".$id);
+  } else {
+    $id = -1;
   }
  
***************
*** 137,141 ****
   navigate($link1);
   HTML_Base2($msg);
!  info($conn,$result,$start);
   HTML_Base3();
  
--- 166,170 ----
   navigate($link1);
   HTML_Base2($msg);
!  info($conn,$adr,$id,$result,$start);
   HTML_Base3();

[Tutos-commits] CVS: tutos/php mytutos.php,1.33,1.34

From: Gero K. <gok...@us...> - 2001-09-03 18:08:10

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

Modified Files:
	mytutos.php 
Log Message:
refix wron fix :-))

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** mytutos.php	2001/09/02 18:34:37	1.33
--- mytutos.php	2001/09/03 18:08:06	1.34
***************
*** 166,170 ****
     echo "  <TH>". $lang['created'] ."</TH>\n";
     echo " </TR>\n";
!    while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) {
       $f = new product($conn);
       $f->read_result($r,$a);
--- 166,170 ----
     echo "  <TH>". $lang['created'] ."</TH>\n";
     echo " </TR>\n";
!    while ( ($a < $n) and (count($s) < 2* $tutos[maxshort]) ) {
       $f = new product($conn);
       $f->read_result($r,$a);
***************
*** 195,199 ****
     global $lang,$conn, $tutos;
  
!    $q = "SELECT * from bugs where creator = ". $adr->id ." where state <> 4 order by creation DESC";
     $r = @DB_Exec($conn,$q);
     $n = DB_NumRows($r);
--- 195,199 ----
     global $lang,$conn, $tutos;
  
!    $q = "SELECT * from bugs where (creator = ". $adr->id ." or solver = ". $adr->id .") and state <> 4 order by creation DESC";
     $r = @DB_Exec($conn,$q);
     $n = DB_NumRows($r);

[Tutos-commits] CVS: tutos/php task.pinc,1.41,1.42 task_overview.php,1.9,1.10

From: Gero K. <gok...@us...> - 2001-09-02 18:53:50

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

Modified Files:
	task.pinc task_overview.php 
Log Message:
include task->bug timetracking for project info

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** task.pinc	2001/08/30 16:50:16	1.41
--- task.pinc	2001/09/02 18:53:47	1.42
***************
*** 113,116 ****
--- 113,117 ----
      $t->read_result($r,$a);
      $t->readTasks();
+     $t->readBugs();
  	$t->readTimetrackSum();
      $obj->tsum['Tasks'] += $t->timetracksum;

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** task_overview.php	2001/08/31 08:35:28	1.9
--- task_overview.php	2001/09/02 18:53:47	1.10
***************
*** 10,13 ****
--- 10,14 ----
   include("product.pinc");
   include("timetrack.pinc");
+  include("bug.pinc");
  
   /* Check if user is allowed to use it */

[Tutos-commits] CVS: tutos/php db.p3,1.44,1.45

From: Gero K. <gok...@us...> - 2001-09-02 18:41:02

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

Modified Files:
	db.p3 
Log Message:
accept plus in search strings

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** db.p3	2001/08/30 13:37:58	1.44
--- db.p3	2001/09/02 18:41:00	1.45
***************
*** 355,358 ****
--- 355,359 ----
        $fld = $fld ."|| ' ' ||". $fld3;
      }
+     $name = eregi_replace("\+","[+]",$name);
      $name = eregi_replace(" ",".*",$name);
      $name = eregi_replace("'",".",$name);

29 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 452 453 454 455 456 .. 464 > >> (Page 454 of 464)