tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
You can subscribe to this list here.
2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
S | M | T | W | T | F | S |
---|---|---|---|---|---|---|
1
|
2
(5) |
3
|
4
(2) |
5
|
6
|
7
(1) |
8
|
9
|
10
(1) |
11
|
12
|
13
|
14
(11) |
15
(9) |
16
(25) |
17
(1) |
18
(1) |
19
(7) |
20
|
21
|
22
|
23
|
24
|
25
(14) |
26
(10) |
27
(3) |
28
|
From: Gero K. <gok...@us...> - 2009-02-27 15:52:16
|
Update of /cvsroot/tutos/tutos/php/note In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32651/note Modified Files: note_select.php Log Message: updates. new external auth to be used with apache mod_authnz_external basic auth Index: note_select.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note_select.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- note_select.php 14 Jun 2008 12:30:08 -0000 1.19 +++ note_select.php 27 Feb 2009 15:52:07 -0000 1.20 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 by Gero Kohnert * submitted by "Nonn" <nonn at resce.com> * * This program is free software; you can redistribute it and/or modify it |
From: Gero K. <gok...@us...> - 2009-02-27 15:52:12
|
Update of /cvsroot/tutos/tutos/php/auth In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32651/auth Modified Files: auth_http.pinc auth_pam.pinc auth_typo3.pinc Added Files: auth_external.pinc Log Message: updates. new external auth to be used with apache mod_authnz_external basic auth --- NEW FILE: auth_external.pinc --- <?php /* * Copyright 2009 by Gero Kohnert * * CVS Info: $Id: auth_external.pinc,v 1.1 2009/02/27 15:52:07 gokohnert Exp $ * $Author: gokohnert $ * * Authentification using some external method */ require_once 'auth.pinc'; /** * Authentification base class * * @modulegroup BASE * @module auth_db * @package BASE */ class auth_external extends auth{ /** * init */ function auth_external() { global $tutos,$msg; # # Globally diable PWLOST SUPPORT # $tutos[pwlostsupport] = 0; $_SERVER['PHP_AUTH_PW'] = ""; $x = "----\n"; $x .= "DateTime:\t". Date("d.M.Y H:i:s T") ."\n"; $x .= "Request:\t". $_SERVER["REQUEST_URI"] ."\n"; foreach ($_SESSION as $i1 => $f1) { $x .= "\t\t_SESSION[". $i1 ."]\t--> ". $f1 ."\n"; } foreach ($_COOKIE as $i1 => $f1) { $x .= "\t\t_COOKIE[". $i1 ."]\t--> ". $f1 ."\n"; } foreach ($_POST as $i1 => $f1) { $x .= "\t\t_POST[". $i1 ."]\t--> ". $f1 ."\n"; } foreach ($_GET as $i1 => $f1) { $x .= "\t\t_GET[". $i1 ."]\t--> ". $f1 ."\n"; } if (isset($tutos['SESSID'])) { # $x .= "sessid \t--> ". $tutos['SESSID'] ."\n"; } if (isset($_SERVER['PHP_AUTH_USER'])) { $x .= "_SERVER[PHP_AUTH_USER]\t--> ". $_SERVER['PHP_AUTH_USER'] ."\n"; } $x .= "----\n"; # error_log($x,3,$tutos[errlog]); $this->nouname = false; if ( ! isset($_SESSION['userid']) ) { $this->nouname = true; $_SESSION['userid'] = -1; error_log("\nNO NAME\n",3,$tutos[errlog]); } } /** * logout * return the next page for the redirect */ Function logout () { global $tutos,$msg; unset ($_COOKIE[session_name()]); $goto = parent::logout(); unset($_SERVER['PHP_AUTH_USER']); unset($_SERVER['PHP_AUTH_PW']); $_SERVER['PHP_AUTH_USER'] = ""; unset($_SESSION); session_write_close(); return $goto; } /** * get the password */ function getpw() { return '---'; } /** * get the username */ function getuname() { if (true == $this->nouname) { return ""; } if ( isset($_SERVER['PHP_AUTH_USER']) ) { return trim($_SERVER['PHP_AUTH_USER']); } return; } /** * Check for permmision * using a DB query */ function check() { global $current_user,$lang; $q = "SELECT a.* ,p.*,p.id as u_id, p.creator as cr_a, p.creation as cr_t FROM ". $this->dbconn->prefix ."addresses a, ". $this->dbconn->prefix ."people p "; $q .= " WHERE p.login = ". $this->dbconn->String($this->getuname()); $q .= " AND p.adr_id = a.id"; $result = $this->dbconn->Exec($q); $r = array(); if ( ! $result ) { ReadLang($lang); $r[0] = "No Result for ". $this->getuname() ." / ". $this->getpw(); $r[1] = $lang['Err0026']; return $r; } /* OK there is a user and a Password so lets check */ if ( 1 != $result->numrows()) { ReadLang($lang); $r[0] = 'not unique "'. $result->numrows() .'" Result for "'. $this->getuname() .'"/"'. $this->getpw() .'" ('. $_SERVER['REMOTE_ADDR'] .')'; $r[1] = $lang['Err0027']; $result->free(); return $r; } $current_user= new tutos_user($this->dbconn); $current_user->read_result($result,0); $result->free(); } /** * login form */ Function login_form ($gotourl,$msg) { global $tutos; header('WWW-Authenticate: Basic realm="TUTOS"'); header('HTTP/1.0 401 Unauthorized'); echo "Login failed"; exit; } } ?> Index: auth_typo3.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/auth/auth_typo3.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- auth_typo3.pinc 17 Oct 2003 12:57:49 -0000 1.1 +++ auth_typo3.pinc 27 Feb 2009 15:52:07 -0000 1.2 @@ -1,6 +1,6 @@ <?php /* - * Copyright 2003 by Gero Kohnert + * Copyright 2009 by Gero Kohnert * * CVS Info: $Id$ * $Author$ Index: auth_pam.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/auth/auth_pam.pinc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- auth_pam.pinc 10 Sep 2008 17:44:42 -0000 1.6 +++ auth_pam.pinc 27 Feb 2009 15:52:07 -0000 1.7 @@ -8,11 +8,6 @@ require_once 'auth.pinc'; -# -# Globally diable PWLOST SUPPORT -# -$tutos[pwlostsupport] = 0; - /** * Authentification base class * @@ -22,6 +17,16 @@ */ class auth_pam extends auth{ /** + * init + */ + function auth_pam() { + global $tutos,$msg; + # + # Globally diable PWLOST SUPPORT + # + $tutos[pwlostsupport] = 0; + } + /** * get the password */ function getpw() { @@ -80,7 +85,7 @@ return $r; } - $error = ""; + $error = ""; ini_set("pam_auth.servicename",$tutos[pamservice]); if ( ! pam_auth($this->getuname(), $this->getpw(), &$error)) { ReadLang($lang); Index: auth_http.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/auth/auth_http.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- auth_http.pinc 17 Oct 2003 12:57:49 -0000 1.1 +++ auth_http.pinc 27 Feb 2009 15:52:07 -0000 1.2 @@ -1,6 +1,6 @@ <?php /* - * Copyright 1999 - 2002 by Gero Kohnert + * Copyright 1999 - 2009 by Gero Kohnert * * CVS Info: $Id$ * $Author$ @@ -16,25 +16,16 @@ */ class auth_http extends auth{ /** - * logout - * return the next page for the redirect - */ - Function logout () { - global $tutos,$msg; - - unset ($_COOKIE[session_name()]); - - parent::logout(); - unset($_SERVER['PHP_AUTH_USER']); - unset($_SESSION); - session_write_close(); - } - /** * init */ function auth_http() { global $tutos,$msg; + # + # Globally diable PWLOST SUPPORT + # + $tutos[pwlostsupport] = 0; + $x = "----\n"; $x .= "DateTime:\t". Date("d.M.Y H:i:s T") ."\n"; $x .= "Request:\t". $_SERVER["REQUEST_URI"] ."\n"; @@ -58,7 +49,7 @@ } $x .= "----\n"; - error_log($x,3,$tutos[errlog]); +# error_log($x,3,$tutos[errlog]); $this->nouname = false; if ( ! isset($_SESSION['userid']) ) { @@ -68,6 +59,20 @@ } } /** + * logout + * return the next page for the redirect + */ + Function logout () { + global $tutos,$msg; + + unset ($_COOKIE[session_name()]); + + parent::logout(); + unset($_SERVER['PHP_AUTH_USER']); + unset($_SESSION); + session_write_close(); + } + /** * get the password */ function getpw() { @@ -130,7 +135,7 @@ error_log("auth http LOGIN\n",3,$tutos[errlog]); header('WWW-Authenticate: Basic realm="'. session_name() .'"'); header('HTTP/1.0 401 Unauthorized'); - echo "Login failed"; + echo "Login failed"; exit; } } |
From: Gero K. <gok...@us...> - 2009-02-27 15:52:11
|
Update of /cvsroot/tutos/tutos/php In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32651 Modified Files: admin_show.php config_default.pinc excel.pinc permission.p3 timetrack_overview.php user_ins.php Log Message: updates. new external auth to be used with apache mod_authnz_external basic auth Index: config_default.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v retrieving revision 1.142 retrieving revision 1.143 diff -u -d -r1.142 -r1.143 --- config_default.pinc 15 Feb 2009 19:18:05 -0000 1.142 +++ config_default.pinc 27 Feb 2009 15:52:06 -0000 1.143 @@ -166,7 +166,7 @@ # auth classes are stored in [tutoshome]/php/auth # # -# for pam sew $tutos[pamservice] below +# for pam see $tutos[pamservice] below # for ldap see $tutos[ldapauth.... below # # for x509 read this: @@ -846,7 +846,7 @@ # # The TUTOS Version number # -$tutos[version] = '1.5pre.20090215'; +$tutos[version] = '1.5pre.20090227'; # ### Local Variables: *** ### mode:iso-accents *** Index: user_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/user_ins.php,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- user_ins.php 8 Feb 2008 17:08:25 -0000 1.56 +++ user_ins.php 27 Feb 2009 15:52:07 -0000 1.57 @@ -10,19 +10,19 @@ * @module user_ins * @package user */ - include_once 'webelements.p3'; - include_once 'permission.p3'; - include_once 'appointment.pinc'; +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'appointment.pinc'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules("user","ins"); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('user','ins'); - $msg = ""; - $saveadr = false; - $saveloc = false; - $u = new tutos_user($dbconn); - $gotourl = "user_new.php"; +$msg = ''; +$saveadr = false; +$saveloc = false; +$u = new tutos_user($dbconn); +$gotourl = 'user_new.php'; if ( ! isset($_POST['uid']) || empty($_POST['uid']) ) { $msg .= "Please enter a id<br />"; Index: timetrack_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- timetrack_overview.php 25 Feb 2009 19:13:53 -0000 1.110 +++ timetrack_overview.php 27 Feb 2009 15:52:07 -0000 1.111 @@ -54,6 +54,8 @@ } return; } else if ($this->format == "excel") { + require_once '../../libs/excel/Worksheet.php'; + require_once '../../libs/excel/Workbook.php'; include_once 'excel.pinc'; $this->excel = new tutos_excel(); Index: excel.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/excel.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- excel.pinc 7 Jul 2005 11:45:04 -0000 1.1 +++ excel.pinc 27 Feb 2009 15:52:06 -0000 1.2 @@ -1,6 +1,6 @@ <?php /** - * Copyright 2004 - 2005 by Gero Kohnert + * Copyright 2004 - 2009 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,7 @@ * $Author$ */ - include_once '../libs/excel/Worksheet.php'; - include_once '../libs/excel/Workbook.php'; - - class tutos_excel { +class tutos_excel { function tutos_excel() { $this->wb = -1; Index: admin_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v retrieving revision 1.93 retrieving revision 1.94 diff -u -d -r1.93 -r1.94 --- admin_show.php 26 Feb 2009 09:48:00 -0000 1.93 +++ admin_show.php 27 Feb 2009 15:52:06 -0000 1.94 @@ -107,8 +107,8 @@ $adr = new tutos_user($this->dbconn); $uid = $result->get($a, "id"); $adr = $adr->read($uid,$adr,1); - echo ' <td colspan="1">'. $adr->getLink() .' </td>'; - echo ' <td colspan="1" align="right">'. makelink('user_new.php?uid='.$uid ,$adr->login); + echo ' <td colspan="1">'. (is_object($adr) ? $adr->getLink():$uid) .' </td>'; + echo ' <td colspan="1" align="right">'. makelink('user_new.php?uid='.$uid ,(is_object($adr) ? $adr->login:'??') ); if ($adr->isAdmin()) { echo ' (ADMIN)'; } Index: permission.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/permission.p3,v retrieving revision 1.165 retrieving revision 1.166 diff -u -d -r1.165 -r1.166 --- permission.p3 13 Jan 2009 15:17:56 -0000 1.165 +++ permission.p3 27 Feb 2009 15:52:06 -0000 1.166 @@ -58,6 +58,15 @@ ini_set("session.gc_maxlifetime",(2 * 60 * $tutos[timetolive])); ini_set("session.gc_probability",50); +$max_vars1 = ini_get('suhosin.post.max_vars'); +if (isset($max_vars1) && $max_vars1 < 250) { + die('ini value suhosin.post.max_vars '. $max_vars1 .' is to low set it to 250'); +} +$max_vars2 = ini_get('suhosin.request.max_vars'); +if (isset($max_vars2) && $max_vars2 < 250) { + die('ini value suhosin.request.max_vars '. $max_vars2 .' is to low set it to 250'); +} + # # IIS NT Hack # @@ -329,6 +338,7 @@ ReadLang($lang); return $current_user; } + if ($auth[0]->getuname() == "") { ReadLang($lang); $auth[0]->login_form($_SERVER['PHP_SELF'],$msg); |
From: Gero K. <gok...@us...> - 2009-02-26 09:48:39
|
Update of /cvsroot/tutos/tutos/php In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24749 Modified Files: admin_show.php main_config.php Log Message: added main_config to the menu Index: admin_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- admin_show.php 9 Jan 2009 14:17:01 -0000 1.92 +++ admin_show.php 26 Feb 2009 09:48:00 -0000 1.93 @@ -537,16 +537,23 @@ } $x = array( url => "module_overview.php", - text => "Modules", - info => "a list of all TUTOS modules", - category => array("admin") + text => $lang['AdminModules'], + info => $lang['AdminModulesI'], + category => array('admin') ); $this->addMenu($x); $x = array( url => "admin/customize_show.php", - text => "Customize", - info => "customize language files", - category => array("admin") + text => $lang['AdminCustomizeLang'], + info => $lang['AdminCustomizeLangI'], + category => array('admin') + ); + $this->addMenu($x); + + $x = array( url => "main_config.php", + text => $lang['AdminMainConfig'], + info => $lang['AdminMainConfigI'], + category => array('admin','config') ); $this->addMenu($x); } @@ -560,4 +567,4 @@ <!-- CVS Info: $Id$ $Author$ ---> \ No newline at end of file +--> Index: main_config.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/main_config.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- main_config.php 25 Feb 2009 19:13:52 -0000 1.1 +++ main_config.php 26 Feb 2009 09:48:01 -0000 1.2 @@ -13,6 +13,7 @@ require_once 'permission.p3'; check_user(); +loadmodules('admin','config'); loadmodule('stc'); loadlayout(); @@ -115,4 +116,4 @@ <!-- CVS Info: $Id$ $Author$ ---> \ No newline at end of file +--> |
Update of /cvsroot/tutos/tutos/php/localization In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24749/localization Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: added main_config to the menu Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/tw.p3,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- tw.p3 29 Jan 2008 20:02:51 -0000 1.61 +++ tw.p3 26 Feb 2009 09:48:09 -0000 1.62 @@ -715,6 +715,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "è³æåº«"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- pl.p3 29 Jan 2008 20:02:50 -0000 1.70 +++ pl.p3 26 Feb 2009 09:48:08 -0000 1.71 @@ -721,6 +721,12 @@ $lang['AdminModOverview'] = "moduÅy TUTOSa"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Baza danych"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pt-br.p3,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- pt-br.p3 29 Jan 2008 20:02:50 -0000 1.59 +++ pt-br.p3 26 Feb 2009 09:48:08 -0000 1.60 @@ -714,6 +714,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- en.p3 25 Feb 2009 19:16:38 -0000 1.75 +++ en.p3 26 Feb 2009 09:48:04 -0000 1.76 @@ -719,6 +719,12 @@ $lang['AdminModOverview'] = 'TUTOS Modules'; $lang['ClientBrowser'] = 'Client Browser'; $lang['AdminKillSession'] = 'Kill Session'; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = 'Database'; @@ -835,4 +841,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pt.p3,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- pt.p3 29 Jan 2008 20:02:50 -0000 1.33 +++ pt.p3 26 Feb 2009 09:48:08 -0000 1.34 @@ -720,6 +720,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Base de Dados"; @@ -824,4 +830,4 @@ ### Local Variables: *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- fr.p3 25 Feb 2009 19:16:39 -0000 1.66 +++ fr.p3 26 Feb 2009 09:48:06 -0000 1.67 @@ -716,6 +716,12 @@ $lang['AdminModOverview'] = 'TUTOS Modules'; $lang['ClientBrowser'] = 'Client Browser'; $lang['AdminKillSession'] = 'Kill Session'; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = 'Base de données'; @@ -821,4 +827,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- ru.p3 29 Jan 2008 20:02:50 -0000 1.63 +++ ru.p3 26 Feb 2009 09:48:08 -0000 1.64 @@ -715,6 +715,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Ðаза ÐаннÑÑ "; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- nl.p3 29 Jan 2008 20:02:50 -0000 1.69 +++ nl.p3 26 Feb 2009 09:48:08 -0000 1.70 @@ -727,6 +727,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; @@ -832,4 +838,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- it.p3 25 Feb 2009 19:16:40 -0000 1.65 +++ it.p3 26 Feb 2009 09:48:08 -0000 1.66 @@ -714,6 +714,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; @@ -819,4 +825,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- ko.p3 29 Jan 2008 20:02:50 -0000 1.59 +++ ko.p3 26 Feb 2009 09:48:08 -0000 1.60 @@ -715,6 +715,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ve.p3,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- es-ve.p3 26 Feb 2009 09:14:33 -0000 1.34 +++ es-ve.p3 26 Feb 2009 09:48:05 -0000 1.35 @@ -716,6 +716,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Base de Datos"; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- es-mx.p3 26 Feb 2009 09:14:33 -0000 1.58 +++ es-mx.p3 26 Feb 2009 09:48:04 -0000 1.59 @@ -716,6 +716,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- ca.p3 29 Jan 2008 20:02:48 -0000 1.59 +++ ca.p3 26 Feb 2009 09:48:01 -0000 1.60 @@ -715,6 +715,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Base de dades"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- cs.p3 29 Jan 2008 20:02:49 -0000 1.59 +++ cs.p3 26 Feb 2009 09:48:02 -0000 1.60 @@ -718,6 +718,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Databáze"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ja.p3,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- ja.p3 29 Jan 2008 20:02:50 -0000 1.60 +++ ja.p3 26 Feb 2009 09:48:08 -0000 1.61 @@ -711,6 +711,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "ãã¼ã¿ãã¼ã¹"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- es-ni.p3 26 Feb 2009 09:14:33 -0000 1.58 +++ es-ni.p3 26 Feb 2009 09:48:04 -0000 1.59 @@ -717,6 +717,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Base de Datos"; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/vi.p3,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- vi.p3 17 Jun 2008 19:25:21 -0000 1.35 +++ vi.p3 26 Feb 2009 09:48:10 -0000 1.36 @@ -720,6 +720,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- es.p3 26 Feb 2009 09:14:33 -0000 1.63 +++ es.p3 26 Feb 2009 09:48:05 -0000 1.64 @@ -716,6 +716,12 @@ $lang['AdminModOverview'] = "Módulos de TUTOS"; $lang['ClientBrowser'] = "Navegador"; $lang['AdminKillSession'] = "Sesiones cerradas"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Base de datos"; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- hu.p3 29 Jan 2008 20:02:49 -0000 1.69 +++ hu.p3 26 Feb 2009 09:48:07 -0000 1.70 @@ -720,6 +720,12 @@ $lang['AdminModOverview'] = "TUTOS modulok"; $lang['ClientBrowser'] = "BöngészÅkliens"; $lang['AdminKillSession'] = "Munkaszakasz kilövése"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Adatbázis"; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- el.p3 29 Jan 2008 20:02:49 -0000 1.61 +++ el.p3 26 Feb 2009 09:48:03 -0000 1.62 @@ -717,6 +717,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "ÎάÏη ÎεδομÎνÏν"; @@ -821,4 +827,4 @@ ### Local Variables: *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/zh.p3,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- zh.p3 29 Jan 2008 20:02:51 -0000 1.61 +++ zh.p3 26 Feb 2009 09:48:10 -0000 1.62 @@ -716,6 +716,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Database"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- de.p3 25 Feb 2009 19:16:37 -0000 1.78 +++ de.p3 26 Feb 2009 09:48:03 -0000 1.79 @@ -719,6 +719,12 @@ $lang['AdminModOverview'] = 'TUTOS-Module'; $lang['ClientBrowser'] = 'Browser des Clients'; $lang['AdminKillSession'] = 'Sitzung beenden'; +$lang['AdminMainConfig'] = 'Konfiguration'; +$lang['AdminMainConfigI'] = 'TUTOS konfigurieren'; +$lang['AdminCustomizeLang'] = 'Sprachanpassung'; +$lang['AdminCustomizeLangI'] = 'Sprachfiles anpassen'; +$lang['AdminModules'] = 'Module'; +$lang['AdminModulesI'] = 'eine Liste aller TUTOS Module'; # Database $lang['DB'] = 'Datenbank'; @@ -824,4 +830,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- sv.p3 29 Jan 2008 20:02:51 -0000 1.64 +++ sv.p3 26 Feb 2009 09:48:09 -0000 1.65 @@ -711,6 +711,12 @@ $lang['AdminModOverview'] = "TUTOS Modules"; $lang['ClientBrowser'] = "Client Browser"; $lang['AdminKillSession'] = "Kill Session"; +$lang['AdminMainConfig'] = 'Config'; +$lang['AdminMainConfigI'] = 'Configure TUTOS'; +$lang['AdminCustomizeLang'] = 'Customize'; +$lang['AdminCustomizeLangI'] = 'Customize Language Files'; +$lang['AdminModules'] = 'Modules'; +$lang['AdminModulesI'] = 'a list of all TUTOS Modules'; # Database $lang['DB'] = "Databas"; @@ -816,4 +822,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:40
|
Update of /cvsroot/tutos/tutos/php/admin In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22702/php/admin Modified Files: de.p3 en.p3 sv.p3 Log Message: language fixes Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin/en.p3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- en.p3 5 Apr 2007 16:14:56 -0000 1.4 +++ en.p3 26 Feb 2009 09:14:33 -0000 1.5 @@ -9,26 +9,26 @@ # ======================================================= - $lang['AdminCCHelp']['dbname'] = "The name of the database where TUTOS should be installed"; - $lang['AdminCCHelp']['dbtype'] = "The type/manufacturer of the database system"; - $lang['AdminCCHelp']['dbalias'] = "an alias for this database (shown on login if multiple systems are defined)"; - $lang['AdminCCHelp']['dbhost'] = "the network name or ip of the sytem hosting the database"; - $lang['AdminCCHelp']['dbport'] = "the network port on the database host<br />(typically 5432 for postgres or 3306 for MySql)."; - $lang['AdminCCHelp']['dbuser'] = "the username to access the database"; - $lang['AdminCCHelp']['dbpasswd'] = "the password for the database user"; - $lang['AdminCCHelp']['repository'] = "the path where files are stored. Relative paths start at [tutoshome] = ". realpath(getcwd() ."/". $tutos['base']); - $lang['AdminCCHelp']['dbprefix'] = "a prefix put in front of all tablenames<br />(leave empty if not sure)"; +$lang['AdminCCHelp']['dbname'] = "The name of the database where TUTOS should be installed"; +$lang['AdminCCHelp']['dbtype'] = "The type/manufacturer of the database system"; +$lang['AdminCCHelp']['dbalias'] = "an alias for this database (shown on login if multiple systems are defined)"; +$lang['AdminCCHelp']['dbhost'] = "the network name or ip of the sytem hosting the database"; +$lang['AdminCCHelp']['dbport'] = "the network port on the database host<br />(typically 5432 for postgres or 3306 for MySql)."; +$lang['AdminCCHelp']['dbuser'] = "the username to access the database"; +$lang['AdminCCHelp']['dbpasswd'] = "the password for the database user"; +$lang['AdminCCHelp']['repository'] = "the path where files are stored. Relative paths start at [tutoshome] = ". realpath(getcwd() ."/". $tutos['base']); +$lang['AdminCCHelp']['dbprefix'] = "a prefix put in front of all tablenames<br />(leave empty if not sure)"; - $lang['AdminCCHelp']['mailmode'] = ""; - $lang['AdminCCHelp']['sendmail'] = "the path where TUTOS could find sendmail"; - $lang['AdminCCHelp']['smtphost'] = ""; +$lang['AdminCCHelp']['mailmode'] = ""; +$lang['AdminCCHelp']['sendmail'] = "the path where TUTOS could find sendmail"; +$lang['AdminCCHelp']['smtphost'] = ""; - $lang['AdminCCHelp']['demo'] = "in demomode TUTOS will not allow to change user entries<br />and will not sent out mail"; - $lang['AdminCCHelp']['debug'] = "debug info will be written to the given path"; - $lang['AdminCCHelp']['errlog'] = "a file with path where debuginfo is written"; - $lang['AdminCCHelp']['jpgraph'] = "a path where the jpgraph <a target=\"_blank\" href=\"http://www.aditus.nu/jpgraph/\">package</a> is installed relative to ".getcwd() ."/". $tutos['base'] ."/php\n"; - $lang['AdminCCHelp']['sessionpath'] = "the directory where TUTOS stores the session files"; +$lang['AdminCCHelp']['demo'] = "in demomode TUTOS will not allow to change user entries<br />and will not sent out mail"; +$lang['AdminCCHelp']['debug'] = "debug info will be written to the given path"; +$lang['AdminCCHelp']['errlog'] = "a file with path where debuginfo is written"; +$lang['AdminCCHelp']['jpgraph'] = "a path where the jpgraph <a target=\"_blank\" href=\"http://www.aditus.nu/jpgraph/\">package</a> is installed relative to ".getcwd() ."/". $tutos['base'] ."/php\n"; +$lang['AdminCCHelp']['sessionpath'] = "the directory where TUTOS stores the session files"; ### Local Variables: *** Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin/sv.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sv.p3 5 Apr 2007 16:14:56 -0000 1.3 +++ sv.p3 26 Feb 2009 09:14:33 -0000 1.4 @@ -9,26 +9,26 @@ # ======================================================= - $lang['AdminCCHelp']['dbname'] = "Namnet pÃ¥ databasen som TUTOS skall installeras pÃ¥"; - $lang['AdminCCHelp']['dbtype'] = "Typ/tillverkare av databasen"; - $lang['AdminCCHelp']['dbalias'] = "alias för databasen (visas vid inloggning om multipla system är definerade)"; - $lang['AdminCCHelp']['dbhost'] = "nätverksnamet eller IP-nummer för datorn databasen körs pÃ¥"; - $lang['AdminCCHelp']['dbport'] = "Portnummer för databasen pÃ¥ värddatorn<br />(normalt 5432 för Postgres och 3306 för MySQL)."; - $lang['AdminCCHelp']['dbuser'] = "användarnamnet för att koppla upp mot databasen"; - $lang['AdminCCHelp']['dbpasswd'] = "lösenordet för databasanvändaren"; - $lang['AdminCCHelp']['repository'] = "sökväg till var filer sparas. Relative till sökvägen för [tutoshome] = ". realpath(getcwd() ."/". $tutos['base']); - $lang['AdminCCHelp']['dbprefix'] = "prefix före tabellerna i databasen<br />(lämna empty om du inte är säker)"; +$lang['AdminCCHelp']['dbname'] = "Namnet pÃ¥ databasen som TUTOS skall installeras pÃ¥"; +$lang['AdminCCHelp']['dbtype'] = "Typ/tillverkare av databasen"; +$lang['AdminCCHelp']['dbalias'] = "alias för databasen (visas vid inloggning om multipla system är definerade)"; +$lang['AdminCCHelp']['dbhost'] = "nätverksnamet eller IP-nummer för datorn databasen körs pÃ¥"; +$lang['AdminCCHelp']['dbport'] = "Portnummer för databasen pÃ¥ värddatorn<br />(normalt 5432 för Postgres och 3306 för MySQL)."; +$lang['AdminCCHelp']['dbuser'] = "användarnamnet för att koppla upp mot databasen"; +$lang['AdminCCHelp']['dbpasswd'] = "lösenordet för databasanvändaren"; +$lang['AdminCCHelp']['repository'] = "sökväg till var filer sparas. Relative till sökvägen för [tutoshome] = ". realpath(getcwd() ."/". $tutos['base']); +$lang['AdminCCHelp']['dbprefix'] = "prefix före tabellerna i databasen<br />(lämna empty om du inte är säker)"; - $lang['AdminCCHelp']['mailmode'] = ""; - $lang['AdminCCHelp']['sendmail'] = "sökvägen till var TUTOS hittar sendmail-kommandot"; - $lang['AdminCCHelp']['smtphost'] = ""; +$lang['AdminCCHelp']['mailmode'] = ""; +$lang['AdminCCHelp']['sendmail'] = "sökvägen till var TUTOS hittar sendmail-kommandot"; +$lang['AdminCCHelp']['smtphost'] = ""; - $lang['AdminCCHelp']['demo'] = "i demoläge kommer TUTOS inte att införa ändringar i databasen.<br />Ej heller skicka E-brev"; - $lang['AdminCCHelp']['debug'] = "sökvägen till var debug-info kommer att skrivas"; - $lang['AdminCCHelp']['errlog'] = "filnamnet för filen där debug-info sparas"; - $lang['AdminCCHelp']['jpgraph'] = "sökväg till var <a target=\"_blank\" href=\"http://www.aditus.nu/jpgraph/\">jpgraph</a> är installerat. Relativt till ".getcwd() ."/". $tutos['base'] ."/php\n"; - $lang['AdminCCHelp']['sessionpath'] = "sökväg där sessionsfiler sparas pÃ¥ datorn"; +$lang['AdminCCHelp']['demo'] = "i demoläge kommer TUTOS inte att införa ändringar i databasen.<br />Ej heller skicka E-brev"; +$lang['AdminCCHelp']['debug'] = "sökvägen till var debug-info kommer att skrivas"; +$lang['AdminCCHelp']['errlog'] = "filnamnet för filen där debug-info sparas"; +$lang['AdminCCHelp']['jpgraph'] = "sökväg till var <a target=\"_blank\" href=\"http://www.aditus.nu/jpgraph/\">jpgraph</a> är installerat. Relativt till ".getcwd() ."/". $tutos['base'] ."/php\n"; +$lang['AdminCCHelp']['sessionpath'] = "sökväg där sessionsfiler sparas pÃ¥ datorn"; ### Local Variables: *** ### mode:iso-accents *** Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/admin/de.p3,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- de.p3 5 Apr 2007 16:14:56 -0000 1.1 +++ de.p3 26 Feb 2009 09:14:32 -0000 1.2 @@ -9,26 +9,26 @@ # ======================================================= - $lang['AdminCCHelp']['dbname'] = "Der Name der Datenbank in welcher TUTOS installiert werden soll"; - $lang['AdminCCHelp']['dbtype'] = "Der Typ/Hersteller des Datenbanksystems"; - $lang['AdminCCHelp']['dbalias'] = "ein Alias für die Datenbank (wird in der Anmeldemaske gezeigt sofern mehrere Systeme definiert sind)"; - $lang['AdminCCHelp']['dbhost'] = "Der Netzwerkname oder die IP Adresse des Datenbankservers"; - $lang['AdminCCHelp']['dbport'] = "Der Netzwerk Port des Datenbankservers<br />(üblicherweise 5432 für postgres oder 3306 für MySql)."; - $lang['AdminCCHelp']['dbuser'] = "Der Benutzernae für den Zugiff auf die Datenbank"; - $lang['AdminCCHelp']['dbpasswd'] = "Das Passwort für den Datenbankzugriff"; - $lang['AdminCCHelp']['repository'] = "Der Verzeichnispfad unter welchem Dateien gespeichert werden sollen. Relative Pfade beginnen bei [tutoshome] = ". realpath(getcwd() ."/". $tutos['base']); +$lang['AdminCCHelp']['dbname'] = "Der Name der Datenbank in welcher TUTOS installiert werden soll"; +$lang['AdminCCHelp']['dbtype'] = "Der Typ/Hersteller des Datenbanksystems"; +$lang['AdminCCHelp']['dbalias'] = "ein Alias für die Datenbank (wird in der Anmeldemaske gezeigt sofern mehrere Systeme definiert sind)"; +$lang['AdminCCHelp']['dbhost'] = "Der Netzwerkname oder die IP Adresse des Datenbankservers"; +$lang['AdminCCHelp']['dbport'] = "Der Netzwerk Port des Datenbankservers<br />(üblicherweise 5432 für postgres oder 3306 für MySql)."; +$lang['AdminCCHelp']['dbuser'] = "Der Benutzernae für den Zugiff auf die Datenbank"; +$lang['AdminCCHelp']['dbpasswd'] = "Das Passwort für den Datenbankzugriff"; +$lang['AdminCCHelp']['repository'] = "Der Verzeichnispfad unter welchem Dateien gespeichert werden sollen. Relative Pfade beginnen bei [tutoshome] = ". realpath(getcwd() ."/". $tutos['base']); $lang['AdminCCHelp']['dbprefix'] = "Ein Präfix welches allen Tabellennamen vorangestellt wird<br />(leer wenn unischer)"; - $lang['AdminCCHelp']['mailmode'] = ''; - $lang['AdminCCHelp']['sendmail'] = "Der Pfad unter welchem sendmail zu finden ist"; - $lang['AdminCCHelp']['smtphost'] = ""; +$lang['AdminCCHelp']['mailmode'] = ''; +$lang['AdminCCHelp']['sendmail'] = "Der Pfad unter welchem sendmail zu finden ist"; +$lang['AdminCCHelp']['smtphost'] = ""; - $lang['AdminCCHelp']['demo'] = "im Demomodus erlaubt TUTOS nicht das Ãndern von Benutzereintrágen<br />und versendet keine Mails"; - $lang['AdminCCHelp']['debug'] = "Debug Informationen werden in ein angegebene Verzeichnis geschrieben"; - $lang['AdminCCHelp']['errlog'] = "Datei und Pfad in welche Debuginformationen geschrieben werden"; - $lang['AdminCCHelp']['jpgraph'] = "der Pfad unter welchem JPGraph installiert ist <a target=\"_blank\" href=\"http://www.aditus.nu/jpgraph/\">package</a> Relativ zu ".getcwd() ."/". $tutos['base'] ."/php\n"; - $lang['AdminCCHelp']['sessionpath'] = "Das Verzeichnis in welchem temporäre Sitzungsdateien gepeichert werden"; +$lang['AdminCCHelp']['demo'] = "im Demomodus erlaubt TUTOS nicht das Ãndern von Benutzereintrágen<br />und versendet keine Mails"; +$lang['AdminCCHelp']['debug'] = "Debug Informationen werden in ein angegebene Verzeichnis geschrieben"; +$lang['AdminCCHelp']['errlog'] = "Datei und Pfad in welche Debuginformationen geschrieben werden"; +$lang['AdminCCHelp']['jpgraph'] = "der Pfad unter welchem JPGraph installiert ist <a target=\"_blank\" href=\"http://www.aditus.nu/jpgraph/\">package</a> Relativ zu ".getcwd() ."/". $tutos['base'] ."/php\n"; +$lang['AdminCCHelp']['sessionpath'] = "Das Verzeichnis in welchem temporäre Sitzungsdateien gepeichert werden"; ### Local Variables: *** |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:40
|
Update of /cvsroot/tutos/tutos/php/localization In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22702/php/localization Modified Files: es-mx.p3 es-ni.p3 es-ve.p3 es.p3 Log Message: language fixes Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- es-mx.p3 29 Jan 2008 20:02:49 -0000 1.57 +++ es-mx.p3 26 Feb 2009 09:14:33 -0000 1.58 @@ -11,6 +11,7 @@ # Translation by Luca Olivetti <lu...@we...> # $lang['content_encoding'] = "utf-8"; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'es_MX'); # # Espaniol Texts Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ve.p3,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- es-ve.p3 29 Jan 2008 20:02:49 -0000 1.33 +++ es-ve.p3 26 Feb 2009 09:14:33 -0000 1.34 @@ -11,6 +11,7 @@ # Translation by José Rey (jr...@ne...) # $lang['content_encoding'] = "utf-8"; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'es_VE'); # # Espaniol Texts @@ -819,4 +820,4 @@ ### Local Variables: *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- es.p3 29 Jan 2008 20:02:49 -0000 1.62 +++ es.p3 26 Feb 2009 09:14:33 -0000 1.63 @@ -11,6 +11,7 @@ # Translation by Luca Olivetti <lu...@we...> # $lang['content_encoding'] = "utf-8"; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'es_ES'); # # Espaniol Texts @@ -820,4 +821,4 @@ ### mode:iso-accents *** ### coding:utf-8 *** ### End: *** -?> \ No newline at end of file +?> Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- es-ni.p3 29 Jan 2008 20:02:49 -0000 1.57 +++ es-ni.p3 26 Feb 2009 09:14:33 -0000 1.58 @@ -11,6 +11,7 @@ # Translation by Antonio Gallardo, AG Software, S. A. <agssa at ibw.com.ni> # $lang['content_encoding'] = "utf-8"; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'US_ES'); # # Mensajes en Español |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:40
|
Update of /cvsroot/tutos/tutos/php/palm In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22702/php/palm Modified Files: pl.p3 Log Message: language fixes Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/palm/pl.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pl.p3 24 Jan 2008 09:31:30 -0000 1.3 +++ pl.p3 26 Feb 2009 09:14:33 -0000 1.4 @@ -10,10 +10,12 @@ # Resource $lang['PalmExport'] = "Eksportuj do PALMa"; +$lang['PalmImport'] = "Import from PALM"; $lang['PalmFile'] = "Nazwa pliku"; $lang['PalmType'] = "Typ"; $lang['PalmTypes'][2] = "Adresy"; $lang['PalmTypes'][3] = "Spotkania"; +$lang['PalmTypes'][4] = "Tasks"; $lang['perm'][usepalm] = "używanie eksportu do palma"; ### Local Variables: *** |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:39
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22702/php/bugtracking Modified Files: ca.p3 cs.p3 el.p3 es-mx.p3 es-ni.p3 es-ve.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 pt.p3 ru.p3 sv.p3 tw.p3 vi.p3 zh.p3 Log Message: language fixes Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ca.p3,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ca.p3 14 Dec 2008 16:22:53 -0000 1.7 +++ ca.p3 26 Feb 2009 09:14:33 -0000 1.8 @@ -57,7 +57,9 @@ $lang['BugAdditional'] = "Informació adicional"; $lang['BugHistory'] = "Històric"; $lang['BugSelInfo'] = "(en blanc per veure totes les incidències)"; +$lang['BugAnyButSolved'] = "any not solved"; $lang['BugAnyButClosed'] = "incidències no solucionades"; +$lang['BugAnyButSolvedOrClosed'] = "any not solved and not closed"; $lang['BugBetween'] = "creats entre"; $lang['BugStats'] = "EstadÃstiques"; $lang['BugStatsInfo'] = "Informació estadÃstica sobre les incidències seleccionades"; @@ -103,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "Utilitzar gestió incidències"; $lang['bug'] = &$lang['Bug']; Index: vi.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/vi.p3,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- vi.p3 14 Dec 2008 16:22:53 -0000 1.7 +++ vi.p3 26 Feb 2009 09:14:33 -0000 1.8 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "Theo dõi SCKT"; $lang['bug'] = &$lang['Bug']; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/nl.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- nl.p3 14 Dec 2008 16:22:53 -0000 1.9 +++ nl.p3 26 Feb 2009 09:14:33 -0000 1.10 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "gebruik bugtracking"; $lang['bug'] = &$lang['Bug']; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/cs.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- cs.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ cs.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -57,7 +57,7 @@ $lang['BugAdditional'] = "Dalšà Info"; $lang['BugHistory'] = "Historie"; $lang['BugSelInfo'] = "(nech prázdné pro zobrazenà vÅ¡ech chyb)"; -$lang['BugAnyButSoved'] = "nÄco nevyÅeÅ¡eno"; +$lang['BugAnyButSolved'] = "nÄco nevyÅeÅ¡eno"; $lang['BugAnyButClosed'] = "any not closed"; $lang['BugAnyButSolvedOrClosed'] = "any not solved and not closed"; $lang['BugBetween'] = "VytvoÅeno mezi"; @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "použÃt sledovánà chyb"; $lang['bug'] = &$lang['Bug']; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/tw.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- tw.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ tw.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "使ç¨Bug 追蹤"; $lang['bug'] = &$lang['Bug']; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- es.p3 14 Dec 2008 16:22:53 -0000 1.9 +++ es.p3 26 Feb 2009 09:14:33 -0000 1.10 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "Usar gestión incidencias"; $lang['bug'] = &$lang['Bug']; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ni.p3,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- es-ni.p3 14 Dec 2008 16:22:53 -0000 1.7 +++ es-ni.p3 26 Feb 2009 09:14:33 -0000 1.8 @@ -80,6 +80,10 @@ $lang['BugTrack'] = "Fallos"; $lang['BugTrackInfo'] = "Base de Datos de Fallos"; +$lang['EmailNewBug'] = "Nuevo Fallo en %s"; +$lang['EmailChangesBug'] = "Cambios en Fallo %s"; +$lang['EmailStillOpen'] = "FALLO %s Todavía %s"; + $lang['BugConfig'] = "configure bugtracking"; $lang['BugConfigHelpLongPop'] = "Show long popups with the whole history"; $lang['BugConfigHelpAutoname'] = " @@ -101,10 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; - -$lang['EmailNewBug'] = "Nuevo Fallo en %s"; -$lang['EmailChangesBug'] = "Cambios en Fallo %s"; -$lang['EmailStillOpen'] = "FALLO %s Todavía %s"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "use seguimiento de fallos"; $lang['bug'] = &$lang['Bug']; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pl.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pl.p3 14 Dec 2008 16:22:53 -0000 1.9 +++ pl.p3 26 Feb 2009 09:14:33 -0000 1.10 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "używanie Åledzenia bÅÄdów"; $lang['bug'] = &$lang['Bug']; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ko.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ko.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ ko.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "use bugtracking"; $lang['bug'] = &$lang['Bug']; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt-br.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pt-br.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ pt-br.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "use bugtracking"; $lang['bug'] = &$lang['Bug']; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ja.p3,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ja.p3 14 Dec 2008 16:22:53 -0000 1.7 +++ ja.p3 26 Feb 2009 09:14:33 -0000 1.8 @@ -57,7 +57,9 @@ $lang['BugAdditional'] = "ä»å æ å ±"; $lang['BugHistory'] = "å±¥æ´"; $lang['BugSelInfo'] = "(空æ¬ãªããã¹ã¦ã®ãã°ã表示)"; +$lang['BugAnyButSolved'] = "any not solved"; $lang['BugAnyButClosed'] = "æªè§£æ±ºã®ãã®å ¨é¨"; +$lang['BugAnyButSolvedOrClosed'] = "any not solved and not closed"; $lang['BugBetween'] = "å³ã®éã«çæ"; $lang['BugStats'] = "çµ±è¨"; $lang['BugStatsInfo'] = "鏿ããããã°ã®çµ±è¨"; @@ -103,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "ãã°ãã©ããã³ã°"; $lang['bug'] = &$lang['Bug']; Index: es-ve.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-ve.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- es-ve.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ es-ve.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "usar seguimeinto de incidencias"; $lang['bug'] = &$lang['Bug']; Index: pt.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/pt.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pt.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ pt.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "usar REGISTO DE ANOMALIAS"; $lang['bug'] = &$lang['Bug']; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/el.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- el.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ el.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "ÏÏήÏη ενÏοÏιÏÎ¼Î¿Ï Î»Î±Î¸Ïν"; $lang['bug'] = &$lang['Bug']; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/hu.p3,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- hu.p3 14 Dec 2008 16:22:53 -0000 1.11 +++ hu.p3 26 Feb 2009 09:14:33 -0000 1.12 @@ -57,7 +57,9 @@ $lang['BugAdditional'] = "Egyéb információk"; $lang['BugHistory'] = "Történet"; $lang['BugSelInfo'] = "(hagyja üresen az összes hiba megtekintéséhez)"; +$lang['BugAnyButSolved'] = "any not solved"; $lang['BugAnyButClosed'] = "összes megoldatlan"; +$lang['BugAnyButSolvedOrClosed'] = "any not solved and not closed"; $lang['BugBetween'] = "létrehozva között"; $lang['BugStats'] = "Statisztika"; $lang['BugStatsInfo'] = "Statisztka a kiválasztott hibákról"; @@ -103,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "hibakezelõ használata"; $lang['bug'] = &$lang['Bug']; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/fr.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- fr.p3 14 Dec 2008 16:22:53 -0000 1.9 +++ fr.p3 26 Feb 2009 09:14:33 -0000 1.10 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "Gestion des incidents"; $lang['bug'] = &$lang['Bug']; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/ru.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ru.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ ru.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "конÑÑÐ¾Ð»Ñ Ð¾Ñибок"; $lang['bug'] = &$lang['Bug']; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/zh.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- zh.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ zh.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "use bugtracking"; $lang['bug'] = &$lang['Bug']; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/es-mx.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- es-mx.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ es-mx.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "usar seguimeinto de fallos"; $lang['bug'] = &$lang['Bug']; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/it.p3,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- it.p3 14 Dec 2008 16:22:53 -0000 1.8 +++ it.p3 26 Feb 2009 09:14:33 -0000 1.9 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "Usa bugtracking"; $lang['bug'] = &$lang['Bug']; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/sv.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- sv.p3 14 Dec 2008 16:22:53 -0000 1.9 +++ sv.p3 26 Feb 2009 09:14:33 -0000 1.10 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "använd bugghantering"; $lang['bug'] = &$lang['Bug']; |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:39
|
Update of /cvsroot/tutos/tutos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22702 Modified Files: Makefile Log Message: language fixes Index: Makefile =================================================================== RCS file: /cvsroot/tutos/tutos/Makefile,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- Makefile 25 Feb 2009 19:20:21 -0000 1.99 +++ Makefile 26 Feb 2009 09:14:32 -0000 1.100 @@ -15,6 +15,9 @@ # # # $Log$ +# Revision 1.100 2009/02/26 09:14:32 gokohnert +# language fixes +# # Revision 1.99 2009/02/25 19:20:21 gokohnert # updates # @@ -1233,25 +1236,31 @@ langdiff: ${LANGFILES} @chmod 755 langdiff.sh @cd php/localization; ../../langdiff.sh - @cd php/group; ../../langdiff.sh - @cd php/resource; ../../langdiff.sh - @cd php/note; ../../langdiff.sh - @cd php/url; ../../langdiff.sh + @cd php/admin; ../../langdiff.sh + @cd php/bugtracking; ../../langdiff.sh + @cd php/checklist; ../../langdiff.sh + @cd php/counter; ../../langdiff.sh + @cd php/expense; ../../langdiff.sh @cd php/file; ../../langdiff.sh - @cd php/invoice; ../../langdiff.sh + @cd php/group; ../../langdiff.sh @cd php/installation; ../../langdiff.sh + @cd php/invoice; ../../langdiff.sh @cd php/ldap; ../../langdiff.sh - @cd php/checklist; ../../langdiff.sh + @cd php/mailbox; ../../langdiff.sh @cd php/merge; ../../langdiff.sh - @cd php/ticker; ../../langdiff.sh - @cd php/watchlist; ../../langdiff.sh - @cd php/reminder; ../../langdiff.sh - @cd php/expense; ../../langdiff.sh - @cd php/report-engine; ../../langdiff.sh + @cd php/note; ../../langdiff.sh + @cd php/palm; ../../langdiff.sh + @cd php/phpweather; ../../langdiff.sh @cd php/rate; ../../langdiff.sh + @cd php/reminder; ../../langdiff.sh @cd php/report-engine; ../../langdiff.sh + @cd php/resource; ../../langdiff.sh + @cd php/stc; ../../langdiff.sh @cd php/stuff; ../../langdiff.sh - @cd php/counter; ../../langdiff.sh + @cd php/ticker; ../../langdiff.sh + @cd php/url; ../../langdiff.sh + @cd php/watchlist; ../../langdiff.sh + @cd php/xml; ../../langdiff.sh # WARNING: I (Dimitri Fontaine <dfo...@cv...>) added this target |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:23
|
Update of /cvsroot/tutos/tutos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22685 Modified Files: .cvsignore Log Message: fix Index: .cvsignore =================================================================== RCS file: /cvsroot/tutos/tutos/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- .cvsignore 23 Apr 2004 11:39:31 -0000 1.21 +++ .cvsignore 26 Feb 2009 09:14:17 -0000 1.22 @@ -34,6 +34,7 @@ config.cache config.pinc.???????? tutos.spec.???????? +google*.html # # The Java Dokumentation # |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:03
|
Update of /cvsroot/tutos/tutos/php/stc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22621/php/stc Modified Files: stc.pinc stc_ins.php stc_new.php stc_show.php Log Message: some stc fixes Index: stc_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/stc/stc_new.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stc_new.php 25 Feb 2009 19:11:29 -0000 1.1 +++ stc_new.php 26 Feb 2009 09:13:55 -0000 1.2 @@ -30,7 +30,7 @@ * info */ Function info() { - global $lang; + global $lang,$table; $this->width = 4; $r = ''; @@ -198,4 +198,4 @@ <!-- CVS Info: $Id$ $Author$ ---> \ No newline at end of file +--> Index: stc_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/stc/stc_ins.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stc_ins.php 25 Feb 2009 19:11:29 -0000 1.1 +++ stc_ins.php 26 Feb 2009 09:13:55 -0000 1.2 @@ -29,6 +29,9 @@ $obj = new stc($dbconn); +$obj->new_states = array(); +$obj->new_trans = array(); + if ( isset($_POST['id']) ) { $gotourl= addUrlParameter($gotourl,"id=". $_POST['id'],true); $obj = $obj->read($_POST['id'],$obj); @@ -117,4 +120,4 @@ * CVS Info: $Id$ * $Author$ */ -?> \ No newline at end of file +?> Index: stc.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/stc/stc.pinc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stc.pinc 25 Feb 2009 19:11:29 -0000 1.1 +++ stc.pinc 26 Feb 2009 09:13:55 -0000 1.2 @@ -101,14 +101,15 @@ function delete() { global $current_user; + $msg .= ''; $q = 'DELETE FROM '. $this->tablename .' WHERE id = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); // delete connected stuff - $q = 'DELETE FROM '. $this->tablename3 .' '; - $q.= 'WHERE stc_state = '. $this->id; - $q.= 'OR next_state = '. $this->id; + $q = 'DELETE FROM '. $this->tablename3; + $q.= ' WHERE stc_state = '. $this->id; + $q.= ' OR next_state = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); @@ -376,7 +377,7 @@ $r = ''; $r .= '<select id="stc_'.$varname.'" name="'.$varname.'">'; foreach($this->states as $j) { - $r .= '<option value="'.$j->stc_state.'" style="background:'.$j->color; + $r .= '<option value="'.$j->stc_state.'" style="background:'.$j->color.'"'; if ($default == $j->stc_state) { $r .= ' selected="selected"'; } Index: stc_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/stc/stc_show.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- stc_show.php 25 Feb 2009 19:11:29 -0000 1.1 +++ stc_show.php 26 Feb 2009 09:13:55 -0000 1.2 @@ -86,7 +86,7 @@ global $lang; if (!load_jpgraph( array("jpgraph_canvas.php","jpgraph_canvtools.php"),'../' )) { - die($msg); + die('no jpgraph'); }; $xsize = 1000; $ysize = 1200; @@ -96,7 +96,7 @@ $g->title->SetColor('black@0.5'); $g->SetBackgroundGradient('white','silver',GRAD_HOR,BGRAD_PLOT); - $g->img->setFont(FF_VERDANA,FS_NORMAL,8); + $g->img->setFont(FF_ARIAL,FS_NORMAL,8); $g->title->Set($lang['STC'].' '. $this->obj->getFullName()); $g->InitFrame(); @@ -148,7 +148,7 @@ $s = next($this->obj->states); } - $g->img->setFont(FF_VERDANA,FS_NORMAL,6); + $g->img->setFont(FF_ARIAL,FS_NORMAL,6); $shape->StrokeText(0,$ysize-15,myiconv('created with TUTOS'),0,'center'); $g->Stroke(); } @@ -251,4 +251,4 @@ <!-- CVS Info: $Id$ $Author$ ---> \ No newline at end of file +--> |
From: Gero K. <gok...@us...> - 2009-02-26 09:14:03
|
Update of /cvsroot/tutos/tutos/php/bugtracking In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22621/php/bugtracking Modified Files: bug.pinc bug_overview.php Log Message: some stc fixes Index: bug.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- bug.pinc 25 Feb 2009 19:16:08 -0000 1.71 +++ bug.pinc 26 Feb 2009 09:13:54 -0000 1.72 @@ -442,7 +442,6 @@ if ( empty($s) ) { $s = $this->state; } - $r .= '<span class="bugstate'. $s .'">'; $stc = getObject($this->dbconn,$tutos['bug_state_stc']); if (is_object($stc)) { @@ -450,7 +449,6 @@ } else { $r .= stc::getNoSTCState($s,'BugStates'); } - $r .= '</span>'; return $r; } /** @@ -1344,4 +1342,4 @@ return $r; } } -?> \ No newline at end of file +?> Index: bug_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- bug_overview.php 16 Feb 2009 20:03:56 -0000 1.32 +++ bug_overview.php 26 Feb 2009 09:13:55 -0000 1.33 @@ -111,7 +111,7 @@ $b = &$this->blist[$i]; $c = 0; $worksheet1->write_string($x,$c++, $b->name); - $worksheet1->write_string($x,$c++, $lang['BugStates'][$b->state],$format2); + $worksheet1->write_string($x,$c++, $b->getState(),$format2); $worksheet1->write_string($x,$c++, $lang['BugClasses'][$b->class],$format2); $worksheet1->write_string($x,$c++, $b->creation->getDate()); @@ -357,7 +357,7 @@ if ( $f == -2 ) { echo " ". $lang['BugAnyButSolved']; } else { - echo " ". $lang['BugStates'][$f]; + echo " ". $b->getState($f); } } else if ( $i == 'mediums' ) { echo $pre . $lang['BugMedium']; @@ -427,16 +427,16 @@ echo $this->showfield($lang['BugState']); } $c = 0; - while ( list ($i,$f) = @each ($states) ) { + foreach ($states as $i => $f) { $val = number_format($f * 100.0 / $cnt ,2); if ( !function_exists('ImageCreate') ) { - echo " <td>". $lang['BugStates'][$i] ."</td>\n"; + echo " <td>". $b->getState($i) ."</td>\n"; echo " <td align=\"right\">". $f ."</td>\n"; echo " <td align=\"right\">". $val ."%</td>\n"; echo "</tr>\n"; } $link = addUrlParameter($link,"f[". $c ."]=".$val); - $link = addUrlParameter($link,"t0[". $c ."]=". UrlEncode($lang['BugStates'][$i])); + $link = addUrlParameter($link,"t0[". $c ."]=". UrlEncode($b->getState($i))); $link = addUrlParameter($link,"t1[". $c ."]=". $f ); $link = addUrlParameter($link,"col[". $c ."]=". UrlEncode($b->c_state[$i])); $c++; @@ -956,4 +956,4 @@ $l = new bug_overview($current_user); $l->display(); $dbconn->Close(); -?> \ No newline at end of file +?> |
From: Gero K. <gok...@us...> - 2009-02-25 19:20:27
|
Update of /cvsroot/tutos/tutos In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16769 Modified Files: ChangeLog Makefile Log Message: updates Index: Makefile =================================================================== RCS file: /cvsroot/tutos/tutos/Makefile,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- Makefile 18 Jan 2009 20:47:46 -0000 1.98 +++ Makefile 25 Feb 2009 19:20:21 -0000 1.99 @@ -15,6 +15,9 @@ # # # $Log$ +# Revision 1.99 2009/02/25 19:20:21 gokohnert +# updates +# # Revision 1.98 2009/01/18 20:47:46 gokohnert # updates # @@ -363,6 +366,8 @@ $(PHP_BUG) \ $(PHP_BUG_HLP) \ $(PHP_BUG_TPL) \ + $(PHP_STC) \ + $(PHP_STC_HLP) \ $(PHP_XML) \ $(PHP_URL) \ $(PHP_RES) \ @@ -641,6 +646,14 @@ PHP_COUNTER_HLP = php/counter/help/.htaccess \ $(wildcard php/counter/help/*.html) +# STC State Transition Control Module +PHP_STC = $(wildcard php/stc/*.php) \ + php/stc/.htaccess \ + $(wildcard php/stc/*.p3) \ + $(wildcard php/stc/*.pinc) +PHP_STC_HLP = php/stc/help/.htaccess \ + $(wildcard php/stc/help/*.html) + # Report Engine Module PHP_REPORT = $(wildcard php/report-engine/*.php) \ $(wildcard php/report-engine/*.p3) \ Index: ChangeLog =================================================================== RCS file: /cvsroot/tutos/tutos/ChangeLog,v retrieving revision 1.126 retrieving revision 1.127 diff -u -d -r1.126 -r1.127 --- ChangeLog 18 Jan 2009 20:47:46 -0000 1.126 +++ ChangeLog 25 Feb 2009 19:20:20 -0000 1.127 @@ -1,9 +1,13 @@ #$Header$ + * new STC Module(State Transitions Control) to limit and check State Changes + * better handling of large gantt charts * new fields for user/owner and source in stuff module + * new module specific config pages (called via Admin page) * new checkfield type headline (this allows to structure a checklist) * additional replace fields supported in $tutos[bugautoname] * custom object type allows to reference objects * new support for sqlite 2.* + * new support for MSSQL native * modified bugautoname replacement keys (see comment in config_default.pinc) * creation of a checklist workingcopy now requires MOD permissions on the checklist 20 August 2008 |
From: Gero K. <gok...@us...> - 2009-02-25 19:17:16
|
Update of /cvsroot/tutos/tutos/php/db In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16332/db Modified Files: db.pinc table.pinc Log Message: updates Index: table.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/db/table.pinc,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- table.pinc 15 Feb 2009 19:16:43 -0000 1.43 +++ table.pinc 25 Feb 2009 19:16:37 -0000 1.44 @@ -1,6 +1,6 @@ <?php /** - * Copyright 2002 - 2007 by Gero Kohnert + * Copyright 2002 - 2009 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 @@ -15,7 +15,7 @@ # Object Types $table['objectids'] = array( name => 'objectids', - Desc => "TUTOS object id - type referece", + Desc => 'TUTOS object id - type referece', 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'object ID'), 'tutostype' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'tutos type (see db.p3)'), ); @@ -24,522 +24,527 @@ $table['tutos_config'] = array ( name => 't_config', Desc => 'TUTOS Configuration', - 'cname' => array(type => 'VARCHAR', size => 40, constraints => 'PK', Desc => "configuration name"), - 'cvalue' => array(type => 'VARCHAR', size => 250, constraints => '', Desc => "configuration value"), - 'ctag' => array(type => 'VARCHAR', size => 40, constraints => '', Desc => "configuration tag (module or similar)"), + 'cname' => array(type => 'VARCHAR', size => 40, constraints => 'PK', Desc => 'configuration name'), + 'cvalue' => array(type => 'VARCHAR', size => 250, constraints => '', Desc => 'configuration value'), + 'ctag' => array(type => 'VARCHAR', size => 40, constraints => '', Desc => 'configuration tag (module or similar)'), ); $tableidx['config1'] = array( - name => "config_tag", - table => "t_config", - column => array("ctag"), - Desc => "config tags", + name => 'config_tag', + table => 't_config', + column => array('ctag'), + Desc => 'config tags', ); $table['people'] = array( name => 'people', Desc => 'TUTOS users', - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "object ID"), - 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => "address ID"), - 'login' => array(type => 'VARCHAR', size => 20, constraints => 'NN', Desc => "login name"), - 'last_seen' => array(type => 'TS_TYPE', constraints => '', Desc => "last login time"), - 'last_host' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => "last login host"), - 'admin' => array(type => 'ID_TYPE', constraints => '', Desc => "admin or not"), - 'pw' => array(type => 'VARCHAR', size => 50, constraints => '', Desc => "users password"), - 'prefteam' => array(type => 'ID_TYPE', constraints => "default 1", Desc => "last seen team in calendar"), - 'lang' => array(type => 'VARCHAR', size => 5 , constraints => '', Desc => "users language"), - 'tz' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "users timezone"), - 'holidays' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "users holiday sets"), - 'namedays' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "nameday sets"), - 'workdays' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => "working days in a week"), - 'weekstart' => array(type => 'ID_TYPE', constraints => '', Desc => "first day in a week"), - 'theme' => array(type => 'VARCHAR', size => 10, constraints => "default 'tutos'", Desc => "users theme"), - 'layout' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "users layout engine"), - 'rowiconsbefore' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => "users rowicon engine"), - 'rowiconsafter' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => "users rowicon engine"), - 'disabled' => array(type => 'ID_TYPE', constraints => '', Desc => "1 == currently disabled account"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date"), - 'signature' => array(type => 'VARCHAR', size => 255,constraints => '', Desc => "user mail signature"), + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'object ID'), + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'address ID'), + 'login' => array(type => 'VARCHAR', size => 20, constraints => 'NN', Desc => 'login name'), + 'last_seen' => array(type => 'TS_TYPE', constraints => '', Desc => 'last login time'), + 'last_host' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => 'last login host'), + 'admin' => array(type => 'ID_TYPE', constraints => '', Desc => 'admin or not'), + 'pw' => array(type => 'VARCHAR', size => 50, constraints => '', Desc => 'users password'), + 'prefteam' => array(type => 'ID_TYPE', constraints => 'default 1', Desc => 'last seen team in calendar'), + 'lang' => array(type => 'VARCHAR', size => 5 , constraints => '', Desc => 'users language'), + 'tz' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'users timezone'), + 'holidays' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'users holiday sets'), + 'namedays' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'nameday sets'), + 'workdays' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => 'working days in a week'), + 'weekstart' => array(type => 'ID_TYPE', constraints => '', Desc => 'first day in a week'), + 'theme' => array(type => 'VARCHAR', size => 10, constraints => '', Desc => 'users theme'), + 'layout' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'users layout engine'), + 'rowiconsbefore' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => 'users rowicon engine'), + 'rowiconsafter' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => 'users rowicon engine'), + 'disabled' => array(type => 'ID_TYPE', constraints => '', Desc => '1 == currently disabled account'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'), + 'signature' => array(type => 'VARCHAR', size => 255,constraints => '', Desc => 'user mail signature'), ); +# +# Permission Managemetn ACL (Access Control Lists) +# $table['acl'] = array( - name => "acl", - Desc => "TUTOS acl", - "obj_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "object ID"), - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "user/team ID"), - "perm" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "permission") + name => 'acl', + Desc => 'TUTOS acl', + 'obj_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'object ID'), + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'user/team ID'), + 'perm' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'permission') ); $tableidx['acl1'] = array( - name => "acl_idx1", - table => "acl", - column => array("obj_id"), - Desc => "ref acl - obj", + name => 'acl_idx1', + table => 'acl', + column => array('obj_id'), + Desc => 'ref acl - obj', ); $tableidx['acl2'] = array( - name => "acl_idx2", - table => "acl", - column => array("adr_id"), - Desc => "ref acl - user", + name => 'acl_idx2', + table => 'acl', + column => array('adr_id'), + Desc => 'ref acl - user', ); $table['acldefault'] = array( - name => "acldefault", - Desc => "TUTOS acl defaults", - "obj_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "object ID"), - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "user/team ID"), - "perm" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "permission") + name => 'acldefault', + Desc => 'TUTOS acl defaults', + 'obj_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'object ID'), + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'user/team ID'), + 'perm' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'permission') ); $tableidx['acldef1'] = array( - name => "acldefault_idx1", - table => "acldefault", - column => array("obj_id"), - Desc => "ref acldef - obj", + name => 'acldefault_idx1', + table => 'acldefault', + column => array('obj_id'), + Desc => 'ref acldef - obj', ); $tableidx['acldef2'] = array( - name => "acldefault_idx2", - table => "acldefault", - column => array("adr_id"), - Desc => "ref acldef - adr", + name => 'acldefault_idx2', + table => 'acldefault', + column => array('adr_id'), + Desc => 'ref acldef - adr', ); - +# +# Address Data +# $table['address'] = array( - name => "addresses", - Desc => "TUTOS addresses", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - "title" => array(type => 'VARCHAR', size => 10, constraints => '', Desc => "title"), - "f_name" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "first name"), - "m_name" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "middle name"), - "l_name" => array(type => 'VARCHAR', size => 30, constraints => 'NN', Desc => "last name"), - "birthday" => array(type => 'date', constraints => '', Desc => "birthday"), - "pic_id" => array(type => 'ID_TYPE', constraints => '', Desc => "file id of picture"), - "category" => array(type => 'ID_TYPE', constraints => "default 1", Desc => "category"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + name => 'addresses', + Desc => 'TUTOS addresses', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'title' => array(type => 'VARCHAR', size => 10, constraints => '', Desc => 'title'), + 'f_name' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'first name'), + 'm_name' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'middle name'), + 'l_name' => array(type => 'VARCHAR', size => 30, constraints => 'NN', Desc => 'last name'), + 'birthday' => array(type => 'date', constraints => '', Desc => 'birthday'), + 'pic_id' => array(type => 'ID_TYPE', constraints => '', Desc => 'file id of picture'), + 'category' => array(type => 'ID_TYPE', constraints => 'default 1', Desc => 'category'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $table['address1'] = array( - name => "adrloc", - Desc => "TUTOS adrloc", - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "address ID"), - "loc_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "loc ID"), - 'name' => array(type => 'VARCHAR', size => 30, constraints => 'NN', Desc => "owner ID"), - "category" => array(type => 'ID_TYPE', constraints => '', Desc => "type of location") + name => 'adrloc', + Desc => 'TUTOS adrloc', + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'address ID'), + 'loc_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'loc ID'), + 'name' => array(type => 'VARCHAR', size => 30, constraints => 'NN', Desc => 'owner ID'), + 'category' => array(type => 'ID_TYPE', constraints => '', Desc => 'type of location') ); $tableidx['address11'] = array( - name => "adrloc_u", - table => "adrloc", - column => array("adr_id","loc_id"), - type => "unique", - Desc => "ref adr - location", + name => 'adrloc_u', + table => 'adrloc', + column => array('adr_id','loc_id'), + type => 'unique', + Desc => 'ref adr - location', ); $tableidx['address12'] = array( - name => "adrloc_a", - table => "adrloc", - column => array("adr_id"), - Desc => "ref adr - location", + name => 'adrloc_a', + table => 'adrloc', + column => array('adr_id'), + Desc => 'ref adr - location', ); $table['location'] = array( - name => "location", - Desc => "TUTOS locations", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - "category" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "category home or buissnes"), - "c_id" => array(type => 'ID_TYPE', constraints => '', Desc => "company ID"), - "d_id" => array(type => 'ID_TYPE', constraints => '', Desc => "department ID"), - "desc1" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "description"), - "phone_1" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "phone number"), - "phone_2" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "phone number"), - "fax_1" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "fax number"), - "email_1" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "email address"), - "email_2" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "email address"), - "street1" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "street address"), - "street2" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "street address"), - "city" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "city"), - "zip" => array(type => 'VARCHAR', size => 10, constraints => '', Desc => "zip code"), - "state" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "state in country"), - "country" => array(type => 'VARCHAR', size => 3, constraints => '', Desc => "ISO Country code"), - "coords" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "Coordinates (not yet used)"), - "acc_info1" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "bank account info line 1"), - "acc_info2" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "bank account info line 2"), - "acc_nr" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "bank account info nr"), - "customer_id" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "customer id"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + name => 'location', + Desc => 'TUTOS locations', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'category' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'category home or buissnes'), + 'c_id' => array(type => 'ID_TYPE', constraints => '', Desc => 'company ID'), + 'd_id' => array(type => 'ID_TYPE', constraints => '', Desc => 'department ID'), + 'desc1' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'description'), + 'phone_1' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'phone number'), + 'phone_2' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'phone number'), + 'fax_1' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'fax number'), + 'email_1' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'email address'), + 'email_2' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'email address'), + 'street1' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'street address'), + 'street2' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'street address'), + 'city' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'city'), + 'zip' => array(type => 'VARCHAR', size => 10, constraints => '', Desc => 'zip code'), + 'state' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'state in country'), + 'country' => array(type => 'VARCHAR', size => 3, constraints => '', Desc => 'ISO Country code'), + 'coords' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'Coordinates (not yet used)'), + 'acc_info1' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'bank account info line 1'), + 'acc_info2' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'bank account info line 2'), + 'acc_nr' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'bank account info nr'), + 'customer_id' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'customer id'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $table['team'] = array( - name => "teams", - Desc => "TUTOS teams", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), + name => 'teams', + Desc => 'TUTOS teams', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), 'name' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'name'), - "owner" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "owner ID"), - "email" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "email to reach the team"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + 'owner' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'owner ID'), + 'email' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'email to reach the team'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $table['team1'] = array( - name => "adrteam", - Desc => "TUTOS adrteam", - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "member ID"), - "team_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "team ID") + name => 'adrteam', + Desc => 'TUTOS adrteam', + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'member ID'), + 'team_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'team ID') ); $tableidx['team1'] = array( - name => "adrteam_u", - table => "adrteam", - column => array("adr_id","team_id"), - type => "unique", - Desc => "ref user - team", + name => 'adrteam_u', + table => 'adrteam', + column => array('adr_id','team_id'), + type => 'unique', + Desc => 'ref user - team', ); $tableidx['team2'] = array( - name => "adrteam_t", - table => "adrteam", - column => array("team_id"), - Desc => "ref user - team", + name => 'adrteam_t', + table => 'adrteam', + column => array('team_id'), + Desc => 'ref user - team', ); $tableidx['team3'] = array( - name => "adrteam_a", - table => "adrteam", - column => array("adr_id"), - Desc => "ref user - team", + name => 'adrteam_a', + table => 'adrteam', + column => array('adr_id'), + Desc => 'ref user - team', ); $table['appointment1'] = array( - name => "calendar", - Desc => "TUTOS calendar", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - "a_start" => array(type => 'TS_TYPE', constraints => 'NN', Desc => "start date"), - "a_end" => array(type => 'TS_TYPE', constraints => 'NN', Desc => "end date"), - "t_ignore" => array(type => 'ID_TYPE', constraints => '', Desc => "ignore start and end time"), - "description" => array(type => 'VARCHAR', size => 100, constraints => '',Desc => "description"), - "trace" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "trace participants"), - "mod_allow" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "allow modification (deprecated)"), - "outside" => array(type => 'ID_TYPE', constraints => '', Desc => "where does it happen"), - "remember" => array(type => 'ID_TYPE', constraints => '', Desc => "seconds before start"), - "remembered" => array(type => 'ID_TYPE', constraints => '', Desc => "remember happend"), - "visitor" => array(type => 'ID_TYPE', constraints => '', Desc => "visitor ID"), - "product" => array(type => 'ID_TYPE', constraints => '', Desc => "product ID"), - "repeat_type" => array(type => 'ID_TYPE', constraints => '', Desc => "type of repeat"), - "r_arg" => array(type => 'VARCHAR', size => 5, constraints => '', Desc => "detail of repeat"), - "r_ignore" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "ignore end when repeating"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + name => 'calendar', + Desc => 'TUTOS calendar', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'a_start' => array(type => 'TS_TYPE', constraints => 'NN', Desc => 'start date'), + 'a_end' => array(type => 'TS_TYPE', constraints => 'NN', Desc => 'end date'), + 't_ignore' => array(type => 'ID_TYPE', constraints => '', Desc => 'ignore start and end time'), + 'description' => array(type => 'VARCHAR', size => 100, constraints => '',Desc => 'description'), + 'trace' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'trace participants'), + 'mod_allow' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'allow modification (deprecated)'), + 'outside' => array(type => 'ID_TYPE', constraints => '', Desc => 'where does it happen'), + 'remember' => array(type => 'ID_TYPE', constraints => '', Desc => 'seconds before start'), + 'remembered' => array(type => 'ID_TYPE', constraints => '', Desc => 'remember happend'), + 'visitor' => array(type => 'ID_TYPE', constraints => '', Desc => 'visitor ID'), + 'product' => array(type => 'ID_TYPE', constraints => '', Desc => 'product ID'), + 'repeat_type' => array(type => 'ID_TYPE', constraints => '', Desc => 'type of repeat'), + 'r_arg' => array(type => 'VARCHAR', size => 5, constraints => '', Desc => 'detail of repeat'), + 'r_ignore' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'ignore end when repeating'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $tableidx['appointment11'] = array( - name => "cal_rep_idx1", - table => "calendar", - column => array("repeat_type"), - Desc => "ref cal - repeat_type", + name => 'cal_rep_idx1', + table => 'calendar', + column => array('repeat_type'), + Desc => 'ref cal - repeat_type', ); $tableidx['appointment12'] = array( - name => "cal_rep_idx2", - table => "calendar", - column => array("r_ignore"), - Desc => "ref cal - r_ignore", + name => 'cal_rep_idx2', + table => 'calendar', + column => array('r_ignore'), + Desc => 'ref cal - r_ignore', ); $tableidx['appointment13'] = array( - name => "cal_idx3", - table => "calendar", - column => array("a_start"), - Desc => "idx cal - start", + name => 'cal_idx3', + table => 'calendar', + column => array('a_start'), + Desc => 'idx cal - start', ); $tableidx['appointment14'] = array( - name => "cal_idx4", - table => "calendar", - column => array("a_end"), - Desc => "idx cal - end", + name => 'cal_idx4', + table => 'calendar', + column => array('a_end'), + Desc => 'idx cal - end', ); $table['appointment2'] = array( - name => "participants", - Desc => "TUTOS participants", - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Participant ID"), - "app_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Appointment ID"), - "state" => array(type => 'ID_TYPE', constraints => "default 0", Desc => "State ID") + name => 'participants', + Desc => 'TUTOS participants', + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Participant ID'), + 'app_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Appointment ID'), + 'state' => array(type => 'ID_TYPE', constraints => 'default 0', Desc => 'State ID') ); $tableidx['appointment21'] = array( - name => "part_uap_id", - table => "participants", - column => array("adr_id","app_id"), - type => "unique", - Desc => "ref app - user", + name => 'part_uap_id', + table => 'participants', + column => array('adr_id','app_id'), + type => 'unique', + Desc => 'ref app - user', ); $tableidx['appointment22'] = array( - name => "part_a_id", - table => "participants", - column => array("app_id"), - Desc => "ref app - part", + name => 'part_a_id', + table => 'participants', + column => array('app_id'), + Desc => 'ref app - part', ); $table['product'] = array( - name => "products", - Desc => "TUTOS products", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), + name => 'products', + Desc => 'TUTOS products', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), 'name' => array(type => 'VARCHAR', size => 40, constraints => '', Desc => 'name'), - "version" => array(type => 'VARCHAR', size => 20, constraints => '', Desc => "version"), - "description" => array(type => "TX_TYPE", constraints => '', Desc => "description"), - "desc1" => array(type => "TX_TYPE", constraints => '', Desc => "description 1"), - "desc2" => array(type => "TX_TYPE", constraints => '', Desc => "description 2"), - "state" => array(type => 'ID_TYPE', constraints => '', Desc => "state of product"), - "path" => array(type => 'VARCHAR', size => 100, constraints => '', Desc => "path to info"), - "price" => array(type => "float", constraints => '', Desc => "price of product"), - "cost" => array(type => "float", constraints => '', Desc => "cost of product"), - "currency" => array(type => 'VARCHAR', size => 4, constraints => '', Desc => "currency for price and cost"), - "probability" => array(type => "float", constraints => '', Desc => "probability"), - "p_start" => array(type => 'TS_TYPE', constraints => '', Desc => "start date"), - "p_end" => array(type => 'TS_TYPE', constraints => '', Desc => "end date"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + 'version' => array(type => 'VARCHAR', size => 20, constraints => '', Desc => 'version'), + 'description' => array(type => 'TX_TYPE', constraints => '', Desc => 'description'), + 'desc1' => array(type => 'TX_TYPE', constraints => '', Desc => 'description 1'), + 'desc2' => array(type => 'TX_TYPE', constraints => '', Desc => 'description 2'), + 'state' => array(type => 'ID_TYPE', constraints => '', Desc => 'state of product'), + 'path' => array(type => 'VARCHAR', size => 100, constraints => '', Desc => 'path to info'), + 'price' => array(type => 'float', constraints => '', Desc => 'price of product'), + 'cost' => array(type => 'float', constraints => '', Desc => 'cost of product'), + 'currency' => array(type => 'VARCHAR', size => 4, constraints => '', Desc => 'currency for price and cost'), + 'probability' => array(type => 'float', constraints => '', Desc => 'probability'), + 'p_start' => array(type => 'TS_TYPE', constraints => '', Desc => 'start date'), + 'p_end' => array(type => 'TS_TYPE', constraints => '', Desc => 'end date'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $table['product2'] = array( - name => "projectroles", - Desc => "TUTOS projectroles", - "pro_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Project ID"), - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Object ID"), - "role_id" => array(type => 'ID_TYPE', constraints => '', Desc => "role ID (from languagefile)"), - "description" => array(type => 'VARCHAR', size => 40, constraints => '', Desc => "additional role description"), + name => 'projectroles', + Desc => 'TUTOS projectroles', + 'pro_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Project ID'), + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Object ID'), + 'role_id' => array(type => 'ID_TYPE', constraints => '', Desc => 'role ID (from languagefile)'), + 'description' => array(type => 'VARCHAR', size => 40, constraints => '', Desc => 'additional role description'), ); $tableidx['product21'] = array( - name => "prole_pro_id", - table => "projectroles", - column => array("pro_id"), - Desc => "ref to project", + name => 'prole_pro_id', + table => 'projectroles', + column => array('pro_id'), + Desc => 'ref to project', ); $tableidx['product22'] = array( - name => "projectroles_idx2", - table => "projectroles", - column => array("adr_id"), - Desc => "ref to object with role", + name => 'projectroles_idx2', + table => 'projectroles', + column => array('adr_id'), + Desc => 'ref to object with role', ); $table['product3'] = array( - name => "projectclass1", - Desc => "TUTOS projectclass1", - "pro_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Project ID"), - "class_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Class ID (from languagefile)"), + name => 'projectclass1', + Desc => 'TUTOS projectclass1', + 'pro_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Project ID'), + 'class_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Class ID (from languagefile)'), ); $tableidx['product3'] = array( - name => "pclass1_pro_id", - table => "projectclass1", - column => array("pro_id"), - Desc => "ref to project", + name => 'pclass1_pro_id', + table => 'projectclass1', + column => array('pro_id'), + Desc => 'ref to project', ); $table['product4'] = array( - name => "projectclass2", - Desc => "TUTOS projectclass2", - "pro_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Project ID"), - "class_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Class ID (from languagefile)"), + name => 'projectclass2', + Desc => 'TUTOS projectclass2', + 'pro_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Project ID'), + 'class_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Class ID (from languagefile)'), ); $tableidx['product4'] = array( - name => "pclass2_pro_id", - table => "projectclass2", - column => array("pro_id"), - Desc => "ref to project", + name => 'pclass2_pro_id', + table => 'projectclass2', + column => array('pro_id'), + Desc => 'ref to project', ); -$table['task'][name] = "tasks"; -$table['task'][Desc] = "TUTOS tasks"; -$table['task']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"); -$table['task']['p_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => "linked object"); -$table['task']['worker'] = array(type => 'ID_TYPE', constraints => '', Desc => "user object (deprecated)"); -$table['task']['autoname'] = array(type => 'VARCHAR', size => 50, constraints => '', Desc => "Task Autoname"); -$table['task']['name'] = array(type => 'VARCHAR', size => 40, constraints => '', Desc => "short description"); -$table['task']['r_start'] = array(type => 'TS_TYPE', constraints => '', Desc => "real start date"); -$table['task']['r_end'] = array(type => 'TS_TYPE', constraints => '', Desc => "real end date"); -$table['task']['s_start'] = array(type => 'TS_TYPE', constraints => '', Desc => "scheduled start date"); -$table['task']['s_end'] = array(type => 'TS_TYPE', constraints => '', Desc => "scheduled end date"); -$table['task']['volume'] = array(type => "float", constraints => '', Desc => "hours of work"); -$table['task']['volume_done'] = array(type => "float", constraints => '', Desc => "hours worked"); -$table['task']['volume_todo'] = array(type => "float", constraints => '', Desc => "hours of work to do"); -$table['task']['status'] = array(type => 'ID_TYPE', constraints => '', Desc => "state of task"); -$table['task']['milestone'] = array(type => 'ID_TYPE', constraints => '', Desc => "milestone flag"); -$table['task']['description'] = array(type => "TX_TYPE", constraints => '', Desc => "description"); -$table['task']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"); -$table['task']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => "creation date"); +$table['task'][name] = 'tasks'; +$table['task'][Desc] = 'TUTOS tasks'; +$table['task']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'); +$table['task']['p_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'linked object'); +$table['task']['worker'] = array(type => 'ID_TYPE', constraints => '', Desc => 'user object (deprecated)'); +$table['task']['autoname'] = array(type => 'VARCHAR', size => 50, constraints => '', Desc => 'Task Autoname'); +$table['task']['name'] = array(type => 'VARCHAR', size => 40, constraints => '', Desc => 'short description'); +$table['task']['r_start'] = array(type => 'TS_TYPE', constraints => '', Desc => 'real start date'); +$table['task']['r_end'] = array(type => 'TS_TYPE', constraints => '', Desc => 'real end date'); +$table['task']['s_start'] = array(type => 'TS_TYPE', constraints => '', Desc => 'scheduled start date'); +$table['task']['s_end'] = array(type => 'TS_TYPE', constraints => '', Desc => 'scheduled end date'); +$table['task']['volume'] = array(type => 'float', constraints => '', Desc => 'hours of work'); +$table['task']['volume_done'] = array(type => 'float', constraints => '', Desc => 'hours worked'); +$table['task']['volume_todo'] = array(type => 'float', constraints => '', Desc => 'hours of work to do'); +$table['task']['status'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state of task'); +$table['task']['milestone'] = array(type => 'ID_TYPE', constraints => '', Desc => 'milestone flag'); +$table['task']['description'] = array(type => 'TX_TYPE', constraints => '', Desc => 'description'); +$table['task']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); +$table['task']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); $tableidx['task1'] = array( - name => "task_idx1", - table => "tasks", - column => array("p_id"), - Desc => "objects with tasks", + name => 'task_idx1', + table => 'tasks', + column => array('p_id'), + Desc => 'objects with tasks', ); $tableidx['task2'] = array( - name => "task_idx2", - table => "tasks", - column => array("worker"), - Desc => "users with tasks", + name => 'task_idx2', + table => 'tasks', + column => array('worker'), + Desc => 'users with tasks', ); $tableidx['task3'] = array( - name => "task_idx3", - table => "tasks", - column => array("s_start"), - Desc => "start date of tasks", + name => 'task_idx3', + table => 'tasks', + column => array('s_start'), + Desc => 'start date of tasks', ); $tableidx['task4'] = array( - name => "task_idx4", - table => "tasks", - column => array("s_end"), - Desc => "end date of tasks", + name => 'task_idx4', + table => 'tasks', + column => array('s_end'), + Desc => 'end date of tasks', ); $sequence['tasknumber'] = array( - name => "tasknumber", + name => 'tasknumber', 'start' => 1, - Desc => "TUTOS task sequencer", + Desc => 'TUTOS task sequencer', ); $table['taskworker'] = array( - name => "taskworker", - Desc => "TUTOS task workers and roles", - "t_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Task ID"), - "w_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Worker ID"), - "role_id" => array(type => 'ID_TYPE', constraints => '', Desc => "role ID (from languagefile)"), - "description" => array(type => 'VARCHAR', size => 40, constraints => '', Desc => "additional role description"), + name => 'taskworker', + Desc => 'TUTOS task workers and roles', + 't_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Task ID'), + 'w_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Worker ID'), + 'role_id' => array(type => 'ID_TYPE', constraints => '', Desc => 'role ID (from languagefile)'), + 'description' => array(type => 'VARCHAR', size => 40, constraints => '', Desc => 'additional role description'), ); $tableidx['taskworker1'] = array( - name => "taskw_idx1", - table => "taskworker", - column => array("t_id"), - Desc => "workers in taskworkers", + name => 'taskw_idx1', + table => 'taskworker', + column => array('t_id'), + Desc => 'workers in taskworkers', ); $tableidx['taskworker2'] = array( - name => "taskw_idx2", - table => "taskworker", - column => array("w_id"), - Desc => "tasks in taskworkers", + name => 'taskw_idx2', + table => 'taskworker', + column => array('w_id'), + Desc => 'tasks in taskworkers', ); $table['tasklink'] = array( - name => "tasklink", - Desc => "TUTOS task dependencies", - "t_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Task ID"), - "l_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "Linked Task ID"), + name => 'tasklink', + Desc => 'TUTOS task dependencies', + 't_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Task ID'), + 'l_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Linked Task ID'), ); $table['company'] = array( - name => "companies", - Desc => "TUTOS companies", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - 'name' => array(type => 'VARCHAR', size => 60, constraints => "NN U",Desc => "name of company"), - "legal_name" => array(type => 'VARCHAR', size => 100, constraints => '', Desc => "legal name / xrms support"), - "company_code" => array(type => 'VARCHAR', size => 10, constraints => '', Desc => "company code / xrms support"), - "tax_id" => array(type => 'VARCHAR', size => 100, constraints => '', Desc => "tax id / xrms support"), - "credit_limit" => array(type => 'VARCHAR', size => 50, constraints => '', Desc => "credit limit / xrms support"), - "employees" => array(type => 'VARCHAR', size => 50, constraints => '', Desc => "employees / xrms support"), - "revenue" => array(type => 'VARCHAR', size => 50, constraints => '', Desc => "revenue / xrms support"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + name => 'companies', + Desc => 'TUTOS companies', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'name' => array(type => 'VARCHAR', size => 60, constraints => 'NN U',Desc => 'name of company'), + 'legal_name' => array(type => 'VARCHAR', size => 100, constraints => '', Desc => 'legal name / xrms support'), + 'company_code' => array(type => 'VARCHAR', size => 10, constraints => '', Desc => 'company code / xrms support'), + 'tax_id' => array(type => 'VARCHAR', size => 100, constraints => '', Desc => 'tax id / xrms support'), + 'credit_limit' => array(type => 'VARCHAR', size => 50, constraints => '', Desc => 'credit limit / xrms support'), + 'employees' => array(type => 'VARCHAR', size => 50, constraints => '', Desc => 'employees / xrms support'), + 'revenue' => array(type => 'VARCHAR', size => 50, constraints => '', Desc => 'revenue / xrms support'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $table['department'] = array( - name => "departments", - Desc => "TUTOS departments", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - "c_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "id of company"), - 'name' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "name of department"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date") + name => 'departments', + Desc => 'TUTOS departments', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'c_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of company'), + 'name' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'name of department'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $tableidx['department1'] = array( - name => "department_idx1", - table => "departments", - column => array("c_id"), - Desc => "companies with departments", + name => 'department_idx1', + table => 'departments', + column => array('c_id'), + Desc => 'companies with departments', ); $table['history'] = array( - name => "history", - Desc => "TUTOS history", - "obj_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "id of history object"), - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "id of changer"), - "m_time" => array(type => 'TS_TYPE', constraints => 'NN', Desc => "change date"), - "m_field" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "changed field"), - "val_old" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "old value"), - "val_new" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "new value") + name => 'history', + Desc => 'TUTOS history', + 'obj_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of history object'), + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of changer'), + 'm_time' => array(type => 'TS_TYPE', constraints => 'NN', Desc => 'change date'), + 'm_field' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'changed field'), + 'val_old' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'old value'), + 'val_new' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'new value') ); $tableidx['history1'] = array( - name => "history_idx1", - table => "history", - column => array("obj_id"), - Desc => "history objects", + name => 'history_idx1', + table => 'history', + column => array('obj_id'), + Desc => 'history objects', ); $table['timetrack'] = array( - name => "timetrack", - Desc => "TUTOS timetrack", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - "adr_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "id of worker"), - "link_id" => array(type => 'ID_TYPE', constraints => 'NN', Desc => "id of worked object"), - "volume" => array(type => "float", constraints => '', Desc => "work volume in hours"), - "volume_todo" => array(type => "float", constraints => '', Desc => "work volume still to do in hours"), - "distance" => array(type => "float", constraints => '', Desc => "distance travelled"), - "t_start" => array(type => 'TS_TYPE', constraints => '', Desc => "start of work"), - "t_end" => array(type => 'TS_TYPE', constraints => '', Desc => "end of work"), - "description" => array(type => 'VARCHAR', size => 120, constraints => '', Desc => "description"), - "invoice" => array(type => 'ID_TYPE', constraints => '', Desc => "id of invoice"), - "state" => array(type => 'ID_TYPE', constraints => '', Desc => "state of this object"), - "cph" => array(type => "float", constraints => '', Desc => "cost per hour for this work"), - "currency" => array(type => 'VARCHAR', size => 4, constraints => '', Desc => "currency for cph"), - "vtime" => array(type => 'TS_TYPE', constraints => '', Desc => "work date"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date"), + name => 'timetrack', + Desc => 'TUTOS timetrack', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'adr_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of worker'), + 'link_id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'id of worked object'), + 'volume' => array(type => 'float', constraints => '', Desc => 'work volume in hours'), + 'volume_todo' => array(type => 'float', constraints => '', Desc => 'work volume still to do in hours'), + 'distance' => array(type => 'float', constraints => '', Desc => 'distance travelled'), + 't_start' => array(type => 'TS_TYPE', constraints => '', Desc => 'start of work'), + 't_end' => array(type => 'TS_TYPE', constraints => '', Desc => 'end of work'), + 'description' => array(type => 'VARCHAR', size => 120, constraints => '', Desc => 'description'), + 'invoice' => array(type => 'ID_TYPE', constraints => '', Desc => 'id of invoice'), + 'state' => array(type => 'ID_TYPE', constraints => '', Desc => 'state of this object'), + 'cph' => array(type => 'float', constraints => '', Desc => 'cost per hour for this work'), + 'currency' => array(type => 'VARCHAR', size => 4, constraints => '', Desc => 'currency for cph'), + 'vtime' => array(type => 'TS_TYPE', constraints => '', Desc => 'work date'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'), ); $tableidx['timetrack1'] = array( - name => "timetrack_idx1", - table => "timetrack", - column => array("adr_id"), - Desc => "timetrack workers", + name => 'timetrack_idx1', + table => 'timetrack', + column => array('adr_id'), + Desc => 'timetrack workers', ); $tableidx['timetrack2'] = array( - name => "timetrack_idx2", - table => "timetrack", - column => array("link_id"), - Desc => "timetrack links", + name => 'timetrack_idx2', + table => 'timetrack', + column => array('link_id'), + Desc => 'timetrack links', ); $table['message'] = array( - name => "messages", - Desc => "TUTOS messages", + name => 'messages', + Desc => 'TUTOS messages', 'ts' => array(type => 'TS_TYPE', constraints => '', Desc => 'date'), 'message' => array(type => 'VARCHAR', size => 200, constraints => '', Desc => 'Info'), ); $table['database'] = array( - name => "tutos_dbs", - Desc => "TUTOS databases", - 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => "Object ID"), - 'name' => array(type => 'VARCHAR', size => 60, constraints => 'NN', Desc => "db name"), - "dbalias" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "db alias"), - "dbhost" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "db host or IP"), - "dbuser" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "db username"), - "dbpass" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "db password"), - "dbhome" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "db home (ORACLE)"), - "dbtype" => array(type => 'ID_TYPE', constraints => '', Desc => "db type (=vendor id)"), - "dbport" => array(type => 'ID_TYPE', constraints => '', Desc => "db port"), - "lastanalyze" => array(type => 'TS_TYPE', constraints => '', Desc => "time of last analyze or cleanup run"), - "repository" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "file repository"), - "last_date" => array(type => 'TS_TYPE', constraints => '', Desc => "date of last sync"), - "last_id" => array(type => 'ID_TYPE', constraints => '', Desc => "id when last synced"), - "version" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "version of table layout"), - "cryptpw" => array(type => 'ID_TYPE', constraints => '', Desc => "encrypt pw (0=no)"), - "prefix" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "prefix for all tables"), - 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => "creator ID"), - 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => "creation date"), - "logo" => array(type => 'VARCHAR', size => 90, constraints => '', Desc => "logo URL"), - "logolink" => array(type => 'VARCHAR', size => 90, constraints => '', Desc => "logo link URL"), - "bugautoname" => array(type => 'VARCHAR', size => 30, constraints => '', Desc => "name schema for bugs in this DB"), - "invautoname" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "name schema for invoices in this DB"), - "taskautoname" => array(type => 'VARCHAR', size => 50, constraints => '', Desc => "name schema for tasks in this DB"), - "vatlist" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "list of possible VAT rates"), - "systemid" => array(type => 'VARCHAR', size => 60, constraints => '', Desc => "a unique system id") + name => 'tutos_dbs', + Desc => 'TUTOS databases', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'name' => array(type => 'VARCHAR', size => 60, constraints => 'NN', Desc => 'db name'), + 'dbalias' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'db alias'), + 'dbhost' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'db host or IP'), + 'dbuser' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'db username'), + 'dbpass' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'db password'), + 'dbhome' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'db home (ORACLE)'), + 'dbtype' => array(type => 'ID_TYPE', constraints => '', Desc => 'db type (=vendor id)'), + 'dbport' => array(type => 'ID_TYPE', constraints => '', Desc => 'db port'), + 'lastanalyze' => array(type => 'TS_TYPE', constraints => '', Desc => 'time of last analyze or cleanup run'), + 'repository' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'file repository'), + 'last_date' => array(type => 'TS_TYPE', constraints => '', Desc => 'date of last sync'), + 'last_id' => array(type => 'ID_TYPE', constraints => '', Desc => 'id when last synced'), + 'version' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'version of table layout'), + 'cryptpw' => array(type => 'ID_TYPE', constraints => '', Desc => 'encrypt pw (0=no)'), + 'prefix' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'prefix for all tables'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'), + 'logo' => array(type => 'VARCHAR', size => 90, constraints => '', Desc => 'logo URL'), + 'logolink' => array(type => 'VARCHAR', size => 90, constraints => '', Desc => 'logo link URL'), + 'bugautoname' => array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'name schema for bugs in this DB'), + 'invautoname' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'name schema for invoices in this DB'), + 'taskautoname' => array(type => 'VARCHAR', size => 50, constraints => '', Desc => 'name schema for tasks in this DB'), + 'vatlist' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'list of possible VAT rates'), + 'systemid' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'a unique system id') ); $sequence['main'] = array( name => 'id', 'start' => 1000, - Desc => "main TUTOS sequencer", + Desc => 'main TUTOS sequencer', ); ?> Index: db.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/db/db.pinc,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- db.pinc 12 Dec 2008 13:30:47 -0000 1.20 +++ db.pinc 25 Feb 2009 19:16:36 -0000 1.21 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 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 |
From: Gero K. <gok...@us...> - 2009-02-25 19:17:15
|
Update of /cvsroot/tutos/tutos/php In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16332 Modified Files: Date.pinc base.pinc graph_bars.php handler.pinc mail.pinc modules.pinc webelements.p3 Log Message: updates Index: base.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/base.pinc,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- base.pinc 16 Feb 2009 18:44:55 -0000 1.112 +++ base.pinc 25 Feb 2009 19:16:29 -0000 1.113 @@ -131,10 +131,12 @@ if ( ! is_object($obj) ) return -1; if ( $obj->tablename == 'UNKNOWN' ) return -1; +# echo $id.' ?<br>'; if ( !isset($tutos['nohash']) && isset($g_hash[$id]) ) { # Hashed $g_hash['hits']++; $obj = &$g_hash[$id]; +# echo $obj.' *<br>'; return $obj; } if (!isset($obj->dbconn)) { @@ -144,6 +146,7 @@ $q = 'SELECT * from '. $obj->tablename .' WHERE id = '. $id; $r = $obj->dbconn->Exec($q); $n = $r->numrows(); +# echo $q.'<br>'; if ( 1 != $n) { $r->free(); return -1; @@ -201,6 +204,7 @@ $this->acl = array(); acl_read($this); $g_hash[$this->id] = &$this; +# echo $this.' #<br>'; return; } /** Index: webelements.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v retrieving revision 1.345 retrieving revision 1.346 diff -u -d -r1.345 -r1.346 --- webelements.p3 16 Feb 2009 20:03:56 -0000 1.345 +++ webelements.p3 25 Feb 2009 19:16:29 -0000 1.346 @@ -1485,7 +1485,7 @@ $g_hash[$id] = -1; } if (is_object($current_user) && ($current_user->id != $save_cu)) { - Fatal_Error('user escalation!','OLD:'.$save_cu.' -> '.$current_user); + Fatal_Error('user escalation!','OLD:'.$save_cu.' -> '.$current_user); } return $ref; } @@ -1748,6 +1748,16 @@ $text = eregi_replace("&#([0-9]{3,5});","&#\\1;",$text); return $text; } + /** + * convert text for pdf excel etc... + */ + function myiconv($text) { + global $lang; + if (isset($lang['target_enc'])) { + return iconv($lang['content_encoding'],$lang['target_enc'],$text); + } + return iconv($lang['content_encoding'],'ISO-8859-1',$text); + } /** * prepare a search pattern for reg expressions * i.e. escape everything that might be misinterpreted Index: Date.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v retrieving revision 1.128 retrieving revision 1.129 diff -u -d -r1.128 -r1.129 --- Date.pinc 14 Feb 2009 19:15:15 -0000 1.128 +++ Date.pinc 25 Feb 2009 19:16:23 -0000 1.129 @@ -10,7 +10,7 @@ * $Author$ */ -include_once 'adodb-time.inc.php'; +require_once 'adodb-time.inc.php'; /** * format a floating hour number Index: handler.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/handler.pinc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- handler.pinc 9 Jan 2009 14:17:01 -0000 1.6 +++ handler.pinc 25 Feb 2009 19:16:29 -0000 1.7 @@ -35,7 +35,7 @@ } } else { $msg .= $arg.'<br \> ('. $i .' handler not found)'; - } + } } return $msg; } Index: modules.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/modules.pinc,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- modules.pinc 18 Aug 2008 11:36:39 -0000 1.39 +++ modules.pinc 25 Feb 2009 19:16:29 -0000 1.40 @@ -25,6 +25,10 @@ # # +# State transition management +# +@include_once("stc/mconfig.pinc"); +# # The document management module # allows you to attach documents to objects # Author: Gero Kohnert Index: graph_bars.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/graph_bars.php,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- graph_bars.php 4 Jan 2009 18:54:04 -0000 1.30 +++ graph_bars.php 25 Feb 2009 19:16:29 -0000 1.31 @@ -1,6 +1,6 @@ <?php /* - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 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,16 +12,16 @@ */ - include "webelements.p3"; - include "permission.p3"; +require_once 'webelements.p3'; +require_once 'permission.p3'; - check_user(); - session_write_close(); - $dbconn->Close(); +check_user(); +session_write_close(); +$dbconn->Close(); - define ('GB_WIDTH',800); - define ('GB_HEIGHT',300); - define ('GB_BACKGROUND',300); +define ('GB_WIDTH',800); +define ('GB_HEIGHT',300); +define ('GB_BACKGROUND',300); function basic (&$f,&$t0,&$t1) { Header("Expires: 0"); @@ -109,7 +109,7 @@ $i++; } $graph = new PieGraph(GB_WIDTH,GB_HEIGHT); - $graph->SetBackGroundGradient('white'); + $graph->SetBackgroundGradient('white','silver',GRAD_HOR,BGRAD_PLOT); if( function_exists('imageantialias') ) { $graph->img->SetAntiAliasing(); } @@ -133,7 +133,8 @@ global $font; $graph = new Graph(GB_WIDTH,GB_HEIGHT); - $graph->SetBackGroundGradient('white'); + $graph->SetBackgroundGradient('white','silver',GRAD_HOR,BGRAD_PLOT); + $graph->SetMarginColor("white"); if( function_exists('imageantialias') ) { $graph->img->SetAntiAliasing(); Index: mail.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/mail.pinc,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- mail.pinc 15 Feb 2009 19:17:56 -0000 1.94 +++ mail.pinc 25 Feb 2009 19:16:29 -0000 1.95 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 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,7 +12,7 @@ * $Author$ */ -include_once 'i18n.php'; +require_once 'i18n.php'; /** * a mail body part including a parser */ |
From: Gero K. <gok...@us...> - 2009-02-25 19:16:47
|
Update of /cvsroot/tutos/tutos/php/localization In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16332/localization Modified Files: de.p3 en.p3 fr.p3 it.p3 Log Message: updates Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- fr.p3 29 Jan 2008 20:02:49 -0000 1.65 +++ fr.p3 25 Feb 2009 19:16:39 -0000 1.66 @@ -11,6 +11,7 @@ # # $lang['content_encoding'] = 'utf-8'; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'fr_FR'); # # French Texts Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- en.p3 29 Jan 2008 20:02:49 -0000 1.74 +++ en.p3 25 Feb 2009 19:16:38 -0000 1.75 @@ -14,6 +14,7 @@ * ======================================================= */ $lang['content_encoding'] = "utf-8"; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'en_GB'); # # English Texts Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- it.p3 29 Jan 2008 20:02:50 -0000 1.64 +++ it.p3 25 Feb 2009 19:16:40 -0000 1.65 @@ -9,6 +9,7 @@ # ======================================================= # $lang['content_encoding'] = "utf-8"; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'it_IT'); # # Testi in Italiano Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- de.p3 3 Aug 2008 13:22:12 -0000 1.77 +++ de.p3 25 Feb 2009 19:16:37 -0000 1.78 @@ -14,6 +14,7 @@ * ======================================================= */ $lang['content_encoding'] = 'utf-8'; +$lang['target_enc'] = 'ISO-8859-1'; //for pdf , excel etc setlocale(LC_TIME,'de_DE'); # # German Texts |
From: Gero K. <gok...@us...> - 2009-02-25 19:16:47
|
Update of /cvsroot/tutos/tutos/php/note In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16332/note Modified Files: note_show.php Log Message: updates Index: note_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/note_show.php,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- note_show.php 7 Jul 2008 14:04:53 -0000 1.38 +++ note_show.php 25 Feb 2009 19:16:40 -0000 1.39 @@ -10,22 +10,22 @@ * @module note_show * @package note */ - $tutos['base'] = "../.."; - ini_set("include_path",".."); - include_once 'webelements.p3'; - include_once 'permission.p3'; +$tutos['base'] = "../.."; +ini_set("include_path",".."); +require_once 'webelements.p3'; +require_once 'permission.p3'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules('note','show'); - loadmodule('note'); - loadlayout(); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('note','show'); +loadmodule('note'); +loadlayout(); - /** - * display a note - */ - class note_show extends layout { +/** + * display a note + */ +class Note_show extends layout { /** * */ @@ -134,9 +134,9 @@ } } - $l = new note_show($current_user); - $l->display(); - $dbconn->Close(); +$l = new Note_show($current_user); +$l->display(); +$dbconn->Close(); ?> <!-- CVS Info: $Id$ |
From: Gero K. <gok...@us...> - 2009-02-25 19:16:47
|
Update of /cvsroot/tutos/tutos/php/url In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16332/url Modified Files: url_new.php Log Message: updates Index: url_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/url/url_new.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- url_new.php 16 Feb 2009 20:03:57 -0000 1.23 +++ url_new.php 25 Feb 2009 19:16:40 -0000 1.24 @@ -26,7 +26,7 @@ /** * change/modify a url */ -class url_new extends layout { +class Url_new extends layout { /** * display the form */ @@ -154,7 +154,7 @@ } } -$l = new url_new($current_user); +$l = new Url_new($current_user); $l->display(); $dbconn->Close(); ?> |
From: Gero K. <gok...@us...> - 2009-02-25 19:16:45
|
Update of /cvsroot/tutos/tutos/php/report-engine/rep_prod_excel In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16332/report-engine/rep_prod_excel Modified Files: rep_prod_excel.pinc Log Message: updates Index: rep_prod_excel.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/report-engine/rep_prod_excel/rep_prod_excel.pinc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rep_prod_excel.pinc 2 Feb 2009 15:33:59 -0000 1.5 +++ rep_prod_excel.pinc 25 Feb 2009 19:16:40 -0000 1.6 @@ -17,7 +17,6 @@ function new_sheet(&$wb,$id,$title) { global $lang; - $target_enc = 'ISO-8859-1'; $this->ws[$id] =& $wb->add_worksheet($title); $this->ws[$id]->set_landscape(); $this->ws[$id]->set_header('report'); @@ -29,11 +28,11 @@ $this->ws[$id]->set_column(2,2,12); $this->ws[$id]->set_column(3,3,25); $this->ws[$id]->set_column(4,4,25); - $this->ws[$id]->write_string($row,$col++, iconv($lang['content_encoding'],$target_enc,$lang['ProdName']),$this->format1); - $this->ws[$id]->write_string($row,$col++, iconv($lang['content_encoding'],$target_enc,$lang['ProdDesc']),$this->format1); - $this->ws[$id]->write_string($row,$col++, iconv($lang['content_encoding'],$target_enc,$lang['ProdState']),$this->format1); - $this->ws[$id]->write_string($row,$col++, iconv($lang['content_encoding'],$target_enc,$lang['ProdRole'][PROD_ROLE_MANAGER]),$this->format1); - $this->ws[$id]->write_string($row,$col++, iconv($lang['content_encoding'],$target_enc,$lang['ProdRole'][PROD_ROLE_SALES]),$this->format1); + $this->ws[$id]->write_string($row,$col++, myiconv($lang['ProdName']),$this->format1); + $this->ws[$id]->write_string($row,$col++, myiconv($lang['ProdDesc']),$this->format1); + $this->ws[$id]->write_string($row,$col++, myiconv($lang['ProdState']),$this->format1); + $this->ws[$id]->write_string($row,$col++, myiconv($lang['ProdRole'][PROD_ROLE_MANAGER]),$this->format1); + $this->ws[$id]->write_string($row,$col++, myiconv($lang['ProdRole'][PROD_ROLE_SALES]),$this->format1); $row = 100; $col = 0; @@ -65,8 +64,6 @@ header("Cache-Control: must-revalidate, post-check=0,pre-check=0"); header("Pragma: public"); - $target_enc = 'ISO-8859-1'; - $tmpname = tempnam ($tutos[sessionpath], "report"); $workbook = new Workbook($tmpname); @@ -108,27 +105,27 @@ } # &\"Arial,Bold\"&14 &A Sheet\n&\"Arial,Regular\"&12New Line - $this->ws[$id]->write_string($row[$id],$c++,iconv($lang['content_encoding'],$target_enc,$p->getFullName()) ,$this->format2); + $this->ws[$id]->write_string($row[$id],$c++,myiconv($p->getFullName()) ,$this->format2); - $this->ws[$id]->write_string($row[$id],$c,iconv($lang['content_encoding'],$target_enc,$p->description) ,$this->format2); - $this->ws[$id]->write_note($row[$id],$c,iconv($lang['content_encoding'],$target_enc,$p->desc1."\r\n\r\n".$p->desc2) ); + $this->ws[$id]->write_string($row[$id],$c,myiconv($p->description) ,$this->format2); + $this->ws[$id]->write_note($row[$id],$c,myiconv($p->desc1."\r\n\r\n".$p->desc2) ); $c++; - $this->ws[$id]->write_string($row[$id],$c++,iconv($lang['content_encoding'],$target_enc,$lang['ProdStates'][$p->state]),$this->format2); + $this->ws[$id]->write_string($row[$id],$c++,myiconv($lang['ProdStates'][$p->state]),$this->format2); $sep = ""; $txt = ""; foreach ( $p->role[PROD_ROLE_MANAGER] as $i => $j) { $txt .= $sep.$j->getFullName(); $sep = " ,\r\n"; } - $this->ws[$id]->write_string($row[$id],$c++,iconv($lang['content_encoding'],$target_enc,$txt) ,$this->format2); + $this->ws[$id]->write_string($row[$id],$c++,myiconv($txt) ,$this->format2); $sep = ""; $txt = ""; foreach ( $p->role[PROD_ROLE_SALES] as $i => $j) { $txt .= $sep.$j->getFullName(); $sep = " ,\r\n"; } - $this->ws[$id]->write_string($row[$id],$c++,iconv($lang['content_encoding'],$target_enc,$txt) ,$this->format2); + $this->ws[$id]->write_string($row[$id],$c++,myiconv($txt) ,$this->format2); $row[$id]++; $x++; |
Update of /cvsroot/tutos/tutos/php/bugtracking In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16292/bugtracking Modified Files: bug.pinc bug_config.php bug_ins.php bug_new.php bug_show.php de.p3 en.p3 mtable.pinc Log Message: use new state transition control STC Index: bug.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- bug.pinc 19 Feb 2009 09:14:56 -0000 1.70 +++ bug.pinc 25 Feb 2009 19:16:08 -0000 1.71 @@ -305,10 +305,10 @@ // if we are looking on unknown stuff if (!isset($lang['BugClasses'][$this->class])) { - $lang['BugClasses'][$this->class] = '? class'. $this->class .'?'; + $lang['BugClasses'][$this->class] = '? BugClass'. $this->class .' ?'; } if (!isset($lang['BugStates'][$this->state])) { - $lang['BugStates'][$this->state] = '? state'. $this->state .'?'; + $lang['BugStates'][$this->state] = '? BugState'. $this->state .' ?'; } $this->solvedate = $r->getDateTime($pos, "solvedate"); @@ -436,12 +436,22 @@ * get current state of this bug (default) as HTML */ function getState ($s = "") { - global $lang; + global $tutos,$lang; - if ( ! empty($s) ) { - return '<span class="bugstate'. $s .'">'. $lang['BugStates'][$s] ."</span>"; - } - return '<span class="bugstate'. $this->state .'">'. $lang['BugStates'][$this->state] ."</span>"; + $r = ''; + if ( empty($s) ) { + $s = $this->state; + } + $r .= '<span class="bugstate'. $s .'">'; + + $stc = getObject($this->dbconn,$tutos['bug_state_stc']); + if (is_object($stc)) { + $r .= $stc->getState($s); + } else { + $r .= stc::getNoSTCState($s,'BugStates'); + } + $r .= '</span>'; + return $r; } /** * get current medium of this bug (default) as HTML @@ -457,12 +467,22 @@ } return ''; } - /** --------------------------------------------------------------------------- + /** + * create a select list with possible states */ function askState () { - $r = BugAskState($this->state,false); - return $r; + global $tutos; + + $r = ''; + $stc = getObject($this->dbconn,$tutos['bug_state_stc']); + if (is_object($stc)) { + $r .= $stc->getStateSelection($this->state,'state'); + } else { + $r .= stc::getNoSTCStateSelection($this->state,'state','BugStates',$this->c_state); + } + return $r; } + function askMedium () { $r = BugAskMedium($this->medium,false); return $r; Index: bug_config.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_config.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- bug_config.php 9 Jan 2009 14:17:01 -0000 1.4 +++ bug_config.php 25 Feb 2009 19:16:10 -0000 1.5 @@ -12,8 +12,8 @@ $tutos['base'] = "../.."; ini_set("include_path",".."); -include 'webelements.p3'; -include 'permission.p3'; +require_once 'webelements.p3'; +require_once 'permission.p3'; check_user(); loadmodules('bugtracking','config'); @@ -64,6 +64,19 @@ echo '<td colspan="2" class="pre"><pre>'.$lang['BugConfigHelpDelete'].'</pre></td>'; echo $this->OverviewRowEnd($line++); + echo $this->OverviewRowStart($line); + echo $this->showfield('bug_state_stc'); + echo '<td><select name="state_stc">'; + echo ' <option value="-1"'.($tutos['bug_state_stc'] == -1 ? ' selected="selected"':'').'>'.$lang['no'].'</option>'; + stc::getListByLangArray($this,'BugStates'); + foreach($this->stcs as $j) { + echo '<option value="'.$j->id.'"'.($tutos['bug_state_stc'] == $j->id ? ' selected="selected"':'').'>'.$j->getLink().'</option>'; + } + echo '</select>'; + echo '<br />'.makelink('stc/stc_new.php?lgarr=BugStates','Create a new STC'); + echo '</td>'; + echo '<td colspan="2" class="pre"><pre>'.$lang['BugConfigHelpStateSTC'].'</pre></td>'; + echo $this->OverviewRowEnd($line++); echo '<tr>'; echo submit_reset(0,1,1,1,1,0); @@ -83,10 +96,11 @@ $this->name = $lang['BugConfig']; # default - if (!isset($tutos['bug_long_pop'])) $tutos['bug_long_pop'] = 0; - if (!isset($tutos['bug_remember'])) $tutos['bug_remember'] = 0; - if (!isset($tutos['bug_autoname'])) $tutos['bug_autoname'] = '%Y-%m-&X-&Y'; - if (!isset($tutos['bug_delete'])) $tutos['bug_delete'] = 1; + if (!isset($tutos['bug_long_pop'])) $tutos['bug_long_pop'] = 0; + if (!isset($tutos['bug_remember'])) $tutos['bug_remember'] = 0; + if (!isset($tutos['bug_autoname'])) $tutos['bug_autoname'] = '%Y-%m-&X-&Y'; + if (!isset($tutos['bug_delete'])) $tutos['bug_delete'] = 1; + if (!isset($tutos['bug_state_stc'])) $tutos['bug_state_stc'] = -1; if ( ! $this->user->isAdmin() ) { $msg .= $this->error("Only admins are allowed to see this"); @@ -102,6 +116,8 @@ write_config_value($this->dbconn,'bug_autoname','bugtracking'); $tutos['bug_delete'] = $_REQUEST['delete']; write_config_value($this->dbconn,'bug_delete','bugtracking'); + $tutos['bug_state_stc'] = $_REQUEST['state_stc']; + write_config_value($this->dbconn,'bug_state_stc','bugtracking'); $msg .= ' saving done '; } } Index: bug_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- bug_new.php 22 Dec 2008 10:49:01 -0000 1.32 +++ bug_new.php 25 Feb 2009 19:16:10 -0000 1.33 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -10,24 +10,24 @@ * @module bug_new * @package bug */ - $tutos['base'] = "../.."; - ini_set("include_path",".."); - include_once 'webelements.p3'; - include_once 'permission.p3'; - include_once 'bug.pinc'; - include_once 'product.pinc'; - include_once 'task.pinc'; +$tutos['base'] = "../.."; +ini_set("include_path",".."); +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'bug.pinc'; +require_once 'product.pinc'; +require_once 'task.pinc'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules('bugtracking','new'); - loadmodule('bugtracking'); - loadlayout(); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('bugtracking','new'); +loadmodule('bugtracking'); +loadlayout(); - /** - * change/modify a bug - */ - class bug_new extends layout { +/** + * change/modify a bug + */ +class Bug_new extends layout { /** * display the form */ @@ -336,11 +336,11 @@ add_module_newlinks($this,$this->obj); } - } +} - $l = new bug_new($current_user); - $l->display(); - $dbconn->Close(); +$l = new Bug_new($current_user); +$l->display(); +$dbconn->Close(); ?> <!-- CVS Info: $Id$ Index: mtable.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/mtable.pinc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mtable.pinc 21 Oct 2006 18:15:13 -0000 1.6 +++ mtable.pinc 25 Feb 2009 19:16:11 -0000 1.7 @@ -1,6 +1,6 @@ <?php /* - * Copyright 2003 - 2006 by Gero Kohnert + * Copyright 2003 - 2009 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -13,65 +13,65 @@ */ -$table['bug'][name] = "bugs"; -$table['bug'][Desc] = "TUTOS bugs"; -$table['bug']['id'] = array(type => "ID_TYPE", constraints => "PK", Desc => "Object ID"); -$table['bug']['name'] = array(type => "VARCHAR", size => 30, constraints => "", Desc => "Bug Display Name"); -$table['bug']['short'] = array(type => "VARCHAR", size => 40, constraints => "", Desc => "short description"); -$table['bug']['description'] = array(type => "TX_TYPE", constraints => "", Desc => "long description"); -$table['bug']['product_id'] = array(type => "ID_TYPE", constraints => "NN", Desc => "object with bug"); -$table['bug']['class'] = array(type => "ID_TYPE", constraints => "NN", Desc => "class of bug"); -$table['bug']['state'] = array(type => "ID_TYPE", constraints => "NN", Desc => "state of bug"); -$table['bug']['solver'] = array(type => "ID_TYPE", constraints => "", Desc => "solver ID"); -$table['bug']['solvedate'] = array(type => "TS_TYPE", constraints => "", Desc => "solve date"); -$table['bug']['plandate'] = array(type => "TS_TYPE", constraints => "", Desc => "planned solve date"); -$table['bug']['reporter'] = array(type => "ID_TYPE", constraints => "", Desc => "reporter ID"); -$table['bug']['medium'] = array(type => "ID_TYPE", constraints => "", Desc => "how the bug was reported"); -$table['bug']['creator'] = array(type => "ID_TYPE", constraints => "", Desc => "creator ID"); -$table['bug']['creation'] = array(type => "TS_TYPE", constraints => "", Desc => "creation date"); +$table['bug'][name] = 'bugs'; +$table['bug'][Desc] = 'TUTOS bugs'; +$table['bug']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'); +$table['bug']['name'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'Bug Display Name'); +$table['bug']['short'] = array(type => 'VARCHAR', size => 40, constraints => '', Desc => 'short description'); +$table['bug']['description'] = array(type => 'TX_TYPE', constraints => '', Desc => 'long description'); +$table['bug']['product_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'object with bug'); +$table['bug']['class'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'class of bug'); +$table['bug']['state'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'state of bug'); +$table['bug']['solver'] = array(type => 'ID_TYPE', constraints => '', Desc => 'solver ID'); +$table['bug']['solvedate'] = array(type => 'TS_TYPE', constraints => '', Desc => 'solve date'); +$table['bug']['plandate'] = array(type => 'TS_TYPE', constraints => '', Desc => 'planned solve date'); +$table['bug']['reporter'] = array(type => 'ID_TYPE', constraints => '', Desc => 'reporter ID'); +$table['bug']['medium'] = array(type => 'ID_TYPE', constraints => '', Desc => 'how the bug was reported'); +$table['bug']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); +$table['bug']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); $tableidx['bug11'] = array( - name => "bug_idx1", - table => "bugs", - column => array("product_id"), - Desc => "objects with bugs", + name => 'bug_idx1', + table => 'bugs', + column => array('product_id'), + Desc => 'objects with bugs', ); $table['bug2'] = array( - name => "bugremember", - Desc => "TUTOS bugremember", - "id" => array(type => "ID_TYPE", constraints => "NN", Desc => "bug ID"), - "r_time" => array(type => "TS_TYPE", constraints => "NN", Desc => "last remember") + name => 'bugremember', + Desc => 'TUTOS bugremember', + 'id' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'bug ID'), + 'r_time' => array(type => 'TS_TYPE', constraints => 'NN', Desc => 'last remember') ); $tableidx['bug21'] = array( - name => "bug_re_id", - table => "bugremember", - column => array("id"), - Desc => "rememberd bug ids", + name => 'bug_re_id', + table => 'bugremember', + column => array('id'), + Desc => 'rememberd bug ids', ); $table['bug3'] = array( - name => "bugchanges", - Desc => "TUTOS bugs changehistory", - "id" => array(type => "ID_TYPE", constraints => "PK", Desc => "Object ID"), - "bugid" => array(type => "ID_TYPE", constraints => "NN", Desc => "Bug ID"), - "description" => array(type => "TX_TYPE", constraints => "", Desc => "long description"), - "creator" => array(type => "ID_TYPE", constraints => "", Desc => "creator ID"), - "creation" => array(type => "TS_TYPE", constraints => "", Desc => "creation date") + name => 'bugchanges', + Desc => 'TUTOS bugs changehistory', + 'id' => array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'), + 'bugid' => array(type => 'ID_TYPE', constraints => 'NN', Desc => 'Bug ID'), + 'description' => array(type => 'TX_TYPE', constraints => '', Desc => 'long description'), + 'creator' => array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'), + 'creation' => array(type => 'TS_TYPE', constraints => '', Desc => 'creation date') ); $tableidx['bug31'] = array( - name => "bug_hist_id", - table => "bugchanges", - column => array("bugid"), - Desc => "bug history", + name => 'bug_hist_id', + table => 'bugchanges', + column => array('bugid'), + Desc => 'bug history', ); $sequence['bugname'] = array( - name => "bugname", + name => 'bugname', 'start' => 1, - Desc => "TUTOS bug sequencer", + Desc => 'TUTOS bug sequencer', ); ?> \ No newline at end of file Index: bug_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- bug_show.php 17 Jul 2008 14:50:49 -0000 1.25 +++ bug_show.php 25 Feb 2009 19:16:10 -0000 1.26 @@ -10,25 +10,25 @@ * @module bug_show * @package bug */ - $tutos['base'] = "../.."; - ini_set("include_path",".."); - include_once 'webelements.p3'; - include_once 'permission.p3'; - include_once 'product.pinc'; - include_once 'task.pinc'; - include_once 'bug.pinc'; - include_once 'timetrack.pinc'; +$tutos['base'] = "../.."; +ini_set("include_path",".."); +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'product.pinc'; +require_once 'task.pinc'; +require_once 'bug.pinc'; +require_once 'timetrack.pinc'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules('bugtracking','show'); - loadmodule('bugtracking'); - loadlayout(); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('bugtracking','show'); +loadmodule('bugtracking'); +loadlayout(); - /** - * display a bug - */ - class bug_show extends layout { +/** + * display a bug + */ +class Bug_show extends layout { /** * the data display part */ @@ -196,12 +196,12 @@ # add this page to the browsehistory of the users session $this->addtohistory(); } - } +} - $l = new bug_show($current_user); - $l->display(); +$l = new Bug_show($current_user); +$l->display(); - $dbconn->Close(); +$dbconn->Close(); ?> <!-- CVS Info: $Id$ Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/en.p3,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- en.p3 23 Dec 2008 15:30:58 -0000 1.9 +++ en.p3 25 Feb 2009 19:16:11 -0000 1.10 @@ -100,6 +100,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Active State Transition Control model"; $lang['perm'][usebugtracking] = "use bugtracking"; $lang['bug'] = &$lang['Bug']; Index: bug_ins.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- bug_ins.php 10 Jul 2008 15:43:36 -0000 1.24 +++ bug_ins.php 25 Feb 2009 19:16:10 -0000 1.25 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -13,26 +13,26 @@ * @module bug_ins * @package bug */ - $tutos['base'] = "../.."; - ini_set("include_path",".."); - include_once 'webelements.p3'; - include_once 'permission.p3'; - include_once 'appointment.pinc'; - include_once 'location.pinc'; - include_once 'product.pinc'; - include_once 'task.pinc'; - include_once 'timetrack.pinc'; - include_once 'mail.pinc'; +$tutos['base'] = "../.."; +ini_set("include_path",".."); +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'appointment.pinc'; +require_once 'location.pinc'; +require_once 'product.pinc'; +require_once 'task.pinc'; +require_once 'timetrack.pinc'; +require_once 'mail.pinc'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules('bugtracking','new'); - loadmodule('bugtracking'); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('bugtracking','new'); +loadmodule('bugtracking'); - $gotourl = "bug_new.php"; - $msg = ""; +$gotourl = 'bug_new.php'; +$msg = ''; $b = new bug($dbconn); if ( isset($_POST['id']) ) { Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/bugtracking/de.p3,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- de.p3 14 Dec 2008 16:22:53 -0000 1.11 +++ de.p3 25 Feb 2009 19:16:11 -0000 1.12 @@ -105,6 +105,7 @@ 0 = disabled (default) Other values = Minutes before mail is sent (via check.php and crontab)"; $lang['BugConfigHelpDelete'] = "Allow deletion of bugs"; +$lang['BugConfigHelpStateSTC'] = "Das aktive State Transition Control model"; $lang['perm'][usebugtracking] = "Fehlermanagement"; $lang['bug'] = &$lang['Bug']; |
From: Gero K. <gok...@us...> - 2009-02-25 19:14:05
|
Update of /cvsroot/tutos/tutos/php In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16163 Modified Files: timetrack.pinc timetrack_new.php timetrack_overview.php task_show.php task_new.php product.pinc product_show.php product_new.php Added Files: main_config.php Log Message: use new state transition control STC Index: product_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/product_show.php,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- product_show.php 9 Jan 2009 14:17:01 -0000 1.120 +++ product_show.php 25 Feb 2009 19:13:54 -0000 1.121 @@ -90,7 +90,7 @@ echo "<tr>\n"; echo $this->showfield($lang['ProdState']); - echo $this->showdata($lang['ProdStates'][$this->obj->state],1); + echo $this->showdata($this->obj->getState(),1); if ( (($this->obj->state == 0) || ($this->obj->state == 5) || ($this->obj->state == 4)) && ( $this->obj->probability != "" ) ) { echo $this->showfield($lang['ProdProb']); echo $this->showdata($this->obj->probability ."%",1); Index: task_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_new.php,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- task_new.php 14 Feb 2009 19:15:15 -0000 1.85 +++ task_new.php 25 Feb 2009 19:13:54 -0000 1.86 @@ -68,7 +68,7 @@ echo " <td><input id=\"name\" size=\"". min($table['task']['name'][size],40) ."\" maxlength=\"". $table['task']['name'][size] ."\" name=\"name\" value=\"". myentities($this->obj->name) ."\" /></td>\n"; echo $this->showfieldc($lang['TaskState'],0,"state"); echo " <td>\n"; - echo SelectLangArray('state','TaskStates',$this->obj->state); + echo $this->obj->askState(); echo " </td>\n"; echo " </tr>\n"; Index: product_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/product_new.php,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- product_new.php 9 Jan 2009 14:17:01 -0000 1.108 +++ product_new.php 25 Feb 2009 19:13:54 -0000 1.109 @@ -60,8 +60,7 @@ echo $this->showfieldc($lang['ProdVersion'],0,"version"); echo ' <td colspan="4"><input id="version" size="'. min($table['product']['version'][size],20) .'" maxlength="'. $table['product']['version'][size] ."\" name=\"version\" value=\"". myentities($this->obj->version) ."\" />\n"; echo " <span class=\"desc\">". $lang['ProdState'] ."</span> \n"; - - echo SelectLangArray('state','ProdStates',$this->obj->state); + echo $this->obj->askState(); echo " <span class=\"desc\">". $lang['ProdProb'] ."</span> \n"; echo '<input id="prob" size="3" maxlength="3" name="prob" value="'. number_format($this->obj->probability,0,$lang['DecPoint'],$lang['ThousandPoint']) ."\" /> %\n"; echo " </td>\n"; Index: timetrack_overview.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- timetrack_overview.php 14 Feb 2009 19:15:15 -0000 1.109 +++ timetrack_overview.php 25 Feb 2009 19:13:53 -0000 1.110 @@ -55,7 +55,7 @@ return; } else if ($this->format == "excel") { include_once 'excel.pinc'; - $target_enc = 'ISO-8859-1'; + $this->excel = new tutos_excel(); $this->excel->open(); $this->excel->add_formats(); @@ -69,34 +69,34 @@ $this->excel->ws[$ws]->write_string($x,$c++, "#",$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,25);# Name - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['TimetrackWorker']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['TimetrackWorker']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,20);# Volume - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],'ISO-8859-1',$lang['TimetrackBooked']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['TimetrackBooked']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,20);# CPH - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],'ISO-8859-1',$lang['TTcph']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['TTcph']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,25);# Sum $this->excel->ws[$ws]->write_string($x,$c++, "Sum",$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,15);# Currency - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['Currency']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['Currency']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,15);# Distance - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['Distance']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['Distance']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,50);# DESC - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['Description']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['Description']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,25);# Day - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['atDateTime']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['atDateTime']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,45);# Referenz - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc, $lang['TimetrackRef']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['TimetrackRef']),$this->excel->format_header); $this->excel->ws[$ws]->set_column($c,$c,45);# MainObject - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,"0-".$lang['TimetrackRef']),$this->excel->format_header); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv("0-".$lang['TimetrackRef']),$this->excel->format_header); $x++; $cnt = 0; @@ -106,26 +106,26 @@ $c = 0; $this->excel->ws[$ws]->write_number($x,$c++, $a->id,$this->excel->format_default); - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$a->worker->getFullName()),$this->excel->format_default); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($a->worker->getFullName()),$this->excel->format_default); $this->excel->ws[$ws]->write_number($x,$c++, $a->volume,$this->excel->format_default); $this->excel->ws[$ws]->write_number($x,$c++, $a->cph,$this->excel->format_default); $this->excel->ws[$ws]->write_number($x,$c++, $a->cph * $a->volume,$this->excel->format_default); - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$a->currency),$this->excel->format_default); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($a->currency),$this->excel->format_default); $this->excel->ws[$ws]->write_number($x,$c++, $a->distance,$this->excel->format_default); - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$a->desc),$this->excel->format_default); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($a->desc),$this->excel->format_default); $this->excel->ws[$ws]->write_string($x,$c++, $a->wday->getDate(),$this->excel->format_default); if ( ! is_object($a->ref) ) { - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['HistoryDeleted']),$this->excel->format_default); - $this->excel->ws[$ws]->write_string($x,$c++, iconv($lang['content_encoding'],$target_enc,$lang['HistoryDeleted']),$this->excel->format_default); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['HistoryDeleted']),$this->excel->format_default); + $this->excel->ws[$ws]->write_string($x,$c++, myiconv($lang['HistoryDeleted']),$this->excel->format_default); } else { $pre = ""; - $name = iconv($lang['content_encoding'],$target_enc,$a->ref->getFullName()); + $name = myiconv($a->ref->getFullName()); $this->excel->ws[$ws]->write_string($x,$c++, $name,$this->excel->format_default); if ($a->ref->getType() == "task") { $p = $a->ref->parent; if( !is_object($p) ) unset($p); while ( isset ( $p ) ) { - $name = iconv($lang['content_encoding'],$target_enc,$p->getFullName()); + $name = myiconv($p->getFullName()); if (isset($p->parent) && is_object($p->parent)) { $p = $p->parent; } else { @@ -244,7 +244,7 @@ echo " </td>\n"; } echo " <td>". myentities($tt->desc) ." </td>\n"; - echo " <td>". $lang['TTStates'][$tt->state] ."</td>\n"; + echo " <td>". $tt->getState() ."</td>\n"; $x= array($tt->cph * $tt->volume,$tt->currency); echo " <td align=\"right\">". handle('money',$x,number_format($tt->cph * $tt->volume,2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". myentities($tt->currency)) ."</td>\n"; --- NEW FILE: main_config.php --- <?php /** * Copyright 1999 - 2009 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 * Free Software Foundation; version 2 of the License. * * CVS Info: $Id: main_config.php,v 1.1 2009/02/25 19:13:52 gokohnert Exp $ * $Author: gokohnert $ */ require_once 'webelements.p3'; require_once 'permission.p3'; check_user(); loadmodule('stc'); loadlayout(); /** * display a admin page */ class Main_config extends layout { function info() { global $lang,$table,$tutos; echo "<form id=\"mainconfig\" name=\"mainconfig\" action=\"main_config.php\" method=\"post\">\n"; echo $this->DataTableStart(); $line = 0; // PRODUCT STATE echo $this->OverviewRowStart($line); echo $this->showfield('prod_state_stc'); echo '<td><select name="prod_state_stc">'; echo ' <option value="-1"'.($tutos['prod_state_stc'] == -1 ? ' selected="selected"':'').'>'.$lang['no'].'</option>'; stc::getListByLangArray($this,'ProdStates'); foreach($this->stcs as $j) { echo '<option value="'.$j->id.'"'.($tutos['prod_state_stc'] == $j->id ? ' selected="selected"':'').'>'.$j->getLink().'</option>'; } echo '</select>'; echo '<br />'.makelink('stc/stc_new.php?lgarr=ProdStates','Create a new STC'); echo '</td>'; echo '<td colspan="2" class="pre"><pre>'.$lang['ConfigHelpProdStateSTC'].'</pre></td>'; echo $this->OverviewRowEnd($line++); // TASK STATE echo $this->OverviewRowStart($line); echo $this->showfield('task_state_stc'); echo '<td><select name="task_state_stc">'; echo ' <option value="-1"'.($tutos['task_state_stc'] == -1 ? ' selected="selected"':'').'>'.$lang['no'].'</option>'; stc::getListByLangArray($this,'TaskStates'); foreach($this->stcs as $j) { echo '<option value="'.$j->id.'"'.($tutos['task_state_stc'] == $j->id ? ' selected="selected"':'').'>'.$j->getLink().'</option>'; } echo '</select>'; echo '<br />'.makelink('stc/stc_new.php?lgarr=TaskStates','Create a new STC'); echo '</td>'; echo '<td colspan="2" class="pre"><pre>'.$lang['ConfigHelpTaskStateSTC'].'</pre></td>'; echo $this->OverviewRowEnd($line++); // TIMETRACK STATE echo $this->OverviewRowStart($line); echo $this->showfield('timetrack_state_stc'); echo '<td><select name="timetrack_state_stc">'; echo ' <option value="-1"'.($tutos['timetrack_state_stc'] == -1 ? ' selected="selected"':'').'>'.$lang['no'].'</option>'; stc::getListByLangArray($this,'TTStates'); foreach($this->stcs as $j) { echo '<option value="'.$j->id.'"'.($tutos['timetrack_state_stc'] == $j->id ? ' selected="selected"':'').'>'.$j->getLink().'</option>'; } echo '</select>'; echo '<br />'.makelink('stc/stc_new.php?lgarr=TTStates','Create a new STC'); echo '</td>'; echo '<td colspan="2" class="pre"><pre>'.$lang['ConfigHelpTTStateSTC'].'</pre></td>'; echo $this->OverviewRowEnd($line++); echo '<tr>'; echo submit_reset(0,1,1,1,1,0); echo '</tr>'; echo $this->DataTableEnd(); $this->addHidden("save", 1); echo hiddenFormElements(); echo $this->getHidden(); echo "</form>\n"; } function navigate() { } function prepare() { global $lang,$msg,$tutos; $this->name = $lang['MainConfig']; # default if (!isset($tutos['prod_state_stc'])) $tutos['prod_state_stc'] = -1; if ( ! $this->user->isAdmin() ) { $msg .= $this->error("Only admins are allowed to see this"); $this->stop = true; return; } if (isset($_REQUEST['save']) && ($_REQUEST['save'] == 1) ) { $tutos['prod_state_stc'] = $_REQUEST['prod_state_stc']; write_config_value($this->dbconn,'prod_state_stc','product'); $msg .= ' saving done '; } } } $l = new Main_config($current_user); $l->display(); $dbconn->close(); ?> <!-- CVS Info: $Id: main_config.php,v 1.1 2009/02/25 19:13:52 gokohnert Exp $ $Author: gokohnert $ --> Index: timetrack_new.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- timetrack_new.php 9 Jan 2009 14:17:01 -0000 1.80 +++ timetrack_new.php 25 Feb 2009 19:13:53 -0000 1.81 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 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 @@ -152,11 +152,9 @@ echo Currency_Select("currency",$this->obj->currency); echo "</td>\n"; echo $this->showfieldc($lang['TTState'],1,"state"); - echo " <td colspan=\"1\"><select id=\"state\" name=\"state\">\n"; - foreach($lang['TTStates'] as $s => $x) { - echo ' <option value="'. $s .'"'. ($this->obj->state == $s ? ' selected="selected"':'') .">". $lang['TTStates'][$s] ."</option>\n"; - } - echo "</select></td>\n"; + echo " <td colspan=\"1\">\n"; + echo $this->obj->askState(); + echo "</td>\n"; echo " <td colspan=\"2\"> </td>\n"; echo "</tr>\n"; } @@ -330,6 +328,7 @@ if ( class_exists ("rate") ) { rate::obj_read($this->obj); } + $this->addtohistory(); } } Index: product.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/product.pinc,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- product.pinc 19 Feb 2009 09:14:52 -0000 1.169 +++ product.pinc 25 Feb 2009 19:13:54 -0000 1.170 @@ -581,6 +581,42 @@ return $this->setIntField("state",$value,"ProdState"); } /** + * get current state of this product as HTML + */ + function getState ($s = "") { + global $tutos,$lang; + + $r = ''; + if ( empty($s) ) { + $s = $this->state; + } + $r .= '<span class="prodstate'. $s .'">'; + + $stc = getObject($this->dbconn,$tutos['prod_state_stc']); + if (is_object($stc)) { + $r .= $stc->getState($s); + } else { + $r .= stc::getNoSTCState($s,'ProdStates'); + } + $r .= '</span>'; + return $r; + } + /** + * create a select list with possible states + */ + function askState () { + global $tutos; + + $r = ''; + $stc = getObject($this->dbconn,$tutos['prod_state_stc']); + if (is_object($stc)) { + $r .= $stc->getStateSelection($this->state,'state'); + } else { + $r .= stc::getNoSTCStateSelection($this->state,'state','ProdStates',null); + } + return $r; + } + /** * set the Probability */ function setProbability($value) { Index: timetrack.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- timetrack.pinc 19 Feb 2009 09:14:55 -0000 1.90 +++ timetrack.pinc 25 Feb 2009 19:13:53 -0000 1.91 @@ -302,6 +302,42 @@ return; } /** + * get current state of this timetrack as HTML + */ + function getState ($s = "") { + global $tutos,$lang; + + $r = ''; + if ( empty($s) ) { + $s = $this->state; + } + $r .= '<span class="ttstate'. $s .'">'; + + $stc = getObject($this->dbconn,$tutos['timetrack_state_stc']); + if (is_object($stc)) { + $r .= $stc->getState($s); + } else { + $r .= stc::getNoSTCState($s,'TTStates'); + } + $r .= '</span>'; + return $r; + } + /** + * create a select list with possible states + */ + function askState () { + global $tutos; + + $r = ''; + $stc = getObject($this->dbconn,$tutos['timetrack_state_stc']); + if (is_object($stc)) { + $r .= $stc->getStateSelection($this->state,'state'); + } else { + $r .= stc::getNoSTCStateSelection($this->state,'state','TTStates',null); + } + return $r; + } + /** * set the Invoice */ function setInvoice($value) { Index: task_show.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_show.php,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- task_show.php 7 Nov 2008 20:00:39 -0000 1.88 +++ task_show.php 25 Feb 2009 19:13:54 -0000 1.89 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2008 by Gero Kohnert + * Copyright 1999 - 2009 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -10,21 +10,21 @@ * @module task_show * @package task */ - include_once 'webelements.p3'; - include_once 'permission.p3'; - include_once 'task.pinc'; - include_once 'product.pinc'; - include_once 'timetrack.pinc'; +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'task.pinc'; +require_once 'product.pinc'; +require_once 'timetrack.pinc'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules('task','show'); - loadlayout(); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('task','show'); +loadlayout(); - /** - * show a task - */ - class task_show extends layout { +/** + * show a task + */ +class Task_show extends layout { /** * display the info */ @@ -53,7 +53,7 @@ echo $this->showfield($lang['TaskName']); echo $this->showdata(myentities($this->obj->name)); echo $this->showfield($lang['TaskState']); - echo $this->showdata($lang['TaskStates'][$this->obj->state],3); + echo $this->showdata($this->obj->getState(),3); echo " </tr>\n"; # display the milestone flag @@ -358,11 +358,11 @@ # add this page to the browsehistory of the users session $this->addtohistory(); } - } +} - $l = new task_show($current_user); - $l->display(); - $dbconn->Close(); +$l = new Task_show($current_user); +$l->display(); +$dbconn->Close(); ?> <!-- CVS Info: $Id$ |
From: Gero K. <gok...@us...> - 2009-02-25 19:12:45
|
Update of /cvsroot/tutos/tutos/php In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16051 Modified Files: task_gantt.php gantt_png.php task.pinc Log Message: better layout handling of gantt charts Index: task.pinc =================================================================== RCS file: /cvsroot/tutos/tutos/php/task.pinc,v retrieving revision 1.213 retrieving revision 1.214 diff -u -d -r1.213 -r1.214 --- task.pinc 19 Feb 2009 09:14:53 -0000 1.213 +++ task.pinc 25 Feb 2009 19:12:36 -0000 1.214 @@ -127,10 +127,17 @@ if (count ($parent->tasklist) == 0 ) { return; } +# echo 'Max '.$parent->max_end->getDateTime().'<br>'; +# echo 'Min '.$parent->min_start->getDateTime().'<br>'; + $length = ($parent->max_end->ts - $parent->min_start->ts)/3600.0; +# echo 'diff '. $length.'h<br>'; +# die( $length ); // Standard calls to create a new graph $graph = new GanttGraph(); + $graph->SetMarginColor('white'); + $graph->SetBackgroundGradient('white','silver',GRAD_HOR,BGRAD_PLOT); //$graph->SetShadow(); - $graph->SetBox(); + // $graph->SetBox(); // Titles for chart $graph->title->Set($lang['TaskGantt']." ". $lang['forphrase'] ." " . html_entity_decode($parent->getFullName()) ); @@ -138,12 +145,92 @@ $graph->title->SetFont($font,FS_BOLD,12); // For illustration we enable all headers. - $graph->ShowHeaders(GANTT_HMONTH | GANTT_HDAY | GANTT_HWEEK); + if ($length > 24000) { + $headers = GANTT_HYEAR | GANTT_HMONTH ; + $graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAME); + $graph->scale->month->SetIntervall(3); + } else + if ($length > 15000) { + $headers = GANTT_HYEAR | GANTT_HMONTH ; + $graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAME); + $graph->scale->month->SetIntervall(2); + } else + if ($length > 6000) { + $headers = GANTT_HYEAR | GANTT_HMONTH | GANTT_HWEEK; + $graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAME); + $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + $graph->scale->week->SetIntervall(2); + } else + if ($length > 4000) { + $headers = GANTT_HYEAR | GANTT_HMONTH | GANTT_HWEEK; + $graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAME); + } else + if ($length > 3000) { + $headers = GANTT_HYEAR | GANTT_HMONTH | GANTT_HWEEK; + $graph->scale->month->SetStyle(MONTHSTYLE_SHORTNAME); + $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY); + } else + if ($length > 1500) { + $headers = GANTT_HMONTH | GANTT_HWEEK; + $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4); + $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAYWNBR); + } else + if ($length > 1000) { + $headers = GANTT_HWEEK | GANTT_HDAY; + $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY2WNBR); + $graph->scale->day->SetStyle(DAYSTYLE_ONE); + $graph->scale->day->SetIntervall(2); + } else + if ($length > 350) { + $headers = GANTT_HWEEK | GANTT_HDAY; + $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY2WNBR); + $graph->scale->day->SetStyle(DAYSTYLE_SHORT); + $graph->scale->day->SetIntervall(1); + } else + if ($length > 110) { + $headers = GANTT_HDAY | GANTT_HHOUR ; + $graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE1); + $graph->scale->hour->SetStyle(HOURSTYLE_H24); + $graph->scale->hour->SetIntervall(6); + } else + if ($length > 48) { + $headers = GANTT_HDAY | GANTT_HHOUR ; + $graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE1); + $graph->scale->hour->SetStyle(HOURSTYLE_H24); + $graph->scale->hour->SetIntervall(4); + } else + if ($length > 24) { + $headers = GANTT_HDAY | GANTT_HHOUR; + $graph->scale->day->SetStyle(DAYSTYLE_SHORTDAYDATE1); + $graph->scale->hour->SetStyle(HOURSTYLE_H24); + $graph->scale->hour->SetIntervall(2); + } else + if ($length > 12) { + $headers = GANTT_HHOUR | GANTT_HMIN; + $graph->scale->hour->SetStyle(HOURSTYLE_H24); + $graph->scale->hour->SetIntervall(1); + $graph->scale->minute->SetIntervall(30); + } else + { + $headers = GANTT_HHOUR; + $graph->scale->hour->SetStyle(HOURSTYLE_H24); + $graph->scale->hour->SetIntervall(2); + } + + $graph->ShowHeaders($headers); + + #$graph->scale->day->SetStyle(DAYSTYLE_ONELETTER); + // $graph->scale->day->Show(false); + // $graph->scale->day->SetBackgroundColor('lightyellow:1.5'); + + // $graph->scale->week->SetBackgroundColor('lightyellow:1.5'); + + // $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4); + // $graph->scale->month->SetBackgroundColor('lightyellow:1.5'); + + // $graph->scale->year->SetStyle(MONTHSTYLE_LONGNAMEYEAR4); + // $graph->scale->year->SetBackgroundColor('lightyellow:1.5'); - $graph->scale->day->SetStyle(DAYSTYLE_ONELETTER); - $graph->scale->day->Show(false); - $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY2WNBR); - $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4); if (isset($graph->scale->actinfo)) { $graph->scale->actinfo->SetFont($font, FS_NORMAL, 8); $graph->scale->actinfo->SetColTitles(array($lang['Task'] ." [". $lang['TaskWorker'] ."]",$lang['TaskVolumeFull'],$lang['TaskVolumeTodo'],$lang['TaskS_Start'],$lang['TaskS_End'])); @@ -152,6 +239,7 @@ // $graph->scale->SetDateLocale("fr_FR"); // Change the scale font + $graph->scale->hour->SetFont(FF_FONT0); $graph->scale->week->SetFont(FF_FONT0); $graph->scale->year->SetFont($font,FS_BOLD,12); @@ -160,9 +248,9 @@ $graph = gantt_addTasks($parent, $graph, $count, 0); // Add a vertical line for the current day -# $vline = new GanttVLine(strftime("%Y-%m-%d", time())); -# $vline->SetDayOffset(0.5); -# $graph->Add($vline); +// $vline = new GanttVLine(strftime("%Y-%m-%d", time())); +// $vline->SetDayOffset(0.5); +// $graph->Add($vline); if ($tutos[jpgraph_old] == 0) { $graph->StrokeCSIM('gantt_png.php'); } else { @@ -616,6 +704,42 @@ return $this->setIntField("state",$value,"TaskState"); } /** + * get current state of this timetrack as HTML + */ + function getState ($s = "") { + global $tutos,$lang; + + $r = ''; + if ( empty($s) ) { + $s = $this->state; + } + $r .= '<span class="taskstate'. $s .'">'; + + $stc = getObject($this->dbconn,$tutos['task_state_stc']); + if (is_object($stc)) { + $r .= $stc->getState($s); + } else { + $r .= stc::getNoSTCState($s,'TaskStates'); + } + $r .= '</span>'; + return $r; + } + /** + * create a select list with possible states + */ + function askState () { + global $tutos; + + $r = ''; + $stc = getObject($this->dbconn,$tutos['task_state_stc']); + if (is_object($stc)) { + $r .= $stc->getStateSelection($this->state,'state'); + } else { + $r .= stc::getNoSTCStateSelection($this->state,'state','TaskStates',null); + } + return $r; + } + /** * set the Milestone flag */ function setMilestone($value) { Index: task_gantt.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/task_gantt.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- task_gantt.php 15 Dec 2007 09:23:14 -0000 1.21 +++ task_gantt.php 25 Feb 2009 19:12:36 -0000 1.22 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2007 by Gero Kohnert + * Copyright 1999 - 2009 by Gero Kohnert * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -9,21 +9,21 @@ * @modulegroup task * @module task_gantt */ - include_once 'webelements.p3'; - include_once 'permission.p3'; - include_once 'task.pinc'; - include_once 'product.pinc'; - include_once 'timetrack.pinc'; +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'task.pinc'; +require_once 'product.pinc'; +require_once 'timetrack.pinc'; - /* Check if user is allowed to use it */ - check_user(); - loadmodules("task","show"); - loadlayout(); +/* Check if user is allowed to use it */ +check_user(); +loadmodules('task','show'); +loadlayout(); - /** - * display - */ - class task_gantt extends layout { +/** + * display + */ +class Task_gantt extends layout { /** * the data display part */ @@ -77,13 +77,13 @@ $this->obj = $this->user; } } - } +} - load_jpgraph( array("jpgraph_gantt.php") ); +load_jpgraph( array("jpgraph_gantt.php") ); - $l = new task_gantt($current_user); - $l->display(); - $dbconn->Close(); +$l = new Task_gantt($current_user); +$l->display(); +$dbconn->Close(); ?> <!-- CVS Info: $Id$ Index: gantt_png.php =================================================================== RCS file: /cvsroot/tutos/tutos/php/gantt_png.php,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- gantt_png.php 4 Apr 2007 19:14:34 -0000 1.25 +++ gantt_png.php 25 Feb 2009 19:12:36 -0000 1.26 @@ -1,6 +1,6 @@ <?php /** - * Copyright 1999 - 2007 by Gero Kohnert + * Copyright 1999 - 2009 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 @@ -18,11 +18,11 @@ * $Id$ */ -include_once 'webelements.p3'; -include_once 'permission.p3'; -include_once 'task.pinc'; -include_once 'product.pinc'; -include_once 'timetrack.pinc'; +require_once 'webelements.p3'; +require_once 'permission.p3'; +require_once 'task.pinc'; +require_once 'product.pinc'; +require_once 'timetrack.pinc'; /* Check if user is allowed to use it */ check_user(); |
Update of /cvsroot/tutos/tutos/php/stc In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15884 Added Files: .htaccess en.p3 mconfig.pinc mtable.pinc stc.pinc stc_ins.php stc_new.php stc_overview.php stc_show.php Log Message: New Module to control State Transitions --- NEW FILE: stc.pinc --- <?php /** * Copyright 2009 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 * Free Software Foundation; version 2 of the License. * * CVS Info: $Id: stc.pinc,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ * $Author: gokohnert $ */ class Stc_state extends tutos_module { function stc_state(&$dbconn) { global $current_user,$table; $this->init($dbconn); $this->stc_id = -1; $this->stc_state = 0; $this->lang_array = ''; $this->color = 'white'; $this->x = 0; $this->y = 0; $this->tablename = $this->dbconn->prefix .$table['stc_states'][name]; $this->tablename3 = $this->dbconn->prefix .$table['stc_trans'][name]; } /** * read the database data */ function read_result (&$r, $pos ) { $this->stc_state = $r->get($pos, 'stc_state'); $this->color = $r->get($pos, 'color'); $this->stc_id = $r->get($pos, 'stc_id'); $this->lang_array = $r->get($pos, 'lang_array'); $this->creator = getObject($this->dbconn,$r->get($pos, 'creator')); parent::read_result($r,$pos); return; } /** * Return a fullname of a state */ function getFullname() { global $lang; if (isset($lang[$this->lang_array][$this->stc_state])) { return $lang[$this->lang_array][$this->stc_state]; } return 'S'.$this->stc_state.'('.$this->id.')'; } /** * save the stc state data to the database */ function save () { global $table; $msg = ''; $q = new query($this->dbconn); $q->setTable($this->tablename); $q->addFV('stc_state',$this->stc_state,'INT'); $q->addFV('stc_id',$this->stc_id,'INT'); $q->addFV('color',$this->color,'STRING',$table['stc_states']['color'][size]); $q->addFV('lang_array',$this->lang_array,'STRING',$table['stc_states']['lang_array'][size]); if ( $this->id < 0 ) { $this->modified = array(); if ( isset($this->newid) ) { $this->id = $this->newid; $q->addFV("id",$this->id,""); } else { $this->id = $q->addFV("id",-1,"NEXTID"); acl_default($this,$this->creator); # Prepare the history $this->modified[] = array ( "field" => "created" , "old" => $this->getType() , "new" => $this->id, "obj_id" => $this->id ); } $q->addFV("creator",$this->creator,"OBJ"); $q->addFV("creation",$this->creation,"DATETIME"); $query = $q->getInsert(); } else { $q->addWC("id",$this->id,""); $query = $q->getUpdate(); } $r = $this->dbconn->Exec($query); $r->free(); $msg .= parent::save(); # $msg .= "saved/updated state ".$this->getFullName() .'<br />'; return $msg; } /** * Delete STC state from DB */ function delete() { global $current_user; $q = 'DELETE FROM '. $this->tablename .' WHERE id = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); // delete connected stuff $q = 'DELETE FROM '. $this->tablename3 .' '; $q.= 'WHERE stc_state = '. $this->id; $q.= 'OR next_state = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); $msg .= parent::delete(); return $msg; } /** * get the type of object */ function gettype () { global $tutos; return $tutos[modules]['stc'][name].'state'; } /** * get the type id of object */ function gettypeid () { return usestcstates; } /** * read the states connected to a stc */ function obj_read (&$obj) { global $table; if (! is_object($obj) ) return; if ( $obj->id < 0 ) return; $obj->states = array(); $q = "SELECT * from ". $obj->dbconn->prefix.$table['stc_states'][name]." where stc_id = ". $this->id ." order by stc_state"; $r = $this->dbconn->Exec($q); $n = $r->numrows(); $a = 0; while ($a < $n) { $x = new stc_state($this->dbconn); $x->read_result($r,$a); # if ( $x->see_ok() ) { $obj->states[$x->stc_state] = &$x; # } $a++; unset($x); } $r->free(); } } /** * a state transition class * * @package stc */ class Stc_transition extends tutos_module { function stc_transition(&$dbconn) { global $current_user,$table; $this->init($dbconn); $this->stc_id = -1; $this->stc_state = null; $this->next_state = null; $this->tablename = $this->dbconn->prefix .$table['stc_trans'][name]; } /** * read the database data */ function read_result (&$r, $pos ) { $this->stc_id = $r->get($pos, 'stc_id'); $this->stc_state = new stc_state($this->dbconn); $this->next_state = new stc_state($this->dbconn); $this->stc_state_id = $r->get($pos, 'stc_state'); $this->next_state_id = $r->get($pos, 'next_state'); $this->stc_state = $this->stc_state->read($this->stc_state_id,$this->stc_state); $this->next_state = $this->next_state->read($this->next_state_id,$this->next_state); if ($this->stc_state_id != $this->stc_state->id) { $this->stc_state = null; } if ($this->next_state_id != $this->next_state->id) { $this->next_state = null; } $this->creator = getObject($this->dbconn,$r->get($pos, 'creator')); parent::read_result($r,$pos); # echo $this.'<br>'; return; } /** * Return a fullname */ function getFullname() { if (($this->stc_state != null) && ($this->next_state != null)) { return $this->stc_state->getFullName() .' -> '. $this->next_state->getFullName(); } return $this->stc_state_id .' -> '.$this->next_state_id; } /** * save the stc transition data to the database */ function save () { global $table; $msg = ''; $q = new query($this->dbconn); $q->setTable($this->tablename); $q->addFV('stc_id',$this->stc_id,'INT'); $q->addFV('stc_state',$this->stc_state,'OBJ'); $q->addFV('next_state',$this->next_state,'OBJ'); if ( $this->id < 0 ) { $this->modified = array(); if ( isset($this->newid) ) { $this->id = $this->newid; $q->addFV("id",$this->id,""); } else { $this->id = $q->addFV("id",-1,"NEXTID"); acl_default($this,$this->creator); # Prepare the history $this->modified[] = array ( "field" => "created" , "old" => $this->getType() , "new" => $this->id, "obj_id" => $this->id ); } $q->addFV("creator",$this->creator,"OBJ"); $q->addFV("creation",$this->creation,"DATETIME"); $query = $q->getInsert(); } else { $q->addWC("id",$this->id,""); $query = $q->getUpdate(); } $r = $this->dbconn->Exec($query); $r->free(); $msg .= parent::save(); # $msg .= "saved/updated transition ".$this->getFullName() .'<br />'; return $msg; } /** * Delete STC transition from DB */ function delete() { global $current_user; $q = 'DELETE FROM '. $this->tablename .' WHERE id = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); $msg .= parent::delete(); return $msg; } /** * get the type of object */ function gettype () { global $tutos; return $tutos[modules]['stc'][name].'trans'; } /** * get the type id of object */ function gettypeid () { return usestctrans; } /** * read the transitions connected to a stc */ function obj_read (&$obj) { global $table; if (! is_object($obj) ) return; if ( $obj->id < 0 ) return; $obj->trans = array(); $q = "SELECT * from ". $obj->dbconn->prefix.$table['stc_trans'][name]." where stc_id = ". $this->id ." order by stc_state"; $r = $this->dbconn->Exec($q); $n = $r->numrows(); $a = 0; while ($a < $n) { $x = new stc_transition($this->dbconn); $x->read_result($r,$a); # if ( $x->see_ok() ) { $obj->trans[$x->id] = &$x; # } $a++; unset($x); } $r->free(); } } /** * a state transition control class * * @package stc */ class Stc extends tutos_module { /** * init */ function stc(&$dbconn) { global $current_user,$table; $this->init($dbconn); $this->name = ''; $this->states = array(); $this->trans = array(); $this->lang_array = ''; $this->tablename = $this->dbconn->prefix .$table['stc'][name]; $this->tablename2 = $this->dbconn->prefix .$table['stc_states'][name]; $this->tablename3 = $this->dbconn->prefix .$table['stc_trans'][name]; } /** * read the database data */ function read_result (&$r, $pos ) { $this->name = $r->get($pos, 'name'); parent::read_result($r,$pos); stc_state::obj_read($this); stc_transition::obj_read($this); return; } /** * Return a link to this stc */ function getURL() { return 'stc/stc_show.php?id='.$this->id; } /** * Return a link to modify this stc */ function getModURL() { return 'stc/stc_new.php?id='.$this->id; } /** * Return a fullname */ function getFullname() { return $this->name; } /** * set the note name */ function setName($value) { return $this->setStrField("name",$value,"STCName"); } /** * Return a state selector */ function getStateSelection($default,$varname = 'state') { global $lang; $r = ''; $r .= '<select id="stc_'.$varname.'" name="'.$varname.'">'; foreach($this->states as $j) { $r .= '<option value="'.$j->stc_state.'" style="background:'.$j->color; if ($default == $j->stc_state) { $r .= ' selected="selected"'; } $r .= '">'; $r .= $j->getFullName(); $r .= '</option>'; } $r .= '</select>'; return $r; } /** * Return a state name */ function getState($default) { global $lang; $r = ''; if (is_object($this->states[$default])) { return $this->states[$default]->getFullName(); } return 'S'.$default; } /** * save the stc data to the database */ function save () { global $table; $msg = ''; $q = new query($this->dbconn); $q->setTable($this->tablename); $q->addFV('name',$this->name,'STRING',$table['stc']['name'][size]); if ( $this->id < 0 ) { $this->modified = array(); if ( isset($this->newid) ) { $this->id = $this->newid; $q->addFV("id",$this->id,""); } else { $this->id = $q->addFV("id",-1,"NEXTID"); acl_default($this,$this->creator); # Prepare the history $this->modified[] = array ( "field" => "created" , "old" => $this->getType() , "new" => $this->id, "obj_id" => $this->id ); } $q->addFV("creator",$this->creator,"OBJ"); $q->addFV("creation",$this->creation,"DATETIME"); $query = $q->getInsert(); } else { $q->addWC("id",$this->id,""); $query = $q->getUpdate(); } $r = $this->dbconn->Exec($query); $r->free(); $msg .= parent::save(); foreach($this->new_states as $i => $x) { $x->stc_id = $this->id; $msg .= $x->save(); if(isset($this->states[$i])) { unset($this->states[$i]); } } foreach($this->states as $i => $x) { $msg .= $x->delete(); } foreach($this->new_trans as $i => $x) { $x->stc_id = $this->id; $msg .= $x->save(); if(isset($this->trans[$i])) { unset($this->trans[$i]); } } foreach($this->trans as $i => $x) { $msg .= $x->delete(); } return $msg; } /** * Delete STC from DB */ function delete() { global $current_user; $q = 'DELETE FROM '. $this->tablename2 .' WHERE stc_id = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); $q = 'DELETE FROM '. $this->tablename3 .' WHERE stc_id = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); $q = 'DELETE FROM '. $this->tablename .' WHERE id = '. $this->id; $r = $this->dbconn->Exec($q); $r->free(); $msg .= parent::delete(); return $msg; } /** * get the type of object */ function gettype () { global $tutos; return $tutos[modules]['stc'][name]; } /** * get the type id of object */ function gettypeid () { global $tutos; return $tutos[modules]['stc']['perm']; } /** * create a array with all stcs valid for a given lang_array */ function getListByLangArray($obj,$la) { global $table; $tablename = $obj->dbconn->prefix .$table['stc'][name]; $tablename2 = $obj->dbconn->prefix .$table['stc_states'][name]; $q = 'SELECT distinct a.* FROM '. $tablename .' a,'.$tablename2 .' b WHERE b.lang_array = \''. $la .'\' AND a.id = b.stc_id'; $r = $this->dbconn->Exec($q); $obj->stcs = array(); $n = $r->numrows(); $a = 0; while ($a < $n) { $x = new stc($obj->dbconn); $x->read_result($r,$a); if ( $x->see_ok() ) { $obj->stcs[$x->id] = &$x; } $a++; unset($x); } $r->free(); return; } /** * Return a state selector without having a STC */ function getNoSTCStateSelection($default,$varname,$lgarray,$colarray) { global $lang; $r = ''; $r .= '<select id="stc_'.$varname.'" name="'.$varname.'">'; foreach($lang[$lgarray] as $i => $j) { $r .= '<option value="'.$i.'" style="background:'.(isset($colarray[$i]) ? $colarray[$i]:'yellow').'"'; if ($default == $i) { $r .= ' selected="selected"'; } $r .= '">'; $r .= $j; $r .= '</option>'; } $r .= '</select>'; return $r; } /** * Return a state selector without having a STC */ function getNoSTCState($default,$lgarray) { global $lang; $r = ''; if (isset($lang[$lgarray][$default])) { return $lang[$lgarray][$default]; } return 'S'.$default; } } ?> --- NEW FILE: .htaccess --- # # This file is part of TUTOS # # # $Id: .htaccess,v 1.1 2009/02/25 19:11:26 gokohnert Exp $ # Options -Indexes # Change DirectoryIndex to whatever you want to be # the default page # DirectoryIndex note_select.php # # # Dont allow access to config files # <Files ~ "\.p3"> Order allow,deny Deny from all </Files> <Files ~ "\.pinc"> Order allow,deny Deny from all </Files> # Disable display of config files AddType application/x-httpd-php .pinc --- NEW FILE: stc_new.php --- <?php /** * Copyright 2009 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 * Free Software Foundation; version 2 of the License. * * @modulegroup stc * @module stc_new * @package stc */ $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'stc.pinc'; /* Check if user is allowed to use it */ check_user(); loadmodules('stc','new'); loadmodule('stc'); loadlayout(); /** * change/modify a state transition set */ class Stc_new extends layout { /** * info */ Function info() { global $lang; $this->width = 4; $r = ''; $r .= '<form id="stcnew" name="stcnew" action="stc_ins.php" method="post">'."\n"; $r .= $this->DataTableStart(); if ( isset ($this->obj->id) && ( $this->obj->id != -1 ) ) { $this->addhidden("id",$this->obj->id); } $r .= $this->Headline(); $r .= $this->acl_line(true); $r .= '<tr>'; $r .= $this->showfieldc($lang['STCName']); $r .= ' <td colspan="3">'; $r .= ' <input id="name" size="'. min($table['stc']['name'][size],40) .'" maxlength="'. $table['stc']['name'][size] .'" name="name" value="'. myentities($this->obj->name) .'" />'; $r .= ' </td>'; $r .= '</tr>'; $r .= '<tr>'; $r .= ' <th colspan="1">'; $r .= $lang['STCStates']; $r .= ' </th>'; $r .= ' <th colspan="2">'; $r .= $lang['STCTransitions']; $r .= ' </th>'; $r .= ' <th colspan="1">'; $r .= $lang['STCGraph']; $r .= ' </th>'; $r .= '</tr>'; $r .= '<tr>'; // States $r .= ' <td valign="top">'; foreach ($this->obj->states as $j) { $r .= $j->stc_state; $r .= '<input name="states[]" type="checkbox" value="'.$j->id.','.$j->stc_state.'"'; if ($j->id > 0) { $r .= ' checked="checked"'; } $r .= '></input> '.$j->getFullName() .'<br/>'; $this->obj->lang_array = $j->lang_array; } $r .= ' </td>'; // Transitions $r .= ' <td colspan ="2" valign="top">'; foreach ($this->obj->trans as $j) { $r .= '<input name="trans[]" type="checkbox" value="'.$j->id.'"'; if (is_object($j->stc_state) && is_object($j->next_state)) { $r .= ' checked="checked"'; } $r .= '></input> '.$j->getFullName() .' <br/>'; } $r .= ' </td>'; // Graph $r .= ' <td colspan ="1" rowspan="3" valign="top">'; $r .= '<img src="stc_show.php?format=graph&id='.$this->obj->id.'" />'; $r .= ' </td>'; $r .= '</tr>'; $r .= '<tr>'; $r .= ' <th colspan="1">'; $r .= $lang['STCNewState']; $r .= ' </th>'; $r .= ' <th colspan="2">'; $r .= $lang['STCNewTransition']; $r .= ' </th>'; $r .= '</tr>'; $r .= '<tr>'; // new State $r .= ' <td valign="top"> '; $r .= '<input size="5" id="newstate" name="newstate"></input><br/>'; $r .= '<select size="1" id="newcolor" name="newcolor">'; $colors = array('white','red','orange','green','lightgreen','lightblue','aqua','teal','yellow','gray','silver'); foreach ($colors as $c) { $r .= ' <option style="background:'.$c.'" value="'.$c.'">'.$c.'</option>'; } $r .= '</select>'; $r .= ' </td>'; // new Transition $r .= ' <td colspan ="2" valign="top">'; $r .= ' <select name="from" size="10">'; foreach ($this->obj->states as $j) { $r .= '<option value="'. $j->stc_state .'">'.$j->getFullName(); $r .= '</option>'; } $r .= ' </select>'; $r .= '<b>--></b>'; $r .= ' <select name="to" size="10">'; foreach ($this->obj->states as $j) { $r .= '<option value="'. $j->stc_state .'">'.$j->getFullName(); $r .= '</option>'; } $r .= ' </select>'; $r .= ' </td>'; $r .= '</tr>'; if ( $this->obj->mod_ok() ) { $r .= "<tr>\n"; if ($this->obj->id > 0 ) { $r .= submit_reset(0,1,1,1,1,0); } else { $r .= submit_reset(0,-1,1,1,1,0); } $r .= "</tr>\n"; } $this->addhidden("lang_array",$this->obj->lang_array); $r .= $this->DataTableEnd(); $r .= hiddenFormElements(); $r .= $this->getHidden(); $r .= $this->markBadFields(); $r .= '</form>'."\n"; echo $r; } /** * navigate */ Function navigate() { } /** * prepare */ Function prepare() { global $msg,$lang,$current_user; $this->obj = new stc($this->dbconn); if(isset($_GET['id']) && is_numeric($_GET['id'])) { $this->obj = $this->obj->read($_GET['id'],$this->obj); $this->name = $lang['STCModify']; } else { $this->name = $lang['STCCreate']; } // array if(isset($_GET['lgarr']) ) { $this->obj->lang_array = $_GET['lgarr']; foreach ($lang[$this->obj->lang_array] as $i => $j) { $x = new stc_state($this->dbconn); $x->lang_array = $this->obj->lang_array; $x->stc_id = $this->obj->id; $x->stc_state = $i; $this->obj->states[$i] = $x; unset($x); } } else if (!is_object($this->obj)){ $msg .= sprintf($lang['Err0040'],$lang['STC']); $this->stop = true ; } else if ($this->obj->id == -1){ $msg .= sprintf($lang['Err0040'],$lang['STC']); $this->stop = true ; } } } $l = new Stc_new($current_user); $l->display(); $dbconn->Close(); ?> <!-- CVS Info: $Id: stc_new.php,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ $Author: gokohnert $ --> --- NEW FILE: mtable.pinc --- <?php /** * Copyright 2009 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 * Free Software Foundation; version 2 of the License. * * Information about the tables and indices neccessary for this module * * CVS Info: $Id: mtable.pinc,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ * $Author: gokohnert $ */ # # State Transition Control # $table['stc'][name] = 'stc'; $table['stc'][Desc] = 'TUTOS STC Element'; $table['stc']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'Object ID'); $table['stc']['name'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'title'); $table['stc']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); $table['stc']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); $table['stc_states'][name] = 'stc_state'; $table['stc_states'][Desc] = 'TUTOS STC State'; $table['stc_states']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'stc state ID'); $table['stc_states']['stc_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'parent ID'); $table['stc_states']['stc_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state ID'); $table['stc_states']['color'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'color for visualization'); $table['stc_states']['lang_array'] = array(type => 'VARCHAR', size => 30, constraints => '', Desc => 'arrayname with translation'); $table['stc_states']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); $table['stc_states']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); $table['stc_trans'][name] = 'stc_trans'; $table['stc_trans'][Desc] = 'TUTOS STC Transition'; $table['stc_trans']['id'] = array(type => 'ID_TYPE', constraints => 'PK', Desc => 'stc trans ID'); $table['stc_trans']['stc_id'] = array(type => 'ID_TYPE', constraints => 'NN', Desc => 'stc ID'); $table['stc_trans']['stc_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'state ID'); $table['stc_trans']['next_state'] = array(type => 'ID_TYPE', constraints => '', Desc => 'target state ID'); $table['stc_trans']['creator'] = array(type => 'ID_TYPE', constraints => '', Desc => 'creator ID'); $table['stc_trans']['creation'] = array(type => 'TS_TYPE', constraints => '', Desc => 'creation date'); ?> --- NEW FILE: mconfig.pinc --- <?php /** * Copyright 2009 by Gero Kohnert * * Module specific configuration * * CVS Info: $Id: mconfig.pinc,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ * $Author: gokohnert $ */ # # Every module must have an individual ID ( < 0 > -100 ). # statetransition management is module 98 # define('usestc',-98); $tutos[modules]['stc'] = array( name => 'stc', Desc => 'state transition control', file => 'php/stc/stc.pinc', 'overview' => 'stc/stc_overview.php', 'perm' => usestc ); define('usestcstates',-3002); define('usestctrans',-3003); # # globally enable this module # $tutos[usestc] = 1; # # List of objects/modules where we do something with this module # and need to include this module # $tutos[modulesinc]['stc'][] = "bugtracking"; $tutos[modulesinc]['stc'][] = "timetrack"; $tutos[modulesinc]['stc'][] = "task"; $tutos[modulesinc]['stc'][] = "product"; ?> --- NEW FILE: en.p3 --- <?php # $Id: en.p3,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ # # ========================= NOTE ======================== # Please put site specific extensions and changes # to TUTOS language files in a file called "en_custom.p3" # or "lang_custom.p3" (for all languages) # using the same format like here # ======================================================= # # # English Texts for this module # # STC $lang['STC'] = "STC"; $lang['STCs'] = "STC"; $lang['STCName'] = "Name"; $lang['STCStates'] = "States"; $lang['STCNewState'] = "new State"; $lang['STCTransitions'] = "Transitions"; $lang['STCNewTransition']= "new Transition"; $lang['STCGraph'] = "State Graph"; $lang['STCModify'] = "State Transition Control Element Modification"; $lang['STCCreate'] = "State Transition Control Element Creation"; $lang['STCDelete'] = "State Transition Control Element Deletion"; $lang['STCDetail'] = "State Transition Control Element"; $lang['STCOverview'] = "State Transition Control Overview"; $lang['stc'] = "STC"; $lang['stcstate'] = "STC State"; $lang['stctrans'] = "STC Transition"; $lang['perm'][usestc] = "use stc"; ?> --- NEW FILE: stc_ins.php --- <?php /** * Copyright 2009 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 * Free Software Foundation; version 2 of the License. * * this script parses all the inputs and stores the object into the database. * on completition it jumps to the detail screen of the stored object * * @modulegroup stc * @module stc_ins * @package stc */ $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; require_once 'permission.p3'; /* Check if user is allowed to use it */ check_user(); loadmodules('stc','new'); loadmodule('stc'); $gotourl = 'stc/stc_new.php'; $msg = ''; $obj = new stc($dbconn); if ( isset($_POST['id']) ) { $gotourl= addUrlParameter($gotourl,"id=". $_POST['id'],true); $obj = $obj->read($_POST['id'],$obj); } if ( isset($_POST['lang_array']) ) { $obj->lang_array = $_POST['lang_array']; } else { $obj->lang_array = '$'; } if ( isset($_POST['name']) ) { $obj->setName($_POST['name']); $obj->setName(StripSlashes(trim($_POST['name']))); $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($obj->name),true); } if ( isset($_POST['states']) ) { foreach($_POST['states'] as $j) { $x = split(',',$j); $s = new stc_state($dbconn); if($x[0] != -1) { $s = $s->read($x[0],$s); } $s->stc_state = $x[1]; $s->stc_id = $obj->id; $s->lang_array = $obj->lang_array; $obj->new_states[$s->stc_state] = &$s; # echo $s.' '.$s->stc_state.' ('.$s->lang_array.') '.$s->stc_id.'<br>'; unset ($s); } } if ( isset($_POST['newstate']) && !empty($_POST['newstate'])) { $x = trim($_POST['newstate']); if ( !is_numeric($x) || ($x < 0) ) { $msg .= 'State has to be a positive number';; } elseif (isset($obj->new_states[$x])) { $msg .= 'State '. $x .' already exists in this STC';; } else { $s = new stc_state($dbconn); $s->stc_state = $x; $s->color = $_POST['newcolor']; $s->stc_id = $obj->id; $s->lang_array = $obj->lang_array; $obj->new_states[$s->stc_state] = &$s; unset ($s); } } if ( isset($_POST['trans']) ) { foreach($_POST['trans'] as $j) { $s = new stc_transition($dbconn); $s = $s->read($j,$s); $obj->new_trans[$s->id] = &$s; unset ($s); } } if ( isset($_POST['from']) && isset($_POST['to']) ) { $s = new stc_transition($dbconn); $s->stc_state = $obj->new_states[$_POST['from']]; $s->next_state = $obj->new_states[$_POST['to']]; $s->stc_id = $obj->id; $obj->new_trans[] = &$s; unset ($s); } #foreach($_POST as $i => $j) { # echo gettype($i) .' '.$i.' '.gettype($j).' '.$j.'<br>'; #} #die(); if ($msg == '') { $dbconn->Begin("WORK"); $msg .= $obj->save(); $dbconn->Commit("WORK"); $gotourl = $obj->getModURL(); } $gotourl = addMessage($gotourl,$msg,true); $gotourl = addSessionKey($gotourl,true); Header("Status: 302 Moved Temporarily"); Header("Location:". dirname(getBaseUrl()) ."/". $gotourl); $dbconn->Close(); /* * CVS Info: $Id: stc_ins.php,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ * $Author: gokohnert $ */ ?> --- NEW FILE: stc_overview.php --- <?php /** * Copyright 2009 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 * Free Software Foundation; version 2 of the License. * * @modulegroup stc * @module stc_overview * @package stc */ $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'stc.pinc'; /* Check if user is allowed to use it */ check_user(); loadmodules('stc','overview'); loadmodule('stc'); loadlayout(); /** * show a state transition overview */ class Stc_overview extends layout { /** * info */ Function info() { } /** * navigate */ Function navigate() { } /** * prepare */ Function prepare() { global $msg,$lang,$current_user; $this->name = $lang['STCOverview']; } } $l = new Stc_overview($current_user); $l->display(); $dbconn->Close(); ?> <!-- CVS Info: $Id: stc_overview.php,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ $Author: gokohnert $ --> --- NEW FILE: stc_show.php --- <?php /** * Copyright 2009 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 * Free Software Foundation; version 2 of the License. * * @modulegroup stc * @module stc_new * @package stc */ $tutos['base'] = "../.."; ini_set("include_path",".."); require_once 'webelements.p3'; require_once 'permission.p3'; require_once 'stc.pinc'; /* Check if user is allowed to use it */ check_user(); loadmodules('stc','show'); loadmodule('stc'); loadlayout(); /** * sshow a state transition set */ class Stc_show extends layout { /** * draw a line with arrow between two states */ function line(&$g,&$shape,&$a,&$b) { $shape->SetColor('green'); $g->img->SetLineWeight(3); $shape->Line($a->x ,$a->y, $b->x,$b->y); $g->img->SetLineWeight(1); // find the position $mx = $a->x + (($b->x - $a->x)* 3/4); $my = $a->y + (($b->y - $a->y)* 3/4); $lx = $b->x - $a->x; $ly = $b->y - $a->y; $m = $ly/$lx; # $lc = sqrt((pow($lx,2) + pow($lx,2))); # $arad =acos((pow($lx,2) + pow($lx,2) - pow($lc,2)) / (2 * $lx * $ly)); if ($ly != 0) { $arad = atan($lx/$ly); } else { $arad = 0; } $adeg = rad2deg($arad); // the angel $shape->SetColor('black'); $offset = deg2rad(180); $i = deg2rad(22.50); if ( ($lx > 0) && ($ly > 0) ) { $offset = deg2rad(90); } elseif ( ($lx > 0) && ($ly < 0) ) { $offset = deg2rad(-90); } elseif ( ($lx < 0) && ($ly < 0) ) { $offset = deg2rad(-90); } elseif ( ($lx < 0) && ($ly > 0) ) { $offset = deg2rad(90); } elseif ( ($lx < 0) && ($ly == 0) ) { $offset = deg2rad(0); } elseif ( ($lx > 0) && ($ly == 0) ) { $offset = deg2rad(180); } $g->img->SetLineWeight(3); $shape->Line($mx,$my, $mx+40*cos($offset + $arad - $i) ,$my-40*sin($offset + $arad - $i)); $shape->Line($mx,$my, $mx+40*cos($offset + $arad + $i) ,$my-40*sin($offset + $arad + $i)); $shape->SetColor('black'); $g->img->SetLineWeight(1); } /** * info */ Function graph() { global $lang; if (!load_jpgraph( array("jpgraph_canvas.php","jpgraph_canvtools.php"),'../' )) { die($msg); }; $xsize = 1000; $ysize = 1200; $g = new CanvasGraph(400,480); $g->SetMargin(0,0,0,0); $g->title->SetColor('black@0.5'); $g->SetBackgroundGradient('white','silver',GRAD_HOR,BGRAD_PLOT); $g->img->setFont(FF_VERDANA,FS_NORMAL,8); $g->title->Set($lang['STC'].' '. $this->obj->getFullName()); $g->InitFrame(); // Create a new scale $scale = new CanvasScale($g); $scale->Set(0,$xsize,0,$ysize); // The shape class is wrapper around the Imgae class which translates // the coordinates for us $shape = new Shape($g,$scale); $shape->SetColor('black'); $steps = count($this->obj->states) ; $step = (360/$steps)*(2*M_PI)/360.0; reset($this->obj->states); $s = current($this->obj->states); for ($i = 0.0 ;$i < 1.99*M_PI ; $i += $step) { $cx = $xsize/2; $cy = 100 + ($ysize-200)/2; $y = floor($cy - ($ysize-200)* 0.4 * sin($i)); $x = floor($cx + $xsize* 0.4 * cos($i)); $s->x = $x; $s->y = $y; $s = next($this->obj->states); } # # Draw the transitions # reset($this->obj->trans); $s = current($this->obj->trans); while (is_object($s)) { $this->line($g,$shape,$s->stc_state,$s->next_state); $s = next($this->obj->trans); } # # Draw the circles and text # reset($this->obj->states); $s = current($this->obj->states); while (is_object($s)) { if(!empty($s->color)) $shape->SetColor($s->color); $shape->FilledCircle($s->x,$s->y,70); $shape->SetColor('black'); $shape->StrokeText($s->x-60,$s->y+30,myiconv($s->getFullName()."\n" . $s->color)); $s = next($this->obj->states); } $g->img->setFont(FF_VERDANA,FS_NORMAL,6); $shape->StrokeText(0,$ysize-15,myiconv('created with TUTOS'),0,'center'); $g->Stroke(); } /** * info */ Function info() { global $lang,$tutos; $r = ''; if ($this->format == 'graph') { return $this->graph(); } $r .= $this->DataTableStart(); $r .= "<tr>\n"; $r .= ' <th colspan="3">'. $lang['STC'] ."</th>\n"; $r .= $this->showGuiIcons('<th class="icons">','</th>',$this->obj,$this->obj,array('mod','del','perm'),false); $r .= "</tr>\n"; $r .= $this->CreatorInfoLine($this->obj,4); $r .= "<tr>\n"; $r .= $this->showfieldc($lang['STCName']); $r .= $this->showdata($this->obj->name); $r .= "</tr>\n"; $r .= "<tr>\n"; $r .= $this->showfield($lang['STCStates']); $r .= '<td>'; $pre = ''; foreach ($this->obj->states as $s) { $r .= $pre.$s->getFullName(); $pre = '<br>'; } $r .= '</td>'; $r .= "</tr>\n"; $r .= "<tr>\n"; $r .= $this->showfield($lang['STCTransitions']); $r .= '<td>'; $pre = ''; foreach ($this->obj->trans as $s) { $r .= $pre.$s->getFullName(); $pre = '<br>'; } $r .= '</td>'; $r .= "</tr>\n"; # # Show additional custom fields # $r .= show_custom_fields($this,$this->obj->gettype(),$this->obj,4); # References to modules $r .= show_module_infolists($this->user,$this->obj,4); $r .= $this->obj->getHistoryLink(4); $r .= $this->DataTableEnd(); echo $r; } /** * navigate */ Function navigate() { } /** * prepare */ Function prepare() { global $msg,$lang,$current_user; $this->name = $lang['STCDetail']; $this->obj = new stc($this->dbconn); if ( isset($_GET['id']) ) { $this->obj = $this->obj->read($_GET['id'],$this->obj); } if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) { $x = array( url => $this->obj->getModURL(), text => $lang['Modify'], info => $lang['STCModify'], category => array('stc','mod','obj') ); $this->addMenu($x); } if ( ($this->obj->id > 0) && $this->obj->del_ok() ) { $x = array( url => $this->obj->getDelURL(), text => $lang['Delete'], info => $lang['STCDelete'], confirm => true, category => array('stc','del','obj') ); $this->addMenu($x); } add_module_addlinks($this,$this->obj); $this->addtohistory(); } } $l = new Stc_show($current_user); $l->display(); $dbconn->Close(); ?> <!-- CVS Info: $Id: stc_show.php,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ $Author: gokohnert $ --> |
From: Gero K. <gok...@us...> - 2009-02-25 19:11:35
|
Update of /cvsroot/tutos/tutos/php/stc/help In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15884/help Added Files: .htaccess Log Message: New Module to control State Transitions --- NEW FILE: .htaccess --- # # This file is part of TUTOS # # # $Id: .htaccess,v 1.1 2009/02/25 19:11:29 gokohnert Exp $ # # Dont allow access to files # Order allow,deny Deny from all |