tutos-commits Mailing List for TUTOS (Page 6)
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
|
From: <gok...@us...> - 2014-01-16 08:27:34
|
Revision: 1217 http://sourceforge.net/p/tutos/code/1217 Author: gokohnert Date: 2014-01-16 08:27:31 +0000 (Thu, 16 Jan 2014) Log Message: ----------- bug export CSV/EXCEL fixing long text Modified Paths: -------------- trunk/php/bugtracking/bug.pinc trunk/php/bugtracking/bug_overview.php Modified: trunk/php/bugtracking/bug.pinc =================================================================== --- trunk/php/bugtracking/bug.pinc 2014-01-15 12:00:17 UTC (rev 1216) +++ trunk/php/bugtracking/bug.pinc 2014-01-16 08:27:31 UTC (rev 1217) @@ -624,12 +624,20 @@ $r .= $i->creation->getDateTime(); $r .= ' '. (is_object($i->creator) ? $i->creator->getFullName():''); if ($this->parent->tutos['bug_use_revision'] == 1) - $r .= '  - '. $i->revision .' -'; - $r .= "\n"; + $r .= ' - '. $i->revision .' -'; + $r .= "\r\n"; if ($desc != $olddesc) { - $r .= $desc ."\n"; + $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"; } - $sep = "--------------------\n"; + $sep = "--------------------\r\n"; } $olddesc = $desc; } Modified: trunk/php/bugtracking/bug_overview.php =================================================================== --- trunk/php/bugtracking/bug_overview.php 2014-01-15 12:00:17 UTC (rev 1216) +++ trunk/php/bugtracking/bug_overview.php 2014-01-16 08:27:31 UTC (rev 1217) @@ -55,6 +55,100 @@ } /** + * display the info as csv output + */ + Function info_csv() { + global $lang; + + Header("Content-Type: text/plain"); + $r = ''; + $r .= txt2csv('ID'); + $r .= txt2csv($lang['BugID']); + $r .= txt2csv($lang['BugState']); + $r .= txt2csv($lang['BugTarget']); + $r .= txt2csv($lang['BugClass']); + $r .= txt2csv($lang['Date']); + $r .= txt2csv($lang['BugReference']); + $r .= txt2csv($lang['BugShort']); + $r .= txt2csv($lang['BugLong']); + $r .= txt2csv($lang['BugReportedFrom']); + $r .= txt2csv($lang['BugAssignedTo']); + $r .= txt2csv($lang['BugCreator']); + $r .= txt2csv('closed at'); + // custom fields + foreach(get_custom_export_fields('bugtracking') as $ti => $tx) { + $r .= txt2csv($tx['lang']); + } + $r .= "\r\n"; + foreach ($this->blist as $b) { + if (!is_object($b)) { + $id = $b; + $b = new bug($this->dbconn); + $b = $b->read($id,$b); + } + $b->read_bugHistory(); + $r .= txt2csv($b->id); + $r .= txt2csv($b->name); + // State + $r .= txt2csv($b->getState()); + // Target + if ( is_object($b->target) && $b->target->id > 0 ) { + $r .= txt2csv($b->target->getFullName()); + } else { + $r.= txt2csv(''); + } + // Class + $r .= txt2csv($lang['BugClasses'][$b->class]); + // Date + $r .= txt2csv($b->creation->getDateTime()); + // Reference + if ( is_object($b->parent) && $b->parent->id > 0 ) { + $r .= txt2csv($b->parent->getFullName()); + } else { + $r .= txt2csv($lang['HistoryDeleted']); + } + // Short + $r .= txt2csv($b->short); + // Long + if (count($b->bughist) > 0) { + $r.= txt2csv($b->getBugHistory(false,false)); + } else { + $r.= txt2csv(''); + } + // reporter + if ( is_object($b->reporter) && $b->reporter->id > 0 ) { + $r .= txt2csv($b->reporter->getFullName()); + } else { + $r .= txt2csv($lang['HistoryDeleted']); + } + // solver + if ( is_object($b->solver) && $b->solver->id > 0 ) { + $r .= txt2csv($b->solver->getFullName()); + } else { + $r .= txt2csv($lang['HistoryDeleted']); + } + // creator + if ( is_object($b->creator) && $b->creator->id > 0 ) { + $r .= txt2csv($b->creator->getFullName()); + } else { + $r .= txt2csv($lang['HistoryDeleted']); + } + // SolveDate + $r .= txt2csv($b->solvedate->getDateTime()); + + // custom fields + foreach(get_custom_export_fields('bugtracking') as $ti => $tx) { + $f = '_fld_'.$ti; + $d = get_custom_field($tx,$b->$f,$b); + $r .= txt2csv($d); + } + + $r .= "\r\n"; + } + return $r; + } + + /** * display the info as excel output */ Function info_excel() { @@ -142,6 +236,7 @@ $b = new bug($this->dbconn); $b = $b->read($id,$b); } + $b->read_bugHistory(); $c = 0; if (strpos($baseUrl, "bugtracking") === false) { @@ -171,7 +266,7 @@ } $worksheet1->write_string($x,$c++, myiconv($b->short),$format2); if (count($b->bughist) > 0) { - $worksheet1->write_string($x,$c++,myiconv($b->bughist[0]->description),$format2); + $worksheet1->write_string($x,$c++,myiconv($b->getBugHistory(false,false)),$format2); } else { $c++; } @@ -239,6 +334,8 @@ return $r; } else if ($this->format == "excel") { return $this->info_excel(); + } else if ($this->format == "csv") { + return $this->info_csv(); } else if ( $this->format == "stat") { return $this->statinfo(); } @@ -1292,6 +1389,15 @@ ); $this->addMenu($x); } + $ll = addUrlParameter($this->link1,'format=csv'); + $ll = addUrlParameter($ll,'ss='.$this->ss); + $x = array( url => $ll, + text => $lang['Export'] ."(CSV)", + info => $lang['ExportInfo'], + category => array('excel',bug::getType(),'view',usebugtracking) + ); + $this->addMenu($x); + $ll = addUrlParameter($this->link1,'format=excel'); $ll = addUrlParameter($ll,'ss='.$this->ss); $x = array( url => $ll, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-01-15 12:00:22
|
Revision: 1216 http://sourceforge.net/p/tutos/code/1216 Author: gokohnert Date: 2014-01-15 12:00:17 +0000 (Wed, 15 Jan 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/custom.pinc Modified: trunk/php/custom.pinc =================================================================== --- trunk/php/custom.pinc 2014-01-13 10:05:27 UTC (rev 1215) +++ trunk/php/custom.pinc 2014-01-15 12:00:17 UTC (rev 1216) @@ -1261,7 +1261,7 @@ $q .= ' '.$pre.' '. $ti .' in '.$l; $pre = $pre2sql; $layout->filter['_fld_'.$ti] = $name; - } else if ($tx[type] == 'VARCHAR') { + } else if (isset($tx[type]) && ($tx[type] == 'VARCHAR')) { foreach ($s as $sn) { if (substr($sn,0,1) == "!") { $q .= ' '.$pre.' '. $layout->dbconn->unLike($ti,substr($sn,1)); @@ -1969,4 +1969,4 @@ return $r; } -?> \ 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-01-13 10:05:30
|
Revision: 1215 http://sourceforge.net/p/tutos/code/1215 Author: gokohnert Date: 2014-01-13 10:05:27 +0000 (Mon, 13 Jan 2014) Log Message: ----------- fixed sorting Modified Paths: -------------- trunk/php/bugtracking/bug_overview.php Modified: trunk/php/bugtracking/bug_overview.php =================================================================== --- trunk/php/bugtracking/bug_overview.php 2014-01-06 20:59:19 UTC (rev 1214) +++ trunk/php/bugtracking/bug_overview.php 2014-01-13 10:05:27 UTC (rev 1215) @@ -946,8 +946,6 @@ } $this->link1 = 'bugtracking/bug_overview.php'; - $this->link2 = $this->link1; - $this->link2 = addUrlParameter($this->link1,"format=".UrlEncode($this->format)); if (isset($_GET['ext'])) { $this->ext = $_GET['ext']; @@ -1175,6 +1173,9 @@ return; } + $this->link2 = $this->link1; + $this->link2 = addUrlParameter($this->link2,"format=".UrlEncode($this->format)); + $this->nav = $this->getSubSession(); $this->nav['link'] = $this->link1; if ( !isset($this->nav['list']) ) { @@ -1309,4 +1310,4 @@ $l = new Bug_overview($current_user); $l->display(); $dbconn->Close(); -?> +?> \ 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-01-06 20:59:22
|
Revision: 1214 http://sourceforge.net/p/tutos/code/1214 Author: gokohnert Date: 2014-01-06 20:59:19 +0000 (Mon, 06 Jan 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/admin_show.php trunk/php/checklist/checkfield_overview.php trunk/php/checklist/checklist.pinc Modified: trunk/php/admin_show.php =================================================================== --- trunk/php/admin_show.php 2014-01-06 18:32:01 UTC (rev 1213) +++ trunk/php/admin_show.php 2014-01-06 20:59:19 UTC (rev 1214) @@ -476,7 +476,7 @@ $r .= $x; } } - } else { + } else if (filesize ($tutos[errlog])) { $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog]))); } fclose($fd); @@ -494,7 +494,9 @@ $fd = fopen($tutos[errlog].'.sql', 'rb'); if ($fd === false) return $r; $r .= '<pre>'; - $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.sql'))); + if (filesize ($tutos[errlog].'.sql')) { + $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.sql'))); + } $r .= '</pre>'; fclose($fd); return $r; @@ -510,7 +512,9 @@ $fd = fopen($tutos[errlog].'.mail', 'rb'); if ($fd === false) return $r; $r .= '<pre>'; - $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail'))); + if (filesize ($tutos[errlog].'.mail')) { + $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail'))); + } $r .= '</pre>'; fclose($fd); return $r; @@ -525,9 +529,11 @@ } $fd = fopen($tutos[errlog].'.log', 'rb'); if ($fd === false) return $r; + if (0 == filesize ($tutos[errlog].'.log')) { + fclose($fd); + return $r; + } - - $r .= '<pre>'; $url = getBaseUrl(); $xx = preg_split('#/#', $url); Modified: trunk/php/checklist/checkfield_overview.php =================================================================== --- trunk/php/checklist/checkfield_overview.php 2014-01-06 18:32:01 UTC (rev 1213) +++ trunk/php/checklist/checkfield_overview.php 2014-01-06 20:59:19 UTC (rev 1214) @@ -11,6 +11,8 @@ * $Author$ * */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -380,7 +382,7 @@ } $this->link1 = "checklist/checkfield_overview.php"; $this->q = "SELECT * FROM ". $this->dbconn->prefix .$table['checkfield'][name]; - $pre = " AND "; + $pre = " WHERE "; if ( isset($_REQUEST['name']) && ($_REQUEST['name'] != "*") && ($_REQUEST['REQUEST'] != "") ) { $this->q .= $pre . $this->dbconn->Like("name",$_REQUEST['name']); @@ -422,4 +424,4 @@ $l = new checkfield_overview($current_user); $l->display(); $dbconn->Close(); -?> +?> \ No newline at end of file Modified: trunk/php/checklist/checklist.pinc =================================================================== --- trunk/php/checklist/checklist.pinc 2014-01-06 18:32:01 UTC (rev 1213) +++ trunk/php/checklist/checklist.pinc 2014-01-06 20:59:19 UTC (rev 1214) @@ -391,7 +391,7 @@ } /** - * create a link to a overview page + * create a link to a select page */ static function getSelectLink (tutos_user $user,$text = "") { global $lang,$tutos; @@ -407,7 +407,7 @@ } /** - * create a link to a select page + * create a link to a overview page */ static function getOverviewLink (tutos_user $user, $text = "") { global $lang; @@ -418,6 +418,25 @@ } /** + * create a link to a filtered overview page + */ + function getOverviewLinkObj (tutos_user $user,tutos_base $obj, $text = "") { + global $lang; + if (! is_object($obj) ) return ''; + if ( $obj->id == -1 ) return ''; + if (! $user->feature_ok(usechecklists,PERM_SEE) ) return ''; + if (! $obj->obj_feature_ok($user,usechecklists,PERM_SEE) ) return ''; + if (! $obj->see_ok() ) return ''; + + return array( url => 'checklist/checklist_overview.php?link_id='.$obj->id, + confirm => false, + text => ($text == '' ? $lang['Checklists']:$text), + info => $lang['Checklist'], + category => array('overview','module',usechecklists) + ); + } + + /** * create a link where a checklist to for the given object could be added */ static function getaddlink (tutos_user $user,tutos_base $obj,$text = "") { @@ -751,9 +770,9 @@ if ( count($obj->list[usechecklists]) > 0 ) { $r .= $user->layout->ContentRowStart(); if ( count($obj->list[usechecklists]) > 1 ) { - $r .= $user->layout->showfield($lang['Checklists']); + $r .= $user->layout->show_info_field($lang['Checklists'],$obj,get_class()); } else { - $r .= $user->layout->showfield($lang['Checklist']); + $r .= $user->layout->show_info_field($lang['Checklist'],$obj,get_class()); } if ( $format == "paper" ) { $d = showChecklists($user,$obj,-1); @@ -804,4 +823,4 @@ return count($obj->checkfields); } } -?> +?> \ 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-01-06 18:32:04
|
Revision: 1213 http://sourceforge.net/p/tutos/code/1213 Author: gokohnert Date: 2014-01-06 18:32:01 +0000 (Mon, 06 Jan 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/Makefile trunk/html/js/jquery.mobile.min.js trunk/php/product_contacts.php Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2014-01-04 19:45:48 UTC (rev 1212) +++ trunk/Makefile 2014-01-06 18:32:01 UTC (rev 1213) @@ -2,7 +2,7 @@ # the ultimate team organization software # --------------------------------------- # -# Copyright 1999-2013 by Gero Kohnert +# Copyright 1999-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 @@ -541,6 +541,11 @@ html/css/images/ajax-loader.gif \ html/css/images/ajax-loader.png \ html/css/images/icons-18-white.png \ + html/css/images/icons-36-white.png \ + html/css/images/icons-18-black.png \ + html/css/images/icons-36-black.png \ + $(wildcard html/css/images/icons-svg/*.svg) \ + $(wildcard html/css/images/icons-png/*.png) \ html/default.css \ html/default_mail.css \ html/new_layout.css \ Modified: trunk/html/js/jquery.mobile.min.js =================================================================== (Binary files differ) Modified: trunk/php/product_contacts.php =================================================================== --- trunk/php/product_contacts.php 2014-01-04 19:45:48 UTC (rev 1212) +++ trunk/php/product_contacts.php 2014-01-06 18:32:01 UTC (rev 1213) @@ -61,7 +61,7 @@ <thead> <tr> <th style="background-color:#BBB" align="center"><b>'.$lang['AdrName'].'</b></th> - <th style="background-color:#BBB" align="center"><b>'.$lang['AdrRoles'].'</b></th> + <th style="background-color:#BBB" align="center"><b>'.$lang['ProdRoles'].'</b></th> <th style="background-color:#BBB" align="center"><b>'.$lang['Phone'].'</b></th> <th style="background-color:#BBB" align="center"><b>'.$lang['AdrEmail'].'</b></th> <th style="background-color:#BBB" align="center"><b>'.$lang['AdrFax'].'</b></th> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-01-04 19:45:53
|
Revision: 1212 http://sourceforge.net/p/tutos/code/1212 Author: gokohnert Date: 2014-01-04 19:45:48 +0000 (Sat, 04 Jan 2014) Log Message: ----------- updated jmobile Modified Paths: -------------- trunk/html/css/jquery.mobile.min.css Added Paths: ----------- trunk/html/css/images/icons-18-black.png trunk/html/css/images/icons-36-black.png trunk/html/css/images/icons-36-white.png trunk/html/css/images/icons-png/ trunk/html/css/images/icons-png/action-black.png trunk/html/css/images/icons-png/action-white.png trunk/html/css/images/icons-png/alert-black.png trunk/html/css/images/icons-png/alert-white.png trunk/html/css/images/icons-png/arrow-d-black.png trunk/html/css/images/icons-png/arrow-d-l-black.png trunk/html/css/images/icons-png/arrow-d-l-white.png trunk/html/css/images/icons-png/arrow-d-r-black.png trunk/html/css/images/icons-png/arrow-d-r-white.png trunk/html/css/images/icons-png/arrow-d-white.png trunk/html/css/images/icons-png/arrow-l-black.png trunk/html/css/images/icons-png/arrow-l-white.png trunk/html/css/images/icons-png/arrow-r-black.png trunk/html/css/images/icons-png/arrow-r-white.png trunk/html/css/images/icons-png/arrow-u-black.png trunk/html/css/images/icons-png/arrow-u-l-black.png trunk/html/css/images/icons-png/arrow-u-l-white.png trunk/html/css/images/icons-png/arrow-u-r-black.png trunk/html/css/images/icons-png/arrow-u-r-white.png trunk/html/css/images/icons-png/arrow-u-white.png trunk/html/css/images/icons-png/audio-black.png trunk/html/css/images/icons-png/audio-white.png trunk/html/css/images/icons-png/back-black.png trunk/html/css/images/icons-png/back-white.png trunk/html/css/images/icons-png/bars-black.png trunk/html/css/images/icons-png/bars-white.png trunk/html/css/images/icons-png/bullets-black.png trunk/html/css/images/icons-png/bullets-white.png trunk/html/css/images/icons-png/calendar-black.png trunk/html/css/images/icons-png/calendar-white.png trunk/html/css/images/icons-png/camera-black.png trunk/html/css/images/icons-png/camera-white.png trunk/html/css/images/icons-png/carat-d-black.png trunk/html/css/images/icons-png/carat-d-white.png trunk/html/css/images/icons-png/carat-l-black.png trunk/html/css/images/icons-png/carat-l-white.png trunk/html/css/images/icons-png/carat-r-black.png trunk/html/css/images/icons-png/carat-r-white.png trunk/html/css/images/icons-png/carat-u-black.png trunk/html/css/images/icons-png/carat-u-white.png trunk/html/css/images/icons-png/check-black.png trunk/html/css/images/icons-png/check-white.png trunk/html/css/images/icons-png/clock-black.png trunk/html/css/images/icons-png/clock-white.png trunk/html/css/images/icons-png/cloud-black.png trunk/html/css/images/icons-png/cloud-white.png trunk/html/css/images/icons-png/comment-black.png trunk/html/css/images/icons-png/comment-white.png trunk/html/css/images/icons-png/delete-black.png trunk/html/css/images/icons-png/delete-white.png trunk/html/css/images/icons-png/edit-black.png trunk/html/css/images/icons-png/edit-white.png trunk/html/css/images/icons-png/eye-black.png trunk/html/css/images/icons-png/eye-white.png trunk/html/css/images/icons-png/forbidden-black.png trunk/html/css/images/icons-png/forbidden-white.png trunk/html/css/images/icons-png/forward-black.png trunk/html/css/images/icons-png/forward-white.png trunk/html/css/images/icons-png/gear-black.png trunk/html/css/images/icons-png/gear-white.png trunk/html/css/images/icons-png/grid-black.png trunk/html/css/images/icons-png/grid-white.png trunk/html/css/images/icons-png/heart-black.png trunk/html/css/images/icons-png/heart-white.png trunk/html/css/images/icons-png/home-black.png trunk/html/css/images/icons-png/home-white.png trunk/html/css/images/icons-png/info-black.png trunk/html/css/images/icons-png/info-white.png trunk/html/css/images/icons-png/location-black.png trunk/html/css/images/icons-png/location-white.png trunk/html/css/images/icons-png/lock-black.png trunk/html/css/images/icons-png/lock-white.png trunk/html/css/images/icons-png/mail-black.png trunk/html/css/images/icons-png/mail-white.png trunk/html/css/images/icons-png/minus-black.png trunk/html/css/images/icons-png/minus-white.png trunk/html/css/images/icons-png/navigation-black.png trunk/html/css/images/icons-png/navigation-white.png trunk/html/css/images/icons-png/phone-black.png trunk/html/css/images/icons-png/phone-white.png trunk/html/css/images/icons-png/plus-black.png trunk/html/css/images/icons-png/plus-white.png trunk/html/css/images/icons-png/power-black.png trunk/html/css/images/icons-png/power-white.png trunk/html/css/images/icons-png/recycle-black.png trunk/html/css/images/icons-png/recycle-white.png trunk/html/css/images/icons-png/refresh-black.png trunk/html/css/images/icons-png/refresh-white.png trunk/html/css/images/icons-png/search-black.png trunk/html/css/images/icons-png/search-white.png trunk/html/css/images/icons-png/shop-black.png trunk/html/css/images/icons-png/shop-white.png trunk/html/css/images/icons-png/star-black.png trunk/html/css/images/icons-png/star-white.png trunk/html/css/images/icons-png/tag-black.png trunk/html/css/images/icons-png/tag-white.png trunk/html/css/images/icons-png/user-black.png trunk/html/css/images/icons-png/user-white.png trunk/html/css/images/icons-png/video-black.png trunk/html/css/images/icons-png/video-white.png trunk/html/css/images/icons-svg/ trunk/html/css/images/icons-svg/action-black.svg trunk/html/css/images/icons-svg/action-white.svg trunk/html/css/images/icons-svg/alert-black.svg trunk/html/css/images/icons-svg/alert-white.svg trunk/html/css/images/icons-svg/arrow-d-black.svg trunk/html/css/images/icons-svg/arrow-d-l-black.svg trunk/html/css/images/icons-svg/arrow-d-l-white.svg trunk/html/css/images/icons-svg/arrow-d-r-black.svg trunk/html/css/images/icons-svg/arrow-d-r-white.svg trunk/html/css/images/icons-svg/arrow-d-white.svg trunk/html/css/images/icons-svg/arrow-l-black.svg trunk/html/css/images/icons-svg/arrow-l-white.svg trunk/html/css/images/icons-svg/arrow-r-black.svg trunk/html/css/images/icons-svg/arrow-r-white.svg trunk/html/css/images/icons-svg/arrow-u-black.svg trunk/html/css/images/icons-svg/arrow-u-l-black.svg trunk/html/css/images/icons-svg/arrow-u-l-white.svg trunk/html/css/images/icons-svg/arrow-u-r-black.svg trunk/html/css/images/icons-svg/arrow-u-r-white.svg trunk/html/css/images/icons-svg/arrow-u-white.svg trunk/html/css/images/icons-svg/audio-black.svg trunk/html/css/images/icons-svg/audio-white.svg trunk/html/css/images/icons-svg/back-black.svg trunk/html/css/images/icons-svg/back-white.svg trunk/html/css/images/icons-svg/bars-black.svg trunk/html/css/images/icons-svg/bars-white.svg trunk/html/css/images/icons-svg/bullets-black.svg trunk/html/css/images/icons-svg/bullets-white.svg trunk/html/css/images/icons-svg/calendar-black.svg trunk/html/css/images/icons-svg/calendar-white.svg trunk/html/css/images/icons-svg/camera-black.svg trunk/html/css/images/icons-svg/camera-white.svg trunk/html/css/images/icons-svg/carat-d-black.svg trunk/html/css/images/icons-svg/carat-d-white.svg trunk/html/css/images/icons-svg/carat-l-black.svg trunk/html/css/images/icons-svg/carat-l-white.svg trunk/html/css/images/icons-svg/carat-r-black.svg trunk/html/css/images/icons-svg/carat-r-white.svg trunk/html/css/images/icons-svg/carat-u-black.svg trunk/html/css/images/icons-svg/carat-u-white.svg trunk/html/css/images/icons-svg/check-black.svg trunk/html/css/images/icons-svg/check-white.svg trunk/html/css/images/icons-svg/clock-black.svg trunk/html/css/images/icons-svg/clock-white.svg trunk/html/css/images/icons-svg/cloud-black.svg trunk/html/css/images/icons-svg/cloud-white.svg trunk/html/css/images/icons-svg/comment-black.svg trunk/html/css/images/icons-svg/comment-white.svg trunk/html/css/images/icons-svg/delete-black.svg trunk/html/css/images/icons-svg/delete-white.svg trunk/html/css/images/icons-svg/edit-black.svg trunk/html/css/images/icons-svg/edit-white.svg trunk/html/css/images/icons-svg/eye-black.svg trunk/html/css/images/icons-svg/eye-white.svg trunk/html/css/images/icons-svg/forbidden-black.svg trunk/html/css/images/icons-svg/forbidden-white.svg trunk/html/css/images/icons-svg/forward-black.svg trunk/html/css/images/icons-svg/forward-white.svg trunk/html/css/images/icons-svg/gear-black.svg trunk/html/css/images/icons-svg/gear-white.svg trunk/html/css/images/icons-svg/grid-black.svg trunk/html/css/images/icons-svg/grid-white.svg trunk/html/css/images/icons-svg/heart-black.svg trunk/html/css/images/icons-svg/heart-white.svg trunk/html/css/images/icons-svg/home-black.svg trunk/html/css/images/icons-svg/home-white.svg trunk/html/css/images/icons-svg/info-black.svg trunk/html/css/images/icons-svg/info-white.svg trunk/html/css/images/icons-svg/location-black.svg trunk/html/css/images/icons-svg/location-white.svg trunk/html/css/images/icons-svg/lock-black.svg trunk/html/css/images/icons-svg/lock-white.svg trunk/html/css/images/icons-svg/mail-black.svg trunk/html/css/images/icons-svg/mail-white.svg trunk/html/css/images/icons-svg/minus-black.svg trunk/html/css/images/icons-svg/minus-white.svg trunk/html/css/images/icons-svg/navigation-black.svg trunk/html/css/images/icons-svg/navigation-white.svg trunk/html/css/images/icons-svg/phone-black.svg trunk/html/css/images/icons-svg/phone-white.svg trunk/html/css/images/icons-svg/plus-black.svg trunk/html/css/images/icons-svg/plus-white.svg trunk/html/css/images/icons-svg/power-black.svg trunk/html/css/images/icons-svg/power-white.svg trunk/html/css/images/icons-svg/recycle-black.svg trunk/html/css/images/icons-svg/recycle-white.svg trunk/html/css/images/icons-svg/refresh-black.svg trunk/html/css/images/icons-svg/refresh-white.svg trunk/html/css/images/icons-svg/search-black.svg trunk/html/css/images/icons-svg/search-white.svg trunk/html/css/images/icons-svg/shop-black.svg trunk/html/css/images/icons-svg/shop-white.svg trunk/html/css/images/icons-svg/star-black.svg trunk/html/css/images/icons-svg/star-white.svg trunk/html/css/images/icons-svg/tag-black.svg trunk/html/css/images/icons-svg/tag-white.svg trunk/html/css/images/icons-svg/user-black.svg trunk/html/css/images/icons-svg/user-white.svg trunk/html/css/images/icons-svg/video-black.svg trunk/html/css/images/icons-svg/video-white.svg Added: trunk/html/css/images/icons-18-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-18-black.png =================================================================== --- trunk/html/css/images/icons-18-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-18-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-18-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-36-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-36-black.png =================================================================== --- trunk/html/css/images/icons-36-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-36-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-36-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-36-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-36-white.png =================================================================== --- trunk/html/css/images/icons-36-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-36-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-36-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/action-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/action-black.png =================================================================== --- trunk/html/css/images/icons-png/action-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/action-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/action-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/action-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/action-white.png =================================================================== --- trunk/html/css/images/icons-png/action-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/action-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/action-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/alert-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/alert-black.png =================================================================== --- trunk/html/css/images/icons-png/alert-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/alert-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/alert-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/alert-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/alert-white.png =================================================================== --- trunk/html/css/images/icons-png/alert-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/alert-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/alert-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-d-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-d-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-d-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-d-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-d-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-d-l-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-d-l-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-d-l-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-d-l-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-d-l-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-d-l-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-d-l-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-d-l-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-d-l-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-d-l-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-d-r-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-d-r-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-d-r-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-d-r-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-d-r-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-d-r-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-d-r-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-d-r-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-d-r-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-d-r-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-d-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-d-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-d-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-d-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-d-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-l-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-l-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-l-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-l-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-l-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-l-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-l-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-l-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-l-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-l-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-r-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-r-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-r-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-r-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-r-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-r-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-r-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-r-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-r-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-r-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-u-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-u-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-u-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-u-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-u-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-u-l-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-u-l-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-u-l-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-u-l-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-u-l-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-u-l-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-u-l-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-u-l-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-u-l-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-u-l-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-u-r-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-u-r-black.png =================================================================== --- trunk/html/css/images/icons-png/arrow-u-r-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-u-r-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-u-r-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-u-r-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-u-r-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-u-r-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-u-r-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-u-r-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/arrow-u-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/arrow-u-white.png =================================================================== --- trunk/html/css/images/icons-png/arrow-u-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/arrow-u-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/arrow-u-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/audio-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/audio-black.png =================================================================== --- trunk/html/css/images/icons-png/audio-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/audio-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/audio-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/audio-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/audio-white.png =================================================================== --- trunk/html/css/images/icons-png/audio-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/audio-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/audio-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/back-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/back-black.png =================================================================== --- trunk/html/css/images/icons-png/back-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/back-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/back-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/back-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/back-white.png =================================================================== --- trunk/html/css/images/icons-png/back-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/back-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/back-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/bars-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/bars-black.png =================================================================== --- trunk/html/css/images/icons-png/bars-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/bars-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/bars-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/bars-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/bars-white.png =================================================================== --- trunk/html/css/images/icons-png/bars-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/bars-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/bars-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/bullets-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/bullets-black.png =================================================================== --- trunk/html/css/images/icons-png/bullets-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/bullets-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/bullets-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/bullets-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/bullets-white.png =================================================================== --- trunk/html/css/images/icons-png/bullets-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/bullets-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/bullets-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/calendar-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/calendar-black.png =================================================================== --- trunk/html/css/images/icons-png/calendar-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/calendar-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/calendar-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/calendar-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/calendar-white.png =================================================================== --- trunk/html/css/images/icons-png/calendar-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/calendar-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/calendar-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/camera-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/camera-black.png =================================================================== --- trunk/html/css/images/icons-png/camera-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/camera-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/camera-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/camera-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/camera-white.png =================================================================== --- trunk/html/css/images/icons-png/camera-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/camera-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/camera-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-d-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-d-black.png =================================================================== --- trunk/html/css/images/icons-png/carat-d-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-d-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-d-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-d-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-d-white.png =================================================================== --- trunk/html/css/images/icons-png/carat-d-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-d-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-d-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-l-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-l-black.png =================================================================== --- trunk/html/css/images/icons-png/carat-l-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-l-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-l-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-l-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-l-white.png =================================================================== --- trunk/html/css/images/icons-png/carat-l-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-l-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-l-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-r-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-r-black.png =================================================================== --- trunk/html/css/images/icons-png/carat-r-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-r-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-r-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-r-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-r-white.png =================================================================== --- trunk/html/css/images/icons-png/carat-r-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-r-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-r-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-u-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-u-black.png =================================================================== --- trunk/html/css/images/icons-png/carat-u-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-u-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-u-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/carat-u-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/carat-u-white.png =================================================================== --- trunk/html/css/images/icons-png/carat-u-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/carat-u-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/carat-u-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/check-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/check-black.png =================================================================== --- trunk/html/css/images/icons-png/check-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/check-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/check-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/check-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/check-white.png =================================================================== --- trunk/html/css/images/icons-png/check-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/check-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/check-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/clock-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/clock-black.png =================================================================== --- trunk/html/css/images/icons-png/clock-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/clock-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/clock-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/clock-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/clock-white.png =================================================================== --- trunk/html/css/images/icons-png/clock-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/clock-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/clock-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/cloud-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/cloud-black.png =================================================================== --- trunk/html/css/images/icons-png/cloud-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/cloud-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/cloud-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/cloud-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/cloud-white.png =================================================================== --- trunk/html/css/images/icons-png/cloud-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/cloud-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/cloud-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/comment-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/comment-black.png =================================================================== --- trunk/html/css/images/icons-png/comment-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/comment-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/comment-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/comment-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/comment-white.png =================================================================== --- trunk/html/css/images/icons-png/comment-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/comment-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/comment-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/delete-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/delete-black.png =================================================================== --- trunk/html/css/images/icons-png/delete-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/delete-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/delete-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/delete-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/delete-white.png =================================================================== --- trunk/html/css/images/icons-png/delete-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/delete-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/delete-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/edit-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/edit-black.png =================================================================== --- trunk/html/css/images/icons-png/edit-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/edit-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/edit-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/edit-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/edit-white.png =================================================================== --- trunk/html/css/images/icons-png/edit-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/edit-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/edit-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/eye-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/eye-black.png =================================================================== --- trunk/html/css/images/icons-png/eye-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/eye-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/eye-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/eye-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/eye-white.png =================================================================== --- trunk/html/css/images/icons-png/eye-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/eye-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/eye-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/forbidden-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/forbidden-black.png =================================================================== --- trunk/html/css/images/icons-png/forbidden-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/forbidden-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/forbidden-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/forbidden-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/forbidden-white.png =================================================================== --- trunk/html/css/images/icons-png/forbidden-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/forbidden-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/forbidden-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/forward-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/forward-black.png =================================================================== --- trunk/html/css/images/icons-png/forward-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/forward-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/forward-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/forward-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/forward-white.png =================================================================== --- trunk/html/css/images/icons-png/forward-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/forward-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/forward-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/gear-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/gear-black.png =================================================================== --- trunk/html/css/images/icons-png/gear-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/gear-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/gear-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/gear-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/gear-white.png =================================================================== --- trunk/html/css/images/icons-png/gear-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/gear-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/gear-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/grid-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/grid-black.png =================================================================== --- trunk/html/css/images/icons-png/grid-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/grid-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/grid-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/grid-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/grid-white.png =================================================================== --- trunk/html/css/images/icons-png/grid-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/grid-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/grid-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/heart-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/heart-black.png =================================================================== --- trunk/html/css/images/icons-png/heart-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/heart-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/heart-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/heart-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/heart-white.png =================================================================== --- trunk/html/css/images/icons-png/heart-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/heart-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/heart-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/home-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/home-black.png =================================================================== --- trunk/html/css/images/icons-png/home-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/home-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/home-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/home-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/home-white.png =================================================================== --- trunk/html/css/images/icons-png/home-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/home-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/home-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/info-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/info-black.png =================================================================== --- trunk/html/css/images/icons-png/info-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/info-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/info-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/info-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/info-white.png =================================================================== --- trunk/html/css/images/icons-png/info-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/info-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/info-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/location-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/location-black.png =================================================================== --- trunk/html/css/images/icons-png/location-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/location-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/location-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/location-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/location-white.png =================================================================== --- trunk/html/css/images/icons-png/location-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/location-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/location-white.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/lock-black.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/lock-black.png =================================================================== --- trunk/html/css/images/icons-png/lock-black.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/lock-black.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/lock-black.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/html/css/images/icons-png/lock-white.png =================================================================== (Binary files differ) Index: trunk/html/css/images/icons-png/lock-white.png =================================================================== --- trunk/html/css/images/icons-png/lock-white.png 2014-01-04 15:40:38 UTC (rev 1211) +++ trunk/html/css/images/icons-png/lock-white.png 2014-01-04 19:45:48 UTC (rev 1212) Property changes on: trunk/html/css/images/icons-png/lock-white.png ___________________________________________________________________ A... [truncated message content] |
From: <gok...@us...> - 2014-01-04 15:40:41
|
Revision: 1211 http://sourceforge.net/p/tutos/code/1211 Author: gokohnert Date: 2014-01-04 15:40:38 +0000 (Sat, 04 Jan 2014) Log Message: ----------- fix Modified Paths: -------------- trunk/php/file/file.pinc Modified: trunk/php/file/file.pinc =================================================================== --- trunk/php/file/file.pinc 2014-01-03 13:26:59 UTC (rev 1210) +++ trunk/php/file/file.pinc 2014-01-04 15:40:38 UTC (rev 1211) @@ -1519,12 +1519,21 @@ $x[$this->getTypeId()][20] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Bug'].' - '.$lang['BugAssignedTo']; $x[$this->getTypeId()][21] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Bug'].' - '.$lang['BugReportedFrom']; $x[$this->getTypeId()][30] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Task'].' - '.$lang['TaskWorker']; - $x[$this->getTypeId()][40] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['SoldBy']; - $x[$this->getTypeId()][41] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['InstalledBy']; - $x[$this->getTypeId()][42] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['Customer']; - $x[$this->getTypeId()][60] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Expense'].' - '.$lang['ExpenseAddress']; + if (isset($lang['Installation'])) { + $x[$this->getTypeId()][40] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['SoldBy']; + $x[$this->getTypeId()][41] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['InstalledBy']; + $x[$this->getTypeId()][42] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Installation'].' - '.$lang['Customer']; + } else { + $x[$this->getTypeId()][40] = $lang[$this->getType()].':'.$lang['FileReference'].':Installation - SoldBy'; + $x[$this->getTypeId()][41] = $lang[$this->getType()].':'.$lang['FileReference'].':Installation - InstalledBy'; + $x[$this->getTypeId()][42] = $lang[$this->getType()].':'.$lang['FileReference'].':Installation - Customer'; + } + if (isset($lang['Expense'])) { + $x[$this->getTypeId()][60] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['Expense'].' - '.$lang['ExpenseAddress']; + } else { + $x[$this->getTypeId()][60] = $lang[$this->getType()].':'.$lang['FileReference'].': Expense - ExpenseAddress'; + } - $x[$this->getTypeId()][100] = $lang[$this->getType()].':'.$lang['FileReference'].':'.$lang['ProductP'].' - '.$lang['ProdRoles']; foreach ($lang['ProdRole'] as $role => $f) { if ( $tutos[rolecheck][$role] != "p") { @@ -1900,4 +1909,4 @@ } } -?> +?> \ 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-01-03 13:27:02
|
Revision: 1210 http://sourceforge.net/p/tutos/code/1210 Author: gokohnert Date: 2014-01-03 13:26:59 +0000 (Fri, 03 Jan 2014) Log Message: ----------- bugfix bad info output Modified Paths: -------------- trunk/php/bugtracking/bug_ins.php Modified: trunk/php/bugtracking/bug_ins.php =================================================================== --- trunk/php/bugtracking/bug_ins.php 2014-01-03 13:05:43 UTC (rev 1209) +++ trunk/php/bugtracking/bug_ins.php 2014-01-03 13:26:59 UTC (rev 1210) @@ -213,7 +213,7 @@ } // check if target is required -$info .= $b->target; +#$info .= $b->target; if ( ($tutos['bug_need_target'] != '') && !is_object($b->target) ) { $x = preg_split('#,#',$tutos['bug_need_target']); if (in_array($state,$x)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-01-03 13:05:47
|
Revision: 1209 http://sourceforge.net/p/tutos/code/1209 Author: gokohnert Date: 2014-01-03 13:05:43 +0000 (Fri, 03 Jan 2014) Log Message: ----------- bugfix product stat with filters Modified Paths: -------------- trunk/php/mailbox/mailbox_show.php trunk/php/product_overview.php Modified: trunk/php/mailbox/mailbox_show.php =================================================================== --- trunk/php/mailbox/mailbox_show.php 2014-01-02 16:03:06 UTC (rev 1208) +++ trunk/php/mailbox/mailbox_show.php 2014-01-03 13:05:43 UTC (rev 1209) @@ -148,7 +148,7 @@ $x = makelink("mailbox/mail_show.php?mno=". $u ."&id=". $this->obj->id ."&path=". base64_encode($this->obj->addpath) ,$this->theme->getImage(mail,'list') . sprintf("%'_6d",$id) ,""); $r .= $this->OverviewRowBlock($x,'over_l'); - if ( $hdr->date ) { + if ( isset($hdr->date) ) { $x = $hdr->date; } else { $x = $d->getDateTime(); @@ -424,4 +424,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/product_overview.php =================================================================== --- trunk/php/product_overview.php 2014-01-02 16:03:06 UTC (rev 1208) +++ trunk/php/product_overview.php 2014-01-03 13:05:43 UTC (rev 1209) @@ -501,35 +501,9 @@ $r .= "<tr>\n"; $r .= $this->showfield($lang['Count']); $r .= "<td colspan=\"5\">". $cnt ."\n"; - $pre = "filtered by "; - while ( list ($i,$f) = @each ($this->filter) ) { - if ( $f == "" ) { - continue; - } - if ( $i == 'state' ) { - $f = $f + 0; - $r .= $pre . $lang['ProdState']; - $r .= " ". $lang['ProdStates'][$f]; - } else if ( $i == 'cl1' ) { - $r .= $pre . $lang['ProdClass1']; - $r .= " ". $lang['ProdClasses1'][$f]; - } else if ( $i == 'cl2' ) { - $r .= $pre . $lang['ProdClass2']; - $r .= " ". $lang['ProdClasses2'][$f]; - } else if ( $i == 'name' ) { - $r .= $pre . $lang['ProdDesc']; - $r .= " ". $f; - } else if ( $i == 'from' ) { - $r .= $pre . $lang['DateTimeFrom']; - $r .= " ". $f->getDateTime(); - } else if ( $i == 'to' ) { - $r .= $pre . $lang['DateTimeTill']; - $r .= " ". $f->getDateTime(); - } else { - $r .= $pre . $i; - $r .= " ". $f; - } - $pre = " and "; + if ($this->header != '') { + $r .= "filtered by "; + $r .= $this->header; } $r .= " </td>\n"; $r .= "</tr>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2014-01-02 16:03:12
|
Revision: 1208 http://sourceforge.net/p/tutos/code/1208 Author: gokohnert Date: 2014-01-02 16:03:06 +0000 (Thu, 02 Jan 2014) Log Message: ----------- removed most nbsp characters; moved more output to new tcpdf; added missing tcpdf files to main package Modified Paths: -------------- trunk/ChangeLog trunk/Makefile trunk/homepage/index.html trunk/libs/php-barcode/TUTOS-README trunk/php/Date.pinc trunk/php/acl.pinc trunk/php/acl_new.php trunk/php/acl_overview.php trunk/php/acl_show.php trunk/php/address_new.php trunk/php/address_overview.php trunk/php/address_select.php trunk/php/address_tools.p3 trunk/php/admin/create_config.php trunk/php/admin/customize_show.php trunk/php/admin/scheme.php trunk/php/admin/table_custom_show.php trunk/php/admin/update.php trunk/php/admin_show.php trunk/php/admin_sync.php trunk/php/adodb-time.inc.php trunk/php/app_new.php trunk/php/app_new_r.php trunk/php/app_overview.php trunk/php/app_show.php trunk/php/bugtracking/bug_new.php trunk/php/bugtracking/bug_overview.php trunk/php/calendar.php trunk/php/calendar_day.php trunk/php/calendar_week.php trunk/php/check.php trunk/php/checklist/checkfield.pinc trunk/php/checklist/checkfield_overview.php trunk/php/checklist/checklist.pinc trunk/php/checklist/checklist_show.php trunk/php/company_new.php trunk/php/config_default.pinc trunk/php/counter/counter_overview.php trunk/php/counter/counter_show.php trunk/php/db/db_pg.pinc trunk/php/department_new.php trunk/php/doctracker/doc_overview.php trunk/php/drawboard/drawboard_overview.php trunk/php/expense/expense_new.php trunk/php/expense/expense_overview.php trunk/php/fax/fax_new.php trunk/php/file/file.pinc trunk/php/file/file_new.php trunk/php/file/file_overview.php trunk/php/file/file_show.php trunk/php/group/group_overview.php trunk/php/installation/installation_overview.php trunk/php/installation/installation_show.php trunk/php/invoice/invoice.pinc trunk/php/invoice/invoice_new.php trunk/php/invoice/invoice_overview.php trunk/php/invoice/invoice_pdf.pinc trunk/php/invoice/invoice_show.php trunk/php/layout/adq_layout.pinc trunk/php/layout/classic_base.pinc trunk/php/layout/classic_layout.pinc trunk/php/layout/new_layout.pinc trunk/php/layout/test_layout.pinc trunk/php/ldap/ldap_overview.php trunk/php/ldap/ldap_show.php trunk/php/localization/hu.p3 trunk/php/mail.pinc trunk/php/mailbox/mail_select.php trunk/php/mailbox/mailbox_new.php trunk/php/mailbox/mailbox_show.php trunk/php/minical.php trunk/php/module_overview.php trunk/php/module_template/AAA_overview.php trunk/php/mytutos.php trunk/php/note/note_overview.php trunk/php/pdf.pinc trunk/php/pdf2.pinc trunk/php/permission.p3 trunk/php/product_contacts.php trunk/php/product_role_new.php trunk/php/rate/rate_overview.php trunk/php/reminder/reminder.pinc trunk/php/reminder/reminder_overview.php trunk/php/report-engine/report_overview.php trunk/php/res_cal.php trunk/php/resource/resource_overview.php trunk/php/rss/rss_overview.php trunk/php/sales_forecast.php trunk/php/scrum/log_new.php trunk/php/scrum/log_overview.php trunk/php/scrum/log_show.php trunk/php/scrum/scrum.pinc trunk/php/scrum/sprint_new.php trunk/php/scrum/sprint_overview.php trunk/php/scrum/sprint_show.php trunk/php/stc/stc.pinc trunk/php/stc/stc_new.php trunk/php/stc/stc_overview.php trunk/php/stc/stc_show.php trunk/php/stuff/stuff.pinc trunk/php/stuff/stuff_overview.php trunk/php/stuff/stuff_show.php trunk/php/subversion/svn_overview.php trunk/php/task_gantt.php trunk/php/task_new.php trunk/php/task_show.php trunk/php/team_new.php trunk/php/team_overview.php trunk/php/team_show.php trunk/php/testmanager/testcase_new.php trunk/php/testmanager/testcase_overview.php trunk/php/testmanager/testmanager.pinc trunk/php/testmanager/testrun_overview.php trunk/php/testmanager/testsuite_overview.php trunk/php/testmanager/testsuite_show.php trunk/php/timetrack/timetrack_overview.php trunk/php/user_new.php trunk/php/user_overview.php trunk/php/watchlist/watchlist_overview.php trunk/php/webelements.p3 trunk/test.sh Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/ChangeLog 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,4 +1,6 @@ #$Id$ +27 December 2013 + * Release 1.10.20131227 * allow to use a fiexed email for sending out emails (i.e a noreply email). Set in the config email tab. * updated bundeled jquery and jqplot * counter stats uses jqplot now Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/Makefile 2014-01-02 16:03:06 UTC (rev 1208) @@ -469,8 +469,8 @@ libs/fpdf/FAQ.htm LIBS_TCPDF = $(wildcard libs/tcpdf/*.php) \ - $(wildcard libs/tcpdf/font/*.php) \ - $(wildcard libs/tcpdf/font/*.z) \ + $(wildcard libs/tcpdf/fonts/*.php) \ + $(wildcard libs/tcpdf/fonts/*.z) \ $(wildcard libs/tcpdf/config/*.php) \ libs/tcpdf/TUTOS-README \ libs/tcpdf/README.TXT \ Modified: trunk/homepage/index.html =================================================================== --- trunk/homepage/index.html 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/homepage/index.html 2014-01-02 16:03:06 UTC (rev 1208) @@ -11,6 +11,6 @@ <p /> <p /> <img border="0" src="../html/tutos_full.png" alt="TUTOS" /> -<br /><b><font size="3">LATEST RELEASE IS 1.9.20121228</font></b> +<br /><b><font size="3">LATEST RELEASE IS 1.10.20131227</font></b> </center> <!--#include file="foot1.html.inc" --> Modified: trunk/libs/php-barcode/TUTOS-README =================================================================== --- trunk/libs/php-barcode/TUTOS-README 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/libs/php-barcode/TUTOS-README 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,9 +1,13 @@ $Id: TUTOS-README,v 1.1 2008/01/24 19:52:23 gokohnert Exp $ You should install the php-barcode tool in this directory +and the genbarcode from the same source in /usr/local/bin Please see http://www.ashberg.de/php-barcode/download/ php-barcode is not part of TUTOS and is not maintained by the TUTOS team. + +Attention: it might be neccessary to anble short_open_tags for PHP if you use php-barcode or +modify the php files in this directory in order to start with "<?php" instead of "<?" \ No newline at end of file Modified: trunk/php/Date.pinc =================================================================== --- trunk/php/Date.pinc 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/Date.pinc 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 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 @@ -967,13 +967,13 @@ } else { $r .= $this->EnterDay($name,$none); } - $r .= "<b>.</b> "; + $r .= "<b>.</b> "; if ( $tutos['df'] == 1 ) { $r .= $this->EnterDay($name,$none); } else { $r .= $this->EnterMonth($name,$none); } - $r .= "<b>.</b> "; + $r .= "<b>.</b> "; $r .= $this->EnterYear($name,$none,$future_only); if ($show_minical) { @@ -991,7 +991,7 @@ $r = '<span id="'.$name.'_HM">'; $r .= '<input id="'. $h .'" maxlength="2" size="2" name="'. $h .'" value="'. sprintf("%02d",$this->hour) ."\" />\n"; - $r .= ' <b>:</b> '; + $r .= ' <b>:</b> '; $r .= '<input id="'. $m .'" maxlength="2" size="2" name="'. $m .'" value="'. sprintf("%02d",$this->min) ."\" />\n"; $r .= '</span>'; return $r; @@ -1012,8 +1012,8 @@ $h = sprintf("%s_H",$name ); $m = sprintf("%s_M",$name ); - $r .= '<span id="'.$name.'_HM"> <input id="'.$h.'" maxlength="2" size="2" name="'. $h .'" value="'. ($this->hour == -1 ? "--":$this->hour) ."\" />\n"; - $r .= ' <b>:</b> '; + $r .= '<span id="'.$name.'_HM"> <input id="'.$h.'" maxlength="2" size="2" name="'. $h .'" value="'. ($this->hour == -1 ? "--":$this->hour) ."\" />\n"; + $r .= ' <b>:</b> '; $r .= '<input id="'.$m.'" maxlength="2" size="2" name="'. $m .'" value="'. ($this->min == -1 ? "--":$this->min) ."\" />\n"; if ($tutos[jscalendar] == 0) { Modified: trunk/php/acl.pinc =================================================================== --- trunk/php/acl.pinc 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/acl.pinc 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 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 @@ -530,15 +530,15 @@ $old = $a; } if ($l == 0) { - $r .= $pre.' '.$lang['everybody']; + $r .= $pre.' '.$lang['everybody']; } else if ($l < 0) { $x = $l - ($obj->getTypeId() << ACLSHIFT); if (isset($virtgroups[$obj->getTypeId()][-$x])) { - $r .= $pre.' '.$virtgroups[$obj->getTypeId()][-$x]; + $r .= $pre.' '.$virtgroups[$obj->getTypeId()][-$x]; } } else { $x = getObject($obj->dbconn,$l); - $r .= $pre.' '.$x->getFullName(); + $r .= $pre.' '.$x->getFullName(); } $pre = '<br />'; } @@ -625,7 +625,7 @@ $r = ''; $r .= '<td align="center" valign="top" width="10%">'; if ( isset($permskip[$f][$p]) ) { - $r .= " "; + $r .= " "; } else { if ( $user->isAdmin() || ($f == usepopup) || ($p == PERM_MYTUTOS) ) { $r .= '<input type="checkbox" name="f'. $f .'[]" value="'. $p .'"'. ($obj->p[$f] & $p ? ' checked="checked"':'') ." />\n"; @@ -740,7 +740,7 @@ $r .= " <th>". $lang['Search'] ."</th>\n"; $r .= " <th>". $lang['PersonalPage'] ."</th>\n"; $r .= " <th colspan=\"2\">★<input type=\"checkbox\" name=\"checkitall\" "CheckAllAll(this,'f-')\" />★</th>\n"; - # $r .= "<th> </th>\n"; + # $r .= "<th> </th>\n"; $r .= "</tr>\n"; $line = 0; $perms = array (PERM_NEW,PERM_SEE,PERM_USE,PERM_MOD,PERM_DEL,PERM_SEL,PERM_MYTUTOS); @@ -763,8 +763,8 @@ $r .= '<td colspan="2" align="center" valign="top" width="15%">*'; $r .= '<input type="checkbox" id="f'.$i.'_fld" name="f-checkit'. $i .'" '. ($obj->p[$i] > 61 ? ' checked="checked"':'') ." />*</td>\n"; } else { - $r .= '<td><span id="f'.$i."_fld\"> </span></td>\n"; - $r .= "<td> </td>\n"; + $r .= '<td><span id="f'.$i."_fld\"> </span></td>\n"; + $r .= "<td> </td>\n"; } } else { $r .= '<td align="center" colspan="9">'. $lang['FeatureOff'] ."</td>\n"; Modified: trunk/php/acl_new.php =================================================================== --- trunk/php/acl_new.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/acl_new.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 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 @@ -143,7 +143,7 @@ $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n"; + $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n"; $r .= "</tr>\n"; @@ -245,14 +245,14 @@ $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= ' <td colspan="2"> '. sprintf($lang['ACLreadI'],myentities($title)) ." </td>\n"; - $r .= ' <td colspan="2"> '. sprintf($lang['ACLuseI'],myentities($title)) ." </td>\n"; - $r .= ' <td colspan="2"> '. sprintf($lang['ACLmodI'] ,myentities($title)) ." </td>\n"; - $r .= ' <td colspan="2"> '. sprintf($lang['ACLdelI'] ,myentities($title)) ." </td>\n"; + $r .= ' <td colspan="2"> '. sprintf($lang['ACLreadI'],myentities($title)) ." </td>\n"; + $r .= ' <td colspan="2"> '. sprintf($lang['ACLuseI'],myentities($title)) ." </td>\n"; + $r .= ' <td colspan="2"> '. sprintf($lang['ACLmodI'] ,myentities($title)) ." </td>\n"; + $r .= ' <td colspan="2"> '. sprintf($lang['ACLdelI'] ,myentities($title)) ." </td>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n"; + $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="keep" id="keep" '. ((count($this->obj) > 1) ? 'checked="checked"':'') .' /><label for="keep">'. $lang['ACLKeepOld'] ."</label></td>\n"; $r .= "</tr>\n"; if (count($this->obj) == 1) { @@ -265,7 +265,7 @@ } } $r .= "<tr>\n"; - $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="recursive" id="recursive" /><label for="recursive">'. $lang['ACLRecursive'] .' ('.$x.')'."</label></td>\n"; + $r .= ' <td colspan="'.$this->width.'"> <input type="checkbox" value="1" name="recursive" id="recursive" /><label for="recursive">'. $lang['ACLRecursive'] .' ('.$x.')'."</label></td>\n"; $r .= "</tr>\n"; } Modified: trunk/php/acl_overview.php =================================================================== --- trunk/php/acl_overview.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/acl_overview.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,7 +1,7 @@ <?php /** * Copyright 2001 Boris Wesslowski - * Copyright 2001 - 2012 Gero Kohnert + * Copyright 2001 - 2014 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 @@ -149,17 +149,17 @@ $r .= '<td rowspan="'. max($n2,1) .'" class="over_l">'. acl_link($obj,$oid,0) ."</td>\n"; $r .= '<td rowspan="'. max($n2,1) .'" class="over_l">'. $lang[$obj->getType()] ."</td>\n"; $r .= '<td rowspan="'. max($n2,1) .'" class="over_l">'. $obj->getLink() ."</td>\n"; - $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"><span class="small">'. (is_object($obj->creator) ? $obj->creator->getLink():' '); - $r .= (is_object($obj->creation) ? '<br />'.$obj->creation->getDateTime():' '); + $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"><span class="small">'. (is_object($obj->creator) ? $obj->creator->getLink():' '); + $r .= (is_object($obj->creation) ? '<br />'.$obj->creation->getDateTime():' '); $r .= "</span></td>\n"; } else { $r .= '<td rowspan="'. max($n2,1) .'">'. $g ."</td>\n"; $r .= '<td rowspan="'. max($n2,1) .'" class="over_l">unknown</td>'."\n"; $r .= '<td rowspan="'. max($n2,1) .'" class="over_l">unknown</td>'."\n"; - $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"> </td>'."\n"; + $r .= '<td rowspan="'. max($n2,1) .'" class="over_l"> </td>'."\n"; } if ( $n2 == 0 ) { - $r .= "<td colspan=\"2\"> </td>\n"; + $r .= "<td colspan=\"2\"> </td>\n"; $r .= $this->MassUpdateField($obj); $r .= $this->OverviewRowEnd($line); } else { @@ -308,7 +308,7 @@ if ( isset($lang[$x['perm']]) ) { $ref = new $x[name]($this->user->dbconn); if ($ref->tablename != 'UNKNOWN') - $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].' (M)',$lang[$x['perm']]) ."</li>\n"; + $r .= ' <li>'. menulink('acl_overview.php?xtype='. $ref->tablename.$pre,$lang[$x['perm']].' (M)',$lang[$x['perm']]) ."</li>\n"; } } $r .= "</ul></td></tr>\n"; @@ -333,7 +333,7 @@ continue; } if ( method_exists($b,"del_ok") && method_exists($b,"delete") && $b->del_ok() ) { - $info = addLine($info,$lang['Delete'] .": ". $lang[$b->getType()] ." ". myentities($b->getFullName())); + $info = addLine($info,$lang['Delete'] .": ". $lang[$b->getType()] ." ". myentities($b->getFullName())); $msg = addLine($msg,$b->delete()); } else { $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0023'],$lang[$b->getType()])); Modified: trunk/php/acl_show.php =================================================================== --- trunk/php/acl_show.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/acl_show.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 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 @@ -33,7 +33,7 @@ $r = ''; foreach ($this->obj->acl[0] as $i => $f) { if ( ($f < $max) && ($f >= $min) ) { - $pre = " "; + $pre = " "; if ( $i == 0 ) { $r .= $pre . $lang['everybody'] ."<br />\n"; } else if ($i < 0) { @@ -51,7 +51,7 @@ } } } - $r .= " "; + $r .= " "; return $r; } Modified: trunk/php/address_new.php =================================================================== --- trunk/php/address_new.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/address_new.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 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 @@ -101,12 +101,12 @@ // ZIP $r .= $this->add_entry ($lang['ZIP'],'zip',$this->loc->zip,$modloc,$table['location']['zip'][size]); - $r .= "<td colspan=\"2\"> </td>"; + $r .= "<td colspan=\"2\"> </td>"; $r .= "</tr><tr>\n"; // STATE $r .= $this->add_entry ($lang['State'],'state',$this->loc->state,$modloc,$table['location']['state'][size]); - $r .= "<td colspan=\"2\"> </td>"; + $r .= "<td colspan=\"2\"> </td>"; $r .= "</tr><tr>\n"; // COUNTRY @@ -197,7 +197,7 @@ $r .= $this->ask_address(); if ( $this->loc->id > -1) { - $r .= "<tr><td colspan=\"4\" align=\"right\"> "; + $r .= "<tr><td colspan=\"4\" align=\"right\"> "; $r .= acl_link($this->loc); $r .= "</td></tr>\n"; } @@ -235,7 +235,7 @@ } else { $req = 0; } - $r .= $this->showfieldc($text . " ",$req,$varname); + $r .= $this->showfieldc($text . " ",$req,$varname); $r .= "<td colspan=\"". $width ."\">\n"; if ( $varname == 'birthday_d' ) { $varname = 'birthday'; @@ -262,13 +262,13 @@ } elseif ( $varname == 'category' ) { if ($varvalue > 2) { - $r .= ' - <input type="hidden" id="category" name="'. $varname .'" value="'. $varvalue .'" />'; + $r .= ' - <input type="hidden" id="category" name="'. $varname .'" value="'. $varvalue .'" />'; } else { $cchecked[1] = ''; $cchecked[2] = ''; $cchecked[$varvalue] = 'checked="checked"'; $r .= $lang['AdrCat1'] .'<input type="radio" id="category" name="'. $varname .'" value="1" '. $cchecked[1] .' />'; - $r .= ' '. $lang['AdrCat2'] .'<input type="radio" name="'. $varname .'" value="2" '. $cchecked[2] .' />'; + $r .= '  '. $lang['AdrCat2'] .'<input type="radio" name="'. $varname .'" value="2" '. $cchecked[2] .' />'; } } elseif ( $varname == 'company' ) { if ( $mod == true ) { @@ -276,7 +276,7 @@ $r .= '<br /><input type="checkbox" value="1" name="cploc"'. ( $varvalue->cploc == 1 ? ' checked="checked"':'') .' />'. $lang['AdrCpLoc']; } else { if ( $varvalue == "" ) { - $r .= " "; + $r .= " "; } else { $r .= $varvalue; } @@ -289,7 +289,7 @@ $r .= '<input id="'. $varname .'" name="'. $varname .'" size="'. $showsize .'" maxlength="'. $size .'" value="'. myentities($varvalue) .'" />'; } else { if ( $varvalue == "" ) { - $r .= ' '; + $r .= ' '; } else { $r .= $varvalue; } Modified: trunk/php/address_overview.php =================================================================== --- trunk/php/address_overview.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/address_overview.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -110,7 +110,7 @@ $pdf->Close(); $data = $pdf->Output('','S'); - export_headers('TUTOS_'.$this->obj->name,'pdf',false); + export_headers('TUTOS_'.$this->name,'pdf',false); Header('Content-Length: '.strlen($data)); return $data; } Modified: trunk/php/address_select.php =================================================================== --- trunk/php/address_select.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/address_select.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2013 by Gero Kohnert + * Copyright 1999 - 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 @@ -64,13 +64,13 @@ $r .= $this->ContentRowStart('ext'); $r .= " <td colspan=\"3\">\n"; - $r .= ' <input type="checkbox" id="f1" value="name" name="ext_f[]"' .$c['name'] .'><label for="f1"> '. $lang['AdrLastName'] ." & ". $lang['AdrFirstName'] ."</label><br />\n"; - $r .= ' <input type="checkbox" id="f7" value="zip" name="ext_f[]"' .$c['zip'] .'><label for="f7"> '. $lang['ZIP'] ."</label><br />\n"; - $r .= ' <input type="checkbox" id="f2" value="city" name="ext_f[]"' .$c['city'] .'><label for="f2"> '. $lang['City'] ."</label><br />\n"; - $r .= ' <input type="checkbox" id="f3" value="street" name="ext_f[]"'.$c['street'].'><label for="f3"> '. $lang['Street'] ."</label><br />\n"; - $r .= ' <input type="checkbox" id="f4" value="email" name="ext_f[]"' .$c['email'] .'><label for="f4"> '. $lang['AdrEmail'] ."</label><br />\n"; - $r .= ' <input type="checkbox" id="f5" value="phone" name="ext_f[]"' .$c['phone'] .'><label for="f5"> '. $lang['Phone'] ."/". $lang['AdrFax']."</label><br />\n"; - $r .= ' <input type="checkbox" id="f6" value="desc" name="ext_f[]"' .$c['desc'] .'><label for="f6"> '. $lang['Description']."</label>\n"; + $r .= '  <input type="checkbox" id="f1" value="name" name="ext_f[]"' .$c['name'] .'><label for="f1"> '. $lang['AdrLastName'] ." & ". $lang['AdrFirstName'] ."</label><br />\n"; + $r .= '  <input type="checkbox" id="f7" value="zip" name="ext_f[]"' .$c['zip'] .'><label for="f7"> '. $lang['ZIP'] ."</label><br />\n"; + $r .= '  <input type="checkbox" id="f2" value="city" name="ext_f[]"' .$c['city'] .'><label for="f2"> '. $lang['City'] ."</label><br />\n"; + $r .= '  <input type="checkbox" id="f3" value="street" name="ext_f[]"'.$c['street'].'><label for="f3"> '. $lang['Street'] ."</label><br />\n"; + $r .= '  <input type="checkbox" id="f4" value="email" name="ext_f[]"' .$c['email'] .'><label for="f4"> '. $lang['AdrEmail'] ."</label><br />\n"; + $r .= '  <input type="checkbox" id="f5" value="phone" name="ext_f[]"' .$c['phone'] .'><label for="f5"> '. $lang['Phone'] ."/". $lang['AdrFax']."</label><br />\n"; + $r .= '  <input type="checkbox" id="f6" value="desc" name="ext_f[]"' .$c['desc'] .'><label for="f6"> '. $lang['Description']."</label>\n"; $r .= " </td>\n"; $r .= $this->ContentRowEnd(); @@ -86,7 +86,7 @@ $r .= $this->ContentRowStart(); $r .= $this->showfieldc($lang['AdrName']); - $r .= "<td><input type=\"text\" value=\"". $this->lookfor ."\" name=\"name\"> </td>\n"; + $r .= "<td><input type=\"text\" value=\"". $this->lookfor ."\" name=\"name\"> </td>\n"; $r .= "<td><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchLdapAdr'] ."\"></td>\n"; if ( count($tutos[ldapserver]) > 1 ) { Modified: trunk/php/address_tools.p3 =================================================================== --- trunk/php/address_tools.p3 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/address_tools.p3 2014-01-02 16:03:06 UTC (rev 1208) @@ -22,7 +22,7 @@ $r = ''; $line = ''; $r .= "<tr>\n"; - $r .= $user->layout->showfield( ($title == "" ? " ":$title)); + $r .= $user->layout->showfield( ($title == "" ? " ":$title)); if ( $typ == 1 ) { $set = 0; @@ -79,7 +79,7 @@ } } if ( $set == 0 ) { - $r .= ' <td colspan="'. $s ."\"> </td>\n"; + $r .= ' <td colspan="'. $s ."\"> </td>\n"; } } elseif ( $typ == 9 ) { if ( count($a->obj->location) <= 1 ) { @@ -90,7 +90,7 @@ if ( count($a->obj->location) > 0 ) { foreach($a->obj->location as $j => $l) { if ( $name == "ModifyDelete" ) { - $r .= $current_user->layout->showGuiIcons('<th colspan="'.$s.'" align="right">'. myentities($l->lname) .' '. $lang['Address'] .' ','</th>',$l,$a->obj,array('mod','del'),false); + $r .= $current_user->layout->showGuiIcons('<th colspan="'.$s.'" align="right">'. myentities($l->lname) .' '. $lang['Address'] .'  ','</th>',$l,$a->obj,array('mod','del'),false); } } } @@ -105,9 +105,9 @@ $s--; } if ( $name == "birthday" ) { - $r .= ' <td colspan="'. $s .'"> '. $a->$name->getLinkDate() ." </td>\n"; + $r .= ' <td colspan="'. $s .'"> '. $a->$name->getLinkDate() ." </td>\n"; } elseif ( $name == "title" ) { - $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n"; + $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n"; $r .= " <td colspan=\"1\" rowspan=\"5\" valign=\"top\" align=\"right\">\n"; $a->read_picture(); if ( is_object($a->pic_file) && $a->pic_file->see_ok() ) { @@ -115,11 +115,11 @@ '<img alt="'. $a->getFullName() .'" class="logopic" src="'. addSessionKey($a->pic_file->getUrl().'&format=show') .'">', $a->getFullName()); } else { - $r .= " "; + $r .= " "; } $r .= "</td>\n"; } else { - $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n"; + $r .= ' <td colspan="'. $s .'"> '. myentities($a->$name) ." </td>\n"; } } $r .= "</tr>\n"; @@ -237,7 +237,7 @@ $needloc = 0; $layout->flds = 0; if ( $layout->head['icon_before'] ) { - $r .= "<th> </th>\n"; + $r .= "<th> </th>\n"; $layout->flds++; } if ( $layout->head['f_name'] ) { @@ -303,7 +303,7 @@ $layout->flds++; } if ( $layout->head['icon_after'] ) { - $r .= "<th> </th>\n"; + $r .= "<th> </th>\n"; $layout->flds++; } @@ -433,18 +433,18 @@ $r .= $layout->OverviewRowBlock($b,'over_l'); } if ( $layout->head['c_id'] ) { - $r .= $layout->OverviewRowBlock((is_object($location->company) ? $location->company->getLink():' '),'over_l'); + $r .= $layout->OverviewRowBlock((is_object($location->company) ? $location->company->getLink():' '),'over_l'); } if ( $layout->head['d_id'] ) { if ( $layout->head['c_id'] ) { - $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink($location->department->name):' '),'over_l'); + $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink($location->department->name):' '),'over_l'); } else { - $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink():' '),'over_l'); + $r .= $layout->OverviewRowBlock((is_object($location->department) ? $location->department->getLink():' '),'over_l'); } } if ( ($row == 0) && ($layout->head['icon_after']) ) { // myparentobj-parameter not needed, but must be filled. Dont know how to leave it blank. - $r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(2),false); + $r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">"," </td>\n",$address,$address,$current_user->get_preficons(2),false); } $r .= show_custom_overview_data($layout,'address',$address); @@ -464,31 +464,31 @@ if ($row == 0 ) { if ( $layout->head['location'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['desc1'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['email'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['phone'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['fax'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['street'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['city'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['c_id'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['d_id'] ) { - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; } if ( $layout->head['icon_after'] ) { $r .= $layout->showGuiIcons(" <td align=\"center\" rowspan=\"". $c ."\">","</td>\n",$address,$address,$current_user->get_preficons(2),false); Modified: trunk/php/admin/create_config.php =================================================================== --- trunk/php/admin/create_config.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin/create_config.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001-2012 by Gero Kohnert + * Copyright 2001-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 @@ -383,11 +383,11 @@ $db = new Database(); $r .= "<tr>\n"; - $r .= $this->showfield($lang['AdminDBName']." [0]",1,"dbname"); + $r .= $this->showfield($lang['AdminDBName']." [0]",1,"dbname"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['name'][size],30) ."\" maxlength=\"".$table['database']['name'][size]."\" name=\"dbname\" id=\"dbname\" value=\"". $tutos[dbname][0] ."\"><br />\n"; $r .= $this->info_help_test('dbname'); $r .= " </td>\n"; - $r .= $this->showfield($lang['AdminDBType']." [0]",1,"dbtype"); + $r .= $this->showfield($lang['AdminDBType']." [0]",1,"dbtype"); $r .= " <td colspan=\"2\" valign=\"top\">\n"; $r .= " <select name=\"dbtype\">\n"; foreach($db->tlist as $i => $f) { @@ -400,45 +400,45 @@ $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= $this->showfield($lang['AdminDBAlias']." [0]",0,"dbalias"); + $r .= $this->showfield($lang['AdminDBAlias']." [0]",0,"dbalias"); $r .= " <td colspan=\"5\" valign=\"top\"><input size=\"". min($table['database']['dbalias'][size],30) ."\" maxlength=\"".$table['database']['dbalias'][size]."\" name=\"dbalias\" id=\"dbalias\" value=\"". $tutos[dbalias][0] ."\"><br />\n"; $r .= $this->info_help_test('dbalias'); $r .= " </td>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= $this->showfield($lang['AdminDBHost']." [0]",1,"dbhost"); + $r .= $this->showfield($lang['AdminDBHost']." [0]",1,"dbhost"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['dbhost'][size],30) ."\" maxlength=\"". $table['database']['dbhost'][size] ."\" name=\"dbhost\" id=\"dbhost\" value=\"". $tutos[dbhost][0] ."\"><br />\n"; $r .= $this->info_help_test('dbhost'); $r .= " </td>\n"; - $r .= $this->showfield($lang['AdminDBPort']." [0]",1,"dbport"); + $r .= $this->showfield($lang['AdminDBPort']." [0]",1,"dbport"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"5\" maxlength=\"5\" name=\"dbport\" id=\"dbport\" value=\"". $tutos[dbport][0] ."\"><br />\n"; $r .= $this->info_help_test('dbport'); $r .= " </td>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= $this->showfield($lang['AdminDBUser']." [0]",1,"dbuser"); + $r .= $this->showfield($lang['AdminDBUser']." [0]",1,"dbuser"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['dbuser'][size],30) ."\" maxlength=\"". $table['database']['dbuser'][size] ."\" name=\"dbuser\" id=\"dbuser\" value=\"". $tutos[dbuser][0] ."\"><br />\n"; $r .= $this->info_help_test('dbuser'); $r .= " </td>\n"; - $r .= $this->showfield($lang['AdminDBPass']." [0]",0,"dbpasswd"); + $r .= $this->showfield($lang['AdminDBPass']." [0]",0,"dbpasswd"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['dbpass'][size],30) ."\" maxlength=\"". $table['database']['dbpass'][size] ."\" name=\"dbpasswd\" id=\"dbpasswd\" value=\"". $tutos[dbpasswd][0] ."\"><br />\n"; $r .= $this->info_help_test('dbpasswd'); $r .= " </td>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= $this->showfield($lang['AdminDBPrefix']." [0]",0,"dbprefix"); + $r .= $this->showfield($lang['AdminDBPrefix']." [0]",0,"dbprefix"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['prefix'][size],10) ."\" maxlength=\"". $table['database']['prefix'][size] ."\" name=\"dbprefix\" id=\"dbprefix\" value=\"". $tutos[dbprefix][0] ."\"><br />\n"; $r .= $this->info_help_test('dbprefix'); $r .= " </td>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= $this->showfield($lang['AdminDBRep']." [0]",0,"repository"); + $r .= $this->showfield($lang['AdminDBRep']." [0]",0,"repository"); $r .= " <td colspan=\"2\" valign=\"top\"><input size=\"". min($table['database']['repository'][size],50) ."\" maxlength=\"". $table['database']['repository'][size] ."\" name=\"repository\" id=\"repository\" value=\"". $tutos[repository][0] ."\"><br />\n"; $r .= $this->info_help_test('repository'); $r .= " </td>\n"; @@ -483,4 +483,4 @@ <!-- SVN Info $Id$ $Author$ ---> \ No newline at end of file +--> Modified: trunk/php/admin/customize_show.php =================================================================== --- trunk/php/admin/customize_show.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin/customize_show.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2007 - 2013 by Gero Kohnert + * Copyright 2007 - 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 @@ -102,7 +102,7 @@ $lang3[$i][$i2] = ''; } $r .= $this->OverviewRowStart($line); - $r .= ' <td> $lang[\''. $i .'\'][\''. $i2.'\'] = </td>'."\n"; + $r .= ' <td>    $lang[\''. $i .'\'][\''. $i2.'\'] = </td>'."\n"; $r .= ' <td>"'. myentities($j2) .'"</td>'."\n"; $r .= ' <td>"<input name="lg2_'.$i.'__'.$i2.'" value="'. $lang2[$i][$i2] .'" />"</td>'."\n"; $r .= ' <td>"<input name="lg3_'.$i.'__'.$i2.'" value="'. $lang3[$i][$i2] .'" />"</td>'."\n"; @@ -120,7 +120,7 @@ $r .= ' <td>$lang[\''. $i .'\'] = </td>'."\n"; $r .= ' <td>"'. myentities($j) .'"</td>'."\n"; $r .= ' <td>"<input name="lg2_'.$i.'" value="'. $lang2[$i] .'" />"</td>'."\n"; - $r .= ' <td>"<input name="lg3_'.$i.'" value="'. $lang3[$i] .'" />" </td>'."\n"; + $r .= ' <td>"<input name="lg3_'.$i.'" value="'. $lang3[$i] .'" />" </td>'."\n"; $r .= $this->OverviewRowEnd($line++); } } @@ -221,4 +221,4 @@ <!-- SVN Info $Id$ $Author$ ---> \ No newline at end of file +--> Modified: trunk/php/admin/scheme.php =================================================================== --- trunk/php/admin/scheme.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin/scheme.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001-2013 by Gero Kohnert + * Copyright 2001-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 @@ -47,7 +47,7 @@ flush(); $out = 0; if ( is_object($this->obj->conn) || is_resource($this->obj->conn) ) { - $r .= " Looks OK <i>(". $this->obj->gettype() ." -> ". $this->obj .")</i> !<br />\n"; + $r .= "  Looks OK <i>(". $this->obj->gettype() ." -> ". $this->obj .")</i> !<br />\n"; } else { $r .= "failed to open Database <br />"; flush(); @@ -393,4 +393,4 @@ <!-- SVN Info $Id$ $Author$ ---> \ No newline at end of file +--> Modified: trunk/php/admin/table_custom_show.php =================================================================== --- trunk/php/admin/table_custom_show.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin/table_custom_show.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2007 - 2013 by Gero Kohnert + * Copyright 2007 - 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 @@ -57,7 +57,7 @@ $pre .= $this->OverviewRowStart($line); $pre .= ' <td colspan="11"><b>'.$tbl[name]; if (isset($tbl[Desc])) { - $pre .= ' <i>('.$tbl[Desc].')</i>'; + $pre .= '  <i>('.$tbl[Desc].')</i>'; } $pre .= "</b></td>\n"; $pre .= $this->OverviewRowEnd($line); @@ -131,4 +131,4 @@ <!-- SVN Info $Id$ $Author$ ---> \ No newline at end of file +--> Modified: trunk/php/admin/update.php =================================================================== --- trunk/php/admin/update.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin/update.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2013 by Gero Kohnert + * Copyright 2002 - 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 @@ -43,10 +43,10 @@ } echo $f[Desc] ."<br />\n"; if (!isset($f[name])) { - echo ' unknown name '.$f[Desc].' ('.$i2.') '; + echo ' unknown name '.$f[Desc].' ('.$i2.') '; continue; } - echo " Table ". $f[name]; + echo " Table ". $f[name]; if (!is_object($this->obj->createtable($f))) { echo ' not created: <span class="warn">'. $this->obj->lasterror .'</span>'; } else { @@ -69,10 +69,10 @@ if (isset($f2['ftype']) && ($f2['ftype'] == 'ObjectRel')) continue; if (isset($f2['ftype']) && ($f2['ftype'] == 'ObjectRelBack')) continue; if (!isset($f[name])) { - echo ' unknown name '.$f[Desc].' ('.$i2.') '; + echo ' unknown name '.$f[Desc].' ('.$i2.') '; continue; } - echo ' Column '.$f[name].' ('.$i2.') '; + echo ' Column '.$f[name].' ('.$i2.') '; if (!is_object($this->obj->createcolumn($f[name],$i2,$f2))) { echo 'not created: <span class="warn">'. $this->obj->lasterror .'</span>'; // nothing created (try an alter table to fix sizes) @@ -274,4 +274,4 @@ <!-- SVN Info $Id$ $Author$ ---> \ No newline at end of file +--> Modified: trunk/php/admin_show.php =================================================================== --- trunk/php/admin_show.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin_show.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2013 by Gero Kohnert + * Copyright 2001 - 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 @@ -634,9 +634,9 @@ $tutos['pagescript'] .= "$('#jquery').html(jQuery().jquery);\n"; if ($this->getLayoutName() == 'mobile_layout') - $tutos['pagescript'] .= "$('#jqmversion').html(', JQuery Mobile:'+$.mobile.version);\n"; + $tutos['pagescript'] .= "$('#jqmversion').html(', JQuery Mobile:'+$.mobile.version);\n"; else - $tutos['pagescript'] .= "$('#jqueryui').html(', JQuery UI:'+$.ui.version);\n"; + $tutos['pagescript'] .= "$('#jqueryui').html(', JQuery UI:'+$.ui.version);\n"; if (function_exists('apache_get_version')) { $r .= $this->ContentRowStart(); Modified: trunk/php/admin_sync.php =================================================================== --- trunk/php/admin_sync.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/admin_sync.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2012 by Gero Kohnert + * Copyright 2001 - 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 @@ -10,6 +10,8 @@ * @module admin_sync * @package BASE */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; @@ -29,7 +31,7 @@ global $current_user; $r = ''; -# echo $r->numfields()." :".$r->numrows() ."<br />\n"; + # echo $r->numfields()." :".$r->numrows() ."<br />\n"; $fc = $res->numfields(); $b = 0; $upd = "UPDATE ". $dbconn2->prefix . $t[name] ; @@ -48,7 +50,7 @@ $fn = strtoupper($res->fieldname($b)); $ft = strtoupper($res->fieldtype($b)); $fv = $res->get($a,$fn); -# echo $b .": |". $fn ."|". $fv ."|". $ft ."|<br />"; + # echo $b .": |". $fn ."|". $fv ."|". $ft ."|<br />"; // OLD VERSIONS if ( ($t[name] == "products") && ( ($fn == "MANAGER") || ($fn == "SELLER") || ($fn == "MANAGER2") ) ) { $b++; @@ -129,7 +131,7 @@ if ( $pre == "(" ) { $r .= "<span class=\"warn\"> no values ???</span><br />\n"; $q[2] = $r; # infos - return $q; + return $q; } $flds .= ")"; $vals .= ")"; @@ -138,7 +140,7 @@ $q[1] = $upd; $q[2] = $r; # infos - return $q; + return $q; } /** @@ -295,7 +297,7 @@ $q2 = $this->result2insert($dbconn1,$dbconn2,$table[$i],$res,$a); $r .= $q2[2]; $dbconn2->Exec($q2[0]); - # $r .= " ". $fc ." ". $q2[0] ."<br />\n"; + # $r .= "  ". $fc ." ". $q2[0] ."<br />\n"; flush(); $a++; } @@ -397,14 +399,14 @@ $r .= " <th colspan=\"3\">". $lang['AdminDBSync'] ."</th>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= " <th> </th>\n"; + $r .= " <th> </th>\n"; $r .= " <th>". $lang['AdminDBSource'] ."</th>\n"; $r .= " <th>". $lang['AdminDBTarget'] ."</th>\n"; $r .= "</tr>\n"; $r .= "<tr>\n"; - $r .= " <td> </td>\n"; + $r .= " <td> </td>\n"; $r .= " <td>". $db1->getLink() ."</td>\n"; $r .= " <td>". $db2->getLink() ."</td>\n"; $r .= "</tr>\n"; @@ -472,7 +474,7 @@ // Does this make sense ? if ( ($this->what != 1 ) && ($db1->lastsync->notime) ) { $r .= "<tr>\n"; - $r .= $this->showfield(" "); + $r .= $this->showfield(" "); $r .= " <td colspan=\"2\"><span class=\"warn\">You must first sync before update</span></td>\n"; $r .= "</tr>\n"; $stop = 1; @@ -482,7 +484,7 @@ // because it the source was reinstalled or something like this if ( ($this->what != 1 ) && ($seq1 < $db1->lastid) ) { $r .= "<tr>\n"; - $r .= $this->showfield(" "); + $r .= $this->showfield(" "); $r .= " <td colspan=\"2\"><span class=\"warn\">Source out of sync (". $seq1 ." < ". $db1->lastid .")</span></td>\n"; $r .= "</tr>\n"; $stop = 1; @@ -491,7 +493,7 @@ // because it the target was reinstalled or something like this if ( ($this->what != 1 ) && ($seq2 < $db1->lastid) ) { $r .= "<tr>\n"; - $r .= $this->showfield(" "); + $r .= $this->showfield(" "); $r .= " <td colspan=\"2\"><span class=\"warn\">Target out of sync (". $seq2 ." < ". $db1->lastid .")</span></td>\n"; $r .= "</tr>\n"; $stop = 1; @@ -570,8 +572,8 @@ $r .= "<br />\n". $current_user->dbconn->db->getLink(); $this->addHidden("to",$this->dbconn->db->id); } else { -# show local available DBs - $r .= " <select size=\"". $tutos['maxshow']."\" name=\"to\">\n"; + # show local available DBs + $r .= " <select size=\"". $tutos['maxshow']."\" name=\"to\">\n"; @reset($dblist); while ( list ($i,$f) = @each ($dblist) ) { if ( $i < 1000 ) { Modified: trunk/php/adodb-time.inc.php =================================================================== --- trunk/php/adodb-time.inc.php 2013-12-27 10:36:12 UTC (rev 1207) +++ trunk/php/adodb-time.inc.php 2014-01-02 16:03:06 UTC (rev 1208) @@ -1,1287 +1,1285 @@ -<?php -/** -ADOdb Date Library, part of the ADOdb abstraction library -Download: http://php.weblogs.com/adodb_date_time_library - -PHP native date functions use integer timestamps for computations. -Because of this, dates are restricted to the years 1901-2038 on Unix -and 1970-2038 on Windows due to integer overflow for dates beyond -those years. This library overcomes these limitations by replacing the -native function's signed integers (normally 32-bits) with PHP floating -point numbers (normally 64-bits). - -Dates from 100 A.D. to 3000 A.D. and later -have been tested. The minimum is 100 A.D. as <100 will invoke the -2 => 4 digit year conversion. The maximum is billions of years in the -future, but this is a theoretical limit as the computation of that year -would take too long with the current implementation of adodb_mktime(). - -This library replaces native functions as follows: - -<pre> - getdate() with adodb_getdate() - date() with adodb_date() - gmdate() with adodb_gmdate() - mktime() with adodb_mktime() - gmmktime() with adodb_gmmktime() - strftime() with adodb_strftime() - strftime() with adodb_gmstrftime() -</pre> - -The parameters are identical, except that adodb_date() accepts a subset -of date()'s field formats. Mktime() will convert from local time to GMT, -and date() will convert from GMT to local time, but daylight savings is -not handled currently. - -This library is independant of the rest of ADOdb, and can be used -as standalone code. - -PERFORMANCE - -For high speed, this library uses the native date functions where -possible, and only switches to PHP code when the dates fall outside -the 32-bit signed integer range. - -GREGORIAN CORRECTION - -Pope Gregory shortened October of A.D. 1582 by ten days. Thursday, -October 4, 1582 (Julian) was followed immediately by Friday, October 15, -1582 (Gregorian). - -Since 0.06, we handle this correctly, so: - -adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582) - == 24 * 3600 (1 day) - -============================================================================= - -COPYRIGHT - -(c) 2003-2005 John Lim and released under BSD-style license except for code by -jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year -and originally found at http://www.php.net/manual/en/function.mktime.php - -============================================================================= - -BUG REPORTS - -These should be posted to the ADOdb forums at - - http://phplens.com/lens/lensforum/topics.php?id=4 - -============================================================================= - -FUNCTION DESCRIPTIONS - - -** FUNCTION adodb_getdate($date=false) - -Returns an array containing date information, as getdate(), but supports -dates greater than 1901 to 2038. The local date/time format is derived from a -heuristic the first time adodb_getdate is called. - - -** FUNCTION adodb_date($fmt, $timestamp = false) - -Convert a timestamp to a formatted local date. If $timestamp is not defined, the -current timestamp is used. Unlike the function date(), it supports dates -outside the 1901 to 2038 range. - -The format fields that adodb_date supports: - -<pre> - a - "am" or "pm" - A - "AM" or "PM" - d - day of the month, 2 digits with leading zeros; i.e. "01" to "31" - D - day of the week, textual, 3 letters; e.g. "Fri" - F - month, textual, long; e.g. "January" - g - hour, 12-hour format without leading zeros; i.e. "1" to "12" - G - hour, 24-hour format without leading zeros; i.e. "0" to "23" - h - hour, 12-hour format; i.e. "01" to "12" - H - hour, 24-hour format; i.e. "00" to "23" - i - minutes; i.e. "00" to "59" - j - day of the month without leading zeros; i.e. "1" to "31" - l (lowercase 'L') - day of the week, textual, long; e.g. "Friday" - L - boolean for whether it is a leap year; i.e. "0" or "1" - m - month; i.e. "01" to "12" - M - month, textual, 3 letters; e.g. "Jan" - n - month without leading zeros; i.e. "1" to "12" - O - Difference to Greenwich time in hours; e.g. "+0200" - Q - Quarter, as in 1, 2, 3, 4 - r - RFC 822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200" - s - seconds; i.e. "00" to "59" - S - English ordinal suffix for the day of the month, 2 characters; - i.e. "st", "nd", "rd" or "th" - t - number of days in the given month; i.e. "28" to "31" - T - Timezone setting of this machine; e.g. "EST" or "MDT" - U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT) - w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday) - Y - year, 4 digits; e.g. "1999" - y - year, 2 digits; e.g. "99" - z - day of the year; i.e. "0" to "365" - Z - timezone offset in seconds (i.e. "-43200" to "43200"). - The offset for timezones west of UTC is always negative, - and for those east of UTC is always positive. -</pre> - -Unsupported: -<pre> - B - Swatch Internet time - I (capital i) - "1" if Daylight Savings Time, "0" otherwise. - W - ISO-8601 week number of year, weeks starting on Monday - -</pre> - - -** FUNCTION adodb_date2($fmt, $isoDateString = false) -Same as adodb_date, but 2nd parameter accepts iso date, eg. - - adodb_date2('d-M-Y H:i','2003-12-25 13:01:34'); - - -** FUNCTION adodb_gmdate($fmt, $timestamp = false) - -Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the -current timestamp is used. Unlike the function date(), it supports dates -outside the 1901 to 2038 range. - - -** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year]) - -Converts a local date to a unix timestamp. Unlike the function mktime(), it supports -dates outside the 1901 to 2038 range. All parameters are optional. - - -** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year]) - -Converts a gmt date to a unix timestamp. Unlike the function gmmktime(), it supports -dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters -are currently compulsory. - -** FUNCTION adodb_gmstrftime($fmt, $timestamp = false) -Convert a timestamp to a formatted GMT date. - -** FUNCTION adodb_strftime($fmt, $timestamp = false) - -Convert a timestamp to a formatted local date. Internally converts $fmt into -adodb_date format, then echo result. - -For best results, you can define the local date format yourself. Define a global -variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using -adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax. - - eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s'); - - Supported format codes: - -<pre> - %a - abbreviated weekday name according to the current locale - %A - full weekday name according to the current locale - %b - abbreviated month name according to the current locale - %B - full month name according to the current locale - %c - preferred date and time representation for the current locale - %d - day of the month as a decimal number (range 01 to 31) - %D - same as %m/%d/%y - %e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31') - %h - same as %b - %H - hour as a decimal number using a 24-hour clock (range 00 to 23) - %I - hour as a decimal number using a 12-hour clock (range 01 to 12) - %m - month as a decimal number (range 01 to 12) - %M - minute as a decimal number - %n - newline character - %p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale - %r - time in a.m. and p.m. notation - %R - time in 24 hour notation - %S - second as a decimal number - %t - tab character - %T - current time, equal to %H:%M:%S - %x - preferred date representation for the current locale without the time - %X - preferred time representation for the current locale without the date - %y - year as a decimal number without a century (range 00 to 99) - %Y - year as a decimal number including the century - %Z - time zone or name or abbreviation - %% - a literal `%' character -</pre> - - Unsupported codes: -<pre> - %C - century number (the year divided by 100 and truncated to an integer, range 00 to 99) - %g - like %G, but without the century. - %G - The 4-digit year corresponding to the ISO week number (see %V). - This has the same format and value as %Y, except that if the ISO week number belongs - to the previous or next year, that year is used instead. - %j - day of the year as a decimal number (range 001 to 366) - %u - weekday as a decimal number [1,7], with 1 representing Monday - %U - week number of the current year as a decimal number, starting - with the first Sunday as the first day of the first week - %V - The ISO 8601:1988 week number of the current year as a decimal number, - range 01 to 53, where week 1 is the first week that has at least 4 days in the - current year, and with Monday as the first day of the week. (Use %G or %g for - the year component that corresponds to the week number for the specified timestamp.) - %w - day of the week as a decimal, Sunday being 0 - %W - week number of the current year as a decimal number, starting with the - first Monday as the first day of the first week -</pre> - -============================================================================= - -NOTES - -Useful url for generating test timestamps: - http://www.4webhelp.net/us/timestamp.php - -Possible future optimizations include - -a. Using an algorithm similar to Plauger's in "The Standard C Library" -(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not -work outside 32-bit signed range, so i decided not to implement it. - -b. Implement daylight savings, which looks awfully complicated, see - http://webexhibits.org/daylightsaving/ - - -CHANGELOG - -- 18 July 2005 0.21 -- In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. C... [truncated message content] |
From: <gok...@us...> - 2013-12-27 10:36:14
|
Revision: 1207 http://sourceforge.net/p/tutos/code/1207 Author: gokohnert Date: 2013-12-27 10:36:12 +0000 (Fri, 27 Dec 2013) Log Message: ----------- tag rlease 1.10.20131227 Added Paths: ----------- tags/RELEASE-1-10-20131227/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-27 10:34:38
|
Revision: 1206 http://sourceforge.net/p/tutos/code/1206 Author: gokohnert Date: 2013-12-27 10:34:37 +0000 (Fri, 27 Dec 2013) Log Message: ----------- start branch 1.10 Added Paths: ----------- branches/1.10/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-27 10:26:53
|
Revision: 1205 http://sourceforge.net/p/tutos/code/1205 Author: gokohnert Date: 2013-12-27 10:26:50 +0000 (Fri, 27 Dec 2013) Log Message: ----------- release 1.10.20131227 Modified Paths: -------------- trunk/ChangeLog trunk/Makefile trunk/php/config_default.pinc Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2013-12-27 09:14:04 UTC (rev 1204) +++ trunk/ChangeLog 2013-12-27 10:26:50 UTC (rev 1205) @@ -1,11 +1,18 @@ #$Id$ + * allow to use a fiexed email for sending out emails (i.e a noreply email). Set in the config email tab. + * updated bundeled jquery and jqplot + * counter stats uses jqplot now + * new user search (user_select.php) + * updated burndown graph + * massupdate support for custom fields + * added shortcut to overview and new pages in detailpages (mouse over event) * handle multiple invoices for an expense * enable testruns on tasks * allow company/dpeartment as author of documents * allow documents and urls attached to appointments and show those links * fix autoimport of mails * installation will now default session/log/repository to a tutos_private subfolder - * appointment search shows more info + * appointment search shows more info / sort participants * improved debugging possibilities (include revison numbers of all files) in admin_show dialog * updated jquery libraries * updated maps api in google_earth handler Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2013-12-27 09:14:04 UTC (rev 1204) +++ trunk/Makefile 2013-12-27 10:26:50 UTC (rev 1205) @@ -16,7 +16,7 @@ # # Primary Version -VERSION = 1.9 +VERSION = 1.10 # # The full Version is VERSION.DATE # Modified: trunk/php/config_default.pinc =================================================================== --- trunk/php/config_default.pinc 2013-12-27 09:14:04 UTC (rev 1204) +++ trunk/php/config_default.pinc 2013-12-27 10:26:50 UTC (rev 1205) @@ -732,7 +732,7 @@ // // The TUTOS Version number // -$tutos[version] = '1.9.20131227'; +$tutos[version] = '1.10.20131227'; // ### Local Variables: *** ### mode:iso-accents *** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-27 09:14:08
|
Revision: 1204 http://sourceforge.net/p/tutos/code/1204 Author: gokohnert Date: 2013-12-27 09:14:04 +0000 (Fri, 27 Dec 2013) Log Message: ----------- fixes related to automated tests Modified Paths: -------------- trunk/php/config_default.pinc trunk/php/counter/counter_show.php trunk/php/drawboard/drawboard.pinc trunk/php/fax/fax_ins.php trunk/php/graphs.pinc trunk/php/installation/installation_new.php trunk/php/installation/mconfig.pinc trunk/php/invoice/invoice_overview.php trunk/php/layout/new2_layout.pinc trunk/php/location_del.php trunk/php/module_template/AAA.pinc trunk/php/report-engine/rep_index/rep_index.pinc trunk/php/task_gantt.php Modified: trunk/php/config_default.pinc =================================================================== --- trunk/php/config_default.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/config_default.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -732,7 +732,7 @@ // // The TUTOS Version number // -$tutos[version] = '1.9.20131214'; +$tutos[version] = '1.9.20131227'; // ### Local Variables: *** ### mode:iso-accents *** Modified: trunk/php/counter/counter_show.php =================================================================== --- trunk/php/counter/counter_show.php 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/counter/counter_show.php 2013-12-27 09:14:04 UTC (rev 1204) @@ -202,7 +202,7 @@ $x = $res->getDateTime($a,'creation'); $a++; $cntx = floor(($x->ts - $from->ts) / $step); - if ($sbar['data'][$cntx]['cnt'] != '') + if (isset($sbar['data'][$cntx]['cnt']) && ($sbar['data'][$cntx]['cnt'] != '')) $sbar['data'][$cntx]['cnt']++; else $sbar['data'][$cntx]['cnt'] = 1; Modified: trunk/php/drawboard/drawboard.pinc =================================================================== --- trunk/php/drawboard/drawboard.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/drawboard/drawboard.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -112,7 +112,12 @@ if ($this->info == -1) { return; } - $fp = @fsockopen($this->host,$this->info,$errno,$errstr,2); + try { + $fp = fsockopen($this->host,$this->info,$errno,$errstr,2); + } + catch (Exception $e) { + return; + } if (!$fp) { return; } Modified: trunk/php/fax/fax_ins.php =================================================================== --- trunk/php/fax/fax_ins.php 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/fax/fax_ins.php 2013-12-27 09:14:04 UTC (rev 1204) @@ -46,7 +46,11 @@ || ($tutos[demo] == 1) ) { $msg .= $lang['Err0032'] ."<br />\n"; } -$gotourl= addUrlParameter($gotourl,"fax=". Base64_Encode($_POST['fax']),true); +if ( !isset($_POST['fax']) || empty($_POST['fax']) ) { + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['EmailFax'])); +} else { + $gotourl= addUrlParameter($gotourl,"fax=". Base64_Encode($_POST['fax']),true); +} // Call faxspool if ( $msg == "" ) { Modified: trunk/php/graphs.pinc =================================================================== --- trunk/php/graphs.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/graphs.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -306,7 +306,11 @@ if ($e['cnt'] == '') $e['cnt'] = 0; $data .= $pre.$e['cnt']; - $tick .= $pre.'"'.$e['title'].'"'; + if (isset($e['title'])) { + $tick .= $pre.'"'.$e['title'].'"'; + } else { + $tick .= $pre.'"?"'; + } if (isset($e['color'])) { $colors .= $pre.'"'.$e['color'].'"'; } Modified: trunk/php/installation/installation_new.php =================================================================== --- trunk/php/installation/installation_new.php 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/installation/installation_new.php 2013-12-27 09:14:04 UTC (rev 1204) @@ -182,7 +182,7 @@ $this->obj->read_relations(); if ( isset($_GET['pid']) ) { $this->obj->product = getObject($this->dbconn,$_GET['pid']); - if (!is_object($this->obj->product)) { + if (!is_object($this->obj->product) || ($this->obj->product->gettypeid() != useprojects) ) { $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Product'])); $this->stop = true; return; Modified: trunk/php/installation/mconfig.pinc =================================================================== --- trunk/php/installation/mconfig.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/installation/mconfig.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -8,10 +8,10 @@ * $Author$ */ $tutos['files'][__FILE__] = '$Rev$'; -# -# Every module must have an individual ID ( < 0 > -100 ). -# this is module 6 -# +// +// Every module must have an individual ID ( < 0 > -100 ). +// this is module 6 +// define('useinstmanagement',-6); $tutos[modules]['installation'] = array( name => "installation", @@ -20,16 +20,16 @@ 'overview' => "installation/installation_overview.php", 'perm' => useinstmanagement ); -# -# globally enable this module -# +// +// globally enable this module +// if(!isset($tutos[useinstmanagement])) { $tutos[useinstmanagement] = 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]['installation'][] = 'address'; $tutos[modulesinc]['installation'][] = 'company'; $tutos[modulesinc]['installation'][] = 'department'; @@ -37,16 +37,16 @@ $tutos[modulesinc]['installation'][] = 'scheme'; $tutos[modulesinc]['installation'][] = 'menu'; -# reverse include +// reverse include $tutos[modulesinc]['file'][] = 'installation'; $tutos[modulesinc]['note'][] = 'installation'; $tutos[modulesinc]['bugtracking'][] = 'installation'; $tutos[modulesinc]['stc'][] = 'installation'; $tutos[modulesinc]['timetrack'][] = 'installation'; -# -# skip -# +// +// skip +// $permskip[useinstmanagement][PERM_MYTUTOS] = 1; -?> +?> \ No newline at end of file Modified: trunk/php/invoice/invoice_overview.php =================================================================== --- trunk/php/invoice/invoice_overview.php 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/invoice/invoice_overview.php 2013-12-27 09:14:04 UTC (rev 1204) @@ -315,7 +315,7 @@ if ($this->ext != 0) { overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice')); - overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice')); + overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference',''); } // Start Date for search Modified: trunk/php/layout/new2_layout.pinc =================================================================== --- trunk/php/layout/new2_layout.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/layout/new2_layout.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -248,10 +248,12 @@ $this->addMenu($x); } + $adr_first = false; if ( $this->user->feature_ok(useaddressbook,PERM_SEL) ) { $x = tutos_address::getSelectLink($this->user); $x[category][] = 'main2'; $x[category][] = 'first'; + $adr_first = true; $this->addMenu($x); } if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) { @@ -261,6 +263,10 @@ info => $lang['AdrCreateInfo'], category => array('main2','new','address','default') ); + if (!$adr_first) { + $x[category][] = 'first'; + $adr_first = true; + } $this->addMenu($x); } if ( $this->user->feature_ok(usecompany,PERM_NEW) ) { @@ -270,6 +276,10 @@ info => $lang['CompanyCreateInfo'], category => array('main2','new','company','default') ); + if (!$adr_first) { + $x[category][] = 'first'; + $adr_first = true; + } $this->addMenu($x); } @@ -302,7 +312,7 @@ } } - + $prod_first = false; if ( $this->user->feature_ok(useprojects,PERM_SEL) ) { require_once 'product.pinc'; $x = product::getSelectLink($this->user,$lang['ProductMenu']); @@ -316,6 +326,7 @@ $xs[text] = ''; $xs[code] = '<form action="%s" method="get">%s<input maxlength="16" name="name" /></form>'; $this->addMenu($xs); + $prod_first = true; } if ( $this->user->feature_ok(useprojects,PERM_NEW) ) { require_once 'product.pinc'; @@ -325,6 +336,9 @@ info => $lang['ProdCreateInfo'], category => array('main4','new','product','default') ); + if (!$prod_first) { + $x[category][] = 'first'; + } $this->addMenu($x); } Modified: trunk/php/location_del.php =================================================================== --- trunk/php/location_del.php 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/location_del.php 2013-12-27 09:14:04 UTC (rev 1204) @@ -29,13 +29,14 @@ $obj = $obj->read($_REQUEST['id'],$obj); } -if ( !isset($_REQUEST['id']) ) { - $obj->adr_loc = $_REQUEST['ref']; +if ( is_object($obj)) { $obj->read_ref(); $gotourl = $obj->ref->getUrl(); +} else { + $msg = addLine($msg,$lang['Err0048']); } -if ( $msg == "" ) { +if ( $msg == '' ) { $dbconn->Begin("WORK"); $msg = addLine($msg,$obj->delete()); $dbconn->Commit("WORK"); Modified: trunk/php/module_template/AAA.pinc =================================================================== --- trunk/php/module_template/AAA.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/module_template/AAA.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -371,6 +371,7 @@ $x = array( url => 'module_template/AAA_overview.php?refid='. $obj->id, confirm => false, text => ($text == '' ? $lang['AAAOverview']:$text), + info => $lang['AAAOverview'], category => array(AAA::getType(),'overview','module',USEAAA) ); return $x; Modified: trunk/php/report-engine/rep_index/rep_index.pinc =================================================================== --- trunk/php/report-engine/rep_index/rep_index.pinc 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/report-engine/rep_index/rep_index.pinc 2013-12-27 09:14:04 UTC (rev 1204) @@ -57,10 +57,12 @@ $pdf->Cell(90,$h,$i,'B',0,'R'); $pdf->SetFont('Arial','B',$fs+1); - foreach($j as $i2 => $line) { - $pdf->SetY($y+$i2*5); - $pdf->SetX(120); - $pdf->Cell(0,$fs,myiconv($line),'',0,'L'); + if (isset($j) && is_array($j)) { + foreach($j as $i2 => $line) { + $pdf->SetY($y+$i2*5); + $pdf->SetX(120); + $pdf->Cell(0,$fs,myiconv($line),'',0,'L'); + } } if (isset($lang['folder_info'][$i])) { $pdf->SetFont('Arial','',$fs-4); Modified: trunk/php/task_gantt.php =================================================================== --- trunk/php/task_gantt.php 2013-12-18 07:03:39 UTC (rev 1203) +++ trunk/php/task_gantt.php 2013-12-27 09:14:04 UTC (rev 1204) @@ -56,7 +56,7 @@ $r .= "<br /><br /><br /><tr><td>"; $url1 = 'task_overview.php'; $url2 = 'task_gantt.php'; - if (count($this->parents)) { + if (isset($this->parents) && count($this->parents)) { foreach ($this->parents as $p) { $url1 = addUrlParameter($url1,'id[]='.$p->id); $url2 = addUrlParameter($url2,'id[]='.$p->id); @@ -73,7 +73,7 @@ } $r .= '</ul>'; - if (count($this->parents)) { + if (isset($this->parents) && count($this->parents)) { foreach ($this->parents as $p) { $r .= "<br />\n"; $r .= $lang[$p->getType()]." ".menulink($p->getURL(), myentities($p->getFullName())); @@ -90,8 +90,9 @@ Function prepare() { global $msg,$lang; - $this->name = $lang['TaskGantt']; - $this->level = -1; // everything + $this->name = $lang['TaskGantt']; + $this->level = -1; // everything + $this->parents = array(); if ( ! isset($_GET['id']) ) { $msg = addLine($msg,$lang['Err0048']); @@ -101,6 +102,7 @@ } if (!load_jpgraph( array("jpgraph_gantt.php") )){ + $this->stop = true; return; } @@ -114,7 +116,6 @@ $id = $_GET['id']; } $count = 0; - $this->parents = array(); foreach($id as $i) { $p = GetObject($this->dbconn,$i); if (!is_object($p)) continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-18 07:03:44
|
Revision: 1203 http://sourceforge.net/p/tutos/code/1203 Author: gokohnert Date: 2013-12-18 07:03:39 +0000 (Wed, 18 Dec 2013) Log Message: ----------- fix Modified Paths: -------------- trunk/php/product_new.php trunk/php/user_ins.php Modified: trunk/php/product_new.php =================================================================== --- trunk/php/product_new.php 2013-12-14 19:54:29 UTC (rev 1202) +++ trunk/php/product_new.php 2013-12-18 07:03:39 UTC (rev 1203) @@ -265,14 +265,12 @@ $this->name = $lang['Product']; $this->obj = new product($this->dbconn); - $this->obj->r1 = null; - $this->obj->r2 = null; + $this->template = false; + $this->r1desc = ""; $this->r2desc = ""; - $this->template = false; - if ( isset($_GET['id']) ) { $this->obj = $this->obj->read($_GET['id'],$this->obj); if ( !is_object($this->obj) ) { @@ -283,6 +281,9 @@ $this->name = sprintf($lang['ProdModifyT'], $this->obj->getFullName()); $this->obj->readroles(); $this->obj->read_picture(); + $this->obj->r1 = null; + $this->obj->r2 = null; + } else if ( isset($_GET['tplid']) ) { $this->obj = $this->obj->read($_GET['tplid'],$this->obj); $this->template = true; @@ -301,9 +302,12 @@ $msg = addLine($msg,$lang['Err0055']); } $this->obj->state = -1; + $this->obj->r1 = null; + $this->obj->r2 = null; } else { $this->name = $lang['ProdCreateT']; $this->obj->r1 = $this->user; + $this->obj->r2 = null; } $this->obj->set_string_from_arg('name','name',$lang['ProdName']); $this->obj->set_string_from_arg('version','version',$lang['ProdVersion']); Modified: trunk/php/user_ins.php =================================================================== --- trunk/php/user_ins.php 2013-12-14 19:54:29 UTC (rev 1202) +++ trunk/php/user_ins.php 2013-12-18 07:03:39 UTC (rev 1203) @@ -238,6 +238,7 @@ $u->id = $adr->id; if ($saveloc) { $loc->adr_id = $adr->id; + $loc->ref = $adr; $msg = addLine($msg,$loc->save()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-14 19:54:32
|
Revision: 1202 http://sourceforge.net/p/tutos/code/1202 Author: gokohnert Date: 2013-12-14 19:54:29 +0000 (Sat, 14 Dec 2013) Log Message: ----------- fix for automated tests Modified Paths: -------------- trunk/php/admin/table_custom_show.php trunk/php/config_default.pinc trunk/php/delobject.php trunk/php/invoice/invoice.pinc trunk/php/invoice/invoice_overview.php trunk/php/location_del.php trunk/php/module_template/AAA_ins.php trunk/php/resource/resource_new.php trunk/php/task.pinc trunk/php/task_gantt.php trunk/php/user_select.php Modified: trunk/php/admin/table_custom_show.php =================================================================== --- trunk/php/admin/table_custom_show.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/admin/table_custom_show.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -81,7 +81,7 @@ } } $r .= "</td>\n"; - $r .= ' <td>'.(isset($x['otype']) ? $x['otype']:'')."</td>\n"; + $r .= ' <td>'.(isset($x['otype']) ? print_r($x['otype'],true):'')."</td>\n"; $r .= ' <td>'.(isset($x[size]) ? $x[size]:'-')."</td>\n"; $r .= ' <td>'.(isset($x['searchable']) ? ($x['searchable']?$lang['yes']:$lang['no']):'-')."</td>\n"; $r .= ' <td>'.(isset($x['overview']) ? ($x['overview']?$lang['yes']:$lang['no']):'-')."</td>\n"; Modified: trunk/php/config_default.pinc =================================================================== --- trunk/php/config_default.pinc 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/config_default.pinc 2013-12-14 19:54:29 UTC (rev 1202) @@ -732,7 +732,7 @@ // // The TUTOS Version number // -$tutos[version] = '1.9.20131213'; +$tutos[version] = '1.9.20131214'; // ### Local Variables: *** ### mode:iso-accents *** Modified: trunk/php/delobject.php =================================================================== --- trunk/php/delobject.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/delobject.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -19,7 +19,8 @@ check_user(); /* Check Input */ -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'mytutos.php'; if ( !isset($_REQUEST['id']) ) { @@ -51,7 +52,7 @@ $msg = addLine($msg,$obj->delete()); $dbconn->Commit("WORK"); } -leave_insert($dbconn,$gotourl,$msg); +leave_insert($dbconn,$gotourl,$msg,$info); // SVN Info $Id$ // $Author$ Modified: trunk/php/invoice/invoice.pinc =================================================================== --- trunk/php/invoice/invoice.pinc 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/invoice/invoice.pinc 2013-12-14 19:54:29 UTC (rev 1202) @@ -230,7 +230,7 @@ $this->sum_single = $obj->money; $this->currency = $obj->currency; $this->description = $lang[$obj->getType()] ."\n". $obj->getFullName(); - $p->itype = $lang['pcs']; + $this->itype = $lang['pcs']; } else if ( $obj->gettype() == 'timetrack' ) { $this->items = $obj->volume; $this->itype = $lang['hours']; Modified: trunk/php/invoice/invoice_overview.php =================================================================== --- trunk/php/invoice/invoice_overview.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/invoice/invoice_overview.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -315,7 +315,7 @@ if ($this->ext != 0) { overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice')); - overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference',get_parent_classes('invoice')); + overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice')); } // Start Date for search Modified: trunk/php/location_del.php =================================================================== --- trunk/php/location_del.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/location_del.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -19,17 +19,27 @@ $msg = ''; $info = ''; -$l = new location($dbconn); -$l = $l->read($_GET['id'],$l); -$l->adr_loc = $_GET['ref']; +$obj = new location($dbconn); -$l->read_ref(); -$gotourl = $l->ref->getUrl(); +$gotourl = 'mytutos.php'; -$dbconn->Begin("WORK"); -$msg = addLine($msg,$l->delete()); -$dbconn->Commit("WORK"); +if ( !isset($_REQUEST['id']) ) { + $msg = addLine($msg,$lang['Err0048']); +} else { + $obj = $obj->read($_REQUEST['id'],$obj); +} +if ( !isset($_REQUEST['id']) ) { + $obj->adr_loc = $_REQUEST['ref']; + $obj->read_ref(); + $gotourl = $obj->ref->getUrl(); +} + +if ( $msg == "" ) { + $dbconn->Begin("WORK"); + $msg = addLine($msg,$obj->delete()); + $dbconn->Commit("WORK"); +} leave_insert($dbconn,$gotourl,$msg,$info); /** * SVN Info $Id$ Modified: trunk/php/module_template/AAA_ins.php =================================================================== --- trunk/php/module_template/AAA_ins.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/module_template/AAA_ins.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -1,4 +1,4 @@ -<? +<?php /** * Copyright 1999 - 2013 by Gero Kohnert * Modified: trunk/php/resource/resource_new.php =================================================================== --- trunk/php/resource/resource_new.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/resource/resource_new.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -75,6 +75,7 @@ $r .= $lang['FldsRequired'] ."\n"; return $r; } + /** * prepare */ @@ -84,13 +85,14 @@ $this->obj = new resource($this->dbconn); if ( isset($_GET['id']) ) { + $this->name = $lang['ResModify'] .": "; $this->obj = $this->obj->read($_GET['id'],$this->obj); if ( !is_object($this->obj) ) { $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Resource'])); $this->stop = true ; return; } - $this->name = $lang['ResModify'] .": ". myentities($this->obj->getFullName()); + $this->name .= myentities($this->obj->getFullName()); } else { $this->name = $lang['ResCreate']; if (!$this->user->feature_ok(useresource,PERM_NEW) ) { @@ -138,4 +140,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/task.pinc =================================================================== --- trunk/php/task.pinc 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/task.pinc 2013-12-14 19:54:29 UTC (rev 1202) @@ -158,6 +158,7 @@ Function gantt_draw(array $parents,$maxdepth = -1) { global $lang, $font, $tutos; + if (count($parents) == 0) return; // // If we use a non western laguage encoding force the use of truetype fonts // Modified: trunk/php/task_gantt.php =================================================================== --- trunk/php/task_gantt.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/task_gantt.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -56,9 +56,11 @@ $r .= "<br /><br /><br /><tr><td>"; $url1 = 'task_overview.php'; $url2 = 'task_gantt.php'; - foreach ($this->parents as $p) { - $url1 = addUrlParameter($url1,'id[]='.$p->id); - $url2 = addUrlParameter($url2,'id[]='.$p->id); + if (count($this->parents)) { + foreach ($this->parents as $p) { + $url1 = addUrlParameter($url1,'id[]='.$p->id); + $url2 = addUrlParameter($url2,'id[]='.$p->id); + } } $r .= menulink($url1, $lang['TaskOverview']); $r .= "<br />\n"; @@ -71,10 +73,12 @@ } $r .= '</ul>'; - foreach ($this->parents as $p) { - $r .= "<br />\n"; - $r .= $lang[$p->getType()]." ".menulink($p->getURL(), myentities($p->getFullName())); - $r .= "<br />\n"; + if (count($this->parents)) { + foreach ($this->parents as $p) { + $r .= "<br />\n"; + $r .= $lang[$p->getType()]." ".menulink($p->getURL(), myentities($p->getFullName())); + $r .= "<br />\n"; + } } $r .= "</td></tr>"; return $r; @@ -120,7 +124,7 @@ unset($p); } if ($count == 0 ) { - $msg .= $lang['Err0048']; + $msg = addLine($msg,$lang['Err0048']); $this->stop = true; return; } Modified: trunk/php/user_select.php =================================================================== --- trunk/php/user_select.php 2013-12-14 11:43:49 UTC (rev 1201) +++ trunk/php/user_select.php 2013-12-14 19:54:29 UTC (rev 1202) @@ -63,10 +63,10 @@ $r .= $this->ContentRowStart('ext'); $r .= $this->showfieldc($lang['UserDisabled'],0,'disabled'); - $x = '<input id="disabled_yes" type="radio" name="disabled" value="1" /><label for="disabled_yes">'.$lang['yes'].'</label>'; - $x .= '<input id="disabled_no" type="radio" name="disabled" value="0" /><label for="disabled_no">'.$lang['no'].'</label>'; - $x .= '<input id="disabled_any" type="radio" name="disabled" value="-1" /><label for="disabled_any">'.$lang['any'].'</label>'; - $r .= $this->showdata($x,2); + $rr = '<input id="disabled_yes" type="radio" name="disabled" value="1" /><label for="disabled_yes">'.$lang['yes'].'</label>'; + $rr .= '<input id="disabled_no" type="radio" name="disabled" value="0" /><label for="disabled_no">'.$lang['no'].'</label>'; + $rr .= '<input id="disabled_any" type="radio" name="disabled" value="-1" /><label for="disabled_any">'.$lang['any'].'</label>'; + $r .= $this->showdata($rr,2); $r .= $this->ContentRowEnd(); $r .= $this->ContentRowStart('ext'); @@ -148,7 +148,7 @@ if ( $this->user->feature_ok(useuser,PERM_NEW) ) { $x = array( url => 'user_new.php', text => $lang['NewEntry'], - info => $lang['UserCreateI'], + info => $lang['UserCreate'], category => array('user','new','obj',useuser) ); $this->addMenu($x); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-14 11:43:54
|
Revision: 1201 http://sourceforge.net/p/tutos/code/1201 Author: gokohnert Date: 2013-12-14 11:43:49 +0000 (Sat, 14 Dec 2013) Log Message: ----------- some standard fixes (flow of errormessages) Modified Paths: -------------- trunk/Makefile trunk/php/address_ins.php trunk/php/app_do_vote.php trunk/php/app_vote.php trunk/php/base.pinc trunk/php/calendar_day.php trunk/php/config_default.pinc trunk/php/custom.pinc trunk/php/database.pinc trunk/php/database_del.php trunk/php/database_ins.php trunk/php/database_new.php trunk/php/database_show.php trunk/php/history_select.php trunk/php/invoice/invoice_config.php trunk/php/invoice/invoice_new.php trunk/php/invoice/invoice_overview.php trunk/php/location_del.php trunk/php/module_template/AAA_config.php trunk/php/reminder/reminder_new.php trunk/php/reminder/reminder_overview.php trunk/php/scrum/scrum_config.php trunk/php/scrum/sprint_overview.php trunk/php/stc/stc_new.php trunk/php/stc/stc_overview.php trunk/php/stc/stc_show.php trunk/php/stuff/stuff_config.php trunk/php/task_copy_ins.php trunk/php/testmanager/testcase_ins.php trunk/php/testmanager/testcase_new.php trunk/php/testmanager/testcase_overview.php trunk/php/testmanager/testcase_show.php trunk/php/testmanager/testmanager.pinc trunk/php/testmanager/testmanager_config.php trunk/php/testmanager/testrun_new.php trunk/php/testmanager/testrun_overview.php trunk/php/testmanager/testsuite_ins.php trunk/php/testmanager/testsuite_overview.php trunk/php/timetrack/timetrack_config.php trunk/php/url/urlcat_new.php trunk/php/url/urlcat_show.php trunk/php/webelements.p3 trunk/test.sh Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/Makefile 2013-12-14 11:43:49 UTC (rev 1201) @@ -806,17 +806,15 @@ TESTPATH=$(shell dirname $(shell pwd))/tutos-test download-test: @echo ${TESTPATH} - @$(RM) -rf ${TESTPATH} + @$(RM) -rf ${TESTPATH}/* mkdir -p ${TESTPATH} - mkdir -p ${TESTPATH}/repo - @$(CHMOD) 777 ${TESTPATH}/repo - mkdir -p ${TESTPATH}/tmp - @$(CHMOD) 777 ${TESTPATH}/tmp mkdir -p ${TESTPATH}/php @$(foreach d,$(wildcard TUTOS-*.zip), \ unzip -n -d ${TESTPATH} $(d); \ ) + @${CHMOD} 777 ${TESTPATH}/tutos_private/repository + $(SED) \ -e 's;%HOST%;${HOST};g' \ -e 's;Alias /tutos;Alias /tutos-test;g' \ Modified: trunk/php/address_ins.php =================================================================== --- trunk/php/address_ins.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/address_ins.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -10,6 +10,8 @@ * @module address_ins * @package address */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; Modified: trunk/php/app_do_vote.php =================================================================== --- trunk/php/app_do_vote.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/app_do_vote.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2009 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -12,6 +12,8 @@ * @module app_do_vote * @package appointment */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'appointment.pinc'; @@ -26,17 +28,17 @@ $gotourl = "calendar.php"; if ( ! isset($_GET['id']) ) { - $msg .= "Missing Appointment ID<br />"; + $msg = addLine($msg,"Missing Appointment ID"); } else { $a = $a->read($_GET['id'],$a); $a->read_participants(); $gotourl= addUrlParameter($gotourl,"id=".$_GET['id']); } if ( ! isset($_GET['adr_id']) ) { - $msg .= "Missing User ID<br />"; + $msg = addLine($msg,"Missing User ID"); } if ( ! isset($_GET['vote']) ) { - $msg .= "Missing Vote<br />"; + $msg = addLine($msg,"Missing Vote"); } if ( $msg == "" ) { @@ -47,10 +49,9 @@ $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg)); /* Go back to calendar */ -Header("Status: 302 Moved Temporarily"); -Header("Location: ". getBaseUrl() . $gotourl); -$dbconn->Close(); -/* + +leave_insert($dbconn,$gotourl,$msg); +/** * SVN Info $Id$ * $Author$ */ Modified: trunk/php/app_vote.php =================================================================== --- trunk/php/app_vote.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/app_vote.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2010 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -17,6 +17,8 @@ * @modulegroup appointment * @module app_vote */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'appointment.pinc'; @@ -112,13 +114,13 @@ * prepare */ Function prepare() { - global $msg,$lang; + global $info,$msg,$lang; $this->name = $lang['AppointCommit']; $this->obj = new appointment($this->dbconn); if ( !isset($_GET['id']) || !isset($_GET['adr_id']) ) { - $msg .= "No appointment or no adr given !<br />"; + $msg = addLine($msg,"No appointment or no adr given !"); $this->stop = true; } else { $this->obj = $this->obj->read($_GET['id'],$this->obj); @@ -126,11 +128,11 @@ $this->adr_id = $_GET['adr_id']; } if ( ! $this->obj->see_ok() ) { - $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()])); $this->stop = true; } if ( 1 != $this->obj->trace ) { - $msg .= "You can not vote for this appointment<br />"; + $msg = addLine($msg,"You can not vote for this appointment"); $this->stop = true; } // menu @@ -150,5 +152,5 @@ ?> <!-- SVN Info $Id$ - $Author$ - --> \ No newline at end of file +$Author$ +--> \ No newline at end of file Modified: trunk/php/base.pinc =================================================================== --- trunk/php/base.pinc 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/base.pinc 2013-12-14 11:43:49 UTC (rev 1201) @@ -311,29 +311,29 @@ if ($this->dbconn->prep) { $this->dbconn->addPStatement('SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = $1 or rel_id = $2','BASEREL'); $rr = $this->dbconn->execPStatement('BASEREL',1,$this->id,$this->id); - } else { - $q = 'SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = '.$this->id.' or rel_id = '.$this->id; - $rr = $this->dbconn->Exec($q); + } else { + $q = 'SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = '.$this->id.' or rel_id = '.$this->id; + $rr = $this->dbconn->Exec($q); + } + $n = $rr->numrows(); + $a = 0; + while ($a < $n) { + $o = $rr->getInt($a,'obj_id'); + $b = $rr->getInt($a,'rel_id'); + if ($o == $this->id) { + $this->relations[$rr->getInt($a,'type_id')][$b] = 1; + } + if ($b == $this->id) { + $this->back_relations[$rr->getInt($a,'type_id')][$o] = 1; + } + $a++; + } + $rr->free(); + // cache it + // update cache + $this->cache_store('_r'.$this->id,$this->relations); + $this->cache_store('_br'.$this->id,$this->back_relations); } - $n = $rr->numrows(); - $a = 0; - while ($a < $n) { - $o = $rr->getInt($a,'obj_id'); - $b = $rr->getInt($a,'rel_id'); - if ($o == $this->id) { - $this->relations[$rr->getInt($a,'type_id')][$b] = 1; - } - if ($b == $this->id) { - $this->back_relations[$rr->getInt($a,'type_id')][$o] = 1; - } - $a++; - } - $rr->free(); - // cache it - // update cache - $this->cache_store('_r'.$this->id,$this->relations); - $this->cache_store('_br'.$this->id,$this->back_relations); - } $g_hash[$this->id] = &$this; $this->run_after_read_hook(); Modified: trunk/php/calendar_day.php =================================================================== --- trunk/php/calendar_day.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/calendar_day.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -262,11 +262,11 @@ * prepare */ Function prepare() { - global $lang,$msg; + global $lang,$msg,$info; $this->name = $lang['Calendar']; if ( ! $this->user->feature_ok(usecalendar,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); + $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'")); $this->stop = true; return; } Modified: trunk/php/config_default.pinc =================================================================== --- trunk/php/config_default.pinc 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/config_default.pinc 2013-12-14 11:43:49 UTC (rev 1201) @@ -732,7 +732,7 @@ // // The TUTOS Version number // -$tutos[version] = '1.9.20131123'; +$tutos[version] = '1.9.20131213'; // ### Local Variables: *** ### mode:iso-accents *** Modified: trunk/php/custom.pinc =================================================================== --- trunk/php/custom.pinc 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/custom.pinc 2013-12-14 11:43:49 UTC (rev 1201) @@ -533,6 +533,7 @@ $rid = $this->x['rel_id']; if (!isset($this->obj->back_relations[$rid]) || !is_array($this->obj->back_relations[$rid])) return ''; + #.print_r($this->obj->relations,true); $r = ''; $pre = ''; Modified: trunk/php/database.pinc =================================================================== --- trunk/php/database.pinc 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/database.pinc 2013-12-14 11:43:49 UTC (rev 1201) @@ -486,7 +486,7 @@ * make a connection to the database */ function getConnection() { - global $tutos; + global $tutos,$msg; if ( $this->type == DB_TYPE_POSTGRES ) { // Postgres @@ -563,8 +563,8 @@ $repo = getcwd()."/". $tutos['base'] ."/". $this->repository; } if (! file_exists($repo)) { - $msg = "<br />\nDocument Management:<br />missing repository directory \"".normalize_url($repo)."\"<br />\n"; - $msg .= "Please change repository path in your config file<br />or create the missing path<br />or disable docmanagement \$tutos[usedocmanagement] = 0; in your config file (php/file/mconfig.pinc)<br />\n"; + $msg = addLine($msg,'Document Management: missing repository directory "'.normalize_url($repo).'"'); + $msg = addLine($msg,'Please change repository path in your config file or create the missing path or disable docmanagement \$tutos[usedocmanagement] = 0; in your config file (php/file/mconfig.pinc)'); Fatal_Error($msg,$repo); } } Modified: trunk/php/database_del.php =================================================================== --- trunk/php/database_del.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/database_del.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,12 +1,14 @@ <?php -/* - * Copyright 2001 -2008 by Gero Kohnert +/** + * Copyright 2001 -2013 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 + * 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 * Free Software Foundation; version 2 of the License. * */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; @@ -15,33 +17,34 @@ loadmodules("database","del"); /* Check Input */ -$msg = ""; -$gotourl = "admin_show.php"; +$msg = ''; +$info = ''; +$gotourl = 'admin_show.php'; $obj = new database($dbconn); if ( !isset($_GET['id']) ) { - $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br />"; + $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$obj->getType()])); } else { $obj = $obj->read($_GET['id'],$obj); $gotourl = $obj->getUrl(); } if ( $obj->id < 1 ) { - $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br />"; + $msg = addLine($msg,sprintf($lang['Err0023'],$lang[$obj->getType()])); } if ( ! $obj->del_ok() ) { - $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br />"; + $msg = addLine($msg,sprintf($lang['Err0023'],$lang[$obj->getType()])); } if ( $msg == "" ) { $gotourl = "admin_show.php"; $dbconn->Begin("WORK"); - $msg .= $obj->delete(); + $msg = addLine($msg,$obj->delete()); $dbconn->Commit("WORK"); } -leave_insert($dbconn,$gotourl,$msg); -/* +leave_insert($dbconn,$gotourl,$msg,$info); +/** * SVN Info $Id$ * $Author$ */ -?> +?> \ No newline at end of file Modified: trunk/php/database_ins.php =================================================================== --- trunk/php/database_ins.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/database_ins.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -17,7 +17,8 @@ loadmodules('database','ins'); $gotourl = 'database_new.php'; -$msg = ''; +$msg = ''; +$info = ''; $obj = new database($dbconn); if ( isset($_POST['Xid']) ) { @@ -26,7 +27,7 @@ } if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) { - $msg .= sprintf($lang['Err0009'],$lang['AdminDBName']) ."<br />"; + $msg = addLine($msg,sprintf($lang['Err0009'],$lang['AdminDBName'])); } else { $name = trim($_POST['name']); $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($name),true); @@ -81,18 +82,18 @@ // // other modules // -$msg .= module_parseforms($current_user,$obj,$gotourl); +$msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl)); if ( $msg == "" ) { $dbconn->Begin("WORK"); - $msg = $obj->save(); + $msg = addLine($msg,$obj->save()); $dbconn->Commit("WORK"); $gotourl = $obj->getURL(); } -leave_insert($dbconn,$gotourl,$msg); -/* +leave_insert($dbconn,$gotourl,$msg,$info); +/** * SVN Info $Id$ * $Author$ */ Modified: trunk/php/database_new.php =================================================================== --- trunk/php/database_new.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/database_new.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -158,21 +158,21 @@ * prepare */ Function prepare() { - global $msg,$lang; + global $msg,$info,$lang; $this->obj = new database($this->dbconn); if ( isset($_GET['id']) && ($_GET['id'] > -1) ) { $this->name = $lang['DBModify']; $this->obj = $this->obj->read($_GET['id'],$this->obj); if ( !is_object($this->obj) ) { - $msg .= sprintf($lang['Err0040'],$lang['database']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['database'])); $this->stop = true; return; } } else { $this->name = $lang['DBCreate']; if ( !$this->user->isadmin()) { - $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()])); $this->stop = true; } } @@ -201,7 +201,7 @@ $this->obj->type = $_GET['type']; } if ( ! $this->obj->mod_ok() ) { - $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()])); $this->stop = true; } // menu @@ -237,4 +237,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/database_show.php =================================================================== --- trunk/php/database_show.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/database_show.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -35,103 +35,115 @@ Function info() { global $tutos,$lang; + $this->width = 4; + $r = ''; $r .= $this->DataTableStart(); - $r .= "<tr>\n"; - $r .= ' <th colspan="3">'. sprintf($lang['Showing'],$this->obj->getFullName()) ."</th>\n"; - $r .= $this->showGuiIcons('<th class="icons">','</th>',$this->obj,$this->obj,array('mod','del','perm'),false); - $r .= "</tr>\n"; + $r .= $this->headline_gui(); + $r .= $this->CreatorInfoLine($this->obj,$this->width); - $r .= $this->CreatorInfoLine($this->obj,4); - - $r .= "<tr>\n"; + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['AdminDBName']); $r .= $this->showdata($this->obj->name); $r .= $this->showfield($lang['AdminDBType']); $r .= $this->showdata($this->obj->tlist[$this->obj->type]); + $r .= $this->ContentRowEnd(); - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['AdminDBAlias']); $r .= $this->showdata($this->obj->alias); $r .= $this->showfield($lang['AdminDBPrefix']); $r .= $this->showdata($this->obj->prefix); + $r .= $this->ContentRowEnd(); + // Do not show sensitive infos if ( $this->user->isAdmin() ) { - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['AdminDBHost']); $r .= $this->showdata($this->obj->host); $r .= $this->showfield($lang['AdminDBPort']); $r .= $this->showdata($this->obj->port); - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowEnd(); + + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['AdminDBUser']); $r .= $this->showdata($this->obj->user); $r .= $this->showfield($lang['AdminDBPass']); $r .= $this->showdata($this->obj->pass); + $r .= $this->ContentRowEnd(); } - $r .= "</tr><tr>\n"; + + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['DBSystemID']); - $r .= $this->showdata($this->obj->systemid,3); - $r .= "</tr><tr>\n"; + $r .= $this->showdata($this->obj->systemid,$this->width-1); + $r .= $this->ContentRowEnd(); + + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['DBLastAnalyze']); $r .= $this->showdata($this->obj->lastanalyze->getDateTime(),3); - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowEnd(); + + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['DBLastDate']); $r .= $this->showdata($this->obj->lastsync->getDateTime()); $r .= $this->showfield($lang['DBLastID']); $r .= $this->showdata($this->obj->lastid); + $r .= $this->ContentRowEnd(); - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowStart(); $r .= $this->showfield('cryptpw'); $r .= $this->showdata($this->obj->crypt); $r .= $this->showfield($lang['CfgVersion']); $r .= $this->showdata($this->obj->version); + $r .= $this->ContentRowEnd(); if ( $this->obj->type == 3 ) { - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['AdminDBHome']); - $r .= $this->showdata($this->obj->home,3); + $r .= $this->showdata($this->obj->home,$this->width-1); + $r .= $this->ContentRowEnd(); } if ( ($tutos[usedocmanagement] == 1) ) { - $r .= "</tr><tr>\n"; + $r .= $this->ContentRowStart(); $r .= $this->showfield($lang['AdminDBRep']); $r .= $this->showdata($this->obj->repository,3); + $r .= $this->ContentRowEnd(); } - $r .= "</tr>\n"; /** - $r .= "<tr>\n"; - $r .= $this->showfield($lang['CfgLogo']); - $r .= $this->showdata('<span class="missing">'.$this->obj->logo.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); + $r .= "<tr>\n"; + $r .= $this->showfield($lang['CfgLogo']); + $r .= $this->showdata('<span class="missing">'.$this->obj->logo.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgLogoLink']); - $r .= $this->showdata('<span class="missing">'.$this->obj->logolink.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); + $r .= "</tr><tr>\n"; + $r .= $this->showfield($lang['CfgLogoLink']); + $r .= $this->showdata('<span class="missing">'.$this->obj->logolink.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgBugAutoName']); - $r .= $this->showdata('<span class="missing">'.$this->obj->bugautoname.'</span> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3); + $r .= "</tr><tr>\n"; + $r .= $this->showfield($lang['CfgBugAutoName']); + $r .= $this->showdata('<span class="missing">'.$this->obj->bugautoname.'</span> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3); - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgInvAutoName']); - $r .= $this->showdata('<span class="missing">'.$this->obj->invautoname.'</span> (deprecated go '.makelink('invoice/invoice_config.php','here').')',3); + $r .= "</tr><tr>\n"; + $r .= $this->showfield($lang['CfgInvAutoName']); + $r .= $this->showdata('<span class="missing">'.$this->obj->invautoname.'</span> (deprecated go '.makelink('invoice/invoice_config.php','here').')',3); - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgTaskAutoName']); - $r .= $this->showdata('<span class="missing">'.$this->obj->taskautoname.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); + $r .= "</tr><tr>\n"; + $r .= $this->showfield($lang['CfgTaskAutoName']); + $r .= $this->showdata('<span class="missing">'.$this->obj->taskautoname.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - $r .= "</tr><tr>\n"; - $r .= $this->showfield($lang['CfgVATlist']); - $r .= $this->showdata('<span class="missing">'.$this->obj->vatlist.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); + $r .= "</tr><tr>\n"; + $r .= $this->showfield($lang['CfgVATlist']); + $r .= $this->showdata('<span class="missing">'.$this->obj->vatlist.'</span> (deprecated go '.makelink('admin/main_config.php','here').')',3); - $r .= "</tr>\n"; + $r .= "</tr>\n"; */ // Show additional custom fields - $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,4); + $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,$this->width); // References to modules - $r .= show_module_infolists($this->user,$this->obj,4,$this->format); - $r .= $this->obj->getHistoryLink(4); + $r .= show_module_infolists($this->user,$this->obj,$this->width,$this->format); + $r .= $this->obj->getHistoryLink($this->width); $r .= $this->DataTableEnd(); return $r; } @@ -149,11 +161,11 @@ $this->obj = $this->obj->read($_GET['id'],$this->obj); } if ( !is_object($this->obj) || (! $this->obj->see_ok()) ) { - $msg .= sprintf($lang['Err0040'],$lang['database']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['database'])); $this->stop = true; return; } else if ( $this->obj->id < 0 ) { - $msg .= sprintf($lang['Err0040'],$lang['database']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['database'])); $this->stop = true; return; } Modified: trunk/php/history_select.php =================================================================== --- trunk/php/history_select.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/history_select.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -85,7 +85,7 @@ * prepare */ Function prepare() { - global $msg,$lang; + global $msg,$info,$lang; $this->layout_id = usehistory; $this->name = $lang['ObjHistory']; @@ -93,12 +93,12 @@ $this->css_class = 'selectbox'; if ( ! $this->user->feature_ok(usehistory,PERM_SEL) ) { - $msg .= sprintf($lang['Err0022'],$this->name); + $msg = addLine($msg,sprintf($lang['Err0022'],$this->name)); $this->stop = true; return; } if ( ! $this->user->feature_ok(usehistory,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],$this->name); + $msg = addLine($msg,sprintf($lang['Err0022'],$this->name)); $this->stop = true; return; } Modified: trunk/php/invoice/invoice_config.php =================================================================== --- trunk/php/invoice/invoice_config.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/invoice/invoice_config.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -99,7 +99,7 @@ * */ function prepare() { - global $lang,$msg,$tutos; + global $lang,$msg,$info,$tutos; $this->name = $lang['InvoiceConfig']; $this->css_class = 'configbox'; @@ -110,7 +110,7 @@ if (!isset($tutos['invoice_billable_tt'])) $tutos['invoice_billable_tt'] = '1'; if ( ! $this->user->isAdmin() ) { - $msg .= $this->error("Only admins are allowed to see this"); + $msg = addLine($msg,$this->error("Only admins are allowed to see this")); $this->stop = true; return; } @@ -124,7 +124,7 @@ $tutos['invoice_billable_tt'] = implode(',',$_REQUEST['invoice_billable_tt']); write_config_value($this->dbconn,'invoice_billable_tt','invoice'); - $msg .= ' saving done '; + $info = addLine($info,'saving done'); } } } Modified: trunk/php/invoice/invoice_new.php =================================================================== --- trunk/php/invoice/invoice_new.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/invoice/invoice_new.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -427,7 +427,7 @@ if ( isset($_GET['id']) ) { $this->obj = $this->obj->read($_GET['id'],$this->obj); if ( !is_object($this->obj) ) { - $msg .= sprintf($lang['Err0040'],$lang['invoice']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['invoice'])); $this->stop = true; return; } @@ -436,7 +436,7 @@ } else { $this->name = $lang['InvoiceCreate']; if ( !$this->user->feature_ok(useinvoice,PERM_NEW) ) { - $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()])); $this->stop = true; return; } @@ -447,7 +447,7 @@ } } if ( ! $this->obj->mod_ok() ) { - $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()])); $this->stop = true; return; } Modified: trunk/php/invoice/invoice_overview.php =================================================================== --- trunk/php/invoice/invoice_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/invoice/invoice_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2012 by Gero Kohnert + * Copyright 2002 - 2013 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 @@ -12,6 +12,8 @@ * @package invoice * */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -313,7 +315,7 @@ if ($this->ext != 0) { overview_arg($this,'link_fn',OVERVIEW_ARG_FN,'invoice',array('link_id'),'InvoiceReference','',get_parent_classes('invoice')); - overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference'); + overview_arg($this,'link_id',OVERVIEW_ARG_OBJID,'invoice',array('link_id'),'InvoiceReference',get_parent_classes('invoice')); } // Start Date for search @@ -333,8 +335,8 @@ } // Customer if ($this->ext != 0) { - overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','','atcdD'); - overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer','','atcdD'); + overview_arg($this,'customerfn',OVERVIEW_ARG_FN,'invoice',array('customer'),'InvoiceCustomer','',array(useaddressbook,useteams,usecompany,usedepartment,'D')); + overview_arg($this,'customerid',OVERVIEW_ARG_OBJID,'invoice',array('customer'),'InvoiceCustomer',''); } // Position (join) Modified: trunk/php/location_del.php =================================================================== --- trunk/php/location_del.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/location_del.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -9,13 +9,16 @@ * @package address * @module location_del */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; /* Check if user is allowed to use it */ check_user(); -$msg = ""; +$msg = ''; +$info = ''; $l = new location($dbconn); $l = $l->read($_GET['id'],$l); $l->adr_loc = $_GET['ref']; @@ -24,11 +27,11 @@ $gotourl = $l->ref->getUrl(); $dbconn->Begin("WORK"); -$msg .= $l->delete(); +$msg = addLine($msg,$l->delete()); $dbconn->Commit("WORK"); leave_insert($dbconn,$gotourl,$msg,$info); -/* +/** * SVN Info $Id$ * $Author$ */ Modified: trunk/php/module_template/AAA_config.php =================================================================== --- trunk/php/module_template/AAA_config.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/module_template/AAA_config.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -66,18 +66,18 @@ * */ function prepare() { - global $lang,$msg,$tutos; + global $lang,$msg,$info,$tutos; $this->name = $lang['AAAConfig']; $this->css_class = 'configbox'; if ( ! $this->user->isAdmin() ) { - $msg .= $this->error("Only admins are allowed to see this"); + $msg = addLine($msg,$this->error("Only admins are allowed to see this")); $this->stop = true; return; } if (isset($_REQUEST['save']) && ($_REQUEST['save'] == 1) ) { - $msg .= ' saving done '; + $info = addLine($info,'saving done'); } } Modified: trunk/php/reminder/reminder_new.php =================================================================== --- trunk/php/reminder/reminder_new.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/reminder/reminder_new.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -180,7 +180,7 @@ if ( isset($_GET['id']) ) { $this->obj = $this->obj->read($_GET['id'],$this->obj); if ( !is_object($this->obj) ) { - $msg .= sprintf($lang['Err0040'],$lang['Reminder']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Reminder'])); $this->stop = true; return; } @@ -192,7 +192,7 @@ if ( isset($_GET['link_id']) ) { $this->obj->link_id = $_GET['link_id']; } else if ($this->obj->id == -1) { - $msg .= sprintf($lang['Err0040'],$lang['ReminderReference']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['ReminderReference'])); $this->stop = true; return; } @@ -210,7 +210,7 @@ $this->obj->read_relations(); if ( is_object($this->obj->ref) && !$this->obj->ref->use_ok() ) { - $msg .= sprintf($lang['Err0001'],$lang[$this->obj->ref->getType()],$this->obj->ref->getFullName()); + $msg = addLine($msg,sprintf($lang['Err0001'],$lang[$this->obj->ref->getType()],$this->obj->ref->getFullName())); $this->stop = true; } @@ -223,7 +223,7 @@ unset($f); } if ( ! $this->obj->mod_ok() ) { - $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()])); $this->stop = true; } @@ -254,4 +254,4 @@ <!-- SVN Info $Id$ $Author$ ---> +--> \ No newline at end of file Modified: trunk/php/reminder/reminder_overview.php =================================================================== --- trunk/php/reminder/reminder_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/reminder/reminder_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -229,8 +229,8 @@ } // adresses to display - overview_arg($this,'tofn',OVERVIEW_ARG_FN,'reminder',array('adr_id'),'ReminderTo','r.','at'); - overview_arg($this,'toid',OVERVIEW_ARG_OBJID,'reminder',array('adr_id'),'ReminderTo','r.','at'); + overview_arg($this,'tofn',OVERVIEW_ARG_FN,'reminder',array('adr_id'),'ReminderTo','r.',array(useaddressbook,useteams)); + overview_arg($this,'toid',OVERVIEW_ARG_OBJID,'reminder',array('adr_id'),'ReminderTo','r.',array(useaddressbook,useteams)); // projects to display overview_arg($this,'reffn',OVERVIEW_ARG_FN,'reminder',array('link_id'),'ReminderReference','r.','all'); overview_arg($this,'refid',OVERVIEW_ARG_OBJID,'reminder',array('link_id'),'ReminderReference','r.'); Modified: trunk/php/scrum/scrum_config.php =================================================================== --- trunk/php/scrum/scrum_config.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/scrum/scrum_config.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -81,13 +81,13 @@ * */ function prepare() { - global $lang,$msg,$tutos; + global $lang,$msg,$info,$tutos; $this->name = $lang['ScrumConfig']; $this->css_class = 'configbox'; if ( ! $this->user->isAdmin() ) { - $msg .= $this->error("Only admins are allowed to see this"); + $msg = addLine($msg,$this->error("Only admins are allowed to see this")); $this->stop = true; return; } @@ -96,7 +96,7 @@ if (!isset($tutos['scrum_max_hours'])) $tutos['scrum_max_hours'] = 15; if (!isset($tutos['scrum_allow_weekend'])) $tutos['scrum_allow_weekend'] = 0; if (isset($_REQUEST['max_hours']) && !is_numeric($_REQUEST['max_hours'])) { - $msg .= $_REQUEST['max_hours'].' is not a number. Nothing saved'; + $msg = addLIne($msg,$_REQUEST['max_hours'].' is not a number. Nothing saved'); $_REQUEST['save'] = 0; } @@ -106,8 +106,7 @@ $tutos['scrum_allow_weekend'] = $_REQUEST['allow_weekend']; write_config_value($this->dbconn,'scrum_allow_weekend','scrumlog'); - - $msg .= ' saving done '; + $info = addLine($info,'saving done'); } } Modified: trunk/php/scrum/sprint_overview.php =================================================================== --- trunk/php/scrum/sprint_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/scrum/sprint_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -180,14 +180,14 @@ * prepare */ Function prepare() { - global $msg,$lang,$current_user,$table; + global $msg,$info,$lang,$table; $this->name = $lang['SprintOverview']; $this->layout_id = USESCRUMSPRINT; if ( ! $this->user->feature_ok(USESCRUMSPRINT,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); + $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'")); $this->stop = true; return; } @@ -238,7 +238,7 @@ overview_arg($this,'state',OVERVIEW_ARG_INT,'scrumsprint',array('state'),array('SprintState','SprintStates'),'d.'); - //$msg .= $this->q; + //$msg = addLine($msg,$this->q); // sorting $xxx = ''; Modified: trunk/php/stc/stc_new.php =================================================================== --- trunk/php/stc/stc_new.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/stc/stc_new.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2009 - 2012 by Gero Kohnert + * Copyright 2009 - 2013 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 @@ -10,6 +10,8 @@ * @module stc_new * @package stc */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -188,21 +190,21 @@ * prepare */ Function prepare() { - global $msg,$lang,$current_user,$tutos; + global $msg,$info,$lang,$tutos; $this->obj = new stc($this->dbconn); if(isset($_GET['id']) && is_numeric($_GET['id'])) { $this->obj = $this->obj->read($_GET['id'],$this->obj); $this->name = $lang['STCModify']; if (is_object($this->obj) && !$this->obj->mod_ok() ) { - $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()])); $this->stop = true; return; } } else { $this->name = $lang['STCCreate']; if (!$this->user->feature_ok(usestc,PERM_NEW) ) { - $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()])); $this->stop = true; } } @@ -211,10 +213,10 @@ if(isset($_GET['lgarr']) ) { $this->obj->lang_array = $_GET['lgarr']; } else if (!is_object($this->obj)){ - $msg .= sprintf($lang['Err0040'],$lang['STC']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['STC'])); $this->stop = true ; } else if ($this->obj->id == -1){ - $msg .= sprintf($lang['Err0040'],$lang['STC']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['STC'])); $this->stop = true ; } if(isset($_GET['mod']) ) { @@ -223,7 +225,7 @@ if (($this->obj->lang_array != '') && (!isset($lang[$this->obj->lang_array]) || !is_array($lang[$this->obj->lang_array]))) { $this->stop = true; - $msg .= '"'.$this->obj->lang_array.'" is not a lang array'; + $msg = addLine($msg,'"'.$this->obj->lang_array.'" is not a lang array'); return; } Modified: trunk/php/stc/stc_overview.php =================================================================== --- trunk/php/stc/stc_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/stc/stc_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -11,6 +11,7 @@ * @package stc */ $tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -101,7 +102,7 @@ * action via massupdate */ Function action() { - global $lang,$msg; + global $lang,$msg,$info; if ( $_GET['action'] == -2 ) { $this->dbconn->Begin("WORK"); @@ -112,10 +113,10 @@ continue; } if ( $b->del_ok() ) { - $msg .= $lang['Delete'].":". $b->getFullName() ."<br />"; - $msg .= $b->delete(); + $info = addLine($info,$lang['Delete'].":". $b->getFullName()); + $msg = addLine($msg,$b->delete()); } else { - $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]) ."<br />\n"; + $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0023'],$lang[$b->getType()])); } unset($b); } @@ -134,13 +135,14 @@ * prepare */ Function prepare() { - global $msg,$lang,$current_user,$table; + global $msg,$lang,$table; $this->name = $lang['STCOverview']; if ( ! $this->user->feature_ok(usestc,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); + $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'")); $this->stop = true; + return; } $this->link1 = "stc/stc_overview.php"; Modified: trunk/php/stc/stc_show.php =================================================================== --- trunk/php/stc/stc_show.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/stc/stc_show.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2009 - 2011 by Gero Kohnert + * Copyright 2009 - 2013 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 @@ -10,6 +10,8 @@ * @module stc_new * @package stc */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -267,7 +269,7 @@ * prepare */ Function prepare() { - global $msg,$lang,$current_user; + global $msg,$info,$lang; $this->name = $lang['STCDetail']; $this->obj = new stc($this->dbconn); @@ -275,17 +277,17 @@ $this->obj = $this->obj->read($_GET['id'],$this->obj); } if ( !is_object($this->obj) ) { - $msg .= sprintf($lang['Err0040'],$lang['STC']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['STC'])); $this->stop = true; $this->format = "html"; return; } else if ( ! $this->obj->see_ok() ) { - $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()])); $this->stop = true; $this->format = "html"; return; } else if ( $this->obj->id < 0 ) { - $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->obj->getType()])); $this->stop = true; $this->format = "html"; return; Modified: trunk/php/stuff/stuff_config.php =================================================================== --- trunk/php/stuff/stuff_config.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/stuff/stuff_config.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -63,7 +63,7 @@ * */ function prepare() { - global $lang,$msg,$tutos; + global $lang,$msg,$info,$tutos; $this->name = $lang['StuffConfig']; $this->css_class = 'configbox'; @@ -72,14 +72,14 @@ if (!isset($tutos['stuff_autoname'])) $tutos['stuff_autoname'] = 'I-%Y-&X'; if ( ! $this->user->isAdmin() ) { - $msg .= $this->error("Only admins are allowed to see this"); + $msg = addLine($msg,$this->error("Only admins are allowed to see this")); $this->stop = true; return; } if (isset($_REQUEST['save']) && ($_REQUEST['save'] == 1) ) { $tutos['stuff_autoname'] = $_REQUEST['autoname']; write_config_value($this->dbconn,'stuff_autoname','stuff'); - $msg .= ' saving done '; + $info = addLine($info,'saving done'); } } } Modified: trunk/php/task_copy_ins.php =================================================================== --- trunk/php/task_copy_ins.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/task_copy_ins.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -13,6 +13,8 @@ * @module task_ins * @package task */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; @@ -29,7 +31,7 @@ * - shiftdates if neccessary */ function copy_task(task $obj,tutos_base $pobj) { - global $current_user,$msg,$cnt,$ref,$gotourl,$copytree,$shiftdates,$diff,$copyres; + global $current_user,$msg,$info,$cnt,$ref,$gotourl,$copytree,$shiftdates,$diff,$copyres; $obj->readWorker(); task::obj_read($obj); @@ -61,7 +63,7 @@ } // save - $msg .= $obj->save(); + $msg = addLine($msg,$obj->save()); $obj->modified[] = array ( "field" => "Copy" , "old" => $oldid , "new" => $obj->id, @@ -72,7 +74,7 @@ $obj->res[] = $i; } } - $msg .= $obj->save(); + $msg = addLine($msg,$obj->save()); if ($gotourl == '') $gotourl = $obj->getUrl(); @@ -81,7 +83,7 @@ if ($copytree) { // walk through subtasks foreach ($obj->tasklist as $i => $o) { - $msg .= copy_task($o,$obj); + $msg = addLine($msg,copy_task($o,$obj)); } } unset($obj->tasklist); @@ -89,15 +91,16 @@ } -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'task_new.php'; $copytree = false; $copyres = false; $shiftdates = false; $diff = 0; -$obj = new task($dbconn); // the copy -$oobj = new task($dbconn); // original +$obj = new task($dbconn); // the copy +$oobj = new task($dbconn); // original $parent = null; $ref = array(); // references old and new ids @@ -140,7 +143,7 @@ $newstart->setDateTimeF("newstart"); $gotourl= addUrlParameter($gotourl,"newstart=". $newstart->getYYYYMMDDHHMM(),true); if ( !$newstart->checkDMY(true) ) { - $msg .= sprintf($lang['Err0038'],$lang['TaskS_Start']) ."<br />"; + $msg = addLine($msg,sprintf($lang['Err0038'],$lang['TaskS_Start'])); } $diff = $newstart->ts - $obj->s_start->ts; } @@ -161,7 +164,7 @@ } if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) { - $msg .= sprintf($lang['Err0009'],$lang['TaskName']) .'<br />'; + $msg = addLine($msg,sprintf($lang['Err0009'],$lang['TaskName'])); $gotourl = addBadField($gotourl,'name',true); } else { $obj->setName(trim($_POST['name'])); @@ -172,31 +175,31 @@ if (is_object($parent)) { $oobj->fulltasklist[$oobj->id] = 1; if (array_key_exists($parent->id,$oobj->fulltasklist)) { - $msg .= 'Copy failed: Selfreference'; + $msg = addLine($msg,'Copy failed: Selfreference'); } } // // Parse additional custom fields // -$msg .= parse_custom_fields($obj->gettype(),$obj); +$msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj)); // other modules (ignore here !!) #$msg .= module_parseforms($current_user,$obj,$gotourl); -$msg .= $obj->run_check_hook(); +$msg = addLine($msg,$obj->run_check_hook()); if ( $msg == "" ) { $dbconn->Begin("WORK"); $gotourl = ''; - $msg .= copy_task($obj,$parent); + $msg = addLine($msg,copy_task($obj,$parent)); // Manage TaskLinks $dbconn->Commit("WORK"); } -leave_insert($dbconn,$gotourl,$msg); +leave_insert($dbconn,$gotourl,$msg,$info); /** * SVN Info $Id$ Modified: trunk/php/testmanager/testcase_ins.php =================================================================== --- trunk/php/testmanager/testcase_ins.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testcase_ins.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -25,7 +25,8 @@ loadmodules('testcase','ins'); loadmodule('testcase'); -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'testmanager/testcase_new.php'; $obj = array(); @@ -104,7 +105,7 @@ $gotourl = $o->ref->getURL(); } } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/testmanager/testcase_new.php =================================================================== --- trunk/php/testmanager/testcase_new.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testcase_new.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -192,11 +192,11 @@ $this->obj[1]->read_reference(); $this->name = $lang['TestcaseMod']; if ( !is_object($this->obj[1]) ) { - $msg .= sprintf($lang['Err0040'],$lang['Testcase']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Testcase'])); $this->stop = true ; return; } else if ( ! $this->obj[1]->mod_ok() ) { - $msg .= sprintf($lang['Err0024'],$lang[$this->obj[1]->getType()]); + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj[1]->getType()])); $this->stop = true; return; } @@ -206,7 +206,7 @@ $this->name = $lang['TestcaseCreation']; if ( !$this->user->feature_ok(usetestcase,PERM_NEW) ) { - $msg .= sprintf($lang['Err0054'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()])); $this->stop = true; return; } @@ -233,13 +233,13 @@ $this->obj[$i]->read_reference(); $this->obj[$i]->read_relations(); if ( ! $this->obj[$i]->mod_ok() ) { - $msg .= sprintf($lang['Err0024'],$lang[$this->obj[$i]->getType()]); + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj[$i]->getType()])); $this->stop = true; return; } if ( !is_object($this->obj[$i]->ref) ) { - $msg .= sprintf($lang['Err0040'],$lang['Reference']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Reference'])); $this->stop = true; return; } Modified: trunk/php/testmanager/testcase_overview.php =================================================================== --- trunk/php/testmanager/testcase_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testcase_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -194,7 +194,7 @@ $this->css_class = 'overviewbox'; $defsort = array('creation',2); if ( ! $this->user->feature_ok(usetestcase,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); + $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'")); $this->stop = true; return; } Modified: trunk/php/testmanager/testcase_show.php =================================================================== --- trunk/php/testmanager/testcase_show.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testcase_show.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -143,7 +143,7 @@ * prepare */ Function prepare() { - global $msg,$lang; + global $info,$msg,$lang; $this->name = $lang['TestcaseDetail']; $this->obj = new testcase($this->dbconn); @@ -152,15 +152,15 @@ } if ( ! is_object($this->obj) ) { - $msg .= sprintf($lang['Err0040'],$lang['Testcase']); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Testcase'])); $this->stop = true; $this->format = "html"; return; } else if ( ! $this->obj->see_ok() ) { - $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()])); $this->stop = true; } else if ( $this->obj->id < 0 ) { - $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]); + $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->obj->getType()])); $this->stop = true; return; } else { Modified: trunk/php/testmanager/testmanager.pinc =================================================================== --- trunk/php/testmanager/testmanager.pinc 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testmanager.pinc 2013-12-14 11:43:49 UTC (rev 1201) @@ -2497,19 +2497,19 @@ * manipulate name and description in order to indicate a retest */ function make_retest(Testrun $orig) { - $msg = ''; + $m = ''; $r_nr = 1; $regs = array(); if (preg_match('#([\p{L}[:print:]\X]*) RETEST ([0-9]+)#miu',$orig->name,$regs)) { $r_nr = $regs[2]; $r_nr++; - $msg .= $this->setName($regs[1].' RETEST '.$r_nr); - $msg .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc); + $m .= $this->setName($regs[1].' RETEST '.$r_nr); + $m .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc); } else { - $msg .= $this->setName($orig->name.' RETEST '.$r_nr); - $msg .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc); + $m .= $this->setName($orig->name.' RETEST '.$r_nr); + $m .= $this->setDesc("RETEST ".$r_nr.":\r\n".$orig->desc); } - return $msg; + return $m; } /** Modified: trunk/php/testmanager/testmanager_config.php =================================================================== --- trunk/php/testmanager/testmanager_config.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testmanager_config.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -66,7 +66,7 @@ * */ function prepare() { - global $lang,$msg,$tutos; + global $lang,$msg,$info,$tutos; $this->name = $lang['TestmanagerConfig']; $this->css_class = 'configbox'; @@ -83,7 +83,7 @@ $tutos['testcase_massadd'] = $_REQUEST['testcase_massadd']; write_config_value($this->dbconn,'testcase_massadd','testcase'); - $msg = addLine($msg,'saving done'); + $info = addLine($info,'saving done'); } } } Modified: trunk/php/testmanager/testrun_new.php =================================================================== --- trunk/php/testmanager/testrun_new.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testrun_new.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -206,7 +206,7 @@ * prepare */ Function prepare() { - global $msg,$lang,$current_user; + global $msg,$info,$lang,$current_user; $this->mode = ''; if (isset($_GET['mode'])) { Modified: trunk/php/testmanager/testrun_overview.php =================================================================== --- trunk/php/testmanager/testrun_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testrun_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -322,7 +322,7 @@ $this->name = $lang['TestrunOverview']; if ( ! $this->user->feature_ok(usetestrun,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); + $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'")); $this->stop = true; return; } Modified: trunk/php/testmanager/testsuite_ins.php =================================================================== --- trunk/php/testmanager/testsuite_ins.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testsuite_ins.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -13,6 +13,8 @@ * @module testsuite_ins * @package testsuite */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -125,8 +127,9 @@ } } -$mode = ''; -$msg = ''; +$mode = ''; +$msg = ''; +$info = ''; $gotourl = 'testmanager/testsuite_new.php'; $statechnage = false; @@ -306,7 +309,7 @@ $x->display(); exit; } - leave_insert($dbconn,'../'.$gotourl,$msg); + leave_insert($dbconn,'../'.$gotourl,$msg,$info); exit; } Modified: trunk/php/testmanager/testsuite_overview.php =================================================================== --- trunk/php/testmanager/testsuite_overview.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/testmanager/testsuite_overview.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -212,7 +212,7 @@ $defsort = array('name',1); if ( ! $this->user->feature_ok(usetestsuite,PERM_SEE) ) { - $msg .= sprintf($lang['Err0022'],"'". $this->name ."'"); + $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'")); $this->stop = true; return; } Modified: trunk/php/timetrack/timetrack_config.php =================================================================== --- trunk/php/timetrack/timetrack_config.php 2013-12-11 08:47:44 UTC (rev 1200) +++ trunk/php/timetrack/timetrack_config.php 2013-12-14 11:43:49 UTC (rev 1201) @@ -135,7 +135,7 @@ * */ function prepare() { - global $lang,$msg,$tutos; + global $lang,$msg,$info,$tutos; $this->name = $lang['TimetrackConfig']; $this->css_class = 'configbox'; @@ -146,7 +146,7 @@ if (!isset($tutos['timetrack_payed_state'])) $tutos['timetrack_payed_state'] = 3; if ( ! $this->user->isAdmin() ) { - $msg .= $this->error("Only admins are allowed to see this"); + $msg = addLine($msg,$this->error("Only ... [truncated message content] |
From: <gok...@us...> - 2013-12-11 08:47:49
|
Revision: 1200 http://sourceforge.net/p/tutos/code/1200 Author: gokohnert Date: 2013-12-11 08:47:44 +0000 (Wed, 11 Dec 2013) Log Message: ----------- added missing lang Modified Paths: -------------- trunk/php/url/ca.p3 trunk/php/url/cs.p3 trunk/php/url/de.p3 trunk/php/url/el.p3 trunk/php/url/en.p3 trunk/php/url/es-mx.p3 trunk/php/url/es-ni.p3 trunk/php/url/es-ve.p3 trunk/php/url/es.p3 trunk/php/url/fr.p3 trunk/php/url/hu.p3 trunk/php/url/it.p3 trunk/php/url/ja.p3 trunk/php/url/ko.p3 trunk/php/url/nl.p3 trunk/php/url/pl.p3 trunk/php/url/pt-br.p3 trunk/php/url/pt.p3 trunk/php/url/ru.p3 trunk/php/url/sv.p3 trunk/php/url/tw.p3 trunk/php/url/vi.p3 trunk/php/url/zh.p3 Modified: trunk/php/url/ca.p3 =================================================================== --- trunk/php/url/ca.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/ca.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/cs.p3 =================================================================== --- trunk/php/url/cs.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/cs.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/de.p3 =================================================================== --- trunk/php/url/de.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/de.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'URL Kategorie anlegen'; $lang['URLCatAddI'] = 'eine neue URL KAtegorie anlegen'; $lang['URLCatMod'] = 'URL Kategorie ändern'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'URL Kategorie anlegen'; $lang['URLStoreQuery'] = 'Abfrage speichern'; Modified: trunk/php/url/el.p3 =================================================================== --- trunk/php/url/el.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/el.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/en.p3 =================================================================== --- trunk/php/url/en.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/en.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -1,14 +1,14 @@ <?php -# $Id$ -# -# ========================= NOTE ======================== -# Please put site specific extensions and changes -# to TUTOS language files in a file called 'en_custom.p3' -# or 'lang_custom.p3' (for all languages) -# using the same format like here -# ======================================================= +// $Id$ +// +// ========================= NOTE ======================== +// Please put site specific extensions and changes +// to TUTOS language files in a file called 'en_custom.p3' +// or 'lang_custom.p3' (for all languages) +// using the same format like here +// ======================================================= -# URL +// URL $lang['URLName'] = 'Name'; $lang['URLDesc'] = 'Description'; $lang['URL'] = 'URL'; @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; @@ -42,4 +43,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> +?> \ No newline at end of file Modified: trunk/php/url/es-mx.p3 =================================================================== --- trunk/php/url/es-mx.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/es-mx.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/es-ni.p3 =================================================================== --- trunk/php/url/es-ni.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/es-ni.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/es-ve.p3 =================================================================== --- trunk/php/url/es-ve.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/es-ve.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -28,6 +28,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/es.p3 =================================================================== --- trunk/php/url/es.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/es.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/fr.p3 =================================================================== --- trunk/php/url/fr.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/fr.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/hu.p3 =================================================================== --- trunk/php/url/hu.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/hu.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/it.p3 =================================================================== --- trunk/php/url/it.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/it.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/ja.p3 =================================================================== --- trunk/php/url/ja.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/ja.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/ko.p3 =================================================================== --- trunk/php/url/ko.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/ko.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/nl.p3 =================================================================== --- trunk/php/url/nl.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/nl.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/pl.p3 =================================================================== --- trunk/php/url/pl.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/pl.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/pt-br.p3 =================================================================== --- trunk/php/url/pt-br.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/pt-br.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/pt.p3 =================================================================== --- trunk/php/url/pt.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/pt.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -27,6 +27,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/ru.p3 =================================================================== --- trunk/php/url/ru.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/ru.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/sv.p3 =================================================================== --- trunk/php/url/sv.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/sv.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/tw.p3 =================================================================== --- trunk/php/url/tw.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/tw.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = "建立分類"; $lang['URLCatAddI'] = "建立新網址分類"; $lang['URLCatMod'] = "修改網址分類"; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = "建立網址分類"; $lang['URLStoreQuery'] = "存儲查詢"; Modified: trunk/php/url/vi.p3 =================================================================== --- trunk/php/url/vi.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/vi.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = 'Create Category'; $lang['URLCatAddI'] = 'Create a new URL Category'; $lang['URLCatMod'] = 'Modify URL Category'; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = 'Create URL Category'; $lang['URLStoreQuery'] = 'Store Query'; Modified: trunk/php/url/zh.p3 =================================================================== --- trunk/php/url/zh.p3 2013-12-11 08:42:03 UTC (rev 1199) +++ trunk/php/url/zh.p3 2013-12-11 08:47:44 UTC (rev 1200) @@ -25,6 +25,7 @@ $lang['URLCatAdd'] = "建立分類"; $lang['URLCatAddI'] = "建立新的网址分類"; $lang['URLCatMod'] = "修改网址分類"; +$lang['URLCatDel'] = 'Delete URL Category'; $lang['URLCatCreate'] = "建立网址分類"; $lang['URLStoreQuery'] = "存储查询"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-11 08:42:06
|
Revision: 1199 http://sourceforge.net/p/tutos/code/1199 Author: gokohnert Date: 2013-12-11 08:42:03 +0000 (Wed, 11 Dec 2013) Log Message: ----------- set default Modified Paths: -------------- trunk/php/bugtracking/bug.pinc Modified: trunk/php/bugtracking/bug.pinc =================================================================== --- trunk/php/bugtracking/bug.pinc 2013-12-11 08:36:37 UTC (rev 1198) +++ trunk/php/bugtracking/bug.pinc 2013-12-11 08:42:03 UTC (rev 1199) @@ -538,7 +538,7 @@ /** * get the history as a formatted text */ - function getBugHistory($showlinks,$showhtml) { + function getBugHistory($showlinks,$showhtml = false) { global $lang,$tutos; $url = addSessionKey('bug_overview.php'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-11 08:36:41
|
Revision: 1198 http://sourceforge.net/p/tutos/code/1198 Author: gokohnert Date: 2013-12-11 08:36:37 +0000 (Wed, 11 Dec 2013) Log Message: ----------- fix failing address copy Modified Paths: -------------- trunk/php/location.pinc Modified: trunk/php/location.pinc =================================================================== --- trunk/php/location.pinc 2013-12-11 08:35:48 UTC (rev 1197) +++ trunk/php/location.pinc 2013-12-11 08:36:37 UTC (rev 1198) @@ -597,7 +597,7 @@ if ( isset ($this->company->id) ) { $this->company->read_locs_data(); if ( count($this->company->location) > 0 ) { - if ($locid != -1) { + if ( ($locid != -1) && isset($this->company->location[$locid])) { $x = $this->company->location[$locid]; } else { reset ($this->company->location); @@ -615,7 +615,7 @@ if ( isset ($this->department->id) ) { $this->department->read_locs_data(); if ( count($this->department->location) > 0 ) { - if ($locid != -1) { + if (($locid != -1) && isset($this->department->location[$locid])) { $x = $this->department->location[$locid]; } else { reset ($this->department->location); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-11 08:35:51
|
Revision: 1197 http://sourceforge.net/p/tutos/code/1197 Author: gokohnert Date: 2013-12-11 08:35:48 +0000 (Wed, 11 Dec 2013) Log Message: ----------- mail to companies/dpeartments via group mail Modified Paths: -------------- trunk/php/company.pinc trunk/php/department.pinc Modified: trunk/php/company.pinc =================================================================== --- trunk/php/company.pinc 2013-12-11 08:26:45 UTC (rev 1196) +++ trunk/php/company.pinc 2013-12-11 08:35:48 UTC (rev 1197) @@ -258,6 +258,43 @@ } /** + * fill mailing list + * this will work recursive and add all members + * and subteam members to the given mailing list + */ + function fill_maillist(&$ml) { + $ml[$this->id] = &$this; + return; + } + + /** + * Read all locations data and find the email adr. + */ + function default_email() { + if ( ! $this->rl2 ) { + $this->read_locs_data(); + }; + $e = ''; + + if ( isset($this->locall) ) { + foreach($this->locall as $i => $f) { + if ( $f->email_1 != '') { + $e = $f->email_1; + if ( $f->category == 2 ) { + return $e; + } + } elseif ( $f->email_2 != '' ) { + $e = $f->email_1; + if ( $f->category == 2 ) { + return $e; + } + } + } + } + return $e; + } + + /** * Returns HTML for popup infos */ function getPopInfo() { Modified: trunk/php/department.pinc =================================================================== --- trunk/php/department.pinc 2013-12-11 08:26:45 UTC (rev 1196) +++ trunk/php/department.pinc 2013-12-11 08:35:48 UTC (rev 1197) @@ -249,6 +249,43 @@ } /** + * fill mailing list + * this will work recursive and add all members + * and subteam members to the given mailing list + */ + function fill_maillist(&$ml) { + $ml[$this->id] = &$this; + return; + } + + /** + * Read all locations data and find the email adr. + */ + function default_email() { + if ( ! $this->rl2 ) { + $this->read_locs_data(); + }; + $e = ''; + + if ( isset($this->locall) ) { + foreach($this->locall as $i => $f) { + if ( $f->email_1 != '') { + $e = $f->email_1; + if ( $f->category == 2 ) { + return $e; + } + } elseif ( $f->email_2 != '' ) { + $e = $f->email_1; + if ( $f->category == 2 ) { + return $e; + } + } + } + } + return $e; + } + + /** * Returns HTML for popup infos */ function getPopInfo() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-11 08:26:49
|
Revision: 1196 http://sourceforge.net/p/tutos/code/1196 Author: gokohnert Date: 2013-12-11 08:26:45 +0000 (Wed, 11 Dec 2013) Log Message: ----------- fix Modified Paths: -------------- trunk/php/timetrack/timetrack_overview.php Modified: trunk/php/timetrack/timetrack_overview.php =================================================================== --- trunk/php/timetrack/timetrack_overview.php 2013-12-09 10:18:48 UTC (rev 1195) +++ trunk/php/timetrack/timetrack_overview.php 2013-12-11 08:26:45 UTC (rev 1196) @@ -602,13 +602,14 @@ Function prepare() { global $msg,$tutos,$lang,$table; - $this->layout_id = usetimetrack; - $this->name = $lang['TimetrackOverview']; - $this->css_class = 'overviewbox'; - $this->head = array(); - $this->head['ref'] = true; - $this->head['worker'] = true; - $this->head['state'] = true; + $this->layout_id = usetimetrack; + $this->name = $lang['TimetrackOverview']; + $this->css_class = 'overviewbox'; + $this->header = ''; + $this->head = array(); + $this->head['ref'] = true; + $this->head['worker'] = true; + $this->head['state'] = true; $this->head['distance'] = true; if (isset($this->hide['distance']) && $this->hide['distance'] ) { $this->head['distance'] = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-09 10:18:52
|
Revision: 1195 http://sourceforge.net/p/tutos/code/1195 Author: gokohnert Date: 2013-12-09 10:18:48 +0000 (Mon, 09 Dec 2013) Log Message: ----------- fix Modified Paths: -------------- trunk/php/db/db.pinc trunk/php/history_show.php Modified: trunk/php/db/db.pinc =================================================================== --- trunk/php/db/db.pinc 2013-12-06 16:34:15 UTC (rev 1194) +++ trunk/php/db/db.pinc 2013-12-09 10:18:48 UTC (rev 1195) @@ -784,10 +784,9 @@ $cnt = $rc->get(0, "c"); $rc->free(); if ($this->range_start == -1) { - $this->range_start = min(0,$cnt - $this->range_cnt); + $this->range_start = max(0,$cnt - $this->range_cnt); } } - $q = $this->getSelect(); $r = $this->dbconn->Exec($q); Modified: trunk/php/history_show.php =================================================================== --- trunk/php/history_show.php 2013-12-06 16:34:15 UTC (rev 1194) +++ trunk/php/history_show.php 2013-12-09 10:18:48 UTC (rev 1195) @@ -95,7 +95,7 @@ if ( $n == 0 ) { $r .= $this->error ( $lang['Err0048'] ); $r .= $this->OverviewTableEnd(); - return; + return $r; } if ( $this->start == -1 ) { $a = $n - $tutos['maxshow']; @@ -105,14 +105,13 @@ $a = $this->start; $end = $this->start + $tutos['maxshow']; } - while ( ($a < $n) && ($a < $end) ) { $f = &$this->xobj->history[$a]; $r .= $this->OverviewRowStart($line); if ( $this->id == -1 ) { $this->obj = getObject($this->dbconn,$f["obj_id"],1); if ( !is_object($this->obj) || ($this->obj->getType() == 'base') ) { - $r .= $this->OverviewRowBlock('<b>'. $f["obj_id"] .'</b>','over_l'); + $r .= $this->OverviewRowBlock('<b>'.$f["obj_id"] .'</b>','over_l'); $r .= $this->OverviewRowBlock(' ','over_l'); } else { $r .= $this->OverviewRowBlock((isset($lang[$this->obj->getType()]) ? $lang[$this->obj->getType()]:$this->obj->getType()),'over_l'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-06 16:34:17
|
Revision: 1194 http://sourceforge.net/p/tutos/code/1194 Author: gokohnert Date: 2013-12-06 16:34:15 +0000 (Fri, 06 Dec 2013) Log Message: ----------- fix cc list Modified Paths: -------------- trunk/php/mail.pinc Modified: trunk/php/mail.pinc =================================================================== --- trunk/php/mail.pinc 2013-12-05 08:44:55 UTC (rev 1193) +++ trunk/php/mail.pinc 2013-12-06 16:34:15 UTC (rev 1194) @@ -1316,7 +1316,7 @@ if (isset($this->charset) ) { $name = "=?". $this->charset ."?B?" . base64_encode( $name ) . "?="; } - $cc .= $name ." <". $em .">"; + $cc .= $pre . $name ." <". $em .">"; $pre = ","; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gok...@us...> - 2013-12-05 08:44:59
|
Revision: 1193 http://sourceforge.net/p/tutos/code/1193 Author: gokohnert Date: 2013-12-05 08:44:55 +0000 (Thu, 05 Dec 2013) Log Message: ----------- update Modified Paths: -------------- trunk/php/app_ins.php trunk/php/bugtracking/bug_ins.php trunk/php/db/table_custom_example.pinc trunk/php/expense/expense_ins.php trunk/php/file/file_ins.php trunk/php/group/group_ins.php trunk/php/module_template/AAA_ins.php trunk/php/note/note_ins.php trunk/php/rate/rate_ins.php trunk/php/reminder/reminder_ins.php trunk/php/resource/resource_ins.php trunk/php/scrum/sprint_ins.php trunk/php/stuff/stuff_ins.php trunk/php/subversion/svn_ins.php trunk/php/team_ins.php trunk/php/url/urlcat_ins.php trunk/php/user.pinc trunk/php/user_ins.php trunk/php/watchlist/watchlist_ins.php trunk/php/webelements.p3 Modified: trunk/php/app_ins.php =================================================================== --- trunk/php/app_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/app_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -13,6 +13,8 @@ * @module app_ins * @package appointment */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'appointment.pinc'; @@ -22,7 +24,8 @@ check_user(); loadmodules('appointment','new'); -$msg = ''; +$msg = ''; +$info = ''; if ( ! isset($_POST['gotourl']) ) { $gotourl="app_new.php"; } else { @@ -30,9 +33,9 @@ } $a = new Appointment($dbconn); -# -# ID -# +// +// ID +// if ( isset($_POST['Xid']) ) { $gotourl= addUrlParameter($gotourl,"id=".$_POST['Xid'],true); $a = $a->read($_POST['Xid'],$a); @@ -53,8 +56,7 @@ $gotourl= addUrlParameter($gotourl,"t_ignore=".$a->t_ignore,true); $gotourl= addUrlParameter($gotourl,"r_ignore=".$a->r_ignore,true); -# Set the Start and End time - +// Set the Start and End time $start = new TUTOS_Date_Time(); $start->setDateTimeF("start"); if ( ( !$start->checkDMY()) || (-1 == $start->getTimeStamp() ) ) { @@ -76,11 +78,11 @@ $a->setEndTime($end); } -# -# Checks -# +// +// Checks +// if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) { -# Start after End + // Start after End $msg = addLine($msg,$lang['Err0002']); } @@ -105,8 +107,8 @@ } } } -# remove the remaining particiapants from the old list -# those participants are no longer member of the app +// remove the remaining particiapants from the old list +// those participants are no longer member of the app foreach ($a->oldparticipant as $i => $f) { $a->delParticipant($i); } @@ -121,36 +123,36 @@ $gotourl= addUrlParameter($gotourl,"mod_allow=".$_POST['mod_allow'],true); $a->mod_allow = $_POST['mod_allow']; } -# -# TRACE -# +// +// TRACE +// if ( !isset($_POST['trace']) ) { $a->setTrace(0); } else { $a->setTrace($_POST['trace']); } $gotourl= addUrlParameter($gotourl,"trace=".$a->trace,true); -# -# EMAIL -# +// +// EMAIL +// if ( !isset($_POST['email']) ) { $a->email = 0; } else { $a->email = $_POST['email']; } $gotourl= addUrlParameter($gotourl,"email=".$a->email,true); -# -# OUTSIDE -# +// +// OUTSIDE +// if ( !isset($_POST['outside']) ) { $a->SetLocation(0); } else { $a->SetLocation($_POST['outside']); } $gotourl= addUrlParameter($gotourl,"outside=".$a->outside,true); -# -# REPEAT -# +// +// REPEAT +// if ( !isset($_POST['repeat']) ) { $a->repeat = 0; } else { @@ -169,26 +171,26 @@ } else if ( $a->repeat == 4 ) { $a->r_arg = ""; } -# -# REMEMBER -# +// +// REMEMBER +// if ( !isset($_POST['remember']) ) { $a->setRemember(0); } else { $a->setRemember($_POST['remember']); } $gotourl= addUrlParameter($gotourl,"remember=".$a->remember,true); -# -# DESCRIPTION -# +// +// DESCRIPTION +// if ( isset($_POST['descr']) && ! empty($_POST['descr']) ) { $a->SetDescription(trim($_POST['descr'])); } $gotourl = addUrlParameter($gotourl,"descr=". UrlEncode($a->descr),true); -# -# VISITOR -# -# Clear Visitor Address +// +// VISITOR +// +// Clear Visitor Address $v = -1; if ( isset($_POST['vfn']) && !empty($_POST['vfn']) ) { $v = check_field($_POST['vfn'],"vfn","vl","acd"); @@ -206,9 +208,9 @@ } else { $a->setVisitor(-1); } -# -# PRODUCT -# +// +// PRODUCT +// $p = -1; if ( isset($_POST['pfn']) && !empty($_POST['pfn']) ) { $p = check_field($_POST['pfn'],"pfn","pl","p"); @@ -226,15 +228,14 @@ } else { $a->setProduct(-1); } -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$a,$gotourl)); -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields('appointment1',$a)); - -# check availability of participants and resources +// check availability of participants and resources if ( ($msg == "") && (isset($_POST['check']) && $_POST['check'] == 1) ) { $gotourl= addUrlParameter($gotourl,"check=".$_POST['check'],true); $a->check_participants($msg); @@ -242,9 +243,9 @@ $msg = addLine($msg,$a->run_check_hook()); -################################################## -# End of Checks -################################################## +// +// End of Checks +// if ( $msg == "" ) { $dbconn->Begin("WORK"); $msg = addLine($msg,$a->save()); @@ -255,7 +256,7 @@ $gotourl= addUrlParameter($gotourl,"id=".$a->id,true); } -leave_insert($dbconn,$gotourl,$msg); +leave_insert($dbconn,$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/bugtracking/bug_ins.php =================================================================== --- trunk/php/bugtracking/bug_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/bugtracking/bug_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -37,7 +37,8 @@ if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } -$msg = ''; +$msg = ''; +$info = ''; $b = new bug($dbconn); if ( isset($_POST['Xid']) ) { @@ -235,18 +236,18 @@ $gotourl = addUrlParameter($gotourl,"pic_path=". $file['name'],true); } } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($b->gettype(),$b)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$b,$gotourl)); $msg = addLine($msg,$b->run_check_hook()); -# -# Old Bug -# +// +// Old Bug +// if ( $b->id > 0 ) { $newlines = ''; if ( !empty($description) ) { @@ -428,7 +429,7 @@ $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /* * SVN Info $Id$ * $Author$ Modified: trunk/php/db/table_custom_example.pinc =================================================================== --- trunk/php/db/table_custom_example.pinc 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/db/table_custom_example.pinc 2013-12-05 08:44:55 UTC (rev 1193) @@ -145,7 +145,7 @@ 'lang' => "FLOAT3", 'hlang' => "help for FLOAT3", 'overview' => true, // show in overview - 'perm_see' => array(10010), // list of team/user ids + 'perm_see' => array(2192,10010), // list of team/user ids who may see this 'required' => true); // // A boolean field Modified: trunk/php/expense/expense_ins.php =================================================================== --- trunk/php/expense/expense_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/expense/expense_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert and ECOsoft.net + * Copyright 1999 - 2013 by Gero Kohnert and ECOsoft.net * * 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 @@ -13,6 +13,8 @@ * @module expense_ins * @package expense */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -23,7 +25,8 @@ loadmodules('expense','ins'); loadmodule('expense'); -$msg = ''; +$msg = ''; +$info = ''; /* Check Input */ $gotourl = 'expense/expense_new.php'; @@ -191,11 +194,11 @@ $gotourl= addUrlParameter($gotourl,"aid=". $_POST['aid'],true); } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($u->gettype(),$u)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl)); $msg = addLine($msg,$u->run_check_hook()); @@ -210,7 +213,7 @@ } } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/file/file_ins.php =================================================================== --- trunk/php/file/file_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/file/file_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -28,7 +28,8 @@ loadmodules('file','ins'); loadmodule('file'); -$msg = ''; +$msg = ''; +$info = ''; if ( empty($_REQUEST['gotourl']) ) { $gotourl = 'file/file_new.php'; @@ -163,19 +164,13 @@ } } -# Manage the list of links -# unset($f->links); -# foreach($links as $l) { -# $f->addReference($l); -# } +// check for at least one reference +if (count($f->links) == 0) { + $msg = addLine($msg,sprintf($lang['Err0009'],$lang['FileReference'])); +} - # check for at least one reference - if (count($f->links) == 0) { - $msg = addLine($msg,sprintf($lang['Err0009'],$lang['FileReference'])); - } - $file = 'none'; -# Hack for Konquerer +// Hack for Konquerer if ( isset($_REQUEST['file1']) ) { $file = $_REQUEST['file1']; if ( $file != "none" ) { @@ -193,7 +188,7 @@ $file = 'none'; } -# via filesystem import +// via filesystem import $import = false; if ( ($tutos['file_local_allow'] == 1) && isset($_REQUEST['file2']) && $_REQUEST['file2'] != '' ) { $file = basename($_REQUEST['file2']); // Strip possible dirnames for security @@ -219,7 +214,7 @@ } $name = ""; -# New files need a path ! +// New files need a path ! if ( ($file == "none") && ($f->id == -1) ) { $msg = addLine($msg,sprintf($lang['Err0009'],$lang['FileName'])); $gotourl = addBadField($gotourl,'file1',true); @@ -295,11 +290,11 @@ } } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($f->gettype(),$f)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$f,$gotourl)); $msg = addLine($msg,$f->run_check_hook()); Modified: trunk/php/group/group_ins.php =================================================================== --- trunk/php/group/group_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/group/group_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2012 by Gero Kohnert + * Copyright 2002 - 2013 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 @@ -13,6 +13,8 @@ * @module group_ins * @package group */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -23,7 +25,8 @@ loadmodules('group','ins'); loadmodule("group"); -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'group/group_new.php'; $obj = new group($dbconn); @@ -42,12 +45,11 @@ if ( isset($_POST['desc']) ) { $gotourl = addUrlParameter($gotourl,"desc=". UrlEncode($_POST['desc']),true); } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj)); - -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl)); $msg = addLine($msg,$obj->run_check_hook()); @@ -61,7 +63,7 @@ $gotourl = $obj->getURL(); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/module_template/AAA_ins.php =================================================================== --- trunk/php/module_template/AAA_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/module_template/AAA_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <? /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -13,6 +13,8 @@ * @module AAA_ins * @package AAA */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -23,7 +25,8 @@ loadmodules('AAA','ins'); loadmodule('AAA'); -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'module_template/AAA_new.php'; if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); @@ -76,7 +79,7 @@ } } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/note/note_ins.php =================================================================== --- trunk/php/note/note_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/note/note_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -13,6 +13,8 @@ * @module note_ins * @package note */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -23,7 +25,8 @@ loadmodules('note','ins'); loadmodule('note'); -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'note/note_new.php'; $u = new note($dbconn); @@ -70,11 +73,11 @@ $msg = addLine($msg,sprintf($lang['Err0038'],$lang['NoteRemember'])); } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($u->gettype(),$u)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl)); $msg = addLine($msg,$u->run_check_hook()); @@ -89,7 +92,7 @@ if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/rate/rate_ins.php =================================================================== --- trunk/php/rate/rate_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/rate/rate_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert and ecosoft + * Copyright 1999 - 2013 by Gero Kohnert and ecosoft * * 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 @@ -13,6 +13,8 @@ * @module rate_ins * @package rate */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -24,18 +26,19 @@ loadmodule("rate"); /* Check Input */ + +$msg = ''; +$info = ''; $gotourl = 'rate/rate_new.php'; +$u = new rate($dbconn); -$msg = ''; -$u = new rate($dbconn); - if ( isset($_POST['Xid']) ) { $u = $u->read($_POST['Xid'],$u); $gotourl= addUrlParameter($gotourl,"id=". $u->id,true); } else { $u->creator = $current_user; } -# name +// name if ( empty($_POST['name']) ) { $msg = addLine($msg,sprintf($lang['Err0009'],$lang['RateName'])); $gotourl = addBadField($gotourl,'name',true); @@ -43,26 +46,26 @@ $u->setName(trim($_POST['name'])); $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($u->name),true); } -# cph +// cph if ( empty($_POST['cph']) ) { $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Rate'])); } else { $u->setCph($_POST['cph']); $gotourl= addUrlParameter($gotourl,"cph=". UrlEncode($u->cph),true); } -# currency +// currency if ( empty($_POST['currency']) ) { $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Rate'])); } else { $u->setCurrency($_POST['currency']); $gotourl= addUrlParameter($gotourl,"currency=". UrlEncode($u->currency),true); } -# priority +// priority if ( isset($_POST['priority']) ) { $u->setPriority($_POST['priority']); $gotourl= addUrlParameter($gotourl,"priority=". UrlEncode($u->priority),true); } -# tax +// tax if ( isset($_POST['vat']) ) { $val = trim($_POST['vat']); if (checkfloat($val) ) { @@ -70,22 +73,22 @@ } $gotourl= addUrlParameter($gotourl,"vat=". UrlEncode($_POST['vat']),true); } -# state +// state if ( isset($_POST['state']) ) { $u->setState($_POST['state']); $gotourl= addUrlParameter($gotourl,"state=". UrlEncode($u->state),true); } -# role +// role if ( isset($_POST['role_id']) ) { $u->setRole($_POST['role_id']); $gotourl= addUrlParameter($gotourl,"role_id=". UrlEncode($u->role_id),true); } -# worker +// worker if ( isset($_POST['worker']) ) { $u->setWorker($_POST['worker']); $gotourl= addUrlParameter($gotourl,"worker=". UrlEncode($u->worker),true); } -# reference +// reference if ( empty($_POST['link_id']) ) { $msg = addLine($msg,"No Link ID given !"); } else { @@ -94,11 +97,11 @@ $u->read_reference(); } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($u->gettype(),$u)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl)); $msg = addLine($msg,$u->run_check_hook()); @@ -109,7 +112,7 @@ $gotourl = $u->ref->getURL(); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/reminder/reminder_ins.php =================================================================== --- trunk/php/reminder/reminder_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/reminder/reminder_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2012 by Gero Kohnert + * Copyright 2004 - 2013 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 @@ -13,6 +13,8 @@ * @module reminder_ins * @package reminder */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -23,7 +25,8 @@ loadmodules('reminder','ins'); loadmodule('reminder'); -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'reminder/reminder_new.php'; if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); @@ -82,7 +85,7 @@ } else { $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ReminderType'])); } -if ($type == REMINDER_SIMPLE) +if ($type == REMINDER_SIMPLE) $obj->setOffset(0); else $obj->setOffset($_POST['offset']); @@ -94,11 +97,11 @@ $msg = addLine($msg,$obj->calc_date($r)); $obj->setRemindDate($r); -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl)); $msg = addLine($msg,$obj->run_check_hook()); @@ -111,7 +114,7 @@ $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/resource/resource_ins.php =================================================================== --- trunk/php/resource/resource_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/resource/resource_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2001 - 2012 by Gero Kohnert + * Copyright 2001 - 2013 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 @@ -13,6 +13,8 @@ * @module resource_ins * @package resource */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -27,7 +29,8 @@ if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } -$msg = ''; +$msg = ''; +$info = ''; $b = new resource($dbconn); if ( isset($_POST['Xid']) ) { @@ -47,12 +50,11 @@ $b->setDesc(trim($_POST['desc'])); $gotourl = addUrlParameter($gotourl,"desc=". UrlEncode($b->desc),true); } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($b->gettype(),$b)); - -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$b,$gotourl)); $msg = addLine($msg,$b->run_check_hook()); @@ -66,7 +68,7 @@ } } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /* * SVN Info $Id$ * $Author$ Modified: trunk/php/scrum/sprint_ins.php =================================================================== --- trunk/php/scrum/sprint_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/scrum/sprint_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2012 by Gero Kohnert + * Copyright 2004 - 2013 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 @@ -13,6 +13,8 @@ * @module stuff_ins * @package stuff */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -24,10 +26,11 @@ loadmodule('scrumsprint'); $gotourl = 'scrum/sprint_new.php'; -$msg = ''; +$msg = ''; +$info = ''; -$obj = new scrumsprint($dbconn); -$preobj = new scrumsprint($dbconn); +$obj = new scrumsprint($dbconn); +$preobj = new scrumsprint($dbconn); if ( isset($_POST['Xid']) ) { $obj = $obj->read($_POST['Xid'],$obj); @@ -203,11 +206,11 @@ } } } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl)); // Check @@ -235,7 +238,7 @@ $dbconn->Commit("WORK"); $gotourl = $obj->getURL(); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/stuff/stuff_ins.php =================================================================== --- trunk/php/stuff/stuff_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/stuff/stuff_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2012 by Gero Kohnert + * Copyright 2004 - 2013 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 @@ -13,6 +13,8 @@ * @module stuff_ins * @package stuff */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -27,7 +29,8 @@ if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } -$msg = ''; +$msg = ''; +$info = ''; $obj = new stuff($dbconn); if ( isset($_POST['Xid']) ) { @@ -158,13 +161,11 @@ $obj->setCurrency(trim($_POST['currency'])); $gotourl = addUrlParameter($gotourl,"currency=". UrlEncode($_POST['currency']),true); } - - -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl)); $msg = addLine($msg,$obj->run_check_hook()); @@ -172,12 +173,12 @@ $dbconn->Begin("WORK"); $msg = addLine($msg,$obj->save()); $dbconn->Commit("WORK"); - $gotourl = $obj->getURL(); + $gotourl = $obj->getURL(); if (isset($_REQUEST['ss'])) { $gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true); } } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/subversion/svn_ins.php =================================================================== --- trunk/php/subversion/svn_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/subversion/svn_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -13,6 +13,8 @@ * @module svn_ins * @package svn */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -23,7 +25,8 @@ loadmodules('svn','ins'); loadmodule('svn'); -$msg = ''; +$msg = ''; +$info = ''; $gotourl = 'subversion/svn_new.php'; $obj = new svn($dbconn); @@ -69,11 +72,11 @@ } $obj->read_reference(); -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($obj->gettype(),$obj)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$obj,$gotourl)); $msg = addLine($msg,$obj->run_check_hook()); @@ -84,7 +87,7 @@ $gotourl = $obj->ref->getURL(); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/team_ins.php =================================================================== --- trunk/php/team_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/team_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -78,7 +78,7 @@ } } -# Permissions +// Permissions $msg = addLine($msg,parse_permission_form($t)); if (!isset($_POST['add']) ) { @@ -92,12 +92,12 @@ $del = $_POST['del']; } -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($t->gettype(),$t)); -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$t,$gotourl)); $msg = addLine($msg,$t->run_check_hook()); Modified: trunk/php/url/urlcat_ins.php =================================================================== --- trunk/php/url/urlcat_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/url/urlcat_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -10,6 +10,8 @@ * @module urlcat_ins * @package url */ +$tutos['files'][__FILE__] = '$Rev$'; + $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; @@ -21,7 +23,8 @@ loadmodule('urlcat'); /* Check Input */ -$msg = ""; +$msg = ''; +$info = ''; $u = new urlcat($dbconn); $gotourl = 'url/urlcat_new.php'; @@ -40,14 +43,11 @@ $u->setName($_POST['urlcatname']); $gotourl= addUrlParameter($gotourl,"urlcatname=". UrlEncode($u->name),true); } - - -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields($u->gettype(),$u)); - -# other modules +// other modules $msg = addLine($msg,module_parseforms($current_user,$u,$gotourl)); $msg = addLine($msg,$u->run_check_hook()); @@ -59,7 +59,7 @@ $gotourl = $u->getUrl(); } -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/user.pinc =================================================================== --- trunk/php/user.pinc 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/user.pinc 2013-12-05 08:44:55 UTC (rev 1193) @@ -324,6 +324,7 @@ $r = $this->dbconn->Exec($q); $n = $r->numrows(); $a = 0; + while ( $a < $n ) { $p = $r->get($a, "perm"); $obj_id = (integer)$r->get($a, "obj_id"); @@ -675,13 +676,13 @@ return true; } // check users permissions - if ( ($this->p[$feature] & $level) ) { + if (isset($this->p[$feature]) && ($this->p[$feature] & $level) ) { return true; } // Check team permissions foreach($this->teams as $f) { - if ( ($f->p[$feature] & $level) ) { + if (isset($this->p[$feature]) && ($f->p[$feature] & $level) ) { return true; } } Modified: trunk/php/user_ins.php =================================================================== --- trunk/php/user_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/user_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2012 by Gero Kohnert + * Copyright 1999 - 2013 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 @@ -10,6 +10,8 @@ * @module user_ins * @package user */ +$tutos['files'][__FILE__] = '$Rev$'; + require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'appointment.pinc'; @@ -19,7 +21,8 @@ check_user(); loadmodules('user','ins'); -$msg = ''; +$msg = ''; +$info = ''; $saveadr = false; $saveloc = false; $u = new tutos_user($dbconn); @@ -102,8 +105,11 @@ $msg = addLine($msg,$lang['Err0041']); } } +if ( ! $u->mod_ok() ) { + $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$u->getType()])); +} -# Holidays +// Holidays $u->holiday = array(); if (isset($_POST['h']) ) { foreach (array_unique($_POST['h']) as $i => $f) { @@ -111,7 +117,7 @@ $u->holiday[$f] = 1; } } -# Namedays +// Namedays $u->nameday = array(); if (isset($_POST['nd']) ) { foreach (array_unique($_POST['nd']) as $i => $f) { @@ -119,7 +125,7 @@ $u->nameday[$f] = 1; } } -# workdays +// workdays if (isset($_POST['wd']) ) { $u->workday = array(); foreach (array_unique($_POST['wd']) as $i => $f) { @@ -127,16 +133,12 @@ $u->workday[] = $f; } } -# Weekstart +// Weekstart if (isset($_POST['ws']) ) { $u->weekstart = $_POST['ws']; $gotourl= addUrlParameter($gotourl,"ws=". UrlEncode($u->weekstart),true); } -if ( ! $u->mod_ok() ) { - $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$u->getType()])); -} - -# RowIcons +// RowIcons $u->rowiconsbefore = array(); if ( isset($_POST['rib']) ) { foreach (array_unique($_POST['rib']) as $i => $f) { @@ -152,9 +154,9 @@ } } -# Check that there is one admin left +// Check that there is one admin left if ( $u->admin == 1 && ($_POST['admin'] == 0) ) { - $q = "SELECT * FROM ". $dbconn->prefix ."people WHERE ". $dbconn->colname("admin") ." = 1"; + $q = 'SELECT * FROM '.$dbconn->prefix .$table['people'][name].' WHERE '.$dbconn->colname("admin") .' = 1'; $r = $dbconn->Exec($q); $n = $r->numrows(); if ( $n == 1 ) { @@ -162,14 +164,14 @@ } $r->free(); } -# Disabled +// Disabled if ( isset($_POST['disabled']) ) { $u->setDisabled($_POST['disabled']); } else { $u->setDisabled(0); } -# will set user-default-acl from input +// will set user-default-acl from input $u->acldefault = array(); if ( isset($_POST['r']) ) { foreach($_POST['r'] as $i => $f) { @@ -203,7 +205,7 @@ $u->updatepw = 1; } -# TEAM HANDLING +// TEAM HANDLING $newteamlist = array(); if (isset($_POST['teams'])) { foreach($_POST['teams'] as $i => $f) { @@ -211,10 +213,9 @@ } } - -# -# Parse additional custom fields -# +// +// Parse additional custom fields +// $msg = addLine($msg,parse_custom_fields("people",$u)); // Permissions @@ -302,8 +303,8 @@ $gotourl= addUrlParameter($gotourl,"id=". $u->id,true); } -leave_insert($dbconn,$gotourl,$msg); -/* +leave_insert($dbconn,$gotourl,$msg,$info); +/** * SVN Info $Id$ * $Author$ */ Modified: trunk/php/watchlist/watchlist_ins.php =================================================================== --- trunk/php/watchlist/watchlist_ins.php 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/watchlist/watchlist_ins.php 2013-12-05 08:44:55 UTC (rev 1193) @@ -22,8 +22,9 @@ loadmodule("watchlist"); /* Check Input */ -$msg = ""; -$w = new Watchlist($dbconn); +$msg = ''; +$info = ''; +$w = new Watchlist($dbconn); if ( empty($_REQUEST['gotourl']) && isset($_SERVER['HTTP_REFERER']) ) { Fatal_Error("Missing gotourl"); } @@ -64,8 +65,7 @@ $msg = addLine($msg,$w->add($obj->id,$a->id)); $dbconn->Commit("WORK"); } - -leave_insert($dbconn,'../'.$gotourl,$msg); +leave_insert($dbconn,'../'.$gotourl,$msg,$info); /** * SVN Info $Id$ * $Author$ Modified: trunk/php/webelements.p3 =================================================================== --- trunk/php/webelements.p3 2013-12-04 07:24:57 UTC (rev 1192) +++ trunk/php/webelements.p3 2013-12-05 08:44:55 UTC (rev 1193) @@ -2763,7 +2763,7 @@ // handle default selection if (isset($_REQUEST['def_'.$fld]) && $_REQUEST['def_'.$fld] == 1) { // remove - $info = addLine($info,'default:'.$fld); + //$info = addLine($info,'default:'.$fld); $obj->def_tutos[$fld] = true; write_config_value($dbconn,$fld,$tutos['cfg'][$fld]['section'],$obj); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |