tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
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
(5) |
3
|
4
|
5
|
6
|
7
|
8
|
9
(4) |
10
|
11
|
12
|
13
|
14
|
15
|
16
(4) |
17
|
18
|
19
|
20
|
21
|
22
|
23
|
24
|
25
|
26
|
27
|
28
|
29
|
30
|
31
|
From: <gok...@us...> - 2014-05-16 11:52:08
|
Revision: 1271 http://sourceforge.net/p/tutos/code/1271 Author: gokohnert Date: 2014-05-16 11:52:05 +0000 (Fri, 16 May 2014) Log Message: ----------- massupdate roles Modified Paths: -------------- trunk/php/product_overview.php Modified: trunk/php/product_overview.php =================================================================== --- trunk/php/product_overview.php 2014-05-16 06:43:29 UTC (rev 1270) +++ trunk/php/product_overview.php 2014-05-16 11:52:05 UTC (rev 1271) @@ -304,10 +304,12 @@ $xx .= task::summary($p); } } else if ( $c == 'checkbox' ) { - $xx .= '<div align="center">'; + $xx .= '<div align="center" class="upd_field">'; // Column for checkboxes if ( $p->mod_ok() ) { - $xx .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $p->id ."\" />\n"; + $xx .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $p->id .'"'; + $xx .= (in_array($p->id,$_GET['mark']) ? ' checked="checked"':''); + $xx .= " />\n"; } else { $xx .= "-\n"; } @@ -403,7 +405,7 @@ // Mass Update $r .= $this->UpdateRowStart($this->flds -1); $r .= sprintf($lang['withmarked'],$lang['ProductPs']); - $r .= " <select name=\"action\">\n"; + $r .= " <select id=\"action\" name=\"action\">\n"; $r .= " <option value=\"-1\" selected=\"selected\">". $lang['ActionNil'] ."</option>\n"; $r .= " <option value=\"-2\">". $lang['Delete'] ."</option>\n"; @@ -418,7 +420,32 @@ $r .= watchlist::action_options(); } $r .= " <option value=\"-5\">". $lang['TaskOverview'] ."</option>\n"; + foreach ( $lang['ProdRole'] as $ti => $tx) { + $r .= ' <option value="R'.$ti.'">'. sprintf($lang['SetTo'],'"'.$tx.'"','...') ."</option>\n"; + } $r .= "</select>\n"; + $dx = ''; + foreach ( $lang['ProdRole'] as $ti => $tx) { + $r .= '<span id="R'.$ti.'_sel"><br />'; + if ( $tutos[rolecheck][$ti] == "p") { + $r .= select_from_array_or_input($this,'R'.$ti.'_',null,1,'p'); + } else { + $r .= select_from_array_or_input($this,'R'.$ti.'_',null,1,'atcd'); + } + $r .= '</span>'."\n"; + $tutos['pagescript'] .= "$('#R".$ti."_sel').hide(); +"; + $dx .= "if(this.value == 'R".$ti."') { + $('#R".$ti."_sel').show(); +} else { + $('#R".$ti."_sel').hide(); +} +"; + } + $tutos['pagescript'] .= "$('#action').change(function() { +".$dx." +}); +"; $r .= $this->UpdateRowEnd(1); } @@ -662,7 +689,25 @@ $this->stc->initByArray('ProdStates',$x->c_state); } - if ( $_GET['action'] == -2 ) { + if ( preg_match("#^(R)(.*)#",$_GET['action'],$a) ) { + // Role mass seeting + $role = $a[2]; + $roler = null; + if ( isset($_GET['R'.$role.'_id']) ) { + $roler = getObject($this->user->dbconn,$_GET['R'.$role.'_id']); + } else if ( !isset($_GET['R'.$role.'_fn']) || ($_GET['R'.$role.'_fn'] == '') ) { + } else if ( isset($_GET['R'.$role.'_fn']) ) { + if ( $tutos[rolecheck][$ti] == "p") { + $roler = check_field($_GET['R'.$role.'_fn'],'R'.$role.'_fn','R'.$role.'_l','p'); + } else { + $roler = check_field($_GET['R'.$role.'_fn'],'R'.$role.'_fn','R'.$role.'_l','atcd'); + } + } + if (!is_object($roler)) { + $info = addLine($info,'No Role'); + return; + } + $info = addLine($info,$lang['ProdRole'][$role].':'.$roler); $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $key => $val) { $p = new product($this->dbconn); @@ -671,6 +716,26 @@ continue; } $p->readroles(); + if ( $p->mod_ok() ) { + $p->setRole($roler,$role,'XX'); + $info = addLine($info,$p->getFullName().':'.$lang['ProdRole'][$role]); + $msg = addLine($msg,$p->save()); + } else { + $msg = addLine($msg,$p->getLink() .": ". sprintf($lang['Err0024'],$lang[$p->getType()])); + } + unset($p); + } + $this->dbconn->Commit("WORK"); + return; + } else if ( $_GET['action'] == -2 ) { + $this->dbconn->Begin("WORK"); + foreach ($_GET['mark'] as $key => $val) { + $p = new product($this->dbconn); + $p = $p->read($val,$p); + if ( $p->id != $val ) { + continue; + } + $p->readroles(); if ( $p->del_ok() ) { $info = addLine($info,sprintf($lang['ProdDelInfo'], $p->getFullName())); $msg = addLine($msg,$p->delete()); @@ -682,8 +747,7 @@ } $this->dbconn->Commit("WORK"); return; - } - if ( preg_match("#^(S)(.*)#",$_GET['action'],$a) ) { + } else if ( preg_match("#^(S)(.*)#",$_GET['action'],$a) ) { $this->dropSubSession(); $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $key => $val) { @@ -710,14 +774,11 @@ } $this->dbconn->Commit("WORK"); return; - } - - if ( $_GET['action'] == -4 ) { + } elseif ( $_GET['action'] == -4 ) { $this->redirect = acl_action(); return; - } - // redirect to Task Overview - if ( $_GET['action'] == -5 ) { + } elseif ( $_GET['action'] == -5 ) { + // redirect to Task Overview $url = 'task_overview.php'; foreach ($_GET['mark'] as $key => $val) { $url = addUrlParameter($url,'id[]='.$val,true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-16 06:43:34
|
Revision: 1270 http://sourceforge.net/p/tutos/code/1270 Author: gokohnert Date: 2014-05-16 06:43:29 +0000 (Fri, 16 May 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/database.pinc Modified: trunk/php/database.pinc =================================================================== --- trunk/php/database.pinc 2014-05-16 06:42:44 UTC (rev 1269) +++ trunk/php/database.pinc 2014-05-16 06:43:29 UTC (rev 1270) @@ -192,8 +192,8 @@ if ( is_object($r) && ($r->numrows() > 0) ) { $obj->read_result($r,0); $obj->dbentryexist = true; - $r->free(); } + $r->free(); } // For all DB ids between 0 and 1000 the connection part of the description is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-16 06:42:47
|
Revision: 1269 http://sourceforge.net/p/tutos/code/1269 Author: gokohnert Date: 2014-05-16 06:42:44 +0000 (Fri, 16 May 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/bugtracking/bug.pinc Modified: trunk/php/bugtracking/bug.pinc =================================================================== --- trunk/php/bugtracking/bug.pinc 2014-05-16 06:42:09 UTC (rev 1268) +++ trunk/php/bugtracking/bug.pinc 2014-05-16 06:42:44 UTC (rev 1269) @@ -627,15 +627,8 @@ $r .= ' - '. $i->revision .' -'; $r .= "\r\n"; if ($desc != $olddesc) { - $d = $desc; - $d = preg_replace('#&#im','&',$d); - $d = preg_replace('#"#im','"',$d); - $d = preg_replace('#<[biu]>#im','',$d); - $d = preg_replace('#</[biu]>#im','',$d); - $d = preg_replace('/→/im',' -> ',$d); - $d = preg_replace('#<SPAN\s([a-z,0-9=_"]*)>#im','',$d); - $d = preg_replace('#</SPAN>#im','',$d); - $r .= $d ."\r\n"; + $r .= removehtml($desc); + $r .= "\r\n"; } $sep = "--------------------\r\n"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-16 06:42:14
|
Revision: 1268 http://sourceforge.net/p/tutos/code/1268 Author: gokohnert Date: 2014-05-16 06:42:09 +0000 (Fri, 16 May 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/bugtracking/bug_overview.php Modified: trunk/php/bugtracking/bug_overview.php =================================================================== --- trunk/php/bugtracking/bug_overview.php 2014-05-09 20:02:04 UTC (rev 1267) +++ trunk/php/bugtracking/bug_overview.php 2014-05-16 06:42:09 UTC (rev 1268) @@ -208,8 +208,8 @@ $worksheet1->set_column($c,$c,50); // short $worksheet1->write_string($x,$c++, myiconv($lang['BugShort']),$format1); - $worksheet1->set_column($c,$c,60); // long - $worksheet1->write_string($x,$c++, myiconv($lang['BugLong']),$format1); + // $worksheet1->set_column($c,$c,60); // long + // $worksheet1->write_string($x,$c++, myiconv($lang['BugLong']),$format1); $worksheet1->set_column($c,$c,20,$format2); // Reporter $worksheet1->write_string($x,$c++, myiconv($lang['BugReportedFrom']),$format1); @@ -266,11 +266,13 @@ $worksheet1->write_string($x,$c++,myiconv($lang['HistoryDeleted']),$format2); } $worksheet1->write_string($x,$c++, myiconv($b->short),$format2); - if (count($b->bughist) > 0) { - $worksheet1->write_string($x,$c++,myiconv($b->getBugHistory(false,false)),$format2); - } else { - $c++; - } + // long does not work with current excel engine + // if (count($b->bughist) > 0) { + // $worksheet1->write_string($x,$c++,myiconv($b->getBugHistory(false,false)),$format2); + // } else { + // $c++; + // } + if (is_object($b->reporter) && $b->reporter->id > 0) { $worksheet1->write_string($x,$c++,myiconv($b->reporter->getFullName()),$format2); } else { @@ -530,16 +532,16 @@ $r .= watchlist::action_options(); } $r .= "</select>\n"; - $r .= select_from_array_or_input($this,"V",null,1,'atT'); + $r .= '<span id="Vsel"><br />'.select_from_array_or_input($this,"V",null,1,'atT').'</span>'; $r .= $this->UpdateRowEnd(2); $tutos['pagescript'] .= " -$('#V').hide(); +$('#Vsel').hide(); $('#action').change(function() { if(this.value == 'V') { - $('#V').show(); + $('#Vsel').show(); } else { - $('#V').hide(); + $('#Vsel').hide(); } }); "; @@ -925,8 +927,9 @@ if ( isset($_GET['Vid']) ) { $vid = ltrim($_GET['Vid'],'T'); if ($vid > 0) { - $solver = getObject($dbconn,$vid); + $solver = getObject($this->user->dbconn,$vid); } else { + // Team $solver = $vid; } } else if ( !isset($_GET['Vfn']) || ($_GET['Vfn'] == '') ) { @@ -935,7 +938,7 @@ } else if ( isset($_GET['Vfn']) ) { $solver = check_field($_GET['Vfn'],"Vfn","Vl",'atT'); } - if ($solver == 0) { + if (is_numeric($solver) && ($solver == 0)) { return; } $this->dbconn->Begin("WORK"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-09 20:02:07
|
Revision: 1267 http://sourceforge.net/p/tutos/code/1267 Author: gokohnert Date: 2014-05-09 20:02:04 +0000 (Fri, 09 May 2014) Log Message: ----------- fixing Modified Paths: -------------- trunk/php/admin_show.php trunk/php/scrum/sprint_show.php trunk/php/stc/stc_show.php Modified: trunk/php/admin_show.php =================================================================== --- trunk/php/admin_show.php 2014-05-09 20:01:17 UTC (rev 1266) +++ trunk/php/admin_show.php 2014-05-09 20:02:04 UTC (rev 1267) @@ -465,8 +465,15 @@ return $r; } $fd = fopen($tutos[errlog], 'rb'); - if ($fd === false) return $r; - $r .= '<pre>'; + if ($fd === false) { + $r .= $this->error('could not open '.$tutos[errlog]); + return $r; + } + if (0 == filesize ($tutos[errlog])) { + fclose($fd); + return 'empty '.$r; + } + $r .= '<pre>'."\n"; if (isset($_GET['filter'])) { $f = $_GET['filter']; while (!feof($fd)) { @@ -477,10 +484,10 @@ } } } else if (filesize ($tutos[errlog])) { - $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog]))); + $r .= fread ($fd, filesize ($tutos[errlog])); } fclose($fd); - $r .= '</pre>'; + $r .= '</pre>'."\n"; return $r; } else if ( ($tutos[debug] == 1) && ($this->mode == 'sqlfile') ) { if ( ! $this->user->isAdmin() ) { @@ -492,7 +499,10 @@ return $r; } $fd = fopen($tutos[errlog].'.sql', 'rb'); - if ($fd === false) return $r; + if ($fd === false) { + $r .= $this->error('could not open '.$tutos[errlog].'.sql'); + return $r; + } $r .= '<pre>'; if (filesize ($tutos[errlog].'.sql')) { $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.sql'))); @@ -510,7 +520,10 @@ return $r; } $fd = fopen($tutos[errlog].'.mail', 'rb'); - if ($fd === false) return $r; + if ($fd === false) { + $r .= $this->error('could not open '.$tutos[errlog].'.mail'); + return $r; + } $r .= '<pre>'; if (filesize ($tutos[errlog].'.mail')) { $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail'))); @@ -528,7 +541,10 @@ return $r; } $fd = fopen($tutos[errlog].'.log', 'rb'); - if ($fd === false) return $r; + if ($fd === false) { + $r .= $this->error('could not open '.$tutos[errlog].'.log'); + return $r; + } if (0 == filesize ($tutos[errlog].'.log')) { fclose($fd); return $r; Modified: trunk/php/scrum/sprint_show.php =================================================================== --- trunk/php/scrum/sprint_show.php 2014-05-09 20:01:17 UTC (rev 1266) +++ trunk/php/scrum/sprint_show.php 2014-05-09 20:02:04 UTC (rev 1267) @@ -359,11 +359,11 @@ $graph = new Graph(GB_WIDTH,GB_HEIGHT*2,'auto'); + $font = jpgraph_init($graph); $graph->SetScale("datlin"); $graph->SetYScale(0,'lin'); # $graph->SetYScale(1,'lin'); $graph->img->SetMargin(50,110,20,120); - $font = jpgraph_init($graph); $graph->title->Set($lang['SprintBurndown'].': '.$this->obj->getFullName()); // ideal @@ -826,4 +826,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/stc/stc_show.php =================================================================== --- trunk/php/stc/stc_show.php 2014-05-09 20:01:17 UTC (rev 1266) +++ trunk/php/stc/stc_show.php 2014-05-09 20:02:04 UTC (rev 1267) @@ -110,9 +110,9 @@ $radius = (count($this->obj->states)>10 ? 70:88); $g = new CanvasGraph(400,480); + $font = jpgraph_init($g); $g->SetMargin(0,0,0,0); $g->title->SetColor('black@0.5'); - $font = jpgraph_init($g); $g->img->setFont($font,FS_NORMAL,8); $g->title->Set($lang['STC'].' '. $this->obj->getFullName()); $g->InitFrame(); @@ -325,4 +325,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-09 20:01:19
|
Revision: 1266 http://sourceforge.net/p/tutos/code/1266 Author: gokohnert Date: 2014-05-09 20:01:17 +0000 (Fri, 09 May 2014) Log Message: ----------- fake missinig function Modified Paths: -------------- trunk/php/webelements.p3 Modified: trunk/php/webelements.p3 =================================================================== --- trunk/php/webelements.p3 2014-05-09 20:00:36 UTC (rev 1265) +++ trunk/php/webelements.p3 2014-05-09 20:01:17 UTC (rev 1266) @@ -877,7 +877,7 @@ $r = 'https://'.$r; } elseif(isset($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] == 80) ) { $r = 'http://'.$r; - } elseif(isset($tutos[baseurl][$_SESSION['dbnr']])) { + } elseif(isset($_SESSION['dbnr']) && isset($tutos[baseurl][$_SESSION['dbnr']])) { if (preg_match('#^https:#',$tutos[baseurl][$_SESSION['dbnr']])) { $r = 'https://'.$r; } else { @@ -2461,9 +2461,13 @@ $graph->title->SetFont($font,FS_BOLD,12); $graph->legend->SetFont($font,FS_NORMAL,9); - if( function_exists('imageantialias') ) { $graph->img->SetAntiAliasing(); + } else { + // fake it + function imageantialias($a,$b) { + return false; + } } return $font; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-09 20:00:40
|
Revision: 1265 http://sourceforge.net/p/tutos/code/1265 Author: gokohnert Date: 2014-05-09 20:00:36 +0000 (Fri, 09 May 2014) Log Message: ----------- keep seleted rows in massupdate Modified Paths: -------------- trunk/html/js/tutos.js trunk/php/layout/layout_base.pinc Modified: trunk/html/js/tutos.js =================================================================== --- trunk/html/js/tutos.js 2014-05-09 20:00:08 UTC (rev 1264) +++ trunk/html/js/tutos.js 2014-05-09 20:00:36 UTC (rev 1265) @@ -1,5 +1,5 @@ /** - * Copyright 2005 - 2011 by Gero Kohnert + * Copyright 2005 - 2014 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -25,6 +25,7 @@ * code will add form elements when click into an area */ $(document).ready(function(){ +$('.m_field:checked').closest('tr').toggleClass("line_selected"); $('.editable').click(function(event) { var t = $(this).html(); var id = this.id; Modified: trunk/php/layout/layout_base.pinc =================================================================== --- trunk/php/layout/layout_base.pinc 2014-05-09 20:00:08 UTC (rev 1264) +++ trunk/php/layout/layout_base.pinc 2014-05-09 20:00:36 UTC (rev 1265) @@ -649,11 +649,15 @@ if ( $tutos[massupdate] == 1 ) { $r .= ' <td class="upd_field" align="center"'.($rs > 1 ? ' rowspan="'.$rs.'"':'') .">\n"; if ( method_exists($obj,"mod_ok") && $obj->mod_ok() ) { + $r .= '<input class="m_field" name="mark[]" type="checkbox"'; if ( $obj->getType() == "user" ) { - $r .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $obj->uid ."\" />\n"; + $r .= (in_array($obj->uid,$_GET['mark']) ? ' checked="checked"':''); + $r .= ' value="'.$obj->uid.'"'; } else { - $r .= '<input class="m_field" name="mark[]" type="checkbox" value="'. $obj->id ."\" />\n"; + $r .= (in_array($obj->id,$_GET['mark']) ? ' checked="checked"':''); + $r .= ' value="'.$obj->id.'"'; } + $r .= " />\n"; } else { $r .= "-\n"; //$r .= makelink('acl_show.php?id='. $obj->id ,'-',$lang['ACLsee'],acl_popup($obj)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-09 20:00:11
|
Revision: 1264 http://sourceforge.net/p/tutos/code/1264 Author: gokohnert Date: 2014-05-09 20:00:08 +0000 (Fri, 09 May 2014) Log Message: ----------- massupdate of bug assignee Modified Paths: -------------- trunk/php/bugtracking/bug_new.php trunk/php/bugtracking/bug_overview.php Modified: trunk/php/bugtracking/bug_new.php =================================================================== --- trunk/php/bugtracking/bug_new.php 2014-05-02 11:12:01 UTC (rev 1263) +++ trunk/php/bugtracking/bug_new.php 2014-05-09 20:00:08 UTC (rev 1264) @@ -113,7 +113,11 @@ if (is_object($this->obj->solver)) $d .= select_from_array_or_input($this->obj,"s",$this->obj->solver,1,'atT'); else { - $x = array($this->obj->solver,$lang['ProdRole'][-($this->obj->solver+10)]); + if (isset($lang['ProdRole'][-($this->obj->solver+10)])) { + $x = array($this->obj->solver,$lang['ProdRole'][-($this->obj->solver+10)]); + } else { + $x = $this->obj->solver; + } $d .= select_from_array_or_input($this->obj,"s",$x,1,'atT'); } } else { @@ -401,4 +405,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/bugtracking/bug_overview.php =================================================================== --- trunk/php/bugtracking/bug_overview.php 2014-05-02 11:12:01 UTC (rev 1263) +++ trunk/php/bugtracking/bug_overview.php 2014-05-09 20:00:08 UTC (rev 1264) @@ -507,7 +507,7 @@ if ( $tutos[massupdate] == 1 ) { $r .= $this->UpdateRowStart($this->flds-2); $r .= sprintf($lang['withmarked'],$lang['Bugs']); - $r .= " <select name=\"action\">\n"; + $r .= " <select id=\"action\" name=\"action\">\n"; $r .= " <option value=\"-1\" selected=\"selected\">". $lang['ActionNil'] ."</option>\n"; if ( $tutos['bug_delete'] == 1 ) { $r .= " <option value=\"-2\">". $lang['Delete'] ."</option>\n"; @@ -523,13 +523,26 @@ if ($f->stc_state == STC_NOT_EXISTANT) continue; $r .= " <option value=\"S". $f->stc_state .'" style="background:'.$f->color.';">'. sprintf($lang['SetTo'],$lang['BugState'],$f->getFullName()) ."</option>\n"; } + $r .= ' <option value="V">'. sprintf($lang['SetTo'],'"'.$lang['BugAssignedTo'].'"','...') ."</option>\n"; $r .= get_custom_massupdate_options($this,'bugtracking'); $r .= " <option value=\"-4\">". $lang['AclModify'] ."</option>\n"; if (class_exists('watchlist')) { $r .= watchlist::action_options(); } $r .= "</select>\n"; + $r .= select_from_array_or_input($this,"V",null,1,'atT'); $r .= $this->UpdateRowEnd(2); + + $tutos['pagescript'] .= " +$('#V').hide(); +$('#action').change(function() { + if(this.value == 'V') { + $('#V').show(); + } else { + $('#V').hide(); + } +}); +"; } $r .= $this->OverviewFootEnd(); $r .= $this->OverviewTableEnd(); @@ -908,7 +921,46 @@ $this->stc = new stc(null); $this->stc->initByArray('BugStates',Bug::$c_state); } - + if ($_GET['action'] == "V") { + if ( isset($_GET['Vid']) ) { + $vid = ltrim($_GET['Vid'],'T'); + if ($vid > 0) { + $solver = getObject($dbconn,$vid); + } else { + $solver = $vid; + } + } else if ( !isset($_GET['Vfn']) || ($_GET['Vfn'] == '') ) { + $info = addLine($info,'No Solver'); + return; + } else if ( isset($_GET['Vfn']) ) { + $solver = check_field($_GET['Vfn'],"Vfn","Vl",'atT'); + } + if ($solver == 0) { + return; + } + $this->dbconn->Begin("WORK"); + foreach ($_GET['mark'] as $val) { + $b = new bug($this->dbconn); + $b = $b->read($val,$b); + if (!is_object($b) || ($b->id != $val) ) { + continue; + } + if ($b->mod_ok()) { + $old = $b->getSolver(); + $b->setSolver($solver); + if ($b->getSolver() != $old) { + $info = addLine($info,$b->getFullName().': '.$lang['BugAssignedTo'].' -> '.$b->getSolver()); + $b->newdesc = $lang['BugAssignedTo'].' '.$old .' -> '.$b->getSolver(); + $b->save(); + } + } else { + $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0024'],$lang[$b->getType()])); + } + unset($b); + } + $this->dbconn->Commit("WORK"); + return; + } if ( $_GET['action'] == -2 ) { $this->dbconn->Begin("WORK"); foreach ($_GET['mark'] as $val) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-02 11:12:04
|
Revision: 1263 http://sourceforge.net/p/tutos/code/1263 Author: gokohnert Date: 2014-05-02 11:12:01 +0000 (Fri, 02 May 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/bugtracking/mconfig.pinc trunk/php/mail.pinc trunk/php/product.pinc Modified: trunk/php/bugtracking/mconfig.pinc =================================================================== --- trunk/php/bugtracking/mconfig.pinc 2014-05-02 11:11:06 UTC (rev 1262) +++ trunk/php/bugtracking/mconfig.pinc 2014-05-02 11:12:01 UTC (rev 1263) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2003 - 2013 by Gero Kohnert + * Copyright 2003 - 2014 by Gero Kohnert * * Module specific configuration * @@ -8,10 +8,10 @@ * $Author$ */ $tutos['files'][__FILE__] = '$Rev$'; -# -# Every module must have an individual ID ( < 0 > -100 ). -# this is module 3 -# +// +// Every module must have an individual ID ( < 0 > -100 ). +// this is module 3 +// define('usebugtracking',-3); $tutos[modules]['bugtracking'] = array( name => "Bug", @@ -21,7 +21,7 @@ 'configurl' => "bugtracking/bug_config.php", 'perm' => usebugtracking ); -# internal +// internal define('usebughist',-3001); $tutos[modules]['bughist'] = array( name => "bugdata", @@ -31,15 +31,15 @@ 'perm' => usebughist ); $tutos[usebughist] = 1; -# -# globally enable this module -# +// +// globally enable this module +// if (!isset($tutos[usebugtracking])) $tutos[usebugtracking] = 1; -# -# List of objects/modules where we do something with this module -# and need to include this module -# +// +// List of objects/modules where we do something with this module +// and need to include this module +// $tutos[modulesinc]['bugtracking'][] = 'mytutos'; $tutos[modulesinc]['bugtracking'][] = 'product'; $tutos[modulesinc]['bugtracking'][] = 'installation'; @@ -50,7 +50,7 @@ $tutos[modulesinc]['bugtracking'][] = 'stuff'; -# and those modules we want to use +// and those modules we want to use $tutos[modulesinc]['timetrack'][] = 'bugtracking'; $tutos[modulesinc]['note'][] = 'bugtracking'; $tutos[modulesinc]['file'][] = 'bugtracking'; @@ -62,10 +62,10 @@ $tutos['docowners'][] = 'Bug'; // classname -# -# modify those values using bug_config -# here are only defaults -# +// +// modify those values using bug_config +// here are only defaults +// $tutos['bug_long_pop'] = 0; $tutos['bug_remember'] = 0; $tutos['bug_delete'] = 1; @@ -78,9 +78,9 @@ $tutos['bug_closed_states'] = '3,4'; $tutos['bug_finish_state'] = 4; $tutos['bug_warn_states'] = '1'; -# Mailling list for "new" bugs +// Mailling list for "new" bugs $tutos['bugnew_prod_mail'] = '1,3'; $tutos['bugmod_prod_mail'] = ''; $tutos['bug_no_mail'] = 0; $tutos['bug_state_age'] = 0; -?> +?> \ No newline at end of file Modified: trunk/php/mail.pinc =================================================================== --- trunk/php/mail.pinc 2014-05-02 11:11:06 UTC (rev 1262) +++ trunk/php/mail.pinc 2014-05-02 11:12:01 UTC (rev 1263) @@ -1546,7 +1546,7 @@ return $msg . $errno ." ". $errstr; } - stream_set_timeout($this->fd, 0,250000); + stream_set_timeout($this->fd, 0,500000); $this->readsmtp($msg,220); // Read the Greetings $this->error_log('smtp mode: '.$tutos['mailmode']); @@ -1617,7 +1617,7 @@ usleep(1000); // helps in some cases see bug 2709852 $this->writechannel($this->eoln."."); $this->readsmtp($msg,250); - usleep(1000); // helps in some cases see bug 2709852 + usleep(1500); // helps in some cases see bug 2709852 $this->writechannel("quit"); $this->readsmtp($msg,221); fclose ($this->fd); @@ -1671,7 +1671,7 @@ } else if ( preg_match("#^250 #",$line ) ) { if ($key == 250) return true; continue; - } else if ( preg_match("#^250#",$line ) ) { + } else if ( preg_match("#^25#",$line ) ) { // other 250 line continue; } else if ( preg_match("#^354 #",$line ) ) { Modified: trunk/php/product.pinc =================================================================== --- trunk/php/product.pinc 2014-05-02 11:11:06 UTC (rev 1262) +++ trunk/php/product.pinc 2014-05-02 11:12:01 UTC (rev 1263) @@ -1110,8 +1110,9 @@ loadmodules($this->getType(),'show'); // error_log('product->getTreeStructure:'.$key.' '.$this.print_r($tutos[activemodules],true)."\n",3,$tutos[errlog]); + $this->readroles(); - $r = '<li data-jstree=\'{"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'">'.$this->getFullName(); + $r = '<li data-jstree=\'{"selected":true,"opened":true,"icon":"'.$ly->theme->getImage($this->getHtmlIcon(),'link').'"}\' id="'.$this->id.'Ä'.$key.'Ä'.$this->gettype().'">'.$this->getFullName(); $rr = ''; foreach (array(10,11,12,13) as $x) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-02 11:11:08
|
Revision: 1262 http://sourceforge.net/p/tutos/code/1262 Author: gokohnert Date: 2014-05-02 11:11:06 +0000 (Fri, 02 May 2014) Log Message: ----------- allow syslog logging Modified Paths: -------------- trunk/php/config_default.pinc trunk/php/permission.p3 Modified: trunk/php/config_default.pinc =================================================================== --- trunk/php/config_default.pinc 2014-05-02 11:09:40 UTC (rev 1261) +++ trunk/php/config_default.pinc 2014-05-02 11:11:06 UTC (rev 1262) @@ -139,8 +139,11 @@ // TUTOS will create some files that are named like /tmp/debug.out and /tmp/debug.out.log // You have to remove old versions of these files by your own ! // -$tutos[errlog] = 'tutos_private/log/debug.out'; +$tutos[errlog] = 'tutos_private/log/debug.out'; // +// use syslog (true) or not (false) +$tutos['syslog'] = false; +// // Logo for the headline // (Change this to your company logo or whatever you like) // Height will be resized to 40 pixels ! @@ -738,4 +741,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Modified: trunk/php/permission.p3 =================================================================== --- trunk/php/permission.p3 2014-05-02 11:09:40 UTC (rev 1261) +++ trunk/php/permission.p3 2014-05-02 11:11:06 UTC (rev 1262) @@ -561,6 +561,9 @@ if ($r[1] != '') { dterror_log($r[1]."\n", 3, $tutos[errlog]); } + if ($tutos['syslog']) { + syslog(LOG_WARNING, "TUTOS ".$r[0]." ".$r[1]." ".$_SERVER['REMOTE_ADDR']." (".$_SERVER['HTTP_USER_AGENT'].")"); + } $auth[0]->login_form($_SERVER['SCRIPT_NAME'],$auth,$r[1]); } @@ -571,6 +574,9 @@ $info = addline($info,sprintf($lang['Welcome_2'],$current_user->last_seen->getDateTime(),$current_user->last_host)); logmessage("check_user: Logged in ". $current_user->id .":". $current_user->login .":". $current_user->getFullname().' ('.$a->loginMethod().')'); + if ($tutos['syslog']) { + syslog(LOG_WARNING, "TUTOS login ".$current_user->login." ".$_SERVER['REMOTE_ADDR']." (".$_SERVER['HTTP_USER_AGENT'].")"); + } $initial_auth = true; // store session id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-02 11:09:43
|
Revision: 1261 http://sourceforge.net/p/tutos/code/1261 Author: gokohnert Date: 2014-05-02 11:09:40 +0000 (Fri, 02 May 2014) Log Message: ----------- lowercase method type Modified Paths: -------------- trunk/php/acl_new.php trunk/php/address_select.php trunk/php/admin/crontab_maker.php Modified: trunk/php/acl_new.php =================================================================== --- trunk/php/acl_new.php 2014-05-02 11:07:57 UTC (rev 1260) +++ trunk/php/acl_new.php 2014-05-02 11:09:40 UTC (rev 1261) @@ -332,7 +332,7 @@ // sort the stuff uksort ($this->user->parties,array('acl_new','acl_sort')); - $r .= '<form action="'.$l.'" method="GET">'; + $r .= '<form action="'.$l.'" method="get">'; $r .= $lang['Feature'].':<select name="feature">'; uasort($tutos[activemodules],array('Acl_new','menusort')); $r .= '<option value="0"'.(0 == $this->feature ? ' selected="selected"':'').'>---</option>'; Modified: trunk/php/address_select.php =================================================================== --- trunk/php/address_select.php 2014-05-02 11:07:57 UTC (rev 1260) +++ trunk/php/address_select.php 2014-05-02 11:09:40 UTC (rev 1261) @@ -32,7 +32,7 @@ $this->width = 3; $r = ''; - $r .= "<form id=\"adrsearch1\" name=\"adrsearch1\" method=\"GET\" action=\"address_overview.php\">\n"; + $r .= '<form id="adrsearch1" name="adrsearch1" method="get" action="address_overview.php">'."\n"; $r .= $this->SelectTableStart(); $this->addHidden('ext',$this->ext); $r .= $this->headline($lang['SearchForAdr']); Modified: trunk/php/admin/crontab_maker.php =================================================================== --- trunk/php/admin/crontab_maker.php 2014-05-02 11:07:57 UTC (rev 1260) +++ trunk/php/admin/crontab_maker.php 2014-05-02 11:09:40 UTC (rev 1261) @@ -71,7 +71,7 @@ } $cmd .= ' 2>&1'; - $r .= '<form method="POST">'; + $r .= '<form method="post">'; $r .= $this->DataTableStart(); $r .= "<tr>\n"; $r .= " <th colspan=\"4\">Crontab</th>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-02 11:08:00
|
Revision: 1260 http://sourceforge.net/p/tutos/code/1260 Author: gokohnert Date: 2014-05-02 11:07:57 +0000 (Fri, 02 May 2014) Log Message: ----------- keep original args Modified Paths: -------------- trunk/php/file/file_ins.php trunk/php/file/file_new.php trunk/php/webelements.p3 Modified: trunk/php/file/file_ins.php =================================================================== --- trunk/php/file/file_ins.php 2014-05-02 11:07:08 UTC (rev 1259) +++ trunk/php/file/file_ins.php 2014-05-02 11:07:57 UTC (rev 1260) @@ -101,6 +101,7 @@ // Versioning System could only be set at first save if ( isset($_REQUEST['vsys']) ) { $f->vsys = $_REQUEST['vsys']; + $gotourl = addUrlParameter($gotourl,"vsys=". UrlEncode($_REQUEST['vsys']),true); } } Modified: trunk/php/file/file_new.php =================================================================== --- trunk/php/file/file_new.php 2014-05-02 11:07:08 UTC (rev 1259) +++ trunk/php/file/file_new.php 2014-05-02 11:07:57 UTC (rev 1260) @@ -269,6 +269,9 @@ $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()])); $this->stop = true; } + if (isset($_GET['vsys']) && is_numeric($_GET['vsys']) ) { + $this->obj->vsys = $_GET['vsys']; + } } preset_from_array_or_input($this->obj,'file3','file3'); @@ -340,4 +343,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/webelements.p3 =================================================================== --- trunk/php/webelements.p3 2014-05-02 11:07:08 UTC (rev 1259) +++ trunk/php/webelements.p3 2014-05-02 11:07:57 UTC (rev 1260) @@ -3204,7 +3204,7 @@ $x = $_REQUEST[$arg]; $q = ''; // the search part of the query $expanded = array(); - $header = ' = '; + $header = ''; // some modes require expand of args if (is_numeric($x) && ($mode != null) && is_array($mode) && in_array(usedepartment,$mode)) { @@ -3226,14 +3226,14 @@ } } - if (substr($x,0,1) == "T") { + if (is_string($x) && substr($x,0,1) == "T") { // subteam selection happend $q = ' = '; $header = ' = '; $q .= substr($x,1); $header .= $lang['ProdRole'][(-1* (substr($x,1)))-10]; $show = false; - } elseif (substr($x,0,2) == "-T") { + } elseif (is_string($x) && substr($x,0,2) == "-T") { // negated subteam selection happend $q = ' != '; $header = ' ≠ '; @@ -3272,9 +3272,10 @@ } if ($not) $header .= '</span>'; $hcnt++; + $hpre = ' , '; + $obj->link1 = addUrlParameter($obj->link1,$arg.'='.$i); + $obj->addHidden($arg.'',$i); } - $obj->link1 = addUrlParameter($obj->link1,$arg.'[]='.$i); - $obj->addHidden($arg.'[]',$i); } if ($q1 != '') { $q = $q1.')'; @@ -3284,6 +3285,7 @@ } if ($hcnt > 1) $header = '('.$header.')'; + $header = ' = '.$header; $show = true; } else { $show = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-05-02 11:07:10
|
Revision: 1259 http://sourceforge.net/p/tutos/code/1259 Author: gokohnert Date: 2014-05-02 11:07:08 +0000 (Fri, 02 May 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/index.htm trunk/index.html Modified: trunk/index.htm =================================================================== --- trunk/index.htm 2014-04-04 18:41:42 UTC (rev 1258) +++ trunk/index.htm 2014-05-02 11:07:08 UTC (rev 1259) @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> -<!-- Copyright 1999 - 2011 by Gero Kohnert gok...@us... et al --> +<!-- Copyright 1999 - 2014 by Gero Kohnert gok...@us... et al --> <!-- all rights reserved --> <!--$Id$ --> <!-- Redirect to the tutos page --> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>TUTOS -- Redirect</title> - <meta http-equiv="refresh" content="0;URL=php/mytutos.php"> + <meta http-equiv="refresh" content="0;URL=php/mytutos.php" /> </head> </html> Modified: trunk/index.html =================================================================== --- trunk/index.html 2014-04-04 18:41:42 UTC (rev 1258) +++ trunk/index.html 2014-05-02 11:07:08 UTC (rev 1259) @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> -<!-- Copyright 1999 - 2013 by Gero Kohnert gok...@us... et al --> +<!-- Copyright 1999 - 2014 by Gero Kohnert gok...@us... et al --> <!-- all rights reserved --> <!--$Id: index.htm 6 2011-02-12 22:10:44Z gokohnert $ --> <!-- Redirect to the tutos page --> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>TUTOS -- Redirect</title> - <meta http-equiv="refresh" content="0;URL=php/mytutos.php"> + <meta http-equiv="refresh" content="0;URL=php/mytutos.php" /> </head> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |