tutos-commits Mailing List for TUTOS
Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory
Brought to you by:
gokohnert
Menu
▾
▴
tutos-commits — SVN commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(13) |
Aug
(214) |
Sep
(144) |
Oct
(22) |
Nov
(22) |
Dec
(93) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(25) |
Feb
(31) |
Mar
(92) |
Apr
(70) |
May
(103) |
Jun
(130) |
Jul
(265) |
Aug
(325) |
Sep
(233) |
Oct
(244) |
Nov
(261) |
Dec
(157) |
| 2003 |
Jan
(101) |
Feb
(135) |
Mar
(148) |
Apr
(164) |
May
(53) |
Jun
(116) |
Jul
(149) |
Aug
(126) |
Sep
(45) |
Oct
(109) |
Nov
(36) |
Dec
(61) |
| 2004 |
Jan
(131) |
Feb
(236) |
Mar
(278) |
Apr
(259) |
May
(92) |
Jun
(110) |
Jul
(150) |
Aug
(64) |
Sep
(141) |
Oct
(141) |
Nov
(146) |
Dec
(65) |
| 2005 |
Jan
(70) |
Feb
(77) |
Mar
(129) |
Apr
(153) |
May
(161) |
Jun
(63) |
Jul
(42) |
Aug
(16) |
Sep
(30) |
Oct
(3) |
Nov
(8) |
Dec
(40) |
| 2006 |
Jan
(114) |
Feb
(16) |
Mar
(12) |
Apr
(15) |
May
(4) |
Jun
(9) |
Jul
(69) |
Aug
(27) |
Sep
(12) |
Oct
(80) |
Nov
(62) |
Dec
(41) |
| 2007 |
Jan
(34) |
Feb
(2) |
Mar
(38) |
Apr
(82) |
May
(61) |
Jun
(37) |
Jul
(16) |
Aug
(64) |
Sep
(7) |
Oct
(52) |
Nov
(18) |
Dec
(28) |
| 2008 |
Jan
(168) |
Feb
(26) |
Mar
(27) |
Apr
(19) |
May
(10) |
Jun
(58) |
Jul
(58) |
Aug
(91) |
Sep
(14) |
Oct
(23) |
Nov
(56) |
Dec
(38) |
| 2009 |
Jan
(58) |
Feb
(90) |
Mar
(204) |
Apr
(90) |
May
(27) |
Jun
(177) |
Jul
(116) |
Aug
(53) |
Sep
(42) |
Oct
(120) |
Nov
(51) |
Dec
(58) |
| 2010 |
Jan
(117) |
Feb
(231) |
Mar
(163) |
Apr
(90) |
May
(40) |
Jun
(139) |
Jul
(49) |
Aug
(118) |
Sep
(25) |
Oct
(80) |
Nov
(102) |
Dec
(99) |
| 2011 |
Jan
(176) |
Feb
(42) |
Mar
(60) |
Apr
(52) |
May
(30) |
Jun
(29) |
Jul
(27) |
Aug
(16) |
Sep
(51) |
Oct
(70) |
Nov
(63) |
Dec
(58) |
| 2012 |
Jan
(28) |
Feb
(26) |
Mar
(7) |
Apr
(12) |
May
(41) |
Jun
(61) |
Jul
(59) |
Aug
(38) |
Sep
(30) |
Oct
(28) |
Nov
(14) |
Dec
(31) |
| 2013 |
Jan
(24) |
Feb
(54) |
Mar
(45) |
Apr
(22) |
May
(35) |
Jun
(8) |
Jul
(18) |
Aug
(38) |
Sep
(11) |
Oct
(8) |
Nov
(19) |
Dec
(20) |
| 2014 |
Jan
(20) |
Feb
(22) |
Mar
(4) |
Apr
(6) |
May
(13) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2015 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
(4) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(8) |
Aug
(13) |
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(3) |
2
(2) |
3
(1) |
4
|
5
|
|
6
(5) |
7
(1) |
8
(2) |
9
(6) |
10
(4) |
11
|
12
|
|
13
|
14
|
15
|
16
|
17
|
18
|
19
(1) |
|
20
(2) |
21
(7) |
22
(2) |
23
(6) |
24
(1) |
25
(7) |
26
(3) |
|
27
(1) |
28
(6) |
29
|
30
|
31
|
|
|
|
From: <gok...@us...> - 2011-03-28 12:29:45
|
Revision: 107
http://tutos.svn.sourceforge.net/tutos/?rev=107&view=rev
Author: gokohnert
Date: 2011-03-28 12:29:39 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
more svn fix
Modified Paths:
--------------
trunk/php/subversion/svn_access.php
trunk/php/subversion/svn_check.php
trunk/php/subversion/svn_notify.php
Modified: trunk/php/subversion/svn_access.php
===================================================================
--- trunk/php/subversion/svn_access.php 2011-03-28 12:08:36 UTC (rev 106)
+++ trunk/php/subversion/svn_access.php 2011-03-28 12:29:39 UTC (rev 107)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2000 - 2009 by Gero Kohnert
+ * Copyright 2000 - 2011 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,45 +10,43 @@
* @module note_notify
* @package svn
*/
-Header("Content-type: text/plain");
-
$tutos['base'] = "../..";
ini_set("include_path","..");
require_once 'webelements.p3';
require_once 'permission.p3';
require_once 'auth/auth_cmdline.pinc';
-loadmodule('svn');
-
-class dummy extends tutos_base {
-}
-
-$tutos[authtype] = "cmdline";
-
-if ( ! isset($_GET['dbnr']) ) {
- $dbnr = 0;
-} else {
+if ( isset($_GET['dbnr']) ) {
$dbnr = $_GET['dbnr'];
+} else if (getParameter('dbnr') != '') {
+ $dbnr = getParameter('dbnr');
+} else {
+ $dbnr = 0;
}
-
$_SESSION['dbnr'] = $dbnr;
$dbconn = DB_Open($dbnr);
-
$current_user = new tutos_user($dbconn);
$current_user->f_name = "TUTOS";
$current_user->l_name = "(svnroot)";
$current_user->admin = 1;
-$msg = '';
+// The current user may see and use SVN Entries
$current_user->p[usesvn] = PERM_SEE | PERM_USE;
+read_config_values_by_tag($current_user->dbconn,array('product','task','main','timetrack'));
+loadmodule('svn');
+
+class dummy extends tutos_base {
+}
+
+$tutos[authtype] = "cmdline";
+
ReadLang($lang);
loadmodules('svn','show');
loadmodule('svn');
loadmodule('watchlist');
+Header("Content-type: text/plain");
-
-
function add_team($i,&$obj,&$svn) {
global $grp_team;
Modified: trunk/php/subversion/svn_check.php
===================================================================
--- trunk/php/subversion/svn_check.php 2011-03-28 12:08:36 UTC (rev 106)
+++ trunk/php/subversion/svn_check.php 2011-03-28 12:29:39 UTC (rev 107)
@@ -6,6 +6,8 @@
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; version 2 of the License.
*
+ * Check if a svn commit is allowed or at least one of the changed files requires a log entry
+ *
* @modulegroup svn
* @module note_notify
* @package svn
@@ -29,15 +31,15 @@
$current_user->f_name = "TUTOS";
$current_user->l_name = "(svn check)";
$current_user->admin = 1;
+$current_user->p[usesvn] = PERM_SEE | PERM_USE;
read_config_values_by_tag($current_user->dbconn,array('product','task','main','timetrack'));
ReadLang($lang);
+// Results are given as plain text
Header("Content-type: text/plain");
-
$msg = '';
-$current_user->p[usesvn] = PERM_SEE | PERM_USE;
loadmodules('svn','show');
loadmodule('svn');
Modified: trunk/php/subversion/svn_notify.php
===================================================================
--- trunk/php/subversion/svn_notify.php 2011-03-28 12:08:36 UTC (rev 106)
+++ trunk/php/subversion/svn_notify.php 2011-03-28 12:29:39 UTC (rev 107)
@@ -1,38 +1,43 @@
<?php
/**
- * Copyright 2000 - 2010 by Gero Kohnert
+ * Copyright 2000 - 2011 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.
*
+ * Notifies everybody who is interested about the changed files
+ *
* @modulegroup svn
* @module note_notify
* @package svn
*/
-Header("Content-type: text/plain");
-
$tutos['base'] = "../..";
ini_set("include_path","..");
require_once 'webelements.p3';
require_once 'permission.p3';
-if ( ! isset($_GET['dbnr']) ) {
+if ( isset($_GET['dbnr']) ) {
+ $dbnr = $_GET['dbnr'];
+} else if (getParameter('dbnr') != '') {
+ $dbnr = getParameter('dbnr');
+} else {
$dbnr = 0;
-} else {
- $dbnr = $_GET['dbnr'];
}
$_SESSION['dbnr'] = $dbnr;
$dbconn = DB_Open($dbnr);
-
$current_user = new tutos_user($dbconn);
$current_user->f_name = "TUTOS";
-$current_user->l_name = "(remember service)";
+$current_user->l_name = "(svn service)";
$current_user->admin = 1;
-$msg = '';
+// The current user may see and use SVN Entries
$current_user->p[usesvn] = PERM_SEE | PERM_USE;
+read_config_values_by_tag($current_user->dbconn,array('product','task','main','timetrack'));
+Header("Content-type: text/plain");
+$msg = '';
+
ReadLang($lang);
loadmodules('svn','show');
loadmodule('svn');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-28 12:08:42
|
Revision: 106
http://tutos.svn.sourceforge.net/tutos/?rev=106&view=rev
Author: gokohnert
Date: 2011-03-28 12:08:36 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
moved getParameter to webelements
Modified Paths:
--------------
trunk/php/check.php
Modified: trunk/php/check.php
===================================================================
--- trunk/php/check.php 2011-03-28 12:08:05 UTC (rev 105)
+++ trunk/php/check.php 2011-03-28 12:08:36 UTC (rev 106)
@@ -26,16 +26,6 @@
require_once 'appointment.pinc';
require_once 'task.pinc';
-function getParameter($x) {
- if (!isset($_SERVER['argc'])) return '';
- for ($i = 0 ; $i < $_SERVER['argc']; $i++ ) {
- if ($_SERVER['argv'][$i] == "-".$x) {
- $r = $_SERVER['argv'][$i+1];
- return $r;
- }
- }
- return '';
-}
if ( isset($_GET['dbnr']) ) {
$dbnr = $_GET['dbnr'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-28 12:08:10
|
Revision: 105
http://tutos.svn.sourceforge.net/tutos/?rev=105&view=rev
Author: gokohnert
Date: 2011-03-28 12:08:05 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
added getParameter function
Modified Paths:
--------------
trunk/php/webelements.p3
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-03-28 12:07:13 UTC (rev 104)
+++ trunk/php/webelements.p3 2011-03-28 12:08:05 UTC (rev 105)
@@ -28,6 +28,20 @@
@require_once 'custom.pinc';
/**
+ * get a paramater from commandline
+ */
+function getParameter($x) {
+ if (!isset($_SERVER['argc'])) return '';
+ for ($i = 0 ; $i < $_SERVER['argc']; $i++ ) {
+ if ($_SERVER['argv'][$i] == "-".$x) {
+ $r = $_SERVER['argv'][$i+1];
+ return $r;
+ }
+ }
+ return '';
+}
+
+/**
* load the layout engine
*/
Function loadlayout() {
@@ -778,18 +792,18 @@
/**
* format a value for use with csv files from "http://de2.php.net/manual/en/function.fputcsv.php#87120"
-*/
-function txt2csv ($val, $delimiter = ';', $enclosure = '"') {
- $delimiter_esc = preg_quote($delimiter, '/');
- $enclosure_esc = preg_quote($enclosure, '/');
+ */
+ function txt2csv ($val, $delimiter = ';', $enclosure = '"') {
+ $delimiter_esc = preg_quote($delimiter, '/');
+ $enclosure_esc = preg_quote($enclosure, '/');
- $r = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $val) ? (
- $enclosure . str_replace($enclosure, $enclosure . $enclosure, $val) . $enclosure
- ) : $val;
+ $r = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $val) ? (
+ $enclosure . str_replace($enclosure, $enclosure . $enclosure, $val) . $enclosure
+ ) : $val;
- return $r.$delimiter;
-}
+ return $r.$delimiter;
+ }
/**
* remove html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-28 12:07:19
|
Revision: 104
http://tutos.svn.sourceforge.net/tutos/?rev=104&view=rev
Author: gokohnert
Date: 2011-03-28 12:07:13 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/subversion/svn_check.php
Modified: trunk/php/subversion/svn_check.php
===================================================================
--- trunk/php/subversion/svn_check.php 2011-03-28 07:28:55 UTC (rev 103)
+++ trunk/php/subversion/svn_check.php 2011-03-28 12:07:13 UTC (rev 104)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2000 - 2010 by Gero Kohnert
+ * Copyright 2000 - 2011 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -14,25 +14,28 @@
ini_set("include_path","..");
require_once 'webelements.p3';
require_once 'permission.p3';
+require_once 'product.pinc';
-
-
-ReadLang($lang);
-
-Header("Content-type: text/plain");
-
-if ( ! isset($_GET['dbnr']) ) {
+if ( isset($_GET['dbnr']) ) {
+ $dbnr = $_GET['dbnr'];
+} else if (getParameter('dbnr') != '') {
+ $dbnr = getParameter('dbnr');
+} else {
$dbnr = 0;
-} else {
- $dbnr = $_GET['dbnr'];
}
$_SESSION['dbnr'] = $dbnr;
$dbconn = DB_Open($dbnr);
-
$current_user = new tutos_user($dbconn);
$current_user->f_name = "TUTOS";
$current_user->l_name = "(svn check)";
$current_user->admin = 1;
+read_config_values_by_tag($current_user->dbconn,array('product','task','main','timetrack'));
+
+ReadLang($lang);
+
+Header("Content-type: text/plain");
+
+
$msg = '';
$current_user->p[usesvn] = PERM_SEE | PERM_USE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-28 07:29:02
|
Revision: 103
http://tutos.svn.sourceforge.net/tutos/?rev=103&view=rev
Author: gokohnert
Date: 2011-03-28 07:28:55 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
added missing text
Modified Paths:
--------------
trunk/php/expense/fr.p3
trunk/php/expense/hu.p3
trunk/php/expense/tw.p3
trunk/php/expense/zh.p3
trunk/php/timetrack/ca.p3
trunk/php/timetrack/cs.p3
trunk/php/timetrack/de.p3
trunk/php/timetrack/el.p3
trunk/php/timetrack/en.p3
trunk/php/timetrack/es-mx.p3
trunk/php/timetrack/es-ni.p3
trunk/php/timetrack/es-ve.p3
trunk/php/timetrack/es.p3
trunk/php/timetrack/fr.p3
trunk/php/timetrack/hu.p3
trunk/php/timetrack/it.p3
trunk/php/timetrack/ja.p3
trunk/php/timetrack/ko.p3
trunk/php/timetrack/nl.p3
trunk/php/timetrack/pl.p3
trunk/php/timetrack/pt-br.p3
trunk/php/timetrack/pt.p3
trunk/php/timetrack/ru.p3
trunk/php/timetrack/sv.p3
trunk/php/timetrack/tw.p3
trunk/php/timetrack/vi.p3
trunk/php/timetrack/zh.p3
Modified: trunk/php/expense/fr.p3
===================================================================
--- trunk/php/expense/fr.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/expense/fr.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -36,6 +36,7 @@
$lang['ExpenseCategory'] = "Categorie";
$lang['ExpenseReason'] = "Raison";
$lang['ExpensePeople'] = "Personnes";
+$lang['ExpenseQuantity'] = 'Quantity';
$lang['ExpenseGAmountAll'] = "Montant Brut total";
$lang['ExpenseGAmount'] = "Montant Brut";
$lang['ExpenseNAmount'] = "Montant Net";
@@ -83,4 +84,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/expense/hu.p3
===================================================================
--- trunk/php/expense/hu.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/expense/hu.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -36,6 +36,7 @@
$lang['ExpenseCategory'] = "Kategória";
$lang['ExpenseReason'] = "Ok";
$lang['ExpensePeople'] = "Emberek";
+$lang['ExpenseQuantity'] = 'Quantity';
$lang['ExpenseGAmountAll'] = "Átlagos bruttó összeg";
$lang['ExpenseGAmount'] = "Bruttó összeg";
$lang['ExpenseNAmount'] = "Nettó összeg";
@@ -83,4 +84,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/expense/tw.p3
===================================================================
--- trunk/php/expense/tw.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/expense/tw.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -36,6 +36,7 @@
$lang['ExpenseCategory'] = "分類";
$lang['ExpenseReason'] = "原因";
$lang['ExpensePeople'] = "人員";
+$lang['ExpenseQuantity'] = 'Quantity';
$lang['ExpenseGAmountAll'] = "整體總開支";
$lang['ExpenseGAmount'] = "總金額";
$lang['ExpenseNAmount'] = "淨金額";
@@ -46,6 +47,7 @@
$lang['ExpenseStartTime'] = "開始時間";
$lang['ExpenseEndTime'] = "終結時間";
$lang['ExpenseLinkInfo'] = "來自 %s 的開支";
+$lang['ExpenseSupplier'] = 'Supplier';
$lang['ExpenseCategories'] = array();
$lang['ExpenseCategories'][1] = "租用車輛";
Modified: trunk/php/expense/zh.p3
===================================================================
--- trunk/php/expense/zh.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/expense/zh.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -36,6 +36,7 @@
$lang['ExpenseCategory'] = "分类";
$lang['ExpenseReason'] = "原因";
$lang['ExpensePeople'] = "人员";
+$lang['ExpenseQuantity'] = 'Quantity';
$lang['ExpenseGAmountAll'] = "整体总开支";
$lang['ExpenseGAmount'] = "总金额";
$lang['ExpenseNAmount'] = "净金额";
@@ -46,6 +47,7 @@
$lang['ExpenseStartTime'] = "开始时间";
$lang['ExpenseEndTime'] = "终结时间";
$lang['ExpenseLinkInfo'] = "來自 %s 的开支";
+$lang['ExpenseSupplier'] = 'Supplier';
$lang['ExpenseCategories'] = array();
$lang['ExpenseCategories'][1] = "租用车辆";
Modified: trunk/php/timetrack/ca.p3
===================================================================
--- trunk/php/timetrack/ca.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/ca.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Hores de treball fetes';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'Utilitzar gestió parts';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/cs.p3
===================================================================
--- trunk/php/timetrack/cs.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/cs.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Ukončeno';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Množství hotovo';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'použít záznam času';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/de.p3
===================================================================
--- trunk/php/timetrack/de.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/de.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'abschliessen';
$lang['TTRefFinished'] = 'abgeschlossen ?';
$lang['TTVolumeDone'] = 'Bearbeitet';
+$lang['ConfigHelpTTStateSTC'] = 'Zustandsmodell für Aufwände';
+$lang['ConfigHelpTTDefaultState'] = 'anfänglicher Status für Aufwände';
$lang['perm'][usetimetrack] = 'Zeiterfassung';
$lang['timetrack'] = &$lang['Timetrack'];
@@ -46,4 +48,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
+?>
\ No newline at end of file
Modified: trunk/php/timetrack/el.p3
===================================================================
--- trunk/php/timetrack/el.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/el.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Ολοκληρωμένος όγκος εργασίας';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'χρήση χρονικής καταγραφής';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/en.p3
===================================================================
--- trunk/php/timetrack/en.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/en.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Volume done';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'use timetracking';
$lang['timetrack'] = &$lang['Timetrack'];
@@ -46,4 +48,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
+?>
\ No newline at end of file
Modified: trunk/php/timetrack/es-mx.p3
===================================================================
--- trunk/php/timetrack/es-mx.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/es-mx.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Horas de trabajo hechas';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'usar timetrack';
$lang['timetrack'] = &$lang['Timetrack'];
@@ -46,4 +48,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/timetrack/es-ni.p3
===================================================================
--- trunk/php/timetrack/es-ni.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/es-ni.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -39,6 +39,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Horas de trabajo hechas';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'use control de tiempo';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/es-ve.p3
===================================================================
--- trunk/php/timetrack/es-ve.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/es-ve.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finalizado';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Horas de trabajo hechas';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'usar timetrack';
$lang['timetrack'] = &$lang['Timetrack'];
@@ -46,4 +48,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/timetrack/es.p3
===================================================================
--- trunk/php/timetrack/es.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/es.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Terminar';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Horas de trabajo hechas';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'Usar gestión de tiempo';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/fr.p3
===================================================================
--- trunk/php/timetrack/fr.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/fr.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Fini';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Travail effectué';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'Enregistrer au journal';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/hu.p3
===================================================================
--- trunk/php/timetrack/hu.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/hu.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Befejezés';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Elvégzett munkamennyiség';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'időnyilvántartás használata';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/it.p3
===================================================================
--- trunk/php/timetrack/it.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/it.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Fine';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Volume eseguito';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'Usa timetrack';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/ja.p3
===================================================================
--- trunk/php/timetrack/ja.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/ja.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = '終了';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'なされた労働';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'タイムトラック';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/ko.p3
===================================================================
--- trunk/php/timetrack/ko.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/ko.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = '수행된 시간';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'use timetrack';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/nl.p3
===================================================================
--- trunk/php/timetrack/nl.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/nl.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Klaar';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Volume gereed';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'gebruik timetrack';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/pl.p3
===================================================================
--- trunk/php/timetrack/pl.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/pl.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Koniec';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Wykonanie';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'używanie śledzenia czasu';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/pt-br.p3
===================================================================
--- trunk/php/timetrack/pt-br.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/pt-br.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Finish';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Volume feito';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'use timetrack';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/pt.p3
===================================================================
--- trunk/php/timetrack/pt.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/pt.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Concluído';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Volume realizado';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'usar REGISTO DE HORAS';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/ru.p3
===================================================================
--- trunk/php/timetrack/ru.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/ru.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Конец';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Объем выполненных работ';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'затраты времени';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/sv.p3
===================================================================
--- trunk/php/timetrack/sv.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/sv.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Avsluta';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Volym klar';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'Tidsrapporter';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/tw.p3
===================================================================
--- trunk/php/timetrack/tw.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/tw.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = '結束';
$lang['TTRefFinished'] = '已完成 ?';
$lang['TTVolumeDone'] = '已完成的工作量';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = '使用工作記錄';
$lang['timetrack'] = &$lang['Timetrack'];
@@ -46,4 +48,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/timetrack/vi.p3
===================================================================
--- trunk/php/timetrack/vi.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/vi.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = 'Kết thúc';
$lang['TTRefFinished'] = 'finished ?';
$lang['TTVolumeDone'] = 'Khá»i lượng hoà n thà nh';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = 'Theo dõi thực thi';
$lang['timetrack'] = &$lang['Timetrack'];
Modified: trunk/php/timetrack/zh.p3
===================================================================
--- trunk/php/timetrack/zh.p3 2011-03-28 07:26:16 UTC (rev 102)
+++ trunk/php/timetrack/zh.p3 2011-03-28 07:28:55 UTC (rev 103)
@@ -38,6 +38,8 @@
$lang['TTfinish'] = '结束';
$lang['TTRefFinished'] = '已完成 ?';
$lang['TTVolumeDone'] = '已完成的工作量';
+$lang['ConfigHelpTTStateSTC'] = 'Statetransition Model for Timetracks';
+$lang['ConfigHelpTTDefaultState'] = 'Default State for new timetrack entries';
$lang['perm'][usetimetrack] = '使用工作记录';
$lang['timetrack'] = &$lang['Timetrack'];
@@ -46,4 +48,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-28 07:26:22
|
Revision: 102
http://tutos.svn.sourceforge.net/tutos/?rev=102&view=rev
Author: gokohnert
Date: 2011-03-28 07:26:16 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
added timetrack to landiff test
Modified Paths:
--------------
trunk/Makefile
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-03-27 08:03:57 UTC (rev 101)
+++ trunk/Makefile 2011-03-28 07:26:16 UTC (rev 102)
@@ -77,7 +77,7 @@
$(LIBS_FCKEDITOR) \
$(LIBS_PHPBARCODE)
-SUBDIRS = localization admin bugtracking checklist counter doctracker expense file group installation invoice ldap mailbox module_template note palm phpweather rate reminder report-engine resource rss scrum subversion stc stuff testmanager ticker url watchlist xml
+SUBDIRS = localization admin bugtracking checklist counter doctracker expense file group installation invoice ldap mailbox module_template note palm phpweather rate reminder report-engine resource rss scrum subversion stc stuff timetrack testmanager ticker url watchlist xml
PHP_TOP = $(wildcard php/*.php) \
$(wildcard php/*.p3) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-27 08:04:03
|
Revision: 101
http://tutos.svn.sourceforge.net/tutos/?rev=101&view=rev
Author: gokohnert
Date: 2011-03-27 08:03:57 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/mailbox/mconfig.pinc
Modified: trunk/php/mailbox/mconfig.pinc
===================================================================
--- trunk/php/mailbox/mconfig.pinc 2011-03-26 20:09:11 UTC (rev 100)
+++ trunk/php/mailbox/mconfig.pinc 2011-03-27 08:03:57 UTC (rev 101)
@@ -44,14 +44,19 @@
$tutos[modulesinc]['mailbox'][] = 'scheme';
$tutos[modulesinc]['mailbox'][] = 'check';
-if ( ($tutos[usemailboxes] != 0) && (!function_exists('imap')) ) {
- if( function_exists('dl') ) {
- if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
- dl('php_imap.dll');
- } else {
- dl('imap.so');
+if ( $tutos[usemailboxes] != 0 ) {
+ if (!extension_loaded('imap')) {
+ if( function_exists('dl') ) {
+ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+ dl('php_imap.dll');
+ } else {
+ dl('imap.so');
+ }
}
}
+ if (!extension_loaded('imap')) {
+ $tutos[usemailboxes] = 0;
+ }
} else {
$tutos[usemailboxes] = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-26 20:09:17
|
Revision: 100
http://tutos.svn.sourceforge.net/tutos/?rev=100&view=rev
Author: gokohnert
Date: 2011-03-26 20:09:11 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
use tabs in config
Modified Paths:
--------------
trunk/html/blue.css
trunk/html/default.css
trunk/html/nuke.css
trunk/html/white.css
trunk/php/admin/main_config.php
trunk/php/layout/layout_base.pinc
Modified: trunk/html/blue.css
===================================================================
--- trunk/html/blue.css 2011-03-26 14:04:29 UTC (rev 99)
+++ trunk/html/blue.css 2011-03-26 20:09:11 UTC (rev 100)
@@ -8,6 +8,9 @@
*
*/
+.ui-widget-content { border: 1px solid #89adc0 ; color: black; background: #789cc0}
+.ui-widget-header { color: black; border: 0px solid black; background: #304c78 ; font-weight: bold; }
+
.aclvirt {
background: #FFDFFF;
}
Modified: trunk/html/default.css
===================================================================
--- trunk/html/default.css 2011-03-26 14:04:29 UTC (rev 99)
+++ trunk/html/default.css 2011-03-26 20:09:11 UTC (rev 100)
@@ -15,6 +15,9 @@
*
*/
+.ui-tabs .ui-tabs-panel { padding: 0.2em 0.2em; }
+.ui-tabs { padding: 0em; }
+
#datafield {
text-align: left;
}
Modified: trunk/html/nuke.css
===================================================================
--- trunk/html/nuke.css 2011-03-26 14:04:29 UTC (rev 99)
+++ trunk/html/nuke.css 2011-03-26 20:09:11 UTC (rev 100)
@@ -9,6 +9,9 @@
*
*/
+.ui-widget-content { border: 1px solid #ddd ; color: black; background: #ececec}
+.ui-widget-header { color: black; border: 0px solid black; background: #dedebb ; font-weight: bold; }
+
h1 {
font-size: 18pt;
text-align: center;
Modified: trunk/html/white.css
===================================================================
--- trunk/html/white.css 2011-03-26 14:04:29 UTC (rev 99)
+++ trunk/html/white.css 2011-03-26 20:09:11 UTC (rev 100)
@@ -8,6 +8,9 @@
*
*/
+.ui-widget-content { border: 1px solid #ccc ; color: black; background: #f8f8f8}
+.ui-widget-header { color: black; border: 0px solid black; background: #B8B8B8 ; font-weight: bold; }
+
.aclvirt {
background: #FFE8E8;
}
Modified: trunk/php/admin/main_config.php
===================================================================
--- trunk/php/admin/main_config.php 2011-03-26 14:04:29 UTC (rev 99)
+++ trunk/php/admin/main_config.php 2011-03-26 20:09:11 UTC (rev 100)
@@ -31,11 +31,21 @@
$r = '';
$r .= "<form id=\"mainconfig\" name=\"mainconfig\" action=\"main_config.php\" method=\"post\">\n";
- $r .= $this->DataTableStart();
$line = 0;
+ $r .= '<div id="mytab">';
+ $r .= '<ul>';
+ $r .= '<li><a href="#tutos">TUTOS</a></a>';
+ $r .= '<li><a href="#network">Network</a></a>';
+ $r .= '<li><a href="#fiscal">Fiscal</a></a>';
+ $r .= '<li><a href="#layout">'.$lang['UserLayout'].'</a></a>';
+ $r .= '<li><a href="#mail">'.$lang['MailboxEmail'].'</a></a>';
+ $r .= '<li><a href="#product">'.$lang['ProductP'].'</a></a>';
+ $r .= '<li><a href="#task">'.$lang['Task'].'</a></a>';
+ $r .= '</ul>';
-
+ $r .= '<div id="tutos">';
+ $r .= $this->DataTableStart();
// time to live
$r .= $this->OverviewRowStart($line);
$r .= $this->showfield('timetolive');
@@ -43,8 +53,12 @@
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpTimeToLive']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+ $r .= '<div id="network">';
+ $r .= $this->DataTableStart();
// Network
$r .= $this->OverviewRowStart($line);
$r .= '<th colspan="4">Network</th>';
@@ -73,7 +87,11 @@
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpResolveHost']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+ $r .= '<div id="fiscal">';
+ $r .= $this->DataTableStart();
// Fiscal
$r .= $this->OverviewRowStart($line);
$r .= '<th colspan="4">Fiscal</th>';
@@ -98,10 +116,15 @@
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpVatList']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+
+ $r .= '<div id="layout">';
+ $r .= $this->DataTableStart();
// LAYOUT
$r .= $this->OverviewRowStart($line);
- $r .= '<th colspan="4">LAYOUT</th>';
+ $r .= '<th colspan="4">'.$lang['UserLayout'].'</th>';
$r .= $this->OverviewRowEnd($line++);
// LOGO
@@ -143,10 +166,14 @@
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShort']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+ $r .= '<div id="mail">';
+ $r .= $this->DataTableStart();
// MAIL
$r .= $this->OverviewRowStart($line);
- $r .= '<th colspan="4">MAIL</th>';
+ $r .= '<th colspan="4">'.$lang['MailboxEmail'].'</th>';
$r .= $this->OverviewRowEnd($line++);
// Mail Stuff
@@ -194,10 +221,14 @@
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpSmtpPass']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+ $r .= '<div id="product">';
+ $r .= $this->DataTableStart();
// PRODUCT / PROJECT
$r .= $this->OverviewRowStart($line);
- $r .= '<th colspan="4">PRODUCT / PROJECT</th>';
+ $r .= '<th colspan="4">'.$lang['ProductP'].'</th>';
$r .= $this->OverviewRowEnd($line++);
// PRODUCT STATE
@@ -257,12 +288,15 @@
$r .= '<td><input type="checkbox" name="prod_classify" '.($tutos['prod_classify'] == 1 ? 'checked="checked"':'').'value="1">';
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpProdClassify']).'</pre></td>';
-
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+ $r .= '<div id="task">';
+ $r .= $this->DataTableStart();
// TASK
$r .= $this->OverviewRowStart($line);
- $r .= '<th colspan="4">TASK</th>';
+ $r .= '<th colspan="4">'.$lang['Task'].'</th>';
$r .= $this->OverviewRowEnd($line++);
// Task State
$r .= $this->OverviewRowStart($line);
@@ -352,18 +386,30 @@
$r .= '</input></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpTaskSkipFinished']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ $r .= $this->DataTableEnd();
+ $r .= '</div>';
+ $r .= '</div>';
+
+ $r .= $this->DataTableStart();
$r .= '<tr>';
$r .= submit_reset(0,1,1,1,1,0);
$r .= '</tr>';
+ $r .= $this->DataTableEnd();
- $r .= $this->DataTableEnd();
$this->addHidden("save", 1);
$r .= hiddenFormElements();
$r .= $this->getHidden();
$r .= "</form>\n";
+
+ $tutos['pagescript'] .= '
+ $(function() {
+ $( "#mytab" ).tabs({ fx: { opacity: \'toggle\' } });
+ });
+';
return $r;
}
+
/**
*
*/
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2011-03-26 14:04:29 UTC (rev 99)
+++ trunk/php/layout/layout_base.pinc 2011-03-26 20:09:11 UTC (rev 100)
@@ -236,6 +236,7 @@
global $tutos;
$r = '';
+ $r .= $this->add_css_link($tutos['base'] .'/html/css/ui-lightness/jquery-ui-1.8.9.custom.css');
$r .= $this->add_css_link($tutos['base'] .'/html/default.css');
$r .= $this->add_css_link($tutos['base'] .'/html/'.$this->getLayoutName() .'.css');
@@ -243,7 +244,6 @@
$r .= $this->add_css_link('default.css');
$r .= $this->add_css_link($tutos['base'] .'/html/custom.css');
# $r .= $this->add_css_link($tutos['base'] .'/html/css/smoothness/jquery-ui-1.8.9.custom.css');
- $r .= $this->add_css_link($tutos['base'] .'/html/css/ui-lightness/jquery-ui-1.8.9.custom.css');
$r .= $this->add_css_link('custom.css');
return $r;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-26 14:04:35
|
Revision: 99
http://tutos.svn.sourceforge.net/tutos/?rev=99&view=rev
Author: gokohnert
Date: 2011-03-26 14:04:29 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
props
Property Changed:
----------------
trunk/php/checklist/
trunk/php/expense/
trunk/php/file/
trunk/php/stuff/
Property changes on: trunk/php/checklist
___________________________________________________________________
Added: svn:ignore
+ *_custom.p3
Property changes on: trunk/php/expense
___________________________________________________________________
Added: svn:ignore
+ *_custom.p3
Property changes on: trunk/php/file
___________________________________________________________________
Added: svn:ignore
+ *_custom.p3
Property changes on: trunk/php/stuff
___________________________________________________________________
Added: svn:ignore
+ *_custom.p3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-26 13:32:44
|
Revision: 98
http://tutos.svn.sourceforge.net/tutos/?rev=98&view=rev
Author: gokohnert
Date: 2011-03-26 13:32:39 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
cleanup
Removed Paths:
-------------
trunk/php/report-engine/rep_directory/templates/CVS/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 20:34:55
|
Revision: 97
http://tutos.svn.sourceforge.net/tutos/?rev=97&view=rev
Author: gokohnert
Date: 2011-03-25 20:34:49 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/database_show.php
Modified: trunk/php/database_show.php
===================================================================
--- trunk/php/database_show.php 2011-03-25 20:24:31 UTC (rev 96)
+++ trunk/php/database_show.php 2011-03-25 20:34:49 UTC (rev 97)
@@ -98,11 +98,11 @@
$r .= "</tr><tr>\n";
$r .= $this->showfield($lang['CfgLogo']);
- $r .= $this->showdata('<strike>'.$this->obj->logo.'</strike> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3);
+ $r .= $this->showdata('<strike>'.$this->obj->logo.'</strike> (deprecated go '.makelink('admin/main_config.php','here').')',3);
$r .= "</tr><tr>\n";
$r .= $this->showfield($lang['CfgLogoLink']);
- $r .= $this->showdata('<strike>'.$this->obj->logolink.'</strike> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3);
+ $r .= $this->showdata('<strike>'.$this->obj->logolink.'</strike> (deprecated go '.makelink('admin/main_config.php','here').')',3);
$r .= "</tr><tr>\n";
$r .= $this->showfield($lang['CfgBugAutoName']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 20:24:37
|
Revision: 96
http://tutos.svn.sourceforge.net/tutos/?rev=96&view=rev
Author: gokohnert
Date: 2011-03-25 20:24:31 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/php/admin/de.p3
trunk/php/admin/en.p3
trunk/php/admin/hu.p3
trunk/php/admin/sv.p3
Modified: trunk/php/admin/de.p3
===================================================================
--- trunk/php/admin/de.p3 2011-03-25 20:20:14 UTC (rev 95)
+++ trunk/php/admin/de.p3 2011-03-25 20:24:31 UTC (rev 96)
@@ -63,12 +63,12 @@
$lang['ConfigHelpFiscalStartMonth'] = 'Startmonat des Geschäftsjahres. Da GJ ist immer gleich der Jahreszahl in welchem dieser Moinat liegt';
$lang['ConfigHelpProdFinishState'] = 'Produkt/Projekt Status beim automatischen beenden';
$lang['ConfigHelpTTDefaultState'] = 'Default Status für neu gebuchte Zeiten';
-$lang['ConfigHelpMailMode'] = 'How to send out mails';
-$lang['ConfigHelpSendmail'] = 'Mode 1: full unix path to sendmail (like /usr/lib/sendmail)';
-$lang['ConfigHelpSmtpHost'] = 'Mode 2/4: Hostname or IP of SMTP Server for outgoing mails';
-$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnumber of SMTP Server for outgoing mails';
-$lang['ConfigHelpSmtpUser'] = 'Mode 4: User for authentification on outgoing SMTP Server';
-$lang['ConfigHelpSmtpPass'] = 'Mode 4: Password for smtp_username (is stored unencrypted in database !)';
+$lang['ConfigHelpMailMode'] = 'Die Methode zum Aussenden von Mails';
+$lang['ConfigHelpSendmail'] = 'Mode 1: kompletter UNIX pfad zum sendmail Programm (meist /usr/lib/sendmail)';
+$lang['ConfigHelpSmtpHost'] = 'Mode 2/4: Rechnername oder IP des SMTP Servers';
+$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnummer am SMTP Server';
+$lang['ConfigHelpSmtpUser'] = 'Mode 4: Benutzername zur Anmeldung am SMTP Server';
+$lang['ConfigHelpSmtpPass'] = 'Mode 4: Passwort zur Anmeldung am SMTP Server (dieses wird unverschlüsselt in der Datenbank gespeichert !)';
$lang['ConfigHelpLogo'] = 'Logo Image URL. Relative to tutosbase or start with http';
$lang['ConfigHelpLogolink'] = 'URL where to jump on clicking the logo (relative to tutos base or absolut)';
@@ -81,4 +81,4 @@
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/admin/en.p3
===================================================================
--- trunk/php/admin/en.p3 2011-03-25 20:20:14 UTC (rev 95)
+++ trunk/php/admin/en.p3 2011-03-25 20:24:31 UTC (rev 96)
@@ -20,11 +20,6 @@
$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']['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";
@@ -70,8 +65,22 @@
$lang['ConfigHelpFiscalStartMonth'] = 'Start Month of the fiscal year. The fiscal year is always the Yearnumber where the FY starts';
$lang['ConfigHelpProdFinishState'] = 'Product State when automatically finished';
$lang['ConfigHelpTTDefaultState'] = 'Default State for newly booked times';
+$lang['ConfigHelpMailMode'] = 'How to send out mails';
+$lang['ConfigHelpSendmail'] = 'Mode 1: full unix path to sendmail (like /usr/lib/sendmail)';
+$lang['ConfigHelpSmtpHost'] = 'Mode 2/4: Hostname or IP of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnumber of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpUser'] = 'Mode 4: User for authentification on outgoing SMTP Server';
+$lang['ConfigHelpSmtpPass'] = 'Mode 4: Password for smtp_username (is stored unencrypted in database !)';
+$lang['ConfigHelpLogo'] = 'Logo Image URL. Relative to tutosbase or start with http';
+$lang['ConfigHelpLogolink'] = 'URL where to jump on clicking the logo (relative to tutos base or absolut)';
+
+$lang['ConfigMailModes'][0] = '0: No outgoing mails';
+$lang['ConfigMailModes'][1] = '1: use sendmail program';
+$lang['ConfigMailModes'][2] = '2: use SMTP (as defined by host/port)';
+$lang['ConfigMailModes'][4] = '4: use SMTP (as defined by host/port and user/pass)';
+
### Local Variables: ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/admin/hu.p3
===================================================================
--- trunk/php/admin/hu.p3 2011-03-25 20:20:14 UTC (rev 95)
+++ trunk/php/admin/hu.p3 2011-03-25 20:24:31 UTC (rev 96)
@@ -18,10 +18,6 @@
$lang['AdminCCHelp']['repository'] = "fájltárolás elérési útja. Relatív elérési utak a(z) [tutoshome] = ". realpath(getcwd() ."/". $tutos['base'] ." helyen kezdõdnek");
$lang['AdminCCHelp']['dbprefix'] = "elõtag az összes táblanév elé<br />(hagyja üresen, ha nem biztos benne)";
-$lang['AdminCCHelp']['mailmode'] = "";
-$lang['AdminCCHelp']['sendmail'] = "a TUTOS által használandó sendmail elérési útja";
-$lang['AdminCCHelp']['smtphost'] = "";
-
$lang['AdminCCHelp']['demo'] = "demo módban a TUTOS nem engedi a felhasználói bejegyzések megváltoztatását<br />és nem küld ki levelet";
$lang['AdminCCHelp']['debug'] = "a debug információk a megadott elérési útra írandók";
$lang['AdminCCHelp']['errlog'] = "a debug információk fájljának elérési útja";
@@ -67,9 +63,23 @@
$lang['ConfigHelpFiscalStartMonth'] = 'Start Month of the fiscal year. The fiscal year is always the Yearnumber where the FY starts';
$lang['ConfigHelpProdFinishState'] = 'Product State when automatically finished';
$lang['ConfigHelpTTDefaultState'] = 'Default State for newly booked times';
+$lang['ConfigHelpMailMode'] = 'How to send out mails';
+$lang['ConfigHelpSendmail'] = 'Mode 1: full unix path to sendmail (like /usr/lib/sendmail)';
+$lang['ConfigHelpSmtpHost'] = 'Mode 2/4: Hostname or IP of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnumber of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpUser'] = 'Mode 4: User for authentification on outgoing SMTP Server';
+$lang['ConfigHelpSmtpPass'] = 'Mode 4: Password for smtp_username (is stored unencrypted in database !)';
+$lang['ConfigHelpLogo'] = 'Logo Image URL. Relative to tutosbase or start with http';
+$lang['ConfigHelpLogolink'] = 'URL where to jump on clicking the logo (relative to tutos base or absolut)';
+
+$lang['ConfigMailModes'][0] = '0: No outgoing mails';
+$lang['ConfigMailModes'][1] = '1: use sendmail program';
+$lang['ConfigMailModes'][2] = '2: use SMTP (as defined by host/port)';
+$lang['ConfigMailModes'][4] = '4: use SMTP (as defined by host/port and user/pass)';
+
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
Modified: trunk/php/admin/sv.p3
===================================================================
--- trunk/php/admin/sv.p3 2011-03-25 20:20:14 UTC (rev 95)
+++ trunk/php/admin/sv.p3 2011-03-25 20:24:31 UTC (rev 96)
@@ -19,11 +19,6 @@
$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']['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";
@@ -69,9 +64,23 @@
$lang['ConfigHelpFiscalStartMonth'] = 'Start Month of the fiscal year. The fiscal year is always the Yearnumber where the FY starts';
$lang['ConfigHelpProdFinishState'] = 'Product State when automatically finished';
$lang['ConfigHelpTTDefaultState'] = 'Default State for newly booked times';
+$lang['ConfigHelpMailMode'] = 'How to send out mails';
+$lang['ConfigHelpSendmail'] = 'Mode 1: full unix path to sendmail (like /usr/lib/sendmail)';
+$lang['ConfigHelpSmtpHost'] = 'Mode 2/4: Hostname or IP of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnumber of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpUser'] = 'Mode 4: User for authentification on outgoing SMTP Server';
+$lang['ConfigHelpSmtpPass'] = 'Mode 4: Password for smtp_username (is stored unencrypted in database !)';
+$lang['ConfigHelpLogo'] = 'Logo Image URL. Relative to tutosbase or start with http';
+$lang['ConfigHelpLogolink'] = 'URL where to jump on clicking the logo (relative to tutos base or absolut)';
+
+$lang['ConfigMailModes'][0] = '0: No outgoing mails';
+$lang['ConfigMailModes'][1] = '1: use sendmail program';
+$lang['ConfigMailModes'][2] = '2: use SMTP (as defined by host/port)';
+$lang['ConfigMailModes'][4] = '4: use SMTP (as defined by host/port and user/pass)';
+
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
### End: ***
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 20:20:20
|
Revision: 95
http://tutos.svn.sourceforge.net/tutos/?rev=95&view=rev
Author: gokohnert
Date: 2011-03-25 20:20:14 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
better check
Modified Paths:
--------------
trunk/php/db/db_mysql.pinc
trunk/php/db/db_mysqli.pinc
trunk/php/db/db_pg.pinc
trunk/php/db.p3
trunk/php/mail.pinc
Modified: trunk/php/db/db_mysql.pinc
===================================================================
--- trunk/php/db/db_mysql.pinc 2011-03-25 18:18:09 UTC (rev 94)
+++ trunk/php/db/db_mysql.pinc 2011-03-25 20:20:14 UTC (rev 95)
@@ -18,10 +18,14 @@
$tutos['dateformat'][] = 'mysqlformat2';
if (!extension_loaded('mysql')) {
- if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
- dl('php_mysql.dll');
+ if (function_exists('dl')) {
+ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+ dl('php_mysql.dll');
+ } else {
+ dl('mysql.so');
+ }
} else {
- dl('mysql.so');
+ die ('mysql extension not available/loaded in your PHP installation');
}
}
Modified: trunk/php/db/db_mysqli.pinc
===================================================================
--- trunk/php/db/db_mysqli.pinc 2011-03-25 18:18:09 UTC (rev 94)
+++ trunk/php/db/db_mysqli.pinc 2011-03-25 20:20:14 UTC (rev 95)
@@ -18,10 +18,14 @@
$tutos['dateformat'][] = 'mysqlformat2';
if (!extension_loaded('mysqli')) {
- if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
- dl('php_mysqli.dll');
+ if (function_exists('dl')) {
+ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+ dl('php_mysqli.dll');
+ } else {
+ dl('mysqli.so');
+ }
} else {
- dl('mysqli.so');
+ die ('mysqli extension not available/loaded in your PHP installation');
}
}
Modified: trunk/php/db/db_pg.pinc
===================================================================
--- trunk/php/db/db_pg.pinc 2011-03-25 18:18:09 UTC (rev 94)
+++ trunk/php/db/db_pg.pinc 2011-03-25 20:20:14 UTC (rev 95)
@@ -22,10 +22,14 @@
$tutos['dateformat'][] = 'pgformat5';
if (!extension_loaded('pgsql')) {
- if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
- dl('php_pgsql.dll');
+ if (function_exists('dl')) {
+ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+ dl('php_pgsql.dll');
+ } else {
+ dl('pgsql.so');
+ }
} else {
- dl('pgsql.so');
+ die ('pgsql extension not available/loaded in your PHP installation');
}
}
Modified: trunk/php/db.p3
===================================================================
--- trunk/php/db.p3 2011-03-25 18:18:09 UTC (rev 94)
+++ trunk/php/db.p3 2011-03-25 20:20:14 UTC (rev 95)
@@ -390,10 +390,14 @@
$tutos['dateformat'] = array();
if ( !extension_loaded('gd')) {
- if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
- @dl('php_gd.dll');
+ if (function_exists('dl')) {
+ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+ @dl('php_gd.dll');
+ } else {
+ @dl('gd.so');
+ }
} else {
- @dl('gd.so');
+ die ('gd extension not available/loaded in your PHP installation');
}
}
Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc 2011-03-25 18:18:09 UTC (rev 94)
+++ trunk/php/mail.pinc 2011-03-25 20:20:14 UTC (rev 95)
@@ -1425,6 +1425,7 @@
global $tutos;
$msg = '';
+ if ($tutos['mailmode'] == MAILMODE_NOMAIL) return;
if ( $tutos['mailmode'] == MAILMODE_SENDMAIL ) {
$this->fd = popen($tutos['sendmail']." -t -i","w");
if ( $this->fd == false ) {
@@ -1529,6 +1530,8 @@
* write to smtp channel
*/
function writechannel($str) {
+ global $tutos;
+ if ($tutos['mailmode'] == MAILMODE_NOMAIL) return;
fputs($this->fd,$str.$this->eoln) || die ("Error writing to mail channel");
}
@@ -1539,6 +1542,7 @@
function readsmtp(&$msg) {
global $tutos;
+ if ($tutos['mailmode'] == MAILMODE_NOMAIL) return true;
if ( ($tutos['mailmode'] != MAILMODE_SMTP) && ($tutos['mailmode'] != MAILMODE_SMTP_EHLO) ) {
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 18:18:15
|
Revision: 94
http://tutos.svn.sourceforge.net/tutos/?rev=94&view=rev
Author: gokohnert
Date: 2011-03-25 18:18:09 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/check.php
Modified: trunk/php/check.php
===================================================================
--- trunk/php/check.php 2011-03-25 14:04:03 UTC (rev 93)
+++ trunk/php/check.php 2011-03-25 18:18:09 UTC (rev 94)
@@ -50,6 +50,7 @@
$current_user->f_name = 'TUTOS';
$current_user->l_name = '(remember service)';
$current_user->admin = 1;
+read_config_values_by_tag($current_user->dbconn,array('product','task','main','timetrack'));
$msg = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 14:04:10
|
Revision: 93
http://tutos.svn.sourceforge.net/tutos/?rev=93&view=rev
Author: gokohnert
Date: 2011-03-25 14:04:03 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
more prepared statements
Modified Paths:
--------------
trunk/php/admin/backup.php
trunk/php/base.pinc
trunk/php/db/db_mysqli.pinc
trunk/php/db/table.pinc
trunk/php/drawboard/README
trunk/php/file/file.pinc
trunk/php/layout/new2_layout.pinc
trunk/php/webelements.p3
Modified: trunk/php/admin/backup.php
===================================================================
--- trunk/php/admin/backup.php 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/admin/backup.php 2011-03-25 14:04:03 UTC (rev 93)
@@ -4,8 +4,8 @@
*
* Backup repository and Database
*
- *
*
+ *
* @modulegroup ADMIN
* @module backup
* @package BASE
@@ -42,7 +42,7 @@
function zipdir($dir,$base,$zip) {
if (! is_dir($dir)) return;
if (! is_readable($dir)) return;
-# $zip->addFile($dir,$base);
+ # $zip->addFile($dir,$base);
$zip->setCommentName($base,$dir);
if (! $dh = opendir($dir)) return;
while (($entry = readdir($dh)) !== false) {
@@ -97,7 +97,7 @@
$zip->setArchiveComment($tutos[dbalias][$dbnr]);
$zip->close();
- showzip($zipname);
+ echo showzip($zipname);
} else {
chdir(dirname($tutos['base'].'/'.$tutos[repository][$dbnr]));
$cmd = "zip -9 -r ". $zipname .' '. basename($tutos['base'].'/'.$tutos[repository][$dbnr]);
@@ -128,6 +128,6 @@
echo "</body></html>";
?>
<!--
- SVN Info $Id$
- $Author$
+SVN Info $Id$
+$Author$
-->
\ No newline at end of file
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/base.pinc 2011-03-25 14:04:03 UTC (rev 93)
@@ -243,22 +243,24 @@
// TODO: save description
// read relations
- $q = 'SELECT rel_id,type_id,description from '.$this->dbconn->prefix.$this->tablename_rel . ' WHERE obj_id = '.$this->id;
- $rr = $this->dbconn->Exec($q);
- $n = $rr->numrows();
- $a = 0;
- while ($a < $n) {
- $this->relations[$rr->get($a,'type_id')][$rr->get($a,'rel_id')] = 1;
- $a++;
+ if ($this->dbconn->prep) {
+ $this->dbconn->addPStatement('SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = $1 or rel_id = $2','BASEREL');
+ $rr = $this->dbconn->execPStatement('BASEREL',1,$this->id,$this->id);
+ } else {
+ $q = 'SELECT * from '.$this->dbconn->prefix.$this->tablename_rel.' WHERE obj_id = '.$this->id.' or rel_id = '.$this->id;
+ $rr = $this->dbconn->Exec($q);
}
- $rr->free();
- // back relations
- $q = 'SELECT obj_id,type_id,description from '.$this->dbconn->prefix.$this->tablename_rel . ' WHERE rel_id = '.$this->id;
- $rr = $this->dbconn->Exec($q);
$n = $rr->numrows();
$a = 0;
while ($a < $n) {
- $this->back_relations[$rr->get($a,'type_id')][$rr->get($a,'obj_id')] = 1;
+ $o = $rr->get($a,'obj_id');
+ $b = $rr->get($a,'rel_id');
+ if ($o == $this->id) {
+ $this->relations[$rr->get($a,'type_id')][$b] = 1;
+ }
+ if ($b == $this->id) {
+ $this->back_relations[$rr->get($a,'type_id')][$o] = 1;
+ }
$a++;
}
$rr->free();
Modified: trunk/php/db/db_mysqli.pinc
===================================================================
--- trunk/php/db/db_mysqli.pinc 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/db/db_mysqli.pinc 2011-03-25 14:04:03 UTC (rev 93)
@@ -219,6 +219,7 @@
if (isset($this->preps[$name])) return $name;
$q = preg_replace('#\$1#','?',$q);
+ $q = preg_replace('#\$2#','?',$q);
$q = 'PREPARE '.$name." FROM '".$q."'";
$r = $this->exec ($q,1);
if (is_object($r))
@@ -232,7 +233,9 @@
* execute a prepared statement
*/
function execPStatement($name,$err = 1) {
+ $name = strtolower($name);
$q = 'execute '.$name;
+ $pre = ' ';
$x = func_num_args();
if ($x > 2) {
$q .= ' using ';
@@ -243,7 +246,7 @@
if (is_object($r))
$r->free();
- $q .= ' @a'.$y;
+ $q .= $pre.'@a'.$y;
$y++;;
$pre = ',';
Modified: trunk/php/db/table.pinc
===================================================================
--- trunk/php/db/table.pinc 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/db/table.pinc 2011-03-25 14:04:03 UTC (rev 93)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2010 by Gero Kohnert
+ * Copyright 2002 - 2011 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
@@ -607,8 +607,8 @@
'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'),
+ 'logo' => array(type => 'VARCHAR', size => 90, constraints => '', Desc => 'logo URL (deprecated)'),
+ 'logolink' => array(type => 'VARCHAR', size => 90, constraints => '', Desc => 'logo link URL (deprecated)'),
'systemid' => array(type => 'VARCHAR', size => 60, constraints => '', Desc => 'a unique system id')
);
@@ -619,4 +619,4 @@
Desc => 'main TUTOS sequencer',
);
-?>
+?>
\ No newline at end of file
Modified: trunk/php/drawboard/README
===================================================================
--- trunk/php/drawboard/README 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/drawboard/README 2011-03-25 14:04:03 UTC (rev 93)
@@ -24,7 +24,7 @@
Restrictions
saving pictures in the clipboard is possible when filemanagement is
enabled and local upload is also enabled.
- $tutos['file_local_allow'] = true;
+ In Documentmanagement configuration set 'file_local_allow' to enabled
Then saved pictures are stored to $tutos['file_local_searchpath'] and
appear as local files in the file_new dialog
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/file/file.pinc 2011-03-25 14:04:03 UTC (rev 93)
@@ -642,13 +642,11 @@
if (class_exists("ZipArchive")) {
# Header("Content-type: text/html");
# Header("Content-Disposition: inline; filename=\"". $this->filename .".html\"");
- $ly->HTML_Start();
- $ly->layout_start();
- # $r .= $ly->PrintHeader();
- showzip($fname);
- $ly->layout_stop();
- $ly->HTML_Stop();
- # $r .= $ly->PrintFooter();
+ echo $ly->HTML_Start();
+ echo $ly->layout_start();
+ echo showzip($fname);
+ echo $ly->layout_stop();
+ echo $ly->HTML_Stop();
} else {
Header("Content-type: text/plain");
Header("Content-Disposition: inline; filename=\"". $this->filename .".txt\"");
Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/layout/new2_layout.pinc 2011-03-25 14:04:03 UTC (rev 93)
@@ -1213,13 +1213,13 @@
}
$r .= ' <td colspan="'. $cols .'" valign="top" align="right">';
- $r .= ' <a id="tutosversion" class="nodeco" href="'. $tutos['base'] .'/html/copyright.html" title="TUTOS '. $tutos[version] ;
+ $r .= ' <a id="tutosversion" class="nodeco" href="'. $tutos['base'] .'/html/copyright.html" title="TUTOS '. $tutos[version] ;
if ( ($tutos[debug] == 1) && function_exists('memory_get_usage') ) {
- $r .= " using ". memory_get_usage() ." Bytes of memory";
+ $r .= " using ". memory_get_usage() ." Bytes of memory\n";
}
if ($tutos[debug] == 1) {
- if ($tutos[usepopup] == 1) {
+ if ($tutos[usepopup] == 2) {
$pinfo = '';
$pinfo .= '<table class="popupinfo">';
@@ -1230,15 +1230,16 @@
$pinfo .= "</table>";
$tutos['pagescript'] .= "$('#tutosversion').bt('".addslashes($pinfo)."');\n";
}
- $r .= ' cacheinfo '. (count($g_hash) - 6);
- $r .= ' / '. $g_hash['hits'].':'.$g_hash['fail'];
- $r .= ' / '. $g_hash['hits2'].':'.$g_hash['fail2'];
+ $r .= ' cacheinfo '. (count($g_hash) - 6)."\n";
+ $r .= ' / '. $g_hash['hits'].':'.$g_hash['fail']."\n";
+ $r .= ' / '. $g_hash['hits2'].':'.$g_hash['fail2']."\n";
if($tutos['memcache'] != null) {
- $r .= ' / '. $g_hash['hits3'].':'.$g_hash['fail3'];
+ $r .= ' / '. $g_hash['hits3'].':'.$g_hash['fail3']."\n";
}
$r .= '"';
}
- $r .= '><span class="smaller"><i><b><acronym title="The Ultimative team organization software">TUTOS</acronym> '. $tutos[version] ."</b></i>\n";
+ $r .= ">\n";
+ $r .= '<span class="smaller"><i><b><acronym title="The Ultimative team organization software">TUTOS</acronym> '. $tutos[version] ."</b></i>\n";
if ( $tutos[debug] == 1 ) {
$r .= '<span class="debug">';
$now = microtime();
Modified: trunk/php/webelements.p3
===================================================================
--- trunk/php/webelements.p3 2011-03-25 08:27:00 UTC (rev 92)
+++ trunk/php/webelements.p3 2011-03-25 14:04:03 UTC (rev 93)
@@ -422,7 +422,7 @@
case 'integer':
case 'double':
$msg .= $a;
- break;
+ break;
case 'boolean':
if (true === $a){
$msg .= 'T';
@@ -1563,8 +1563,13 @@
$found_by_hash = false;
// Second use the type info from objectids table
- $q = 'select tutostype from '. $dbconn->prefix . $dbconn->db->tablename_hash .' where id = '. $id;
- $r = $dbconn->Exec($q,1);
+ if ($dbconn->prep) {
+ $dbconn->addPStatement('select tutostype from '. $dbconn->prefix . $dbconn->db->tablename_hash .' where id = $1','HASH');
+ $r = $dbconn->execPStatement('HASH',1,$id);
+ } else {
+ $q = 'select tutostype from '. $dbconn->prefix . $dbconn->db->tablename_hash .' where id = '. $id;
+ $r = $dbconn->Exec($q,1);
+ }
if ($r->numrows() == 1 ) {
$found = true;
$found_by_hash = true;
@@ -2224,42 +2229,44 @@
* show a zipfile content
*/
function showzip($zipname) {
+ $r = '';
if (!class_exists("ZipArchive")) {
- return;
+ return $r;
}
$za = new ZipArchive();
$za->open($zipname);
- echo "numFiles: " . $za->numFiles . "<br />\n";
- echo "comment: " . $za->comment . "<br />\n";
+ $r .= "numFiles: " . $za->numFiles . "<br />\n";
+ $r .= "comment: " . $za->comment . "<br />\n";
- echo DoubleTableStart(1);
- echo '<th>Nr</th>';
- echo '<th>Filename</th>';
- echo '<th>Size</th>';
- echo '<th>Date</th>';
- echo '<th>Compr.Size</th>';
- echo '<th>Compr.Method</th>';
+ $r .= DoubleTableStart(1);
+ $r .= '<th>Nr</th>';
+ $r .= '<th>Filename</th>';
+ $r .= '<th>Size</th>';
+ $r .= '<th>Date</th>';
+ $r .= '<th>Compr.Size</th>';
+ $r .= '<th>Compr.Method</th>';
for ($i=0; $i<$za->numFiles;$i++) {
$d = $za->statIndex($i);
- echo '<tr>';
- echo '<td align="right">';
- echo $d['index']." ";
- echo '</td><td>';
- echo $d['name']." ";
- echo '</td><td align="right">';
- echo $d['size']." bytes ";
- echo '</td><td>';
- echo strftime("%D %T",$d['mtime'])." ";
- echo '</td><td align="right">';
- echo $d['comp_size']." bytes ";
- echo '</td><td>';
- echo $d['comp_method']." ";
- echo '</td>'."\r\n";
- echo '</tr>';
+ $r .= '<tr>';
+ $r .= '<td align="right">';
+ $r .= $d['index']." ";
+ $r .= '</td><td>';
+ $r .= $d['name']." ";
+ $r .= '</td><td align="right">';
+ $r .= $d['size']." bytes ";
+ $r .= '</td><td>';
+ $r .= strftime("%D %T",$d['mtime'])." ";
+ $r .= '</td><td align="right">';
+ $r .= $d['comp_size']." bytes ";
+ $r .= '</td><td>';
+ $r .= $d['comp_method']." ";
+ $r .= '</td>'."\r\n";
+ $r .= '</tr>';
# print_r($d);
}
- echo DoubleTableEnd();
+ $r .= DoubleTableEnd();
$za->close();
+ return $r;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 08:27:07
|
Revision: 92
http://tutos.svn.sourceforge.net/tutos/?rev=92&view=rev
Author: gokohnert
Date: 2011-03-25 08:27:00 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
moved logo and logolink from database mask to main config
Modified Paths:
--------------
trunk/php/admin/de.p3
trunk/php/admin/main_config.php
trunk/php/auth/auth_cmdline.pinc
trunk/php/base.pinc
trunk/php/config_default.pinc
trunk/php/database.pinc
trunk/php/database_ins.php
trunk/php/database_new.php
trunk/php/database_show.php
trunk/php/db.p3
trunk/php/group/group_show.php
trunk/php/invoice/invoice_pdf.pinc
trunk/php/layout/adq_layout.pinc
trunk/php/layout/classic_layout.pinc
trunk/php/layout/new2_layout.pinc
trunk/php/layout/new_layout.pinc
trunk/php/layout/test_layout.pinc
trunk/php/mail.pinc
trunk/php/pdf.pinc
trunk/php/testmanager/testrun_show.php
trunk/php/testmanager/testsuite_show.php
Modified: trunk/php/admin/de.p3
===================================================================
--- trunk/php/admin/de.p3 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/admin/de.p3 2011-03-25 08:27:00 UTC (rev 92)
@@ -52,7 +52,7 @@
$lang['ConfigHelpResolveHost'] = 'das Auflösen von IP Adressen zu Hostnamen kann die Darstelluing der Adminseite bremsen';
$lang['ConfigHelpTimeToLive'] = 'Anzahl Minuten bevor ein inaktiver User wieder zum Einloggen aufgefordert wird';
$lang['ConfigHelpMaxShow'] = 'Maximale Anzahl von Zeilen in Übersichtsseiten';
-$lang['ConfigHelpMaxSelect'] = 'Maximale Anzahl in Auswahllisten bevor TUTOS nach mehr Deatils fragt';
+$lang['ConfigHelpMaxSelect'] = 'Maximale Anzahl in Auswahllisten bevor TUTOS nach mehr Details fragt';
$lang['ConfigHelpMaxShort'] = 'Anzahl von Zeilen in kleinen Übersichten bevor ein Overview Link angeboten wird';
$lang['ConfigHelpTaskCalendar'] = 'Aufgaben im Kalender anzeigen';
$lang['ConfigHelpTaskBugInfo'] = 'Kurze Info zu Fehlern in der Aufgabenübersicht';
@@ -69,6 +69,8 @@
$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnumber of SMTP Server for outgoing mails';
$lang['ConfigHelpSmtpUser'] = 'Mode 4: User for authentification on outgoing SMTP Server';
$lang['ConfigHelpSmtpPass'] = 'Mode 4: Password for smtp_username (is stored unencrypted in database !)';
+$lang['ConfigHelpLogo'] = 'Logo Image URL. Relative to tutosbase or start with http';
+$lang['ConfigHelpLogolink'] = 'URL where to jump on clicking the logo (relative to tutos base or absolut)';
$lang['ConfigMailModes'][0] = '0: No outgoing mails';
Modified: trunk/php/admin/main_config.php
===================================================================
--- trunk/php/admin/main_config.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/admin/main_config.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -44,24 +44,10 @@
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpTimeToLive']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
- // fiscal year start month
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('fiscal_start_month');
- $r .= '<td><select name="fiscal_start_month" value="'.$tutos['fiscal_start_month'] .'">'."\n";
- for ($i = 1; $i <= 12; $i++) {
- $r .= ' <option value="'.$i.'"'.($tutos['fiscal_start_month'] == $i ? ' selected="selected"':'').'>'.$i.'</option>'."\n";
- }
- $r .= '</select></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpFiscalStartMonth']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // LIST of VAT rates
+ // Network
$r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('vat_list');
- $r .= '<td><input name="vat_list" value="'.$tutos['vat_list'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpVatList']).'</pre></td>';
+ $r .= '<th colspan="4">Network</th>';
$r .= $this->OverviewRowEnd($line++);
// ProxyHost
@@ -88,11 +74,52 @@
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpResolveHost']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+ // Fiscal
+ $r .= $this->OverviewRowStart($line);
+ $r .= '<th colspan="4">Fiscal</th>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // fiscal year start month
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('fiscal_start_month');
+ $r .= '<td><select name="fiscal_start_month" value="'.$tutos['fiscal_start_month'] .'">'."\n";
+ for ($i = 1; $i <= 12; $i++) {
+ $r .= ' <option value="'.$i.'"'.($tutos['fiscal_start_month'] == $i ? ' selected="selected"':'').'>'.$i.'</option>'."\n";
+ }
+ $r .= '</select></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpFiscalStartMonth']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+
+ // LIST of VAT rates
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('vat_list');
+ $r .= '<td><input name="vat_list" value="'.$tutos['vat_list'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpVatList']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
// LAYOUT
$r .= $this->OverviewRowStart($line);
$r .= '<th colspan="4">LAYOUT</th>';
$r .= $this->OverviewRowEnd($line++);
+ // LOGO
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('logo');
+ $r .= '<td><input name="logo" value="'.$tutos['logo'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpLogo']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // LogoLink
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('logolink');
+ $r .= '<td><input name="logolink" value="'.$tutos['logolink'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpLogolink']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
// maxshow
$r .= $this->OverviewRowStart($line);
$r .= $this->showfield('maxshow');
@@ -460,6 +487,12 @@
$tutos['smtp_password'] = $_REQUEST['smtp_password'];
write_config_value($this->dbconn,'smtp_password','main');
+ $tutos['logo'] = $_REQUEST['logo'];
+ write_config_value($this->dbconn,'logo','main');
+
+ $tutos['logolink'] = $_REQUEST['logolink'];
+ write_config_value($this->dbconn,'logolink','main');
+
$msg .= ' saving done ';
}
}
@@ -472,4 +505,4 @@
<!--
SVN Info $Id$
$Author$
--->
+-->
\ No newline at end of file
Modified: trunk/php/auth/auth_cmdline.pinc
===================================================================
--- trunk/php/auth/auth_cmdline.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/auth/auth_cmdline.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
-/*
- * Copyright 2004 by Gero Kohnert
+/**
+ * Copyright 2004 - 2011 by Gero Kohnert
*
* authentification when called by commandline php
*
Modified: trunk/php/base.pinc
===================================================================
--- trunk/php/base.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/base.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1030,16 +1030,16 @@
if (is_object($mail)
&& $mail->contenttype == 'text/html'
&& preg_match('#@LOGO@#',$s)) {
- if (preg_match('#^http#',$tutos[logo])) {
- $p = $tutos[logo];
+ if (preg_match('#^http#',$tutos['logo'])) {
+ $p = $tutos['logo'];
} else {
// include logo in mail
- $p = $tutos['base'].'/'.myentities($tutos[logo]);
+ $p = $tutos['base'].'/'.myentities($tutos['logo']);
$handle = fopen($p,'rb');
$logo .= fread($handle, filesize($p));
fclose($handle);
- $px = basename($tutos[logo]).'@'.uniqid();
+ $px = basename($tutos['logo']).'@'.uniqid();
$p = 'cid:'.$px;
}
$s = preg_replace("/@LOGO@/", '<img src="'.$p.'" />', $s);
@@ -1531,4 +1531,4 @@
return array($r,$o);
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/config_default.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -153,12 +153,12 @@
# Height will be resized to 40 pixels !
# logo and logolink are either relative to [tutosdir] or should start with "http:"
# NOTE: a value in the database entry will override these settings !!
-# call adminpage -> select DB Name -> Modify -> change -> save
+# call adminpage -> Konfig
#
-#$tutos[logo] = "html/tutos_small.gif";
-$tutos[logo] = "http://sflogo.sourceforge.net/sflogo.php?group_id=8047&type=13";
-#$tutos[logolink] = "html/copyright.html";
-$tutos[logolink] = "http://www.tutos.org";
+#$tutos['logo'] = "html/tutos_small.gif";
+$tutos['logo'] = "http://sflogo.sourceforge.net/sflogo.php?group_id=8047&type=13";
+#$tutos['logolink'] = "html/copyright.html";
+$tutos['logolink'] = "http://www.tutos.org";
#
# The default timezone
# This is the timezone where your database is running
Modified: trunk/php/database.pinc
===================================================================
--- trunk/php/database.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/database.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2010 by Gero Kohnert
+ * Copyright 2001 - 2011 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
@@ -86,8 +86,8 @@
$this->type = -1;
$this->prefix = '';
$this->repository = 'undefined';
- $this->logo = $tutos[logo];
- $this->logolink = $tutos[logolink];
+ $this->logo = '(deprecated)';
+ $this->logolink ='(deprecated)';
$this->bugautoname = '(deprecated)';
$this->invautoname = '(deprecated)';
$this->taskautoname = '(deprecated)';
@@ -287,18 +287,6 @@
/**
*/
- function setLogo($value) {
- return $this->setStrField("logo",$value,"CfgLogo");
- }
-
- /**
- */
- function setLogoLink($value) {
- return $this->setStrField("logolink",$value,"CfgLogoLink");
- }
-
- /**
- */
function setVersion($value) {
return $this->setStrField("version",$value,"CfgVersion");
}
@@ -350,13 +338,6 @@
$q->addFV("last_id",$this->lastid,"INT");
$q->addFV("version",$this->version,"STRING",$table['database']["version"][size]);
$q->addFV("cryptpw",$this->crypt,"INT");
-
- # $q->addFV("vatlist",$this->vatlist,"STRING",$table['database']["vatlist"][size]);
- # $q->addFV("bugautoname",$this->bugautoname,"STRING",$table['database']["bugautoname"][size]);
- # $q->addFV("invautoname",$this->invautoname,"STRING",$table['database']["invautoname"][size]);
- # $q->addFV("taskautoname",$this->taskautoname,"STRING",$table['database']["taskautoname"][size]);
- $q->addFV("logo",$this->logo,"STRING",$table['database']["logo"][size]);
- $q->addFV("logolink",$this->logolink,"STRING",$table['database']["logolink"][size]);
$q->addFV("systemid",$this->systemid,"STRING",$table['database']["systemid"][size]);
if ( $this->id < 0 ) {
@@ -566,7 +547,7 @@
}
/**
- * read and update thee current database if neccessary
+ * read and update the current database if neccessary
*/
function read_update() {
global $tutos;
@@ -575,12 +556,6 @@
Fatal_Error("no db connection","");
}
$x = $this->read($this->id,$this);
- if ( $this->logo != "" ) {
- $tutos[logo] = $this->logo;
- }
- if ( $this->logolink != "" ) {
- $tutos[logolink] = $this->logolink;
- }
if ( $this->dbentryexist == false ) {
$this->newid = $this->id;
$this->id = -1;
Modified: trunk/php/database_ins.php
===================================================================
--- trunk/php/database_ins.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/database_ins.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2010 by Gero Kohnert
+ * Copyright 2001 - 2011 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -57,13 +57,6 @@
$rep = trim($_POST['rep']);
$gotourl = addUrlParameter($gotourl,"rep=". UrlEncode($rep),true);
-$logo = trim($_POST['logo']);
-$gotourl = addUrlParameter($gotourl,"logo=". UrlEncode($logo),true);
-
-$logolink = trim($_POST['logolink']);
-$gotourl = addUrlParameter($gotourl,"logolink=". UrlEncode($logolink),true);
-
-
# other modules
$msg .= module_parseforms($current_user,$obj,$gotourl);
@@ -78,8 +71,6 @@
$obj->SetHome($home);
$obj->setRepository($rep);
$obj->setType($type);
- $obj->setLogo($logo);
- $obj->setLogoLink($logolink);
$dbconn->Begin("WORK");
$msg = $obj->save();
Modified: trunk/php/database_new.php
===================================================================
--- trunk/php/database_new.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/database_new.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2010 by Gero Kohnert
+ * Copyright 2001 - 2011 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
@@ -128,16 +128,6 @@
$r .= "<td colspan=\"3\"><input size=\"50\" maxlength=\"". $table['database']["dbhome"][size] ."\" id=\"home\" name=\"home\" value=\"". myentities($this->obj->home) ."\" /></td>\n";
$r .= "</tr>\n";
- $r .= "<tr>\n";
- $r .= $this->showfieldc($lang['CfgLogo'],0,"logo_fld");
- $r .= "<td colspan=\"3\"><input size=\"50\" maxlength=\"". $table['database']["logo"][size] ."\" id=\"logo_fld\" name=\"logo\" value=\"". $this->obj->logo ."\" /></td>\n";
- $r .= "</tr>\n";
-
- $r .= "<tr>\n";
- $r .= $this->showfieldc($lang['CfgLogoLink'],0,"logolink");
- $r .= "<td colspan=\"3\"><input size=\"50\" maxlength=\"". $table['database']["logolink"][size] ."\" id=\"logolink\" name=\"logolink\" value=\"". $this->obj->logolink ."\" /></td>\n";
- $r .= "</tr>\n";
-
// References to modules
$r .= module_addforms($this->user,$this->obj,4);
@@ -210,12 +200,6 @@
if ( !empty($_GET['type']) ) {
$this->obj->type = $_GET['type'];
}
- if ( !empty($_GET['logo']) ) {
- $this->obj->logo = $_GET['logo'];
- }
- if ( !empty($_GET['logolink']) ) {
- $this->obj->logolink = $_GET['logolink'];
- }
if ( ! $this->obj->mod_ok() ) {
$msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
$this->stop = true;
@@ -252,5 +236,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/database_show.php
===================================================================
--- trunk/php/database_show.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/database_show.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -98,11 +98,11 @@
$r .= "</tr><tr>\n";
$r .= $this->showfield($lang['CfgLogo']);
- $r .= $this->showdata($this->obj->logo,3);
+ $r .= $this->showdata('<strike>'.$this->obj->logo.'</strike> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3);
$r .= "</tr><tr>\n";
$r .= $this->showfield($lang['CfgLogoLink']);
- $r .= $this->showdata($this->obj->logolink,3);
+ $r .= $this->showdata('<strike>'.$this->obj->logolink.'</strike> (deprecated go '.makelink('bugtracking/bug_config.php','here').')',3);
$r .= "</tr><tr>\n";
$r .= $this->showfield($lang['CfgBugAutoName']);
Modified: trunk/php/db.p3
===================================================================
--- trunk/php/db.p3 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/db.p3 2011-03-25 08:27:00 UTC (rev 92)
@@ -78,9 +78,9 @@
define ('bugdelete',66); # deprecated
define ('ldapserver',67);
define ('ldapport',68);
-define ('logo',69);
+define ('logo',69); // deprecated
-define ('logolink',70);
+define ('logolink',70); //dperecated
# Calendar Handling
define ('cal',71);
define ('Date',72);
@@ -511,6 +511,12 @@
if (isset($tutos[smtp_password])) {
$confmsg .= '<br />check smtp_password. Instead of $tutos[smtp_password] in your config you should define it only '.makelink('admin/main_config.php','here');
}
+if (isset($tutos[logo])) {
+ $confmsg .= '<br />check logo. Rename $tutos[logo] in your config.php to $tutos[\'logo\'] Runtime Logo will be defined '.makelink('admin/main_config.php','here');
+}
+if (isset($tutos[logolink])) {
+ $confmsg .= '<br />check logolink. Rename $tutos[logolink] in your config.php to $tutos[\'logo\'] Runtime Logolink will be defined '.makelink('admin/main_config.php','here');
+}
$tutos['prod_state_stc'] = -1;
$tutos['prod_activ_states'] = '0,1,4';
@@ -563,4 +569,4 @@
return $dbc;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/php/group/group_show.php
===================================================================
--- trunk/php/group/group_show.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/group/group_show.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -79,7 +79,7 @@
$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
- $pdf->SetHeaderData($tutos['base'].'/../'.$tutos[logo],15,$lang[$this->obj->getType()],$this->obj->getFullName());
+ $pdf->SetHeaderData($tutos['base'].'/../'.$tutos['logo'],15,$lang[$this->obj->getType()],$this->obj->getFullName());
$pdf->AddPage();
$h = 5;
Modified: trunk/php/invoice/invoice_pdf.pinc
===================================================================
--- trunk/php/invoice/invoice_pdf.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/invoice/invoice_pdf.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright 2003 - 2009 by Gero Kohnert
+ * Copyright 2003 - 2011 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
@@ -30,22 +30,22 @@
# $this->SetFont('Arial','B',2);
# $this->Text(40,40, "X:".$this->obj->dbconn->db->logo);
- $p = (ereg("^http",$tutos[logo]) ? '':$tutos['base']."/" ). myentities($tutos[logo]);
+ $p = (ereg("^http",$tutos['logo']) ? '':$tutos['base']."/" ). myentities($tutos['logo']);
//Title
if ($this->PageNo() == 1) {
//Logo
- if (eregi("png",$tutos[logo])) {
+ if (eregi("png",$tutos['logo'])) {
$this->Image($p,10,10,20,0,"PNG");
- } else if (eregi("jpg",$tutos[logo]) || eregi("jpeg",$tutos[logo]) ) {
+ } else if (eregi("jpg",$tutos['logo']) || eregi("jpeg",$tutos['logo']) ) {
$this->Image($p,10,10,20,0,"JPG");
}
$this->SetFont('Arial','B',26);
$this->Cell(0,20, $lang['Invoice']." ". $this->obj->getFullName(),1,1,'C');
} else {
- if (eregi("png",$tutos[logo])) {
+ if (eregi("png",$tutos['logo'])) {
$this->Image($p,10,10,10,0,"PNG");
- } else if (eregi("jpg",$tutos[logo]) || eregi("jpeg",$tutos[logo]) ) {
+ } else if (eregi("jpg",$tutos['logo']) || eregi("jpeg",$tutos['logo']) ) {
$this->Image($p,10,10,10,0,"JPG");
}
$this->SetFont('Arial','B',12);
Modified: trunk/php/layout/adq_layout.pinc
===================================================================
--- trunk/php/layout/adq_layout.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/layout/adq_layout.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -37,15 +37,15 @@
// Please do not remove the link to the Copyright note !!
// Honour my work
//
- if ( ! isset($tutos[logo]) ) {
+ if ( ! isset($tutos['logo']) ) {
$r .= " <td class=\"headline\" width=\"16%\" colspan=\"2\" valign=\"middle\" align=\"left\"> <a class=\"nodeco\" rel=\"copyright\" href=\"". $tutos['base'] ."/html/copyright.html\">TUTOS</a></td>\n";
} else {
$r .= " <td class=\"headline\" width=\"8%\" valign=\"middle\" align=\"left\">";
- if ( isset($tutos[logolink]) ) {
- $r .= "<a target=\"url\" href=\"". (ereg("^http",$tutos[logolink]) ? "":$tutos['base']."/" ) . $tutos[logolink] ."\">";
+ if ( isset($tutos['logolink']) ) {
+ $r .= "<a target=\"url\" href=\"". (ereg("^http",$tutos['logolink']) ? "":$tutos['base']."/" ) . $tutos['logolink'] ."\">";
}
- $r .= "<img id=\"logo\" border=\"0\" src=\"". (ereg("^http",$tutos[logo]) ? "":$tutos['base']."/" ). $tutos[logo] ."\" alt=\"LOGO\" align=\"middle\">";
- if ( isset($tutos[logolink]) ) {
+ $r .= "<img id=\"logo\" border=\"0\" src=\"". (ereg("^http",$tutos['logo']) ? "":$tutos['base']."/" ). $tutos['logo'] ."\" alt=\"LOGO\" align=\"middle\">";
+ if ( isset($tutos['logolink']) ) {
$r .= "</a>";
}
$r .= "</td>\n";
@@ -397,4 +397,4 @@
return;
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/layout/classic_layout.pinc
===================================================================
--- trunk/php/layout/classic_layout.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/layout/classic_layout.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2010 by Gero Kohnert
+ * Copyright 2002 - 2011 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
@@ -46,15 +46,15 @@
// Please do not remove the link to the Copyright note !!
// Honour my work
//
- if ( ! isset($tutos[logo]) ) {
+ if ( ! isset($tutos['logo']) ) {
$r .= " <td width=\"16%\" colspan=\"2\" valign=\"middle\" align=\"left\"> <a class=\"nodeco\" rel=\"copyright\" href=\"". $tutos['base'] ."/html/copyright.html\">TUTOS</a></td>\n";
} else {
$r .= " <td rowspan=\"2\" width=\"8%\" valign=\"middle\" align=\"left\">";
- if ( isset($tutos[logolink]) ) {
- $r .= "<a target=\"url\" href=\"". (preg_match("#^http#i",$tutos[logolink]) ? "":$tutos['base']."/" ) . $tutos[logolink] ."\">";
+ if ( isset($tutos['logolink']) ) {
+ $r .= "<a target=\"url\" href=\"". (preg_match("#^http#i",$tutos['logolink']) ? "":$tutos['base']."/" ) . $tutos['logolink'] ."\">";
}
- $r .= "<img id=\"logo\" border=\"0\" src=\"". (preg_match("#^http#i",$tutos[logo]) ? "":$tutos['base']."/" ). $tutos[logo] ."\" alt=\"LOGO\" align=\"middle\" />";
- if ( isset($tutos[logolink]) ) {
+ $r .= "<img id=\"logo\" border=\"0\" src=\"". (preg_match("#^http#i",$tutos['logo']) ? "":$tutos['base']."/" ). $tutos['logo'] ."\" alt=\"LOGO\" align=\"middle\" />";
+ if ( isset($tutos['logolink']) ) {
$r .= "</a>";
}
$r .= "</td>\n";
@@ -77,7 +77,7 @@
$r .= " </td></tr>\n";
$r .= "<tr>\n";
- if ( ! isset($tutos[logo]) ) {
+ if ( ! isset($tutos['logo']) ) {
$r .= "<td> </td>\n";
}
$r .= "<td class=\"nodeco\" colspan=\"3\">\n";
Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/layout/new2_layout.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1017,11 +1017,11 @@
$r .= " </td>\n";
$r .= " <td nowrap=\"nowrap\" width=\"90%\" colspan=\"8\" align=\"center\" class=\"pagetitle\">". ($name == '' ? myentities($this->name):myentities($name)) ."</td>\n";
$r .= " <td width=\"5%\" rowspan=\"2\" align=\"right\" valign=\"top\" class=\"pagetitle\">\n";
- if ( isset($tutos[logolink]) ) {
- $r .= ' <a target="url" href="'. (preg_match("#^http#",$tutos[logolink]) ? '':$tutos['base'].'/' ) . $tutos[logolink] .'">';
+ if ( isset($tutos['logolink']) ) {
+ $r .= ' <a target="url" href="'. (preg_match("#^http#",$tutos['logolink']) ? '':$tutos['base'].'/' ) . $tutos['logolink'] .'">';
}
- $r .= ' <img id="logo" border="0" src="'. (preg_match("#^http#",$tutos[logo]) ? '':$tutos['base']."/" ). myentities($tutos[logo]) .'" alt="LOGO" align="middle" />';
- if ( isset($tutos[logolink]) ) {
+ $r .= ' <img id="logo" border="0" src="'. (preg_match("#^http#",$tutos['logo']) ? '':$tutos['base']."/" ). myentities($tutos['logo']) .'" alt="LOGO" align="middle" />';
+ if ( isset($tutos['logolink']) ) {
$r .= '</a>';
}
$r .= " </td>\n";
Modified: trunk/php/layout/new_layout.pinc
===================================================================
--- trunk/php/layout/new_layout.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/layout/new_layout.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -705,11 +705,11 @@
$r .= " </td>\n";
$r .= " <td nowrap=\"nowrap\" width=\"90%\" colspan=\"8\" align=\"center\" class=\"pagetitle\">". ($name == '' ? myentities($this->name):myentities($name)) ."</td>\n";
$r .= " <td colspan=\"1\" rowspan=\"2\" align=\"right\" valign=\"top\" class=\"pagetitle\">\n";
- if ( isset($tutos[logolink]) ) {
- $r .= ' <a target="url" href="'. (preg_match("#^http#",$tutos[logolink]) ? '':$tutos['base'].'/' ) . $tutos[logolink] .'">';
+ if ( isset($tutos['logolink']) ) {
+ $r .= ' <a target="url" href="'. (preg_match("#^http#",$tutos['logolink']) ? '':$tutos['base'].'/' ) . $tutos['logolink'] .'">';
}
- $r .= ' <img id="logo" border="0" src="'. (preg_match("#^http#",$tutos[logo]) ? '':$tutos['base']."/" ). myentities($tutos[logo]) .'" alt="LOGO" align="middle" />';
- if ( isset($tutos[logolink]) ) {
+ $r .= ' <img id="logo" border="0" src="'. (preg_match("#^http#",$tutos['logo']) ? '':$tutos['base']."/" ). myentities($tutos['logo']) .'" alt="LOGO" align="middle" />';
+ if ( isset($tutos['logolink']) ) {
$r .= '</a>';
}
$r .= " </td>\n";
Modified: trunk/php/layout/test_layout.pinc
===================================================================
--- trunk/php/layout/test_layout.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/layout/test_layout.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2007 by Gero Kohnert
+ * Copyright 2002 - 2011 by Gero Kohnert
*
* SVN Info $Id$
* $Author$
@@ -39,19 +39,19 @@
$r .= $this->PrintHeader($name);
$r .= "<table id=\"maintable\" cellspacing=\"0\" cellpadding=\"1\" width=\"100%\" border=\"0\"><tr>\n";
-#
+ #
# Please do not remove the link to the Copyright note !!
# Honour my work
-#
- if ( ! isset($tutos[logo]) ) {
+ #
+ if ( ! isset($tutos['logo']) ) {
$r .= " <td class=\"headline\" height=\"30px\" width=\"16%\" colspan=\"2\" valign=\"middle\" align=\"left\"> <a class=\"nodeco\" rel=\"copyright\" href=\"". $tutos['base'] ."/html/copyright.html\">TUTOS</a></td>\n";
} else {
$r .= " <td class=\"headline\" width=\"8%\" valign=\"top\" align=\"left\">";
- if ( isset($tutos[logolink]) ) {
- $r .= "<a target=\"url\" href=\"". (ereg("^http",$tutos[logolink]) ? "":$tutos['base']."/" ) . $tutos[logolink] ."\">";
- }
- $r .= "<img id=\"logo\" border=\"0\" src=\"". (ereg("^http",$tutos[logo]) ? "":$tutos['base']."/" ). $tutos[logo] ."\" alt=\"LOGO\" align=\"middle\">";
- if ( isset($tutos[logolink]) ) {
+ if ( isset($tutos['logolink']) ) {
+ $r .= "<a target=\"url\" href=\"". (ereg("^http",$tutos['logolink']) ? "":$tutos['base']."/" ) . $tutos['logolink'] ."\">";
+ }
+ $r .= "<img id=\"logo\" border=\"0\" src=\"". (ereg("^http",$tutos['logo']) ? "":$tutos['base']."/" ). $tutos['logo'] ."\" alt=\"LOGO\" align=\"middle\">";
+ if ( isset($tutos['logolink']) ) {
$r .= "</a>";
}
$r .= "</td>\n";
@@ -128,17 +128,17 @@
$r .= "<td colspan=\"4\" class=\"headline\">\n";
if ( ($this->format == "html") && ($tutos[debug] != 0) ) {
$r .= "layout demo took about ". sprintf("%.3f",($end - $this->start_ts)) ." seconds\n";
-# $r .= " hits = ". $g_hash['hits'];
-# $r .= " hits2 = ". $g_hash['hits2'];
+ # $r .= " hits = ". $g_hash['hits'];
+ # $r .= " hits2 = ". $g_hash['hits2'];
/*********
- $r .= " hash size = ". (count($g_hash) -1);
- foreach( $g_hash as $i => $f ) {
- $r .= "<br>". $i ;
- if ( gettype($f) == "object" ) {
- $r .= " ". $f->getType() ;
- $r .= " ". $f->getFullName() ;
- }
- }
+ $r .= " hash size = ". (count($g_hash) -1);
+ foreach( $g_hash as $i => $f ) {
+ $r .= "<br>". $i ;
+ if ( gettype($f) == "object" ) {
+ $r .= " ". $f->getType() ;
+ $r .= " ". $f->getFullName() ;
+ }
+ }
*********/
}
$r .= " </td>\n";
@@ -188,8 +188,8 @@
$this->buildmenu();
# if ( $msg != "" ) {
-# $this->format = "html";
-# }
+ # $this->format = "html";
+ # }
if ( ($this->format == "html") || ($this->format == "stat") || ($this->format == "checklist")) {
echo $this->PageHeader();
echo $this->HTML_one($msg);
@@ -371,7 +371,7 @@
if ($x[url] == $tarr[url]) {
return;
}
- }
+ }
}
}
# do not add duplicate entries
@@ -387,4 +387,4 @@
return 'new_layout';
}
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/mail.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -274,13 +274,13 @@
$show_as_img = false;
$select_alternative = false;
-#echo "PART ".$part ." FORMAT ".$mformat ." this ". $this->part ." ". $this->contenttype ."<br />";
+ //#echo "PART ".$part ." FORMAT ".$mformat ." this ". $this->part ." ". $this->contenttype ."<br />";
$r = "";
- # $r .= "p:". $this->part ."b:".$this->boundary ."e:".$this->contentencoding ."|t:". $this->contenttype ."|b:".count($this->bodies)."|len:".strlen($this->body) ."". $this->part ."<br />";
+ //#$r .= "p:". $this->part ."b:".$this->boundary ."e:".$this->contentencoding ."|t:". $this->contenttype ."|b:".count($this->bodies)."|len:".strlen($this->body) ."". $this->part ."<br />";
if ( ($part != 0) && ($part != $this->part)) {
-# echo "SKIP ".$this->part .'<br>';
+ //# echo "SKIP ".$this->part .'<br>';
$skip = true;
}
@@ -289,10 +289,8 @@
$show_text = true;
} elseif (strtolower($this->contenttype) == "text/calendar") {
$show_headline = true;
- # $show_text = true;
} elseif (strtolower($this->contenttype) == "text/x-vcard") {
$show_headline = true;
- # $show_text = true;
} elseif (strtolower($this->contenttype) == "text/html") {
$show_headline = true;
$show_as_frame = true;
@@ -522,7 +520,6 @@
*/
function parse_line($line,$short) {
-# echo "XXX".myentities($line) ."<br />";
if (!$this->got_header && (trim($line) == "")) {
$this->parse_in = "";
$this->got_header = true; // now we are in the body
@@ -572,7 +569,6 @@
$this->hdr[] = $line;
} else if (preg_match("#^Return-Path:(.*)#i",$line,$reg)) {
$this->parse_in = "";
-# echo "XXXX". $line ."XXXX";
$this->hdr[] = $line;
} else if (preg_match("#^in-reply-to:(.*)#i",$line,$reg)) {
$this->parse_in = "";
@@ -614,11 +610,9 @@
} else if (preg_match("#^Content-transfer-encoding:(.*)#i",$line,$reg)) {
$this->parse_in = "";
$this->contentencoding = trim($reg[1]);
-# echo "enc |". $this->contentencoding ."<br />\n";
} else if (preg_match("#^Content-Description:(.*)#i",$line,$reg)) {
$this->parse_in = "";
$this->contentdesc = trim($reg[1]);
-# echo "desc |". $this->contentdesc ."<br />\n";
} else if (preg_match("#^List-.*:(.*)#i",$line,$reg)) {
$this->parse_in = "LIST";
$this->hdr[] = $line;
@@ -645,7 +639,6 @@
$this->subject .= $line;
$this->hdr[] = $line;
} else {
-#trigger_error("unknown mailheader | ". $line ."|". $this->parse_in ."|". strlen($line) ."\n");
$this->parse_in = "";
$this->hdr[] = $line;
}
@@ -657,16 +650,12 @@
if ($x) {
$this->charset = $reg[1];
}
-# echo 'xxx '.$this->ct.' '. $this->charset .'<br>';
$x = preg_match("#boundary=[\"]*([-_=0-9A-Za-z/.:]*)[\"]*#i",$this->ct,$reg);
-# echo 'xxx '.$this->ct.' | '. $this->boundary .'<br>';
if ($x) {
$this->boundary = $reg[1];
}
-# echo 'xxx '.$this->ct.' | '. $this->boundary .'<br>';
preg_match("#Content-type:[ ]*([0-9A-Za-z./-]*)#i",$this->ct,$reg);
$this->contenttype = $reg[1];
-# echo "ct |". $this->contenttype ."|". $this->ct."<br />\n";
$this->ct = "";
}
@@ -705,7 +694,6 @@
$this->bodies[count($this->bodies)-1]->parse_line($line,$short);
} else if ($this->got_header) {
$this->body .= $line;
-# echo $this->got_header."-".$this->part ."|B| ". $line ."||<br />\n";
}
}
@@ -1438,7 +1426,7 @@
$msg = '';
if ( $tutos['mailmode'] == MAILMODE_SENDMAIL ) {
- $this->fd = popen($tutos[sendmail]." -t -i","w");
+ $this->fd = popen($tutos['sendmail']." -t -i","w");
if ( $this->fd == false ) {
$msg .= "could not connect to sendmail server<br />\n";
return $msg;
@@ -1449,7 +1437,7 @@
// POP before SMTP
// using the same host as smtp (some code stolen from squirrelmail)
if ( $tutos[popbeforesmtp] == 1 ) {
- $fd = fsockopen($tutos[smtphost],110, $errno, $errstr);
+ $fd = fsockopen($tutos['smtphost'],110, $errno, $errstr);
if ( $fd == false ) {
$msg .= "could not connect to pop server for popbeforesmtp<br />\n";
return $msg . $errno ." ". $errstr;
@@ -1603,7 +1591,7 @@
$msg .= sprintf($lang['Err0034'],$this->from->getFullName()) ."<br />\n";
return $msg;
}
- if ( (($tutos['mailmode'] == MAILMODE_SENDMAIL) && !is_executable($tutos[sendmail]))
+ if ( (($tutos['mailmode'] == MAILMODE_SENDMAIL) && !is_executable($tutos['sendmail']))
|| (($tutos['mailmode'] == MAILMODE_SMTP) && empty($tutos['smtphost']))
|| ($tutos['mailmode'] == MAILMODE_NOMAIL)
|| ($tutos[demo] == 1) ) {
@@ -1733,7 +1721,7 @@
if ($omsg != "") {
return $msg . $omsg;
}
-# die(myentities($to));
+
$x = "=?". $lang['content_encoding'] ."?B?" . base64_encode($this->from->getFullName()) . "?=";
$this->writechannel("From: \"". $x ." (TUTOS)\" <". $from .">");
$this->writechannel("Reply-To: \"". $x ."\" <". $from .">");
@@ -1751,9 +1739,6 @@
}
$this->writechannel("X-Mailer: TUTOS ". $tutos[version] ."/PHP " . phpversion() ." ". PHP_OS);
-# if (!$this->readsmtp($msg)) {
-# return $msg;
- # };
$this->output($this);
if ($fname == '') {
@@ -1763,8 +1748,8 @@
}
return $msg;
}
- /**
+ /**
* write to a file
*/
function save_to_file($fname) {
Modified: trunk/php/pdf.pinc
===================================================================
--- trunk/php/pdf.pinc 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/pdf.pinc 2011-03-25 08:27:00 UTC (rev 92)
@@ -52,19 +52,19 @@
}
//Logo
- $p = (preg_match('#^http#',$tutos[logo]) ? '':$tutos['base']."/" ). myentities($tutos[logo]);
- if (preg_match("#png#i",$tutos[logo])) {
- @$this->Image($p,5,5,0,15,"PNG",$this->dbconn->db->logolink);
+ $p = (preg_match('#^http#',$tutos['logo']) ? '':$tutos['base']."/" ). myentities($tutos['logo']);
+ if (preg_match("#png#i",$tutos['logo'])) {
+ @$this->Image($p,5,5,0,15,"PNG",$tutos['logolink']);
$this->Cell(40);
$this->SetY(5);
$this->SetX(45);
- } else if (preg_match("#jpg#i",$tutos[logo])) {
- @$this->Image($p,5,5,0,15,"JPG",$this->dbconn->db->logolink);
+ } else if (preg_match("#jpg#i",$tutos['logo'])) {
+ @$this->Image($p,5,5,0,15,"JPG",$tutos['logolink']);
$this->Cell(40);
$this->SetY(5);
$this->SetX(45);
- } else if (preg_match("#jpeg#i",$tutos[logo])) {
- @$this->Image($p,5,5,0,15,"JPG",$this->dbconn->db->logolink);
+ } else if (preg_match("#jpeg#i",$tutos['logo'])) {
+ @$this->Image($p,5,5,0,15,"JPG",$tutos['logolink']);
$this->Cell(40);
$this->SetY(5);
$this->SetX(45);
Modified: trunk/php/testmanager/testrun_show.php
===================================================================
--- trunk/php/testmanager/testrun_show.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/testmanager/testrun_show.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -185,7 +185,7 @@
$pdf->SetFont('times', '', 10);
$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
- $pdf->SetHeaderData($tutos['base'].'/../'.$tutos[logo],15,$lang[$this->obj->getType()],$this->obj->ref->getFullName().': '.$this->obj->getFullName());
+ $pdf->SetHeaderData($tutos['base'].'/../'.$tutos['logo'],15,$lang[$this->obj->getType()],$this->obj->ref->getFullName().': '.$this->obj->getFullName());
# $pdf->headtitle = $lang[$this->obj->getType()].' '.$this->obj->getFullName();
Modified: trunk/php/testmanager/testsuite_show.php
===================================================================
--- trunk/php/testmanager/testsuite_show.php 2011-03-25 07:05:53 UTC (rev 91)
+++ trunk/php/testmanager/testsuite_show.php 2011-03-25 08:27:00 UTC (rev 92)
@@ -138,7 +138,7 @@
$pdf->SetFont('times', '', 10);
$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
- $pdf->SetHeaderData($tutos['base'].'/../'.$tutos[logo],15,$lang[$this->obj->getType()],$this->obj->getFullName());
+ $pdf->SetHeaderData($tutos['base'].'/../'.$tutos['logo'],15,$lang[$this->obj->getType()],$this->obj->getFullName());
$pdf->AddPage();
$this->obj->fillPDF($pdf);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-25 07:05:59
|
Revision: 91
http://tutos.svn.sourceforge.net/tutos/?rev=91&view=rev
Author: gokohnert
Date: 2011-03-25 07:05:53 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/admin/main_config.php
Modified: trunk/php/admin/main_config.php
===================================================================
--- trunk/php/admin/main_config.php 2011-03-24 18:21:00 UTC (rev 90)
+++ trunk/php/admin/main_config.php 2011-03-25 07:05:53 UTC (rev 91)
@@ -125,9 +125,9 @@
// Mail Stuff
$r .= $this->OverviewRowStart($line);
$r .= $this->showfield('mailmode');
- $r .= '<td><select name="mailmode" value="'.$tutos['mailmode'] .'">';
+ $r .= '<td><select name="mailmode">';
foreach ($lang['ConfigMailModes'] as $j => $f) {
- $r .= ' <option vaalue="'.$j.'">'.$f.'</option>';
+ $r .= ' <option value="'.$j.'" '.($tutos['mailmode'] == $j ? 'selected="selected"':'').'>'.$f.'</option>';
}
$r .= '</select></td>';
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMailMode']).'</pre></td>';
@@ -366,7 +366,7 @@
if (!isset($tutos['task_show_buginfo'])) $tutos['task_show_buginfo'] = 1; // TODO per user
if (!isset($tutos['task_skip_finished'])) $tutos['task_skip_finished'] = 1; // TODO per user
- if (!isset($tutos['mailmode'])) $tutos['mailmode'] = 1; // sendmail
+ if (!isset($tutos['mailmode'])) $tutos['mailmode'] = 0; // sendmail
if (!isset($tutos['sendmail'])) $tutos['sendmail'] = '/usr/lib/sendmail';
if (!isset($tutos['smtphost'])) $tutos['smtphost'] = 'localhost';
if (!isset($tutos['smtpport'])) $tutos['smtpport'] = 25;
@@ -472,4 +472,4 @@
<!--
SVN Info $Id$
$Author$
--->
\ No newline at end of file
+-->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-24 18:21:07
|
Revision: 90
http://tutos.svn.sourceforge.net/tutos/?rev=90&view=rev
Author: gokohnert
Date: 2011-03-24 18:21:00 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
move mail config from config.php to database stored configuration
Modified Paths:
--------------
trunk/php/admin/create_config.php
trunk/php/admin/de.p3
trunk/php/admin/main_config.php
trunk/php/config_default.pinc
trunk/php/db.p3
trunk/php/group/group.pinc
trunk/php/mail.pinc
trunk/php/permission.p3
trunk/php/product.pinc
trunk/php/team.pinc
trunk/php/watchlist/watchlist.pinc
Modified: trunk/php/admin/create_config.php
===================================================================
--- trunk/php/admin/create_config.php 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/admin/create_config.php 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001-2010 by Gero Kohnert
+ * Copyright 2001-2011 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
@@ -146,19 +146,6 @@
$conf['dbalias'][0] = $conf['dbname'][0];
}
- if (isset($_POST['mailmode'])){ $conf['mailmode'] = $_POST['mailmode']; }
- if ( isset($_POST['sendmail']) && !empty($_POST['sendmail']) ){
- $conf['sendmail'] = $_POST['sendmail'];
- } else {
- $conf['sendmail'] = '/usr/lib/sendmail';
- $info['sendmail'] = 'using default';
- }
- if (isset($_POST['smtphost']) && !empty($_POST['smtphost'])){
- $conf['smtphost'] = $_POST['smtphost'];
- } else {
- $conf['smtphost'] = $conf['dbhost'][0];
- $info['smtphost'] = 'set to dbhost';
- }
if (isset($_POST['sessionpath'])){ $conf['sessionpath'] = $_POST['sessionpath']; }
if (isset($_POST['errlog'])){ $conf['errlog'] = $_POST['errlog']; }
@@ -206,12 +193,6 @@
\$tutos[repository][0] = \"". $conf['repository'][0] ."\";
\$tutos[dbprefix][0] = \"". $conf['dbprefix'][0] ."\";
#
-# MAIL
-#
-\$tutos[mailmode] = \"". $conf['mailmode']."\";
-\$tutos[sendmail] = \"". $conf['sendmail']."\";
-\$tutos[smtphost] = \"". $conf['smtphost']."\";
-#
# demo mode
#
\$tutos[demo] = ". $conf['demo'].";
@@ -285,8 +266,6 @@
}
$test['sessionpath'] = test_dir_writeable( $tutos[sessionpath] );
$test['errlog'] = test_dir_writeable( dirname($tutos[errlog]) );
- $test['sendmail'] = test_file_exist( $tutos[sendmail] );
- $test['smtphost'] = test_host_exist( $tutos[smtphost] );
$test['jpgraph'] = test_file_exist( getcwd()."/". $tutos['base'] ."/php/". $tutos[jpgraph] ."/jpgraph.php" );
}
@@ -410,35 +389,8 @@
$r .= "</tr>\n";
- $r .= "<tr><th colspan=\"6\">sending Mail</th></tr>\n";
- $r .= $this->showfieldc('Mail Mode',1,"demo");
- $r .= " <td colspan=\"5\" valign=\"top\">\n";
- $r .= " <select name=\"mailmode\">\n";
- $r .= " <option value=\"0\" ".(0 == $tutos[mailmode] ? " selected":"").">0 = no mail</option>\n";
- $r .= " <option value=\"1\" ".(1 == $tutos[mailmode] ? " selected":"").">1 = via sendmail (see sendmail path below)</option>\n";
- $r .= " <option value=\"2\" ".(2 == $tutos[mailmode] ? " selected":"").">2 = via smtp (see smtphost below)</option>\n";
- $r .= " </select><br />\n";
- $r .= $this->info_help_test('mailmode');
- $r .= "</td>\n";
- $r .= "</tr>\n";
$r .= "<tr>\n";
- $r .= " <td colspan=\"1\" valign=\"top\"></td>\n";
- $r .= $this->showfield('1: sendmail path',0,"sendmail");
- $r .= " <td colspan=\"4\" valign=\"top\"><input size=\"30\" maxlength=\"30\" name=\"sendmail\" id=\"sendmail\" value=\"". $tutos[sendmail] ."\"><br />\n";
- $r .= $this->info_help_test('sendmail');
- $r .= " </td>\n";
- $r .= "</tr>\n";
-
- $r .= "<tr>\n";
- $r .= " <td colspan=\"1\" valign=\"top\"></td>\n";
- $r .= $this->showfield('2: smtp host',0,"smtphost");
- $r .= " <td colspan=\"4\" valign=\"top\"><input size=\"30\" maxlength=\"30\" name=\"smtphost\" id=\"smtphost\" value=\"". $tutos[smtphost] ."\"><br />\n";
- $r .= $this->info_help_test('smtphost');
- $r .= " </td>\n";
- $r .= "</tr>\n";
-
- $r .= "<tr>\n";
$r .= submit_reset(0,-1,1,1,1,0);
$r .= "</tr>\n";
@@ -475,5 +427,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/admin/de.p3
===================================================================
--- trunk/php/admin/de.p3 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/admin/de.p3 2011-03-24 18:21:00 UTC (rev 90)
@@ -19,11 +19,6 @@
$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']['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";
@@ -68,6 +63,18 @@
$lang['ConfigHelpFiscalStartMonth'] = 'Startmonat des Geschäftsjahres. Da GJ ist immer gleich der Jahreszahl in welchem dieser Moinat liegt';
$lang['ConfigHelpProdFinishState'] = 'Produkt/Projekt Status beim automatischen beenden';
$lang['ConfigHelpTTDefaultState'] = 'Default Status für neu gebuchte Zeiten';
+$lang['ConfigHelpMailMode'] = 'How to send out mails';
+$lang['ConfigHelpSendmail'] = 'Mode 1: full unix path to sendmail (like /usr/lib/sendmail)';
+$lang['ConfigHelpSmtpHost'] = 'Mode 2/4: Hostname or IP of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpPort'] = 'Mode 2/4: Portnumber of SMTP Server for outgoing mails';
+$lang['ConfigHelpSmtpUser'] = 'Mode 4: User for authentification on outgoing SMTP Server';
+$lang['ConfigHelpSmtpPass'] = 'Mode 4: Password for smtp_username (is stored unencrypted in database !)';
+
+
+$lang['ConfigMailModes'][0] = '0: No outgoing mails';
+$lang['ConfigMailModes'][1] = '1: use sendmail program';
+$lang['ConfigMailModes'][2] = '2: use SMTP (as defined by host/port)';
+$lang['ConfigMailModes'][4] = '4: use SMTP (as defined by host/port and user/pass)';
### Local Variables: ***
### mode:iso-accents ***
### coding:utf-8 ***
Modified: trunk/php/admin/main_config.php
===================================================================
--- trunk/php/admin/main_config.php 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/admin/main_config.php 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2009 - 2010 by Gero Kohnert
+ * Copyright 2009 - 2011 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
@@ -35,6 +35,7 @@
$line = 0;
+
// time to live
$r .= $this->OverviewRowStart($line);
$r .= $this->showfield('timetolive');
@@ -54,6 +55,124 @@
$r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpFiscalStartMonth']).'</pre></td>';
$r .= $this->OverviewRowEnd($line++);
+
+ // LIST of VAT rates
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('vat_list');
+ $r .= '<td><input name="vat_list" value="'.$tutos['vat_list'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpVatList']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // ProxyHost
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('proxy_host');
+ $r .= '<td><input name="proxy_host" value="'.$tutos['proxy_host'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpProxyHost']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // ProxyPort
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('proxy_port');
+ $r .= '<td><input name="proxy_port" value="'.$tutos['proxy_port'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpProxyPort']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // resolve hostnames
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('resolve hostnames');
+ $r .= '<td><input type="checkbox" name="resolve_host" '.($tutos['resolve_host'] == 1 ? 'checked="checked"':'').'value="1">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpResolveHost']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // LAYOUT
+ $r .= $this->OverviewRowStart($line);
+ $r .= '<th colspan="4">LAYOUT</th>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // maxshow
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('maxshow');
+ $r .= '<td><input name="maxshow" value="'.$tutos['maxshow'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShow']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // maxselect
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('maxselect');
+ $r .= '<td><input name="maxselect" value="'.$tutos['maxselect'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxSelect']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // maxshort
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('maxshort');
+ $r .= '<td><input name="maxshort" value="'.$tutos['maxshort'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShort']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // MAIL
+ $r .= $this->OverviewRowStart($line);
+ $r .= '<th colspan="4">MAIL</th>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // Mail Stuff
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('mailmode');
+ $r .= '<td><select name="mailmode" value="'.$tutos['mailmode'] .'">';
+ foreach ($lang['ConfigMailModes'] as $j => $f) {
+ $r .= ' <option vaalue="'.$j.'">'.$f.'</option>';
+ }
+ $r .= '</select></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMailMode']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('sendmail');
+ $r .= '<td><input name="sendmail" value="'.$tutos['sendmail'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpSendmail']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('smtphost');
+ $r .= '<td><input name="smtphost" value="'.$tutos['smtphost'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpSmtpHost']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('smtpport');
+ $r .= '<td><input name="smtpport" value="'.$tutos['smtpport'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpSmtpPort']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('smtp_username');
+ $r .= '<td><input name="smtp_username" value="'.$tutos['smtp_username'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpSmtpUser']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ $r .= $this->OverviewRowStart($line);
+ $r .= $this->showfield('smtp_password');
+ $r .= '<td><input name="smtp_password" value="'.$tutos['smtp_password'] .'">';
+ $r .= '</input></td>';
+ $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpSmtpPass']).'</pre></td>';
+ $r .= $this->OverviewRowEnd($line++);
+
+ // PRODUCT / PROJECT
+ $r .= $this->OverviewRowStart($line);
+ $r .= '<th colspan="4">PRODUCT / PROJECT</th>';
+ $r .= $this->OverviewRowEnd($line++);
+
// PRODUCT STATE
$r .= $this->OverviewRowStart($line);
$r .= $this->showfield('prod_state_stc');
@@ -114,65 +233,12 @@
$r .= $this->OverviewRowEnd($line++);
-
- // LIST of VAT rates
+ // TASK
$r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('vat_list');
- $r .= '<td><input name="vat_list" value="'.$tutos['vat_list'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpVatList']).'</pre></td>';
+ $r .= '<th colspan="4">TASK</th>';
$r .= $this->OverviewRowEnd($line++);
-
- // ProxyHost
+ // Task State
$r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('proxy_host');
- $r .= '<td><input name="proxy_host" value="'.$tutos['proxy_host'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpProxyHost']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // ProxyPort
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('proxy_port');
- $r .= '<td><input name="proxy_port" value="'.$tutos['proxy_port'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpProxyPort']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // resolve hostnames
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('resolve hostnames');
- $r .= '<td><input type="checkbox" name="resolve_host" '.($tutos['resolve_host'] == 1 ? 'checked="checked"':'').'value="1">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpResolveHost']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // maxshow
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('maxshow');
- $r .= '<td><input name="maxshow" value="'.$tutos['maxshow'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShow']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // maxselect
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('maxselect');
- $r .= '<td><input name="maxselect" value="'.$tutos['maxselect'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxSelect']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // maxshort
- $r .= $this->OverviewRowStart($line);
- $r .= $this->showfield('maxshort');
- $r .= '<td><input name="maxshort" value="'.$tutos['maxshort'] .'">';
- $r .= '</input></td>';
- $r .= '<td colspan="2" class="pre"><pre>'.urlReplace($lang['ConfigHelpMaxShort']).'</pre></td>';
- $r .= $this->OverviewRowEnd($line++);
-
- // TASK STATE
- $r .= $this->OverviewRowStart($line);
$r .= $this->showfield('task_state_stc');
$r .= '<td><select name="task_state_stc">';
$r .= ' <option value="-1"'.($tutos['task_state_stc'] == -1 ? ' selected="selected"':'').'>'.$lang['no'].'</option>';
@@ -300,6 +366,13 @@
if (!isset($tutos['task_show_buginfo'])) $tutos['task_show_buginfo'] = 1; // TODO per user
if (!isset($tutos['task_skip_finished'])) $tutos['task_skip_finished'] = 1; // TODO per user
+ if (!isset($tutos['mailmode'])) $tutos['mailmode'] = 1; // sendmail
+ if (!isset($tutos['sendmail'])) $tutos['sendmail'] = '/usr/lib/sendmail';
+ if (!isset($tutos['smtphost'])) $tutos['smtphost'] = 'localhost';
+ if (!isset($tutos['smtpport'])) $tutos['smtpport'] = 25;
+ if (!isset($tutos['smtp_username'])) $tutos['smtp_username'] = 'change this';
+ if (!isset($tutos['smtp_password'])) $tutos['smtp_password'] = 'change this';
+
if ( ! $this->user->isAdmin() ) {
$msg .= $this->error("Only admins are allowed to see this");
$this->stop = true;
@@ -369,6 +442,24 @@
$tutos['task_skip_finished'] = ( isset($_REQUEST['task_skip_finished']) ? $_REQUEST['task_skip_finished']:0 );
write_config_value($this->dbconn,'task_skip_finished','task');
+ $tutos['mailmode'] = $_REQUEST['mailmode'];
+ write_config_value($this->dbconn,'mailmode','main');
+
+ $tutos['sendmail'] = $_REQUEST['sendmail'];
+ write_config_value($this->dbconn,'sendmail','main');
+
+ $tutos['smtphost'] = $_REQUEST['smtphost'];
+ write_config_value($this->dbconn,'smtphost','main');
+
+ $tutos['smtpport'] = $_REQUEST['smtpport'];
+ write_config_value($this->dbconn,'smtpport','main');
+
+ $tutos['smtp_username'] = $_REQUEST['smtp_username'];
+ write_config_value($this->dbconn,'smtp_username','main');
+
+ $tutos['smtp_password'] = $_REQUEST['smtp_password'];
+ write_config_value($this->dbconn,'smtp_password','main');
+
$msg .= ' saving done ';
}
}
@@ -380,5 +471,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/config_default.pinc 2011-03-24 18:21:00 UTC (rev 90)
@@ -259,15 +259,6 @@
#
#
#
-# Mail features
-#
-# Mode 0 = no mail
-# Mode 1 = via sendmail
-# Mode 2 = via SMTP
-# Mode 4 = via SMTP using EHLO and 'AUTH LOGIN'
-#
-$tutos[mailmode] = 2;
-#
# for auth use pop before smtp
# (only useful in mailmode 2)
# 1 = do pop auth
@@ -276,24 +267,6 @@
$tutos[popbeforesmtp_user] = "tutos";
$tutos[popbeforesmtp_pass] = "tutos";
#
-# Mode 1
-# Where to find sendmail
-# Set this to something nonexistant to disable mailing
-#
-$tutos[sendmail] = '/usr/lib/sendmail';
-#
-# Mode 2 and 4
-# The name or IP of the SMTP server
-#
-$tutos[smtphost] = 'localhost';
-$tutos[smtpport] = 25;
-#
-# Mode 4
-# Username and Password for SMTP
-#
-$tutos[smtp_username] = 'change this_to_a_smtp_username';
-$tutos[smtp_password] = 'change_this_to_a_smtp_password';
-#
# If usemail = 2 then this URL will be used to create a new mail
#
$tutos[squirrelurl] = "http://localhost/squirrel/";
@@ -776,7 +749,7 @@
#
# The TUTOS Version number
#
-$tutos[version] = '1.7.20110213';
+$tutos[version] = '1.7.20110323';
#
### Local Variables: ***
### mode:iso-accents ***
Modified: trunk/php/db.p3
===================================================================
--- trunk/php/db.p3 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/db.p3 2011-03-24 18:21:00 UTC (rev 90)
@@ -52,11 +52,11 @@
define ('maxselect',42); // deprecated
define ('errlevel',43);
define ('dbport',44);
-define ('sendmail',45);
+define ('sendmail',45);// deprecated
define ('prodsearchfrom',46);
define ('prodsearchto',47);
-define ('mailmode',48);
-define ('smtphost',49);
+define ('mailmode',48); // deprecated
+define ('smtphost',49); // deprecated
define ('faxmode',50);
define ('faxmail',51);
@@ -136,9 +136,9 @@
define ('popbeforesmtp',116);
define ('popbeforesmtp_user',117);
define ('popbeforesmtp_pass',118);
-define ('smtp_username',119);
+define ('smtp_username',119); // deprecated
-define ('smtp_password',120);
+define ('smtp_password',120); // deprecated
define ('loadedmodules',121);
define ('rowiconsbefore',122);
define ('rowiconsafter',123);
@@ -163,7 +163,7 @@
define ('task_show_buginfo',140); // deprectated
define ('task_skip_finished',141); // deprecated
define ('memcache_hosts',142);
-define ('smtpport',143);
+define ('smtpport',143); // deprecated
define ('help_need_login',144);
define ('tcpdfpath',145);
@@ -493,6 +493,25 @@
$confmsg .= '<br />check timetrackdefaultstate. Instead of $tutos[timetrackdefaultstate] in your config you should define it only '.makelink('admin/main_config.php','here');
}
+if (isset($tutos[mailmode])) {
+ $confmsg .= '<br />check mailmode. Instead of $tutos[mailmode] in your config you should define it only '.makelink('admin/main_config.php','here');
+}
+if (isset($tutos[sendmail])) {
+ $confmsg .= '<br />check sendmail. Instead of $tutos[sendmail] in your config you should define it only '.makelink('admin/main_config.php','here');
+}
+if (isset($tutos[smtphost])) {
+ $confmsg .= '<br />check mailmode. Instead of $tutos[smtphost] in your config you should define it only '.makelink('admin/main_config.php','here');
+}
+if (isset($tutos[smtpport])) {
+ $confmsg .= '<br />check smtpport. Instead of $tutos[smtpport] in your config you should define it only '.makelink('admin/main_config.php','here');
+}
+if (isset($tutos[smtp_username])) {
+ $confmsg .= '<br />check smtp_username. Instead of $tutos[smtp_username] in your config you should define it only '.makelink('admin/main_config.php','here');
+}
+if (isset($tutos[smtp_password])) {
+ $confmsg .= '<br />check smtp_password. Instead of $tutos[smtp_password] in your config you should define it only '.makelink('admin/main_config.php','here');
+}
+
$tutos['prod_state_stc'] = -1;
$tutos['prod_activ_states'] = '0,1,4';
$tutos['prod_finish_state'] = 2;
@@ -514,6 +533,12 @@
$tutos['task_show_fileinfo'] = 1;
$tutos['task_book_state'] = 1;
$tutos['task_finish_state'] = 2;
+$tutos['mailmode'] = 1;
+$tutos['sendmail'] = '/usr/lib/sendmail';
+$tutos['smtphost'] = 'localhost';
+$tutos['smtpport'] = 25;
+$tutos['smtp_username'] = 'change me';
+$tutos['smtp_password'] = 'change me';
$tutos['pagescript'] = '';
/**
@@ -538,4 +563,4 @@
return $dbc;
}
-?>
+?>
\ No newline at end of file
Modified: trunk/php/group/group.pinc
===================================================================
--- trunk/php/group/group.pinc 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/group/group.pinc 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2002 - 2010 by Gero Kohnert
+ * Copyright 2002 - 2011 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
@@ -210,7 +210,7 @@
info => sprintf($lang['GroupMailI'], $this->name),
category => array("product","mail","support"),
);
- if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos[mailmode] != 0) ) {
+ if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos['mailmode'] != 0) ) {
$m[url] = "mail_new.php?toid=".$this->id ."&subject=". UrlEncode($lang['Group']." ".$this->getFullName());
return $m;
}
Modified: trunk/php/mail.pinc
===================================================================
--- trunk/php/mail.pinc 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/mail.pinc 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2010 by Gero Kohnert
+ * Copyright 1999 - 2011 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
@@ -1436,14 +1436,14 @@
function open_channel(&$from,&$rcpt) {
global $tutos;
- $msg = "";
- if ( $tutos[mailmode] == MAILMODE_SENDMAIL ) {
+ $msg = '';
+ if ( $tutos['mailmode'] == MAILMODE_SENDMAIL ) {
$this->fd = popen($tutos[sendmail]." -t -i","w");
if ( $this->fd == false ) {
$msg .= "could not connect to sendmail server<br />\n";
return $msg;
}
- } else if ( ($tutos[mailmode] == MAILMODE_SMTP) || ($tutos[mailmode] == MAILMODE_SMTP_EHLO) ) {
+ } else if ( ($tutos['mailmode'] == MAILMODE_SMTP) || ($tutos['mailmode'] == MAILMODE_SMTP_EHLO) ) {
$errno = 0;
$errstr = "";
// POP before SMTP
@@ -1471,22 +1471,22 @@
@fputs($fd, "QUIT".$this->eoln); /* log off */
fclose ($fd);
}
- $this->fd = @fsockopen($tutos[smtphost],$tutos[smtpport],$errno,$errstr);
+ $this->fd = @fsockopen($tutos['smtphost'],$tutos['smtpport'],$errno,$errstr);
if ( $this->fd == false ) {
- $msg .= 'could not connect to smtp server '.$tutos[smtphost].' port:'.$tutos[smtpport]."<br />\n";
+ $msg .= 'could not connect to smtp server '.$tutos['smtphost'].' port:'.$tutos['smtpport']."<br />\n";
return $msg . $errno ." ". $errstr;
}
$this->readsmtp($msg); // Read the Greetings
- if ($tutos[mailmode] == MAILMODE_SMTP_EHLO) {
+ if ($tutos['mailmode'] == MAILMODE_SMTP_EHLO) {
fputs($this->fd,"EHLO ". $_SERVER['SERVER_NAME'] . $this->eoln); //EHLO is correct
if (!$this->readsmtp($msg)) return $msg;
fputs($this->fd,"AUTH LOGIN" . $this->eoln);
if (!$this->readsmtp($msg)) return $msg;
- fputs($this->fd,base64_encode($tutos[smtp_username]) . $this->eoln);
+ fputs($this->fd,base64_encode($tutos['smtp_username']) . $this->eoln);
if (!$this->readsmtp($msg)) return $msg;
- fputs($this->fd,base64_encode($tutos[smtp_password]) . $this->eoln);
+ fputs($this->fd,base64_encode($tutos['smtp_password']) . $this->eoln);
if (!$this->readsmtp($msg)) return $msg;
} else {
$this->writechannel("HELO ". $_SERVER['SERVER_NAME']);
@@ -1509,7 +1509,7 @@
};
# $this->readsmtp($msg);
} else {
- $msg .= 'Unknown Mailmode '. $tutos[mailmode] .' fix config.php<br />';
+ $msg .= 'Unknown Mailmode '. $tutos['mailmode'] .' fix configuration<br />';
return $msg;
}
return $msg;
@@ -1522,9 +1522,9 @@
global $tutos;
$msg = '';
- if ( $tutos[mailmode] == MAILMODE_SENDMAIL ) {
+ if ( $tutos['mailmode'] == MAILMODE_SENDMAIL ) {
pclose($this->fd);
- } else if ( ($tutos[mailmode] == MAILMODE_SMTP) || ($tutos[mailmode] == MAILMODE_SMTP_EHLO) ) {
+ } else if ( ($tutos['mailmode'] == MAILMODE_SMTP) || ($tutos['mailmode'] == MAILMODE_SMTP_EHLO) ) {
usleep(1000); // helps in some cases see bug 2709852
$this->writechannel($this->eoln.".");
$this->readsmtp($msg);
@@ -1551,7 +1551,7 @@
function readsmtp(&$msg) {
global $tutos;
- if ( ($tutos[mailmode] != MAILMODE_SMTP) && ($tutos[mailmode] != MAILMODE_SMTP_EHLO) ) {
+ if ( ($tutos['mailmode'] != MAILMODE_SMTP) && ($tutos['mailmode'] != MAILMODE_SMTP_EHLO) ) {
return true;
}
$line = fgets($this->fd,1024);
@@ -1603,9 +1603,9 @@
$msg .= sprintf($lang['Err0034'],$this->from->getFullName()) ."<br />\n";
return $msg;
}
- if ( (($tutos[mailmode] == MAILMODE_SENDMAIL) && !is_executable($tutos[sendmail]))
- || (($tutos[mailmode] == MAILMODE_SMTP) && empty($tutos[smtphost]))
- || ($tutos[mailmode] == MAILMODE_NOMAIL)
+ if ( (($tutos['mailmode'] == MAILMODE_SENDMAIL) && !is_executable($tutos[sendmail]))
+ || (($tutos['mailmode'] == MAILMODE_SMTP) && empty($tutos['smtphost']))
+ || ($tutos['mailmode'] == MAILMODE_NOMAIL)
|| ($tutos[demo] == 1) ) {
$msg .= sprintf($lang['Err0033'],$this->subject) ."<br />\n";
if ( isset($this->to) ) {
Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/permission.p3 2011-03-24 18:21:00 UTC (rev 90)
@@ -306,7 +306,7 @@
}
// no mailing possible so sending password is also not possible
- if ( $tutos[mailmode] == 0 ) {
+ if ( $tutos['mailmode'] == 0 ) {
$tutos[pwlostsupport] = 0;
}
Modified: trunk/php/product.pinc
===================================================================
--- trunk/php/product.pinc 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/product.pinc 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2010 by Gero Kohnert
+ * Copyright 1999 - 2011 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
@@ -765,7 +765,7 @@
category => array('mail','support','product',useprojects),
);
- if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos[mailmode] != 0) ) {
+ if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos['mailmode'] != 0) ) {
$m[url] = "mail_new.php?toid=".$this->id ."&subject=". UrlEncode($lang['Project']." ".$this->getFullName());
return $m;
}
@@ -1277,8 +1277,8 @@
case 'ProdStart':
case 'ProdEnd':
$x = resolve_history_datetime($f,$this->dbconn);
- return $x;
- break;
+ return $x;
+ break;
default:
return null;
}
Modified: trunk/php/team.pinc
===================================================================
--- trunk/php/team.pinc 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/team.pinc 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 1999 - 2010 by Gero Kohnert
+ * Copyright 1999 - 2011 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
@@ -265,7 +265,7 @@
function getMailUrl() {
global $current_user,$lang,$tutos;
- if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos[mailmode] != 0) ) {
+ if ( $current_user->feature_ok(usemail,PERM_NEW) && ($tutos['mailmode'] != 0) ) {
return "mail_new.php?toid=".$this->id ."&subject=". UrlEncode($lang['Team']." ".$this->getFullName() );
}
$x = "";
Modified: trunk/php/watchlist/watchlist.pinc
===================================================================
--- trunk/php/watchlist/watchlist.pinc 2011-03-23 19:51:04 UTC (rev 89)
+++ trunk/php/watchlist/watchlist.pinc 2011-03-24 18:21:00 UTC (rev 90)
@@ -1,7 +1,11 @@
<?php
/**
- * Copyright 1999 - 2010 by Gero Kohnert
+ * Copyright 1999 - 2011 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.
+ *
* SVN Info $Id$
* $Author$
*
@@ -249,7 +253,7 @@
info => $lang['Watcher'].' ('.$obj->getFullName().')',
category => array('watchlist','support','module',usewatchlist)
);
- if ( $user->feature_ok(usemail,PERM_NEW) && ($tutos[mailmode] != 0) ) {
+ if ( $user->feature_ok(usemail,PERM_NEW) && ($tutos['mailmode'] != 0) ) {
$x[] = array( url => 'mail_new.php?watch='. $obj->id ."&subject=". UrlEncode($lang[$obj->getType()].' '.$obj->getFullName()),
text => $lang['WatchMail'],
info => $lang['WatchMail'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-23 19:51:10
|
Revision: 89
http://tutos.svn.sourceforge.net/tutos/?rev=89&view=rev
Author: gokohnert
Date: 2011-03-23 19:51:04 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
some more meta info
Modified Paths:
--------------
trunk/php/layout/classic_base.pinc
trunk/php/layout/layout_base.pinc
trunk/php/layout/new2_layout.pinc
trunk/php/layout/new_layout.pinc
Modified: trunk/php/layout/classic_base.pinc
===================================================================
--- trunk/php/layout/classic_base.pinc 2011-03-23 15:20:19 UTC (rev 88)
+++ trunk/php/layout/classic_base.pinc 2011-03-23 19:51:04 UTC (rev 89)
@@ -91,10 +91,6 @@
$r .= " <link rel=\"alternate\" href=\"". addUrlParaMeter($x,"th=".$i) ."\" title=\"". myentities($lang['UserTheme'] .": ".$i) ."\"".$c."\n";
}
- $r .= " <meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\"".$c."\n";
- # $r .= " <link rel=\"icon\" href=\"". $tutos['base'] ."/html/tutos_small.gif\" type=\"image/gif\"".$c."\n";
- $r .= " <link rel=\"SHORTCUT ICON\" href=\"". $tutos['base'] ."/html/tutos.ico\"".$c."\n";
- $r .= " <link rel=\"Copyright\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"Copyright\"".$c."\n";
$r .= " <link rel=\"Help\" href=\"". make_helplink() ."\" title=\"". $lang['Help']."\"".$c."\n";
$r .= " <link rev=\"Made\" href=\"https://sourceforge.net/project/memberlist.php?group_id=8047\" hreflang=\"en\" target=\"url\" title=\"TUTOS Team\"".$c."\n";
$x = $_SERVER['REQUEST_URI'];
Modified: trunk/php/layout/layout_base.pinc
===================================================================
--- trunk/php/layout/layout_base.pinc 2011-03-23 15:20:19 UTC (rev 88)
+++ trunk/php/layout/layout_base.pinc 2011-03-23 19:51:04 UTC (rev 89)
@@ -135,6 +135,13 @@
$c = " />\n";
$r = '';
$r .= ' <meta name="GENERATOR" content="TUTOS '. $tutos[version] .'"'.$c;
+ $r .= ' <meta name="MSSmartTagsPreventParsing" content="true"'.$c;
+ $r .= ' <meta name="imagetoolbar" content="no"'.$c;
+ $r .= ' <meta name="description" content="the ultimate team organization software"'.$c;
+ $r .= ' <meta name="keywords" content="TUTOS,team,project,bugtracking,development"'.$c;
+ $r .= ' <meta name="author" content="Gero Kohnert et al"'.$c;
+ $r .= ' <link rel="SHORTCUT ICON" href="'. $tutos['base'] .'/html/tutos.ico"'. $c;
+ $r .= ' <link rel="Copyright" href="'. $tutos['base'] .'/html/copyright.html" title="Copyright"'. $c;
// useful only on smartphones
$r .= ' <meta name="viewport" content="user-scalable=no, width=device-width"'.$c;
@@ -143,6 +150,7 @@
}
if ( isset($tutos[lang]) && $tutos[lang] != "" ) {
$r .= ' <meta name="language" content="'. $tutos[lang] .'"'.$c;
+ $r .= ' <meta name="content-language" content="'. $tutos[lang] .'"'.$c;
}
$r .= ' <meta http-equiv="Expires" content="-1"'.$c;
return $r;
Modified: trunk/php/layout/new2_layout.pinc
===================================================================
--- trunk/php/layout/new2_layout.pinc 2011-03-23 15:20:19 UTC (rev 88)
+++ trunk/php/layout/new2_layout.pinc 2011-03-23 19:51:04 UTC (rev 89)
@@ -644,8 +644,6 @@
$r .= "<!-- Copyright 1999 - 2011 by Gero Kohnert gok...@us... et al -->\n";
$r .= "<!-- all rights reserved -->\n";
$r .= " <head>\n";
- // $r .= ' <base href="'.getBaseUrl().'"'.$c;
- // $r .= '<!--'.getBaseUrl().' -->'."\n";
$r .= " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=". $lang['content_encoding'] ."\"".$c;
$r .= ' <title>TUTOS -- '. myentities($this->name);
if (isset($this->dbconn)) {
@@ -677,10 +675,6 @@
}
}
- $r .= ' <meta name="MSSmartTagsPreventParsing" content="TRUE"'.$c;
-# echo ' <link rel="icon" href="'. $tutos['base'] .'/html/tutos_small.gif" type="image/gif"'. $c;
- $r .= ' <link rel="SHORTCUT ICON" href="'. $tutos['base'] .'/html/tutos.ico"'. $c;
- $r .= ' <link rel="Copyright" href="'. $tutos['base'] .'/html/copyright.html" title="Copyright"'. $c;
$r .= ' <link rel="Help" href="'. make_helplink() .'" title="'. $lang['Help'].'"'.$c;
$r .= ' <link rev="Made" href="https://sourceforge.net/project/memberlist.php?group_id=8047" hreflang="en" target="url" title="TUTOS Team"'.$c;
$x = $_SERVER['REQUEST_URI'];
Modified: trunk/php/layout/new_layout.pinc
===================================================================
--- trunk/php/layout/new_layout.pinc 2011-03-23 15:20:19 UTC (rev 88)
+++ trunk/php/layout/new_layout.pinc 2011-03-23 19:51:04 UTC (rev 89)
@@ -589,10 +589,7 @@
$r .= ' <link rel="alternate" href="'. addUrlParaMeter($x,'th='.$i) .'" title="'. myentities($lang['UserTheme'] .': '.$i) .'"'. $c;
}
- $r .= ' <meta name="MSSmartTagsPreventParsing" content="TRUE"'.$c;
# echo ' <link rel="icon" href="'. $tutos['base'] .'/html/tutos_small.gif" type="image/gif"'. $c;
- $r .= ' <link rel="SHORTCUT ICON" href="'. $tutos['base'] .'/html/tutos.ico"'. $c;
- $r .= ' <link rel="Copyright" href="'. $tutos['base'] .'/html/copyright.html" title="Copyright"'. $c;
$r .= ' <link rel="Help" href="'. make_helplink() .'" title="'. $lang['Help'].'"'.$c;
$r .= ' <link rev="Made" href="https://sourceforge.net/project/memberlist.php?group_id=8047" hreflang="en" target="url" title="TUTOS Team"'.$c;
$x = $_SERVER['REQUEST_URI'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-23 15:20:25
|
Revision: 88
http://tutos.svn.sourceforge.net/tutos/?rev=88&view=rev
Author: gokohnert
Date: 2011-03-23 15:20:19 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
performance updates
Modified Paths:
--------------
trunk/php/file/file.pinc
trunk/php/file/file_overview.php
trunk/php/file/file_show.php
Modified: trunk/php/file/file.pinc
===================================================================
--- trunk/php/file/file.pinc 2011-03-23 12:41:08 UTC (rev 87)
+++ trunk/php/file/file.pinc 2011-03-23 15:20:19 UTC (rev 88)
@@ -68,6 +68,7 @@
$fd = fopen($fname,'rb');
fpassthru($fd);
}
+
/**
* Show links to all files
*/
@@ -87,7 +88,7 @@
foreach ($obj->list[usedocmanagement] as $i => $f) {
if ( ($n >= $rows) && ( $x != $rows ) ) {
- $r .= " ". $user->layout->theme->getImage(folder,'list') ." ". makelink("file/file_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->list[usedocmanagement])));
+ $r .= ' '. $user->layout->theme->getImage(folder,'list') .' '. makelink('file/file_overview.php?link_id='. $obj->id,sprintf($lang['AllEntries'], count($obj->list[usedocmanagement])));
break;
}
$icon = get_icon($user->layout,$f->filename,'paper');
@@ -103,18 +104,14 @@
function files_clone( $dbconn, $oldpar,tutos_base $nobj) {
global $tutos;
- $q = "SELECT * FROM ". $dbconn->prefix ."files WHERE link_id = '". $oldpar ."'";
- $result = $dbconn->Exec( $q );
- for ($i = 0; $i < $result->numrows(); $i++) {
- $f = new tutos_file($dbconn);
- $f->read_result($result, $i);
+ $oobj = getObject($dbconn,$oldpar);
+ if (!is_object($oobj)) return;
+
+ tutos_file::obj_read($oobj);
+
+ foreach ($oobj->list[usedocmanagement] as $f) {
$nf = new tutos_file($dbconn);
- $nf->id = -1;
- if (substr($dbconn->db->repository,0,1) == "/") {
- $nf->base = $dbconn->db->repository;
- } else {
- $nf->base = getcwd()."/". $tutos['base'] ."/". $dbconn->db->repository;
- }
+
$nf->name = $f->name;
$nf->filename = $f->filename;
$nf->filesize = $f->filesize;
@@ -123,7 +120,7 @@
$nf->nocheck = true;
$nf->filetype = $f->filetype;
$nf->locked = 0;
- $nf->version = "";
+ $nf->version = $f->version;
$nf->logtxt = "Document created from template.\n";
$nf->author = $f->author;
$nf->savemode = $f->savemode;
@@ -132,7 +129,6 @@
$oldacl = $f->acl;
$nf->addReference($nobj);
$nf->save();
-
$nf->acl = $oldacl;
acl_save($nf);
@@ -155,7 +151,8 @@
* @package file
*/
class Tutos_file extends tutos_module {
- /* ---------------------------------------------------------------------------
+ /**
+ *
*/
function tutos_file(&$dbconn) {
global $tutos,$current_user,$table;
@@ -165,18 +162,18 @@
if (substr($this->dbconn->db->repository,0,1) == "/") {
$this->base = $this->dbconn->db->repository;
} else {
- $this->base = getcwd()."/". $tutos['base'] ."/". $this->dbconn->db->repository;
+ $this->base = getcwd().'/'. $tutos['base'] .'/'. $this->dbconn->db->repository;
}
}
$this->links = array();
- $this->name = "";
+ $this->name = '';
$this->filename = "NONAME";
$this->filesize = 0;
- $this->md5 = "";
- $this->fileloc = "";
- $this->filetype = "";
+ $this->md5 = '';
+ $this->fileloc = '';
+ $this->filetype = '';
$this->locked = 0;
- $this->version = "";
+ $this->version = '';
$this->logtxt = "Document created.\n";
$this->author = $current_user;
$this->savemode = 1;
@@ -191,6 +188,7 @@
}
$this->run_postinit_hook();
}
+
/**
* fill the object data with a given resultset
*
@@ -218,8 +216,11 @@
$lid = $r->get($pos, "link_id");
$l = GetObject($this->dbconn,$lid);
+ $needsave = false;
if ( is_object($l) ) {
$this->links[$lid] = &$l;
+ // needs to save new situation (TODO: let disappear the support with next update)
+ $needsave = true;
}
$cid = $r->get($pos, "creator");
@@ -229,6 +230,12 @@
$this->author = getObject($this->dbconn,$cid);
parent::read_result($r,$pos);
+
+ $this->readLinks();
+
+ if ($needsave) {
+ $this->save();
+ }
return;
}
@@ -279,7 +286,14 @@
if ( trim($name) == "" ) return 0;
- $q = "SELECT ".($mode == 1 ? '*':'id')." from ". $user->dbconn->prefix .$table['file'][name] ." WHERE". $user->dbconn->Like("name",$name,"version");
+ $q = "SELECT ".($mode == 1 ? '*':'id')." from ". $user->dbconn->prefix .$table['file'][name];
+ if (preg_match('/#([0-9]*)/',trim($name),$regs)) {
+ if(is_numeric($regs[1])) {
+ $q .= ' where id = '.$regs[1];
+ }
+ } else {
+ $q .= ' where '.$user->dbconn->Like("name",$name,"version");
+ }
$q .= " order by name";
check_dbacl($user->dbconn, $q, $user->id);
$r = $user->dbconn->Exec($q);
@@ -311,7 +325,6 @@
if (count ($this->neighbours) > 0 ) return $this->neighbours;
parent::getNeighbours();
- $this->readlinks();
// Possible new parents are all teams below or above
foreach ($this->links as $a => $b) {
if ( $b->use_ok() ) {
@@ -979,7 +992,7 @@
$q->addFV("logtxt",$this->logtxt,"TEXT");
$q->addFV("adr_pic",$this->adr_pic,"INT");
$q->addFV("version",$this->version,"STRING",$table['file']['version'][size]);
- $q->addFV("link_id",current($this->links),"OBJ");
+ $q->addFV("link_id",null,"INT");
$q->addFV("author",$this->author ,"OBJ");
$q->addFV("f_size",$this->filesize ,"");
$q->addFV("md5",$this->md5 ,"STRING",$table['file']['md5'][size]);
@@ -1198,29 +1211,29 @@
case 'FileCreate':
case 'FileReference':
$x = $f;
- $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
- if ( $f['old'] <= 0 ) {
- $x['old'] = '';
+ $x['field'] = isset( $lang[$f['field']]) ? $lang[$f['field']] : $f['field'];
+ if ( $f['old'] <= 0 ) {
+ $x['old'] = '';
+ } else {
+ $b = getObject($this->dbconn,$f['old']);
+ if ( is_object($b) ) {
+ $x['old'] = $b->getLink();
} else {
- $b = getObject($this->dbconn,$f['old']);
- if ( is_object($b) ) {
- $x['old'] = $b->getLink();
- } else {
- $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
- }
+ $x['old'] = makelink("history_show.php?id=". $f['old'],$lang['HistoryDeleted']) ;
}
- if ( $f['new'] <= 0 ) {
- $x['new'] = '';
+ }
+ if ( $f['new'] <= 0 ) {
+ $x['new'] = '';
+ } else {
+ $b = getObject($this->dbconn,$f['new']);
+ if ( is_object($b) ) {
+ $x['new'] = $b->getLink();
} else {
- $b = getObject($this->dbconn,$f['new']);
- if ( is_object($b) ) {
- $x['new'] = $b->getLink();
- } else {
- $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
- }
+ $x['new'] = makelink("history_show.php?id=". $f['new'],$lang['HistoryDeleted']) ;
}
- break;
}
+ break;
+ }
return $x;
}
/* ---------------------------------------------------------------------------
@@ -1231,6 +1244,7 @@
* Read all urls related to given id
*/
static function obj_read(&$obj) {
+ global $table;
if (! is_object($obj) ) return;
if ( ! isset($obj->id) ) return;
@@ -1239,9 +1253,9 @@
$obj->list[usedocmanagement] = array();
- $q = "SELECT f.* from ". $obj->dbconn->prefix ."files f,".$obj->dbconn->prefix."filelink l ";
- $q .= "where (f.id = l.f_id and l.link_id = ". $obj->id .")";
- $q .= " order by f.name";
+ $q = 'SELECT distinct f.* from '. $obj->dbconn->prefix .$table['file'][name].' f,'.$obj->dbconn->prefix.$table['filelink'][name].' l';
+ $q .= ' where (f.id = l.f_id) and (l.link_id = '. $obj->id .' or f.link_id = '.$obj->id.')';
+ $q .= ' order by f.name';
$r = $obj->dbconn->Exec($q);
$n = $r->numrows();
$a = 0;
@@ -1257,7 +1271,7 @@
$r->free();
// OLD Style without linktable
- $q = "SELECT f.* from ". $obj->dbconn->prefix ."files f ";
+ $q = 'SELECT f.* from '. $obj->dbconn->prefix .$table['file'][name].' f ';
$q .= "where f.link_id = ". $obj->id;
$q .= " order by f.name";
$r = $obj->dbconn->Exec($q);
@@ -1382,7 +1396,6 @@
tutos_file::obj_read($obj);
if ( count($obj->list[usedocmanagement]) > 0 ) {
foreach ($obj->list[usedocmanagement] as $i => $f) {
- $f->readlinks();
unset($f->links[$obj->id]);
if (count($f->links) == 0) {
$msg .= $f->delete();
Modified: trunk/php/file/file_overview.php
===================================================================
--- trunk/php/file/file_overview.php 2011-03-23 12:41:08 UTC (rev 87)
+++ trunk/php/file/file_overview.php 2011-03-23 15:20:19 UTC (rev 88)
@@ -193,13 +193,13 @@
// $this->q .= ",".$this->dbconn->prefix ."acl a";
// }
$pre = " WHERE " ;
- $this->q .= $pre . "( (f.link_id = ".$_GET['link_id'].") OR (l.f_id = f.id and l.link_id = ". $_GET['link_id'] ."))";
+ $this->q .= $pre . "(f.id = l.f_id) and (f.link_id = ".$_GET['link_id'].' or l.link_id = '. $_GET['link_id'] .')';
$pre = " AND " ;
$this->link1 = addUrlParameter($this->link1,"link_id=". $_GET['link_id']);
} else {
$this->q = 'SELECT distinct f.* FROM '. $this->dbconn->prefix .'files f';
if(! $this->user->isadmin()) {
-# $this->q .= ",".$this->dbconn->prefix ."acl a";
+ # $this->q .= ",".$this->dbconn->prefix ."acl a";
}
$pre = " WHERE " ;
}
@@ -322,5 +322,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
+$Author$
+-->
\ No newline at end of file
Modified: trunk/php/file/file_show.php
===================================================================
--- trunk/php/file/file_show.php 2011-03-23 12:41:08 UTC (rev 87)
+++ trunk/php/file/file_show.php 2011-03-23 15:20:19 UTC (rev 88)
@@ -230,10 +230,10 @@
$this->stop = true;
$this->format = "html";
return;
- } else {
- $this->obj->readLinks();
- $this->name .= ": ".$this->obj->getFullName();
}
+
+ $this->name .= ': '.$this->obj->getFullName();
+
if ( ! isset($_GET['version']) ) {
$this->version = $this->obj->version;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-23 12:41:14
|
Revision: 87
http://tutos.svn.sourceforge.net/tutos/?rev=87&view=rev
Author: gokohnert
Date: 2011-03-23 12:41:08 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
refix
Modified Paths:
--------------
trunk/php/db/db_sqlite3.pinc
Modified: trunk/php/db/db_sqlite3.pinc
===================================================================
--- trunk/php/db/db_sqlite3.pinc 2011-03-23 12:40:52 UTC (rev 86)
+++ trunk/php/db/db_sqlite3.pinc 2011-03-23 12:41:08 UTC (rev 87)
@@ -96,8 +96,8 @@
}
$this->conn = &$c;
- # $r = $this->exec('PRAGMA temp_store_directory = \''.$tutos[sessionpath].'\'');
- # $r->free();
+ $r = $this->exec('PRAGMA temp_store_directory = \''.$tutos[sessionpath].'\'');
+ $r->free();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-23 12:40:58
|
Revision: 86
http://tutos.svn.sourceforge.net/tutos/?rev=86&view=rev
Author: gokohnert
Date: 2011-03-23 12:40:52 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
beautify
Modified Paths:
--------------
trunk/php/permission.p3
Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3 2011-03-23 09:56:16 UTC (rev 85)
+++ trunk/php/permission.p3 2011-03-23 12:40:52 UTC (rev 86)
@@ -485,8 +485,8 @@
# logmessage($current_user->tz ." ". getenv("TZ"));
- $x = Date("Z"); # this happens in Default TZ
- $dbconn->TimeZone($current_user->tz);
+ $x = Date("Z"); // this happens in Default TZ
+ $dbconn->TimeZone($current_user->tz);
$y = Date("Z");
if ( ($dbconn->gettype() == "MySQL") || ($dbconn->gettype() == "Oracle") ) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-23 09:56:23
|
Revision: 85
http://tutos.svn.sourceforge.net/tutos/?rev=85&view=rev
Author: gokohnert
Date: 2011-03-23 09:56:16 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
include commetns in pdf and use new pdf
Modified Paths:
--------------
trunk/php/group/group_show.php
Modified: trunk/php/group/group_show.php
===================================================================
--- trunk/php/group/group_show.php 2011-03-23 07:08:03 UTC (rev 84)
+++ trunk/php/group/group_show.php 2011-03-23 09:56:16 UTC (rev 85)
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright 2001 - 2010 by Gero Kohnert
+ * Copyright 2001 - 2011 by Gero Kohnert
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -14,7 +14,7 @@
ini_set("include_path","..");
require_once 'webelements.p3';
require_once 'permission.p3';
-require_once 'pdf.pinc';
+require_once 'pdf2.pinc';
// Check if user is allowed to use it
check_user();
@@ -73,40 +73,38 @@
$pdf=new tutospdf($this->obj->dbconn);
$pdf->Open();
- $pdf->setAuthor(myiconv(is_object($this->obj->creator) ? $this->obj->creator->getFullName():$lang['HistoryDeleted']));
- $pdf->setTitle(myiconv($this->obj->getFullName()));
- $pdf->setSubject(myiconv($this->obj->getFullName()));
+ $pdf->setAuthor(is_object($this->obj->creator) ? $this->obj->creator->getFullName():$lang['HistoryDeleted']);
+ $pdf->setTitle($this->obj->getFullName());
+ $pdf->setSubject($this->obj->getFullName());
- $pdf->headtitle = $this->name;
+ $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
+ $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
+ $pdf->SetHeaderData($tutos['base'].'/../'.$tutos[logo],15,$lang[$this->obj->getType()],$this->obj->getFullName());
$pdf->AddPage();
$h = 5;
- $pdf->SetFont('Arial','',8);
+ $pdf->SetFont('times','',10);
$pdf->Cell(30,$h,$lang['GroupName'],0,0);
$pdf->Cell(0,$h,$this->obj->name,0,1);
$pdf->Cell(30,$h,$lang['GroupDesc'],0,0);
$pdf->Cell(0,$h,$this->obj->desc,0,1);
$pdf->Ln();
- $w = array(35,25,40,50,0);
- $fs = array(7,7,7,7,7);
- $al = array('R','R','L','L','L');
-
- // Header
- $h = 8;
- $pdf->SetFont('Arial','B',$fs[0]);
- $pdf->Cell($w[0],$h, myiconv($lang['AdrName']),1,0,$al[0]);
- $pdf->SetFont('Arial','B',$fs[1]);
- $pdf->Cell($w[1],$h, myiconv($lang['Description']),1,0,$al[1]);
- $pdf->SetFont('Arial','B',$fs[2]);
- $pdf->Cell($w[2],$h, myiconv($lang['Phone']),1,0,$al[2]);
- $pdf->SetFont('Arial','B',$fs[3]);
- $pdf->Cell($w[3],$h, myiconv($lang['AdrEmail']),1,0,$al[3]);
- $pdf->SetFont('Arial','B',$fs[4]);
- $pdf->Cell($w[4],$h, myiconv($lang['AdrFax']),1,0,$al[4]);
-
- $pdf->Ln();
-
+ $tbl = '
+<table border ="0.5" cellpadding="2">
+ <thead>
+ <tr>
+ <th rowspan="2" style="background-color:#BBB" align="center"><b>'.$lang['AdrName'].'</b></th>
+ <th style="background-color:#BBB" align="center"><b>'.$lang['Description'].'</b></th>
+ <th style="background-color:#BBB" align="center"><b>'.$lang['AdrEmail'].'</b></th>
+ <th style="background-color:#BBB" align="center"><b>'.$lang['Phone'].'</b></th>
+ <th style="background-color:#BBB" align="center"><b>'.$lang['AdrFax'].'</b></th>
+ </tr>
+ <tr>
+ <th colspan="4" style="background-color:#BBB" align="center"><b>'.$lang['Comment'].'</b></th>
+ </tr>
+ </thead>
+';
foreach($this->obj->member as $i => $f) {
$obj = $f[0];
$x = $obj->gettype();
@@ -115,99 +113,87 @@
$f = array();
$p = array();
$d = array();
- $name = array();
-
- $name[] = $obj->getFullName();
- if ( ($x == "company") || ($x == "department") ){
+ if ( ($x == 'company') || ($x == 'department') || ($x == 'address') ){
$obj->read_locs_data();
+ $tbl .= '<tr>';
+ $tbl .= ' <td rowspan="'.(1+count($obj->location)).'">'.$obj->getFullName().'</td>';
+ $cnt = 0;
foreach($obj->location as $l) {
- if (count($obj->location) == 1) {
- $loc = "";
+ if ($cnt >0)
+ $tbl .= '<tr>';
+ $tbl .= ' <td>';
+ if (is_object($l->department) && ($l->department->id > 0) ) {
+ $tbl .= $l->department->getFullName();
+ if (count($obj->location) > 1) {
+ $tbl .= ' ('.$l->lname.')';
+ }
+ } else if (is_object($l->company) && ($l->company->id > 0) ) {
+ $tbl .= $l->company->getFullName();
+ if (count($obj->location) > 1) {
+ $tbl .= ' ('.$l->lname.')';
+ }
} else {
- $loc = " (".$l->lname.")";
+ $tbl .= $l->lname;
}
- if ($l->email_1)
- $e[] = $l->email_1 .$loc;
+ $tbl .= '</td>';
+
+ $tbl .= ' <td>'.$l->email_1;
if ($l->email_2)
- $e[] = $l->email_2 .$loc;
- if ($l->fax_1)
- $f[] = $l->fax_1 .$loc;
- if ($l->phone_1)
- $p[] = $l->phone_1 .$loc;
+ $tbl .= '<br />'.$l->email_2;
+ $tbl .= ' </td>';
+
+ $tbl .= ' <td>'.$l->phone_1;
if ($l->phone_2)
- $p[] = $l->phone_2 .$loc;
- }
- }
- if ($x == "address"){
- $obj->read_locs_data();
- foreach($obj->location as $l) {
- if (count($obj->location) == 1) {
- $loc = "";
- } else {
- $loc = " (".$l->lname.")";
- }
- if ($l->email_1)
- $e[] = $l->email_1 .$loc;
- if ($l->email_2)
- $e[] = $l->email_2 .$loc;
- if ($l->fax_1)
- $f[] = $l->fax_1 .$loc;
- if ($l->phone_1)
- $p[] = $l->phone_1 .$loc;
- if ($l->phone_2)
- $p[] = $l->phone_2 .$loc;
- if ($l->desc1)
- $d[] = $l->desc1 .$loc;
- }
- }
- if ($x == "team") {
- $name = array();
- $name[] = $lang[$x];
- $name[] = $obj->getFullName();
- }
+ $tbl .= '<br />'.$l->phone_2;
+ $tbl .= ' </td>';
- $max = 0;
- $max = max($max,count($name));
- for ($i=0;$i<$max;$i++) {
- $h = 5;
- $border = "LR";
- if ($i == 0) {
- $border .= "T";
- $h += 1;
+ $tbl .= ' <td>'.$l->fax_1.'</td>';
+ $tbl .= '</tr>';
+ $cnt++;
}
- if ($i == ($max-1)) {
- $border .= "B";
- $h += 1;
- }
- // name
- $pdf->SetFont('Arial','',$fs[0]);
- $pdf->Cell($w[0],$h, (isset($name[$i]) ? myiconv($name[$i]):" "),$border,0,$al[0]);
- // desc
- $pdf->SetFont('Arial','',$fs[1]);
- $pdf->Cell($w[1],$h, (isset($d[$i]) ? myiconv($d[$i]):" "),$border,0,$al[1]);
- // phone
- $pdf->SetFont('Arial','',$fs[2]);
- $pdf->Cell($w[2],$h,(isset($p[$i]) ? myiconv($p[$i]) : " "),$border,0,$al[2]);
- // email
- $pdf->SetFont('Arial','',$fs[3]);
- $pdf->Cell($w[3],$h, (isset($e[$i]) ? myiconv($e[$i]) : " "),$border,0,$al[3]);
- // fax
- $pdf->SetFont('Arial','',$fs[4]);
- $pdf->Cell($w[4],$h, (isset($f[$i]) ? myiconv($f[$i]) : " "),$border,0,$al[4]);
-
- $pdf->Ln();
+ $tbl .= '<tr>';
+ $tbl .= ' <td colspan="4">'.$this->obj->member[$i][2]->getDate().' '.$this->obj->member[$i][1].'</td>';
+ $tbl .= '</tr>';
+ } else if ($x == "team") {
+ $tbl .= '<tr>';
+ $tbl .= ' <td rowspan="2">'.$lang[$x].' '.$obj->getFullName().'</td>';
+ $tbl .= ' <td></td>';
+ $tbl .= ' <td></td>';
+ $tbl .= ' <td></td>';
+ $tbl .= ' <td></td>';
+ $tbl .= '</tr>';
+ $tbl .= '<tr>';
+ $tbl .= ' <td colspan="4">'.$this->obj->member[$i][2]->getDate().' '.$this->obj->member[$i][1].'</td>';
+ $tbl .= '</tr>';
+ } else {
+ $tbl .= '<tr>';
+ $tbl .= ' <td rowspan="2">'.$lang[$x].' '.$obj->getFullName().'</td>';
+ $tbl .= ' <td></td>';
+ $tbl .= ' <td></td>';
+ $tbl .= ' <td></td>';
+ $tbl .= ' <td></td>';
+ $tbl .= '</tr>';
+ $tbl .= '<tr>';
+ $tbl .= ' <td colspan="4">'.$this->obj->member[$i][2]->getDate().' '.$this->obj->member[$i][1].'</td>';
+ $tbl .= '</tr>';
}
+
}
+
+ $tbl .= '</table>';
+ $pdf->SetFont('times', '', 8);
+ $pdf->writeHTML($tbl, true, false, false, false, '');
+
$pdf->Close();
- $data = $pdf->buffer;
+ $data = $pdf->Output('','S');
Header("Content-Type: application/pdf");
if(headers_sent()) {
Fatal_Error('Some data has already been output to browser, can\'t send PDF file');
}
- Header('Content-Disposition: inline; filename="'. $this->obj->name.'_'.Date('YmdHi').'.pdf"');
+ Header('Content-Disposition: inline; filename="'. $this->obj->name .'_'.Date('YmdHi').'.pdf"');
Header("Content-Description: Upload from TUTOS" );
Header('Content-Length: '.strlen($data));
- header("Expires: 0");
+ header("Expires: -1");
header("Cache-Control: must-revalidate, post-check=0,pre-check=0");
header("Pragma: public");
return $data;
@@ -399,5 +385,5 @@
?>
<!--
SVN Info $Id$
- $Author$
- -->
\ No newline at end of file
+$Author$
+-->
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-23 07:08:10
|
Revision: 84
http://tutos.svn.sourceforge.net/tutos/?rev=84&view=rev
Author: gokohnert
Date: 2011-03-23 07:08:03 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/ldap/ldap.pinc
Modified: trunk/php/ldap/ldap.pinc
===================================================================
--- trunk/php/ldap/ldap.pinc 2011-03-22 19:49:51 UTC (rev 83)
+++ trunk/php/ldap/ldap.pinc 2011-03-23 07:08:03 UTC (rev 84)
@@ -446,6 +446,14 @@
}
/**
+ * always ok to see
+ */
+ function see_ok () {
+ global $tutos;
+ return $tutos[seeok];
+ }
+
+ /**
* get a usefull human readable name
*/
function getIndex () {
@@ -577,4 +585,4 @@
return $r;
}
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gok...@us...> - 2011-03-22 19:49:57
|
Revision: 83
http://tutos.svn.sourceforge.net/tutos/?rev=83&view=rev
Author: gokohnert
Date: 2011-03-22 19:49:51 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
fix
Modified Paths:
--------------
trunk/php/url/url_show.php
Modified: trunk/php/url/url_show.php
===================================================================
--- trunk/php/url/url_show.php 2011-03-22 19:10:25 UTC (rev 82)
+++ trunk/php/url/url_show.php 2011-03-22 19:49:51 UTC (rev 83)
@@ -40,7 +40,7 @@
* prepare
*/
Function prepare() {
- global $msg,$lang;
+ global $msg,$lang,$info;
$this->name = $lang['URL'];
$this->obj = new url($this->dbconn);
@@ -67,7 +67,7 @@
$this->addtohistory();
if (preg_match("<@BASEURL@>",$this->obj->url)) {
- leave_insert($dbconn,$this->obj->getTargetUrl(),$msg,$info);
+ leave_insert($this->obj->dbconn,$this->obj->getTargetUrl(),$msg,$info);
} else {
Header('Status: 302 Moved Temporarily');
Header("Content-Description: TUTOS Redirect" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|