tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
1
|
2
|
3
|
|
4
|
5
|
6
(17) |
7
(6) |
8
(7) |
9
|
10
|
|
11
|
12
(2) |
13
(3) |
14
(16) |
15
|
16
(6) |
17
|
|
18
|
19
(26) |
20
(3) |
21
(3) |
22
(3) |
23
(7) |
24
|
|
25
|
26
(20) |
27
(11) |
28
|
29
(7) |
30
(13) |
31
|
|
From: Gero K. <gok...@us...> - 2004-07-30 18:24:53
|
Update of /cvsroot/tutos/tutos/php/installation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31091/php/installation Modified Files: Tag: BRANCH-1-2 installation.pinc Log Message: some fixes Index: installation.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v retrieving revision 1.32.2.1 retrieving revision 1.32.2.2 diff -u -r1.32.2.1 -r1.32.2.2 --- installation.pinc 26 Jul 2004 19:55:03 -0000 1.32.2.1 +++ installation.pinc 30 Jul 2004 18:24:44 -0000 1.32.2.2 @@ -341,15 +341,13 @@ } else { $q->addFV("installer_id","null",""); } - if ( $this->seller->id > 0 ) { + if (is_object($this->seller) && ($this->seller->id > 0) ) { $q->addFV("seller_id",$this->seller,"OBJ"); } else { $q->addFV("seller_id","null",""); } - if ( $this->seller->id > 0 ) { - $q->addFV("creator",$this->creator,"OBJ"); - } + $q->addFV("creator",$this->creator,"OBJ"); if ( $this->id < 0 ) { $this->modified = array(); @@ -365,7 +363,7 @@ if ( $this->seller->id > 0 ) { acl_raise($this,$this->seller->id,$tutos[modok]); } - if ( $this->installer->id > 0 ) { + if ( is_object($this->installer) && ($this->installer->id > 0) ) { acl_raise($this,$this->installer->id,$tutos[modok]); } acl_default($this,$current_user); |
|
From: Gero K. <gok...@us...> - 2004-07-30 18:24:53
|
Update of /cvsroot/tutos/tutos/php/watchlist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31091/php/watchlist Modified Files: Tag: BRANCH-1-2 watchlist.pinc Log Message: some fixes Index: watchlist.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v retrieving revision 1.52.2.2 retrieving revision 1.52.2.3 diff -u -r1.52.2.2 -r1.52.2.3 --- watchlist.pinc 26 Jul 2004 19:55:06 -0000 1.52.2.2 +++ watchlist.pinc 30 Jul 2004 18:24:44 -0000 1.52.2.3 @@ -30,7 +30,7 @@ $msg = ""; $encoding = $f->lg['content_encoding']; - $mail = new mail($currentuser); + $mail = new mail($current_user); $mail->setFrom($user); $mail->resetBody(); $mail->resetTo(); |
|
From: Gero K. <gok...@us...> - 2004-07-30 18:24:53
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31091/php Modified Files: Tag: BRANCH-1-2 appointment.pinc Log Message: some fixes Index: appointment.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v retrieving revision 1.175.2.2 retrieving revision 1.175.2.3 diff -u -r1.175.2.2 -r1.175.2.3 --- appointment.pinc 26 Jul 2004 19:54:57 -0000 1.175.2.2 +++ appointment.pinc 30 Jul 2004 18:24:43 -0000 1.175.2.3 @@ -651,12 +651,12 @@ $q->addFV("remembered",$this->remembered,""); $q->addFV("mod_allow",$this->mod_allow,""); $q->addFV("repeat",$this->repeat,"INT"); - if ( $this->visitor->id != -1 ) { + if ( is_object($this->visitor) && ($this->visitor->id != -1) ) { $q->addFV("visitor",$this->visitor,"OBJ"); } else { $q->addFV("visitor","null",""); } - if ( $this->product->id != -1 ) { + if ( is_object($this->product) && ( $this->product->id != -1) ) { $q->addFV("product",$this->product,"OBJ"); } else { $q->addFV("product","null",""); |
|
From: Gero K. <gok...@us...> - 2004-07-30 18:24:53
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31091/php/bugtracking Modified Files: Tag: BRANCH-1-2 bug.pinc bug_ins.php Log Message: some fixes Index: bug.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v retrieving revision 1.26.2.1 retrieving revision 1.26.2.2 diff -u -r1.26.2.1 -r1.26.2.2 --- bug.pinc 26 Jul 2004 19:55:02 -0000 1.26.2.1 +++ bug.pinc 30 Jul 2004 18:24:44 -0000 1.26.2.2 @@ -607,7 +607,7 @@ * set the parent (i.e. the buggy product etc) */ function setParent(&$parent) { - if ( $this->parent->id != $parent->id ) { + if ( is_object($this->parent) && ($this->parent->id != $parent->id) ) { $this->modified[] = array ( "field" => "ProductP" , "old" => $this->parent->id , "new" => $parent->id); $this->parent = $parent; } Index: bug_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- bug_ins.php 26 Jul 2004 19:55:02 -0000 1.8.2.1 +++ bug_ins.php 30 Jul 2004 18:24:44 -0000 1.8.2.2 @@ -151,7 +151,7 @@ # # New Bug # - $b->bughist[0] = new bugdata($this->dbconn); + $b->bughist[0] = new bugdata($dbconn); $b->bughist[0]->description = myentities($description); if ( $b->parent->getType() == "product" ) { |
|
From: Gero K. <gok...@us...> - 2004-07-30 18:24:53
|
Update of /cvsroot/tutos/tutos/php/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31091/php/db Modified Files: Tag: BRANCH-1-2 db.pinc Log Message: some fixes Index: db.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/db/db.pinc,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- db.pinc 19 Mar 2004 19:39:31 -0000 1.8 +++ db.pinc 30 Jul 2004 18:24:44 -0000 1.8.2.1 @@ -281,7 +281,11 @@ } else if ( $type == "INT" ) { $this->flds[$fld] = sprintf("%d",$val); } else if ( $type == "OBJ" ) { - $this->flds[$fld] = sprintf("%d",$val->id); + if (is_object($val)) { + $this->flds[$fld] = sprintf("%d",$val->id); + } else { + $this->flds[$fld] = "null"; + } } else { $this->flds[$fld] = $val; } |
|
From: Gero K. <gok...@us...> - 2004-07-30 14:06:38
|
Update of /cvsroot/tutos/tutos/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16011/homepage Modified Files: Tag: BRANCH-1-2 calendar.png docs.html download.html feedback.html head0.html index.html require.html screens.html status.html Removed Files: Tag: BRANCH-1-2 database.html object.html source_php.html Log Message: release prepare Index: calendar.png =================================================================== RCS file: /cvsroot/tutos/tutos/homepage/calendar.png,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -r1.5 -r1.5.6.1 Binary files /tmp/cvsns2V6h and /tmp/cvsILFpF0 differ Index: docs.html =================================================================== RCS file: /cvsroot/tutos/tutos/homepage/docs.html,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -r1.5 -r1.5.6.1 --- docs.html 3 Mar 2003 19:53:38 -0000 1.5 +++ docs.html 30 Jul 2004 14:06:29 -0000 1.5.6.1 @@ -6,14 +6,11 @@ <!--$Id$ --> <ul> - <li><a href="TUTOS" rel="nofollow">http://www.tutos.org/documentation/book0/index.html">TUTOS Online Ducumentation (part of the helpsystem)</a> + <li><b><a href="http://wiki.tutos.org">TUTOS Wiki</a></b> + <li><a href="TUTOS" rel="nofollow">http://www.tutos.org/documentation/book0/index.html">TUTOS Online Ducumentation (part of the helpsystem)</a>outdated <li><a href="license.html">License</a> <li><a href="install.html">Installation</a> <li><a href="install_faq.html">Installation FAQ</a> - <li><a href="database.html">Database Structure</a> - <li><a href="object.html">Logical Structure</a> - <li><a href="source_php.html">Physical Source Structure PHP</a> - <li><a href="apidoc/index2.html">API Documetation (PHPDoc)</a> </ul> <!--#include file="foot1.html" --> Index: download.html =================================================================== RCS file: /cvsroot/tutos/tutos/homepage/download.html,v retrieving revision 1.41 retrieving revision 1.41.4.1 diff -u -r1.41 -r1.41.4.1 --- download.html 21 Oct 2003 19:56:33 -0000 1.41 +++ download.html 30 Jul 2004 14:06:29 -0000 1.41.4.1 @@ -6,17 +6,19 @@ <!--$Id$ --> <P> -When updating to a new version: Please look at the ChangeLog file you find in the release ! -<P> -<B>Versions:</B> -<P> -A <B>better overview</B> over released version is available at <A HREF=http://sourceforge.net/project/showfiles.php?group_id=8047 |
|
From: Gero K. <gok...@us...> - 2004-07-30 14:06:38
|
Update of /cvsroot/tutos/tutos/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16011/html Modified Files: Tag: BRANCH-1-2 copyright.html motd.html Log Message: release prepare Index: copyright.html =================================================================== RCS file: /cvsroot/tutos/tutos/html/copyright.html,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -u -r1.14 -r1.14.2.1 --- copyright.html 12 Apr 2004 12:53:47 -0000 1.14 +++ copyright.html 30 Jul 2004 14:06:29 -0000 1.14.2.1 @@ -15,7 +15,7 @@ --> <b>Copyright © 1999 - 2004 by Gero Kohnert All rights reserved.</b> <p> -Go and see the TUTOS <a href="http://www.tutos.org">homepage</a><br> +Go and see the TUTOS <a href="http://www.tutos.org" target="home">homepage</a><br> <p /> </center> This software uses (if available):<BR><UL> Index: motd.html =================================================================== RCS file: /cvsroot/tutos/tutos/html/motd.html,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -r1.5 -r1.5.6.1 --- motd.html 1 Jan 2003 18:54:36 -0000 1.5 +++ motd.html 30 Jul 2004 14:06:29 -0000 1.5.6.1 @@ -2,7 +2,7 @@ <!-- This will be read inside of <PRE> </PRE> --> This is the <u>default</u> message of today. -Congratulations you have managed to install <a href="http://www.tutos.org">TUTOS</a>. +Congratulations you have managed to install <a href="http://www.tutos.org" target="home">TUTOS</a>. To change the message of today: @@ -16,4 +16,6 @@ Have fun. + +See <a href="wiki.tutos.org" target="doku">TUTOS wiki</a> for uptodate documentation. <!-- EOF --> |
|
From: Gero K. <gok...@us...> - 2004-07-30 14:06:37
|
Update of /cvsroot/tutos/tutos/documentation/user_manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16011/documentation/user_manual Modified Files: Tag: BRANCH-1-2 address_pic2.png tasks_pic7.png Log Message: release prepare Index: address_pic2.png =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/user_manual/address_pic2.png,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -u -r1.2 -r1.2.6.1 Binary files /tmp/cvsywWriT and /tmp/cvsImoSxB differ Index: tasks_pic7.png =================================================================== RCS file: /cvsroot/tutos/tutos/documentation/user_manual/tasks_pic7.png,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -u -r1.2 -r1.2.8.1 Binary files /tmp/cvsZBEuZ9 and /tmp/cvsIiqqrS differ |
|
From: Dimitri F. <ta...@us...> - 2004-07-30 13:30:27
|
Update of /cvsroot/tutos/tutos/php/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9135/php/admin Modified Files: Tag: BRANCH-2-0 acl_clean.php Log Message: * we don't work no more on a per-user base whatever the case, but on a per-object base. That is selecting all the « type » objects, then read_acl($obj)... Index: acl_clean.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin/Attic/acl_clean.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- acl_clean.php 29 Jul 2004 17:07:56 -0000 1.1.2.1 +++ acl_clean.php 30 Jul 2004 13:30:17 -0000 1.1.2.2 @@ -41,11 +41,49 @@ function info() { global $tutos, $lang; - // Get a list of all tutos users in the system - $q = - "SELECT * FROM ". $this->dbconn->prefix ."people ORDER BY adr_id"; - $r = $this->dbconn->Exec($q); - $n = $r->numrows(); + switch( $this->action ) { + case "addresses": { + // Get a list of all tutos users in the system + $q = + "SELECT adr_id FROM ". $this->dbconn->prefix ."people ". + "ORDER BY adr_id"; + $r = $this->dbconn->Exec($q); + $n = $r->numrows(); + break; + } + case "projects": + $q = + "SELECT id FROM ".$this->dbconn->prefix."products ". + "ORDER BY id DESC"; + $r = $this->dbconn->Exec($q); + $n = $r->numrows(); + break; + + case "task": + $q = + "SELECT id FROM ".$this->dbconn->prefix."tasks ". + "ORDER BY id"; + $r = $this->dbconn->Exec($q); + $n = $r->numrows(); + break; + + case "bugs": + $q = + "SELECT id FROM ".$this->dbconn->prefix."bugs ". + "ORDER BY id"; + $r = $this->dbconn->Exec($q); + $n = $r->numrows(); + break; + + case "timetrack": + $q = + "SELECT id FROM ".$this->dbconn->prefix."timetrack ". + "ORDER BY id"; + $r = $this->dbconn->Exec($q); + $n = $r->numrows(); + break; + + } if ( $this->start == -1 ) { $a = $n - $tutos[maxshow]; @@ -83,15 +121,15 @@ $list = array(); for(; ($a < $n) && ($a < $end); $a++) { - $adr_id = $r->get($a, 'adr_id'); - $user = new tutos_user($this->dbconn); - $user->read($adr_id); - - if( $user->id == "" || $user->id == -1 ) - continue; - switch( $this->action ) { case "addresses": { + $adr_id = $r->get($a, 'adr_id'); + $user = new tutos_user($this->dbconn); + $user->read($adr_id); + + if( $user->id == "" || $user->id == -1 ) + continue; + $acl = read_acl($this->dbconn, $user); $list[] = array('id' => $adr_id, @@ -105,76 +143,77 @@ break; case "projects": - product::obj_read($user); + $id = $r->get($a, 'id'); + $project = new product($this->dbconn); + $project->read($id); - foreach( $user->prolist as $role ) { - foreach( $role as $p ) { - - if( isset($p) && isset($p->id) && $p->id != "" && $p->id != -1 ) { - $acl = read_acl($this->dbconn, $p); + if( $project->id == "" || $project->id == -1 ) + continue; + + $acl = read_acl($this->dbconn, $project); - $list[] = array('id' => $p->id, - 'name' => $p->getFullName(), - 'link' => $p->getUrl(), - 'creator' => $p->creator->id, - 'acl' => $acl, - 'rowspan' => count($acl) + 1); - - } - } - } + $list[] = array('id' => $project->id, + 'name' => $project->getFullName(), + 'link' => $project->getUrl(), + 'creator' => $project->creator->id, + 'acl' => $acl, + 'rowspan' => count($acl) + 1); break; case "task": - task::obj_read($user); - - foreach( $user->fulltasklist as $t ) { - if( isset($t) && isset($t->id) && $t->id != "" && $t->id != -1 ) { - $acl = read_acl($this->dbconn, $t); - - $list[] = array('id' => $t->id, - 'name' => $t->getFullName(), - 'link' => $t->getUrl(), - 'creator' => $t->creator->id, - 'acl' => $acl, - 'rowspan' => count($acl) + 1); - } - } + $id = $r->get($a, 'id'); + $task = new task($this->dbconn); + $task->read($id); + + if( $task->id == "" || $task->id == -1 ) + continue; + + $acl = read_acl($this->dbconn, $task); + + $list[] = array('id' => $task->id, + 'name' => $task->getFullName(), + 'link' => $task->getUrl(), + 'creator' => $task->creator->id, + 'acl' => $acl, + 'rowspan' => count($acl) + 1); break; case "bugs": - bug::obj_read($user); - - foreach( $user->list[usebugtracking] as $i => $b ) { - if( isset($b) && isset($b->id) && $b->id != "" && $b->id != -1 ) { - $acl = read_acl($this->dbconn, $b); - - $list[] = array('id' => $b->id, - 'name' => $b->getFullName(), - 'link' => $b->getUrl(), - 'creator' => $b->creator->id, - 'acl' => $acl, - 'rowspan' => count($acl) + 1); - } - } + $id = $r->get($a, 'id'); + $bug = new bug($this->dbconn); + $bug->read($id); + + if( $bug->id == "" || $bug->id == -1 ) + continue; + + $acl = read_acl($this->dbconn, $bug); + + $list[] = array('id' => $bug->id, + 'name' => $bug->getFullName(), + 'link' => $bug->getUrl(), + 'creator' => $bug->creator->id, + 'solver' => $bug->solver->id, + 'acl' => $acl, + 'rowspan' => count($acl) + 1); break; case "timetrack": - timetrack::obj_read($user); - - foreach( $user->ttlist as $tt ) { - if( isset($tt) &&isset($tt->id)&& $tt->id != "" && $tt->id != -1 ) { - $acl = read_acl($this->dbconn, $tt); - - $list[] = array('id' => $tt->id, - 'name' => $tt->desc, - 'link' => $tt->getUrl(), - 'creator' => $tt->creator->id, - 'acl' => $acl, - 'rowspan' => count($acl) + 1); - } - } + $id = $r->get($a, 'id'); + $tt = new timetrack($this->dbconn); + $tt->read($id); + + if( $tt->id == "" || $tt->id == -1 ) + continue; + + $acl = read_acl($this->dbconn, $tt); + + $list[] = array('id' => $tt->id, + 'name' => $tt->desc, + 'link' => $tt->getUrl(), + 'creator' => $tt->wid, + 'acl' => $acl, + 'rowspan' => count($acl) + 1); break; } } |
|
From: Dimitri F. <ta...@us...> - 2004-07-30 13:30:27
|
Update of /cvsroot/tutos/tutos/templates/classic/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9135/templates/classic/admin Modified Files: Tag: BRANCH-2-0 acl_clean.tpl Log Message: * we don't work no more on a per-user base whatever the case, but on a per-object base. That is selecting all the « type » objects, then read_acl($obj)... Index: acl_clean.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/admin/Attic/acl_clean.tpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- acl_clean.tpl 29 Jul 2004 17:07:56 -0000 1.1.2.1 +++ acl_clean.tpl 30 Jul 2004 13:30:18 -0000 1.1.2.2 @@ -6,7 +6,16 @@ <tr> <th rowspan="2">id</th> <th rowspan="2">name</th> - <th rowspan="2">creator</th> + <th rowspan="2"> + {if $search.action == "timetrack"} + worker + {else} + creator + {/if} + </th> + {if $search.action == "bugs"} + <th rowspan="2">solver</th> + {/if} <th colspan="5">acl objects</th> </tr> <tr> @@ -75,16 +84,19 @@ <tr> <td rowspan="{$p.rowspan}" class="data" valign="top">{$p.id}</td> <td rowspan="{$p.rowspan}" valign="top"> - <a href="{$p.link}" title="{$p.name}">{$p.name}</a> + <a href="../{$p.link}" title="{$p.name}">{$p.name}</a> </td> <td rowspan="{$p.rowspan}" class="data" valign="top">{$p.creator}</td> + {if $search.action == "bugs"} + <td rowspan="{$p.rowspan}" class="data" valign="top">{$p.solver}</td> + {/if} </tr> {foreach from=$p.acl item=a} <tr> <td class="data">{$a.id}</td> <td class="data" style="text-align: left;">{$a.type}</td> - <td><a href="{$a.link}" title="{$a.name}">{$a.name}</a></td> + <td><a href="../{$a.link}" title="{$a.name}">{$a.name}</a></td> <td class="data">{$a.perm}</td> <td class="data">{if $a.creator == ""} {else}{$a.creator}{/if}</td> </tr> |
|
From: Gero K. <gok...@us...> - 2004-07-30 06:34:07
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9865 Modified Files: Tag: BRANCH-1-2 Date.pinc base.pinc Log Message: some fixes Index: Date.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v retrieving revision 1.97 retrieving revision 1.97.2.1 diff -u -r1.97 -r1.97.2.1 --- Date.pinc 20 Apr 2004 18:56:08 -0000 1.97 +++ Date.pinc 30 Jul 2004 06:33:43 -0000 1.97.2.1 @@ -553,7 +553,7 @@ $this->setNoTime(); return; }; - if (($str == "0") || ($str == "") || ($str== "--------")) { + if (($str == "0") || ($str == "") || ($str== "--------") || ($str == "------------") ) { $this->setNoTime(); return; }; Index: base.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/base.pinc,v retrieving revision 1.73.2.3 retrieving revision 1.73.2.4 diff -u -r1.73.2.3 -r1.73.2.4 --- base.pinc 26 Jul 2004 19:54:57 -0000 1.73.2.3 +++ base.pinc 30 Jul 2004 06:33:43 -0000 1.73.2.4 @@ -117,7 +117,7 @@ if ( ! is_numeric($id) ) return -1; if ( $obj->tablename == "UNKNOWN" ) return -1; - if ( isset($g_hash[$id]) ) { + if ( !isset($tutos['nohash']) && isset($g_hash[$id]) ) { # Hashed #$this = $g_hash[$id]; # if ($this->id != $id) { @@ -128,7 +128,8 @@ # echo $id ." ". $g_hash[$id]->getFullName() ." ###<br>"; # } else { $g_hash['hits']++; - return $g_hash[$id]; + $obj = &$g_hash[$id]; + return $obj; # } } if (!isset($obj->dbconn)) { @@ -232,6 +233,8 @@ * parse XML import */ function parseXML ($fld,$data,$attrs) { + global $tutos; + if ( $fld == "systemid" ) { $this->force_insert = ($data != $this->dbconn->db->systemid); } @@ -239,8 +242,14 @@ if ($this->force_insert) { $this->id = -1; } else { - $this->read($data,$this); + $tutos['nohash'] =1 ; + $xx = $this->read($data,$this); + unset($tutos['nohash']); +# echo "X:".$xx->id." ".$this->id." ". $data ."\n"; if ( ($this->id != $data) ) { + if ($tutos[debug] != 0) { + Fatal_Error($this->gettype() ." with id ". $data. " does not exist"); + } die ($this->gettype() ." with id ". $data. " does not exist"); } } |
|
From: Gero K. <gok...@us...> - 2004-07-30 06:34:06
|
Update of /cvsroot/tutos/tutos/php/auth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9865/auth Modified Files: Tag: BRANCH-1-2 auth.pinc Log Message: some fixes Index: auth.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/auth/auth.pinc,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -r1.8 -r1.8.4.1 --- auth.pinc 17 Oct 2003 14:06:10 -0000 1.8 +++ auth.pinc 30 Jul 2004 06:33:43 -0000 1.8.4.1 @@ -73,6 +73,9 @@ Function login_form ($gotourl,$m) { global $msg,$current_user; + if (isset($_GET['format']) && $_GET['format'] == "xml" ) { + die("login required to fetch data\n"); + } $msg = $m; require_once 'login.pinc'; $l = new login($current_user); |
|
From: Gero K. <gok...@us...> - 2004-07-30 06:34:06
|
Update of /cvsroot/tutos/tutos/php/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9865/xml Modified Files: Tag: BRANCH-1-2 xml_ins.php xml_parse.pinc Log Message: some fixes Index: xml_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/xml/xml_ins.php,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -r1.3 -r1.3.4.1 --- xml_ins.php 4 Feb 2004 19:50:54 -0000 1.3 +++ xml_ins.php 30 Jul 2004 06:33:43 -0000 1.3.4.1 @@ -61,14 +61,14 @@ #$xml_parser->parse_file($file); if ( $xml_parser->format != "xml") { - $_SESSION['XML'] = UrlEncode($xml_parser->output); - $gotourl = addUrlParameter($gotourl,"XML",true); - xml_parser_free($xml_parser->parser); - $gotourl = addMessage($gotourl,$msg,true); - $gotourl = addSessionKey($gotourl,true); + $_SESSION['XML'] = UrlEncode($xml_parser->output); + $gotourl = addUrlParameter($gotourl,"XML",true); + xml_parser_free($xml_parser->parser); + $gotourl = addMessage($gotourl,$msg,true); + $gotourl = addSessionKey($gotourl,true); - Header("Status: 302 Moved Temporarily"); - Header("Location:". getBaseUrl(). $gotourl); + Header("Status: 302 Moved Temporarily"); + Header("Location:". getBaseUrl(). $gotourl); } else { echo $xml_parser->output; xml_parser_free($xml_parser->parser); Index: xml_parse.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/xml/xml_parse.pinc,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -r1.15 -r1.15.2.1 --- xml_parse.pinc 26 Mar 2004 18:05:26 -0000 1.15 +++ xml_parse.pinc 30 Jul 2004 06:33:43 -0000 1.15.2.1 @@ -8,14 +8,14 @@ */ include_once('appointment.pinc'); -include_once('group/group.pinc'); -include_once('url/url.pinc'); -include_once('note/note.pinc'); + +loadmodule("group"); +loadmodule("url"); +loadmodule("note"); class TUTOS_XMLParser extends tutos_module { # var: Deprecated in PHP5 # var $depth = array(); -# var $stack = array(); var $imp_locs = array(); var $groupmemberlist = array(); @@ -31,6 +31,8 @@ $this->testonly = false; $this->stop = false; $this->output = ""; + $this->format = ""; + $this->stack = array(); xml_parser_set_option($this->parser,XML_OPTION_CASE_FOLDING,0); xml_set_object($this->parser, &$this); @@ -77,7 +79,11 @@ $this->parentobj = $this->cobj; $this->cobj = &$this->group; } - + if ( $name == "note" ) { + $this->note = new note($this->dbconn); + $this->parentobj = $this->cobj; + $this->cobj = &$this->note; + } $this->ctag = $name; $this->attrs = $attrs; # echo "#". $name ."#<br>\n"; @@ -100,6 +106,8 @@ } $this->group = null; $this->cobj = &$this->parentobj; + } else if ( $name == "note" ) { + $this->cobj = &$this->parentobj; } else if ( $name == "location" ) { $this->loc->ref = $this->parentobj; $this->loc->adr_id = $this->parentobj->id; @@ -195,7 +203,7 @@ if (trim($data) == "") { return; } - #$this->output .= $this->ctag. "|". utf8_decode($this->data) ."|\n"; + $this->output .= $this->ctag. "|". utf8_decode($this->data) ."|\n"; } function defaulthandler($parser, $data) { @@ -216,6 +224,7 @@ $this->output .= "could not open XML input file:".$fname ."\n"; } while (!$this->stop && ($data = fread($fp, 4096)) ) { + $this->output .= myentities($data); $this->parse_data($data); } } |
|
From: Gero K. <gok...@us...> - 2004-07-29 17:58:33
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21880 Modified Files: Tag: BRANCH-1-2 address_tools.p3 db.p3 user.pinc Log Message: fixes Index: address_tools.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v retrieving revision 1.76.2.1 retrieving revision 1.76.2.2 diff -u -r1.76.2.1 -r1.76.2.2 --- address_tools.p3 26 Jul 2004 19:54:56 -0000 1.76.2.1 +++ address_tools.p3 29 Jul 2004 17:58:23 -0000 1.76.2.2 @@ -284,7 +284,7 @@ if ( $ashow['icon_before'] ) { # myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank. - echo $layout->showGuiIcons(" <td valign=\"top\" rowspan=\"". $c ."\">","</td>\n",$address,$address,$current_user->get_preficons(1),false); + echo $layout->showGuiIcons(" <td valign=\"top\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(1),false); } if ( $ashow['f_name'] ) { $b = myentities($address->f_name); @@ -413,7 +413,7 @@ } } if ( $ashow['d_id'] ) { - if ( isset($location->department) ) { + if ( is_object($location->department) ) { echo " <td> ". $location->department->getLink() ."</td>\n"; } else { echo " <td> </td>\n"; @@ -421,7 +421,7 @@ } if ( ($row == 0) && ($ashow['icon_after']) ) { # myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank. - echo $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">","</td>\n",$address,$address,$current_user->get_preficons(2),false); + echo $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(2),false); } if ( ($row == 0) && ($tutos[massupdate] == 1) && !empty($target)) { echo " <td align=\"center\" rowspan=\"". $c ."\">\n"; Index: db.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/db.p3,v retrieving revision 1.147.2.1 retrieving revision 1.147.2.2 diff -u -r1.147.2.1 -r1.147.2.2 --- db.p3 26 Jul 2004 19:54:58 -0000 1.147.2.1 +++ db.p3 29 Jul 2004 17:58:23 -0000 1.147.2.2 @@ -284,7 +284,7 @@ $tutos[debugConsole] = 0; ini_set('display_errors','Off'); } -@error_reporting($tutos['error_reporting']); +error_reporting($tutos['error_reporting']); set_error_handler('PHP_Error'); define('FPDF_FONTPATH',$tutos['base'] ."/". $tutos[fpdfpath].'/font/'); Index: user.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/user.pinc,v retrieving revision 1.135.2.2 retrieving revision 1.135.2.3 diff -u -r1.135.2.2 -r1.135.2.3 --- user.pinc 26 Jul 2004 19:55:00 -0000 1.135.2.2 +++ user.pinc 29 Jul 2004 17:58:23 -0000 1.135.2.3 @@ -73,11 +73,11 @@ $this->holiday[strtolower($i)] = $f; } # Default all iconsets - foreach ($tutos[rowiconsbefore] as $i => $f) { - $this->rowiconsbefore[strtolower($i)] = $f; + foreach ($tutos[rowiconsbefore] as $f) { + $this->rowiconsbefore[strtolower($f)] = 0; } - foreach ($tutos[rowiconsafter] as $i => $f) { - $this->rowiconsafter[strtolower($i)] = $f; + foreach ($tutos[rowiconsafter] as $f) { + $this->rowiconsafter[strtolower($f)] = 0; } # Disable all namedays foreach ($tutos[nameday] as $i => $f) { @@ -177,7 +177,8 @@ if ( strlen($rowiconsbefore) > 0 ) { $h = split(",",$rowiconsbefore); while( list ($i,$f) = @each ($h) ) { - $this->rowiconsbefore[strtolower($f)] = 1; + if ( $f != "" ) + $this->rowiconsbefore[strtolower($f)] = 1; } } $rowiconsafter = StripSlashes($r->get($pos, "rowiconsafter")); @@ -187,7 +188,8 @@ if ( strlen($rowiconsafter) > 0 ) { $h = split(",",$rowiconsafter); while( list ($i,$f) = @each ($h) ) { - $this->rowiconsafter[strtolower($f)] = 1; + if ( $f != "" ) + $this->rowiconsafter[strtolower($f)] = 1; } } $namedays = StripSlashes($r->get($pos, "namedays")); |
|
From: Gero K. <gok...@us...> - 2004-07-29 17:58:33
|
Update of /cvsroot/tutos/tutos/php/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21880/layout Modified Files: Tag: BRANCH-1-2 new_layout.pinc theme_base.pinc Log Message: fixes Index: new_layout.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/layout/new_layout.pinc,v retrieving revision 1.35 retrieving revision 1.35.2.1 diff -u -r1.35 -r1.35.2.1 --- new_layout.pinc 7 May 2004 08:07:46 -0000 1.35 +++ new_layout.pinc 29 Jul 2004 17:58:24 -0000 1.35.2.1 @@ -125,7 +125,6 @@ } #building html - echo $start; if ( ($myobject->see_ok()) && (in_array("see",$which)) && ($desc == true) ) { $r .= " ". menulink($SeeUrl, $this->theme->getImage(view,'list')." ". $lang['show'], @@ -153,8 +152,7 @@ $this->theme->getImage(delete,'list'), $DelSprintf); } - $r .= $end; - return $r; + return $start.$r.$end; } /** * do we support icons for edit modify del Index: theme_base.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/layout/theme_base.pinc,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- theme_base.pinc 26 Mar 2004 11:01:38 -0000 1.7 +++ theme_base.pinc 29 Jul 2004 17:58:24 -0000 1.7.2.1 @@ -21,6 +21,7 @@ define ('mail',15); define ('modify',16); define ('delete',17); +define ('view',18); /** * @@ -88,6 +89,7 @@ $this->i[user] = $this->findImage('user'); $this->i[modify] = $this->findImage('modify'); $this->i[delete] = $this->findImage('delete'); + $this->i[view] = $this->findImage('view'); $this->a[up] = "UP"; $this->a[down] = "DOWN"; |
|
From: Dimitri F. <ta...@us...> - 2004-07-29 17:08:05
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12939/php Modified Files: Tag: BRANCH-2-0 base.pinc user.pinc Log Message: * Added a new admin tool for TUTOS, allowing to check existing ACL. At the moment, the script is not capable of doing any data update. This allowed me to find out the mess I had manage to make in our database ! Index: base.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/base.pinc,v retrieving revision 1.62.2.1 retrieving revision 1.62.2.2 diff -u -r1.62.2.1 -r1.62.2.2 --- base.pinc 14 Apr 2004 17:39:09 -0000 1.62.2.1 +++ base.pinc 29 Jul 2004 17:07:56 -0000 1.62.2.2 @@ -334,9 +334,10 @@ */ function mod_ok () { global $current_user; - if ( ! $current_user->feature_ok($this->gettypeid(),PERM_MOD) ) { + if ( ! $current_user->feature_ok($this->gettypeid(),PERM_MOD, True) ) { return 0; } + error_log('MOD_OK '.acl_mod_ok($this)); return acl_mod_ok($this); } /** Index: user.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/user.pinc,v retrieving revision 1.130.2.3 retrieving revision 1.130.2.4 diff -u -r1.130.2.3 -r1.130.2.4 --- user.pinc 18 Jun 2004 15:23:30 -0000 1.130.2.3 +++ user.pinc 29 Jul 2004 17:07:56 -0000 1.130.2.4 @@ -446,9 +446,12 @@ /** * Checks if this user is allowed to use a feature */ - function feature_ok ($feature,$level) { + function feature_ok ($feature,$level, $debug = False) { global $tutos; + + if( $debug ) error_log(' FEATURE '.$feature.' '.$level); + if ( !isset($tutos[$feature])) { # echo "NO1 |". $this->p[$feature]."| ".$feature; return false; @@ -461,14 +464,19 @@ if ($tutos[useacl] != 1) { return true; } + #internal feature of a module if ( $feature < -1000 ) { return true; } + # check users permissions + if( $debug ) error_log(' FEATURE '.$this->p[$feature].' '.$level); if ( ($this->p[$feature] & $level) ) { + if( $debug ) error_log(' TRUE'); return true; } + if ( ($this->p[$feature] & PERM_ALL) ) { return true; } |
|
From: Dimitri F. <ta...@us...> - 2004-07-29 17:08:05
|
Update of /cvsroot/tutos/tutos/php/invoice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12939/php/invoice Modified Files: Tag: BRANCH-2-0 invoice.pinc Log Message: * Added a new admin tool for TUTOS, allowing to check existing ACL. At the moment, the script is not capable of doing any data update. This allowed me to find out the mess I had manage to make in our database ! Index: invoice.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v retrieving revision 1.43.2.2 retrieving revision 1.43.2.3 diff -u -r1.43.2.2 -r1.43.2.3 --- invoice.pinc 15 Apr 2004 16:19:48 -0000 1.43.2.2 +++ invoice.pinc 29 Jul 2004 17:07:56 -0000 1.43.2.3 @@ -1050,7 +1050,7 @@ return; } return array('url' => "invoice/invoice_overview.php", - 'image' => $user->layout->theme->getImage(invoice::getHtmlIcon(),'menu'), + 'image' => 'invoice', 'text' => ($text == "" ? $lang['InvOverview']: $text), 'info' => $lang['InvOverview'], 'category' => array("overview","invoice","module") @@ -1065,11 +1065,11 @@ if ( ! $user->feature_ok(useinvoice,PERM_SEL) ) { return; } - return array( url => "invoice/invoice_select.php", - image => invoice::getHtmlIcon(), - text => ($text == "" ? $lang['Invoices']: $text), - info => $lang['InvoiceSearch'], - category => array("search","invoice","module") + return array('url' => "invoice/invoice_select.php", + 'image' => "invoice", + 'text' => ($text == "" ? $lang['Invoices']: $text), + 'info' => $lang['InvoiceSearch'], + 'category' => array("search","invoice","module") ); } |
|
From: Dimitri F. <ta...@us...> - 2004-07-29 17:08:05
|
Update of /cvsroot/tutos/tutos/templates/classic/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12939/templates/classic/admin Added Files: Tag: BRANCH-2-0 acl_clean.tpl Log Message: * Added a new admin tool for TUTOS, allowing to check existing ACL. At the moment, the script is not capable of doing any data update. This allowed me to find out the mess I had manage to make in our database ! --- NEW FILE: acl_clean.tpl --- {* Admin page to clean ACLs when things go wrong *} {* $Id: acl_clean.tpl,v 1.1.2.1 2004/07/29 17:07:56 tapoueh Exp $ *} <table class="overview"> <thead> <tr> <th rowspan="2">id</th> <th rowspan="2">name</th> <th rowspan="2">creator</th> <th colspan="5">acl objects</th> </tr> <tr> <th>id</th> <th>type</th> <th>name</th> <th>perm</th> <th>creator</th> </tr> </thead> <tfoot> <tr> <td colspan="7" align="center"> {if $astart > 0} {strip} <a href="? {foreach from=$search key=k item=v} {$k}={$v}& {/foreach} start={$prev_start}" title="{$NavBack}"> <img src="{$base}/html/classic/left.png" alt="{$NavBack}"> </a> {/strip} {else} {/if} {foreach from=$direct_nav item=d name=navbar} {if $d.astart == $astart} <b>{$d.label}</b> {else} {strip} <a href="? {foreach from=$search key=k item=v} {$k}={$v}& {/foreach} start={$d.astart}" title="{$d.title}">{$d.label}</a> {/strip} {/if} {if not $smarty.foreach.navbar.last} - {/if} {/foreach} {if $next_start < $nb} {strip} <a href="? {foreach from=$search key=k item=v} {$k}={$v}& {/foreach} start={$next_start}" title="{$NavNext}"> <img src="{$base}/html/classic/right.png" alt="{$NavNext}"> </a> {/strip} {/if} </td> <td colspan="2" align="right"> {$astart} - {$aend} / {$nb} </td> </tr> </tfoot> <tbody> {foreach from=$list item=p} <tr> <td rowspan="{$p.rowspan}" class="data" valign="top">{$p.id}</td> <td rowspan="{$p.rowspan}" valign="top"> <a href="{$p.link}" title="{$p.name}">{$p.name}</a> </td> <td rowspan="{$p.rowspan}" class="data" valign="top">{$p.creator}</td> </tr> {foreach from=$p.acl item=a} <tr> <td class="data">{$a.id}</td> <td class="data" style="text-align: left;">{$a.type}</td> <td><a href="{$a.link}" title="{$a.name}">{$a.name}</a></td> <td class="data">{$a.perm}</td> <td class="data">{if $a.creator == ""} {else}{$a.creator}{/if}</td> </tr> {/foreach} {/foreach} </tbody> </table> |
|
From: Dimitri F. <ta...@us...> - 2004-07-29 17:08:05
|
Update of /cvsroot/tutos/tutos/php/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12939/php/admin Added Files: Tag: BRANCH-2-0 acl_clean.php Log Message: * Added a new admin tool for TUTOS, allowing to check existing ACL. At the moment, the script is not capable of doing any data update. This allowed me to find out the mess I had manage to make in our database ! --- NEW FILE: acl_clean.php --- <?php $tutos['base'] = "../.."; ini_set("include_path",".."); include_once 'acl.pinc'; include_once 'webelements.p3'; include_once 'permission.p3'; include_once 'task.pinc'; include_once 'product.pinc'; include_once 'timetrack.pinc'; include_once 'bugtracking/bug.pinc'; include_once 'layout/layout.pinc'; check_user(); function read_acl($dbconn, $obj) { acl_read($obj); $acl = array(); foreach( $obj->acl as $id => $perm ) { if( isset($id) && $id != "" && $id != -1 ) { $object = getObject($dbconn, $id); if( $object != -1 ) $acl[] = array('id' => $object->id, 'type' => $object->getType(), 'name' => $object->getFullName(), 'link' => $object->getUrl(), 'perm' => $perm, 'creator' => $object->creator->id); } } return $acl; } class admin_acl_clean extends layout { function info() { global $tutos, $lang; // Get a list of all tutos users in the system $q = "SELECT * FROM ". $this->dbconn->prefix ."people ORDER BY adr_id"; $r = $this->dbconn->Exec($q); $n = $r->numrows(); if ( $this->start == -1 ) { $a = $n - $tutos[maxshow]; $end = $n; $this->start = $a; } else { $a = $this->start; $end = $this->start + $tutos[maxshow]; } $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]); $this->assign('next_start', $end); $this->assign('NavBack', $lang['NavBack']); $this->assign('NavNext', $lang['NavNext']); $this->assign('nb', $n); $this->assign('astart', $a); $this->assign('aend', $end > $n ? $n : $end); $this->assign('n_per_page', $tutos[maxshow]); // Generate direct links to page results $nb_pages = ceil($n / $tutos[maxshow]); $direct_nav = array(); for($i=0; $i < $nb_pages; $i++) $direct_nav[] = array('label' => $i + 1, 'astart' => $i * $tutos[maxshow], 'title' => sprintf($lang['pageof'], $i+1, $nb_pages)); $this->assign('direct_nav', $direct_nav); $list = array(); for(; ($a < $n) && ($a < $end); $a++) { $adr_id = $r->get($a, 'adr_id'); $user = new tutos_user($this->dbconn); $user->read($adr_id); if( $user->id == "" || $user->id == -1 ) continue; switch( $this->action ) { case "addresses": { $acl = read_acl($this->dbconn, $user); $list[] = array('id' => $adr_id, 'name' => $user->getFullName(), 'link' => $user->getUrl(), 'creator' => $user->creator->id, 'acl' => $acl, 'rowspan' => count($acl) + 1); } break; case "projects": product::obj_read($user); foreach( $user->prolist as $role ) { foreach( $role as $p ) { if( isset($p) && isset($p->id) && $p->id != "" && $p->id != -1 ) { $acl = read_acl($this->dbconn, $p); $list[] = array('id' => $p->id, 'name' => $p->getFullName(), 'link' => $p->getUrl(), 'creator' => $p->creator->id, 'acl' => $acl, 'rowspan' => count($acl) + 1); } } } break; case "task": task::obj_read($user); foreach( $user->fulltasklist as $t ) { if( isset($t) && isset($t->id) && $t->id != "" && $t->id != -1 ) { $acl = read_acl($this->dbconn, $t); $list[] = array('id' => $t->id, 'name' => $t->getFullName(), 'link' => $t->getUrl(), 'creator' => $t->creator->id, 'acl' => $acl, 'rowspan' => count($acl) + 1); } } break; case "bugs": bug::obj_read($user); foreach( $user->list[usebugtracking] as $i => $b ) { if( isset($b) && isset($b->id) && $b->id != "" && $b->id != -1 ) { $acl = read_acl($this->dbconn, $b); $list[] = array('id' => $b->id, 'name' => $b->getFullName(), 'link' => $b->getUrl(), 'creator' => $b->creator->id, 'acl' => $acl, 'rowspan' => count($acl) + 1); } } break; case "timetrack": timetrack::obj_read($user); foreach( $user->ttlist as $tt ) { if( isset($tt) &&isset($tt->id)&& $tt->id != "" && $tt->id != -1 ) { $acl = read_acl($this->dbconn, $tt); $list[] = array('id' => $tt->id, 'name' => $tt->desc, 'link' => $tt->getUrl(), 'creator' => $tt->creator->id, 'acl' => $acl, 'rowspan' => count($acl) + 1); } } break; } } $r->free(); // $this->debug($list); $this->assign('list', $list); $this->template('admin/acl_clean'); } function navigate() { $this->menuprint("acl_clean"); } function prepare() { global $tutos, $lang; $actions = array("addresses", "projects", "task", "bugs", "timetrack"); $this->action = "addresses"; if( isset($_GET['action']) && $_GET['action'] != "" ) if( in_array($_GET['action'], $actions) ) { $this->action = $_GET['action']; $this->search['action'] = $this->action; } $this->assign('actions', $actions); $this->assign('search', $this->search); if( isset($_GET['start']) && $_GET['start'] != "" ) $this->start = $_GET['start']; else $this->start = 0; foreach( $actions as $action ) { $x = array('url' => "admin/acl_clean.php?action=".$action, 'text' => $action, 'info' => $action, 'image' => $action, 'category' => array("acl_clean") ); $this->addMenu($x); } } } $l = new admin_acl_clean($current_user); $l->display(); ?> |
|
From: Dimitri F. <ta...@us...> - 2004-07-29 17:06:20
|
Update of /cvsroot/tutos/tutos/templates/classic/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12771/templates/classic/admin Log Message: Directory /cvsroot/tutos/tutos/templates/classic/admin added to the repository --> Using per-directory sticky tag `BRANCH-2-0' |
|
From: Dimitri F. <ta...@us...> - 2004-07-27 15:36:42
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18162/php Modified Files: Tag: BRANCH-2-0 product_show.php task.pinc Log Message: * debug task:computeOverview, the results seem to be good, this time. Index: product_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/product_show.php,v retrieving revision 1.90.2.11 retrieving revision 1.90.2.12 diff -u -r1.90.2.11 -r1.90.2.12 --- product_show.php 27 Jul 2004 12:51:22 -0000 1.90.2.11 +++ product_show.php 27 Jul 2004 15:36:28 -0000 1.90.2.12 @@ -186,8 +186,6 @@ $tasklist[] = $tmp; } } - // $this->debug(task::flatten_tasks($tasklist)); - $this->assign('tasklist', array('label' => $lang['Tasks'], 'llabel' => $lang['TaskOverview'], Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.130.2.9 retrieving revision 1.130.2.10 diff -u -r1.130.2.9 -r1.130.2.10 --- task.pinc 27 Jul 2004 13:30:39 -0000 1.130.2.9 +++ task.pinc 27 Jul 2004 15:36:28 -0000 1.130.2.10 @@ -861,7 +861,6 @@ $p = ( ($max_end - $min_start + 86400) / $w); } - foreach($tasks as $i => $f) { $start = $f['s_start_ts']; $end = $f['s_end_ts']; @@ -878,26 +877,43 @@ $green = round($task_length * $c / 100.0); $red = $task_length - $green; + $tasks[$i]['green'] = $green; + $tasks[$i]['red'] = $red; + if( $timeline ) { - // Time line position : bt = length before time, at after - $tasks[$i]['bt'] = round(($t - $min_start)/$p); + // Time line position : 'bt' = length before time, 'at' after + $bt = round(($t - $min_start)/$p); + $tasks[$i]['bt'] = $bt; $tasks[$i]['at'] = $w - $tasks[$i]['bt']; // length of task to display arround time line - $before = round((min($t, $max) - $start)/$p); + $before = $start <= $t ? round(($t - $start)/$p) : 0; $after = $end >= $t ? round(($end - $t)/$p) : 0; - + + $tasks[$i]['before'] = $before; + $tasks[$i]['after'] = $after; + // Colors before timeline (before, green, red then none) - $tasks[$i]['b'] = round(($start - $min_start)/$p); - $tasks[$i]['bg'] = min($green, $before); - $tasks[$i]['br'] = min($red, $before - $tasks[$i]['bg']); - $tasks[$i]['bn'] = $end < $t ? round(($t - $end) / $p) : 0; + $b = $before == 0 ? $bt : round(($start - $min_start)/$p); + $bg = ($b + $green) < $bt ? $green : $bt - $b; + $br = ($b + $bg + $red) < $bt ? $red : $bt - ($b + $bg); + $bn = ($b + $bg + $br) < $bt ? $bt - ($b + $bg + $br) : 0; + + $tasks[$i]['b'] = $b; + $tasks[$i]['bg'] = $bg; + $tasks[$i]['br'] = $br; + $tasks[$i]['bn'] = $bn; // Colors after timeline (none, green, red then after) - $tasks[$i]['an'] = $start > $t ? round(($start - $t) / $p) : 0; - $tasks[$i]['ag'] = $green - $tasks[$i]['bg']; - $tasks[$i]['ar'] = $red - $tasks[$i]['br']; - $tasks[$i]['a'] = $after - ($tasks[$i]['ag'] + $tasks[$i]['ar']); + $an = $before == 0 ? round(($start - $t)/$p) : 0; + $ag = $green - $bg; + $ar = $red - $br; + $a = round(($max_end - $end)/$p); + + $tasks[$i]['an'] = $an; + $tasks[$i]['ag'] = $ag; + $tasks[$i]['ar'] = $ar; + $tasks[$i]['a'] = $a; } else { // Length to be displayed before beginning of the task |
|
From: Dimitri F. <ta...@us...> - 2004-07-27 15:36:42
|
Update of /cvsroot/tutos/tutos/php/url In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18162/php/url Modified Files: Tag: BRANCH-2-0 url.pinc Log Message: * debug task:computeOverview, the results seem to be good, this time. Index: url.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -u -r1.12.2.3 -r1.12.2.4 --- url.pinc 16 Apr 2004 14:43:15 -0000 1.12.2.3 +++ url.pinc 27 Jul 2004 15:36:30 -0000 1.12.2.4 @@ -234,30 +234,36 @@ } return $msg; } + /** * create a list of urls for the given object and given user */ function infolist (&$user,&$obj,$cols) { global $lang; + $urls = array(); + if ( ! $user->feature_ok(useurl,PERM_SEE) ) { - return; + return $urls; } url::obj_read($obj); if ( count($obj->list[useurl]) > 0 ) { - echo "<tr>"; - echo $user->layout->showfield($lang['ProdLinks']); - echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n"; - $pre = ""; + $urls = array('label' => $lang['ProdLinks'], + 'cols' => $cols -1, + 'summary' => array()); + foreach($obj->list[useurl] as $f) { - echo $pre . $f->getLink(); - echo " (". makelink("url/url_new.php?id=". $f->id,$lang['Modify'],$lang['Modify']) .")"; - $pre = "<br>\n"; + $urls['summary'][] = + array('label' => $f->getFullName(), + 'title' => $f->getFullName(), + 'link' => $f->getUrl(), + 'mlabel' => $lang['Modify'], + 'mtitle' => $lang['Modify'], + 'mlink' => "url/url_new.php?id=". $f->id); } - echo "</td>"; - echo "</tr>\n"; } } + /** * create a link to a overview page */ |
|
From: Dimitri F. <ta...@us...> - 2004-07-27 13:59:50
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32069/php Modified Files: Tag: BRANCH-2-0 product.pinc Log Message: * debug project.pinc readclassification and readroles when $this has no id. I suppose this should not be possible, but it is. Index: product.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/product.pinc,v retrieving revision 1.133.2.5 retrieving revision 1.133.2.6 diff -u -r1.133.2.5 -r1.133.2.6 --- product.pinc 13 May 2004 10:37:29 -0000 1.133.2.5 +++ product.pinc 27 Jul 2004 13:59:41 -0000 1.133.2.6 @@ -160,6 +160,10 @@ */ function readclassification ($c) { $this->cl[$c] = array(); + + if( $this->id == "" || $this->id == -1 ) + return; + $q = "SELECT * FROM ". $this->dbconn->prefix ."projectclass".$c." WHERE pro_id = ". $this->id; $r = $this->dbconn->Exec($q); $n = $r->numrows(); @@ -175,6 +179,9 @@ * read the different roles in this project */ function readroles () { + if( $this->id == "" || $this->id == -1 ) + return; + $q = "SELECT * FROM ". $this->tablename2 ." WHERE pro_id = ". $this->id; $r = $this->dbconn->Exec($q); $n = $r->numrows(); |
|
From: Dimitri F. <ta...@us...> - 2004-07-27 13:30:48
|
Update of /cvsroot/tutos/tutos/php In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26404/php Modified Files: Tag: BRANCH-2-0 task.pinc task_overview.php Log Message: * debug task->printRow(), must return an array, may be empty * debug task_overview to flatten the task list before calling computeOverview Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.130.2.8 retrieving revision 1.130.2.9 diff -u -r1.130.2.8 -r1.130.2.9 --- task.pinc 27 Jul 2004 12:51:22 -0000 1.130.2.8 +++ task.pinc 27 Jul 2004 13:30:39 -0000 1.130.2.9 @@ -669,11 +669,13 @@ function printRow(&$parent, $depth = 0, $fld = "", $slimit=0, $elimit=0) { global $lang, $tutos, $projects_tasks; + $result = array(); + if( !isset($projects_tasks) ) $projects_tasks = array(); // I sometimes get -1 as $this->id if( $this->id == -1 ) - return; + return $result; if ( ($parent->getType() == "address") || ($parent->getType() == "team") @@ -682,14 +684,12 @@ $recursive = false; # print only unfinished tasks if ( $this->state == TASK_FINISH ) { - return 1; + return $result; } } else { $recursive = true; } - $result = array(); - /* we limit the date range of printed tasks */ if( $slimit == 0 && $elimit == 0 || ($slimit != 0 && $elimit != 0 @@ -800,7 +800,7 @@ * The printRow function returns nested arrays, we may want to flatten * the list * - * This method is intended as a static one. + * This method is provided as a static one. */ function flatten_tasks($tasks) { $flatArray = array(); @@ -818,6 +818,10 @@ * Given a task array, we calculate beginning and end of actions, * then populate the array with length of elements to display for a * task overview + * + * You have to flatten the task list before calling this function + * + * This method is provided as a static one. */ function computeOverview(&$tasks, $w = 200) { if( count($tasks) < 1 ) Index: task_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v retrieving revision 1.62.2.9 retrieving revision 1.62.2.10 diff -u -r1.62.2.9 -r1.62.2.10 --- task_overview.php 27 Jul 2004 12:51:22 -0000 1.62.2.9 +++ task_overview.php 27 Jul 2004 13:30:39 -0000 1.62.2.10 @@ -121,6 +121,7 @@ $tasks[] = $tmp; } } + $tasks = task::flatten_tasks($tasks); // Compute lengths of task element to be displayed $width = 200; @@ -128,7 +129,7 @@ $limits = task::computeOverview($tasks, $width); // $this->debug($tasks); - $this->assign('tasks', task::flatten_tasks($tasks)); + $this->assign('tasks', $tasks); $this->assign('withtimeline', $limits['withtimeline']); /** |
|
From: Dimitri F. <ta...@us...> - 2004-07-27 12:51:32
|
Update of /cvsroot/tutos/tutos/templates/classic/bugtracking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/templates/classic/bugtracking Modified Files: Tag: BRANCH-2-0 bug_overview.tpl Log Message: * task printRow os now again recursive when necessary * use task:flatten_list to obtain a flat tasks list (to give to template for example) * task_overview now display correctly the tasks depths (whith —) * product_show now show all project tasks, with proper indentation * bug_overview now use the same navigation bar as other overviews Index: bug_overview.tpl =================================================================== RCS file: /cvsroot/tutos/tutos/templates/classic/bugtracking/Attic/bug_overview.tpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- bug_overview.tpl 11 May 2004 13:43:44 -0000 1.1.2.3 +++ bug_overview.tpl 27 Jul 2004 12:51:23 -0000 1.1.2.4 @@ -8,7 +8,6 @@ <input type="hidden" name="solverid" value="{$solverid}"> {/if} -{* <table class="single" border="1" cellpadding="3" cellspacing="0"> *} <table class="overview"> <thead> <tr> @@ -19,6 +18,58 @@ </tr> </thead> +<tfoot> +<tr> + <td colspan="{$inner_cols}" align="center"> + {if $astart > 0} + {strip} + <a href="? + {foreach from=$search key=k item=v} + {$k}={$v}& + {/foreach} + start={$prev_start}" + title="{$NavBack}"> + <img src="{$base}/html/classic/left.png" alt="{$NavBack}"> + </a> + {/strip} + {else} + + {/if} + + {foreach from=$direct_nav item=d name=navbar} + {if $d.astart == $astart} + <b>{$d.label}</b> + {else} + {strip} + <a href="? + {foreach from=$filter key=k item=v} + {$k}={$v}& + {/foreach} + start={$d.astart}" title="{$d.title}">{$d.label}</a> + {/strip} + {/if} + {if not $smarty.foreach.navbar.last} - {/if} + {/foreach} + + {if $next_start < $nb_bugs} + {strip} + <a href="? + {foreach from=$filter key=k item=v} + {$k}={$v}& + {/foreach} + start={$next_start}" + title="{$NavNext}"> + <img src="{$base}/html/classic/right.png" alt="{$NavNext}"> + </a> + {/strip} + {/if} + </td> + <td colspan="2" align="right"> + {$astart} - {$aend} / {$nb_bugs} + </td> +</tr> +</tfoot> + <tbody> {section name=b loop=$bugs} <tr> @@ -42,16 +93,6 @@ {/section} </tbody> -<tr> - <td align="right" colspan="7">{$marked} - <select name="action"> - {foreach from=$actions key=value item=option} - <option value="{$value}">{$option}</option> - {/foreach} - </td> - <td colspan="2"><input type="submit" value="Enter"></td> -</tr> - </table> <!-- bug_overview stop --> \ No newline at end of file |