tutos-commits Mailing List for TUTOS (Page 25)
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gok...@us...> - 2012-07-13 15:42:48
|
Revision: 715
http://tutos.svn.sourceforge.net/tutos/?rev=715&view=rev
Author: gokohnert
Date: 2012-07-13 15:42:37 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/base.pinc
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-07-13 15:27:45 UTC (rev 714)
+++ trunk/php/base.pinc 2012-07-13 15:42:37 UTC (rev 715)
@@ -1348,8 +1348,8 @@
// save for future use
if($tutos['memcache'] != null) {
- $memid = $this->dbconn->db->systemid.'_TT'.$id;
- $tutos['memcache']->set($memid,$obj->getTypeId(),0,$tutos['timetolive']*360);
+ $memid = $this->dbconn->db->systemid.'_TT'.$x;
+ $tutos['memcache']->set($memid,$this->getTypeId(),0,$tutos['timetolive']*360);
}
return $msg;
}
@@ -1759,4 +1759,4 @@
return array($r,$o);
}
}
-?>
\ 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...> - 2012-07-13 15:27:51
|
Revision: 714
http://tutos.svn.sourceforge.net/tutos/?rev=714&view=rev
Author: gokohnert
Date: 2012-07-13 15:27:45 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
added speedup for deleted objects / more memcache (flush) support
Modified Paths:
--------------
trunk/php/admin/memcache.php
trunk/php/admin_show.php
trunk/php/base.pinc
trunk/php/webelements.p3
Modified: trunk/php/admin/memcache.php
===================================================================
--- trunk/php/admin/memcache.php 2012-07-13 15:20:47 UTC (rev 713)
+++ trunk/php/admin/memcache.php 2012-07-13 15:27:45 UTC (rev 714)
@@ -1,9 +1,9 @@
<?php
/**
- * Copyright 2001 - 2010 by Gero Kohnert
+ * Copyright 2001 - 2012 by Gero Kohnert
*
- * $Header: /cvsroot/tutos/tutos/php/admin/memcache.php,v 1.3 2010/02/25 19:20:14 gokohnert Exp $
- * $Author$
+ * SVN Info $Id$
+ * $Author$
*
* @modulegroup ADMIN
* @module memcache
@@ -60,20 +60,38 @@
* preparation
*/
Function prepare() {
- global $current_user,$tutos,$msg;
+ global $current_user,$tutos,$msg,$info;
$this->name = 'Memcache Info';
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 ( !$current_user->isadmin() || !class_exists("memcache") || $tutos['memcache'] == null) {
+ if ( !$this->user->isadmin() || !class_exists("memcache") || $tutos['memcache'] == null) {
$msg .= 'memcache isn\'t installed or isn\'t activated see $tutos[memcache_hosts] in config !';
$this->stop = true;
return;
}
+ if (isset($_GET['action']) && $_GET['action'] == 'flush') {
+ $x = $tutos['memcache']->flush();
+ if ($x === false)
+ $msg = addLine($msg,'Flushing failed !');
+ else
+ $info = addLine($info,'Memory flushed !');
+ }
+
+ $url = 'admin/memcache.php';
+ $url = addUrlParameter($url, "action=flush");
+ $x = array( URL => $url,
+ TEXT => 'Flush Memcache',
+ INFO => 'Info about optimization',
+ 'target' => 'admin',
+ CATEGORY => array('admin')
+ );
+ $this->addMenu($x);
+
}
}
session_write_close();
Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php 2012-07-13 15:20:47 UTC (rev 713)
+++ trunk/php/admin_show.php 2012-07-13 15:27:45 UTC (rev 714)
@@ -594,6 +594,26 @@
$r .= $this->showdata(apache_get_version(), 9);
$r .= $this->ContentRowEnd();
}
+
+ $r .= $this->ContentRowStart();
+ $r .= $this->showfield("Memcache");
+ $d = '';
+ if($tutos['memcache'] != null) {
+ $d = $tutos['memcache']->getVersion().' ';
+ $dd = $tutos['memcache']->getStats();
+ if (is_array($dd)) {
+ if ($dd['cmd_get'] != 0)
+ $ratio = 100.0 * ($dd['get_hits'] / $dd['cmd_get']);
+ else
+ $ratio = '?';
+ $d .= ' (hits:'.$dd['get_hits'].' misses:'.$dd['get_misses'] .' ratio '.sprintf('%.2f %%',$ratio).')';
+ }
+ } else {
+ $d = 'not enabled';
+ }
+ $r .= $this->showdata($d,9);
+ $r .= $this->ContentRowEnd();
+
$r .= $this->debug_info();
$r .= $this->ContentRowStart();
@@ -693,7 +713,7 @@
* action
*/
Function action() {
- global $msg,$lang,$tutos;
+ global $msg,$lang,$tutos,$info;
if ( $_GET['action'] == "kill" ) {
$file = $_GET['mark'];
@@ -719,9 +739,9 @@
return;
}
if ( ! $this->user->isAdmin() ) {
- $msg .= "Session for ". $data['username'] ." NOT killed\nOnly superusers are allowed to kill sessions";
+ $msg = addLine($msg,"Session for ". $data['username'] ." NOT killed. Only superusers are allowed to kill sessions");
} else {
- $msg .= "Session for ". $data['username'] ." killed";
+ $info = addLine($info,"Session for ". $data['username'] ." killed");
unlink($filename);
}
}
@@ -739,9 +759,9 @@
$this->name = $lang['AdminShow'];
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"));
if ( $tutos[demo] == 1 ) {
- $msg .= $this->error("exceptionally enabled for this demo");
+ $msg = addLine($msg,$this->error("exceptionally enabled for this demo"));
} else {
$this->stop = true;
return;
@@ -762,7 +782,6 @@
$_GET['xo'] = 2;
}
-
$x = array( URL => 'user_new.php',
TEXT => $lang['UserCreate'],
INFO => $lang['UserCreate'],
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-07-13 15:20:47 UTC (rev 713)
+++ trunk/php/base.pinc 2012-07-13 15:27:45 UTC (rev 714)
@@ -1328,6 +1328,8 @@
* Save the object id (used for faster getObject)
*/
function save_obj_id() {
+ global $tutos;
+
if ( $this->id == -1 ) return;
if ( $this->gettypeid() == noobject) return;
@@ -1340,9 +1342,15 @@
$q = 'DELETE from '. $this->dbconn->prefix.$this->tablename_hash .' where id = '. $x ;
$r = $this->dbconn->Exec($q);
$r->free();
- $q = 'INSERT into '. $this->dbconn->prefix.$this->tablename_hash .' (id,tutostype) values ('. $x .','. $this->gettypeid() .')';
+ $q = 'INSERT into '. $this->dbconn->prefix.$this->tablename_hash .' (id,tutostype) values ('. $x .','. $this->getTypeId() .')';
$r = $this->dbconn->Exec($q);
$r->free();
+
+ // save for future use
+ if($tutos['memcache'] != null) {
+ $memid = $this->dbconn->db->systemid.'_TT'.$id;
+ $tutos['memcache']->set($memid,$obj->getTypeId(),0,$tutos['timetolive']*360);
+ }
return $msg;
}
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2012-07-13 15:20:47 UTC (rev 713)
+++ trunk/php/webelements.p3 2012-07-13 15:27:45 UTC (rev 714)
@@ -1695,7 +1695,7 @@
* find the object from a given id by scanning the tables
*
*/
-Function scanObject(tutos_db &$dbconn,$id) {
+Function scanObject(tutos_db $dbconn,$id) {
global $tutos,$table;
$type = noobject;
@@ -1805,6 +1805,10 @@
}
switch ($type) {
+ case 0:
+ // meanwhile deleted
+ $ref = -1;
+ break;
case noobject:
// search modules (scan failed)
foreach ($tutos[modules] as $r => $x) {
@@ -1904,10 +1908,15 @@
$g_hash['fail']++;
$ref->save_obj_id();
}
- if ( ! is_object($ref) ) {
+ if ( ! is_object($ref) && $type != 0) {
$g_hash[$id] = -1;
$g_hash['fail2']++;
- // error_log('getObject failed for '.$id .' '.TUTOS_backtrace()."\n",3,$tutos[errlog]);
+ // save for future use that this is menwhile deleted
+ if($tutos['memcache'] != null) {
+ $memid = $dbconn->db->systemid.'_TT'.$id;
+ $tutos['memcache']->set($memid,0,0,$tutos['timetolive']*360);
+ }
+ error_log('getObject failed for '.$id .' '.TUTOS_backtrace()."\n",3,$tutos[errlog]);
}
if (is_object($current_user) && ($current_user->id != $save_cu)) {
Fatal_Error('user escalation!','OLD:'.$save_cu.' -> '.$current_user);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-13 15:20:57
|
Revision: 713
http://tutos.svn.sourceforge.net/tutos/?rev=713&view=rev
Author: gokohnert
Date: 2012-07-13 15:20:47 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
forgot something
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-07-13 14:09:40 UTC (rev 712)
+++ trunk/php/bugtracking/bug.pinc 2012-07-13 15:20:47 UTC (rev 713)
@@ -49,8 +49,7 @@
$stc = getObject($current_user->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $x = new Bug($current_user->dbconn);
- $stc->initByArray('BugStates',$x->c_state);
+ $stc->initByArray('BugStates',Bug::$c_state);
}
$additional = array();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-13 14:09:54
|
Revision: 712
http://tutos.svn.sourceforge.net/tutos/?rev=712&view=rev
Author: gokohnert
Date: 2012-07-13 14:09:40 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
a lot of msg/info updating / memcache Types
Modified Paths:
--------------
trunk/php/acl.pinc
trunk/php/acl_ins.php
trunk/php/acl_new.php
trunk/php/acl_overview.php
trunk/php/address_ins.php
trunk/php/address_new.php
trunk/php/address_overview.php
trunk/php/admin/main_config.php
trunk/php/app_ins.php
trunk/php/app_new.php
trunk/php/app_new_r.php
trunk/php/app_overview.php
trunk/php/base.pinc
trunk/php/bugtracking/bug_ins.php
trunk/php/bugtracking/bug_overview.php
trunk/php/checklist/checkfield_ins.php
trunk/php/checklist/checklist_ins.php
trunk/php/company_ins.php
trunk/php/company_overview.php
trunk/php/company_show.php
trunk/php/custom.pinc
trunk/php/db.p3
trunk/php/delobject.php
trunk/php/department_ins.php
trunk/php/department_show.php
trunk/php/expense/expense_ins.php
trunk/php/file/file.pinc
trunk/php/file/file_ins.php
trunk/php/file/file_new.php
trunk/php/group/group2_ins.php
trunk/php/group/group_ins.php
trunk/php/installation/installation_ins.php
trunk/php/installation/installation_new.php
trunk/php/installation/installation_overview.php
trunk/php/installation/installation_show.php
trunk/php/invoice/invoice_ins.php
trunk/php/layout/new2_layout.pinc
trunk/php/mail.pinc
trunk/php/mail_ins.php
trunk/php/mailbox/mailbox_ins.php
trunk/php/mailbox/mailbox_new.php
trunk/php/module_template/AAA_ins.php
trunk/php/module_template/AAA_new.php
trunk/php/module_template/AAA_overview.php
trunk/php/module_template/AAA_show.php
trunk/php/note/note_ins.php
trunk/php/note/note_show.php
trunk/php/product_overview.php
trunk/php/product_role_ins.php
trunk/php/product_role_new.php
trunk/php/rate/rate_ins.php
trunk/php/rate/rate_show.php
trunk/php/reminder/reminder_ins.php
trunk/php/reminder/reminder_show.php
trunk/php/resource/resource_ins.php
trunk/php/rss/rss_ins.php
trunk/php/scrum/log_ins.php
trunk/php/scrum/log_show.php
trunk/php/scrum/mtable.pinc
trunk/php/scrum/scrum.pinc
trunk/php/scrum/sprint_ins.php
trunk/php/scrum/sprint_show.php
trunk/php/stc/stc_ins.php
trunk/php/stuff/stuff_ins.php
trunk/php/stuff/stuff_show.php
trunk/php/subversion/svn_ins.php
trunk/php/task_ins.php
trunk/php/task_new.php
trunk/php/task_overview.php
trunk/php/team.pinc
trunk/php/team_ins.php
trunk/php/team_overview.php
trunk/php/team_show.php
trunk/php/testmanager/testcase_ins.php
trunk/php/testmanager/testrun_overview.php
trunk/php/testmanager/testsuite_ins.php
trunk/php/testmanager/testsuite_new.php
trunk/php/testmanager/testsuite_show.php
trunk/php/timetrack/timetrack_ins.php
trunk/php/url/url_ins.php
trunk/php/url/urlcat_ins.php
trunk/php/user_del.php
trunk/php/user_ins.php
trunk/php/user_overview.php
trunk/php/watchlist/watchlist_ins.php
trunk/php/webelements.p3
Modified: trunk/php/acl.pinc
===================================================================
--- trunk/php/acl.pinc 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/acl.pinc 2012-07-13 14:09:40 UTC (rev 712)
@@ -770,7 +770,7 @@
*/
function acl_action() {
// edit permissions in another dialog
- $url = "acl_new.php";
+ $url = 'acl_new.php';
foreach ($_REQUEST['mark'] as $key => $val) {
$url = addUrlParameter($url,"id[]=". $val,true);
}
Modified: trunk/php/acl_ins.php
===================================================================
--- trunk/php/acl_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/acl_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -30,10 +30,10 @@
$list = array();
$x = getObject($dbconn,$id);
if ( !is_object($x) ) {
- $msg = addLine(sprintf($lang['Err0040'],"Object ". $id),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],"Object ". $id));
} else if ( ! $current_user->isadmin() && ! $x->del_ok() ) {
// we need delete permissions but talk about modify !
- $msg = addLine(sprintf($lang['Err0024'],$lang[$x->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$x->getType()]));
} else {
$list[] = &$x;
}
@@ -82,7 +82,7 @@
$gotourl = 'mytutos.php';
if ( !isset($_POST['id']) ) {
- $msg = addLine('Missing ID',$msg);
+ $msg = addLine($msg,'Missing ID');
} else {
if (! is_Array($_POST['id'])) {
$id[0] = $_POST['id'];
@@ -146,7 +146,7 @@
acl_raise($val,$f,$tutos[delok]);
}
}
- $msg = addLine(acl_save($val),$msg);
+ $msg = addLine($msg,acl_save($val));
if ($val->getType() != "url") {
$gotourl = $val->getURL();
}
Modified: trunk/php/acl_new.php
===================================================================
--- trunk/php/acl_new.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/acl_new.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -368,7 +368,7 @@
$this->feature_info = null;
if ( ! isset($_GET['id']) ) {
- $msg = addLine("Missing ID",$msg);
+ $msg = addLine($msg,"Missing ID");
$this->stop = true;
return;
}
@@ -394,11 +394,11 @@
foreach($id as $val) {
$x = getObject($this->dbconn,$val);
if ( !is_object($x) ) {
- $msg = addLine(sprintf($lang['Err0040'],"Object ". $val),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],"Object ". $val));
$this->stop = true;
} else if ( ! $current_user->isadmin() && ! $x->del_ok() ) {
// we need delete permissions but talk about modify !
- $msg = addLine(sprintf($lang['Err0024'],$lang[$x->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$x->getType()]));
$this->stop = true;
} else {
$this->obj[] = &$x;
Modified: trunk/php/acl_overview.php
===================================================================
--- trunk/php/acl_overview.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/acl_overview.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -107,6 +107,7 @@
$g = $result->get($a, "id");
$obj = getObject($this->dbconn,$g);
if ( !is_object($obj) || ($obj->id == -1) || (! is_subclass_of($obj,'tutos_base')) ) {
+ error_log('obj '.$g .' '.$obj."\n",3,$tutos[errlog]);
$a++;
if ( $this->type == "" ) {
$obj = new Dummy($this->dbconn);
@@ -316,24 +317,24 @@
* action
*/
Function action() {
- global $msg,$lang;
+ global $msg,$lang,$info;
if ( $_GET['action'] == -2 ) {
$this->dbconn->Begin("WORK");
foreach ($_GET['mark'] as $val) {
$b = getObject($this->dbconn,$val);
if ( ! is_subclass_of($b,'tutos_base') ) {
- $msg .= 'Unknown marked object: '. $val.'. ';
+ $msg = addLine($msg,'Unknown marked object: '. $val.'.');
continue;
}
if ( $b->id != $val ) {
continue;
}
if ( method_exists($b,"del_ok") && method_exists($b,"delete") && $b->del_ok() ) {
- $msg .= $lang['Delete'] .": ". $lang[$b->getType()] ." ". myentities($b->getFullName()) ."<br />";
- $msg .= $b->delete();
+ $info = addLine($info,$lang['Delete'] .": ". $lang[$b->getType()] ." ". myentities($b->getFullName()));
+ $msg = addLine($msg,$b->delete());
} else {
- $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]);
+ $msg = addLine($msg,$b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]));
}
unset($b);
}
@@ -379,7 +380,7 @@
$this->link1 = addUrlParameter($this->link1,"maxshow=".$_GET['maxshow']);
}
if ( !$this->user->isAdmin()) {
- $msg .= sprintf($lang['Err0022'],$lang['ACLOverview']);
+ $msg = addLine($msg,sprintf($lang['Err0022'],$lang['ACLOverview']));
$this->stop = true;
return;
}
Modified: trunk/php/address_ins.php
===================================================================
--- trunk/php/address_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/address_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -38,7 +38,7 @@
$a->read_picture();
if ( ! $a->mod_ok() ) {
// Not allowed
- $msg = addLine(sprintf($lang['Err0024'],$lang[$a->getType()],true),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$a->getType()],true));
}
$new = false;
} else {
@@ -50,7 +50,7 @@
$l = $l->read($_POST['loc_id'],$l);
if ( ! $l->mod_ok() ) {
// Not allowed
- $msg = addLine(sprintf($lang['Err0024'],$lang[$l->getType()],true),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$l->getType()],true));
}
}
@@ -59,7 +59,7 @@
if ( !$birthday->checkDMY(true) ) {
- $msg = addLine(sprintf($lang['Err0038'],$lang['AdrBirthday']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0038'],$lang['AdrBirthday']));
} else {
$gotourl= addUrlParameter($gotourl,"bd=". $birthday->getYYYYMMDD(),true);
}
@@ -70,7 +70,7 @@
}
if ( empty($_POST['l_name']) || !isset($_POST['l_name']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['AdrLastName']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['AdrLastName']));
$gotourl = addBadField($gotourl,'l_name',true);
} else {
$l_name = trim($_POST['l_name']);
@@ -116,7 +116,7 @@
if ( 0 != $n) {
$x = new tutos_address($dbconn);
$x->read_result($r,0);
- $msg = addLine(sprintf($lang['Err0039'],$x->getLink()),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0039'],$x->getLink()));
}
$r->free();
}
@@ -130,7 +130,7 @@
// location
$lmsg = $l->parseform();
if ($l->used || ($l->id >0)) {
- $msg = addLine($lmsg,$msg);
+ $msg = addLine($msg,$lmsg);
}
$savefile = 0;
@@ -156,28 +156,28 @@
//
// Parse additional custom fields
//
-$msg = addLine(parse_custom_fields($a->gettype(),$a),$msg);
+$msg = addLine($msg,parse_custom_fields($a->gettype(),$a));
// other modules
-$msg = addLine(module_parseforms($current_user,$a,$gotourl),$msg);
+$msg = addLine($msg,module_parseforms($current_user,$a,$gotourl));
-$msg = addLine($a->run_check_hook(),$msg);
+$msg = addLine($msg,$a->run_check_hook());
if ( $msg == "" ) {
$dbconn->Begin("WORK");
- $msg = addLine($a->save(),$msg);
+ $msg = addLine($msg,$a->save());
$gotourl = $a->getModUrl();
$l->adr_id = $a->id;
$l->ref = $a;
if ($l->used || ($l->id >0)) {
- $msg = addLine($l->save(),$msg);
+ $msg = addLine($msg,$l->save());
$gotourl= addUrlParameter($gotourl,"loc_id=". $l->id,true);
}
if ( $savefile == 1 ) {
$a->pic_file->addReference($a);
$a->pic_file->adr_pic = 1;
- $msg = addLine($a->pic_file->save(),$msg);
+ $msg = addLine($msg,$a->pic_file->save());
$a->pic_id = $a->pic_file->id;
- $msg = addLine($a->save(),$msg);
+ $msg = addLine($msg,$a->save());
}
$dbconn->Commit("WORK");
Modified: trunk/php/address_new.php
===================================================================
--- trunk/php/address_new.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/address_new.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -349,7 +349,7 @@
// Modify Base Address
$this->obj = $this->obj->read($id,$this->obj);
if ( is_numeric($this->obj) && $this->obj == -1 ) {
- $msg = addLine(sprintf($lang['Err0040'],$lang['Address']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Address']));
$this->stop = true;
return;
}
@@ -373,10 +373,10 @@
} else {
$this->loc->lname = $this->obj->loc[$loc_id];
if ($this->loc->id < 0) {
- $msg = addLine(sprintf($lang['Err0040'],$lang[$this->loc->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->loc->getType()]));
$this->stop = true;
} else if ( ! $this->loc->mod_ok() ) {
- $msg = addLine(sprintf($lang['Err0024'],$lang[$this->loc->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->loc->getType()]));
$this->stop = true;
}
}
@@ -458,10 +458,10 @@
}
}
if (($this->obj->id < 0) && !$this->user->feature_ok(useaddressbook,PERM_NEW) ) {
- $msg = addLine(sprintf($lang['Err0054'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
$this->stop = true;
} else if ( ! $this->obj->mod_ok() ) {
- $msg = addLine(sprintf($lang['Err0024'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
$this->stop = true;
}
Modified: trunk/php/address_overview.php
===================================================================
--- trunk/php/address_overview.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/address_overview.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -210,7 +210,7 @@
* action via massupdate
*/
Function action() {
- global $lang,$msg;
+ global $lang,$msg,$info;
if ( $_GET['action'] == -2 ) {
$this->dbconn->Begin("WORK");
@@ -221,10 +221,10 @@
continue;
}
if ( $b->del_ok() ) {
- $msg .= sprintf($lang['AdrBDelInfo'], $b->getFullName()) ."<br />";
- $msg .= $b->delete();
+ $msg = addLine($info,sprintf($lang['AdrBDelInfo'], $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);
}
Modified: trunk/php/admin/main_config.php
===================================================================
--- trunk/php/admin/main_config.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/admin/main_config.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -466,7 +466,7 @@
*
*/
function prepare() {
- global $lang,$msg,$tutos;
+ global $lang,$msg,$info,$tutos;
$this->name = $lang['AdminMainConfig'];
@@ -510,12 +510,12 @@
if (!isset($tutos['password_need_special'])) $tutos['password_need_special'] = 0;
if (isset($_REQUEST['password_max_age']) && !is_numeric($_REQUEST['password_max_age'])) {
- $msg = addLine($this->error('password_max_age: '.$_REQUEST['password_max_age'].' not a number'),$msg);
+ $msg = addLine($msg,$this->error('password_max_age: '.$_REQUEST['password_max_age'].' not a number'));
$this->stop = isset($_REQUEST['save']);
}
if (isset($_REQUEST['smtpport']) && !is_numeric($_REQUEST['smtpport'])) {
- $msg = addLine($this->error('smtpport: '.$_REQUEST['smtpport'].' not a number'),$msg);
+ $msg = addLine($msg,$this->error('smtpport: '.$_REQUEST['smtpport'].' not a number'));
$this->stop = isset($_REQUEST['save']);
}
@@ -618,7 +618,7 @@
config_field_parse($this->dbconn,'maxshort');
config_field_parse($this->dbconn,'CSV_delimiter');
config_field_parse($this->dbconn,'CSV_enclosure');
- $msg = addLine('saving done',$msg);
+ $info = addLine($info,'saving done');
}
}
}
Modified: trunk/php/app_ins.php
===================================================================
--- trunk/php/app_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/app_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -58,7 +58,7 @@
$start = new TUTOS_Date_Time();
$start->setDateTimeF("start");
if ( ( !$start->checkDMY()) || (-1 == $start->getTimeStamp() ) ) {
- $msg = addLine(sprintf($lang['Err0038'],$lang['StartDate']).' '.$start->getDate(),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0038'],$lang['StartDate']).' '.$start->getDate());
$gotourl = addBadField($gotourl,'start',true);
$gotourl = addBadField($gotourl,'jqc_start',true);
} else {
@@ -69,7 +69,7 @@
$end = new TUTOS_Date_Time();
$end->setDateTimeF("end");
if ( ( !$end->checkDMY()) || (-1 == $end->getTimeStamp()) ) {
- $msg = addLine(sprintf($lang['Err0038'],$lang['EndDate']) .' '.$end->getDate(),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0038'],$lang['EndDate']) .' '.$end->getDate());
$gotourl = addBadField($gotourl,'end',true);
} else {
$gotourl= addUrlParameter($gotourl,"end=".$end->getYYYYMMDDHHMM(),true);
@@ -81,7 +81,7 @@
#
if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) {
# Start after End
- $msg = addLine($lang['Err0002'],$msg);
+ $msg = addLine($msg,$lang['Err0002']);
}
@@ -112,11 +112,11 @@
}
if ( count($a->participant) == 0 ) {
- $msg = addLine(sprintf($lang['Err0014'],$lang['Participants']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0014'],$lang['Participants']));
}
if ( !isset($_POST['mod_allow']) ) {
- $msg = addLine(sprintf($lang['Err0014'],$lang['AppChangeOrDel']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0014'],$lang['AppChangeOrDel']));
} else {
$gotourl= addUrlParameter($gotourl,"mod_allow=".$_POST['mod_allow'],true);
$a->mod_allow = $_POST['mod_allow'];
@@ -227,11 +227,11 @@
$a->setProduct(-1);
}
# other modules
-$msg = addLine(module_parseforms($current_user,$a,$gotourl),$msg);
+$msg = addLine($msg,module_parseforms($current_user,$a,$gotourl));
#
# Parse additional custom fields
#
-$msg = addLine(parse_custom_fields('appointment1',$a),$msg);
+$msg = addLine($msg,parse_custom_fields('appointment1',$a));
# check availability of participants and resources
@@ -241,13 +241,13 @@
}
-$msg = addLine($a->run_check_hook(),$msg);
+$msg = addLine($msg,$a->run_check_hook());
##################################################
# End of Checks
##################################################
if ( $msg == "" ) {
$dbconn->Begin("WORK");
- $msg = addLine($a->save(),$msg);
+ $msg = addLine($msg,$a->save());
$dbconn->Commit("WORK");
/* Go back to calendar */
Modified: trunk/php/app_new.php
===================================================================
--- trunk/php/app_new.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/app_new.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -244,7 +244,7 @@
$this->name = $lang['AppointModify'];
$this->obj = $this->obj->read($_GET['id'],$this->obj);
if ( !is_object($this->obj) ) {
- $msg = addLine(sprintf($lang['Err0040'],$lang['Appointment']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Appointment']));
$this->stop = true;
$this->format = "html";
return;
@@ -324,10 +324,10 @@
$this->obj->allowed = $this->obj->mod_ok();
if ( ($this->obj->id < 0) && !$this->user->feature_ok(usecalendar,PERM_NEW) ) {
- $msg = addLine(sprintf($lang['Err0054'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
$this->stop = true;
} else if ( ! $this->obj->mod_ok() ) {
- $msg = addLine(sprintf($lang['Err0024'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
$this->stop = true;
return;
}
Modified: trunk/php/app_new_r.php
===================================================================
--- trunk/php/app_new_r.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/app_new_r.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -223,7 +223,7 @@
$this->name = $lang['AppointModify'];
$this->obj = $this->obj->read($_GET['id'],$this->obj);
if (!is_object($this->obj)) {
- $msg = addLine(sprintf($lang['Err0040'],$lang['appointment']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang['appointment']));
$this->stop = true;
return;
}
@@ -295,10 +295,10 @@
$this->obj->allowed = $this->obj->mod_ok();
if ( ($this->obj->id < 0) && !$this->user->feature_ok(usecalendar,PERM_NEW) ) {
- $msg = addLine(sprintf($lang['Err0054'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0054'],$lang[$this->obj->getType()]));
$this->stop = true;
} else if ( ! $this->obj->mod_ok() ) {
- $msg = addLine(sprintf($lang['Err0024'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$this->obj->getType()]));
$this->stop = true;
}
# menu
Modified: trunk/php/app_overview.php
===================================================================
--- trunk/php/app_overview.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/app_overview.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2011 by Gero Kohnert
+ * Copyright 1999 - 2012 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
@@ -14,12 +14,14 @@
*/
require_once 'webelements.p3';
require_once 'permission.p3';
+
+// Check if user is allowed to use it
+check_user();
+
require_once 'appointment.pinc';
require_once 'product.pinc';
require_once 'group/group.pinc';
-// Check if user is allowed to use it
-check_user();
loadmodules('appointment','overview');
loadlayout();
@@ -166,11 +168,12 @@
$this->result->free();
return $r;
}
+
/**
* action
*/
Function action() {
- global $lang,$msg;
+ global $lang,$msg,$info;
if ( $_REQUEST['action'] == -2 ) {
$this->dbconn->Begin("WORK");
@@ -181,16 +184,17 @@
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 />";
+ $msg = addLine($msg,$b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]));
}
unset($b);
}
$this->dbconn->Commit("WORK");
}
}
+
/**
* prepare
*/
@@ -238,7 +242,7 @@
if ( isset($_GET['link_id']) ) {
if (false == is_numeric($_GET['link_id'])) {
- $msg .= sprintf($lang['Err0012'],"link_id",$_GET['link_id']);
+ $msg = addLine($msg,sprintf($lang['Err0012'],"link_id",$_GET['link_id']));
$this->stop = true;
}
$obj = getObject($this->dbconn,$_GET['link_id']);
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/base.pinc 2012-07-13 14:09:40 UTC (rev 712)
@@ -1350,6 +1350,8 @@
* delete the object id (used for faster getObject)
*/
function del_obj_id() {
+ global $tutos;
+
$msg = '';
$q = 'DELETE FROM '. $this->dbconn->prefix.$this->tablename_hash .' where id = '. $this->id;
$r = $this->dbconn->Exec($q);
@@ -1357,6 +1359,10 @@
$q = 'DELETE FROM '. $this->dbconn->prefix.$this->tablename_rel .' where obj_id = '. $this->id.' or rel_id = '.$this->id;
$r = $this->dbconn->Exec($q);
$r->free();
+ if($tutos['memcache'] != null) {
+ $memid = $this->dbconn->db->systemid.'_TT'.$this->id;
+ $tutos['memcache']->delete($memid,0);
+ }
return $msg;
}
Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/bugtracking/bug_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -54,7 +54,7 @@
}
if ( empty($_POST['name']) || !isset($_POST['name']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugID']),$msg);
+ $msg = addLine(sprintf($msg,$lang['Err0009'],$lang['BugID']));
$gotourl = addBadField($gotourl,'name',true);
} else {
$name = trim($_POST['name']);
@@ -62,7 +62,7 @@
}
if ( (empty($_POST['description']) || !isset($_POST['description']) ) && ($b->id < 0 )) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugLong']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugLong']));
$gotourl = addBadField($gotourl,'description',true);
$description = '';
} else {
@@ -71,7 +71,7 @@
}
if ( empty($_POST['short1']) || !isset($_POST['short1']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugShort']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugShort']));
$gotourl = addBadField($gotourl,'short1',true);
} else {
$short = trim($_POST['short1']);
@@ -79,7 +79,7 @@
}
if ( empty($_POST['medium']) || !isset($_POST['medium']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugMedium']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugMedium']));
} else {
$medium = $_POST['medium'];
$gotourl= addUrlParameter($gotourl,"medium=". $medium,true);
@@ -94,7 +94,7 @@
$b->parent->readroles();
}
} else {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugReference']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugReference']));
$gotourl = addBadField($gotourl,'pid',true);
}
@@ -142,14 +142,14 @@
}
if ( empty($_POST['state']) || !isset($_POST['state']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugState']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugState']));
$gotourl = addBadField($gotourl,'state',true);
} else {
$state = $_POST['state'];
$gotourl= addUrlParameter($gotourl,"state=". $state,true);
}
if ( empty($_POST['class']) || !isset($_POST['class']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugClass']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugClass']));
$gotourl = addBadField($gotourl,'class',true);
} else {
$class = $_POST['class'];
@@ -183,7 +183,7 @@
else
$solver = $_POST['sid']; // subteam
} else {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugAssignedTo']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugAssignedTo']));
$gotourl = addBadField($gotourl,'sfn',true);
}
} else {
@@ -204,7 +204,7 @@
$plandate->setDateTimeF("pd");
$gotourl= addUrlParameter($gotourl,"pd=". $plandate->getYYYYMMDD(),true);
if ( !$plandate->checkDMY(true) ) {
- $msg = addLine(sprintf($lang['Err0038'],$lang['DateTimeTill']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0038'],$lang['DateTimeTill']));
}
// check if target is required
@@ -212,7 +212,7 @@
if ( ($tutos['bug_need_target'] != '') && !is_object($b->target) ) {
$x = preg_split('#,#',$tutos['bug_need_target']);
if (in_array($state,$x)) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugTarget']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugTarget']));
$gotourl = addBadField($gotourl,'t',true);
}
}
@@ -234,11 +234,11 @@
#
# Parse additional custom fields
#
-$msg = addLine(parse_custom_fields($b->gettype(),$b),$msg);
+$msg = addLine($msg,parse_custom_fields($b->gettype(),$b));
# other modules
-$msg = addLine(module_parseforms($current_user,$b,$gotourl),$msg);
+$msg = addLine($msg,module_parseforms($current_user,$b,$gotourl));
-$msg = addLine($b->run_check_hook(),$msg);
+$msg = addLine($msg,$b->run_check_hook());
#
# Old Bug
@@ -339,7 +339,7 @@
// we have no revison but maybe are forced to need one
$x = preg_split('#,#',$b->parent->tutos['bug_need_revision']);
if (in_array($state,$x)) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugRevision']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugRevision']));
$gotourl = addBadField($gotourl,'newrev',true);
}
}
@@ -354,7 +354,7 @@
// we have no revison but maybe are forced to need one
$x = preg_split('#,#',$b->parent->tutos['bug_need_revision']);
if (in_array($state,$x)) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['BugRevision']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['BugRevision']));
$gotourl = addBadField($gotourl,'newrev',true);
}
}
@@ -397,7 +397,7 @@
$dbconn->Begin("WORK");
$msgx = '';
-$msgx = addLine($b->save(),$msgx);
+$msgx = addLine($msgx,$b->save());
if ( $msg == "" && $b->id > 0) {
if ( isset($file) && ($file != "none") ) {
@@ -410,13 +410,13 @@
$ff->savemode = 0;
$ff->addReference($b);
if ( isset($file['size']) && ($file['size'] > 0) && ($file['name'] != "")) {
- $msgx = addLine($ff->save(),$msgx);
+ $msgx = addLine($msgx,$ff->save());
}
}
} else {
- $msg = addLine('no addfile',$msg);
+ $msg = addLine($msg,'no addfile');
}
-$msg = addLine($msgx,$msg);
+$msg = addLine($msg,$msgx);
$dbconn->Commit("WORK");
$gotourl = $b->getUrl();
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/bugtracking/bug_overview.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -868,7 +868,7 @@
* action via massupdate
*/
Function action() {
- global $lang,$msg,$tutos;
+ global $lang,$msg,$tutos,$info;
$this->stc = getObject($this->user->dbconn,$tutos['bug_state_stc']);
if (!is_object($this->stc)) {
@@ -885,10 +885,10 @@
continue;
}
if ( $b->del_ok() ) {
- $msg = addLine(sprintf($lang['BugDeleteI'], $b->getFullName()),$msg);
- $msg = addLine($b->delete(),$msg);
+ $info = addLine($info,sprintf($lang['BugDeleteI'], $b->getFullName()));
+ $msg = addLine($msg,$b->delete());
} else {
- $msg = addLine($b->getLink() .': '. sprintf($lang['Err0023'],$lang[$b->getType()]),$msg);
+ $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0023'],$lang[$b->getType()]));
}
unset($b);
}
@@ -915,28 +915,28 @@
if ( $a[1] == "S" ) {
if ($a[2] == $b->state) continue; // keep
if (!$this->stc->check_trans($b->state,$a[2])) {
- $msg = addLine($b->getLink() .': '. sprintf($lang['Err0024'],$lang[$b->getType()]).' ('.$lang['BugState'].')',$msg);
+ $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0024'],$lang[$b->getType()]).' ('.$lang['BugState'].')');
continue;
}
- $msg = addLine($b->getLink() .' '. $lang['BugState'] .' = '. $lang['BugStates'][$a[2]],$msg);
+ $info = addLine($info,$b->getLink() .' '. $lang['BugState'] .' = '. $lang['BugStates'][$a[2]]);
$state = $b->state;
if ($b->setState($a[2])) {
$newlines = sprintf('<b>'. $lang['BugState'] .": <i>%s</i> → <i>%s</i></b>\n%s" ,$b->getState($state),$b->getState() , $newlines);
}
} else if ( $a[1] == "C" ) {
if ($a[2] == $b->class) continue; // keep
- $msg = addLine($b->getLink() .' '. $lang['BugClass'] .' = '. $lang['BugClasses'][$a[2]],$msg);
+ $info = addLine($info,$b->getLink() .' '. $lang['BugClass'] .' = '. $lang['BugClasses'][$a[2]]);
$class = $b->class;
if ($b->setClass($a[2])) {
$newlines = sprintf('<b>'. $lang['BugClass'] .": <i>%s</i> → <i>%s</i></b>\n%s" ,$b->getClass($class),$b->getClass() , $newlines);
}
} else {
- $msg = addLine("A:".$_GET['action'] ." M: '". $val[1] ."' V:". $val[2],$msg);
+ $msg = addLine($msg,"A:".$_GET['action'] ." M: '". $val[1] ."' V:". $val[2]);
}
$b->newdesc = $newlines;
- $msg = addLine($b->save(),$msg);
+ $msg = addLine($msg,$b->save());
} else {
- $msg = addLine($b->getLink() .': '. sprintf($lang['Err0024'],$lang[$b->getType()]),$msg);
+ $msg = addLine($msg,$b->getLink() .': '. sprintf($lang['Err0024'],$lang[$b->getType()]));
}
unset ($b);
}
@@ -992,7 +992,7 @@
$this->css_class = 'overviewbox';
if ( ! $this->user->feature_ok(usebugtracking,PERM_SEE) ) {
- $msg = addLine(sprintf($lang['Err0022'],"'". $this->name ."'"),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0022'],"'". $this->name ."'"));
$this->stop = true;
return;
}
@@ -1273,7 +1273,7 @@
$this->result2->free();
if ( 0 == $n) {
- $msg = addLine($lang['Err0048'],$msg);
+ $msg = addLine($msg,$lang['Err0048']);
$this->redirect = 'bug_select.php';
if ($this->ext != 0) {
$this->redirect = addUrlParameter($this->redirect,'ext=1',true);
@@ -1342,4 +1342,4 @@
$l = new Bug_overview($current_user);
$l->display();
$dbconn->Close();
-?>
+?>
\ No newline at end of file
Modified: trunk/php/checklist/checkfield_ins.php
===================================================================
--- trunk/php/checklist/checkfield_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/checklist/checkfield_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -30,7 +30,7 @@
}
if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) {
- $msg .= sprintf($lang['Err0009'],$lang['CheckfieldName']) .'<br />';
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['CheckfieldName']));
$gotourl = addBadField($gotourl,'name',true);
} else {
$b->setName(trim($_POST['name']));
@@ -38,7 +38,7 @@
}
if ( !isset($_POST['desc']) || (trim($_POST['desc']) == '') ) {
- $msg .= sprintf($lang['Err0009'],$lang['ChecklistDescription']) .'<br />';
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ChecklistDescription']));
$gotourl = addBadField($gotourl,'desc',true);
} else {
$b->setDesc(trim($_POST['desc']));
@@ -60,14 +60,14 @@
if (checkfloat($v)) {
$b->setMaxValue($v);
} else {
- $msg .= $v .' is not numeric '."<br />";
+ $msg = addLine($msg,$v .' is not numeric ');
$gotourl = addBadField($gotourl,'maxval',true);
}
$gotourl= addUrlParameter($gotourl,"maxval=". UrlEncode($v),true);
}
if ( empty($_POST['type']) || !isset($_POST['type']) ) {
- $msg .= sprintf($lang['Err0009'],$lang['CheckfieldType']) ."<br />";
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['CheckfieldType']));
$gotourl = addBadField($gotourl,'type',true);
} else {
$b->type = $_POST['type'];
@@ -75,19 +75,25 @@
}
if ( empty($_POST['link_id']) ) {
- $msg .= "No Link ID given !<br />";
+ $msg = addLine($msg,"No Link ID given !");
} else {
$b->link_id = $_POST['link_id'];
$gotourl= addUrlParameter($gotourl,"link_id=". $b->link_id,true);
$b->read_reference();
}
-# other modules
-$msg .= module_parseforms($current_user,$b,$gotourl);
+//
+// Parse additional custom fields
+//
+$msg = addLine($msg,parse_custom_fields($b->gettype(),$b));
+// other modules
+$msg = addLine($msg,module_parseforms($current_user,$b,$gotourl));
+$msg = addLine($msg,$b->run_check_hook());
+
if ( $msg == "" ) {
$dbconn->Begin("WORK");
- $msg .= $b->save();
+ $msg = addLine($msg,$b->save());
$dbconn->Commit("WORK");
$gotourl = $b->getURL();
}
Modified: trunk/php/checklist/checklist_ins.php
===================================================================
--- trunk/php/checklist/checklist_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/checklist/checklist_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -1,7 +1,7 @@
<?php
/**
* Checklist: Copyright 2002 by Markus Leist under GNU GPL
- * TUTOS: Copyright 1999 - 2010 by Gero Kohnert
+ * TUTOS: Copyright 1999 - 2012 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,10 +12,12 @@
ini_set("include_path","..");
require_once 'webelements.p3';
require_once 'permission.p3';
-require_once 'checklist/checkfield.pinc';
// Check if user is allowed to use it
check_user();
+
+require_once 'checklist/checkfield.pinc';
+
loadmodules('checklist','ins');
loadmodule('checklist');
@@ -156,7 +158,7 @@
$b = $b->read($_POST['id'],$b);
}
if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) {
- $msg .= sprintf($lang['Err0009'],$lang['ChecklistName']) ."<br />";
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ChecklistName']));
$gotourl = addBadField($gotourl,'name',true);
} else {
$b->setName(trim($_POST['name']));
@@ -167,14 +169,14 @@
$gotourl= addUrlParameter($gotourl,"desc=". UrlEncode($b->description),true);
}
if ( empty($_POST['type']) || !isset($_POST['type']) ) {
- $msg .= sprintf($lang['Err0009'],$lang['ChecklistType']) ."<br />";
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ChecklistType']));
$gotourl = addBadField($gotourl,'type',true);
} else {
$b->type = $_POST['type'];
$gotourl= addUrlParameter($gotourl,"type=". $b->type,true);
}
if ( empty($_POST['link_id']) ) {
- $msg .= "No Link ID given !<br />";
+ $msg = addLine($msg,"No Link ID given !");
$gotourl = addBadField($gotourl,'link_id',true);
} else {
$b->link_id = $_POST['link_id'];
@@ -183,21 +185,27 @@
}
if ( isset($_POST['checklist_ins']) && ($_POST['checklist_ins'] == 'make_instance') ) {
if ( empty($_POST['class']) ) {
- $msg .= "No Class ID given !<br />";
+ $msg = addLine($msg,"No Class ID given !");
} else {
$b->class_id = $_POST['class'];
}
}
+ //
+ // Parse additional custom fields
+ //
+ $msg = addLine($msg,parse_custom_fields($b->gettype(),$b));
// other modules
- $msg .= module_parseforms($current_user,$b,$gotourl);
+ $msg = addLine($msg,module_parseforms($current_user,$b,$gotourl));
+ $msg = addLine($msg,$b->run_check_hook());
+
if ( $msg == "" ) {
$dbconn->Begin("WORK");
- $msg .= $b->save();
+ $msg = addLine($msg,$b->save());
if ( isset($_POST['checklist_ins']) && ($_POST['checklist_ins'] == 'make_instance') ) {
- $msg .= $b->generateCheckFields();
+ $msg = addLine($msg,$b->generateCheckFields());
}
$dbconn->Commit("WORK");
$gotourl = $b->getURL();
Modified: trunk/php/company_ins.php
===================================================================
--- trunk/php/company_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/company_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -31,7 +31,7 @@
$c = $c->read($_POST['id'],$c);
if ( ! $c->mod_ok() ) {
// Not allowed
- $msg = addLine(sprintf($lang['Err0024'],$lang[$c->getType()],true),$msg);
+ $msg = addLine(sprintf($msg,$lang['Err0024'],$lang[$c->getType()],true));
}
}
@@ -40,12 +40,12 @@
$l = $l->read($_POST['loc_id'],$l);
if ( ! $l->mod_ok() ) {
// Not allowed
- $msg = addLine(sprintf($lang['Err0024'],$lang[$l->getType()],true),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$l->getType()],true));
}
}
if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['Company']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Company']));
$gotourl = addBadField($gotourl,'name',true);
} else {
$name = trim($_POST['name']);
@@ -83,7 +83,7 @@
if ( 0 != $n) {
$x = new company($dbconn);
$x->read_result($r,0);
- $msg = addLine(sprintf($lang['Err0044'],$x->getLink()),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0044'],$x->getLink()));
}
$r->free();
}
@@ -93,7 +93,7 @@
$_POST['c_id'] = -1;
$lmsg = $l->parseform();
if ($l->used || ($l->id >0)) {
- $msg = addLine($lmsg,$msg);
+ $msg = addLine($msg,$lmsg);
}
$c->setName($name);
@@ -101,18 +101,18 @@
//
// Parse additional custom fields
//
-$msg = addLine(parse_custom_fields($c->gettype(),$c),$msg);
+$msg = addLine($msg,parse_custom_fields($c->gettype(),$c));
// other modules
-$msg = addLine(module_parseforms($current_user,$c,$gotourl),$msg);
+$msg = addLine($msg,module_parseforms($current_user,$c,$gotourl));
-$msg = addLine($c->run_check_hook(),$msg);
+$msg = addLine($msg,$c->run_check_hook());
if ( $msg == "" ) {
$dbconn->Begin("WORK");
- $msg = addLine($c->save(),$msg);
+ $msg = addLine($msg,$c->save());
$l->adr_id = $c->id;
$l->ref = $c;
if ($l->used || ($l->id >0)) {
- $msg = addLine($l->save(),$msg);
+ $msg = addLine($msg,$l->save());
}
$dbconn->Commit("WORK");
Modified: trunk/php/company_overview.php
===================================================================
--- trunk/php/company_overview.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/company_overview.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2011 by Gero Kohnert
+ * Copyright 1999 - 2012 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
@@ -184,7 +184,7 @@
* action via massupdate
*/
Function action() {
- global $lang,$msg;
+ global $lang,$msg,$info;
if ( $_GET['action'] == -2 ) {
$this->dbconn->Begin("WORK");
@@ -195,10 +195,10 @@
continue;
}
if ( $c->del_ok() ) {
- $msg .= sprintf($lang['CompanyDelInfo'], $c->getFullName()) ."<br />";
- $msg .= $c->delete();
+ $info = addLine($info,sprintf($lang['CompanyDelInfo'], $c->getFullName()));
+ $msg = addLine($msg,$c->delete());
} else {
- $msg .= $c->getLink() .": ". sprintf($lang['Err0023'],$lang[$c->getType()]) ."<br />\n";
+ $msg = addLine($msg,$c->getLink() .": ". sprintf($lang['Err0023'],$lang[$c->getType()]));
}
unset($c);
}
Modified: trunk/php/company_show.php
===================================================================
--- trunk/php/company_show.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/company_show.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -144,11 +144,11 @@
$b->read_locs_data();
foreach($b->locall as $i => $f) {
if ($f->company->id == $this->obj->id) {
- $msg = addLine($lang['Delete'].':'.$b->getLink().'@'.$f->company->getFullName(),$msg);
+ $msg = addLine($msg,$lang['Delete'].':'.$b->getLink().'@'.$f->company->getFullName());
$this->dbconn->Begin("WORK");
$f->setCompany(null);
$f->setDepartment(null);
- $msg = addLine($f->save(),$msg);
+ $msg = addLine($msg,$f->save());
$this->dbconn->Commit("WORK");
}
}
@@ -178,17 +178,17 @@
$this->obj = $this->obj->read($_GET['id'],$this->obj);
}
if ( !is_object($this->obj) ) {
- $msg = addLine(sprintf($lang['Err0040'],$lang['Company']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Company']));
$this->stop = true;
$this->format = "html";
return;
} else if ( ! $this->obj->see_ok() ) {
- $msg = addLine(sprintf($lang['Err0022'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
$this->stop = true;
$this->format = "html";
return;
} else if ( $this->obj->id < 0 ) {
- $msg = addLine(sprintf($lang['Err0040'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->obj->getType()]));
$this->stop = true;
$this->format = "html";
return;
Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/custom.pinc 2012-07-13 14:09:40 UTC (rev 712)
@@ -316,7 +316,7 @@
}
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
@@ -483,7 +483,7 @@
}
}
if ($this->required && $this->is_empty()) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
return $r;
@@ -573,7 +573,7 @@
$this->content = $_POST[$pn];
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
@@ -615,7 +615,7 @@
if (!isset($_POST[$pn])) return $r;
if ( !checkfloat($_POST[$pn]) ) {
- $r = addLine(sprintf($lang['Err0017'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0017'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
$gotourl= addUrlParameter($gotourl,$pn .'='. $_POST[$pn],true);
@@ -623,7 +623,7 @@
$this->content = $this->obj->$fn;
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
return $r;
@@ -658,7 +658,7 @@
$r = '';
if ( !checkfloat($_POST[$this->get_parsename()]) ) {
- $r = addLine(sprintf($lang['Err0017'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0017'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$this->get_parsename(),true);
}
$gotourl= addUrlParameter($gotourl,$this->get_parsename() .'='. $_POST[$this->get_parsename()],true);
@@ -709,7 +709,7 @@
$this->content = $this->obj->$fn;
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,'jqc_'.$pn,true);
}
return $r;
@@ -757,7 +757,7 @@
$this->content = $this->obj->$fn;
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,'jqc_'.$pn,true);
}
return $r;
@@ -838,7 +838,7 @@
$this->content = $this->obj->$fn;
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
return $r;
@@ -904,7 +904,7 @@
$gotourl= addUrlParameter($gotourl,$pn .'='. UrlEncode($xx),true);
if ( ($xx == '') && $this->required) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$this->get_parsename(),true);
};
@@ -1008,7 +1008,7 @@
$this->content = $this->obj->$fn;
if ($this->required && $this->is_empty() ) {
- $r = addLine(sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))),$r);
+ $r = addLine($r,sprintf($lang['Err0009'],myentities(getLang($this->x['lang']))));
$gotourl = addBadField($gotourl,$pn,true);
}
return $r;
@@ -1654,7 +1654,7 @@
$f = get_fld_obj($obj,$x,$section,$i);
if (is_object($f)) {
- $r = addLine($f->set(),$r);
+ $r = addLine($r,$f->set());
continue;
}
}
Modified: trunk/php/db.p3
===================================================================
--- trunk/php/db.p3 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/db.p3 2012-07-13 14:09:40 UTC (rev 712)
@@ -382,9 +382,11 @@
$g_hash['hits'] = 0;
$g_hash['hits2'] = 0;
$g_hash['hits3'] = 0;
+$g_hash['hits4'] = 0;
$g_hash['fail'] = 0;
$g_hash['fail2'] = 0;
$g_hash['fail3'] = 0;
+$g_hash['fail4'] = 0;
$tutos['dateformat'] = array();
Modified: trunk/php/delobject.php
===================================================================
--- trunk/php/delobject.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/delobject.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2010 by Gero Kohnert
+ * Copyright 1999 - 2012 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
@@ -22,14 +22,14 @@
$gotourl = 'mytutos.php';
if ( !isset($_REQUEST['id']) ) {
- $msg .= $lang['Err0048'] .'<br />';
+ $msg = addLine($msg,$lang['Err0048']);
} else {
$obj = getObject($dbconn,$_REQUEST['id']);
}
if ( ! is_object($obj)) {
- $msg .= $lang['Err0048'] .'<br />';
+ $msg = addLine($msg,$lang['Err0048']);
} else if ( ! $obj->del_ok() ) {
- $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br />";
+ $msg = addLine($msg,sprintf($lang['Err0023'],$lang[$obj->getType()]));
$gotourl = $obj->get_failed_del_Url();
} else {
$gotourl = $obj->get_failed_del_Url();
@@ -47,7 +47,7 @@
$gotourl = $obj->get_after_del_Url();
}
$dbconn->Begin("WORK");
- $msg .= $obj->delete();
+ $msg = addLine($msg,$obj->delete());
$dbconn->Commit("WORK");
}
leave_insert($dbconn,$gotourl,$msg);
Modified: trunk/php/department_ins.php
===================================================================
--- trunk/php/department_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/department_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -31,7 +31,7 @@
$gotourl = addUrlParameter($gotourl,"id=". $d->id,true);
if ( ! $d->mod_ok() ) {
// Not allowed
- $msg = addLine(sprintf($lang['Err0024'],$lang[$d->getType()],true),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$d->getType()],true));
}
}
@@ -40,12 +40,12 @@
$l = $l->read($_POST['loc_id'],$l);
if ( ! $l->mod_ok() ) {
// Not allowed
- $msg = addLine(sprintf($lang['Err0024'],$lang[$l->getType()],true),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0024'],$lang[$l->getType()],true));
}
}
if ( !isset($_POST['name']) || (trim($_POST['name']) == '') ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['Department']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Department']));
$gotourl = addBadField($gotourl,'name',true);
} else {
$name = trim($_POST['name']);
@@ -55,7 +55,7 @@
// Check Company
if ( isset($_POST['cfn']) ) {
if ( empty($_POST['cfn']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['Company']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Company']));
} else {
$x = check_field($_POST['cfn'],"cfn","cl","c");
$d->setCompany($x->id);
@@ -74,7 +74,7 @@
if ( 0 != $n) {
$x = new department($dbconn);
$x->read_result($r,0);
- $msg = addLine(sprintf($lang['Err0045'],$x->getLink()),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0045'],$x->getLink()));
}
$r->free();
}
@@ -85,7 +85,7 @@
$_POST['d_id'] = -1;
$lmsg = $l->parseform();
if ($l->used || ($l->id >0)) {
- $msg = addLine($lmsg,$msg);
+ $msg = addLine($msg,$lmsg);
}
$d->setName($name);
@@ -94,19 +94,19 @@
//
// Parse additional custom fields
//
-$msg = addLine(parse_custom_fields($d->gettype(),$d),$msg);
+$msg = addLine($msg,parse_custom_fields($d->gettype(),$d));
// other modules
-$msg = addLine(module_parseforms($current_user,$d,$gotourl),$msg);
+$msg = addLine($msg,module_parseforms($current_user,$d,$gotourl));
-$msg = addLine($d->run_check_hook(),$msg);
+$msg = addLine($msg,$d->run_check_hook());
if ( $msg == '' ) {
$dbconn->Begin("WORK");
- $msg = addLine($d->save(),$msg);
+ $msg = addLine($msg,$d->save());
$l->adr_id = $d->id;
$l->ref = $d;
if ($l->used || ($l->id >0)) {
- $msg = addLine($l->save(),$msg);
+ $msg = addLine($msg,$l->save());
}
$dbconn->Commit("WORK");
$gotourl = $d->getURL();
Modified: trunk/php/department_show.php
===================================================================
--- trunk/php/department_show.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/department_show.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -124,11 +124,11 @@
$b->read_locs_data();
foreach($b->locall as $i => $f) {
if ($f->department->id == $this->obj->id) {
- $msg = addLine($lang['Delete'].':'.$b->getLink().'@'.$f->department->getFullName() .' + '. $f->company->getFullName(),$msg);
+ $msg = addLine($msg,$lang['Delete'].':'.$b->getLink().'@'.$f->department->getFullName() .' + '. $f->company->getFullName());
$this->dbconn->Begin("WORK");
$f->setCompany(null);
$f->setDepartment(null);
- $msg = addLine($f->save(),$msg);
+ $msg = addLine($msg,$f->save());
$this->dbconn->Commit("WORK");
}
}
@@ -154,17 +154,17 @@
$this->obj = $this->obj->read($_GET['id'],$this->obj);
}
if ( !is_object($this->obj) ) {
- $msg = addLine(sprintf($lang['Err0040'],$lang['Department']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang['Department']));
$this->stop = true;
$this->format = "html";
return;
} else if ( ! $this->obj->see_ok() ) {
- $msg = addLine(sprintf($lang['Err0022'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0022'],$lang[$this->obj->getType()]));
$this->stop = true;
$this->format = "html";
return;
} else if ( $this->obj->id < 0 ) {
- $msg = addLine(sprintf($lang['Err0040'],$lang[$this->obj->getType()]),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0040'],$lang[$this->obj->getType()]));
$this->stop = true;
$this->format = "html";
return;
Modified: trunk/php/expense/expense_ins.php
===================================================================
--- trunk/php/expense/expense_ins.php 2012-07-13 06:45:44 UTC (rev 711)
+++ trunk/php/expense/expense_ins.php 2012-07-13 14:09:40 UTC (rev 712)
@@ -56,7 +56,7 @@
$u->creator = $current_user;
}
if ( empty($_POST['name']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['ExpenseName']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ExpenseName']));
$gotourl = addBadField($gotourl,'name',true);
} else {
$u->setName(trim($_POST['name']));
@@ -83,7 +83,7 @@
$gotourl= addUrlParameter($gotourl,"country=". UrlEncode($u->country),true);
}
if ( empty($_POST['currency']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['Currency']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['Currency']));
} else {
$u->setCurrency(trim($_POST['currency']));
$gotourl= addUrlParameter($gotourl,"currency=". UrlEncode($u->currency),true);
@@ -101,7 +101,7 @@
$gotourl= addUrlParameter($gotourl,"description=". UrlEncode($u->description),true);
}
if ( empty($_POST['link_id']) ) {
- $msg = addLine("No Link ID given !",$msg);
+ $msg = addLine($msg,"No Link ID given !");
} else {
$u->setReference($_POST['link_id']);
$gotourl= addUrlParameter($gotourl,"link_id=". $u->link_id,true);
@@ -115,7 +115,7 @@
if ( empty($_POST['quantity']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['ExpenseQuantity']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ExpenseQuantity']));
$gotourl = addBadField($gotourl,'quantity',true);
} else {
$u->setQuantity(trim($_POST['quantity']));
@@ -123,7 +123,7 @@
}
if ( empty($_POST['gamount']) ) {
- $msg = addLine(sprintf($lang['Err0009'],$lang['ExpenseGAmount']),$msg);
+ $msg = addLine($msg,sprintf($lang['Err0009'],$lang['ExpenseGAmount']));
$gotourl = addBadField($gotourl,'gamount',true);
} else {
$u->setGAmount(trim($_POST['gamount']));
@@ -144,7 +144,7 @@
$t_start = new TUTOS_Date_Time();
$t_start->setDateTimeF("t_st...
[truncated message content] |
|
From: <gok...@us...> - 2012-07-13 06:45:51
|
Revision: 711
http://tutos.svn.sourceforge.net/tutos/?rev=711&view=rev
Author: gokohnert
Date: 2012-07-13 06:45:44 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
bugs are red now
Modified Paths:
--------------
trunk/html/bugs.gif
trunk/html/bugs.png
Modified: trunk/html/bugs.gif
===================================================================
(Binary files differ)
Modified: trunk/html/bugs.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-13 05:28:10
|
Revision: 710
http://tutos.svn.sourceforge.net/tutos/?rev=710&view=rev
Author: gokohnert
Date: 2012-07-13 05:28:01 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
more static and hopefully compatible with PHP 5.1
Modified Paths:
--------------
trunk/php/acl_new.php
trunk/php/address.pinc
trunk/php/appointment.pinc
trunk/php/base.pinc
trunk/php/bugtracking/bug.pinc
trunk/php/checklist/checkfield.pinc
trunk/php/checklist/checklist.pinc
trunk/php/company.pinc
trunk/php/counter/counter.pinc
trunk/php/database.pinc
trunk/php/department.pinc
trunk/php/doctracker/doctracker.pinc
trunk/php/drawboard/drawboard.pinc
trunk/php/expense/expense.pinc
trunk/php/file/file.pinc
trunk/php/group/group.pinc
trunk/php/group/group2_ins.php
trunk/php/installation/installation.pinc
trunk/php/invoice/invoice.pinc
trunk/php/ldap/ldap.pinc
trunk/php/localization/holiday_be.pinc
trunk/php/location.pinc
trunk/php/mailbox/mailbox.pinc
trunk/php/module_base.pinc
trunk/php/module_template/AAA.pinc
trunk/php/note/note.pinc
trunk/php/product.pinc
trunk/php/rate/rate.pinc
trunk/php/reminder/reminder.pinc
trunk/php/report-engine/reporter.pinc
trunk/php/resource/resource.pinc
trunk/php/rss/rss.pinc
trunk/php/scrum/scrum.pinc
trunk/php/stc/stc.pinc
trunk/php/stuff/stuff.pinc
trunk/php/subversion/svn.pinc
trunk/php/task.pinc
trunk/php/team.pinc
trunk/php/testmanager/testmanager.pinc
trunk/php/ticker/ticker.pinc
trunk/php/timetrack/timetrack.pinc
trunk/php/timetrack/timetrack_ins.php
trunk/php/url/url.pinc
trunk/php/user.pinc
trunk/php/watchlist/watchlist.pinc
trunk/php/xml/xml_parse.pinc
Modified: trunk/php/acl_new.php
===================================================================
--- trunk/php/acl_new.php 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/acl_new.php 2012-07-13 05:28:01 UTC (rev 710)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2010 by Gero Kohnert
+ * Copyright 1999 - 2012 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
@@ -122,7 +122,28 @@
$r .= ' <td colspan="8"> <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";
+
+
$r .= "<tr>\n";
+ $r .= '<th colspan="4">'.$this->feature_info[name].'</th>';
+ $r .= "</tr>\n";
+ $x = $this->feature_info[name];
+ foreach($x::getObjConfig($this) as $cf) {
+ $r .= "<tr>\n";
+ $r .= " <td>\n";
+ $r .= $x.' '.$cf;
+ $r .= " </td>\n";
+
+ $r .= " <td>\n";
+ if (isset($tutos['cfg'][$cf]['help'])) {
+ }
+ $r .= " </td>\n";
+ $r .= "</tr>\n";
+ }
+
+
+
+ $r .= "<tr>\n";
$r .= submit_reset(0,1,1,1,1,4);
$r .= "</tr>\n";
@@ -296,9 +317,7 @@
}
$r .= '<form action="'.$l.'" method="GET">';
- $r .= $this->DataTableStart();
- $r .= '<tr>';
- $r .= ' <td>'.$lang['Feature'].':</td><td><select name="feature">';
+ $r .= $lang['Feature'].':<select name="feature">';
uasort($tutos[activemodules],array('Acl_new','menusort'));
$r .= '<option value="0"'.(0 == $this->feature ? ' selected="selected"':'').'>---</option>';
foreach ($tutos[activemodules] as $i => $f) {
@@ -315,14 +334,10 @@
$r .= '<option class="'.$class.'" value="'.$v.'"'.($v == $this->feature ? ' selected="selected"':'').'> '.$lang[$v] .'</option>';
}
$r .= '</select>';
- $r .= '</td></tr>';
- $r .= '<tr><td colspan="2">';
- $r .= '<input type="submit" value="OK"/>';
+ $r .= ' <input type="submit" value="OK"/>';
$r .= hiddenFormElements();
$r .= $this->getHidden();
- $r .= '</td></tr>';
- $r .= $this->DataTableEnd();
- $r .= '</form>';
+ $r .= '</form><p>';
@@ -346,13 +361,14 @@
* prepare
*/
Function prepare() {
- global $lang,$msg,$current_user;
+ global $lang,$tutos,$msg,$current_user;
$this->name = $lang['AclModify'];
$this->feature = 0;
+ $this->feature_info = null;
if ( ! isset($_GET['id']) ) {
- $msg .= "Missing ID";
+ $msg = addLine("Missing ID",$msg);
$this->stop = true;
return;
}
@@ -360,6 +376,11 @@
// the feature (defaults to 0)
if ( isset($_GET['feature']) ) {
$this->feature = $_GET['feature'];
+ foreach ($tutos[modules] as $m => $ma) {
+ if (isset($ma['perm']) && $ma['perm'] == $this->feature ) {
+ $this->feature_info = $ma;
+ }
+ }
}
@@ -373,11 +394,11 @@
foreach($id as $val) {
$x = getObject($this->dbconn,$val);
if ( !is_object($x) ) {
- $msg .= sprintf($lang['Err0040'],"Object ". $val);
+ $msg = addLine(sprintf($lang['Err0040'],"Object ". $val),$msg);
$this->stop = true;
} else if ( ! $current_user->isadmin() && ! $x->del_ok() ) {
// we need delete permissions but talk about modify !
- $msg .= sprintf($lang['Err0024'],$lang[$x->getType()]);
+ $msg = addLine(sprintf($lang['Err0024'],$lang[$x->getType()]),$msg);
$this->stop = true;
} else {
$this->obj[] = &$x;
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/address.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -678,21 +678,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "address";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useaddressbook;
}
/**
* get the type id of object
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'addresses';
}
@@ -734,7 +734,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/appointment.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -1674,21 +1674,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "appointment";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usecalendar;
}
/**
* get the type id of object
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'appointments';
}
@@ -2103,7 +2103,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/base.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -71,7 +71,7 @@
global $current_user,$table,$tutos;
$this->id = -1;
- $this->dbconn = &$dbconn;
+ $this->dbconn = $dbconn;
$this->creator = $current_user;
$this->creation = new TUTOS_Date_Time();
$this->list = array();
@@ -1436,7 +1436,7 @@
/**
* get an array with all types of objects that will be changed when performing a recursive acl change
*/
- function get_tree_info() {
+ static function get_tree_info() {
global $tutos;
$tree = array();
@@ -1453,28 +1453,28 @@
/**
* the type of this TUTOS object
*/
- function getType () {
+ static function getType () {
return 'base';
}
/**
* get the type id of object
*/
- function getTypeId () {
+ static function getTypeId () {
return noobject;
}
/**
* get the icon as a image html tag
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return '';
}
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
return '';
}
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/bugtracking/bug.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -24,6 +24,18 @@
define ('BUG_CLASS_8',8);
define ('BUG_CLASS_9',9);
+$tutos['cfg']['bug_use_revision'] = array(
+ 'section' => 'bugtracking',
+ type => 'bool',
+ 'default' => '0',
+ 'help' => 'BugConfigHelpUseRevision'
+ );
+$tutos['cfg']['bug_delete'] = array(
+ 'section' => 'bugtracking',
+ type => 'bool',
+ 'default' => '0',
+ 'help' => 'BugConfigHelpDelete'
+ );
class Bugdummy extends tutos_base {
}
@@ -37,7 +49,8 @@
$stc = getObject($current_user->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('BugStates',Bug::$c_state);
+ $x = new Bug($current_user->dbconn);
+ $stc->initByArray('BugStates',$x->c_state);
}
$additional = array();
@@ -190,14 +203,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'BugsDetail';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usebughist;
}
@@ -249,20 +262,20 @@
protected $showurl = 'bugtracking/bug_show.php';
static public $c_state = array(BUG_STATE_OPEN => "red",
- BUG_STATE_WORK => "blue",
- BUG_STATE_SOLVED => "green",
- BUG_STATE_CLOSED => "gray"
+ BUG_STATE_WORK => "blue",
+ BUG_STATE_SOLVED => "green",
+ BUG_STATE_CLOSED => "gray"
);
static public $c_class = array(BUG_CLASS_LIGHT => "blue",
- BUG_CLASS_HEAVY => "#F05050",
- BUG_CLASS_DANGER => "red",
- BUG_CLASS_HINT => "green",
- BUG_CLASS_5 => "#50F050",
- BUG_CLASS_6 => "#5050F0",
- BUG_CLASS_7 => "#804040",
- BUG_CLASS_8 => "#408040",
- BUG_CLASS_9 => "#404080"
+ BUG_CLASS_HEAVY => "#F05050",
+ BUG_CLASS_DANGER => "red",
+ BUG_CLASS_HINT => "green",
+ BUG_CLASS_5 => "#50F050",
+ BUG_CLASS_6 => "#5050F0",
+ BUG_CLASS_7 => "#804040",
+ BUG_CLASS_8 => "#408040",
+ BUG_CLASS_9 => "#404080"
);
/**
@@ -295,8 +308,6 @@
}
}
// colors in statistics if not stc
- // $this->c_state[BUG_STATE_OPEN] = "red";
- // $this->c_state[BUG_STATE_WORK] = "blue";
$this->solver = new tutos_address($this->dbconn);
$this->reporter = new tutos_address($this->dbconn);
$this->parent = -1;
@@ -368,6 +379,7 @@
*/
function get_parent_feature(tutos_base $p) {
global $tutos;
+
foreach (self::$parent_feature as $i) {
$p->tutos[$i] = $tutos[$i];
}
@@ -1448,21 +1460,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'bugtracking';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usebugtracking;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'bugs';
}
@@ -1495,7 +1507,7 @@
case 'BugReportedFrom':
case 'BugCreate':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'BugAssignedTo':
$x = $f;
if ($f['old'] < 0)
@@ -2166,7 +2178,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
@@ -2178,4 +2190,4 @@
return $r;
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/checklist/checkfield.pinc
===================================================================
--- trunk/php/checklist/checkfield.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/checklist/checkfield.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -497,13 +497,13 @@
/**
* get the type of object
*/
- function getType () {
+ static function getType () {
return "checkfield";
}
/**
* get the type id of object (for hashing)
*/
- function gettypeid () {
+ static function gettypeid () {
return usecheckfields;
}
/**
Modified: trunk/php/checklist/checklist.pinc
===================================================================
--- trunk/php/checklist/checklist.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/checklist/checklist.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -383,14 +383,14 @@
/**
* get the type of object
*/
- function getType () {
+ static function getType () {
return "checklist";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usechecklists;
}
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/company.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -443,14 +443,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'company';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usecompany;
}
@@ -487,7 +487,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/counter/counter.pinc
===================================================================
--- trunk/php/counter/counter.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/counter/counter.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -19,7 +19,7 @@
/**
* the type of this TUTOS object
*/
- function getType () {
+ static function getType () {
return 'counter';
}
@@ -101,7 +101,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = "";
Modified: trunk/php/database.pinc
===================================================================
--- trunk/php/database.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/database.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -608,14 +608,14 @@
/**
* get the type of object
*/
- function gettype() {
+ static function gettype() {
return 'database';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usedbs;
}
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/department.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -403,14 +403,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'department';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usedepartment;
}
@@ -514,7 +514,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/doctracker/doctracker.pinc
===================================================================
--- trunk/php/doctracker/doctracker.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/doctracker/doctracker.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -60,7 +60,7 @@
/**
* create
*/
- function docowner(&$dbconn) {
+ function docowner(tutos_db $dbconn) {
global $table,$lang;
$this->init($dbconn);
@@ -79,7 +79,7 @@
/**
* read result data
*/
- function read_result (&$r, $pos ) {
+ function read_result (result $r, $pos ) {
$this->ref_id = $r->get($pos, 'ref_id');
$this->ref_number = $r->get($pos, 'ref_number');
// $this->path = $r->get($pos, 'path');
@@ -217,7 +217,7 @@
/**
* create
*/
- function doctracker(&$dbconn) {
+ function doctracker(tutos_db $dbconn) {
global $table,$tutos;
$this->init($dbconn);
@@ -244,7 +244,7 @@
/**
* read result data
*/
- function read_result (&$r, $pos ) {
+ function read_result (result $r, $pos ) {
$this->number = $r->get($pos, 'number');
$this->ref_id = $r->get($pos, 'ref_id');
$this->path = $r->get($pos, 'path');
@@ -733,14 +733,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'doctracker';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usedoctracker;
}
Modified: trunk/php/drawboard/drawboard.pinc
===================================================================
--- trunk/php/drawboard/drawboard.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/drawboard/drawboard.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2004 - 2010 by Gero Kohnert
+ * Copyright 2004 - 2012 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,9 +17,14 @@
*/
class drawboard extends tutos_module {
/**
+ * URL to use for display this object
+ */
+ protected $showurl = 'drawboard/drawboard_show.php';
+
+ /**
* constructor
*/
- function drawboard(&$dbconn) {
+ function drawboard(tutos_db $dbconn) {
global $current_user,$table;
$this->init($dbconn);
@@ -57,7 +62,7 @@
* @param Object $r a result set object
* @param int $pos a index in the resultset
*/
- function read_result (&$r, $pos ) {
+ function read_result (result $r, $pos ) {
global $current_user;
$this->name = $r->get($pos, "name");
@@ -128,13 +133,6 @@
}
/**
- * Return a link to this drawboard
- */
- function getURL() {
- return "drawboard/drawboard_show.php?id=".$this->id;
- }
-
- /**
* Return a fullname
*/
function getFullname() {
@@ -224,14 +222,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "drawboard";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usedrawboard;
}
Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/expense/expense.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -843,21 +843,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'expense';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useexpenses;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'coins';
}
/**
@@ -1039,7 +1039,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/file/file.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -1398,21 +1398,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'file';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usedocmanagement;
}
/**
* get the icon type
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'paper';
}
@@ -1779,7 +1779,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = "";
Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/group/group.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -281,21 +281,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "group";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usegroups;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'folder_user';
}
@@ -594,7 +594,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/group/group2_ins.php
===================================================================
--- trunk/php/group/group2_ins.php 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/group/group2_ins.php 2012-07-13 05:28:01 UTC (rev 710)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2010 by Gero Kohnert
+ * Copyright 2002 - 2012 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
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/installation/installation.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -562,21 +562,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "installation";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useinstmanagement;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'installation';
}
@@ -830,7 +830,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/invoice/invoice.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -158,7 +158,7 @@
/**
*
*/
- function gettypeid () {
+ static function gettypeid () {
return useinvoice;
}
@@ -398,7 +398,7 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "invpos";
}
}
@@ -1073,21 +1073,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "invoice";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useinvoice;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'money_dollar';
}
@@ -1397,10 +1397,11 @@
$r .= info_table_end();
return $r;
}
+
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/ldap/ldap.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -347,7 +347,7 @@
if (!isset($loc[$c])) {
$loc[$c] = new location($this->dbconn);
$loc[$c]->category = 3; # = LDAP retrieved data
- }
+ }
$loc[$c]->lname = 'ldap:'.$tutos['ldap:'.$this->host.':'.$this->port]['servername'];
foreach($loc[$c]->larray as $i => $f ) {
if (isset($tutos['ldap:'. $this->host .":". $this->port][$f]) ) {
@@ -501,14 +501,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "ldap";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useldap;
}
@@ -576,7 +576,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/localization/holiday_be.pinc
===================================================================
--- trunk/php/localization/holiday_be.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/localization/holiday_be.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -1,40 +1,40 @@
<?php
/*
-* Copyright 2003 contributed by Puuter
-*
-* SVN Info $Id$
-* $Author$
-* see (https://sourceforge.net/forum/forum.php?thread_id=801872&forum_id=25073)
-* Type = 0 day is displayed but not marked
-* Type = 1 marks the day red in the calendar
-*/
+ * Copyright 2003 contributed by Puuter
+ *
+ * SVN Info $Id$
+ * $Author$
+ * see (https://sourceforge.net/forum/forum.php?thread_id=801872&forum_id=25073)
+ * Type = 0 day is displayed but not marked
+ * Type = 1 marks the day red in the calendar
+ */
- $tutos[cal][] = array(
- array( Date => "01-01", type => 1, Desc => "Nieuwjaar (B)"),
- array( Date => "06-01", type => 0, Desc => "Driekoningen (B)"),
- array( Date => "14-02", type => 0, Desc => "St.Valentijn (B)"),
- array( Date => "CARNAVALMON", type => 0, Desc => "Carnaval (B)"),
- array( Date => "CARNAVALTUE", type => 0, Desc => "Carnaval (B)"),
- array( Date => "CARNAVALWED", type => 0, Desc => "Aswoensdag (B)"),
- array( Date => "GOODFRIDAY", type => 0, Desc => "Goede Vrijdag (B)"),
- array( Date => "EASTERSUNDAY", type => 1, Desc => "Pasen (B)"),
- array( Date => "EASTERMONDAY", type => 1, Desc => "Paasmaandag (B)"),
- array( Date => "1-04", type => 0, Desc => "1 april!! (B)"),
- array( Date => "01-05", type => 1, Desc => "Dag van de Arbeid (B)"),
- array( Date => "MOTHERDAY", type => 0, Desc => "Moederkesdag (B)"),
- array( Date => "FATHERDAY", type => 0, Desc => "Vaderdag (B)"),
- array( Date => "11-07", type => 0, Desc => "Vlaamse Gemeenschap (B)"),
- array( Date => "21-07", type => 1, Desc => "Nationale Feestdag (B)"),
- array( Date => "ASCENSIONDAY", type => 1, Desc => "Hemelvaartsdag (B)"),
- array( Date => "WHITSUNDAY", type => 1, Desc => "Pinksteren (B)"),
- array( Date => "WHITMONDAY", type => 1, Desc => "Pinkstermaandag (B)"),
- array( Date => "27-09", type => 0, Desc => "Franse Gemeenschap (B)"),
- array( Date => "1-11", type => 1, Desc => "Allerheiligen (B)"),
- array( Date => "2-11", type => 0, Desc => "Allerzielen (B)"),
- array( Date => "11-11", type => 1, Desc => "Wapenstilstand 1918 (B)"),
- array( Date => "6-12", type => 0, Desc => "Sinterklaas (B)"),
- array( Date => "25-12", type => 1, Desc => "Kerstmis (B)"),
- array( Date => "26-12", type => 1, Desc => "Tweede Kerstdag (B)"),
- array( Date => "31-12", type => 0, Desc => "Oudejaarsavond (B)"),
- );
-?>
+$tutos[cal][] = array(
+ array( Date => "01-01", type => 1, Desc => "Nieuwjaar (B)"),
+ array( Date => "06-01", type => 0, Desc => "Driekoningen (B)"),
+ array( Date => "14-02", type => 0, Desc => "St.Valentijn (B)"),
+ array( Date => "CARNAVALMON", type => 0, Desc => "Carnaval (B)"),
+ array( Date => "CARNAVALTUE", type => 0, Desc => "Carnaval (B)"),
+ array( Date => "CARNAVALWED", type => 0, Desc => "Aswoensdag (B)"),
+ array( Date => "GOODFRIDAY", type => 0, Desc => "Goede Vrijdag (B)"),
+ array( Date => "EASTERSUNDAY", type => 1, Desc => "Pasen (B)"),
+ array( Date => "EASTERMONDAY", type => 1, Desc => "Paasmaandag (B)"),
+ array( Date => "1-04", type => 0, Desc => "1 april!! (B)"),
+ array( Date => "01-05", type => 1, Desc => "Dag van de Arbeid (B)"),
+ array( Date => "MOTHERDAY", type => 0, Desc => "Moederkesdag (B)"),
+ array( Date => "FATHERDAY", type => 0, Desc => "Vaderdag (B)"),
+ array( Date => "11-07", type => 0, Desc => "Vlaamse Gemeenschap (B)"),
+ array( Date => "21-07", type => 1, Desc => "Nationale Feestdag (B)"),
+ array( Date => "ASCENSIONDAY", type => 1, Desc => "Hemelvaartsdag (B)"),
+ array( Date => "WHITSUNDAY", type => 1, Desc => "Pinksteren (B)"),
+ array( Date => "WHITMONDAY", type => 1, Desc => "Pinkstermaandag (B)"),
+ array( Date => "27-09", type => 0, Desc => "Franse Gemeenschap (B)"),
+ array( Date => "1-11", type => 1, Desc => "Allerheiligen (B)"),
+ array( Date => "2-11", type => 0, Desc => "Allerzielen (B)"),
+ array( Date => "11-11", type => 1, Desc => "Wapenstilstand 1918 (B)"),
+ array( Date => "6-12", type => 0, Desc => "Sinterklaas (B)"),
+ array( Date => "25-12", type => 1, Desc => "Kerstmis (B)"),
+ array( Date => "26-12", type => 1, Desc => "Tweede Kerstdag (B)"),
+ array( Date => "31-12", type => 0, Desc => "Oudejaarsavond (B)"),
+ );
+?>
\ No newline at end of file
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/location.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -468,14 +468,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'location';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return uselocation;
}
Modified: trunk/php/mailbox/mailbox.pinc
===================================================================
--- trunk/php/mailbox/mailbox.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/mailbox/mailbox.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -22,9 +22,14 @@
*/
class Mailbox extends Tutos_module {
- /* ---------------------------------------------------------------------------
+ /**
+ * URL to use for modify this object
*/
- function mailbox(&$dbconn) {
+ protected $modurl = 'mailbox/mailbox_new.php';
+
+ /**
+ */
+ function mailbox(tutos_db $dbconn) {
global $tutos,$current_user;
$this->init($dbconn);
@@ -52,7 +57,7 @@
/**
* read the data from DB result
*/
- function read_result (&$r, $pos ) {
+ function read_result (result $r, $pos ) {
$this->host = $r->get($pos, "host");
$this->type = $r->get($pos, "type");
$this->port = $r->get($pos, "port");
@@ -89,13 +94,6 @@
}
/**
- * Return a url to modify this mailbox (for an overview)
- */
- function getModUrl() {
- return 'mailbox/mailbox_new.php?id='. $this->id;
- }
-
- /**
* the url where we go after deleting this object
*/
function get_after_del_url () {
@@ -594,14 +592,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return "mailbox";
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usemailboxes;
}
/* ---------------------------------------------------------------------------
@@ -737,7 +735,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/module_base.pinc
===================================================================
--- trunk/php/module_base.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/module_base.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -355,7 +355,7 @@
/**
* the type of this TUTOS object
*/
- function getType () {
+ static function getType () {
return 'modulebase';
}
Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/module_template/AAA.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -27,7 +27,7 @@
/**
* init
*/
- function AAA(&$dbconn) {
+ function AAA(tutos_db $dbconn) {
global $table;
$this->init($dbconn);
@@ -42,7 +42,7 @@
/**
* read the database data for AAA
*/
- function read_result (&$r, $pos ) {
+ function read_result (result $r, $pos ) {
$this->name = $r->get($pos, 'name');
$this->link_id = $r->get($pos, 'link_id');
$this->creator = $r->getObject($pos, "creator");
@@ -222,7 +222,7 @@
/**
* get the type of object
*/
- function getType () {
+ static function getType () {
global $tutos;
return $tutos[modules]['AAA'][name];
}
@@ -230,7 +230,7 @@
/**
* get the type id of object
*/
- function getTypeId () {
+ static function getTypeId () {
global $tutos;
return $tutos[modules]['AAA']['perm'];
}
@@ -356,7 +356,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/note/note.pinc
===================================================================
--- trunk/php/note/note.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/note/note.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -431,21 +431,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'note';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usenotes;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'note';
}
@@ -802,7 +802,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/product.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -271,8 +271,7 @@
$stc = getObject($current_user->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $x = new product($current_user->dbconn);
- $stc->initByArray('ProdStates',$x->c_state);
+ $stc->initByArray('ProdStates',product::$c_state);
}
$r = "<select id=\"state\" name=\"state[]\" multiple=\"multiple\">\n";
@@ -338,7 +337,7 @@
*/
protected $showurl = 'product_show.php';
- public $c_state = array(PROD_STATE_AQ => "gray",
+ static public $c_state = array(PROD_STATE_AQ => "gray",
PROD_STATE_RUN => "orange",
PROD_STATE_FINISH => "green",
PROD_STATE_CANCEL => "red",
@@ -1053,7 +1052,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',product::$c_state);
}
$r .= $stc->getState($s);
return $r;
@@ -1073,7 +1072,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',product::$c_state);
}
if (isset($stc->states[$s]))
$r .= $stc->states[$s]->color;
@@ -1097,7 +1096,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc($this->dbconn);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',product::$c_state);
}
$stc->stateowner = $this;
$r .= $stc->getStateSelection($this->state,'state');
@@ -1310,7 +1309,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc($this->dbconn);
- $stc->initByArray('ProdStates',self::$c_state);
+ $stc->initByArray('ProdStates',product::$c_state);
}
if ($this->mod_ok() && $stc->check_trans($this->state,$tutos['prod_finish_state'])) {
$this->setState($tutos['prod_finish_state']);
@@ -1388,8 +1387,8 @@
case 'ProdStart':
case 'ProdEnd':
$x = resolve_history_datetime($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
@@ -1417,7 +1416,7 @@
/**
* get an array with all types of objects that will be changed when performing a recursive acl change
*/
- function get_tree_info() {
+ static function get_tree_info() {
global $tutos;
$tree = parent::get_tree_info();
@@ -1452,21 +1451,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'product';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useprojects;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'projects';
}
@@ -1832,7 +1831,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
@@ -1845,4 +1844,4 @@
}
}
$tutos['classes'][useprojects] = 'product';
-?>
+?>
\ No newline at end of file
Modified: trunk/php/rate/rate.pinc
===================================================================
--- trunk/php/rate/rate.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/rate/rate.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -108,27 +108,27 @@
# } else {
# $this->worker = $this->creator;
# }
- # } else {
- $this->worker = $this->creator;
- # }
-}
- if ( is_object($this->worker) && ($this->worker->gettype() == "team") ) {
- $this->worker->read_member();
- }
+ # } else {
+ $this->worker = $this->creator;
+ # }
+ }
+ if ( is_object($this->worker) && ($this->worker->gettype() == "team") ) {
+ $this->worker->read_member();
+ }
-$this->name = $r->get($pos, "name");
-$this->priority = $r->get($pos, "priority");
-$this->cph = $r->get($pos, "cph");
-$this->currency = $r->get($pos, "currency");
-$this->vat = $r->get($pos, "vat");
-$this->role_id = $r->get($pos, "role_id");
-$this->state = $r->get($pos, "state");
+ $this->name = $r->get($pos, "name");
+ $this->priority = $r->get($pos, "priority");
+ $this->cph = $r->get($pos, "cph");
+ $this->currency = $r->get($pos, "currency");
+ $this->vat = $r->get($pos, "vat");
+ $this->role_id = $r->get($pos, "role_id");
+ $this->state = $r->get($pos, "state");
-$this->creator = getObject($this->dbconn,$r->get($pos, "creator"));
+ $this->creator = getObject($this->dbconn,$r->get($pos, "creator"));
-parent::read_result($r,$pos);
-return;
-}
+ parent::read_result($r,$pos);
+ return;
+ }
/**
* get a list of possible new parents
@@ -446,21 +446,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'rate';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return userates;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'rates';
}
@@ -825,7 +825,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/reminder/reminder.pinc
===================================================================
--- trunk/php/reminder/reminder.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/reminder/reminder.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -583,21 +583,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'reminder';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usereminder;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'clock';
}
@@ -966,7 +966,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/report-engine/reporter.pinc
===================================================================
--- trunk/php/report-engine/reporter.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/report-engine/reporter.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -20,7 +20,7 @@
/* ---------------------------------------------------------------------------
*/
- function report(&$dbconn) {
+ function report(tutos_db $dbconn) {
global $tutos,$current_user,$table;
$this->init($dbconn);
@@ -77,14 +77,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'report-engine';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usereporter;
}
Modified: trunk/php/resource/resource.pinc
===================================================================
--- trunk/php/resource/resource.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/resource/resource.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -264,21 +264,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'resource';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useresource;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'resource';
}
@@ -625,7 +625,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/rss/rss.pinc
===================================================================
--- trunk/php/rss/rss.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/rss/rss.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -229,7 +229,7 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
global $tutos;
return $tutos[modules]['rss'][name];
@@ -237,7 +237,7 @@
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
global $tutos;
return $tutos[modules]['rss']['perm'];
@@ -246,7 +246,7 @@
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'feed';
}
@@ -388,7 +388,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = "";
Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/scrum/scrum.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -568,14 +568,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'scrumlog';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return USESCRUMLOG;
}
@@ -1274,21 +1274,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'scrumsprint';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return USESCRUMSPRINT;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'sprint';
}
@@ -1620,7 +1620,7 @@
/**
* get the help index for sprints
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/stc/stc.pinc
===================================================================
--- trunk/php/stc/stc.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/stc/stc.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -144,7 +144,7 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
global $tutos;
return $tutos[modules]['stc'][name].'state';
}
@@ -152,7 +152,7 @@
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usestcstates;
}
@@ -368,7 +368,7 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
global $tutos;
return $tutos[modules]['stc'][name].'trans';
}
@@ -376,7 +376,7 @@
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usestctrans;
}
@@ -810,7 +810,7 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
global $tutos;
return $tutos[modules]['stc'][name];
}
@@ -818,7 +818,7 @@
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
global $tutos;
return $tutos[modules]['stc']['perm'];
}
@@ -870,7 +870,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/stuff/stuff.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -341,14 +341,14 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'stuff';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return USESTUFF;
}
@@ -565,7 +565,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/subversion/svn.pinc
===================================================================
--- trunk/php/subversion/svn.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/subversion/svn.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -671,20 +671,20 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'svn';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usesvn;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'drive';
}
Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/task.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -471,9 +471,9 @@
protected $showurl = 'task_show.php';
protected $c_state = array(TASK_PRE => "yellow",
- TASK_RUNNING => "orange",
- TASK_FINISH => "lightgreen",
- TASK_OVERDUE => "red"
+ TASK_RUNNING => "orange",
+ TASK_FINISH => "lightgreen",
+ TASK_OVERDUE => "red"
);
/**
@@ -2000,7 +2000,7 @@
/**
* get an array with all types of objects that will be changed when performing a recursive acl change
*/
- function get_tree_info() {
+ static function get_tree_info() {
global $tutos;
$tree = parent::get_tree_info();
@@ -2015,21 +2015,21 @@
/**
* get the type of object
*/
- function getType () {
+ static function getType () {
return 'task';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usetaskmanagement;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'task';
}
@@ -2306,9 +2306,9 @@
$x1 = $obj->dbconn->DateTime($from);
$x2 = $obj->dbconn->DateTime($to);
#
- #
- #
- $q = 'SELECT c.* FROM '. $obj->dbconn->prefix .$table['task'][name].' c ';
+ #
+ #
+ $q = 'SELECT c.* FROM '. $obj->dbconn->prefix .$table['task'][name].' c ';
$pre = " WHERE";
if ( ($obj->getType() == "address") || ($obj->getType() == "user") ) {
// Select the workers and all his teams tasks
@@ -2318,7 +2318,7 @@
}
$q .= ")";
#
- $qq = 'SELECT DISTINCT t_id FROM '. $obj->dbconn->prefix .$table['taskworker'][name]. " WHERE w_id in (".$obj->id;
+ $qq = 'SELECT DISTINCT t_id FROM '. $obj->dbconn->prefix .$table['taskworker'][name]. " WHERE w_id in (".$obj->id;
foreach ($obj->teamlist as $i => $f) {
$qq .= "," . $i;
}
@@ -2339,7 +2339,7 @@
}
$r->free();
#
- $q .= ")";
+ $q .= ")";
$pre = " AND";
}
$q .= $pre. "(";
@@ -2445,7 +2445,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/team.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -579,21 +579,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'team';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return useteams;
}
/**
* get the type id of object
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'group';
}
@@ -726,7 +726,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/testmanager/testmanager.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -632,21 +632,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'testcase';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usetestcase;
}
/**
* get the icon type
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'paper';
}
@@ -1570,7 +1570,7 @@
/**
* get an array with all types of objects that will be changed when performing a recursive acl change
*/
- function get_tree_info() {
+ static function get_tree_info() {
global $tutos;
$tree = parent::get_tree_info();
@@ -1586,21 +1586,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'testsuite';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usetestsuite;
}
/**
* get the icon type
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'script';
}
@@ -2785,21 +2785,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'testrun';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usetestrun;
}
/**
* get the icon type
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'script_gear';
}
Modified: trunk/php/ticker/ticker.pinc
===================================================================
--- trunk/php/ticker/ticker.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/ticker/ticker.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2010 by Gero Kohnert
+ * Copyright 2001 - 2012 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
@@ -26,7 +26,7 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'ticker';
}
@@ -49,7 +49,7 @@
/**
* get the help index
*/
- function getHelpIndex () {
+ static function getHelpIndex () {
global $lang;
$r = '';
Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/timetrack/timetrack.pinc 2012-07-13 05:28:01 UTC (rev 710)
@@ -37,7 +37,6 @@
}
$r = "<select id=\"state\" multiple=\"multiple\" name=\"state[]\">\n";
foreach ($stc->states as $f) {
-# if($f->stc_state == STC_NOT_EXISTANT) continue;
$r .= ' <option value="'. $f->stc_state .'" style="background:'.$f->color.'"';
if ( isset($default[$f->stc_state]) ) {
$r .= ' selected="selected"';
@@ -155,10 +154,10 @@
*/
protected $showurl = 'timetrack/timetrack_overview.php';
- protected $c_state = array(TT_STATE_CHECKED => 'lightgreen',
- TT_STATE_BILLED => 'orange',
- TT_STATE_PAYED => 'green',
- TT_STATE_NOBILL => 'red',
+ static protected $c_state = array(TT_STATE_CHECKED => 'lightgreen',
+ TT_STATE_BILLED => 'orange',
+ TT_STATE_PAYED => 'green',
+ TT_STATE_NOBILL => 'red',
);
/**
@@ -757,21 +756,21 @@
/**
* get the type of object
*/
- function gettype () {
+ static function gettype () {
return 'timetrack';
}
/**
* get the type id of object
*/
- function gettypeid () {
+ static function gettypeid () {
return usetimetrack;
}
/**
* get name of icons
*/
- function getHtmlIcon () {
+ static function getHtmlIcon () {
return 'time';
}
Modified: trunk/php/timetrack/timetrack_ins.php
===================================================================
--- trunk/php/timetrack/timetrack_ins.php 2012-07-12 16:12:07 UTC (rev 709)
+++ trunk/php/timetrack/timetrack_ins.php 2012-07-13 05:28:01 UTC (rev 710)
@@ -215,5 +215,5 @@
}
}
-leave_insert($dbconn,'../'.$gotourl,$msg);
+leave_insert($dbconn,'../'.$gotourl,$msg,$info);
?>
\ No newline at end of file
Modified: trunk/php/url/url.pinc
========================================...
[truncated message content] |
|
From: <gok...@us...> - 2012-07-12 16:12:18
|
Revision: 709
http://tutos.svn.sourceforge.net/tutos/?rev=709&view=rev
Author: gokohnert
Date: 2012-07-12 16:12:07 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/product.pinc
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2012-07-12 13:34:07 UTC (rev 708)
+++ trunk/php/product.pinc 2012-07-12 16:12:07 UTC (rev 709)
@@ -271,7 +271,8 @@
$stc = getObject($current_user->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('ProdStates',product::$c_state);
+ $x = new product($current_user->dbconn);
+ $stc->initByArray('ProdStates',$x->c_state);
}
$r = "<select id=\"state\" name=\"state[]\" multiple=\"multiple\">\n";
@@ -337,7 +338,7 @@
*/
protected $showurl = 'product_show.php';
- protected $c_state = array(PROD_STATE_AQ => "gray",
+ public $c_state = array(PROD_STATE_AQ => "gray",
PROD_STATE_RUN => "orange",
PROD_STATE_FINISH => "green",
PROD_STATE_CANCEL => "red",
@@ -1052,7 +1053,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('ProdStates',self::$c_state);
+ $stc->initByArray('ProdStates',$this->c_state);
}
$r .= $stc->getState($s);
return $r;
@@ -1072,7 +1073,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('ProdStates',self::$c_state);
+ $stc->initByArray('ProdStates',$this->c_state);
}
if (isset($stc->states[$s]))
$r .= $stc->states[$s]->color;
@@ -1096,7 +1097,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc($this->dbconn);
- $stc->initByArray('ProdStates',self::$c_state);
+ $stc->initByArray('ProdStates',$this->c_state);
}
$stc->stateowner = $this;
$r .= $stc->getStateSelection($this->state,'state');
@@ -1844,4 +1845,4 @@
}
}
$tutos['classes'][useprojects] = 'product';
-?>
\ 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...> - 2012-07-12 13:34:16
|
Revision: 708
http://tutos.svn.sourceforge.net/tutos/?rev=708&view=rev
Author: gokohnert
Date: 2012-07-12 13:34:07 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/bugtracking/bug.pinc
trunk/php/bugtracking/bug_overview.php
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-07-12 07:29:05 UTC (rev 707)
+++ trunk/php/bugtracking/bug.pinc 2012-07-12 13:34:07 UTC (rev 708)
@@ -248,13 +248,13 @@
*/
protected $showurl = 'bugtracking/bug_show.php';
- protected $c_state = array(BUG_STATE_OPEN => "red",
+ static public $c_state = array(BUG_STATE_OPEN => "red",
BUG_STATE_WORK => "blue",
BUG_STATE_SOLVED => "green",
BUG_STATE_CLOSED => "gray"
);
- protected $c_class = array(BUG_CLASS_LIGHT => "blue",
+ static public $c_class = array(BUG_CLASS_LIGHT => "blue",
BUG_CLASS_HEAVY => "#F05050",
BUG_CLASS_DANGER => "red",
BUG_CLASS_HINT => "green",
@@ -2178,4 +2178,4 @@
return $r;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2012-07-12 07:29:05 UTC (rev 707)
+++ trunk/php/bugtracking/bug_overview.php 2012-07-12 13:34:07 UTC (rev 708)
@@ -97,7 +97,8 @@
if ($step == 0) {
$step = 1;
}
- $step = 10800;
+ #$step = 10800;
+ #$step = 3600;
$ticks = ($to - $from) / $step;
// Points
@@ -1341,4 +1342,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...> - 2012-07-12 07:29:17
|
Revision: 707
http://tutos.svn.sourceforge.net/tutos/?rev=707&view=rev
Author: gokohnert
Date: 2012-07-12 07:29:05 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
revert
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/appointment.pinc
trunk/php/base.pinc
trunk/php/bugtracking/bug.pinc
trunk/php/checklist/checkfield.pinc
trunk/php/checklist/checklist.pinc
trunk/php/company.pinc
trunk/php/database.pinc
trunk/php/department.pinc
trunk/php/doctracker/doctracker.pinc
trunk/php/expense/expense.pinc
trunk/php/file/file.pinc
trunk/php/group/group.pinc
trunk/php/installation/installation.pinc
trunk/php/invoice/invoice.pinc
trunk/php/ldap/ldap.pinc
trunk/php/location.pinc
trunk/php/module_template/AAA.pinc
trunk/php/note/note.pinc
trunk/php/product.pinc
trunk/php/rate/rate.pinc
trunk/php/reminder/reminder.pinc
trunk/php/resource/resource.pinc
trunk/php/rss/rss.pinc
trunk/php/scrum/scrum.pinc
trunk/php/stc/stc.pinc
trunk/php/stuff/stuff.pinc
trunk/php/task.pinc
trunk/php/team.pinc
trunk/php/testmanager/testmanager.pinc
trunk/php/timetrack/timetrack.pinc
trunk/php/url/url.pinc
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/address.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -23,7 +23,7 @@
/**
* URL to use for display this object
*/
- static protected $showurl = 'address_show.php';
+ protected $showurl = 'address_show.php';
/**
* initialize
Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/appointment.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -378,7 +378,7 @@
/**
* URL to use for display this object
*/
- static protected $showurl = 'app_show.php';
+ protected $showurl = 'app_show.php';
/**
*
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/base.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -26,11 +26,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'mytutos.php'; // default only
+ protected $modurl = 'mytutos.php'; // default only
/**
* URL to use for display this object
*/
- static protected $showurl = 'showobject.php';
+ protected $showurl = 'showobject.php';
/** the global unique ID of this object in the Database
* @var int $id
*/
@@ -920,7 +920,7 @@
* get a url to this object
*/
function getURL ($arg = '') {
- $url = addUrlParameter(self::$showurl,'id='.$this->id);
+ $url = addUrlParameter($this->showurl,'id='.$this->id);
return addUrlParameter($url,$arg);
}
@@ -928,7 +928,7 @@
* get a url to the modify page of this object
*/
function getModURL ($arg = '') {
- $url = addUrlParameter(self::$modurl,'id='.$this->id);
+ $url = addUrlParameter($this->modurl,'id='.$this->id);
$url = addUrlParameter($url,$arg);
if (isset($_REQUEST['ss'])) {
$url = addUrlParameter($url,'ss='.$_REQUEST['ss']);
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/bugtracking/bug.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -242,27 +242,27 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'bugtracking/bug_new.php';
+ protected $modurl = 'bugtracking/bug_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'bugtracking/bug_show.php';
+ protected $showurl = 'bugtracking/bug_show.php';
- static public $c_state = array(BUG_STATE_OPEN => "red",
- BUG_STATE_WORK => "blue",
- BUG_STATE_SOLVED => "green",
- BUG_STATE_CLOSED => "gray"
+ protected $c_state = array(BUG_STATE_OPEN => "red",
+ BUG_STATE_WORK => "blue",
+ BUG_STATE_SOLVED => "green",
+ BUG_STATE_CLOSED => "gray"
);
- static public $c_class = array(BUG_CLASS_LIGHT => "blue",
- BUG_CLASS_HEAVY => "#F05050",
- BUG_CLASS_DANGER => "red",
- BUG_CLASS_HINT => "green",
- BUG_CLASS_5 => "#50F050",
- BUG_CLASS_6 => "#5050F0",
- BUG_CLASS_7 => "#804040",
- BUG_CLASS_8 => "#408040",
- BUG_CLASS_9 => "#404080"
+ protected $c_class = array(BUG_CLASS_LIGHT => "blue",
+ BUG_CLASS_HEAVY => "#F05050",
+ BUG_CLASS_DANGER => "red",
+ BUG_CLASS_HINT => "green",
+ BUG_CLASS_5 => "#50F050",
+ BUG_CLASS_6 => "#5050F0",
+ BUG_CLASS_7 => "#804040",
+ BUG_CLASS_8 => "#408040",
+ BUG_CLASS_9 => "#404080"
);
/**
@@ -1495,7 +1495,7 @@
case 'BugReportedFrom':
case 'BugCreate':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'BugAssignedTo':
$x = $f;
if ($f['old'] < 0)
Modified: trunk/php/checklist/checkfield.pinc
===================================================================
--- trunk/php/checklist/checkfield.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/checklist/checkfield.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -53,11 +53,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'checklist/checkfield_new.php';
+ protected $modurl = 'checklist/checkfield_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'checklist/checkfield_show.php';
+ protected $showurl = 'checklist/checkfield_show.php';
/**
* constructor
Modified: trunk/php/checklist/checklist.pinc
===================================================================
--- trunk/php/checklist/checklist.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/checklist/checklist.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -129,11 +129,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'checklist/checklist_new.php';
+ protected $modurl = 'checklist/checklist_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'checklist/checklist_show.php';
+ protected $showurl = 'checklist/checklist_show.php';
/**
* constructor
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/company.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -20,7 +20,7 @@
/**
* URL to use for display this object
*/
- static protected $showurl = 'company_show.php';
+ protected $showurl = 'company_show.php';
/**
* initialize
Modified: trunk/php/database.pinc
===================================================================
--- trunk/php/database.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/database.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -72,11 +72,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'database_new.php';
+ protected $modurl = 'database_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'database_show.php';
+ protected $showurl = 'database_show.php';
/* ---------------------------------------------------------------------------
*/
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/department.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -18,7 +18,7 @@
/**
* URL to use for display this object
*/
- static protected $showurl = 'department_show.php';
+ protected $showurl = 'department_show.php';
/**
* initialize
Modified: trunk/php/doctracker/doctracker.pinc
===================================================================
--- trunk/php/doctracker/doctracker.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/doctracker/doctracker.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -208,11 +208,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'doctracker/doc_new.php';
+ protected $modurl = 'doctracker/doc_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'doctracker/doc_show.php';
+ protected $showurl = 'doctracker/doc_show.php';
/**
* create
Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/expense/expense.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -116,11 +116,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'expense/expense_new.php';
+ protected $modurl = 'expense/expense_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'expense/expense_show.php';
+ protected $showurl = 'expense/expense_show.php';
/**
* constructor
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/file/file.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -153,11 +153,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'file/file_new.php';
+ protected $modurl = 'file/file_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'file/file_show.php';
+ protected $showurl = 'file/file_show.php';
/**
*
Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/group/group.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -17,11 +17,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'group/group_new.php';
+ protected $modurl = 'group/group_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'group/group_show.php';
+ protected $showurl = 'group/group_show.php';
/**
*
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/installation/installation.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -89,11 +89,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'installation/installation_new.php';
+ protected $modurl = 'installation/installation_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'installation/installation_show.php';
+ protected $showurl = 'installation/installation_show.php';
/**
* initialization
Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/invoice/invoice.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -412,11 +412,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'invoice/invoice_new.php';
+ protected $modurl = 'invoice/invoice_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'invoice/invoice_show.php';
+ protected $showurl = 'invoice/invoice_show.php';
/**
Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/ldap/ldap.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -103,7 +103,7 @@
*
*/
function close() {
- ldap_close($this->ds);
+ ldap_unbind($this->ds);
$this->ds = false;
}
@@ -347,7 +347,7 @@
if (!isset($loc[$c])) {
$loc[$c] = new location($this->dbconn);
$loc[$c]->category = 3; # = LDAP retrieved data
- }
+ }
$loc[$c]->lname = 'ldap:'.$tutos['ldap:'.$this->host.':'.$this->port]['servername'];
foreach($loc[$c]->larray as $i => $f ) {
if (isset($tutos['ldap:'. $this->host .":". $this->port][$f]) ) {
Modified: trunk/php/location.pinc
===================================================================
--- trunk/php/location.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/location.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -109,7 +109,7 @@
*/
class Location extends Tutos_base {
- static public $larray = array('desc1','city','zip','state','country','street1','street2','email_1','email_2','phone_1','phone_2','fax_1','acc_info1','acc_info2','acc_nr','customer_id');
+ static protected $larray = array('desc1','city','zip','state','country','street1','street2','email_1','email_2','phone_1','phone_2','fax_1','acc_info1','acc_info2','acc_nr','customer_id');
/* ---------------------------------------------------------------------------
*/
function location(tutos_db $dbconn) {
Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/module_template/AAA.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -19,11 +19,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'module_template/AAA_new.php';
+ protected $modurl = 'module_template/AAA_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'module_template/AAA_show.php';
+ protected $showurl = 'module_template/AAA_show.php';
/**
* init
*/
Modified: trunk/php/note/note.pinc
===================================================================
--- trunk/php/note/note.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/note/note.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -82,11 +82,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'note/note_new.php';
+ protected $modurl = 'note/note_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'note/note_show.php';
+ protected $showurl = 'note/note_show.php';
/**
* constructor
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/product.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -331,13 +331,13 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'product_new.php';
+ protected $modurl = 'product_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'product_show.php';
+ protected $showurl = 'product_show.php';
- static public $c_state = array(PROD_STATE_AQ => "gray",
+ protected $c_state = array(PROD_STATE_AQ => "gray",
PROD_STATE_RUN => "orange",
PROD_STATE_FINISH => "green",
PROD_STATE_CANCEL => "red",
@@ -1387,8 +1387,8 @@
case 'ProdStart':
case 'ProdEnd':
$x = resolve_history_datetime($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
Modified: trunk/php/rate/rate.pinc
===================================================================
--- trunk/php/rate/rate.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/rate/rate.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -56,11 +56,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'rate/rate_new.php';
+ protected $modurl = 'rate/rate_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'rate/rate_show.php';
+ protected $showurl = 'rate/rate_show.php';
/**
* constructor
Modified: trunk/php/reminder/reminder.pinc
===================================================================
--- trunk/php/reminder/reminder.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/reminder/reminder.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -123,11 +123,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'reminder/reminder_new.php';
+ protected $modurl = 'reminder/reminder_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'reminder/reminder_show.php';
+ protected $showurl = 'reminder/reminder_show.php';
/**
*
Modified: trunk/php/resource/resource.pinc
===================================================================
--- trunk/php/resource/resource.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/resource/resource.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -80,11 +80,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'resource/resource_new.php';
+ protected $modurl = 'resource/resource_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'resource/resource_show.php';
+ protected $showurl = 'resource/resource_show.php';
/**
*/
Modified: trunk/php/rss/rss.pinc
===================================================================
--- trunk/php/rss/rss.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/rss/rss.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -15,11 +15,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'rss/rss_new.php';
+ protected $modurl = 'rss/rss_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'rss/rss_show.php';
+ protected $showurl = 'rss/rss_show.php';
/**
* init
Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/scrum/scrum.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -37,11 +37,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'scrum/log_new.php';
+ protected $modurl = 'scrum/log_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'scrum/log_show.php';
+ protected $showurl = 'scrum/log_show.php';
/**
* constructor
@@ -824,11 +824,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'scrum/sprint_new.php';
+ protected $modurl = 'scrum/sprint_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'scrum/sprint_show.php';
+ protected $showurl = 'scrum/sprint_show.php';
/**
* constructor
Modified: trunk/php/stc/stc.pinc
===================================================================
--- trunk/php/stc/stc.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/stc/stc.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -494,11 +494,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'stc/stc_new.php';
+ protected $modurl = 'stc/stc_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'stc/stc_show.php';
+ protected $showurl = 'stc/stc_show.php';
/**
* init
Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/stuff/stuff.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -22,11 +22,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'stuff/stuff_new.php';
+ protected $modurl = 'stuff/stuff_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'stuff/stuff_show.php';
+ protected $showurl = 'stuff/stuff_show.php';
/* ---------------------------------------------------------------------------
*/
Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/task.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -464,13 +464,13 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'task_new.php';
+ protected $modurl = 'task_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'task_show.php';
+ protected $showurl = 'task_show.php';
- static public $c_state = array(TASK_PRE => "yellow",
+ protected $c_state = array(TASK_PRE => "yellow",
TASK_RUNNING => "orange",
TASK_FINISH => "lightgreen",
TASK_OVERDUE => "red"
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/team.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -20,11 +20,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'team_new.php';
+ protected $modurl = 'team_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'team_show.php';
+ protected $showurl = 'team_show.php';
/**
* initialize
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/testmanager/testmanager.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -105,11 +105,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'testmanager/testcase_new.php';
+ protected $modurl = 'testmanager/testcase_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'testmanager/testcase_show.php';
+ protected $showurl = 'testmanager/testcase_show.php';
/**
* constructor
@@ -1139,11 +1139,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'testmanager/testsuite_new.php';
+ protected $modurl = 'testmanager/testsuite_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'testmanager/testsuite_show.php';
+ protected $showurl = 'testmanager/testsuite_show.php';
/**
* constructor
@@ -2025,11 +2025,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'testmanager/testrun_new.php';
+ protected $modurl = 'testmanager/testrun_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'testmanager/testrun_show.php';
+ protected $showurl = 'testmanager/testrun_show.php';
/**
* constructor
Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/timetrack/timetrack.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -149,13 +149,13 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'timetrack/timetrack_new.php';
+ protected $modurl = 'timetrack/timetrack_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'timetrack/timetrack_overview.php';
+ protected $showurl = 'timetrack/timetrack_overview.php';
- static public $c_state = array(TT_STATE_CHECKED => 'lightgreen',
+ protected $c_state = array(TT_STATE_CHECKED => 'lightgreen',
TT_STATE_BILLED => 'orange',
TT_STATE_PAYED => 'green',
TT_STATE_NOBILL => 'red',
Modified: trunk/php/url/url.pinc
===================================================================
--- trunk/php/url/url.pinc 2012-07-12 06:36:35 UTC (rev 706)
+++ trunk/php/url/url.pinc 2012-07-12 07:29:05 UTC (rev 707)
@@ -24,11 +24,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'url/urlcat_new.php';
+ protected $modurl = 'url/urlcat_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'url/urlcat_show.php';
+ protected $showurl = 'url/urlcat_show.php';
/**
* creator
@@ -184,11 +184,11 @@
/**
* URL to use for modify this object
*/
- static protected $modurl = 'url/url_new.php';
+ protected $modurl = 'url/url_new.php';
/**
* URL to use for display this object
*/
- static protected $showurl = 'url/url_show.php';
+ protected $showurl = 'url/url_show.php';
/**
* creator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-12 06:36:46
|
Revision: 706
http://tutos.svn.sourceforge.net/tutos/?rev=706&view=rev
Author: gokohnert
Date: 2012-07-12 06:36:35 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
more static variables
Modified Paths:
--------------
trunk/php/appointment.pinc
trunk/php/stc/stc.pinc
Modified: trunk/php/appointment.pinc
===================================================================
--- trunk/php/appointment.pinc 2012-07-12 06:35:22 UTC (rev 705)
+++ trunk/php/appointment.pinc 2012-07-12 06:36:35 UTC (rev 706)
@@ -378,7 +378,7 @@
/**
* URL to use for display this object
*/
- protected $showurl = 'app_show.php';
+ static protected $showurl = 'app_show.php';
/**
*
Modified: trunk/php/stc/stc.pinc
===================================================================
--- trunk/php/stc/stc.pinc 2012-07-12 06:35:22 UTC (rev 705)
+++ trunk/php/stc/stc.pinc 2012-07-12 06:36:35 UTC (rev 706)
@@ -494,11 +494,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'stc/stc_new.php';
+ static protected $modurl = 'stc/stc_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'stc/stc_show.php';
+ static protected $showurl = 'stc/stc_show.php';
/**
* init
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-12 06:35:30
|
Revision: 705
http://tutos.svn.sourceforge.net/tutos/?rev=705&view=rev
Author: gokohnert
Date: 2012-07-12 06:35:22 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
more static variables
Modified Paths:
--------------
trunk/php/address.pinc
trunk/php/base.pinc
trunk/php/bugtracking/bug.pinc
trunk/php/bugtracking/bug_overview.php
trunk/php/checklist/checkfield.pinc
trunk/php/checklist/checklist.pinc
trunk/php/company.pinc
trunk/php/database.pinc
trunk/php/department.pinc
trunk/php/doctracker/doctracker.pinc
trunk/php/expense/expense.pinc
trunk/php/file/file.pinc
trunk/php/group/group.pinc
trunk/php/installation/installation.pinc
trunk/php/invoice/invoice.pinc
trunk/php/module_template/AAA.pinc
trunk/php/note/note.pinc
trunk/php/product.pinc
trunk/php/rate/rate.pinc
trunk/php/reminder/reminder.pinc
trunk/php/resource/resource.pinc
trunk/php/rss/rss.pinc
trunk/php/scrum/scrum.pinc
trunk/php/stuff/stuff.pinc
trunk/php/task.pinc
trunk/php/team.pinc
trunk/php/testmanager/testmanager.pinc
trunk/php/timetrack/timetrack.pinc
trunk/php/url/url.pinc
Modified: trunk/php/address.pinc
===================================================================
--- trunk/php/address.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/address.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -23,7 +23,7 @@
/**
* URL to use for display this object
*/
- protected $showurl = 'address_show.php';
+ static protected $showurl = 'address_show.php';
/**
* initialize
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/base.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -26,11 +26,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'mytutos.php'; // default only
+ static protected $modurl = 'mytutos.php'; // default only
/**
* URL to use for display this object
*/
- protected $showurl = 'showobject.php';
+ static protected $showurl = 'showobject.php';
/** the global unique ID of this object in the Database
* @var int $id
*/
@@ -920,7 +920,7 @@
* get a url to this object
*/
function getURL ($arg = '') {
- $url = addUrlParameter($this->showurl,'id='.$this->id);
+ $url = addUrlParameter(self::$showurl,'id='.$this->id);
return addUrlParameter($url,$arg);
}
@@ -928,7 +928,7 @@
* get a url to the modify page of this object
*/
function getModURL ($arg = '') {
- $url = addUrlParameter($this->modurl,'id='.$this->id);
+ $url = addUrlParameter(self::$modurl,'id='.$this->id);
$url = addUrlParameter($url,$arg);
if (isset($_REQUEST['ss'])) {
$url = addUrlParameter($url,'ss='.$_REQUEST['ss']);
Modified: trunk/php/bugtracking/bug.pinc
===================================================================
--- trunk/php/bugtracking/bug.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/bugtracking/bug.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -37,8 +37,7 @@
$stc = getObject($current_user->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $x = new Bug($current_user->dbconn);
- $stc->initByArray('BugStates',$x->c_state);
+ $stc->initByArray('BugStates',Bug::$c_state);
}
$additional = array();
@@ -243,39 +242,39 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'bugtracking/bug_new.php';
+ static protected $modurl = 'bugtracking/bug_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'bugtracking/bug_show.php';
+ static protected $showurl = 'bugtracking/bug_show.php';
- public $c_state = array(BUG_STATE_OPEN => "red",
- BUG_STATE_WORK => "blue",
- BUG_STATE_SOLVED => "green",
- BUG_STATE_CLOSED => "gray"
+ static public $c_state = array(BUG_STATE_OPEN => "red",
+ BUG_STATE_WORK => "blue",
+ BUG_STATE_SOLVED => "green",
+ BUG_STATE_CLOSED => "gray"
);
- public $c_class = array(BUG_CLASS_LIGHT => "blue",
- BUG_CLASS_HEAVY => "#F05050",
- BUG_CLASS_DANGER => "red",
- BUG_CLASS_HINT => "green",
- BUG_CLASS_5 => "#50F050",
- BUG_CLASS_6 => "#5050F0",
- BUG_CLASS_7 => "#804040",
- BUG_CLASS_8 => "#408040",
- BUG_CLASS_9 => "#404080"
+ static public $c_class = array(BUG_CLASS_LIGHT => "blue",
+ BUG_CLASS_HEAVY => "#F05050",
+ BUG_CLASS_DANGER => "red",
+ BUG_CLASS_HINT => "green",
+ BUG_CLASS_5 => "#50F050",
+ BUG_CLASS_6 => "#5050F0",
+ BUG_CLASS_7 => "#804040",
+ BUG_CLASS_8 => "#408040",
+ BUG_CLASS_9 => "#404080"
);
/**
* features we can modify per parent
*/
- protected $parent_feature = array('bug_use_revision',
- 'bug_need_revision',
- 'bug_delete',
- 'bug_free_target',
- 'bugnew_prod_mail',
- 'bugmod_prod_mail',
- 'bug_no_mail'
+ static protected $parent_feature = array('bug_use_revision',
+ 'bug_need_revision',
+ 'bug_delete',
+ 'bug_free_target',
+ 'bugnew_prod_mail',
+ 'bugmod_prod_mail',
+ 'bug_no_mail'
);
/**
*
@@ -369,7 +368,7 @@
*/
function get_parent_feature(tutos_base $p) {
global $tutos;
- foreach ($this->parent_feature as $i) {
+ foreach (self::$parent_feature as $i) {
$p->tutos[$i] = $tutos[$i];
}
read_config_values_by_obj($this->dbconn,$this->gettype(),$p);
@@ -680,7 +679,7 @@
$stc = getObject($this->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('BugStates',$this->c_state);
+ $stc->initByArray('BugStates',self::$c_state);
if ($s == -1) {
$this->state = BUG_STATE_OPEN;
$s = $this->state;
@@ -738,7 +737,7 @@
$stc = getObject($this->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('BugStates',$this->c_state);
+ $stc->initByArray('BugStates',self::$c_state);
if ($s == -1) {
$this->state = BUG_STATE_OPEN;
$s = $this->state;
@@ -782,7 +781,7 @@
$stc = getObject($this->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('BugStates',$this->c_state);
+ $stc->initByArray('BugStates',self::$c_state);
if ($this->state == -1) {
$r .= $lang['BugAutoState'] .' ';
$r .= $this->getState().'<input id="stc_state" type="hidden" name="state" value="'. $this->state ."\" />\n";
@@ -1412,7 +1411,7 @@
$stc = getObject($this->dbconn,$tutos['bug_state_stc']);
if (!is_object($stc)) {
$stc = new Stc($this->dbconn);
- $stc->initByArray('BugStates',$this->c_state);
+ $stc->initByArray('BugStates',self::$c_state);
}
if ($this->mod_ok() && $stc->check_trans($this->state,$tutos['bug_finish_state'])) {
$this->setState($tutos['bug_finish_state']);
@@ -1496,7 +1495,7 @@
case 'BugReportedFrom':
case 'BugCreate':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'BugAssignedTo':
$x = $f;
if ($f['old'] < 0)
@@ -2158,6 +2157,13 @@
}
/**
+ * get a list of per object config fields
+ */
+ static function getObjConfig(tutos_base $obj) {
+ return self::$parent_feature;
+ }
+
+ /**
* get the help index
*/
function getHelpIndex () {
Modified: trunk/php/bugtracking/bug_overview.php
===================================================================
--- trunk/php/bugtracking/bug_overview.php 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/bugtracking/bug_overview.php 2012-07-12 06:35:22 UTC (rev 705)
@@ -704,8 +704,8 @@
$e['val'] = $f2;
$e['cnt'] = $f2;
$e['title'] = (isset($lang['BugClasses'][$i2]) ? $lang['BugClasses'][$i2]:$i).' '.$i;
- if (isset($b->c_class[$i2]))
- $e['color'] = (isset($b->c_class[$i2]) ? $b->c_class[$i2]:'black');
+ if (isset(Bug::$c_class[$i2]))
+ $e['color'] = (isset(Bug::$c_class[$i2]) ? Bug::$c_class[$i2]:'black');
$spie['data2'][] = $e;
}
}
@@ -725,7 +725,7 @@
$e['val'] = $f;
$e['cnt'] = $f;
$e['title'] = $lang['BugClasses'][$i];
- $e['color'] = $b->c_class[$i];
+ $e['color'] = Bug::$c_class[$i];
$spie['data'][] = $e;
}
$r .= pie($spie);
@@ -872,7 +872,7 @@
$this->stc = getObject($this->user->dbconn,$tutos['bug_state_stc']);
if (!is_object($this->stc)) {
$this->stc = new stc(null);
- $this->stc->initByArray('BugStates',$this->dummy->c_state);
+ $this->stc->initByArray('BugStates',Bug::$c_state);
}
if ( $_GET['action'] == -2 ) {
@@ -980,7 +980,7 @@
$this->stc = getObject($this->user->dbconn,$tutos['bug_state_stc']);
if (!is_object($this->stc)) {
$this->stc = new stc(null);
- $this->stc->initByArray('BugStates',$this->dummy->c_state);
+ $this->stc->initByArray('BugStates',Bug::$c_state);
}
if ( $this->format == "stat") {
Modified: trunk/php/checklist/checkfield.pinc
===================================================================
--- trunk/php/checklist/checkfield.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/checklist/checkfield.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -53,11 +53,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'checklist/checkfield_new.php';
+ static protected $modurl = 'checklist/checkfield_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'checklist/checkfield_show.php';
+ static protected $showurl = 'checklist/checkfield_show.php';
/**
* constructor
Modified: trunk/php/checklist/checklist.pinc
===================================================================
--- trunk/php/checklist/checklist.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/checklist/checklist.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -129,11 +129,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'checklist/checklist_new.php';
+ static protected $modurl = 'checklist/checklist_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'checklist/checklist_show.php';
+ static protected $showurl = 'checklist/checklist_show.php';
/**
* constructor
Modified: trunk/php/company.pinc
===================================================================
--- trunk/php/company.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/company.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -20,7 +20,7 @@
/**
* URL to use for display this object
*/
- protected $showurl = 'company_show.php';
+ static protected $showurl = 'company_show.php';
/**
* initialize
Modified: trunk/php/database.pinc
===================================================================
--- trunk/php/database.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/database.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -72,11 +72,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'database_new.php';
+ static protected $modurl = 'database_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'database_show.php';
+ static protected $showurl = 'database_show.php';
/* ---------------------------------------------------------------------------
*/
Modified: trunk/php/department.pinc
===================================================================
--- trunk/php/department.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/department.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -18,7 +18,7 @@
/**
* URL to use for display this object
*/
- protected $showurl = 'department_show.php';
+ static protected $showurl = 'department_show.php';
/**
* initialize
Modified: trunk/php/doctracker/doctracker.pinc
===================================================================
--- trunk/php/doctracker/doctracker.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/doctracker/doctracker.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -208,11 +208,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'doctracker/doc_new.php';
+ static protected $modurl = 'doctracker/doc_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'doctracker/doc_show.php';
+ static protected $showurl = 'doctracker/doc_show.php';
/**
* create
Modified: trunk/php/expense/expense.pinc
===================================================================
--- trunk/php/expense/expense.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/expense/expense.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -116,11 +116,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'expense/expense_new.php';
+ static protected $modurl = 'expense/expense_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'expense/expense_show.php';
+ static protected $showurl = 'expense/expense_show.php';
/**
* constructor
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/file/file.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -153,11 +153,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'file/file_new.php';
+ static protected $modurl = 'file/file_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'file/file_show.php';
+ static protected $showurl = 'file/file_show.php';
/**
*
@@ -1427,29 +1427,29 @@
case 'FileCreate':
case 'FileReference':
$x = $f;
- $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
- if ( $f['old'] <= 0 ) {
- $x['old'] = '';
- } else {
- $b = getObject($this->dbconn,$f['old']);
- if ( is_object($b) ) {
- $x['old'] = $b->getLink();
+ $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
+ if ( $f['old'] <= 0 ) {
+ $x['old'] = '';
} else {
- $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
+ $b = getObject($this->dbconn,$f['old']);
+ if ( is_object($b) ) {
+ $x['old'] = $b->getLink();
+ } else {
+ $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
+ }
}
- }
- if ( $f['new'] <= 0 ) {
- $x['new'] = '';
- } else {
- $b = getObject($this->dbconn,$f['new']);
- if ( is_object($b) ) {
- $x['new'] = $b->getLink();
+ if ( $f['new'] <= 0 ) {
+ $x['new'] = '';
} else {
- $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
+ $b = getObject($this->dbconn,$f['new']);
+ if ( is_object($b) ) {
+ $x['new'] = $b->getLink();
+ } else {
+ $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
+ }
}
+ break;
}
- break;
- }
return $x;
}
Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/group/group.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -17,11 +17,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'group/group_new.php';
+ static protected $modurl = 'group/group_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'group/group_show.php';
+ static protected $showurl = 'group/group_show.php';
/**
*
@@ -30,8 +30,8 @@
global $table;
$this->init($dbconn);
- $this->name = "";
- $this->desc = "";
+ $this->name = '';
+ $this->desc = '';
$this->member = array();
$this->tablename = $this->dbconn->prefix .$table['group'][name];
Modified: trunk/php/installation/installation.pinc
===================================================================
--- trunk/php/installation/installation.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/installation/installation.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -43,7 +43,7 @@
case 'department':
case 'address':
$url = addUrlParameter($url,'cid='.$obj->id);
- break;
+ break;
default:
$url = addUrlParameter($url,'link_id='.$obj->id);
}
@@ -89,11 +89,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'installation/installation_new.php';
+ static protected $modurl = 'installation/installation_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'installation/installation_show.php';
+ static protected $showurl = 'installation/installation_show.php';
/**
* initialization
@@ -607,13 +607,13 @@
case 'SoldDateTime':
case 'InstDateTime':
$x = resolve_history_datetime($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
case 'InstCreate':
case 'InstalledBy':
case 'SoldBy':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
}
return $x;
}
Modified: trunk/php/invoice/invoice.pinc
===================================================================
--- trunk/php/invoice/invoice.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/invoice/invoice.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -412,11 +412,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'invoice/invoice_new.php';
+ static protected $modurl = 'invoice/invoice_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'invoice/invoice_show.php';
+ static protected $showurl = 'invoice/invoice_show.php';
/**
Modified: trunk/php/module_template/AAA.pinc
===================================================================
--- trunk/php/module_template/AAA.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/module_template/AAA.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -19,11 +19,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'module_template/AAA_new.php';
+ static protected $modurl = 'module_template/AAA_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'module_template/AAA_show.php';
+ static protected $showurl = 'module_template/AAA_show.php';
/**
* init
*/
Modified: trunk/php/note/note.pinc
===================================================================
--- trunk/php/note/note.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/note/note.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -82,11 +82,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'note/note_new.php';
+ static protected $modurl = 'note/note_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'note/note_show.php';
+ static protected $showurl = 'note/note_show.php';
/**
* constructor
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/product.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -42,8 +42,7 @@
$obj->stc = getObject($obj->dbconn,$tutos['prod_state_stc']);
if (!is_object($obj->stc)) {
$obj->stc = new stc(null);
- $x = new Product($obj->dbconn);
- $obj->stc->initByArray('ProdStates',$x->c_state);
+ $obj->stc->initByArray('ProdStates',product::$c_state);
}
$obj->filter = array();
@@ -272,8 +271,7 @@
$stc = getObject($current_user->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $x = new Product($current_user->dbconn);
- $stc->initByArray('ProdStates',$x->c_state);
+ $stc->initByArray('ProdStates',product::$c_state);
}
$r = "<select id=\"state\" name=\"state[]\" multiple=\"multiple\">\n";
@@ -333,18 +331,18 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'product_new.php';
+ static protected $modurl = 'product_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'product_show.php';
+ static protected $showurl = 'product_show.php';
- public $c_state = array(PROD_STATE_AQ => "gray",
- PROD_STATE_RUN => "orange",
- PROD_STATE_FINISH => "green",
- PROD_STATE_CANCEL => "red",
- PROD_STATE_QRUN => "lightgreen",
- PROD_STATE_QCANCEL => "lightred"
+ static public $c_state = array(PROD_STATE_AQ => "gray",
+ PROD_STATE_RUN => "orange",
+ PROD_STATE_FINISH => "green",
+ PROD_STATE_CANCEL => "red",
+ PROD_STATE_QRUN => "lightgreen",
+ PROD_STATE_QCANCEL => "lightred"
);
@@ -1054,7 +1052,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',self::$c_state);
}
$r .= $stc->getState($s);
return $r;
@@ -1074,7 +1072,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',self::$c_state);
}
if (isset($stc->states[$s]))
$r .= $stc->states[$s]->color;
@@ -1098,7 +1096,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc($this->dbconn);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',self::$c_state);
}
$stc->stateowner = $this;
$r .= $stc->getStateSelection($this->state,'state');
@@ -1311,7 +1309,7 @@
$stc = getObject($this->dbconn,$tutos['prod_state_stc']);
if (!is_object($stc)) {
$stc = new Stc($this->dbconn);
- $stc->initByArray('ProdStates',$this->c_state);
+ $stc->initByArray('ProdStates',self::$c_state);
}
if ($this->mod_ok() && $stc->check_trans($this->state,$tutos['prod_finish_state'])) {
$this->setState($tutos['prod_finish_state']);
Modified: trunk/php/rate/rate.pinc
===================================================================
--- trunk/php/rate/rate.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/rate/rate.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -56,11 +56,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'rate/rate_new.php';
+ static protected $modurl = 'rate/rate_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'rate/rate_show.php';
+ static protected $showurl = 'rate/rate_show.php';
/**
* constructor
@@ -108,27 +108,27 @@
# } else {
# $this->worker = $this->creator;
# }
- # } else {
- $this->worker = $this->creator;
- # }
- }
- if ( is_object($this->worker) && ($this->worker->gettype() == "team") ) {
- $this->worker->read_member();
- }
+ # } else {
+ $this->worker = $this->creator;
+ # }
+}
+ if ( is_object($this->worker) && ($this->worker->gettype() == "team") ) {
+ $this->worker->read_member();
+ }
- $this->name = $r->get($pos, "name");
- $this->priority = $r->get($pos, "priority");
- $this->cph = $r->get($pos, "cph");
- $this->currency = $r->get($pos, "currency");
- $this->vat = $r->get($pos, "vat");
- $this->role_id = $r->get($pos, "role_id");
- $this->state = $r->get($pos, "state");
+$this->name = $r->get($pos, "name");
+$this->priority = $r->get($pos, "priority");
+$this->cph = $r->get($pos, "cph");
+$this->currency = $r->get($pos, "currency");
+$this->vat = $r->get($pos, "vat");
+$this->role_id = $r->get($pos, "role_id");
+$this->state = $r->get($pos, "state");
- $this->creator = getObject($this->dbconn,$r->get($pos, "creator"));
+$this->creator = getObject($this->dbconn,$r->get($pos, "creator"));
- parent::read_result($r,$pos);
- return;
- }
+parent::read_result($r,$pos);
+return;
+}
/**
* get a list of possible new parents
Modified: trunk/php/reminder/reminder.pinc
===================================================================
--- trunk/php/reminder/reminder.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/reminder/reminder.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -123,11 +123,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'reminder/reminder_new.php';
+ static protected $modurl = 'reminder/reminder_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'reminder/reminder_show.php';
+ static protected $showurl = 'reminder/reminder_show.php';
/**
*
Modified: trunk/php/resource/resource.pinc
===================================================================
--- trunk/php/resource/resource.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/resource/resource.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -80,11 +80,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'resource/resource_new.php';
+ static protected $modurl = 'resource/resource_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'resource/resource_show.php';
+ static protected $showurl = 'resource/resource_show.php';
/**
*/
@@ -349,7 +349,7 @@
case 'ResUsage':
case 'Resource':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
}
return $x;
}
Modified: trunk/php/rss/rss.pinc
===================================================================
--- trunk/php/rss/rss.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/rss/rss.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -15,11 +15,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'rss/rss_new.php';
+ static protected $modurl = 'rss/rss_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'rss/rss_show.php';
+ static protected $showurl = 'rss/rss_show.php';
/**
* init
Modified: trunk/php/scrum/scrum.pinc
===================================================================
--- trunk/php/scrum/scrum.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/scrum/scrum.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -37,11 +37,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'scrum/log_new.php';
+ static protected $modurl = 'scrum/log_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'scrum/log_show.php';
+ static protected $showurl = 'scrum/log_show.php';
/**
* constructor
@@ -824,11 +824,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'scrum/sprint_new.php';
+ static protected $modurl = 'scrum/sprint_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'scrum/sprint_show.php';
+ static protected $showurl = 'scrum/sprint_show.php';
/**
* constructor
Modified: trunk/php/stuff/stuff.pinc
===================================================================
--- trunk/php/stuff/stuff.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/stuff/stuff.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -22,11 +22,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'stuff/stuff_new.php';
+ static protected $modurl = 'stuff/stuff_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'stuff/stuff_show.php';
+ static protected $showurl = 'stuff/stuff_show.php';
/* ---------------------------------------------------------------------------
*/
Modified: trunk/php/task.pinc
===================================================================
--- trunk/php/task.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/task.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -464,16 +464,16 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'task_new.php';
+ static protected $modurl = 'task_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'task_show.php';
+ static protected $showurl = 'task_show.php';
- public $c_state = array(TASK_PRE => "yellow",
- TASK_RUNNING => "orange",
- TASK_FINISH => "lightgreen",
- TASK_OVERDUE => "red"
+ static public $c_state = array(TASK_PRE => "yellow",
+ TASK_RUNNING => "orange",
+ TASK_FINISH => "lightgreen",
+ TASK_OVERDUE => "red"
);
/**
@@ -2306,9 +2306,9 @@
$x1 = $obj->dbconn->DateTime($from);
$x2 = $obj->dbconn->DateTime($to);
#
- #
- #
- $q = 'SELECT c.* FROM '. $obj->dbconn->prefix .$table['task'][name].' c ';
+ #
+ #
+ $q = 'SELECT c.* FROM '. $obj->dbconn->prefix .$table['task'][name].' c ';
$pre = " WHERE";
if ( ($obj->getType() == "address") || ($obj->getType() == "user") ) {
// Select the workers and all his teams tasks
@@ -2318,7 +2318,7 @@
}
$q .= ")";
#
- $qq = 'SELECT DISTINCT t_id FROM '. $obj->dbconn->prefix .$table['taskworker'][name]. " WHERE w_id in (".$obj->id;
+ $qq = 'SELECT DISTINCT t_id FROM '. $obj->dbconn->prefix .$table['taskworker'][name]. " WHERE w_id in (".$obj->id;
foreach ($obj->teamlist as $i => $f) {
$qq .= "," . $i;
}
@@ -2339,7 +2339,7 @@
}
$r->free();
#
- $q .= ")";
+ $q .= ")";
$pre = " AND";
}
$q .= $pre. "(";
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/team.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -20,11 +20,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'team_new.php';
+ static protected $modurl = 'team_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'team_show.php';
+ static protected $showurl = 'team_show.php';
/**
* initialize
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/testmanager/testmanager.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -105,11 +105,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'testmanager/testcase_new.php';
+ static protected $modurl = 'testmanager/testcase_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'testmanager/testcase_show.php';
+ static protected $showurl = 'testmanager/testcase_show.php';
/**
* constructor
@@ -624,7 +624,7 @@
case 'TestSuiteCopy':
case 'TestcaseRef':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
}
return $x;
}
@@ -1139,11 +1139,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'testmanager/testsuite_new.php';
+ static protected $modurl = 'testmanager/testsuite_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'testmanager/testsuite_show.php';
+ static protected $showurl = 'testmanager/testsuite_show.php';
/**
* constructor
@@ -1818,12 +1818,12 @@
case 'TestcaseCreate':
case 'TestsuiteCreate':
$f['old'] = '';
- $x = resolve_history_obj($f,$this->dbconn);
- break;
+ $x = resolve_history_obj($f,$this->dbconn);
+ break;
case 'TestSuiteCopy':
case 'TestsuiteRef':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'TestsuiteState':
$x = resolve_history_lgarr ($f,'TestsuiteStates');
}
@@ -2025,11 +2025,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'testmanager/testrun_new.php';
+ static protected $modurl = 'testmanager/testrun_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'testmanager/testrun_show.php';
+ static protected $showurl = 'testmanager/testrun_show.php';
/**
* constructor
@@ -2777,7 +2777,7 @@
case 'TestrunCreate':
case 'TestSuiteCopy':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
}
return $x;
}
Modified: trunk/php/timetrack/timetrack.pinc
===================================================================
--- trunk/php/timetrack/timetrack.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/timetrack/timetrack.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -27,9 +27,8 @@
$stc = getObject($current_user->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
- $x = new timetrack($current_user->dbconn);
$stc = new Stc(null);
- $stc->initByArray('TTStates',$x->c_state);
+ $stc->initByArray('TTStates',timetrack::$c_state);
}
$additional = array();
@@ -150,16 +149,16 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'timetrack/timetrack_new.php';
+ static protected $modurl = 'timetrack/timetrack_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'timetrack/timetrack_overview.php';
+ static protected $showurl = 'timetrack/timetrack_overview.php';
- public $c_state = array(TT_STATE_CHECKED => "lightgreen",
- TT_STATE_BILLED => "orange",
- TT_STATE_PAYED => "green",
- TT_STATE_NOBILL => "red",
+ static public $c_state = array(TT_STATE_CHECKED => 'lightgreen',
+ TT_STATE_BILLED => 'orange',
+ TT_STATE_PAYED => 'green',
+ TT_STATE_NOBILL => 'red',
);
/**
@@ -414,7 +413,7 @@
$stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('TTStates',$this->c_state);
+ $stc->initByArray('TTStates',self::$c_state);
}
$r .= $stc->getState($s);
@@ -435,7 +434,7 @@
$stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
$stc = new stc(null);
- $stc->initByArray('TTStates',$this->c_state);
+ $stc->initByArray('TTStates',self::$c_state);
}
if (isset($stc->states[$s]))
$r .= $stc->states[$s]->color;
@@ -459,7 +458,7 @@
$stc = getObject($this->dbconn,$tutos['timetrack_state_stc']);
if (!is_object($stc)) {
$stc = new Stc(null);
- $stc->initByArray('TTStates',$this->c_state);
+ $stc->initByArray('TTStates',self::$c_state);
if ($this->state == -1) {
$this->state = $tutos['timetrack_default_state'];
}
@@ -1055,4 +1054,4 @@
}
}
$tutos['classes'][usetimetrack] = 'Timetrack';
-?>
+?>
\ No newline at end of file
Modified: trunk/php/url/url.pinc
===================================================================
--- trunk/php/url/url.pinc 2012-07-10 14:00:07 UTC (rev 704)
+++ trunk/php/url/url.pinc 2012-07-12 06:35:22 UTC (rev 705)
@@ -24,11 +24,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'url/urlcat_new.php';
+ static protected $modurl = 'url/urlcat_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'url/urlcat_show.php';
+ static protected $showurl = 'url/urlcat_show.php';
/**
* creator
@@ -184,11 +184,11 @@
/**
* URL to use for modify this object
*/
- protected $modurl = 'url/url_new.php';
+ static protected $modurl = 'url/url_new.php';
/**
* URL to use for display this object
*/
- protected $showurl = 'url/url_show.php';
+ static protected $showurl = 'url/url_show.php';
/**
* creator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-10 14:00:18
|
Revision: 704
http://tutos.svn.sourceforge.net/tutos/?rev=704&view=rev
Author: gokohnert
Date: 2012-07-10 14:00:07 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
export CSV in target encoding
Modified Paths:
--------------
trunk/php/webelements.p3
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2012-07-10 13:26:13 UTC (rev 703)
+++ trunk/php/webelements.p3 2012-07-10 14:00:07 UTC (rev 704)
@@ -467,7 +467,7 @@
case 'integer':
case 'double':
$r .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$r .= 'T';
@@ -818,10 +818,14 @@
}
/**
- * format a value for use with csv files from "http://de2.php.net/manual/en/function.fputcsv.php#87120"
+ * format a value for use with csv files from
+ * "http://de2.php.net/manual/en/function.fputcsv.php#87120"
+* output is always converted to target_enc encoding
*/
function txt2csv ($val,$delimiter = '',$enclosure = '') {
global $tutos;
+
+
if ($delimiter == '' && isset($tutos['CSV_delimiter'])) {
$delimiter = $tutos['CSV_delimiter'];
} else {
@@ -836,8 +840,8 @@
$enclosure_esc = preg_quote($enclosure, '/');
$r = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $val) ? (
- $enclosure . str_replace($enclosure, $enclosure . $enclosure, $val) . $enclosure
- ) : $val;
+ $enclosure . str_replace($enclosure, $enclosure . $enclosure, myiconv($val)) . $enclosure
+ ) : myiconv($val);
return $r.$delimiter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-10 13:26:24
|
Revision: 703
http://tutos.svn.sourceforge.net/tutos/?rev=703&view=rev
Author: gokohnert
Date: 2012-07-10 13:26:13 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
fix linefeed
Modified Paths:
--------------
trunk/php/mail.pinc
Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc 2012-07-10 13:03:52 UTC (rev 702)
+++ trunk/php/mail.pinc 2012-07-10 13:26:13 UTC (rev 703)
@@ -1838,7 +1838,7 @@
function error_log($info) {
global $tutos;
if ($tutos['maildebug'])
- error_log($info."\n",3,$tutos[errlog].'.mail');
+ error_log(trim($info)."\n",3,$tutos[errlog].'.mail');
}
}
?>
\ 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...> - 2012-07-10 13:04:03
|
Revision: 702
http://tutos.svn.sourceforge.net/tutos/?rev=702&view=rev
Author: gokohnert
Date: 2012-07-10 13:03:52 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/admin_show.php
Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php 2012-07-10 11:45:33 UTC (rev 701)
+++ trunk/php/admin_show.php 2012-07-10 13:03:52 UTC (rev 702)
@@ -463,7 +463,6 @@
}
$fd = fopen($tutos[errlog].'.mail', 'rb');
if ($fd === false) return $r;
- fclose($fd);
$r .= '<pre>';
$r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail')));
$r .= '</pre>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-10 11:45:44
|
Revision: 701
http://tutos.svn.sourceforge.net/tutos/?rev=701&view=rev
Author: gokohnert
Date: 2012-07-10 11:45:33 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/bugtracking/bug_ins.php
Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php 2012-07-10 11:45:19 UTC (rev 700)
+++ trunk/php/bugtracking/bug_ins.php 2012-07-10 11:45:33 UTC (rev 701)
@@ -64,6 +64,7 @@
if ( (empty($_POST['description']) || !isset($_POST['description']) ) && ($b->id < 0 )) {
$msg = addLine(sprintf($lang['Err0009'],$lang['BugLong']),$msg);
$gotourl = addBadField($gotourl,'description',true);
+ $description = '';
} else {
$description = trim($_POST['description']);
$gotourl= addUrlParameter($gotourl,"description=". UrlEncode($description),true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-10 11:45:30
|
Revision: 700
http://tutos.svn.sourceforge.net/tutos/?rev=700&view=rev
Author: gokohnert
Date: 2012-07-10 11:45:19 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
log viewer fo sql and mail
Modified Paths:
--------------
trunk/php/admin_show.php
Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php 2012-07-09 18:52:35 UTC (rev 699)
+++ trunk/php/admin_show.php 2012-07-10 11:45:19 UTC (rev 700)
@@ -129,6 +129,22 @@
$r .= $this->showdata('changed = '.date($lang['DateTimePHP'], filemtime($tutos[errlog].'.log')), 3);
$r .= "</tr>\n";
}
+ if ($tutos['sqldebug'] && is_readable($tutos[errlog].'.sql')) {
+ $r .= "<tr>\n";
+ $r .= $this->showfield('SQL Log File');
+ $r .= $this->showdata(makelink('admin_show.php?mode=sqlfile', ($current_user->isAdmin() ? $tutos[errlog].'.sql':basename($tutos[errlog].'.sql'))), 4);
+ $r .= $this->showdata('size = '.filesize($tutos[errlog].'.sql'), 1);
+ $r .= $this->showdata('changed = '.date($lang['DateTimePHP'], filemtime($tutos[errlog].'.sql')), 3);
+ $r .= "</tr>\n";
+ }
+ if ($tutos['maildebug'] && is_readable($tutos[errlog].'.mail')) {
+ $r .= "<tr>\n";
+ $r .= $this->showfield('Mail Log File');
+ $r .= $this->showdata(makelink('admin_show.php?mode=mailfile', ($current_user->isAdmin() ? $tutos[errlog].'.mail':basename($tutos[errlog].'.mail'))), 4);
+ $r .= $this->showdata('size = '.filesize($tutos[errlog].'.mail'), 1);
+ $r .= $this->showdata('changed = '.date($lang['DateTimePHP'], filemtime($tutos[errlog].'.mail')), 3);
+ $r .= "</tr>\n";
+ }
return $r;
}
@@ -420,12 +436,44 @@
fclose($fd);
$r .= '</pre>';
return $r;
- }
- if ( ($tutos[debug] == 1) && ($this->mode == 'logfile') ) {
+ } else if ( ($tutos[debug] == 1) && ($this->mode == 'sqlfile') ) {
if ( ! $this->user->isAdmin() ) {
$r .= $this->error('Only real admins are allowed to see this');
return $r;
}
+ if (!file_exists($tutos[errlog].'.sql')) {
+ $r .= $this->error('no such file '.$tutos[errlog].'.sql');
+ return $r;
+ }
+ $fd = fopen($tutos[errlog].'.sql', 'rb');
+ if ($fd === false) return $r;
+ $r .= '<pre>';
+ $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.sql')));
+ $r .= '</pre>';
+ fclose($fd);
+ return $r;
+ } else if ( ($tutos[debug] == 1) && ($this->mode == 'mailfile') ) {
+ if ( ! $this->user->isAdmin() ) {
+ $r .= $this->error('Only real admins are allowed to see this');
+ return $r;
+ }
+ if (!file_exists($tutos[errlog].'.mail')) {
+ $r .= $this->error('no such file '.$tutos[errlog].'.mail');
+ return $r;
+ }
+ $fd = fopen($tutos[errlog].'.mail', 'rb');
+ if ($fd === false) return $r;
+ fclose($fd);
+ $r .= '<pre>';
+ $r .= htmlspecialchars(fread ($fd, filesize ($tutos[errlog].'.mail')));
+ $r .= '</pre>';
+ fclose($fd);
+ return $r;
+ } else if ( ($tutos[debug] == 1) && ($this->mode == 'logfile') ) {
+ if ( ! $this->user->isAdmin() ) {
+ $r .= $this->error('Only real admins are allowed to see this');
+ return $r;
+ }
if (!file_exists($tutos[errlog].'.log')) {
$r .= $this->error('no such file '.$tutos[errlog].'.log');
return $r;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-09 18:52:45
|
Revision: 699
http://tutos.svn.sourceforge.net/tutos/?rev=699&view=rev
Author: gokohnert
Date: 2012-07-09 18:52:35 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
lang update
Modified Paths:
--------------
trunk/php/bugtracking/ca.p3
Modified: trunk/php/bugtracking/ca.p3
===================================================================
--- trunk/php/bugtracking/ca.p3 2012-07-09 18:49:01 UTC (rev 698)
+++ trunk/php/bugtracking/ca.p3 2012-07-09 18:52:35 UTC (rev 699)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "Utilitzar gestió incidències";
$lang['bugtracking'] = &$lang['Bug'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-09 18:49:11
|
Revision: 698
http://tutos.svn.sourceforge.net/tutos/?rev=698&view=rev
Author: gokohnert
Date: 2012-07-09 18:49:01 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
lang update
Modified Paths:
--------------
trunk/php/bugtracking/cs.p3
trunk/php/bugtracking/de.p3
trunk/php/bugtracking/el.p3
trunk/php/bugtracking/en.p3
trunk/php/bugtracking/es-mx.p3
trunk/php/bugtracking/es-ni.p3
trunk/php/bugtracking/es-ve.p3
trunk/php/bugtracking/es.p3
trunk/php/bugtracking/fr.p3
trunk/php/bugtracking/hu.p3
trunk/php/bugtracking/it.p3
trunk/php/bugtracking/ja.p3
trunk/php/bugtracking/ko.p3
trunk/php/bugtracking/nl.p3
trunk/php/bugtracking/pl.p3
trunk/php/bugtracking/pt-br.p3
trunk/php/bugtracking/pt.p3
trunk/php/bugtracking/ru.p3
trunk/php/bugtracking/sv.p3
trunk/php/bugtracking/tw.p3
trunk/php/bugtracking/vi.p3
trunk/php/bugtracking/zh.p3
Modified: trunk/php/bugtracking/cs.p3
===================================================================
--- trunk/php/bugtracking/cs.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/cs.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "použít sledování chyb";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/de.p3
===================================================================
--- trunk/php/bugtracking/de.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/de.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Alter des momentanen Status in Übersicht anzeigen.';
$lang['BugConfigHelpFinishState'] = 'Status der beim automatischen Schliessen eines Fehlers gesetzt wird (z.Bsp. beim Buchen eines Aufwands)';
$lang['BugConfigHelpNeedTarget'] = 'Fehlerzustände welche ein gesetztes Ziel benötigen.';
+$lang['BugConfigHelpUseRevision'] = 'Revision Feld benutzen.';
+$lang['BugConfigHelpNeedRevision'] = 'Fehlerzustände welche eine definierte Revison benötigen.';
$lang['perm'][usebugtracking] = "Fehlermanagement";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/el.p3
===================================================================
--- trunk/php/bugtracking/el.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/el.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "χρήση εντοπισμού λαθών";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/en.p3
===================================================================
--- trunk/php/bugtracking/en.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/en.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -118,6 +118,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "use bugtracking";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/es-mx.p3
===================================================================
--- trunk/php/bugtracking/es-mx.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/es-mx.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "usar seguimeinto de fallos";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/es-ni.p3
===================================================================
--- trunk/php/bugtracking/es-ni.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/es-ni.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "use seguimiento de fallos";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/es-ve.p3
===================================================================
--- trunk/php/bugtracking/es-ve.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/es-ve.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "usar seguimeinto de incidencias";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/es.p3
===================================================================
--- trunk/php/bugtracking/es.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/es.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "Usar gestión incidencias";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/fr.p3
===================================================================
--- trunk/php/bugtracking/fr.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/fr.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "Gestion des incidents";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/hu.p3
===================================================================
--- trunk/php/bugtracking/hu.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/hu.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "hibakezelõ használata";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/it.p3
===================================================================
--- trunk/php/bugtracking/it.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/it.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "Usa bugtracking";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/ja.p3
===================================================================
--- trunk/php/bugtracking/ja.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/ja.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "バグトラッキング";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/ko.p3
===================================================================
--- trunk/php/bugtracking/ko.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/ko.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "use bugtracking";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/nl.p3
===================================================================
--- trunk/php/bugtracking/nl.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/nl.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "gebruik bugtracking";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/pl.p3
===================================================================
--- trunk/php/bugtracking/pl.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/pl.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "używanie śledzenia błędów";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/pt-br.p3
===================================================================
--- trunk/php/bugtracking/pt-br.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/pt-br.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "use bugtracking";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/pt.p3
===================================================================
--- trunk/php/bugtracking/pt.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/pt.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "usar REGISTO DE ANOMALIAS";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/ru.p3
===================================================================
--- trunk/php/bugtracking/ru.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/ru.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "контроль ошибок";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/sv.p3
===================================================================
--- trunk/php/bugtracking/sv.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/sv.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "använd bugghantering";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/tw.p3
===================================================================
--- trunk/php/bugtracking/tw.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/tw.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -120,6 +120,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "使用毛病 追蹤";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/vi.p3
===================================================================
--- trunk/php/bugtracking/vi.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/vi.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -123,6 +123,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "Theo dõi SCKT";
$lang['bugtracking'] = &$lang['Bug'];
Modified: trunk/php/bugtracking/zh.p3
===================================================================
--- trunk/php/bugtracking/zh.p3 2012-07-09 18:46:06 UTC (rev 697)
+++ trunk/php/bugtracking/zh.p3 2012-07-09 18:49:01 UTC (rev 698)
@@ -120,6 +120,8 @@
$lang['BugConfigHelpStateAge'] = 'Show age of current state in overview.';
$lang['BugConfigHelpFinishState'] = 'State to set when automatically closing a bug (when booking time)';
$lang['BugConfigHelpNeedTarget'] = 'States which need a defined target.';
+$lang['BugConfigHelpUseRevision'] = 'Enable Revision field.';
+$lang['BugConfigHelpNeedRevision'] = 'States which need a defined revision.';
$lang['perm'][usebugtracking] = "使用故障 追踪";
$lang['bugtracking'] = &$lang['Bug'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-09 18:46:12
|
Revision: 697
http://tutos.svn.sourceforge.net/tutos/?rev=697&view=rev
Author: gokohnert
Date: 2012-07-09 18:46:06 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
mail debug support
Modified Paths:
--------------
trunk/php/db.p3
trunk/php/mail.pinc
trunk/php/permission.p3
Modified: trunk/php/db.p3
===================================================================
--- trunk/php/db.p3 2012-07-09 18:44:57 UTC (rev 696)
+++ trunk/php/db.p3 2012-07-09 18:46:06 UTC (rev 697)
@@ -343,6 +343,7 @@
} else {
$tutos['pw'] = 0;
$tutos['sqldebug'] = false;
+ $tutos['maildebug'] = false;
$tutos['error_reporting'] = 0;
ini_set('display_startup_errors','Off');
ini_set('display_errors','Off');
Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc 2012-07-09 18:44:57 UTC (rev 696)
+++ trunk/php/mail.pinc 2012-07-09 18:46:06 UTC (rev 697)
@@ -1489,11 +1489,11 @@
stream_set_timeout($this->fd, 0,250000);
$this->readsmtp($msg,220); // Read the Greetings
- error_log('smtp mode: '.$tutos['mailmode']."\n",3,$tutos[errlog]);
+ $this->error_log('smtp mode: '.$tutos['mailmode']);
if ($tutos['mailmode'] == MAILMODE_SMTP_EHLO) {
fputs($this->fd,"EHLO ". $_SERVER['SERVER_NAME'] . $this->eoln); //EHLO is correct
- error_log('smtp out: EHLO (1)'."\n",3,$tutos[errlog]);
+ $this->error_log('smtp out: EHLO (1)');
if (!$this->readsmtp($msg,250)) return $msg;
fputs($this->fd,"AUTH LOGIN" . $this->eoln);
if (!$this->readsmtp($msg)) return $msg;
@@ -1504,20 +1504,20 @@
} else if ($tutos['mailmode'] == MAILMODE_SMTP_CRAM) {
$tutos['cram_password'] = '';
fputs($this->fd,"EHLO ". $_SERVER['SERVER_NAME'] . $this->eoln); //EHLO is correct
- error_log('smtp out: EHLO (2)'."\n",3,$tutos[errlog]);
+ $this->error_log('smtp out: EHLO (2)');
if (!$this->readsmtp($msg,250)) return $msg;
fputs($this->fd,"AUTH CRAM-MD5" . $this->eoln);
- error_log('smtp out: AUTH CRAM-MD5'."\n",3,$tutos[errlog]);
+ $this->error_log('smtp out: AUTH CRAM-MD5');
if (!$this->readsmtp($msg,334)) return $msg;
fputs($this->fd,base64_encode($tutos['cram_password']) . $this->eoln);
- error_log('smtp out: CRAM PW'."\n",3,$tutos[errlog]);
+ $this->error_log('smtp out: CRAM PW');
if (!$this->readsmtp($msg,235)) return $msg;
} else {
$this->writechannel("HELO ". $_SERVER['SERVER_NAME']);
if (!$this->readsmtp($msg)) return $msg;
}
$this->writechannel("MAIL From: <". $from .">");
- error_log('smtp out: MAIL From'."\n",3,$tutos[errlog]);
+ $this->error_log('smtp out: MAIL From:'.$from);
if (!$this->readsmtp($msg,250)) {
return $msg;
};
@@ -1526,6 +1526,7 @@
// Parse the name and/or email part
list($name,$em) = mail::split_name_email($obj);
$this->writechannel("RCPT To: <". $em .">");
+ $this->error_log('smtp out: RCPT to:'.$em);
$this->readsmtp($msg,250);
}
$this->writechannel("DATA");
@@ -1595,7 +1596,7 @@
$cnt = 1;
while (($line = fgets($this->fd, 1024)) !== false) {
#$line = fgets($this->fd,1024);
- error_log('smtp in: ('.$key.') '.$cnt++.' '.$line."",3,$tutos[errlog]);
+ $this->error_log('smtp in: ('.$key.') '.$cnt++.' '.$line);
if (empty($line)) {
return $result;
} else if ( preg_match("#^220 #",$line ) ) {
@@ -1621,12 +1622,12 @@
$ticket = base64_decode($in[1]);
$password=hash_hmac('MD5', $ticket, $tutos['smtp_password']);
$tutos['cram_password'] = $tutos['smtp_username'].' '.$password;
- error_log('smtp cram: '.$tutos['cram_password'] .' ticket:'.$ticket.'\n',3,$tutos[errlog]);
+ $this->error_log('smtp cram: '.$tutos['cram_password'] .' ticket:'.$ticket);
if ($key == 334) return true;
continue;
} else if ( preg_match("#^5#",$line ) ) {
$msg = addLine($msg,$line);
- error_log('smtp err: '.$line."",3,$tutos[errlog]);
+ $this->error_log('smtp err: '.$line);
$result = false;
} else {
$msg = addLine($msg,$line);
@@ -1830,5 +1831,14 @@
function save_to_file($fname) {
return $this->send($fname);
}
+
+ /**
+ * error_log to ....mail file
+ */
+ function error_log($info) {
+ global $tutos;
+ if ($tutos['maildebug'])
+ error_log($info."\n",3,$tutos[errlog].'.mail');
+ }
}
?>
\ No newline at end of file
Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3 2012-07-09 18:44:57 UTC (rev 696)
+++ trunk/php/permission.p3 2012-07-09 18:46:06 UTC (rev 697)
@@ -629,6 +629,7 @@
short_one_debugfile($tutos[errlog].'.log');
short_one_debugfile($tutos[errlog].'.sql');
+ short_one_debugfile($tutos[errlog].'.mail');
short_one_debugfile($tutos[errlog]);
}
@@ -679,6 +680,7 @@
if ($file == basename($tutos[errlog])) continue;
if ($file == basename($tutos[errlog]).'.log') continue;
if ($file == basename($tutos[errlog]).'.sql') continue;
+ if ($file == basename($tutos[errlog]).'.mail') continue;
$filename = $tutos[sessionpath] .'/'. $file;
if ( ! is_writeable($filename) ) continue;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-09 18:45:04
|
Revision: 696
http://tutos.svn.sourceforge.net/tutos/?rev=696&view=rev
Author: gokohnert
Date: 2012-07-09 18:44:57 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
canadian holiday support
Modified Paths:
--------------
trunk/php/custom.pinc
Modified: trunk/php/custom.pinc
===================================================================
--- trunk/php/custom.pinc 2012-07-09 18:44:11 UTC (rev 695)
+++ trunk/php/custom.pinc 2012-07-09 18:44:57 UTC (rev 696)
@@ -1067,7 +1067,7 @@
global $tutos;
// error_log($_SERVER["REQUEST_URI"] .">ReadCustomLang:".count($lang)." ". $key ." ". $path ."<br />\n",3,$tutos[errlog]);
- if ($key == 'en-us') {
+ if ( ($key == 'en-us') || ($key == 'en-ca') ) {
ReadCustomLang($lang,'en',$path);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-09 18:44:41
|
Revision: 695
http://tutos.svn.sourceforge.net/tutos/?rev=695&view=rev
Author: gokohnert
Date: 2012-07-09 18:44:11 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
canadian holiday support
Modified Paths:
--------------
trunk/php/Date.pinc
trunk/php/config_default.pinc
trunk/php/localization/holiday_de.pinc
trunk/php/webelements.p3
Added Paths:
-----------
trunk/php/localization/en-ca.p3
trunk/php/localization/holiday_ca.pinc
Modified: trunk/php/Date.pinc
===================================================================
--- trunk/php/Date.pinc 2012-07-05 11:20:32 UTC (rev 694)
+++ trunk/php/Date.pinc 2012-07-09 18:44:11 UTC (rev 695)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2011 by Gero Kohnert
+ * Copyright 1999 - 2012 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
@@ -59,6 +59,30 @@
return $ret;
}
+/* CANADA - Victoria Day - Monday preceding May 25th */
+function victoriaday($wd, $m, $y) {
+ $ret = nthday(-1, $wd, $m, $y);
+ if ($ret >= 25) {
+ $ret -= 7;
+ }
+ return $ret;
+}
+
+/* CANADA - Canada Day - July 1st, but not on a Sunday */
+/* - July 2nd if July 1st is a Sunday */
+function canadaday($wd, $m, $y) {
+ if ($wd > 0 ) {
+ $ret = 1;
+ }
+ if (($wd == 1) && (($wd+1) == 2) ) {
+ $ret = 2;
+ }
+ if (($wd == 1) && ((nthday(1, $wd, $m, $y)) == 1) ) {
+ $ret = 1;
+ }
+ return $ret;
+}
+
/*
* Read and fill the holiday array
*/
@@ -179,6 +203,14 @@
continue;
}
+ /* CANADA - Canada Day - July 1st, but not on a Sunday */
+ /* - July 2nd if July 1st is a Sunday */
+ if (($tutos[cal][$ii][$ij][Date] == "CA_CANADADAY") && ($month == "07") &&
+ ($today['mday'] == canadaday($today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+
/* Holidays defined by Weekday */
if ( $wd == "Mon" ) {
/* Date calculation for Dutch carnaval monday by Robert Brouwer */
@@ -236,6 +268,48 @@
$desc .= $tutos[cal][$ii][$ij][Desc].$br;
$mark += $tutos[cal][$ii][$ij][type];
}
+ /* CANADA - February Holiday - 2nd Monday in February */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_FEBHOLIDAY2") && ($month == "02") &&
+ ($today['mday'] == nthday(2, $today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+ /* CANADA - February Holiday - 3rd Monday in February */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_FEBHOLIDAY3") && ($month == "02") &&
+ ($today['mday'] == nthday(3, $today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+ /* CANADA - Victoria Day - Monday preceding May 25th */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_VICTORIADAY") && ($month == "05") &&
+ ($today['mday'] == victoriaday($today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+ /* CANADA - Civic Holiday - 1st Monday in August */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_CIVICDAY") && ($month == "08") &&
+ ($today['mday'] == nthday(1, $today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+ /* CANADA - Discovery Day - 3nd Monday in August */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_DISCOVERYDAY") && ($month == "08") &&
+ ($today['mday'] == nthday(3, $today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+ /* CANADA - Labour Day - 1st Monday in September */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_LABOURDAY") && ($month == "09") &&
+ ($today['mday'] == nthday(1, $today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
+ /* CANADA - Thanksgiving Day - 2nd Monday in October */
+ elseif (($tutos[cal][$ii][$ij][Date] == "CA_THANKSGIVING") && ($month == "10") &&
+ ($today['mday'] == nthday(2, $today['wday'], $today['mon'], $today['year'])) ) {
+ $desc .= $tutos[cal][$ii][$ij][Desc].$br;
+ $mark += $tutos[cal][$ii][$ij][type];
+ }
}
elseif ( $wd == "Tue" ) {
/* Date calculation for Dutch 'Prinsjesdag' by Robert Brouwer */
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2012-07-05 11:20:32 UTC (rev 694)
+++ trunk/php/config_default.pinc 2012-07-09 18:44:11 UTC (rev 695)
@@ -566,6 +566,7 @@
#
$tutos[holiday]['AU'] = 0;
$tutos[holiday]['BE'] = 0;
+$tutos[holiday]['CA'] = 0;
$tutos[holiday]['CH'] = 0;
$tutos[holiday]['CO'] = 0;
$tutos[holiday]['CS'] = 0;
@@ -744,6 +745,7 @@
#
$tutos[debug] = 0;
$tutos['sqldebug'] = false;
+$tutos['maildebug'] = false;
#
# The TUTOS Version number
#
@@ -753,4 +755,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
+?>
\ No newline at end of file
Added: trunk/php/localization/en-ca.p3
===================================================================
--- trunk/php/localization/en-ca.p3 (rev 0)
+++ trunk/php/localization/en-ca.p3 2012-07-09 18:44:11 UTC (rev 695)
@@ -0,0 +1,30 @@
+<?php
+# $Id: en-us.p3 11 2011-02-13 14:05:50Z gokohnert $
+#
+# contributed by Harold Smorodin <shws at pobox.com>
+#
+setlocale(LC_TIME,'en_CA');
+$tutos['df'] = 1;
+
+$lang['DateTimePHP'] = 'Y-M-d h:i a T';
+$lang['DateTimeStr'] = "%Y-%b-%d %I:%M %p %Z";
+$lang['DateTimeFormat'] = "%s-%s-%s %02s:%02s %s %s";
+
+$lang['DateTimeSPHP'] = "M-d h:i a";
+$lang['DateTimeSStr'] = "%b-%d %I:%M %p";
+$lang['DateTimeSFormat'] = "%s-%s %02s:%02s %s";
+
+$lang['TimeFormatPHP'] = "h:i a T";
+$lang['TimeFormatStr'] = "%I:%M %p %Z";
+$lang['TimeFormat'] = "%02s:%02s %s %s";
+
+$lang['DateFormatTitle'] = "%A, %B %d, %Y";
+$lang['DateFormatStr'] = "%Y-%m-%d";
+$lang['DateFormat'] = "%s-%s-%s";
+$lang['DateShortFormat'] = "%s-%s";
+
+$lang['AppRepeatInfo3'] = 'every year on %b-%d';
+
+### Local Variables: ***
+### End: ***
+?>
\ No newline at end of file
Property changes on: trunk/php/localization/en-ca.p3
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Added: svn:eol-style
+ native
Added: trunk/php/localization/holiday_ca.pinc
===================================================================
--- trunk/php/localization/holiday_ca.pinc (rev 0)
+++ trunk/php/localization/holiday_ca.pinc 2012-07-09 18:44:11 UTC (rev 695)
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright 2012 by Gero Kohnert & Harold Smorodin
+ *
+ * SVN Info $Id: holiday_de.pinc 11 2011-02-13 14:05:50Z gokohnert $
+ * $Author: gokohnert $
+ *
+ *
+ * Type = 0 day is displayed but not marked
+ * Type = 1 marks the day red in the calendar
+ *
+ *
+ * Edit as required.
+ *
+ * contributed by Harold Smorodin <shws at pobox.com>
+ */
+
+$tutos[cal][] = array(
+
+ # ****** CANADA STATUTORY HOLIDAYS - Start **********************************
+
+ array( Date => "01-01", type => 1, Desc => "New Year's Day (CA)"),
+ array( Date => "GOODFRIDAY", type => 1, Desc => "Good Friday (CA)"),
+ array( Date => "EASTERSUNDAY", type => 0, Desc => "Easter Sunday (CA)"),
+ array( Date => "CA_VICTORIADAY", type => 1, Desc => "Victoria Day (CA)"),
+# array( Date => "21-06", type => 1, Desc => "Aboriginal Day (CA_NT)"),
+ array( Date => "CA_CANADADAY", type => 1, Desc => "Canada Day (CA)"),
+# array( Date => "09-07", type => 1, Desc => "Nunavut Day (CA_NU)"),
+ array( Date => "CA_CIVICDAY", type => 1, Desc => "Civic Holiday (CA)"),
+# array( Date => "CA_DISCOVERYDAY",type => 1, Desc => "Discovery Day (CA_YT)"),
+ array( Date => "CA_LABOURDAY", type => 1, Desc => "Labour Day (CA)"),
+ array( Date => "CA_THANKSGIVING",type => 1, Desc => "Thanksgiving Day (CA)"),
+ array( Date => "11-11", type => 1, Desc => "Remembrance Day (CA)"),
+ array( Date => "25-12", type => 1, Desc => "Christmas Day (CA)"),
+ array( Date => "26-12", type => 1, Desc => "Boxing Day (CA)"),
+
+ # ****** CANADA STATUTORY HOLIDAYS - End **********************************
+
+
+
+# Add LOCAL HOLIDAYS here:
+ # ****** LOCAL HOLIDAYS Start ***********************************************
+
+# CANADA - February Holiday - Second Monday in February
+# a.k.a. Family Day in BC
+# Comment out the following line if you are not in British Columbia
+#array( Date => "CA_FEBHOLIDAY2", type => 1, Desc => "Family Day (CA_BC)"),
+
+# CANADA - February Holiday - Third Monday in February
+# a.k.a. Islander Day in PE
+# a.k.a. Family Day in AB, SK, ON
+# a.k.a. Louis Riel Day in MB
+# Edit "Desc" to suit your location OR comment out the following line
+# if your location does not does not observe the "February Holiday"
+ array( Date => "CA_FEBHOLIDAY3", type => 1, Desc => "Family Day (CA)"),
+
+ # ****** LOCAL HOLIDAYS End ***********************************************
+
+
+
+# Add NOTABLE EVENTS here:
+ # ****** EVENTS Start *******************************************************
+
+ # *** Celestial Events
+ array( Date => "20-03", type => 0, Desc => "Spring Equinox (CA)"),
+ array( Date => "20-06", type => 0, Desc => "Summer Solstice"),
+ array( Date => "22-09", type => 0, Desc => "Fall Equinox"),
+ array( Date => "21-12", type => 0, Desc => "Winter Solstice"),
+
+ # *** Observances of Interest
+ array( Date => "17-03", type => 0, Desc => "St. Patrick's Day"),
+ array( Date => "01-04", type => 0, Desc => "April Fools Day"),
+ array( Date => "31-10", type => 0, Desc => "Halloween"),
+ array( Date => "24-12", type => 0, Desc => "Christmas Eve"),
+ array( Date => "31-12", type => 0, Desc => "New Year's Eve"),
+
+ # ****** EVENTS End *******************************************************
+ );
+?>
\ No newline at end of file
Property changes on: trunk/php/localization/holiday_ca.pinc
___________________________________________________________________
Added: svn:mime-type
+ text/x-php
Added: svn:eol-style
+ native
Modified: trunk/php/localization/holiday_de.pinc
===================================================================
--- trunk/php/localization/holiday_de.pinc 2012-07-05 11:20:32 UTC (rev 694)
+++ trunk/php/localization/holiday_de.pinc 2012-07-09 18:44:11 UTC (rev 695)
@@ -1,5 +1,5 @@
<?php
-/*
+/**
* Copyright 2001 by Gero Kohnert
*
* SVN Info $Id$
@@ -10,27 +10,27 @@
* Type = 1 marks the day red in the calendar
*/
- $tutos[cal][] = array(
- array( Date => "01-01", type => 1, Desc => "Neujahr (D)"),
- array( Date => "06-01", type => 1, Desc => "Heilige drei Könige (D*)"),
- array( Date => "01-05", type => 1, Desc => "Tag der Arbeit (D)"),
- array( Date => "15-08", type => 1, Desc => "Maria Himmelfahrt (D*)"),
- array( Date => "03-10", type => 1, Desc => "Tag der deutschen Einheit (D)"),
- array( Date => "31-10", type => 1, Desc => "Reformationstag (D*)"),
- array( Date => "01-11", type => 1, Desc => "Allerheiligen (D*)"),
- array( Date => "25-12", type => 1, Desc => "Weihnachten (D)"),
- array( Date => "26-12", type => 1, Desc => "Weihnachten (D)"),
- array( Date => "GOODFRIDAY", type => 1, Desc => "Karfreitag (D)"),
- array( Date => "EASTERSUNDAY", type => 1, Desc => "Ostersonntag (D)"),
- array( Date => "EASTERMONDAY", type => 1, Desc => "Ostermontag (D)"),
- array( Date => "ASCENSIONDAY", type => 1, Desc => "Christi Himmelfahrt (D)"),
- array( Date => "WHITSUNDAY", type => 1, Desc => "Pfingstsonntag (D)"),
- array( Date => "WHITMONDAY", type => 1, Desc => "Pfingstmontag (D)"),
- array( Date => "FRONLEICHNAM", type => 1, Desc => "Fronleichnam (D*)")
- );
+$tutos[cal][] = array(
+ array( Date => "01-01", type => 1, Desc => "Neujahr (D)"),
+ array( Date => "06-01", type => 1, Desc => "Heilige drei Könige (D*)"),
+ array( Date => "01-05", type => 1, Desc => "Tag der Arbeit (D)"),
+ array( Date => "15-08", type => 1, Desc => "Maria Himmelfahrt (D*)"),
+ array( Date => "03-10", type => 1, Desc => "Tag der deutschen Einheit (D)"),
+ array( Date => "31-10", type => 1, Desc => "Reformationstag (D*)"),
+ array( Date => "01-11", type => 1, Desc => "Allerheiligen (D*)"),
+ array( Date => "25-12", type => 1, Desc => "Weihnachten (D)"),
+ array( Date => "26-12", type => 1, Desc => "Weihnachten (D)"),
+ array( Date => "GOODFRIDAY", type => 1, Desc => "Karfreitag (D)"),
+ array( Date => "EASTERSUNDAY", type => 1, Desc => "Ostersonntag (D)"),
+ array( Date => "EASTERMONDAY", type => 1, Desc => "Ostermontag (D)"),
+ array( Date => "ASCENSIONDAY", type => 1, Desc => "Christi Himmelfahrt (D)"),
+ array( Date => "WHITSUNDAY", type => 1, Desc => "Pfingstsonntag (D)"),
+ array( Date => "WHITMONDAY", type => 1, Desc => "Pfingstmontag (D)"),
+ array( Date => "FRONLEICHNAM", type => 1, Desc => "Fronleichnam (D*)")
+ );
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
+?>
\ No newline at end of file
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2012-07-05 11:20:32 UTC (rev 694)
+++ trunk/php/webelements.p3 2012-07-09 18:44:11 UTC (rev 695)
@@ -228,6 +228,10 @@
include $path ."/". "en.p3";
$ok = true;
}
+ if ( ("en-ca" == $lg) && file_exists(getcwd()."/".$path ."/en.p3") && is_readable(getcwd()."/".$path ."/en.p3") ) {
+ include $path ."/". "en.p3";
+ $ok = true;
+ }
if ( file_exists(getcwd()."/".$path ."/". $lg .".p3") && is_readable(getcwd()."/".$path ."/". $lg .".p3") ) {
include $path ."/". $lg .".p3";
$ok = true;
@@ -253,6 +257,8 @@
if ( file_exists(getcwd()."/".$path ."/". $tok .".p3") && is_readable(getcwd()."/".$path ."/". $tok .".p3") ) {
if ( "en-us" == $tok ) {
include $path ."/en.p3";
+ } else if ( "en-ca" == $tok ) {
+ include $path ."/en.p3";
}
include $path ."/". $tok. ".p3";
ReadCustomLang($lang,$tok,$path);
@@ -262,6 +268,8 @@
include $path ."/en.p3";
if ( preg_match("#^en-us#", $tok ) && file_exists(getcwd()."/".$path ."/en-us.p3") ) {
include $path ."/en-us.p3";
+ } else if ( preg_match("#^en-ca#", $tok ) && file_exists(getcwd()."/".$path ."/en-ca.p3") ) {
+ include $path ."/en-ca.p3";
}
ReadCustomLang($lang,"en",$path);
return ReadLangFinish($lang,$tok);
@@ -459,7 +467,7 @@
case 'integer':
case 'double':
$r .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$r .= 'T';
@@ -908,6 +916,7 @@
$text = myentities($text);
$text = preg_replace('#<([BIU])>#im' ,'<$1>',$text);
$text = preg_replace('#</([BIU])>#im' ,'</$1>',$text);
+ # $text = preg_replace('#"#m' ,'"',$text);
if ($ureplace)
$text = urlReplace($text,0);
if ($ireplace)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-05 11:20:43
|
Revision: 694
http://tutos.svn.sourceforge.net/tutos/?rev=694&view=rev
Author: gokohnert
Date: 2012-07-05 11:20:32 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/bugtracking/bug_ins.php
Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php 2012-07-05 07:59:09 UTC (rev 693)
+++ trunk/php/bugtracking/bug_ins.php 2012-07-05 11:20:32 UTC (rev 694)
@@ -337,7 +337,6 @@
if ( ($b->parent->tutos['bug_use_revision'] == 1) && ($b->parent->tutos['bug_need_revision'] != '') && ($b->newrev == '') && ($b->newdesc != '') ) {
// we have no revison but maybe are forced to need one
$x = preg_split('#,#',$b->parent->tutos['bug_need_revision']);
- $msg .= 'X:'.$x;
if (in_array($state,$x)) {
$msg = addLine(sprintf($lang['Err0009'],$lang['BugRevision']),$msg);
$gotourl = addBadField($gotourl,'newrev',true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-05 07:59:18
|
Revision: 693
http://tutos.svn.sourceforge.net/tutos/?rev=693&view=rev
Author: gokohnert
Date: 2012-07-05 07:59:09 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
stay and link popups
Modified Paths:
--------------
trunk/php/file/file.pinc
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2012-07-05 07:35:17 UTC (rev 692)
+++ trunk/php/file/file.pinc 2012-07-05 07:59:09 UTC (rev 693)
@@ -689,7 +689,8 @@
return '';
}
$url = $tutos['base'].'/php/'.addUrlParameter($this->getUrl(),'format=preview',true);
- $info = "{ajaxPath: '".$url." div#file_content'}";
+ $info = "{ajaxPath: '".$url." div#file_content',
+trigger : ['hoverIntent mouseover','none']}";
return array($info,'');
}
@@ -778,7 +779,7 @@
$url = dirname(getBaseUrl()) .'/'. addSessionKey($this->getUrl().'&format=show');
if ( preg_match('#image#',$this->filetype) ) {
- $info .= '<div id="file_content"><img class="file_preview" src="'.$url.'"><br />'.$this->getFullName().'</div>';
+ $info .= '<div id="file_content"><a href="'.$url.'"><img class="file_preview" src="'.$url.'"></a><br />'.$this->getFullName().'</div>';
} else {
$info .= '<div id="file_content"><pre class="file_preview">';
$info .= file_get_contents($fname,false,null,-1,100);
@@ -1426,29 +1427,29 @@
case 'FileCreate':
case 'FileReference':
$x = $f;
- $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
- if ( $f['old'] <= 0 ) {
- $x['old'] = '';
+ $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
+ if ( $f['old'] <= 0 ) {
+ $x['old'] = '';
+ } else {
+ $b = getObject($this->dbconn,$f['old']);
+ if ( is_object($b) ) {
+ $x['old'] = $b->getLink();
} else {
- $b = getObject($this->dbconn,$f['old']);
- if ( is_object($b) ) {
- $x['old'] = $b->getLink();
- } else {
- $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
- }
+ $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
}
- if ( $f['new'] <= 0 ) {
- $x['new'] = '';
+ }
+ if ( $f['new'] <= 0 ) {
+ $x['new'] = '';
+ } else {
+ $b = getObject($this->dbconn,$f['new']);
+ if ( is_object($b) ) {
+ $x['new'] = $b->getLink();
} else {
- $b = getObject($this->dbconn,$f['new']);
- if ( is_object($b) ) {
- $x['new'] = $b->getLink();
- } else {
- $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
- }
+ $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
}
- break;
}
+ break;
+ }
return $x;
}
@@ -1822,4 +1823,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...> - 2012-07-05 07:35:26
|
Revision: 692
http://tutos.svn.sourceforge.net/tutos/?rev=692&view=rev
Author: gokohnert
Date: 2012-07-05 07:35:17 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
fix file redirect
Modified Paths:
--------------
trunk/php/file/file_ins.php
trunk/php/file/file_show.php
trunk/php/testmanager/testmanager.pinc
Modified: trunk/php/file/file_ins.php
===================================================================
--- trunk/php/file/file_ins.php 2012-07-04 10:48:48 UTC (rev 691)
+++ trunk/php/file/file_ins.php 2012-07-05 07:35:17 UTC (rev 692)
@@ -331,7 +331,7 @@
$dbconn->Commit("WORK");
if ( $f->id != -1 ) {
- $gotourl = '../'.$f->getURL();
+ $gotourl = $f->getURL();
if (isset($_REQUEST['ss'])) {
$gotourl= addUrlParameter($gotourl,'ss='. $_REQUEST['ss'],true);
}
Modified: trunk/php/file/file_show.php
===================================================================
--- trunk/php/file/file_show.php 2012-07-04 10:48:48 UTC (rev 691)
+++ trunk/php/file/file_show.php 2012-07-05 07:35:17 UTC (rev 692)
@@ -20,6 +20,7 @@
// Check if user is allowed to use it
check_user();
+
$tutos['mobileok'] = 1;
loadmodules('file','show');
loadmodule('file');
Modified: trunk/php/testmanager/testmanager.pinc
===================================================================
--- trunk/php/testmanager/testmanager.pinc 2012-07-04 10:48:48 UTC (rev 691)
+++ trunk/php/testmanager/testmanager.pinc 2012-07-05 07:35:17 UTC (rev 692)
@@ -624,7 +624,7 @@
case 'TestSuiteCopy':
case 'TestcaseRef':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
}
return $x;
}
@@ -849,7 +849,8 @@
}
$pre = '<br />';
foreach($this->list[usedocmanagement] as $i) {
- $r .= $pre.'- '.$i->getLink()."\n";
+ $icon = get_icon($ly,$i->filename,'paper');
+ $r .= $pre.$icon.' '.$i->getLink()."\n";
}
if ($this->activ == 1) {
$r .= $pre.makelink('file/file_new.php?link_id='.$this->id,$lang['FileCreation'],'','','file');
@@ -1817,12 +1818,12 @@
case 'TestcaseCreate':
case 'TestsuiteCreate':
$f['old'] = '';
- $x = resolve_history_obj($f,$this->dbconn);
- break;
+ $x = resolve_history_obj($f,$this->dbconn);
+ break;
case 'TestSuiteCopy':
case 'TestsuiteRef':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
case 'TestsuiteState':
$x = resolve_history_lgarr ($f,'TestsuiteStates');
}
@@ -2776,7 +2777,7 @@
case 'TestrunCreate':
case 'TestSuiteCopy':
$x = resolve_history_obj($f,$this->dbconn);
- break;
+ break;
}
return $x;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2012-07-04 10:48:57
|
Revision: 691
http://tutos.svn.sourceforge.net/tutos/?rev=691&view=rev
Author: gokohnert
Date: 2012-07-04 10:48:48 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
no mail per project
Modified Paths:
--------------
trunk/php/bugtracking/bug_ins.php
trunk/php/bugtracking/bug_new.php
Modified: trunk/php/bugtracking/bug_ins.php
===================================================================
--- trunk/php/bugtracking/bug_ins.php 2012-07-04 10:24:18 UTC (rev 690)
+++ trunk/php/bugtracking/bug_ins.php 2012-07-04 10:48:48 UTC (rev 691)
@@ -343,7 +343,7 @@
$gotourl = addBadField($gotourl,'newrev',true);
}
}
-} else {
+} else if (is_object($b->parent)) {
//
// New Bug
//
Modified: trunk/php/bugtracking/bug_new.php
===================================================================
--- trunk/php/bugtracking/bug_new.php 2012-07-04 10:24:18 UTC (rev 690)
+++ trunk/php/bugtracking/bug_new.php 2012-07-04 10:48:48 UTC (rev 691)
@@ -86,7 +86,7 @@
$r .= $this->EditRowStart();
$r .= $this->showfieldc($lang['BugShort'],1,"short1");
- $r .= $this->showdata('<input id="short1" size="'. min(40,$table['bugtracking']['short'][size]) .'" maxlength="'.$table['bugtracking']['short'][size].'" name="short1" value="'. myentities($this->obj->short) ."\" />",1);
+ $r .= $this->showdata('<input id="short1" size="'. min(40,$table['bugtracking']['short'][size]) .'" maxlength="'.$table['bugtracking']['short'][size].'" name="short1" value="'. myentities($this->obj->short) ."\" />",$this->width-1);
$r .= $this->EditRowEnd();
$r .= $this->EditRowStart();
@@ -251,7 +251,7 @@
$r .= $this->showfield($lang['BugLong'],1,"description");
}
$d = '';
- if ($this->obj->parent->tutos['bug_use_revision'] == 1) {
+ if (is_object($this->obj->parent) && $this->obj->parent->tutos['bug_use_revision'] == 1) {
// $d .= '<span style="float:left"></span>';
$d .= '<span style="float:right">';
$d .= $lang['BugRevision'];
@@ -282,7 +282,7 @@
$r .= module_addforms($this->user,$this->obj,4);
// allow nomail flag
- if ($tutos['bug_no_mail'] == 1) {
+ if ( (is_object($this->obj->parent) && $this->obj->parent->tutos['bug_no_mail'] == 1) || ($tutos['bug_no_mail'] == 1) ) {
$r .= $this->EditRowStart();
$r .= $this->showfield($lang['BugNoMail'],0,"nomail");
$r .= $this->showdata('<input type="checkbox" id="nomail" name="nomail" value="1" />',$this->width-1);
@@ -337,7 +337,7 @@
$this->obj->set_int_from_arg('class','class',$lang['BugClass']);
$this->obj->set_datetime_from_arg('plandate','pd',$lang['DateTimeTill']);
if ( isset($_GET['pid']) ) {
- $this->obj->parent = getObject($this->dbconn,$_GET['pid']);
+ $this->obj->setParent(getObject($this->dbconn,$_GET['pid']));
}
// preset additional custom fields
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
29 messages has been excluded from this view by a project administrator.