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
(12) |
|
3
(3) |
4
|
5
(27) |
6
(15) |
7
(4) |
8
(2) |
9
(14) |
|
10
(23) |
11
(19) |
12
(13) |
13
(11) |
14
(6) |
15
|
16
(1) |
|
17
(4) |
18
(8) |
19
|
20
|
21
|
22
(2) |
23
(11) |
|
24
(14) |
25
(5) |
26
|
27
(48) |
28
|
29
(6) |
30
(10) |
|
From: Gero K. <gok...@us...> - 2002-11-30 19:05:20
|
Update of /cvsroot/tutos/tutos/php/installation
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/installation
Modified Files:
ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es.p3 fr.p3
hu.p3 installation.pinc installation_new.php it.p3 ja.p3
mtable.pinc nl.p3 pl.p3 pt-br.p3 ru.p3 sv.p3 tw.p3 zh.p3
Log Message:
using table field sizes
Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/ca.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ca.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ ca.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "instal·lat per";
$lang['SoldBy'] = "vengut per";
$lang['Customer'] = "client";
-$lang['Money'] = "preu";
-$lang['Currency'] = "valuta";
$lang['InstLinkI'] = "Veure instal·lació";
$lang['InstCreateI'] = "crear una nova %s instal·lació";
$lang['InstModifyI'] = "modificar aquesta instal·lació";
Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/cs.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cs.p3 27 Nov 2002 14:20:07 -0000 1.4
+++ cs.p3 30 Nov 2002 19:04:47 -0000 1.5
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "Instaloval";
$lang['SoldBy'] = "Prodal/koupil";
$lang['Customer'] = "Klient/U¾ivatel";
-$lang['Money'] = "Souèet";
-$lang['Currency'] = "Peníze";
$lang['InstLinkI'] = "Zobrazit instalace";
$lang['InstCreateI'] = "vytvoøit novou instalaci %s";
$lang['InstModifyI'] = "upravit tuto instalaci";
Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/de.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- de.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ de.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "Installiert von";
$lang['SoldBy'] = "Verkauft durch";
$lang['Customer'] = "Kunde/Anwender";
-$lang['Money'] = "Betrag";
-$lang['Currency'] = "Währung";
$lang['InstLinkI'] = "Installationen anzeigen";
$lang['InstCreateI'] = "Eine neue Installation für %s anlegen";
$lang['InstModifyI'] = "Diese Installation ändern";
Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/el.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- el.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ el.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "åãêáôáóôÜèçêå áðü";
$lang['SoldBy'] = "ðïõëÞèçêå áðü";
$lang['Customer'] = "ÐåëÜôçò/×ñÞóôçò";
-$lang['Money'] = "Ðïóü";
-$lang['Currency'] = "Íüìéóìá";
$lang['InstLinkI'] = "ÂëÝðå ÅãêáôáóôÜóåéò";
$lang['InstCreateI'] = "äçìéïõñãßá íÝáò åãêáôÜóôáóçò %s";
$lang['InstModifyI'] = "ôñïðïðïßçóç áõôÞò ôçò åãêáôÜóôáóçò";
Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/en.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- en.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ en.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "installed by";
$lang['SoldBy'] = "sold by";
$lang['Customer'] = "Customer/User";
-$lang['Money'] = "Sum";
-$lang['Currency'] = "Currency";
$lang['InstLinkI'] = "See Installations";
$lang['InstCreateI'] = "create a new Installation of %s";
$lang['InstModifyI'] = "modify this installation";
Index: es-mx.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/es-mx.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- es-mx.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ es-mx.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "instalado por";
$lang['SoldBy'] = "vendido por";
$lang['Customer'] = "cliente";
-$lang['Money'] = "precio";
-$lang['Currency'] = "moneda";
$lang['InstLinkI'] = "Ver instalación";
$lang['InstCreateI'] = "Crear nueva %s instalación";
$lang['InstModifyI'] = "Modificar instalación";
Index: es-ni.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/es-ni.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- es-ni.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ es-ni.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "instalado por";
$lang['SoldBy'] = "vendido por";
$lang['Customer'] = "cliente";
-$lang['Money'] = "precio";
-$lang['Currency'] = "valuta";
$lang['InstLinkI'] = "Ver instalación";
$lang['InstCreateI'] = "crear una nueva %s instalación";
$lang['InstModifyI'] = "Modificar esta instalación";
Index: es.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/es.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- es.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ es.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "instalado por";
$lang['SoldBy'] = "vendido por";
$lang['Customer'] = "cliente";
-$lang['Money'] = "precio";
-$lang['Currency'] = "valuta";
$lang['InstLinkI'] = "Ver instalación";
$lang['InstCreateI'] = "crear una nuevo %s instalación";
$lang['InstModifyI'] = "modificar esta instalación";
Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/fr.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fr.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ fr.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "Installe par";
$lang['SoldBy'] = "Vendu par";
$lang['Customer'] = "Client/Utilisateur";
-$lang['Money'] = "Somme";
-$lang['Currency'] = "Monnaie";
$lang['InstLinkI'] = "Voir les installations";
$lang['InstCreateI'] = "Créer une nouvelle %s installation";
$lang['InstModifyI'] = "Modifier cette installation";
Index: hu.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/hu.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hu.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ hu.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "Instalálta:";
$lang['SoldBy'] = "Eladta:";
$lang['Customer'] = "Ügyfél/felhasználó";
-$lang['Money'] = "Összeg";
-$lang['Currency'] = "Pénznem";
$lang['InstLinkI'] = "Installatiok kijelzése";
$lang['InstCreateI'] = "Új Installácó létrehozása";
$lang['InstModifyI'] = "Ezen az installációnak a módosítása";
Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- installation.pinc 14 Nov 2002 20:26:24 -0000 1.8
+++ installation.pinc 30 Nov 2002 19:04:47 -0000 1.9
@@ -300,7 +300,7 @@
* Save Installation to DB
*/
function save() {
- global $tutos,$current_user;
+ global $tutos,$current_user,$table;
$msg = "";
$q = new query($this->dbconn);
@@ -309,8 +309,8 @@
$q->addFV("customer_id",$this->customer,"OBJ");
$q->addFV("instdate",$this->instdate,"DATETIME");
$q->addFV("salesdate",$this->salesdate,"DATETIME");
- $q->addFV("currency",$this->currency,"STRING",4);
- $q->addFV("description",$this->description,"STRING",60);
+ $q->addFV("currency",$this->currency,"STRING",$table['installation']['currency'][size]);
+ $q->addFV("description",$this->description,"STRING",$table['installation']['description'][size]);
if ( !empty($this->money) ) {
$q->addFV("money",$this->money,"FLOAT");
} else {
Index: installation_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_new.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- installation_new.php 14 Nov 2002 20:26:25 -0000 1.4
+++ installation_new.php 30 Nov 2002 19:04:47 -0000 1.5
@@ -26,7 +26,7 @@
* display the form
*/
Function info() {
- global $tutos,$lang;
+ global $tutos,$lang,$table;
echo "<form name=\"instadd\" METHOD=\"post\" action=\"installation_ins.php\">\n";
echo $this->DataTableStart();
@@ -56,49 +56,49 @@
echo "<tr>\n";
echo $this->showfieldc($lang['Description'],0,"desc");
- echo " <td colspan=\"3\"><input name=\"desc\" size=\"40\" maxlength=\"60\" value=\"". $this->obj->description ."\">\n";
+ echo " <td colspan=\"3\"><input name=\"desc\" size=\"". min($table['installation']['description'][size],60) ."\" maxlength=\"". $table['installation']['description'][size] ."\" value=\"". $this->obj->description ."\">\n";
echo "</td></tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InstalledBy'],0,"ifn");
- echo " <TD>\n";
+ echo " <td>\n";
select_from_array_or_input($this->obj,"i",$this->obj->installer,1);
- echo " </TD>\n";
+ echo " </td>\n";
echo $this->showfieldc($lang['atDateTime'],0);
- echo " <TD>\n";
+ echo " <td>\n";
$this->obj->instdate->EnterDate("inst");
- echo "</TD></TR>\n";
+ echo "</td></tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['SoldBy'],0,"sfn");
- echo " <TD>\n";
+ echo " <td>\n";
select_from_array_or_input($this->obj,"s",$this->obj->seller,1);
- echo " </TD>\n";
+ echo " </td>\n";
echo $this->showfieldc($lang['atDateTime'],0);
- echo " <TD>\n";
+ echo " <td>\n";
$this->obj->salesdate->EnterDate("sale");
- echo "</TD></TR>\n";
+ echo "</td></tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['Money'],0,"money");
- echo "<TD><INPUT SIZE=10 MAXLENGTH=10 name=\"money\" value=\"". $this->obj->money ."\"></TD>";
+ echo "<td><input size=\"10\" maxlength=\"10\" name=\"money\" value=\"". $this->obj->money ."\"></td>";
echo $this->showfieldc($lang['Currency'],0);
- echo "<TD COLSPAN=1 VALIGN=top>";
+ echo "<td colspan=\"1\" valign=\"top\">";
Currency_Select("currency",$this->obj->currency);
- echo "</TD></TR>\n";
+ echo "</td></tr>\n";
# References to modules
module_addforms($this->user,$this->obj,4);
if ( $this->obj->mod_ok() != 0 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
if ( $this->obj->id > 0 ) {
submit_reset(0,1,1,1,1,0);
} else {
submit_reset(0,-1,1,1,1,0);
}
- echo "</TR>\n";
+ echo "</tr>\n";
}
echo $this->DataTableEnd();
hiddenFormElements();
Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/it.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- it.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ it.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "installato da";
$lang['SoldBy'] = "venduto da";
$lang['Customer'] = "Cliente/Utente";
-$lang['Money'] = "Totale";
-$lang['Currency'] = "Valuta";
$lang['InstLinkI'] = "Visualizza le installazioni";
$lang['InstCreateI'] = "Crea una nuova %s installazione";
$lang['InstModifyI'] = "modifica questa installazione";
Index: ja.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/ja.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ja.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ ja.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "ÀßÈ÷¼Ô";
$lang['SoldBy'] = "ÇäµÑ¼Ô";
$lang['Customer'] = "¥«¥¹¥¿¥Þ/¥æ¡¼¥¶";
-$lang['Money'] = "¹ç·×";
-$lang['Currency'] = "Ä̲ß";
$lang['InstLinkI'] = "ÀßÈ÷¤ò¸«¤ë";
$lang['InstCreateI'] = "%s ¤Î¿·¤·¤¤ÀßÈ÷¤òºîÀ®";
$lang['InstModifyI'] = "¤³¤ÎÀßÈ÷¤òÊѹ¹";
Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/mtable.pinc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mtable.pinc 5 Nov 2002 19:57:48 -0000 1.4
+++ mtable.pinc 30 Nov 2002 19:04:47 -0000 1.5
@@ -18,10 +18,10 @@
"product_id" => array(type => "ID_TYPE", constraints => "", Desc => "id of product/project"),
"update_id" => array(type => "ID_TYPE", constraints => "", Desc => "id of updated instalation"),
"money" => array(type => "float", constraints => "", Desc => "cost of installation"),
- "currency" => array(type => "varchar(4)", constraints => "", Desc => "currency for money"),
+ "currency" => array(type => "VARCHAR", size => 4, constraints => "", Desc => "currency for money"),
"instdate" => array(type => "TS_TYPE", constraints => "", Desc => "installation date"),
"salesdate" => array(type => "TS_TYPE", constraints => "", Desc => "sales date"),
- "description" => array(type => "varchar(60)", constraints => "", Desc => "description"),
+ "description" => array(type => "VARCHAR", size => 60 ,constraints => "", Desc => "description"),
"invoice" => array(type => "ID_TYPE", constraints => "", Desc => "id of invoice"),
"creator" => array(type => "ID_TYPE", constraints => "NN", Desc => "creator ID"),
"creation" => array(type => "TS_TYPE", constraints => "NN", Desc => "creation date"),
Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/nl.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nl.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ nl.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "geinstalleerd door";
$lang['SoldBy'] = "verkocht door";
$lang['Customer'] = "Klant/Gebruiker";
-$lang['Money'] = "Som";
-$lang['Currency'] = "Valuta";
$lang['InstLinkI'] = "Toon Installaties";
$lang['InstCreateI'] = "Maak een nieuwe %s Installatie";
$lang['InstModifyI'] = "Wijzig deze installatie";
Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/pl.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pl.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ pl.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "instalowane przez";
$lang['SoldBy'] = "sprzedane przez";
$lang['Customer'] = "Odbiorca/U¿ytkownik";
-$lang['Money'] = "Suma";
-$lang['Currency'] = "Waluta";
$lang['InstLinkI'] = "Zobacz instalacje";
$lang['InstCreateI'] = "utwórz now± %s instalacjê";
$lang['InstModifyI'] = "modyfikuj niniejsz± instalacjê";
Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/pt-br.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pt-br.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ pt-br.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "instalado por";
$lang['SoldBy'] = "vendido por";
$lang['Customer'] = "Cliente/Usuário";
-$lang['Money'] = "Soma";
-$lang['Currency'] = "Moeda";
$lang['InstLinkI'] = "Ver instalações";
$lang['InstCreateI'] = "criar uma nova %s instalação";
$lang['InstModifyI'] = "modifica essa instalação";
Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/ru.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ru.p3 5 Nov 2002 19:57:48 -0000 1.4
+++ ru.p3 30 Nov 2002 19:04:47 -0000 1.5
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "ÕÓÔÁÎÏ×ÌÅÎÏ ";
$lang['SoldBy'] = "ÐÒÏÄÁÌ";
$lang['Customer'] = "ðÏËÕÐÁÔÅÌØ/ðÏÌØÚÏ×ÁÔÅÌØ";
-$lang['Money'] = "óÕÍÍÁ";
-$lang['Currency'] = "÷ÁÌÀÔÁ";
$lang['InstLinkI'] = "óÍÏÔÒÅÔØ ÕÓÔÁÎÏ×ËÉ";
$lang['InstCreateI'] = "óÏÚÄÁÔØ ÎÏ×ÕÀ ÕÓÔÁÎÏ×ËÕ %s";
$lang['InstModifyI'] = "éÚÍÅÎÉÔØ ÜÔÕ ÕÓÔÁÎÏ×ËÕ";
Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/sv.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sv.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ sv.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "installerad av";
$lang['SoldBy'] = "såld av";
$lang['Customer'] = "Kund/Användare";
-$lang['Money'] = "Totalt";
-$lang['Currency'] = "Valuta";
$lang['InstLinkI'] = "Visa Installationer";
$lang['InstCreateI'] = "skapa en ny %s installation";
$lang['InstModifyI'] = "ändra denna installation";
Index: tw.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/tw.p3,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tw.p3 27 Nov 2002 17:54:56 -0000 1.4
+++ tw.p3 30 Nov 2002 19:04:47 -0000 1.5
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "¾É¤JªÌ";
$lang['SoldBy'] = "°â³fû";
$lang['Customer'] = "«È¤á/¨Ï¥ÎªÌ";
-$lang['Money'] = "Á`p";
-$lang['Currency'] = "³f¹ô";
$lang['InstLinkI'] = "À˵ø¦w¸Ë¤u§@";
$lang['InstCreateI'] = "«Ø¥ß·sªº %s ¾É¤J¤u§@";
$lang['InstModifyI'] = "ק惡¾É¤J¤u§@";
Index: zh.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/zh.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zh.p3 5 Nov 2002 19:57:48 -0000 1.3
+++ zh.p3 30 Nov 2002 19:04:47 -0000 1.4
@@ -18,8 +18,6 @@
$lang['InstalledBy'] = "Ö´ÐÐÕß";
$lang['SoldBy'] = "ÊÛ»õÔ±";
$lang['Customer'] = "¿Í?/ÓÃ?";
-$lang['Money'] = "ºÏ¹²";
-$lang['Currency'] = "»õ±Ò";
$lang['InstLinkI'] = "²é¿´°²×°¹¤×÷";
$lang['InstCreateI'] = "create a new Installation of %s";
$lang['InstModifyI'] = "modify this installation";
|
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php
Modified Files:
address.pinc address_new.php admin_show.php app_new.php
appointment.pinc base.pinc bug.pinc bug_new.php calendar.php
config_default.pinc database.pinc db.p3 fax_ins.php
fax_new.php file.pinc file_new.php file_overview.php
file_show.php location.pinc mail_new.php module_base.pinc
product.pinc scheme.php task.pinc task_new.php task_show.php
team.pinc timetrack_overview.php update.php user.pinc
webelements.p3
Log Message:
using table field sizes
Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- address.pinc 18 Nov 2002 05:55:00 -0000 1.81
+++ address.pinc 30 Nov 2002 19:04:44 -0000 1.82
@@ -210,16 +210,16 @@
* save the objects data to the database
*/
function save () {
- global $current_user, $tutos;
+ global $table,$current_user, $tutos;
$msg = "";
$q = new query($this->dbconn);
$q->setTable($this->tablename);
$q->addFV("birthday",$this->birthday,"DATE");
- $q->addFV("title",$this->title,"STRING",10);
- $q->addFV("f_name",$this->f_name,"STRING",30);
- $q->addFV("m_name",$this->m_name,"STRING",3);
- $q->addFV("l_name",$this->l_name,"STRING",30);
+ $q->addFV("title",$this->title,"STRING",$table['address']['title'][size]);
+ $q->addFV("f_name",$this->f_name,"STRING",$table['address']['f_name'][size]);
+ $q->addFV("m_name",$this->m_name,"STRING",$table['address']['m_name'][size]);
+ $q->addFV("l_name",$this->l_name,"STRING",$table['address']['l_name'][size]);
$q->addFV("pic_id",$this->pic_file,"OBJ");
if ( $this->id < 0 ) {
Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- address_new.php 18 Nov 2002 05:55:01 -0000 1.43
+++ address_new.php 30 Nov 2002 19:04:45 -0000 1.44
@@ -18,7 +18,7 @@
*
*/
Function ask_location() {
- global $lang;
+ global $lang,$table;
$modloc = true;
@@ -28,8 +28,8 @@
$this->add_entry ($lang['AdrCategory'],'category',$this->loc->category,$modloc,30,3);
echo "</tr><tr>\n";
# Address Desription
- $this->add_entry ($lang['AdrDescription'],'lname',$this->loc->lname,$modloc,30);
- $this->add_entry ($lang['Description'],'desc1',$this->loc->desc1,$modloc,30);
+ $this->add_entry ($lang['AdrDescription'],'lname',$this->loc->lname,$modloc,$table['address1']['name'][size]);
+ $this->add_entry ($lang['Description'],'desc1',$this->loc->desc1,$modloc,$table['location']['desc1'][size]);
echo "</tr><tr>\n";
# COMPANY/NAME
@@ -37,7 +37,7 @@
echo $this->showfield($lang['Company']);
echo "<td><select name=\"c_id\">\n";
foreach($this->loc->cl as $i => $f ) {
- echo " <option value=\"". $i ."\">". $f->name ."</OPTION>\n";
+ echo " <option value=\"". $i ."\">". $f->name ."</option>\n";
}
echo " <option value=\"-1\">None</option>\n";
echo "</select>\n";
@@ -48,7 +48,7 @@
$this->add_entry ($lang['Company'],'company',$this->loc,$modloc,30);
}
# EMAIL
- $this->add_entry ($lang['AdrEmail']. " #1",'email_1',$this->loc->email_1,$modloc,60);
+ $this->add_entry ($lang['AdrEmail']. " #1",'email_1',$this->loc->email_1,$modloc,$table['location']['email_1'][size]);
echo "</tr><tr>\n";
# DEPARTMENT
@@ -56,7 +56,7 @@
echo $this->showfield($lang['Department']);
echo "<td><select name=\"d_id\">\n";
foreach($this->loc->dl as $i => $f ) {
- echo " <option value=\"". $i ."\">". $f->name ." / ". $f->company->name ."</OPTION>\n";
+ echo " <option value=\"". $i ."\">". $f->name ." / ". $f->company->name ."</option>\n";
}
echo " <option value=\"-1\">None</option>\n";
echo "</select>\n";
@@ -65,64 +65,64 @@
$this->add_entry ($lang['Department'],'department',$this->loc->department_name,$modloc,30);
}
# EMAIL
- $this->add_entry ($lang['AdrEmail']." #2",'email_2',$this->loc->email_2,$modloc,60);
+ $this->add_entry ($lang['AdrEmail']." #2",'email_2',$this->loc->email_2,$modloc,$table['location']['email_2'][size]);
echo "</tr><tr>\n";
# STREET
- $this->add_entry ($lang['Street'],'street1',$this->loc->street1,$modloc,30);
+ $this->add_entry ($lang['Street'],'street1',$this->loc->street1,$modloc,$table['location']['street1'][size]);
# PHONE
- $this->add_entry ($lang['Phone'] ." #1",'phone_1',$this->loc->phone_1,$modloc,30);
+ $this->add_entry ($lang['Phone'] ." #1",'phone_1',$this->loc->phone_1,$modloc,$table['location']['phone_1'][size]);
echo "</tr><tr>\n";
# STREET
- $this->add_entry ($lang['Street'],'street2',$this->loc->street2,$modloc,30);
+ $this->add_entry ($lang['Street'],'street2',$this->loc->street2,$modloc,$table['location']['street2'][size]);
# PHONE
- $this->add_entry ($lang['Phone'] ." #2",'phone_2',$this->loc->phone_2,$modloc,30);
+ $this->add_entry ($lang['Phone'] ." #2",'phone_2',$this->loc->phone_2,$modloc,$table['location']['phone_2'][size]);
echo "</tr><tr>\n";
# FAX
- $this->add_entry ($lang['AdrFax'],'fax_1',$this->loc->fax_1,$modloc,30);
+ $this->add_entry ($lang['AdrFax'],'fax_1',$this->loc->fax_1,$modloc,$table['location']['fax_1'][size]);
# CITY
- $this->add_entry ($lang['City'],'city',$this->loc->city,$modloc,30);
+ $this->add_entry ($lang['City'],'city',$this->loc->city,$modloc,$table['location']['city'][size]);
echo "</tr><tr>\n";
# ZIP
- $this->add_entry ($lang['ZIP'],'zip',$this->loc->zip,$modloc,10);
+ $this->add_entry ($lang['ZIP'],'zip',$this->loc->zip,$modloc,$table['location']['zip'][size]);
echo "<td colspan=\"2\"> </td>";
echo "</tr><tr>\n";
# STATE
- $this->add_entry ($lang['State'],'state',$this->loc->state,$modloc,30);
+ $this->add_entry ($lang['State'],'state',$this->loc->state,$modloc,$table['location']['state'][size]);
echo "<td colspan=\"2\"> </td>";
echo "</tr><tr>\n";
# COUNTRY
- $this->add_entry ($lang['Country'],'country',$this->loc->country,$modloc,3,3);
+ $this->add_entry ($lang['Country'],'country',$this->loc->country,$modloc,$table['location']['country'][size],3);
echo "</tr>\n";
- echo $this->setfocus("adrnew.lname");
+ echo $this->setfocus("adrnew.lname");
}
/**
*
*/
Function ask_address() {
- global $lang,$tutos;
+ global $lang,$table,$tutos;
echo "<tr>\n";
# TITLE
- $this->add_entry ($lang['AdrTitle'],'title',$this->obj->title,$this->modadr,10,3);
- echo "</tr><TR>\n";
+ $this->add_entry ($lang['AdrTitle'],'title',$this->obj->title,$this->modadr,$table['address']['title'][size],3);
+ echo "</tr><tr>\n";
# FIRST NAME
- $this->add_entry ($lang['AdrFirstName'],'f_name',$this->obj->f_name,$this->modadr,30,3);
+ $this->add_entry ($lang['AdrFirstName'],'f_name',$this->obj->f_name,$this->modadr,$table['address']['f_name'][size],3);
echo "</tr><tr>\n";
# MIDDLE NAME
- $this->add_entry ($lang['AdrMiddleName'],'m_name',$this->obj->m_name,$this->modadr,3,3);
+ $this->add_entry ($lang['AdrMiddleName'],'m_name',$this->obj->m_name,$this->modadr,$table['address']['m_name'][size],3);
echo "</tr><tr>\n";
# LAST NAME
- $this->add_entry ($lang['AdrLastName'],'l_name',$this->obj->l_name,$this->modadr,30,3);
+ $this->add_entry ($lang['AdrLastName'],'l_name',$this->obj->l_name,$this->modadr,$table['address']['l_name'][size],3);
echo "</tr><tr>\n";
# BIRTHDAY
@@ -150,7 +150,7 @@
*
*/
Function info() {
- global $lang;
+ global $lang,$table;
if ( isset($this->loc) ) {
echo "<form name=\"adrnew\" action=\"location_ins.php\" method=\"post\">\n";
@@ -213,11 +213,8 @@
function add_entry($text,$varname,$varvalue,$mod,$size,$width = 1) {
global $lang;
- if ($size > 30 ) {
- $showsize = 30;
- } else {
- $showsize = $size;
- }
+ $showsize = min($size,30);
+
if ( ($varname == 'f_name') ||
($varname == 'l_name') ||
($varname == 'lname') ||
@@ -268,7 +265,7 @@
$this->addHidden($varname,$varvalue);
}
} elseif ( $varname == "country" ) {
- SelectCntryCde($varname,$varvalue);
+ SelectCntryCde($varname,$varvalue);
} else {
if ( $mod == true ) {
echo "<input name=\"". $varname ."\" size=\"". $showsize ."\" maxlength=\"". $size ."\" value=\"". myentities($varvalue) ."\">";
@@ -325,7 +322,7 @@
echo "<P>\n";
if ( $this->obj->isUser() != 0 ) {
- $u = new tutos_user($this->dbconn);
+ $u = new tutos_user($this->dbconn);
$u->read($this->obj->id);
if ( $u->mod_ok() ) {
echo menulink("user_new.php?id=". $this->obj->id ,$lang['UserModify'],sprintf($lang['UserModInfo'],$this->obj->getFullName())) ."<BR>\n";
@@ -340,16 +337,16 @@
* prepare
*/
Function prepare() {
- global $msg,$lang,$HTTP_GET_VARS;
+ global $msg,$lang;
$this->name = $lang['Addresses'];
$this->obj = new tutos_address($this->dbconn);
- if ( isset($HTTP_GET_VARS['id']) ) {
- $id = $HTTP_GET_VARS['id'];
+ if ( isset($_GET['id']) ) {
+ $id = $_GET['id'];
}
- if ( isset($HTTP_GET_VARS['loc_id']) ) {
- $loc_id = $HTTP_GET_VARS['loc_id'];
+ if ( isset($_GET['loc_id']) ) {
+ $loc_id = $_GET['loc_id'];
}
@@ -381,33 +378,33 @@
if ( isset($this->loc->department) ) {
$this->loc->department_name = $this->loc->department->name;
}
- if ( isset($HTTP_GET_VARS['company']) ) {
- $this->loc->company_name = StripSlashes($HTTP_GET_VARS['company']);
+ if ( isset($_GET['company']) ) {
+ $this->loc->company_name = StripSlashes($_GET['company']);
}
- if ( isset($HTTP_GET_VARS['department']) ) {
- $this->loc->department_name = StripSlashes($HTTP_GET_VARS['department']);
+ if ( isset($_GET['department']) ) {
+ $this->loc->department_name = StripSlashes($_GET['department']);
}
- if ( isset($HTTP_GET_VARS['lname']) ) {
- $this->loc->lname = StripSlashes($HTTP_GET_VARS['lname']);
+ if ( isset($_GET['lname']) ) {
+ $this->loc->lname = StripSlashes($_GET['lname']);
}
- if ( isset($HTTP_GET_VARS['category']) ) {
- $this->loc->category = $HTTP_GET_VARS['category'];
+ if ( isset($_GET['category']) ) {
+ $this->loc->category = $_GET['category'];
}
- if ( isset($HTTP_GET_VARS['cploc']) ) {
- $this->loc->cploc = $HTTP_GET_VARS['cploc'];
+ if ( isset($_GET['cploc']) ) {
+ $this->loc->cploc = $_GET['cploc'];
} else {
$this->loc->cploc = 0;
}
- if ( isset($HTTP_GET_VARS['cl']) ) {
- $cl = $HTTP_GET_VARS['cl'];
+ if ( isset($_GET['cl']) ) {
+ $cl = $_GET['cl'];
foreach ($cl as $f) {
$c = new company($this->dbconn);
$c->read($f);
$this->loc->cl[$f] = $c;
}
}
- if ( isset($HTTP_GET_VARS['dl']) ) {
- $dl = $HTTP_GET_VARS['dl'];
+ if ( isset($_GET['dl']) ) {
+ $dl = $_GET['dl'];
foreach ($dl as $f) {
$d = new department($this->dbconn);
$d->read($f);
@@ -415,26 +412,26 @@
}
}
foreach($this->loc->larray as $i => $f) {
- if ( isset($HTTP_GET_VARS[$f]) ) {
- $this->loc->$f = StripSlashes($HTTP_GET_VARS[$f]);
+ if ( isset($_GET[$f]) ) {
+ $this->loc->$f = StripSlashes($_GET[$f]);
}
$i++;
}
} else {
- if ( isset($HTTP_GET_VARS['f_name']) ) {
- $this->obj->f_name = StripSlashes($HTTP_GET_VARS['f_name']);
+ if ( isset($_GET['f_name']) ) {
+ $this->obj->f_name = StripSlashes($_GET['f_name']);
}
- if ( isset($HTTP_GET_VARS['m_name']) ) {
- $this->obj->m_name = StripSlashes($HTTP_GET_VARS['m_name']);
+ if ( isset($_GET['m_name']) ) {
+ $this->obj->m_name = StripSlashes($_GET['m_name']);
}
- if ( isset($HTTP_GET_VARS['l_name']) ) {
- $this->obj->l_name = StripSlashes($HTTP_GET_VARS['l_name']);
+ if ( isset($_GET['l_name']) ) {
+ $this->obj->l_name = StripSlashes($_GET['l_name']);
}
- if ( isset($HTTP_GET_VARS['bd']) ) {
- $this->obj->birthday->setDateTime($HTTP_GET_VARS['bd']);
+ if ( isset($_GET['bd']) ) {
+ $this->obj->birthday->setDateTime($_GET['bd']);
}
- if ( isset($HTTP_GET_VARS['pic_path']) ) {
- $this->obj->pic_file->pic_path = StripSlashes($HTTP_GET_VARS['pic_path']);
+ if ( isset($_GET['pic_path']) ) {
+ $this->obj->pic_file->pic_path = StripSlashes($_GET['pic_path']);
} else {
$this->obj->pic_file->pic_path = "";
}
Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- admin_show.php 5 Nov 2002 19:57:45 -0000 1.45
+++ admin_show.php 30 Nov 2002 19:04:45 -0000 1.46
@@ -6,9 +6,9 @@
* @module admin_show
* @package BASE
*/
- include("webelements.p3");
- include("permission.p3");
- require 'db/table.pinc';
+ include 'webelements.p3';
+ include 'permission.p3';
+ require_once 'db/table.pinc';
/* Check if user is allowed to use it */
check_user();
@@ -79,41 +79,41 @@
$url['people'] = "user_overview.php";
getinfo();
- echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
- echo "<TR>\n";
- echo " <TH COLSPAN=6>". $lang['AdminDBInfo'] ." : ". $this->dbconn->db->alias ."</TH>\n";
- echo "</TR>\n";
- echo "<TR>\n";
+ echo "<table class=\"single\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\">\n";
+ echo "<tr>\n";
+ echo " <th colspan=\"6\">". $lang['AdminDBInfo'] ." : ". $this->dbconn->db->alias ."</th>\n";
+ echo "</tr>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['AdminDBName']);
- echo " <TD COLSPAN=2>". $this->dbconn->db->getLink($this->dbconn->db->name) ."</TD>\n";
+ echo $this->showdata($this->dbconn->db->getLink($this->dbconn->db->name),2);
echo $this->showfield($lang['AdminDBUser']);
- echo " <TD COLSPAN=2>". $this->dbconn->db->user ."</TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($this->dbconn->db->user,2);
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
if ( $this->dbconn->gettype() == "Oracle" ) {
echo $this->showfield($lang['AdminDBHome']);
- echo " <TD COLSPAN=5>". $this->dbconn->db->home ." </TD>\n";
+ echo $this->showdata($this->dbconn->db->home,5);
} else {
echo $this->showfield($lang['AdminDBHost']);
- echo " <TD COLSPAN=2>". $this->dbconn->db->host ."</TD>\n";
+ echo $this->showdata($this->dbconn->db->host,2);
if ( $this->dbconn->gettype() == "Postgres" ) {
echo $this->showfield($lang['AdminDBPort']);
- echo " <TD COLSPAN=2>". $this->dbconn->db->port ."</TD>\n";
+ echo $this->showdata($this->dbconn->db->port,2);
} else {
- echo " <TD COLSPAN=3> </TD>\n";
+ echo " <td colspan=\"3\"> </td>\n";
}
}
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
- echo " <TH>". $lang['AdminDBTable'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBCount'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBTable'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBCount'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBTable'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBCount'] ."</TH>\n";
- echo "</TR>\n";
+ echo "<tr>\n";
+ echo " <th>". $lang['AdminDBTable'] ."</th>\n";
+ echo " <th>". $lang['AdminDBCount'] ."</th>\n";
+ echo " <th>". $lang['AdminDBTable'] ."</th>\n";
+ echo " <th>". $lang['AdminDBCount'] ."</th>\n";
+ echo " <th>". $lang['AdminDBTable'] ."</th>\n";
+ echo " <th>". $lang['AdminDBCount'] ."</th>\n";
+ echo "</tr>\n";
@ksort($table);
@reset ($table);
$c = 0;
@@ -199,16 +199,16 @@
$adr->read($uid,1);
echo " <td colspan=\"1\">". $adr->getLink() ."</td>";
echo " <td align=\"right\">". makelink("user_new.php?uid=".$uid ,$result->get($a, "login")) ."</TD>";
- $ls = new DateTime($result->get($a, "last_seen"));
- echo " <TD COLSPAN=2>". $ls->getLinkDateTime() ."</TD>";
- echo " <TD> ". $result->get($a, "last_host") ."</TD>";
- echo " <TD ALIGN=center>". ($adr->disabled == 0 ? $lang['no']:$lang['yes']) ."</TD>";
+ $ls = $result->getDateTime($a, "last_seen");
+ echo " <td colspan=\"2\">". $ls->getLinkDateTime() ."</td>";
+ echo " <td> ". $result->get($a, "last_host") ."</td>";
+ echo " <td align=\"center\">". ($adr->disabled == 0 ? $lang['no']:$lang['yes']) ."</td>";
echo $this->OverviewRowEnd($line++);
unset($adr);
$a++;
}
$result->free();
- echo "</TABLE>\n";
+ echo "</table>\n";
}
/**
* navigation
@@ -216,10 +216,10 @@
Function navigate() {
global $lang;
- echo "<TR><TD>";
- echo menulink("acl_overview.php",$lang['ACLOverview'],$lang['ACLOverviewI']) ."<BR>\n";
- echo menulink("admin_sync.php",$lang['AdminDBSync'],$lang['AdminDBSync']) ."<BR>";
- echo "</TD></TR>";
+ echo "<tr><td>";
+ echo menulink("acl_overview.php",$lang['ACLOverview'],$lang['ACLOverviewI']) ."<br>\n";
+ echo menulink("admin_sync.php",$lang['AdminDBSync'],$lang['AdminDBSync']) ."<br>\n";
+ echo "</td></tr>";
}
/**
* preparation
Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- app_new.php 9 Nov 2002 19:51:57 -0000 1.44
+++ app_new.php 30 Nov 2002 19:04:45 -0000 1.45
@@ -46,28 +46,28 @@
echo $this->DataTableStart();
echo "<TR>\n";
- echo "<TH COLSPAN=6>";
+ echo "<th colspan=\"6\">";
if ( $this->obj->id > 0 ) {
echo $lang['ModOldAppoint'];
- echo "</TH>\n";
- echo "</TR><TR>\n";
- echo "<TD COLSPAN=5> <B>". $lang['AppCreatedBy'] ."</B> ". $this->obj->creator->getLink();
- echo " <B>". $lang['atDateTime'] ."</B> ". $this->obj->creation->getDateTime()."</TD>";
- echo "<TD ALIGN=right>" .acl_link($this->obj) ."</TD>\n";
- echo "</TR>\n";
+ echo "</th>\n";
+ echo "</tr><tr>\n";
+ echo "<td colspan=\"5\"> <b>". $lang['AppCreatedBy'] ."</b> ". $this->obj->creator->getLink();
+ echo " <b>". $lang['atDateTime'] ."</b> ". $this->obj->creation->getDateTime()."</td>";
+ echo "<td align=\"right\">" .acl_link($this->obj) ."</td>\n";
+ echo "</tr>\n";
} else {
echo $lang['CreateAppoint'];
- echo "</TH>\n";
+ echo "</th>\n";
}
$this->addHidden("creator",$this->obj->creator->id);
# START
- echo "<TR>";
+ echo "<tr>";
echo $this->showfieldc($lang['StartDate'],0,"start");
- echo "<TD COLSPAN=2>";
+ echo "<td colspan=\"2\">";
$this->obj->start->EnterDate("start");
- echo "</TD>";
- echo "<TD VALIGN=top> <B>";
+ echo "</td>";
+ echo "<td valign=\"top\"> <b>";
if ( !isset($_SERVER['HTTP_USER_AGENT']) || ereg("Lynx",$_SERVER['HTTP_USER_AGENT']) || ereg("w3m",$_SERVER['HTTP_USER_AGENT']) ) {
echo $lang['StartTime'];
} else {
@@ -78,35 +78,35 @@
echo $lang['StartTime'];
echo "</a>\n";
}
- echo "</B> <BR> <FONT SIZE=-1>(HH:MM)</FONT></TD>\n";
- echo "<TD COLSPAN=2>";
+ echo "</b> <br> <font size=\"-1\">(HH:MM)</font></td>\n";
+ echo "<td colspan=\"2\">";
$this->obj->start->EnterTime("start");
- echo "</TD>\n";
+ echo "</td>\n";
# END
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfieldc($lang['EndDate'],0,"end");
- echo "<TD COLSPAN=2>";
+ echo "<td colspan=\"2\">";
$this->obj->end->EnterDate("end");
- echo "</TD>\n";
- echo "<TD VALIGN=top> <B>";
+ echo "</td>\n";
+ echo "<td valign=\"top\"> <b>";
if ( !isset($_SERVER['HTTP_USER_AGENT']) || ereg("Lynx",$_SERVER['HTTP_USER_AGENT']) || ereg("w3m",$_SERVER['HTTP_USER_AGENT']) ) {
echo $lang['EndTime'];
} else {
- echo "<A HREF=\"JavaScript: var d = document.forms[0];
+ echo "<a href=\"JavaScript: var d = document.forms[0];
mywindow = window.open('', 'timer', 'width=120,height=420,top=100,left=450');
mywindow.location.href = '". $tutos['base'] ."/php/minitimer.php?f=end&". SID ."'; mywindow.focus();\"
"self.status='minitimer' ;return true\">";
echo $lang['EndTime'];
echo "</a>\n";
}
- echo "</B> <BR> <FONT SIZE=-1>(HH:MM)</FONT></TD>\n";
- echo "<TD COLSPAN=2>";
+ echo "</b> <br> <font size=\"-1\">(HH:MM)</font></td>\n";
+ echo "<td colspan=\"2\">";
$this->obj->end->EnterTime("end");
- echo "</TD>\n";
+ echo "</td>\n";
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
# LOCATION
echo $this->showfieldc($lang['Location2'],0,"outside");
@@ -120,16 +120,16 @@
# Ignore times
echo " <td colspan=\"3\" valign=\"top\">\n";
- echo "<input type=\"checkbox\" name=\"t_ignore\" value=1 ". ($this->obj->t_ignore == 1 ? "CHECKED":"") .">\n";
+ echo "<input type=\"checkbox\" name=\"t_ignore\" value=1 ". ($this->obj->t_ignore == 1 ? "checked":"") .">\n";
echo $lang['IgnoreTime'] ."<br>\n";
- echo "<FONT SIZE=-1>". $lang['IgnoreTime2'] ."</FONT>";
- echo " </TD>\n";
+ echo "<font size=\"-1\">". $lang['IgnoreTime2'] ."</font>";
+ echo " </td>\n";
echo "</tr><tr>\n";
echo $this->showfield($lang['Description'],0,"descr");
echo " <td colspan=\"5\"><textarea wrap=\"virtual\" rows=\"3\" cols=\"40\" name=\"descr\">". $this->obj->descr ."</textarea>\n";
- echo " </TD>\n";
+ echo " </td>\n";
echo "</tr><tr>\n";
Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- appointment.pinc 27 Nov 2002 17:54:56 -0000 1.124
+++ appointment.pinc 30 Nov 2002 19:04:45 -0000 1.125
@@ -339,9 +339,8 @@
$this->mod_allow = $r->get($pos, "mod_allow");
$this->t_ignore = $r->get($pos, "t_ignore");
$this->descr = StripSlashes($r->get($pos, "description"));
- $this->start = new DateTime($r->get($pos, "a_start"));
- $this->end = new DateTime($r->get($pos, "a_end"));
- $this->creation = new DateTime($r->get($pos, "creation"));
+ $this->start = $r->getDateTime($pos, "a_start");
+ $this->end = $r->getDateTime($pos, "a_end");
$cid = $r->get($pos, "creator");
$this->creator = new tutos_address($this->dbconn);
@@ -635,13 +634,13 @@
* save the object to the database and sent mails if neccessary
*/
function save() {
- global $lang , $current_user, $tutos;
+ global $table,$lang , $current_user, $tutos;
$q = new query($this->dbconn);
$q->setTable($this->tablename);
$q->addFV("a_start",$this->start,"DATETIME");
$q->addFV("a_end",$this->end,"DATETIME");
- $q->addFV("description",$this->descr,"STRING",100);
+ $q->addFV("description",$this->descr,"STRING",$table['appointment1']['description'][size]);
$q->addFV("t_ignore",$this->t_ignore,"INT");
$q->addFV("outside",$this->outside,"INT");
$q->addFV("r_arg",$this->r_arg,"STRING",5);
Index: base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/base.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- base.pinc 18 Nov 2002 05:55:01 -0000 1.34
+++ base.pinc 30 Nov 2002 19:04:45 -0000 1.35
@@ -107,7 +107,7 @@
global $g_hash;
$this->id = $r->get($pos, "id");
- $this->creation = new DateTime($r->get($pos, "creation"));
+ $this->creation = $r->getDateTime($pos, "creation");
acl_read($this);
$g_hash[$this->id] = &$this;
Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- bug.pinc 29 Nov 2002 16:14:48 -0000 1.90
+++ bug.pinc 30 Nov 2002 19:04:45 -0000 1.91
@@ -163,7 +163,7 @@
$this->name = StripSlashes($r->get($pos, "name"));
$this->description = StripSlashes($r->get($pos, "description"));
$this->short = StripSlashes($r->get($pos, "short"));
- $this->parent = getObject($this->dbconn,$r->get($pos, "product_id"));
+ $this->parent = $r->getObject($pos, "product_id");
if ($this->name == "") {
$this->name = $this->getFullName();
@@ -183,7 +183,7 @@
}
$this->creator->read($r->get($pos, "creator"));
- $this->solvedate = new DateTime($r->get($pos, "solvedate"));
+ $this->solvedate = $r->getDateTime($pos, "solvedate");
# Check
if ( $this->solver->id == -1 ) {
@@ -829,7 +829,7 @@
$n1 = $r1->numrows();
$a1 = 0;
while ( ($a1 < $n1) && ($diff < 0) ) {
- $d1 = new DateTime($r1->get($a1, "r_time"));
+ $d1 = $r1->getDateTime($a1, "r_time");
$diff = $d1->getTimestamp() - $d->getTimeStamp() + ($tutos[bugremember] * 60);
$a1++;
}
Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_new.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- bug_new.php 29 Nov 2002 08:51:29 -0000 1.49
+++ bug_new.php 30 Nov 2002 19:04:45 -0000 1.50
@@ -27,7 +27,7 @@
Function info() {
global $lang,$tutos;
- echo "<form name=\"bugnew\" action=\"bug_ins.php\" method=\"POST\">\n";
+ echo "<form name=\"bugnew\" action=\"bug_ins.php\" method=\"post\">\n";
if ( $this->obj->id > 0 ) {
$this->addHidden("id",$this->obj->id);
} else {
@@ -41,7 +41,7 @@
echo $this->DataTableStart();
echo "<tr>\n";
- echo " <th colspan=\"4\">". sprintf($lang['Showing'],$lang[$this->obj->getType()])."</TH>\n";
+ echo " <th colspan=\"4\">". sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
echo "</tr>\n";
if ($this->obj->id > 0 ) {
@@ -185,33 +185,33 @@
* prepare
*/
Function prepare() {
- global $tutos,$lang,$HTTP_GET_VARS;
+ global $tutos,$lang;
$this->obj = new bug($this->dbconn);
$this->obj->newdesc = "";
- if ( isset($HTTP_GET_VARS['id']) ) {
- $this->obj->read($HTTP_GET_VARS['id']);
+ if ( isset($_GET['id']) ) {
+ $this->obj->read($_GET['id']);
$this->name = sprintf($lang['BugModifyI'],$this->obj->getFullName());
} else {
$this->name = $lang['BugCreate'];
}
- if ( isset($HTTP_GET_VARS['description']) ) {
- $this->obj->newdesc = StripSlashes($HTTP_GET_VARS['description']);
+ if ( isset($_GET['description']) ) {
+ $this->obj->newdesc = StripSlashes($_GET['description']);
}
- if ( isset($HTTP_GET_VARS['short']) ) {
- $this->obj->short = StripSlashes($HTTP_GET_VARS['short']);
+ if ( isset($_GET['short']) ) {
+ $this->obj->short = StripSlashes($_GET['short']);
}
- if ( isset($HTTP_GET_VARS['state']) ) {
- $this->obj->state = $HTTP_GET_VARS['state'];
+ if ( isset($_GET['state']) ) {
+ $this->obj->state = $_GET['state'];
}
- if ( isset($HTTP_GET_VARS['class']) ) {
- $this->obj->class = $HTTP_GET_VARS['class'];
+ if ( isset($_GET['class']) ) {
+ $this->obj->class = $_GET['class'];
}
- if ( isset($HTTP_GET_VARS['pid']) ) {
- $this->obj->parent = getObject($this->dbconn,$HTTP_GET_VARS['pid']);
+ if ( isset($_GET['pid']) ) {
+ $this->obj->parent = getObject($this->dbconn,$_GET['pid']);
}
# Get possible references
$this->obj->read_relations();
Index: calendar.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- calendar.php 27 Nov 2002 17:54:56 -0000 1.69
+++ calendar.php 30 Nov 2002 19:04:45 -0000 1.70
@@ -247,7 +247,7 @@
echo $this->error ( sprintf($lang['Err0040'],$lang['Appointment']) );
$this->id = -1;
} else {
- $d = new DateTime($result->get(0, "a_start"));
+ $d = $result->getDateTime(0, "a_start");
$this->t = $d->getYYYYMMDD();
}
$result->free();
Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- config_default.pinc 27 Nov 2002 17:54:56 -0000 1.38
+++ config_default.pinc 30 Nov 2002 19:04:45 -0000 1.39
@@ -189,25 +189,14 @@
# reset lists
$tutos[ldapserver] = array();
$tutos[ldapport] = array();
-$tutos[ldapbasedn] = array();
#
$tutos[ldapserver][0] = $_SERVER["SERVER_NAME"];
$tutos[ldapport][0] = 389;
-$tutos[ldapbasedn][0] = "o=TUTOS";
#
# You may add your own ldap stuff
# by simply increasing the index [0] to other values
# AGAIN: do this in config.pinc not in config_default.pinc
-# (examples of public ldap servers below)
-#$tutos[ldapserver][1] = "ldap.bigfoot.com";
-#$tutos[ldapport][1] = 389;
-#$tutos[ldapbasedn][1] = "";
-#$tutos[ldapserver][2] = "directory.verisign.com";
-#$tutos[ldapport][2] = 389;
-#$tutos[ldapbasedn][2] = "";
-#$tutos[ldapserver][3] = "www.nldap.com";
-#$tutos[ldapport][3] = 389;
-#$tutos[ldapbasedn][3] = "";
+# (for examples of public ldap servers README.ldap)
#
#
# Support for X.509v3-Certs (this is alpha)
Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- database.pinc 27 Nov 2002 20:28:42 -0000 1.29
+++ database.pinc 30 Nov 2002 19:04:45 -0000 1.30
@@ -101,8 +101,8 @@
$this->home = StripSlashes($r->get($pos, "dbhome"));
$this->type = StripSlashes($r->get($pos, "dbtype"));
$this->repository = StripSlashes($r->get($pos, "repository"));
- $this->lastsync = new DateTime($r->get($pos, "last_date"));
- $this->lastanalyze = new DateTime($r->get($pos, "lastanalyze"));
+ $this->lastsync = $r->getDateTime($pos, "last_date");
+ $this->lastanalyze = $r->getDateTime($pos, "lastanalyze");
$this->lastid = $r->get($pos, "last_id");
$this->version = StripSlashes($r->get($pos, "version"));
$this->crypt = StripSlashes($r->get($pos, "cryptpw"));
@@ -110,8 +110,6 @@
$this->creator = new tutos_user($this->dbconn);
$this->creator->read($r->get($pos, "creator"));
- $this->id = $r->get($pos, "id");
- $this->creation = new DateTime($r->get($pos, "creation"));
$this->logo = @StripSlashes($r->get($pos, "logo"));
$this->logolink = @StripSlashes($r->get($pos, "logolink"));
@@ -119,8 +117,8 @@
$this->invautoname = @StripSlashes($r->get($pos, "invautoname"));
$this->vatlist = @StripSlashes($r->get($pos, "vatlist"));
- acl_read($this);
- $g_hash[$this->id] = &$this;
+ parent::read_result($r,$pos);
+ return;
}
/* ---------------------------------------------------------------------------
*/
Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- db.p3 18 Nov 2002 05:55:01 -0000 1.102
+++ db.p3 30 Nov 2002 19:04:45 -0000 1.103
@@ -354,15 +354,65 @@
}
}
/**
- * Resultset base class
+ * Resultset base class (= template)
* @package DB
* @module result
*
*/
class result {
-
+ /**
+ * initialize
+ */
function result(&$dbconn) {
$this->dbconn = &$dbconn;
+ }
+ /**
+ * get a result entry
+ */
+ function get($pos,$fld) {
+ return "not implemented";
+ }
+ /**
+ * get a result entry as DateTime
+ */
+ function getDateTime($pos,$fld) {
+ return new DateTime($this->get($pos,$fld));
+ }
+ /**
+ * get a result entry as TUTOS object
+ */
+ function getObject($pos,$fld) {
+ return getObject($this->dbconn,$this->get($pos,$fld));
+ }
+ /**
+ * get the number of rows returned
+ */
+ function numrows() {
+ return "not implemented";
+ }
+ /**
+ * number of fields returned
+ */
+ function numfields() {
+ return "not implemented";
+ }
+ /**
+ * the DB name of a field
+ */
+ function fieldname($nr) {
+ return "not implemented";
+ }
+ /**
+ * the DB type of a field
+ */
+ function fieldtype($nr) {
+ return "not implemented";
+ }
+ /**
+ * free the result
+ */
+ function free() {
+ return "not implemented";
}
}
/**
Index: fax_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fax_ins.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fax_ins.php 5 Nov 2002 19:57:47 -0000 1.15
+++ fax_ins.php 30 Nov 2002 19:04:45 -0000 1.16
@@ -2,9 +2,9 @@
/*
* Copyright 1999 - 2002 by Gero Kohnert
*/
- include("webelements.p3");
- include("permission.p3");
- include("note.pinc");
+ include_once 'webelements.p3';
+ include_once 'permission.p3';
+ include_once 'note.pinc';
/* Check if user is allowed to use it */
check_user();
@@ -14,27 +14,27 @@
$msg = "";
/* Check Input */
- if ( !isset($HTTP_POST_VARS['nr']) || empty($HTTP_POST_VARS['nr']) ) {
+ if ( !isset($_POST['nr']) || empty($_POST['nr']) ) {
$msg .= $lang['Err0031'] ."<BR>\n";
} else {
- $gotourl= addUrlParameter($gotourl,"nr=". UrlEncode($HTTP_POST_VARS['nr']));
+ $gotourl= addUrlParameter($gotourl,"nr=". UrlEncode($_POST['nr']));
}
- if ( isset($HTTP_POST_VARS['adr']) ) {
- $adr = UrlDecode($HTTP_POST_VARS['adr']);
+ if ( isset($_POST['adr']) ) {
+ $adr = UrlDecode($_POST['adr']);
}
- if ( isset($HTTP_POST_VARS['adrid']) ) {
- $gotourl= addUrlParameter($gotourl,"a=". $HTTP_POST_VARS['adrid']);
- $a = getObject($dbconn,$HTTP_POST_VARS['adrid']);
+ if ( isset($_POST['adrid']) ) {
+ $gotourl= addUrlParameter($gotourl,"a=". $_POST['adrid']);
+ $a = getObject($dbconn,$_POST['adrid']);
}
- if ( isset($HTTP_POST_VARS['locid']) ) {
- $gotourl= addUrlParameter($gotourl,"l=". $HTTP_POST_VARS['locid']);
+ if ( isset($_POST['locid']) ) {
+ $gotourl= addUrlParameter($gotourl,"l=". $_POST['locid']);
}
if ( ( ($tutos[faxmode] == 1) && !is_executable($tutos[faxspool]))
|| ($current_user->feature_ok(usefax,PERM_NEW) == 0)
|| ($tutos[demo] == 1) ) {
$msg .= $lang['Err0032'] ."<BR>\n";
}
- $gotourl= addUrlParameter($gotourl,"fax=". Base64_Encode($HTTP_POST_VARS['fax']));
+ $gotourl= addUrlParameter($gotourl,"fax=". Base64_Encode($_POST['fax']));
# Call faxspool
if ( $msg == "" ) {
@@ -67,13 +67,13 @@
$f = $hdr . $fax ."\n--\n";
$m->addBody($f);
$msg .= $m->send();
- $msg .= sprintf($lang['FaxSpooledTo'], $faxmail) ."<BR>\n";
+ $msg .= sprintf($lang['FaxSpooledTo'], $faxmail) ."<br>\n";
$gotourl = "fax_new.php";
} else {
$msg .= "Unknown faxmode ". $tutos[faxmode] ." please fix config.pinc<BR>";
}
- if ( isset($HTTP_POST_VARS['savenote']) ) {
- $x = getObject($dbconn,$HTTP_POST_VARS['savenote']);
+ if ( isset($_POST['savenote']) ) {
+ $x = getObject($dbconn,$_POST['savenote']);
$n = new note($dbconn);
$n->name = "FAX to ". $nr;
$n->note = $fax;
@@ -82,7 +82,7 @@
$dbconn->Begin("WORK");
$msg .= $n->save();
$dbconn->Commit("WORK");
- $msg .= "Fax was saved as a note for ". $x->getLink() ."<BR>";
+ $msg .= "Fax was saved as a note for ". $x->getLink() ."<br>";
$gotourl = $a->getURL();
}
} else {
Index: fax_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fax_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fax_new.php 5 Nov 2002 19:57:47 -0000 1.14
+++ fax_new.php 30 Nov 2002 19:04:46 -0000 1.15
@@ -19,47 +19,48 @@
Function info() {
global $lang,$tutos;
- echo "<br><br><center>\n";
-
echo "<form action=\"fax_ins.php\" method=\"post\">\n";
- DoubleTableStart();
+ echo $this->DataTableStart();
+ echo "<tr>\n";
+ echo " <th colspan=\"6\">". $this->name ."</th>\n";
+ echo "</tr>\n";
echo "<tr>\n";
- echo " <td class=\"desc\">". $lang['FaxTo'] ."</td>\n";
+ echo $this->showfieldc($lang['FaxTo'],0,"adr");
if ( $this->adr->id > 0 ) {
- echo " <TD COLSPAN=2>". $this->adr->getLink() ."</TD>\n";
+ echo " <td colspan=\"2\">". $this->adr->getLink() ."</td>\n";
$this->addHidden("adrid",$this->adr->id);
$this->addHidden("locid",$this->obj->id);
$this->addHidden("adr",UrlEncode($this->adr->getFullName()));
} else {
- echo " <TD COLSPAN=2><INPUT name=\"adr\"></TD>\n";
+ echo " <td colspan=\"2\"><input name=\"adr\"></td>\n";
}
- echo " <TD COLSPAN=1 CLASS=desc>". $lang['FaxNr'] ."</TD>\n";
- echo " <TD COLSPAN=2><INPUT name=\"nr\" value=\"". $this->nr ."\"></TD>\n";
- echo "</TR>\n";
+ echo $this->showfieldc($lang['FaxNr'],1,"nr");
+ echo " <td colspan=\"2\"><input name=\"nr\" value=\"". $this->nr ."\"></td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
- echo " <TD COLSPAN=6 ALIGN=center><TEXTAREA wrap=hard rows=20 cols=70 name=\"fax\">\n";
+ echo "<tr>\n";
+ echo " <td colspan=\"6\" align=\"center\"><textarea wrap=\"hard\" rows=\"20\" cols=\"70\" name=\"fax\">\n";
echo $this->text;
- echo "</TEXTAREA></TD>\n";
- echo "</TR>\n";
+ echo "</textarea></td>\n";
+ echo "</tr>\n";
if ( $this->adr->id > 0 ) {
if ( $this->user->feature_ok(usenotes,PERM_NEW) ) {
- echo "<TR>\n";
- echo " <TD COLSPAN=4 CLASS=desc> ". sprintf($lang['FaxNote'],$this->adr->getFullName()) ."</TD>\n";
- echo " <TD COLSPAN=2><INPUT type=\"checkbox\" name=\"savenote\" value=". $this->adr->id ."></TD>\n";
- echo "</TR>\n";
+ echo "<tr>\n";
+ echo " <td colspan=\"4\" class=\"desc\"> ". sprintf($lang['FaxNote'],$this->adr->getFullName()) ."</td>\n";
+ echo " <td colspan=\"2\"><input type=\"checkbox\" name=\"savenote\" value=". $this->adr->id ."></td>\n";
+ echo "</tr>\n";
}
}
- echo "<TR>\n";
+ echo "<tr>\n";
submit_reset(0,-1,2,1,2,0);
- echo "</TR>\n";
+ echo "</tr>\n";
- DoubleTableEnd();
+ echo $this->DataTableEnd();
hiddenFormElements();
echo $this->getHidden();
- echo "</FORM></CENTER>\n";
+ echo "</form>\n";
}
/**
* navigate
@@ -70,18 +71,18 @@
* prepare
*/
Function prepare() {
- global $msg,$HTTP_GET_VARS,$lang;
+ global $msg,$lang;
$this->name = $lang['FaxCreate'];
$this->obj = new location($this->dbconn);
- if ( isset($HTTP_GET_VARS['a']) ) {
- $this->adr = getObject($this->dbconn,$HTTP_GET_VARS['a']);
+ if ( isset($_GET['a']) ) {
+ $this->adr = getObject($this->dbconn,$_GET['a']);
}
- if ( isset($HTTP_GET_VARS['l']) ) {
- $this->obj->read($HTTP_GET_VARS['l']);
+ if ( isset($_GET['l']) ) {
+ $this->obj->read($_GET['l']);
}
- if ( isset($HTTP_GET_VARS['fax']) ) {
- $this->text = Base64_Decode($HTTP_GET_VARS['fax']);
+ if ( isset($_GET['fax']) ) {
+ $this->text = Base64_Decode($_GET['fax']);
} else {
$t = new DateTime();
$this->text = $t->getDateTime();
@@ -91,7 +92,7 @@
$this->text .= "\n";
$this->text .= $this->user->getFullName();
}
- $this->nr = eregi_replace("^\+\+","00",$HTTP_GET_VARS['nr']);
+ $this->nr = eregi_replace("^\+\+","00",$_GET['nr']);
$this->nr = eregi_replace("^\+","00",$this->nr);
$this->nr = eregi_replace("\(","",$this->nr);
$this->nr = eregi_replace("\)","",$this->nr);
Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file.pinc,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- file.pinc 23 Nov 2002 14:09:15 -0000 1.84
+++ file.pinc 30 Nov 2002 19:04:46 -0000 1.85
@@ -454,18 +454,18 @@
* Copy file to repository
*/
function save() {
- global $current_user, $tutos, $php_errormsg;
+ global $table,$current_user, $tutos, $php_errormsg;
$msg = "";
if ( !is_dir($this->base)) {
$x = @mkdir($this->base ,0755);
if ( $x == FALSE ) {
- $msg .= "<BR>Could not create ". $this->base . " ". $php_errormsg;
+ $msg .= "<br>Could not create ". $this->base . " ". $php_errormsg;
}
}
if ( $msg != "" ) {
$this->id = -1;
- $msg .= "<BR>FILE NOT SAVED";
+ $msg .= "<br>FILE NOT SAVED";
return $msg;
}
if ( $this->link_id == -1 ) {
@@ -511,15 +511,15 @@
return $msg;
}
- $q->addFV("name",$this->name,"STRING",200);
- $q->addFV("filename",$this->filename,"STRING",200);
- $q->addFV("loc",$this->fileloc,"STRING",200);
+ $q->addFV("name",$this->name,"STRING",$table['file']['name'][size]);
+ $q->addFV("filename",$this->filename,"STRING",$table['file']['filename'][size]);
+ $q->addFV("loc",$this->fileloc,"STRING",$table['file']['loc'][size]);
$q->addFV("logtxt",$this->logtxt,"TEXT");
- $q->addFV("version",$this->version,"STRING",10);
+ $q->addFV("version",$this->version,"STRING",$table['file']['version'][size]);
$q->addFV("link_id",$this->link_id,"");
$q->addFV("author",$this->author ,"OBJ");
$q->addFV("f_size",$this->filesize ,"");
- $q->addFV("type",$this->filetype ,"STRING",40);
+ $q->addFV("type",$this->filetype ,"STRING",$table['file']['type'][size]);
$q->addFV("locked",$this->locked ,"");
if ( $newfile == 1 ) {
Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_new.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- file_new.php 10 Nov 2002 11:45:56 -0000 1.37
+++ file_new.php 30 Nov 2002 19:04:46 -0000 1.38
@@ -25,7 +25,7 @@
* display the form
*/
Function info() {
- global $tutos,$lang;
+ global $tutos,$lang,$table;
echo "<form name=\"fileadd\" enctype=\"multipart/form-data\" method=\"post\" action=\"file_ins.php\">\n";
@@ -45,9 +45,9 @@
}
echo "<tr>\n";
echo $this->showfieldc($lang['FileNameDoc'],1,"name");
- echo " <td><input maxlength=\"200\" name=\"name\" value=\"". $this->obj->name ."\"></td>\n";
+ echo " <td><input maxlength=\"".$table['file']['name'][size]."\" name=\"name\" value=\"". $this->obj->name ."\"></td>\n";
echo $this->showfieldc($lang['FileVersion'],0,"version");
- echo " <td><input size=\"10\" maxlength=\"10\" name=\"version\" value=\"". $this->obj->version ."\"></td>\n";
+ echo " <td><input size=\"10\" maxlength=\"".$table['file']['version'][size]."\" name=\"version\" value=\"". $this->obj->version ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_overview.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- file_overview.php 10 Nov 2002 11:45:56 -0000 1.34
+++ file_overview.php 30 Nov 2002 19:04:46 -0000 1.35
@@ -112,7 +112,7 @@
* prepare
*/
Function prepare() {
- global $msg,$lang,$HTTP_GET_VARS;
+ global $msg,$lang;
$this->name = $lang['FileOverview'];
$this->link1 = "file_overview.php";
@@ -120,44 +120,44 @@
$this->q = "SELECT * FROM ". $this->dbconn->prefix ."files";
$pre = " WHERE " ;
- if ( isset($HTTP_GET_VARS['link_id']) ) {
- $this->q .= $pre . " link_id = ". $HTTP_GET_VARS['link_id'];
+ if ( isset($_GET['link_id']) ) {
+ $this->q .= $pre . " link_id = ". $_GET['link_id'];
$pre = " AND " ;
- $this->link1 = addUrlParameter($this->link1,"link_id=". $HTTP_GET_VARS['link_id']);
+ $this->link1 = addUrlParameter($this->link1,"link_id=". $_GET['link_id']);
}
- if ( isset($HTTP_GET_VARS['author']) ) {
- $this->q .= $pre . " author = ". $HTTP_GET_VARS['author'];
+ if ( isset($_GET['author']) ) {
+ $this->q .= $pre . " author = ". $_GET['author'];
$pre = " AND " ;
- $this->link1 = addUrlParameter($this->link1,"author=". $HTTP_GET_VARS['author']);
+ $this->link1 = addUrlParameter($this->link1,"author=". $_GET['author']);
}
- if ( isset($HTTP_GET_VARS['creator']) ) {
- $this->q .= $pre . " creator = ". $HTTP_GET_VARS['creator'];
+ if ( isset($_GET['creator']) ) {
+ $this->q .= $pre . " creator = ". $_GET['creator'];
$pre = " AND " ;
- $this->link1 = addUrlParameter($this->link1,"creator=". $HTTP_GET_VARS['creator']);
+ $this->link1 = addUrlParameter($this->link1,"creator=". $_GET['creator']);
}
- if ( isset($HTTP_GET_VARS['type']) ) {
- $this->q .= $pre . $this->dbconn->Like("type",$HTTP_GET_VARS['type']);
+ if ( isset($_GET['type']) ) {
+ $this->q .= $pre . $this->dbconn->Like("type",$_GET['type']);
$pre = " AND " ;
- $this->link1 = addUrlParameter($this->link1,"type=". UrlEncode($HTTP_GET_VARS['type']));
+ $this->link1 = addUrlParameter($this->link1,"type=". UrlEncode($_GET['type']));
}
- if ( isset($HTTP_GET_VARS['name']) && ($HTTP_GET_VARS['name'] != "") ) {
+ if ( isset($_GET['name']) && ($_GET['name'] != "") ) {
$this->q .= $pre . "(";
- $this->q .= $this->dbconn->Like("name",$HTTP_GET_VARS['name']);
- $this->q .= " OR ". $this->dbconn->Like("filename",$HTTP_GET_VARS['name']);
- $this->q .= " OR ". $this->dbconn->Like("version",$HTTP_GET_VARS['name']);
+ $this->q .= $this->dbconn->Like("name",$_GET['name']);
+ $this->q .= " OR ". $this->dbconn->Like("filename",$_GET['name']);
+ $this->q .= " OR ". $this->dbconn->Like("version",$_GET['name']);
# $this->q .= " OR ". $this->dbconn->Like("logtxt",$name);
$this->q .= ")";
$pre = " AND " ;
- $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($HTTP_GET_VARS['name']));
- $this->filter['name'] = $HTTP_GET_VARS['name'];
+ $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
+ $this->filter['name'] = $_GET['name'];
} else {
$this->filter['name'] = "";
}
# Start Date for search
$from = new DateTime(0);
- if ( isset($HTTP_GET_VARS['fd']) ) {
- $from->setDateTime($HTTP_GET_VARS['fd']);
+ if ( isset($_GET['fd']) ) {
+ $from->setDateTime($_GET['fd']);
} else {
$from->setDateTimeF("f");
# remember this
@@ -172,8 +172,8 @@
}
# End Date for search
$to = new DateTime(0);
- if ( isset($HTTP_GET_VARS['td']) ) {
- $to->setDateTime($HTTP_GET_VARS['td']);
+ if ( isset($_GET['td']) ) {
+ $to->setDateTime($_GET['td']);
} else {
$to->setDateTimeF("t");
# remember this
Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file_show.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- file_show.php 10 Nov 2002 13:24:46 -0000 1.42
+++ file_show.php 30 Nov 2002 19:04:46 -0000 1.43
@@ -91,69 +91,69 @@
}
echo $this->DataTableStart();
- echo "<TR><TH COLSPAN=4>". $lang['FileDetail'] ."</TH></TR>\n";
+ echo "<tr><th colspan=\"4\">". $lang['FileDetail'] ."</th></tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileNameDoc']);
echo $this->showdata($this->obj->name,1);
echo $this->showfield($lang['FileVersion']);
echo $this->showdata($this->obj->version,1);
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileName']);
echo $this->showdata($this->obj->filename,3);
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['created']);
echo $this->showdata($this->obj->creation->getDateTime(),4);
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileAuthor']);
echo $this->showdata($this->obj->author->getLink(),3);
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileReference']);
if ($this->obj->ref != -1 ) {
echo $this->showdata($lang[$this->obj->ref->gettype()] ." ". $this->obj->getRefLink(),3);
} else {
echo $this->showdata($lang['HistoryDeleted'] ." (". $this->obj->link_id .")",3);
}
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileSize']);
echo $this->showdata($this->obj->filesize ." Bytes",3);
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileType']);
echo $this->showdata($this->obj->filetype,3);
- echo "</TR>\n";
+ echo "</tr>\n";
if ( $this->obj->locked > 0 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileLockedBy']);
echo $this->showdata($this->obj->locker->getMailLink(),3);
- echo "</TR>\n";
+ echo "</tr>\n";
}
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileMore']);
- echo " <TD COLSPAN=3 CLASS=pre><FONT SIZE=-1><PRE>\n";
+ echo " <td colspan=\"3\" class=\"pre\"><font size=\"-1\"><pre>\n";
$this->obj->moreinfo();
- echo " </PRE></FONT></TD>\n";
- echo "</TR>\n";
+ echo " </pre></font></td>\n";
+ echo "</tr>\n";
$this->obj->make_vlist();
@reset($this->obj->vlist);
if (count($this->obj->vlist) > 0 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileOldVersion']);
- echo " <TD COLSPAN=3><FONT SIZE=-1>\n";
+ echo " <td colspan=\"3\"><font size=\"-1\">\n";
while ( list ($i,$v) = @each ($this->obj->vlist) ) {
if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
echo makelink("file_show.php?id=". $this->obj->id ."&format=download&version=".$v, $lang['FileDownload'] ." ". $lang['FileVersion'] ." ". $i , $v);
@@ -162,15 +162,15 @@
}
echo "<BR>\n";
}
- echo "</FONT></TD>\n";
- echo "</TR>\n";
+ echo "</font></td>\n";
+ echo "</tr>\n";
}
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['FileLog']);
- echo " <TD COLSPAN=3 CLASS=pre><FONT SIZE=-1><PRE>\n";
+ echo " <td colspan=\"3\" class=\"pre\"><font size=\"-1\"><pre>\n";
echo $this->obj->logtxt;
- echo " </PRE></FONT></TD>\n";
- echo "</TR>\n";
+ echo " </pre></font></td>\n";
+ echo "</tr>\n";
# References to modules
show_module_infolists($this->user,$this->obj,4,$this->format);
Index: location.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/location.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- location.pinc 5 Nov 2002 19:57:47 -0000 1.34
+++ location.pinc 30 Nov 2002 19:04:46 -0000 1.35
@@ -220,7 +220,7 @@
* save to DB
*/
function save () {
- global $current_user, $tutos;
+ global $current_user, $tutos,$table;
$msg = "";
@@ -232,7 +232,7 @@
$i=0;
while($i < count($this->larray)) {
$f = $this->larray[$i];
- $q1->addFV($f,$this->$f,"STRING");
+ $q1->addFV($f,$this->$f,"STRING",$table['location'][$f][size]);
$i++;
}
if ( is_object($this->company) ) {
Index: mail_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mail_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mail_new.php 5 Nov 2002 19:57:47 -0000 1.14
+++ mail_new.php 30 Nov 2002 19:04:46 -0000 1.15
@@ -11,9 +11,9 @@
* @module mail_new
* @package mail
*/
- include("webelements.p3");
- include("permission.p3");
- include("mailbox.pinc");
+ include_once 'webelements.p3';
+ include_once 'permission.p3';
+ include_once 'mailbox.pinc';
/* Check if user is allowed to use it */
check_user();
@@ -30,61 +30,60 @@
Function info() {
global $tutos,$lang;
- echo "<form name=\"mailnew\" action=\"mail_ins.php\" method=\"POST\">\n";
+ echo "<form name=\"mailnew\" action=\"mail_ins.php\" method=\"post\">\n";
$this->addHidden("gotourl","mail_new.php");
echo $this->DataTableStart();
-
echo "<tr>\n";
echo " <th colspan=\"4\">". $lang['MailboxEmail'] ."</td>\n";
echo "</tr>\n";
- echo "<TR>\n";
- echo $this->showfieldc($lang['MailFrom'],0);
- echo " <TD COLSPAN=3>\n";
+ echo "<tr>\n";
+ echo $this->showfieldc($lang['MailFrom'],0,"from");
+ echo " <td colspan=\"3\">\n";
$d = $this->obj->from->default_email();
- echo "<SELECT NAME=\"from\">";
+ echo " <select name=\"from\">\n";
if ( isset($this->obj->from->location) ) {
@reset($this->obj->from->location);
while( list ($i,$f) = @each ($this->obj->from->location)) {
if ( $f->email_1 != "") {
- echo "<OPTION VALUE=\"1,". $f->id ."\" ". ($d == $f->email_1 ? "SELECTED" : "") .">". $f->email_1 ."</OPTION>";
+ echo " <option value=\"1,". $f->id ."\"". ($d == $f->email_1 ? " selected" : "") .">". $f->email_1 ."</option>\n";
}
if ( $f->email_2 != "") {
- echo "<OPTION VALUE=\"2,". $f->id ."\" ". ($d == $f->email_2 ? "SELECTED" : "") .">". $f->email_2 ."</OPTION>";
+ echo " <option value=\"2,". $f->id ."\"". ($d == $f->email_2 ? " selected" : "") .">". $f->email_2 ."</option>\n";
}
}
}
- echo "</SELECT>";
- echo " </TD>\n";
- echo "</TR>\n";
-
- echo "<TR>\n";
- echo $this->showfieldc($lang['MailTo'],1);
- echo " <TD COLSPAN=3>\n";
- echo " <INPUT size=40 maxlength=60 name=to value=\"". $this->obj->getToAscii() ."\">\n";
- echo " </TD>\n";
- echo "</TR>\n";
-
- echo "<TR>\n";
- echo $this->showfieldc($lang['MailCc'],0);
- echo " <TD COLSPAN=3>\n";
- echo " <INPUT size=40 maxlength=60 name=cc value=\"". $this->obj->getCcAscii() ."\">\n";
- echo " </TD>\n";
- echo "</TR>\n";
-
- echo "<TR>\n";
- echo $this->showfieldc($lang['MailSubject'],0);
- echo " <TD COLSPAN=3>\n";
- echo " <INPUT size=40 maxlength=60 name=subject value=\"". $this->obj->subject ."\">\n";
- echo " </TD>\n";
- echo "</TR>\n";
-
- echo "<TR>\n";
- echo " <TD COLSPAN=4>\n";
- echo " <TEXTAREA wrap=hard rows=20 cols=60 name=body>". $this->obj->body[0] ."</TEXTAREA>\n";
- echo " </TD>\n";
- echo "</TR>\n";
+ echo " </select>\n";
+ echo " </td>\n";
+ echo "</tr>\n";
+
+ echo "<tr>\n";
+ echo $this->showfieldc($lang['MailTo'],1,"to");
+ echo " <td colspan=\"3\">\n";
+ echo " <input size=\"40\" maxlength=\"60\" name=\"to\" value=\"". $this->obj->getToAscii() ."\">\n";
+ echo " </td>\n";
+ echo "</tr>\n";
+
+ echo "<tr>\n";
+ echo $this->showfieldc($lang['MailCc'],0,"cc");
+ echo " <td colspan=\"3\">\n";
+ echo " <input size=\"40\" maxlength=\"60\" name=\"cc\" value=\"". $this->obj->getCcAscii() ."\">\n";
+ echo " </td>\n";
+ echo "</tr>\n";
+
+ echo "<tr>\n";
+ echo $this->showfieldc($lang['MailSubject'],0,"subject");
+ echo " <td colspan=\"3\">\n";
+ echo " <input size=\"40\" maxlength=\"60\" name=\"subject\" value=\"". $this->obj->subject ."\">\n";
+ echo " </td>\n";
+ echo "</tr>\n";
+
+ echo "<tr>\n";
+ echo " <td colspan=\"4\">\n";
+ echo " <textarea wrap=\"hard\" rows=\"20\" cols=\"60\" name=\"body\">". $this->obj->body[0] ."</textarea>\n";
+ echo " </td>\n";
+ echo "</tr>\n";
submit_reset(0,1,1,1,1,0);
echo $this->DataTableEnd();
Index: module_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/module_base.pinc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- module_base.pinc 24 Nov 2002 16:34:53 -0000 1.23
+++ module_base.pinc 30 Nov 2002 19:04:46 -0000 1.24
@@ -16,10 +16,14 @@
* load modules that want to work here
*/
Function loadmodule($key) {
- global $tutos,$lang,$current_user;
+ global $tutos,$lang,$current_user,$table,$tableidx,$sequence;
include_once $tutos['base'] ."/". $tutos[modules][$key][file];
ReadLang1($lang,dirname($tutos['base'] ."/". $tutos[modules][$key][file]),$current_user);
+
+ if (file_exists(dirname($tutos['base'] ."/". $tutos[modules][$key][file]) ."/mtable.pinc") ) {
+ @include_once dirname($tutos['base'] ."/". $tutos[modules][$key][file]) ."/mtable.pinc";
+ }
}
/**
* load modules that want to work here
Index: product.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product.pinc,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- product.pinc 24 Nov 2002 19:19:06 -0000 1.103
+++ product.pinc 30 Nov 2002 19:04:46 -0000 1.104
@@ -132,8 +132,8 @@
$this->state = $r->get($pos, "state");
$this->creator = new tutos_address($this->dbconn);
$this->creator->read($r->get($pos, "creator"));
- $this->p_start = new DateTime($r->get($pos, "p_start"));
- $this->p_end = new DateTime($r->get($pos, "p_end"));
+ $this->p_start = $r->getDateTime($pos, "p_start");
+ $this->p_end = $r->getDateTime($pos, "p_end");
parent::read_result($r,$pos);
#
Index: scheme.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/scheme.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- scheme.php 12 Nov 2002 20:22:29 -0000 1.38
+++ scheme.php 30 Nov 2002 19:04:46 -0000 1.39
@@ -541,7 +541,6 @@
@reset($tutos[modules]);
while ( list ($r,$x) = @each ($tutos[modules])) {
loadmodule($r);
- @include(dirname($tutos['base'] ."/". $tutos[modules][$r][file]) ."/mtable.pinc");
}
if ( isset($_GET['step']) && ($tutos[demo] == 0) ) {
$this->step = $_GET['step'];
Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- task.pinc 17 Nov 2002 13:36:54 -0000 1.95
+++ task.pinc 30 Nov 2002 19:04:46 -0000 1.96
@@ -113,10 +113,10 @@
$this->name = StripSlashes($r->get($pos, "name"));
$this->desc = StripSlashes($r->get($pos, "description"));
- $this->r_start = new DateTime($r->get($pos, "r_start"));
- $this->r_end = new DateTime($r->get($pos, "r_end"));
- $this->s_start = new DateTime($r->get($pos, "s_start"));
- $this->s_end = new DateTime($r->g...
[truncated message content] |
|
From: Gero K. <gok...@us...> - 2002-11-30 19:05:19
|
Update of /cvsroot/tutos/tutos/php/group
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/group
Modified Files:
group.pinc group_new.php
Log Message:
using table field sizes
Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- group.pinc 23 Nov 2002 14:11:54 -0000 1.20
+++ group.pinc 30 Nov 2002 19:04:47 -0000 1.21
@@ -28,16 +28,12 @@
* @param int $pos a index in the resultset
*/
function read_result (&$r, $pos ) {
- global $g_hash;
-
$this->name = StripSlashes($r->get($pos, "name"));
$this->desc = StripSlashes($r->get($pos, "description"));
$this->creator->read($r->get($pos, "creator"));
- $this->id = $r->get($pos, "id");
- $this->creation = new DateTime($r->get($pos, "creation"));
- acl_read($this);
- $g_hash[$this->id] = &$this;
+ parent::read_result($r,$pos);
+ return;
}
/**
* Return a url that displays this group
@@ -140,14 +136,14 @@
* Save Group to DB
*/
function save() {
- global $tutos,$current_user;
+ global $tutos,$current_user,$table;
$msg = "";
$q = new query($this->dbconn);
$q->setTable($this->tablename);
- $q->addFV("name",$this->name,"STRING",30);
- $q->addFV("description",$this->desc,"STRING",60);
+ $q->addFV("name",$this->name,"STRING",$table['group1']['name'][size]);
+ $q->addFV("description",$this->desc,"STRING",$table['group1']['description'][size]);
if ( $this->id < 0 ) {
unset ($this->modified);
Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- group_new.php 6 Nov 2002 08:01:22 -0000 1.14
+++ group_new.php 30 Nov 2002 19:04:47 -0000 1.15
@@ -27,7 +27,7 @@
* display the form
*/
Function info() {
- global $tutos,$lang;
+ global $tutos,$lang,$table;
echo "<form name=\"groupnew\" action=\"group_ins.php\" method=\"POST\">\n";
echo $this->DataTableStart();
@@ -44,12 +44,12 @@
echo "<tr>\n";
echo $this->showfieldc($lang['GroupName'],1,"name");
- echo " <td colspan=\"3\" valign=\"top\"><input size=\"30\" maxlength=\"30\" name=\"name\" value=\"". $this->obj->name ."\"></td>";
+ echo " <td colspan=\"3\" valign=\"top\"><input size=\"". min($table['group1']['name'][size],30) ."\" maxlength=\"".$table['group1']['name'][size]."\" name=\"name\" value=\"". $this->obj->name ."\"></td>";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['GroupDesc'],0,"desc");
- echo " <td colspan=\"3\" valign=\"top\"><input size=\"60\" maxlength=\"60\" name=\"desc\" value=\"". $this->obj->desc ."\"></td>";
+ echo " <td colspan=\"3\" valign=\"top\"><input size=\"". min($table['group1']['description'][size],60) ."\" maxlength=\"".$table['group1']['description'][size]."\" name=\"desc\" value=\"". $this->obj->desc ."\"></td>";
echo "</tr>\n";
# References to modules
|
|
From: Gero K. <gok...@us...> - 2002-11-30 19:05:19
|
Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/db
Modified Files:
db_pg.pinc
Log Message:
using table field sizes
Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- db_pg.pinc 5 Nov 2002 19:47:16 -0000 1.6
+++ db_pg.pinc 30 Nov 2002 19:04:47 -0000 1.7
@@ -436,19 +436,22 @@
function result_pg(&$dbconn) {
parent::result($dbconn);
}
- /* ---------------------------------------------------------------------------
+ /**
+ * ge a result entry
*/
function get($pos,$fld) {
if ( empty($this->rs) ) return -1;
return pg_Result($this->rs, $pos, $fld);
}
- /* ---------------------------------------------------------------------------
+ /**
+ * get the number of rows returned
*/
function numrows() {
if ( empty($this->rs) ) return -1;
return pg_NumRows($this->rs);
}
- /* ---------------------------------------------------------------------------
+ /**
+ * number of fields returned
*/
function numfields() {
if ( empty($this->rs) ) return -1;
|
|
From: Gero K. <gok...@us...> - 2002-11-30 19:04:52
|
Update of /cvsroot/tutos/tutos/php/localization In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/localization Modified Files: ca.p3 cs.p3 de.p3 el.p3 en.p3 es-mx.p3 es-ni.p3 es.p3 fr.p3 hu.p3 it.p3 ja.p3 ko.p3 nl.p3 pl.p3 pt-br.p3 ru.p3 sv.p3 tw.p3 zh.p3 Log Message: using table field sizes Index: ca.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ca.p3 23 Nov 2002 14:10:47 -0000 1.12 +++ ca.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -148,6 +148,8 @@ $lang['withmarked'] = "amb les %s marcades"; $lang['SetTo'] = "Posar %s a %s"; $lang['pcs'] = "u."; +$lang['Money'] = "preu"; +$lang['Currency'] = "valuta"; # Appointments $lang['Appointment'] = "Cita"; Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cs.p3 27 Nov 2002 20:29:15 -0000 1.11 +++ cs.p3 30 Nov 2002 19:04:48 -0000 1.12 @@ -151,6 +151,8 @@ $lang['withmarked'] = "oznaèení %s"; $lang['SetTo'] = "nastavit %s na %s"; $lang['pcs'] = "kusù"; +$lang['Money'] = "Souèet"; +$lang['Currency'] = "Peníze"; # Appointments $lang['Appointment'] = "Schùzka"; Index: de.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- de.p3 23 Nov 2002 14:10:48 -0000 1.14 +++ de.p3 30 Nov 2002 19:04:48 -0000 1.15 @@ -150,6 +150,8 @@ $lang['withmarked'] = "Markierte %s"; $lang['SetTo'] = "%s auf %s setzen"; $lang['pcs'] = "Stück"; +$lang['Money'] = "Betrag"; +$lang['Currency'] = "Währung"; # Appointments $lang['Appointment'] = "Termin"; Index: el.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- el.p3 23 Nov 2002 14:10:48 -0000 1.13 +++ el.p3 30 Nov 2002 19:04:48 -0000 1.14 @@ -149,6 +149,8 @@ $lang['withmarked'] = "åðéëïãÞ ãéá %s"; $lang['SetTo'] = "ôïðïèÝôçóå %s óå %s"; $lang['pcs'] = "êïììÜôéá"; +$lang['Money'] = "Ðïóü"; +$lang['Currency'] = "Íüìéóìá"; # Appointments $lang['Appointment'] = "ÓõíÜíôçóç"; Index: en.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- en.p3 23 Nov 2002 14:10:48 -0000 1.14 +++ en.p3 30 Nov 2002 19:04:48 -0000 1.15 @@ -150,6 +150,8 @@ $lang['withmarked'] = "with marked %s"; $lang['SetTo'] = "set %s to %s"; $lang['pcs'] = "pieces"; +$lang['Money'] = "Sum"; +$lang['Currency'] = "Currency"; # Appointments $lang['Appointment'] = "Appointment"; Index: es-mx.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-mx.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- es-mx.p3 23 Nov 2002 14:10:48 -0000 1.12 +++ es-mx.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -147,6 +147,8 @@ $lang['withmarked'] = "with marked %s"; $lang['SetTo'] = "set %s to %s"; $lang['pcs'] = "pieces"; +$lang['Money'] = "precio"; +$lang['Currency'] = "moneda"; # Appointments $lang['Appointment'] = "Cita"; Index: es-ni.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es-ni.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- es-ni.p3 23 Nov 2002 14:10:48 -0000 1.12 +++ es-ni.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -147,6 +147,8 @@ $lang['withmarked'] = "marcado como %s"; $lang['SetTo'] = "cambiar %s a %s"; $lang['pcs'] = "piezas"; +$lang['Money'] = "precio"; +$lang['Currency'] = "valuta"; # Appointments $lang['Appointment'] = "Cita"; Index: es.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/es.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- es.p3 23 Nov 2002 14:10:48 -0000 1.12 +++ es.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -147,6 +147,8 @@ $lang['withmarked'] = "con las %s marcadas"; $lang['SetTo'] = "Poner %s a %s"; $lang['pcs'] = "piezas"; +$lang['Money'] = "precio"; +$lang['Currency'] = "valuta"; # Appointments $lang['Appointment'] = "Cita"; Index: fr.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fr.p3 23 Nov 2002 14:10:48 -0000 1.12 +++ fr.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -147,6 +147,8 @@ $lang['withmarked'] = "Pour les %s sélectionnées "; $lang['SetTo'] = "Positionner %s à %s"; $lang['pcs'] = "pièces"; +$lang['Money'] = "Somme"; +$lang['Currency'] = "Monnaie"; # Appointments $lang['Appointment'] = "Rendez-vous"; Index: hu.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/hu.p3,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- hu.p3 23 Nov 2002 14:10:49 -0000 1.10 +++ hu.p3 30 Nov 2002 19:04:48 -0000 1.11 @@ -151,6 +151,8 @@ $lang['withmarked'] = "Megjelölt %s"; $lang['SetTo'] = "%s auf %s setzen"; $lang['pcs'] = "Darab"; +$lang['Money'] = "Összeg"; +$lang['Currency'] = "Pénznem"; # Appointments $lang['Appointment'] = "Határidõ, tárgyalás"; Index: it.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- it.p3 23 Nov 2002 14:10:49 -0000 1.12 +++ it.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -145,6 +145,8 @@ $lang['withmarked'] = "with marked %s"; $lang['SetTo'] = "set %s to %s"; $lang['pcs'] = "pieces"; +$lang['Money'] = "Totale"; +$lang['Currency'] = "Valuta"; # Appointments $lang['Appointment'] = "Appuntamento"; Index: ja.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ja.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ja.p3 23 Nov 2002 14:10:49 -0000 1.12 +++ ja.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -144,6 +144,8 @@ $lang['withmarked'] = "%s ±¦¤Î¤è¤¦¤Ë¥Þ¡¼¥¯¤¹¤ë"; $lang['SetTo'] = "%s ¤ò %s ¤Ë¥»¥Ã¥È"; $lang['pcs'] = "Éôʬ"; +$lang['Money'] = "¹ç·×"; +$lang['Currency'] = "Ä̲ß"; # Appointments $lang['Appointment'] = "ͽÌó"; Index: ko.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ko.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ko.p3 23 Nov 2002 14:10:49 -0000 1.12 +++ ko.p3 30 Nov 2002 19:04:48 -0000 1.13 @@ -147,6 +147,8 @@ $lang['withmarked'] = "Ç¥½ÃµÈ %sÀ»"; $lang['SetTo'] = "%s(À»)¸¦ %s(À¸)·Î ¼³Á¤"; $lang['pcs'] = "Pieces"; +$lang['Money'] = "Sum"; +$lang['Currency'] = "Currency"; # Appointments $lang['Appointment'] = "<pre><FONT SIZE=5><b>ÀÏ Á¤</b></FONT></pre>"; Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- nl.p3 27 Nov 2002 19:51:28 -0000 1.15 +++ nl.p3 30 Nov 2002 19:04:48 -0000 1.16 @@ -154,6 +154,8 @@ $lang['withmarked'] = "Met gemarkeerde %s"; $lang['SetTo'] = "Stel %s in op %s"; $lang['pcs'] = "stuks"; +$lang['Money'] = "Som"; +$lang['Currency'] = "Valuta"; # Appointments $lang['Appointment'] = "Afspraak"; Index: pl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pl.p3 23 Nov 2002 14:10:49 -0000 1.13 +++ pl.p3 30 Nov 2002 19:04:48 -0000 1.14 @@ -151,6 +151,8 @@ $lang['withmarked'] = "z zaznaczonym %s"; $lang['SetTo'] = "ustaw %s na %s"; $lang['pcs'] = "sztuk"; +$lang['Money'] = "Suma"; +$lang['Currency'] = "Waluta"; # Appointments $lang['Appointment'] = "Spotkanie"; Index: pt-br.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/pt-br.p3,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pt-br.p3 23 Nov 2002 14:10:49 -0000 1.12 +++ pt-br.p3 30 Nov 2002 19:04:49 -0000 1.13 @@ -145,6 +145,8 @@ $lang['withmarked'] = "with marked %s"; $lang['SetTo'] = "set %s to %s"; $lang['pcs'] = "pieces"; +$lang['Money'] = "Soma"; +$lang['Currency'] = "Moeda"; # Appointments $lang['Appointment'] = "Compromisso"; Index: ru.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ru.p3 27 Nov 2002 17:54:57 -0000 1.15 +++ ru.p3 30 Nov 2002 19:04:49 -0000 1.16 @@ -147,6 +147,8 @@ $lang['withmarked'] = "Ó ÐÏÍÅÔËÏÊ %s"; $lang['SetTo'] = "ÕÓÔ. %s × %s"; $lang['pcs'] = "ÞÁÓÔÉ"; +$lang['Money'] = "óÕÍÍÁ"; +$lang['Currency'] = "÷ÁÌÀÔÁ"; # Appointments $lang['Appointment'] = "óÏÂÙÔÉÅ"; Index: sv.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sv.p3 23 Nov 2002 14:10:49 -0000 1.13 +++ sv.p3 30 Nov 2002 19:04:49 -0000 1.14 @@ -143,6 +143,8 @@ $lang['withmarked'] = "with marked %s"; $lang['SetTo'] = "set %s to %s"; $lang['pcs'] = "pieces"; +$lang['Money'] = "Totalt"; +$lang['Currency'] = "Valuta"; # Appointments $lang['Appointment'] = "Bokning"; Index: tw.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/tw.p3,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tw.p3 27 Nov 2002 17:54:57 -0000 1.15 +++ tw.p3 30 Nov 2002 19:04:49 -0000 1.16 @@ -148,6 +148,8 @@ $lang['withmarked'] = "¿ï©w%s¡A¶i¦æ"; $lang['SetTo'] = "±N%s³]¬°¡u%s¡v"; $lang['pcs'] = "±i"; +$lang['Money'] = "Á`p"; +$lang['Currency'] = "³f¹ô"; # Appointments $lang['Appointment'] = "·|ij"; Index: zh.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/zh.p3,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- zh.p3 23 Nov 2002 14:10:49 -0000 1.14 +++ zh.p3 30 Nov 2002 19:04:49 -0000 1.15 @@ -150,6 +150,8 @@ $lang['withmarked'] = "with marked %s"; $lang['SetTo'] = "set %s to %s"; $lang['pcs'] = "pieces"; +$lang['Money'] = "ºÏ¹²"; +$lang['Currency'] = "»õ±Ò"; # Appointments $lang['Appointment'] = "»áÒé"; |
|
From: Gero K. <gok...@us...> - 2002-11-30 19:04:52
|
Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/watchlist
Modified Files:
watchlist.pinc watchlist_overview.php
Log Message:
using table field sizes
Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- watchlist.pinc 24 Nov 2002 19:19:06 -0000 1.18
+++ watchlist.pinc 30 Nov 2002 19:04:49 -0000 1.19
@@ -304,8 +304,8 @@
$a = 0;
$m = new mail();
while ($a < $n) {
- $lc = new DateTime($r->get($a, "lastcall"));
- $bd = new DateTime($r->get($a, "birthday"));
+ $lc = $r->getDateTime($a, "lastcall");
+ $bd = $r->getDateTime($a, "birthday");
# Send Remider one day in advance
$bd->addDays(-1);
Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_overview.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- watchlist_overview.php 10 Nov 2002 11:45:57 -0000 1.17
+++ watchlist_overview.php 30 Nov 2002 19:04:49 -0000 1.18
@@ -106,9 +106,9 @@
}
echo "</td>\n";
}
- $d = new DateTime($r->get($a, "creation"));
+ $d = $r->getDateTime($a, "creation");
echo " <td nowrap align=\"right\">". $d->getDateTime() ." </td>\n";
- $d = new DateTime($r->get($a, "lastcall"));
+ $d = $r->getDateTime($a, "lastcall");
echo " <td nowrap ALIGN=right>". $d->getDateTime() ." </TD>\n";
if ( !$remove && (($this->user->id == $aid) || ($obj != -1 ) || $obj->mod_ok() ) ) {
|
|
From: Gero K. <gok...@us...> - 2002-11-30 19:04:52
|
Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/url
Modified Files:
url.pinc url_new.php
Log Message:
using table field sizes
Index: url.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- url.pinc 10 Nov 2002 11:45:57 -0000 1.3
+++ url.pinc 30 Nov 2002 19:04:49 -0000 1.4
@@ -63,13 +63,14 @@
* Save URL to DB
*/
function save() {
+ global $table;
$msg = "";
$q = new query($this->dbconn);
$q->setTable($this->tablename);
$q->addFV("link_id",$this->link_id,"");
- $q->addFV("name",$this->name,"STRING",200);
- $q->addFV("url",$this->url,"STRING",200);
+ $q->addFV("name",$this->name,"STRING",$table['url']['name'][size]);
+ $q->addFV("url",$this->url,"STRING",$table['url']['url'][size]);
if ( $this->id < 0 ) {
$this->modified = array();
Index: url_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_new.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- url_new.php 6 Nov 2002 08:01:27 -0000 1.3
+++ url_new.php 30 Nov 2002 19:04:49 -0000 1.4
@@ -27,7 +27,7 @@
* display the form
*/
Function info() {
- global $lang,$tutos;
+ global $lang,$tutos,$table;
echo "<form name=\"urlnew\" action=\"url_ins.php\" method=\"POST\">\n";
echo $this->DataTableStart();
@@ -48,12 +48,12 @@
echo " <tr>\n";
echo $this->showfieldc($lang['URLName'],1,"urlname");
- echo " <td colspan=\"3\"><input size=\"50\" maxlength=\"200\" name=\"urlname\" value=\"". $this->obj->name ."\"></td>\n";
+ echo " <td colspan=\"3\"><input size=\"". min($table['url']['name'][size],50) ."\" maxlength=\"". $table['url']['name'][size] ."\" name=\"urlname\" value=\"". $this->obj->name ."\"></td>\n";
echo " </tr>\n";
echo " <tr>\n";
echo $this->showfieldc($lang['URL'],1,"url");
- echo " <td colspan=\"3\"><input size=\"50\" maxlength=\"200\" name=\"url\" value=\"". $this->obj->url ."\"></td>\n";
+ echo " <td colspan=\"3\"><input size=\"". min($table['url']['url'][size],50) ."\" maxlength=\"". $table['url']['url'][size] ."\" name=\"url\" value=\"". $this->obj->url ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
|
|
From: Gero K. <gok...@us...> - 2002-11-30 19:04:52
|
Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/note
Modified Files:
note.pinc note_new.php
Log Message:
using table field sizes
Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- note.pinc 24 Nov 2002 19:19:06 -0000 1.23
+++ note.pinc 30 Nov 2002 19:04:49 -0000 1.24
@@ -73,11 +73,7 @@
$this->link_id = $r->get($pos, "link_id");
$this->name = StripSlashes($r->get($pos, "name"));
$this->note = StripSlashes($r->get($pos, "note"));
-
- $x = $r->get($pos, "remember");
- if ( $x != "" ) {
- $this->remember = new DateTime($x);
- }
+ $this->remember = $r->getDateTime($pos, "remember");
$cid = $r->get($pos, "creator");
$this->creator = new tutos_address($this->dbconn);
@@ -136,10 +132,10 @@
$info .= "<tr><th>". $t ."</th></tr>";
$info .= "<tr><td><font size=\"-1\"><pre>";
$info .= $n;
- $info .= "</PRE></FONT></TD></TR>";
- $info .= "</TABLE>";
- $info .= "</BODY>";
- $info .= "</HTML>";
+ $info .= "</pre></font></td></tr>";
+ $info .= "</table>";
+ $info .= "</body>";
+ $info .= "</html>";
return $info;
}
/**
@@ -236,7 +232,7 @@
* Save NOTE to DB
*/
function save() {
- global $current_user, $tutos;
+ global $current_user, $tutos,$table;
$msg = "";
@@ -246,7 +242,7 @@
}
$q = new query($this->dbconn);
$q->setTable($this->tablename);
- $q->addFV("name",$this->name,"STRING",40);
+ $q->addFV("name",$this->name,"STRING",$table['note']['name'][size]);
$q->addFV("note",$this->note,"TEXT");
$q->addFV("remember",$this->remember,"DATETIME");
$q->addFV("link_id",$this->link_id,"INT");
Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- note_new.php 29 Nov 2002 08:51:30 -0000 1.13
+++ note_new.php 30 Nov 2002 19:04:49 -0000 1.14
@@ -25,7 +25,7 @@
* display the form
*/
Function info() {
- global $lang,$tutos;
+ global $lang,$tutos,$table;
echo "<form name=\"notenew\" action=\"note_ins.php\" method=\"POST\">\n";
echo $this->DataTableStart();
@@ -44,7 +44,7 @@
}
echo "<tr>\n";
echo $this->showfieldc($lang['NoteName'],1,"name");
- echo " <td colspan=\"5\"><input size=\"30\" maxlength=\"30\" name=\"name\" value=\"". $this->obj->name ."\"></td>\n";
+ echo " <td colspan=\"5\"><input size=\"". min($table['note']['name'][size],40) ."\" maxlength=\"". $table['note']['name'][size] ."\" name=\"name\" value=\"". $this->obj->name ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['NoteReference']);
@@ -54,7 +54,7 @@
echo "<tr>\n";
echo $this->showfield($lang['NoteDescription'],1,"note");
- echo " <TD COLSPAN=5><TEXTAREA wrap=hard rows=20 cols=80 name=\"note\">". $this->obj->note ."</TEXTAREA></TD>\n";
+ echo " <td colspan=\"5\"><textarea wrap=hard rows=20 cols=80 name=\"note\">". $this->obj->note ."</textarea></td>\n";
echo "</tr>\n";
echo "<tr>\n";
|
|
From: Gero K. <gok...@us...> - 2002-11-30 19:04:50
|
Update of /cvsroot/tutos/tutos/php/ldap
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/ldap
Modified Files:
ldap.pinc ldap_overview.php ldap_show.php
Log Message:
using table field sizes
Index: ldap.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/ldap.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldap.pinc 25 Nov 2002 20:40:22 -0000 1.3
+++ ldap.pinc 30 Nov 2002 19:04:47 -0000 1.4
@@ -297,7 +297,7 @@
*/
function error() {
$errno = ldap_errno($this->ds);
- return $this->getFullName()." ".ldap_error($this->ds) ." (error ". $errno ." ". ldap_err2str($errno) .")";
+ return $this->getFullName().": ".ldap_error($this->ds) ." (error ". $errno ." ". ldap_err2str($errno) .")";
}
/**
* get a usefull human readable name
Index: ldap_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/ldap_overview.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldap_overview.php 25 Nov 2002 20:40:22 -0000 1.4
+++ ldap_overview.php 30 Nov 2002 19:04:47 -0000 1.5
@@ -40,10 +40,9 @@
$link2 = "ldap/ldap_overview.php?host=".$this->obj->host."&port=".$this->obj->port;
$justthese = array( "cn","c","o","ou","mail","*");
-
-
// Search surname entry
$sr = ldap_search($this->obj->ds,$this->obj->basedn,$this->filter,$justthese,0,40,10,LDAP_DEREF_ALWAYS);
+# echo "|".$this->obj->basedn ."|". $this->filter ."<br>";
if (!$sr) {
echo $this->error($this->obj->error());
return;
@@ -119,6 +118,7 @@
echo "</tr>\n";
echo "</thead>\n";
+ $line = 0;
echo "<tbody>\n";
for ($i=0; $i<$info["count"]; $i++) {
$keyname = $tutos['ldap:'.$this->obj->host.':'.$this->obj->port]['uniquekey'];
@@ -161,16 +161,23 @@
}
if ( $ashow['email'] == 1 ) {
// email
- echo "<td>". AsEmail($info[$i]["mail"][0],$info[$i]["mail"][0],$info[$i]["givenname"][0]) ." </td>\n";
+ echo "<td>\n";
+ if (isset($tutos[$this->obj->getIndex()]['email_1'])) {
+ $k = strtolower($tutos[$this->obj->getIndex()]['email_1']);
+ if ( isset($info[$i][$k]) ) {
+ echo AsEmail($info[$i][$k][0],$info[$i][$k][0],$info[$i]["givenname"][0]);
+ }
+ }
+ echo " </td>\n";
}
if ( $ashow['city'] == 1 ) {
echo "<td>";
if (isset($tutos[$this->obj->getIndex()]['city'])) {
$k = strtolower($tutos[$this->obj->getIndex()]['city']);
echo $this->obj->decode($info[$i][$k][0]);
- } else {
+ } else if (isset($tutos[$this->obj->getIndex()]['l'])) {
echo $this->obj->decode($info[$i]["l"][0]);
- }
+ }
echo " </td>\n";
}
echo "<td>";
Index: ldap_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/ldap_show.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldap_show.php 25 Nov 2002 20:40:22 -0000 1.5
+++ ldap_show.php 30 Nov 2002 19:04:48 -0000 1.6
@@ -66,11 +66,13 @@
echo "<td>\n";
if ( isset($d['count']) ) {
for ($k = 0;$k < $d['count'];$k++) {
- if ( $y == "userCertificate" ) {
+ if ( eregi("certificate",$y) ) {
# TODO make some cool OPSENSSL Stuff here
echo "<br><pre>skipped</pre><br>";
} else if ( $y == "jpegPhoto" ) {
echo "<br><pre>skipped</pre><br>";
+ } else if (eregi("mail",$y)){
+ echo AsEmail($d[$k],$d[$k],$d[$k]);
} else {
echo $this->obj->decode($d[$k]) ."<br>";
}
|
|
From: Gero K. <gok...@us...> - 2002-11-30 19:04:50
|
Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1:/tmp/cvs-serv31154/php/invoice
Modified Files:
invoice.pinc invoice_new.php invoice_show.php
Log Message:
using table field sizes
Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- invoice.pinc 29 Nov 2002 08:56:56 -0000 1.25
+++ invoice.pinc 30 Nov 2002 19:04:47 -0000 1.26
@@ -109,7 +109,7 @@
$this->items = $r->get($pos, "items");
$this->itype = $r->get($pos, "ityp");
$this->pos = $r->get($pos, "pos");
- $this->description = $r->get($pos, "description");
+ $this->description = StripSlashes($r->get($pos, "description"));
$this->sum_single = $r->get($pos, "sum_single");
$this->currency = $r->get($pos, "currency");
if ($this->currency == "" ) {
@@ -334,17 +334,16 @@
$this->customer_id = $r->get($pos, "customer");
$this->customer = getObject($this->dbconn,$this->customer_id);
- $this->datesent[0] = new DateTime($r->get($pos, "d_sent0"));
- $this->datesent[1] = new DateTime($r->get($pos, "d_sent1"));
- $this->datesent[2] = new DateTime($r->get($pos, "d_sent2"));
- $this->datedue[0] = new DateTime($r->get($pos, "d_due0"));
- $this->datedue[1] = new DateTime($r->get($pos, "d_due1"));
- $this->datedue[2] = new DateTime($r->get($pos, "d_due2"));
- $this->datefinish = new DateTime($r->get($pos, "d_finish"));
+ $this->datesent[0] = $r->getDateTime($pos, "d_sent0");
+ $this->datesent[1] = $r->getDateTime($pos, "d_sent1");
+ $this->datesent[2] = $r->getDateTime($pos, "d_sent2");
+ $this->datedue[0] = $r->getDateTime($pos, "d_due0");
+ $this->datedue[1] = $r->getDateTime($pos, "d_due1");
+ $this->datedue[2] = $r->getDateTime($pos, "d_due2");
+ $this->datefinish = $r->getDateTime($pos, "d_finish");
$this->creator = new tutos_address($this->dbconn);
$this->creator->read($r->get($pos, "creator"));
- $this->creation = new DateTime($r->get($pos, "creation"));
$this->pos = array();
parent::read_result($r,$pos);
@@ -571,13 +570,13 @@
* Save Resource to DB
*/
function save() {
- global $tutos,$current_user;
+ global $tutos,$current_user,$table;
$msg = "";
$q = new query($this->dbconn);
$q->setTable($this->tablename);
- $q->addFV("name",$this->name,"STRING");
+ $q->addFV("name",$this->name,"STRING",$table['invoice']['name'][size]);
$q->addFV("state",$this->state,"INT");
$q->addFV("link_id",$this->link_id,"INT");
$q->addFV("accountant",$this->accountant,"INT");
Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- invoice_new.php 5 Nov 2002 19:47:11 -0000 1.20
+++ invoice_new.php 30 Nov 2002 19:04:47 -0000 1.21
@@ -97,37 +97,37 @@
* display the form
*/
Function info() {
- global $lang,$tutos;
+ global $lang,$tutos,$table;
- echo "<FORM name=\"invadd\" ACTION=\"invoice_ins.php\" method=\"POST\">\n";
+ echo "<form name=\"invadd\" action=\"invoice_ins.php\" method=\"post\">\n";
if ($this->obj->id > 0 ) {
$this->addHidden("id",$this->obj->id);
}
echo $this->DataTableStart();
echo "<tr>\n";
- echo " <th COLSPAN=9>". sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
+ echo " <th colspan=\"9\">". sprintf($lang['Showing'],$lang[$this->obj->getType()])."</th>\n";
echo "</tr>\n";
if ($this->obj->id > 0 ) {
echo "<tr>\n";
- echo " <td COLSPAN=5>". sprintf ($lang['InvoiceCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
- echo " <td COLSPAN=4 ALIGN=right>". acl_link($this->obj) ."</td>\n";
+ echo " <td colspan=\"5\">". sprintf ($lang['InvoiceCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
+ echo " <td colspan=\"4\" align=\"right\">". acl_link($this->obj) ."</td>\n";
echo "</tr>\n";
}
echo "<tr>\n";
echo $this->showfieldc($lang['Accountant'],1,"accountant");
- echo " <td COLSPAN=8>\n";
+ echo " <td colspan=\"8\">\n";
if ( $this->obj->change_ok() ) {
- echo " <SELECT NAME=\"accountant\">\n";
+ echo " <select name=\"accountant\">\n";
$this->obj->creator->read_locs_data();
- echo " <OPTION VALUE=\"". $this->obj->creator->id ."\">". $this->obj->creator->getFullName() ."</OPTION>\n";
+ echo " <option value=\"". $this->obj->creator->id ."\">". $this->obj->creator->getFullName() ."</option>\n";
@reset($this->obj->creator->location);
while ( list ($j,$l) = @each ($this->obj->creator->location) ) {
if ( is_object($l->company) ) {
- echo " <OPTION VALUE=\"". $l->id ."\">". $l->company->getFullName() ."</OPTION>\n";
+ echo " <option value=\"". $l->id ."\">". $l->company->getFullName() ."</option>\n";
}
}
- echo " </SELECT>\n";
+ echo " </select>\n";
} else {
echo $this->obj->acc->getLink();
$this->addHidden("accountant",$this->obj->accountant);
@@ -143,7 +143,7 @@
echo "automatic";
$this->addHidden("name",$this->obj->name);
} else {
- echo " <input size=\"30\" maxlength=\"30\" name=\"name\" value=\"". $this->obj->name ."\">";
+ echo " <input size=\"". min($table['invoice']['name'][size],30) ."\" maxlength=\"".$table['invoice']['name'][size]."\" name=\"name\" value=\"". $this->obj->name ."\">";
}
} else {
echo $this->obj->getLink();
@@ -317,13 +317,13 @@
* prepare
*/
Function prepare() {
- global $msg,$HTTP_GET_VARS,$lang, $tutos;
+ global $msg,$lang, $tutos;
$this->obj = new invoice($this->dbconn);
$this->name = $lang['Invoice'];
- if ( isset($HTTP_GET_VARS['id']) ) {
- $this->obj->read($HTTP_GET_VARS['id']);
+ if ( isset($_GET['id']) ) {
+ $this->obj->read($_GET['id']);
if ($i->id == -1) {
$msg .= sprintf($lang['Err0040'],$lang[$i->getType()]) . "<BR>";
$this->stop = true;
@@ -333,15 +333,15 @@
} else {
$this->name = $lang['InvoiceCreate'];
}
- if ( isset($HTTP_GET_VARS['state']) ) {
- $this->obj->state = $HTTP_GET_VARS['state'];
+ if ( isset($_GET['state']) ) {
+ $this->obj->state = $_GET['state'];
}
- if ( isset($HTTP_GET_VARS['name']) ) {
- $this->obj->name = UrlDecode(Stripslashes($HTTP_GET_VARS['name']));
+ if ( isset($_GET['name']) ) {
+ $this->obj->name = UrlDecode(Stripslashes($_GET['name']));
}
- if ( isset($HTTP_GET_VARS['link_id']) ) {
- $this->obj->link_id = $HTTP_GET_VARS['link_id'];
+ if ( isset($_GET['link_id']) ) {
+ $this->obj->link_id = $_GET['link_id'];
if ( $this->obj->id == -1 ) {
$this->obj->read_ref();
if ( $this->obj->ref->getType() == "product" ) {
Index: invoice_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_show.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- invoice_show.php 10 Nov 2002 13:24:46 -0000 1.18
+++ invoice_show.php 30 Nov 2002 19:04:47 -0000 1.19
@@ -27,20 +27,20 @@
global $lang;
$f->read_ref();
- echo "<TR>\n";
+ echo "<tr>\n";
if ( $f->ref != -1 ) {
- echo " <TD ALIGN=right VALIGN=top>". $f->ref->getLink(sprintf("%04d",$f->pos)) ."</TD>";
+ echo " <td align=\"right\" valign=\"top\">". $f->ref->getLink(sprintf("%04d",$f->pos)) ."</td>";
} else {
- echo " <TD ALIGN=right VALIGN=top>". sprintf("%04d",$f->pos) ."</TD>";
+ echo " <td align=\"right\" valign=\"top\">". sprintf("%04d",$f->pos) ."</td>";
}
- echo " <TD ALIGN=right VALIGN=top>". number_format($f->items,2,$lang['DecPoint'],$lang['ThousandPoint']) ." </TD>";
- echo " <TD ALIGN=right VALIGN=top>". $f->itype ." </TD>";
- echo " <TD VALIGN=top><PRE>". $f->description ."</PRE></TD>";
- echo " <TD ALIGN=right VALIGN=top>". number_format($f->sum_single ,2,$lang['DecPoint'],$lang['ThousandPoint']) ."</TD>";
- echo " <TD ALIGN=right VALIGN=top>". number_format($f->tax ,2,$lang['DecPoint'],$lang['ThousandPoint']) ."</TD>";
- echo " <TD ALIGN=right VALIGN=top>". number_format($f->getTotal(),2,$lang['DecPoint'],$lang['ThousandPoint']) ."</TD>";
- echo " <TD ALIGN=left VALIGN=top> ". $f->currency ."</TD>";
- echo "</TR>\n";
+ echo " <td align=\"right\" valign=\"top\">". number_format($f->items,2,$lang['DecPoint'],$lang['ThousandPoint']) ." </td>";
+ echo " <td align=\"right\" valign=\"top\">". $f->itype ." </td>";
+ echo " <td valign=\"top\"><pre>". $f->description ."</pre></td>";
+ echo " <td align=\"right\" valign=\"top\">". number_format($f->sum_single ,2,$lang['DecPoint'],$lang['ThousandPoint']) ."</td>";
+ echo " <td align=\"right\" valign=\"top\">". number_format($f->tax ,2,$lang['DecPoint'],$lang['ThousandPoint']) ."</td>";
+ echo " <td align=\"right\" valign=\"top\">". number_format($f->getTotal(),2,$lang['DecPoint'],$lang['ThousandPoint']) ."</td>";
+ echo " <td align=\"left\" valign=\"top\"> ". $f->currency ."</td>";
+ echo "</tr>\n";
}
/**
@@ -63,101 +63,101 @@
return;
}
echo $this->DataTableStart();
- echo "<TR>\n";
- echo " <TH COLSPAN=8>". sprintf($lang['Showing'],$lang[$this->obj->getType()]) ."</TH>\n";
- echo "</TR>\n";
- echo "<TR>\n";
- echo " <TD COLSPAN=8>". $lang['createdby'] ." ". $this->obj->creator->getLink();
- echo " ". $lang['atDateTime'] ." ". $this->obj->creation->getLinkDateTime() ."</TD>\n";
- echo "</TR>\n";
+ echo "<tr>\n";
+ echo " <th colspan=\"8\">". sprintf($lang['Showing'],$lang[$this->obj->getType()]) ."</th>\n";
+ echo "</tr>\n";
+ echo "<tr>\n";
+ echo " <td colspan=\"8\">". $lang['createdby'] ." ". $this->obj->creator->getLink();
+ echo " ". $lang['atDateTime'] ." ". $this->obj->creation->getLinkDateTime() ."</td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['Accountant']);
if ( $this->obj->acc->getType() == "location" ) {
- echo "<TD COLSPAN=7>". $this->obj->acc->company->getLink() ."</TD>\n";
+ echo "<td colspan=\"7\">". $this->obj->acc->company->getLink() ."</td>\n";
} else {
- echo "<TD COLSPAN=7>". $this->obj->acc->getLink() ."</TD>\n";
+ echo "<td colspan=\"7\">". $this->obj->acc->getLink() ."</td>\n";
}
- echo "</TR>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvoiceName']);
- echo "<TD COLSPAN=3>". $this->obj->name ."</TD>\n";
+ echo $this->showdata(myentities($this->obj->name),3);
echo $this->showfieldc($lang['InvoiceState']);
- echo "<TD COLSPAN=3>". $lang['InvoiceStates'][$this->obj->state] ."</TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($lang['InvoiceStates'][$this->obj->state],3);
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvoiceCustomer']);
if (is_object($this->obj->customer) ) {
- echo "<TD COLSPAN=7>". $this->obj->customer->getLink() ."</TD>\n";
+ echo $this->showdata($this->obj->customer->getLink(),7);
} else {
- echo "<TD COLSPAN=7>". $lang['HistoryDeleted'] ."</TD>\n";
+ echo $this->showdata($lang['HistoryDeleted'],7);
}
- echo "</TR>\n";
+ echo "</tr>\n";
if ( $this->obj->ref != -1 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang[$this->obj->ref->getType()],0);
- echo " <TD COLSPAN=7 VALIGN=top>". $this->obj->ref->getLink() ."</TD>";
- echo "</TR>\n";
+ echo $this->showdata($this->obj->ref->getLink(),7);
+ echo "</tr>\n";
}
if ( ($this->obj->datesent[0]->notime != 1) or ($this->obj->datedue[0]->notime != 1) ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvDateSent'][0]);
- echo "<TD COLSPAN=3>". $this->obj->datesent[0]->getDate() ." </TD>\n";
+ echo $this->showdata($this->obj->datesent[0]->getDate(),3);
echo $this->showfieldc($lang['InvDateDue'][0]);
- echo "<TD COLSPAN=3>". $this->obj->datedue[0]->getDate() ." </TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($this->obj->datedue[0]->getDate(),3);
+ echo "</tr>\n";
}
if ( $this->obj->datesent[1]->notime != 1 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvDateSent'][1]);
- echo "<TD COLSPAN=3>". $this->obj->datesent[1]->getDate() ." </TD>\n";
+ echo $this->showdata($this->obj->datesent[1]->getDate(),3);
echo $this->showfieldc($lang['InvDateDue'][1]);
- echo "<TD COLSPAN=3>". $this->obj->datedue[1]->getDate() ." </TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($this->obj->datedue[1]->getDate(),3);
+ echo "</tr>\n";
}
if ( $this->obj->datesent[2]->notime != 1 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvDateSent'][2]);
- echo "<TD COLSPAN=3>". $this->obj->datesent[2]->getDate() ." </TD>\n";
+ echo $this->showdata($this->obj->datesent[2]->getDate(),3);
echo $this->showfieldc($lang['InvDateDue'][2]);
- echo "<TD COLSPAN=3>". $this->obj->datedue[2]->getDate() ." </TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($this->obj->datedue[2]->getDate(),3);
+ echo "</tr>\n";
}
if ( $this->obj->state == 7 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvDatePayed']);
- echo "<TD COLSPAN=7>". $this->obj->datefinish->getDate() ." </TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($this->obj->datefinish->getDate(),7);
+ echo "</tr>\n";
}
if ( $this->obj->state == 8 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfieldc($lang['InvDateCancel']);
- echo "<TD COLSPAN=7>". $this->obj->datefinish->getDate() ." </TD>\n";
- echo "</TR>\n";
+ echo $this->showdata($this->obj->datefinish->getDate(),7);
+ echo "</tr>\n";
}
- echo "<TR>\n";
- echo "<TH>". $lang['InvPosPos'] ."</TH>\n";
- echo "<TH>". $lang['InvPosItems'] ."</TH>\n";
- echo "<TH>". $lang['InvPosIType'] ."</TH>\n";
- echo "<TH>". $lang['InvPosDesc'] ."</TH>\n";
- echo "<TH>". $lang['InvPosSingle'] ."</TH>\n";
- echo "<TH>". $lang['InvPosTax'] ."</TH>\n";
- echo "<TH>". $lang['InvPosSum'] ."</TH>\n";
- echo "<TH>". $lang['Currency'] ."</TH>\n";
- echo "</TR>\n";
+ echo "<tr>\n";
+ echo "<th>". $lang['InvPosPos'] ."</th>\n";
+ echo "<th>". $lang['InvPosItems'] ."</th>\n";
+ echo "<th>". $lang['InvPosIType'] ."</th>\n";
+ echo "<th>". $lang['InvPosDesc'] ."</th>\n";
+ echo "<th>". $lang['InvPosSingle'] ."</th>\n";
+ echo "<th>". $lang['InvPosTax'] ."</th>\n";
+ echo "<th>". $lang['InvPosSum'] ."</th>\n";
+ echo "<th>". $lang['Currency'] ."</th>\n";
+ echo "</tr>\n";
@reset($this->obj->pos);
if ( count($this->obj->pos) == 0 ) {
- echo "<TR>\n";
- echo "<TD COLSPAN=8 CLASS=warn>".$lang['Err0048']."</TD>\n";
- echo "</TR>\n";
+ echo "<tr>\n";
+ echo "<td colspan=\"8\" class=\"warn\">".$lang['Err0048']."</td>\n";
+ echo "</tr>\n";
}
@reset($tutos[currencies]);
while( list ($i,$c) = @each ($tutos[currencies])) {
@@ -170,19 +170,19 @@
$sum[$f->currency] += $f->getTotal();
unset($f);
}
- echo "<TR>";
- echo "<TD COLSPAN=6> </TD>\n";
- echo "<TD COLSPAN=2> ";
+ echo "<tr>";
+ echo "<td colspan=\"6\"> </td>\n";
+ echo "<td colspan=\"2\"> ";
@reset($tutos[currencies]);
$pre = "";
while( list ($i,$c) = @each ($tutos[currencies])) {
if ( $sum[$c] != 0 ) {
echo $pre . number_format($sum[$c],2,$lang['DecPoint'],$lang['ThousandPoint']) ." ". $c;
- $pre = "<BR>\n";
+ $pre = "<br>\n";
}
}
- echo "</TD>\n";
- echo "</TR>";
+ echo "</td>\n";
+ echo "</tr>";
# References to modules
show_module_infolists($this->user,$this->obj,8,$this->format);
@@ -195,30 +195,30 @@
Function navigate() {
global $lang, $tutos;
- echo "<TR><TD>";
+ echo "<tr><td>";
if ( ($this->obj->id > 0) && $this->obj->mod_ok() ) {
echo menulink("invoice/invoice_new.php?id=". $this->obj->id ,$lang['Modify'],sprintf($lang['InvModInfo'],$this->obj->getFullname())) ." <BR>";
}
- echo "<BR>\n";
+ echo "<br>\n";
if ( ($this->obj->id > 0) && $this->obj->see_ok() ) {
if ( function_exists( 'pdf_open_file' ) ) {
- echo menulink($this->obj->getUrl() ."&format=pdf",$lang['InvDocument'],$lang['InvDocumentI']) ." <BR>";
+ echo menulink($this->obj->getUrl() ."&format=pdf",$lang['InvDocument'],$lang['InvDocumentI']) ." <br>";
}
}
- echo "</TD></TR>";
+ echo "</td></tr>";
}
/**
* prepare
*/
Function prepare() {
- global $msg,$HTTP_GET_VARS,$lang, $tutos;
+ global $msg,$lang, $tutos;
$this->name = $lang['Invoice'];
$this->obj = new invoice($this->dbconn);
- if ( isset($HTTP_GET_VARS['id']) ) {
- $this->obj->read($HTTP_GET_VARS['id']);
+ if ( isset($_GET['id']) ) {
+ $this->obj->read($_GET['id']);
}
if ( ! $this->obj->see_ok() ) {
$msg .= sprintf($lang['Err0022'],$lang[$i->getType()]);
|
|
From: Gero K. <gok...@us...> - 2002-11-29 16:19:51
|
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv17278
Modified Files:
bug_ins.php
Log Message:
fixed always reported ref change
Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_ins.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- bug_ins.php 14 Nov 2002 20:26:24 -0000 1.28
+++ bug_ins.php 29 Nov 2002 16:19:40 -0000 1.29
@@ -94,7 +94,6 @@
return;
}
-
#
# Old Bug
#
@@ -117,7 +116,7 @@
#
# Parent Change
#
- if (($oldparent != -1) && ($b->parent->id != $oldparent) ) {
+ if (($oldparent != -1) && ($b->parent->id != $oldparent->id) ) {
$newlines = sprintf("<B>%s -- Reference changed from <I>%s</I> to <I>%s</I> by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$b->parent->getFullName(),$oldparent->getFullName(),$current_user->getFullname() , $newlines);
}
#
|
|
From: Gero K. <gok...@us...> - 2002-11-29 16:14:52
|
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv13290
Modified Files:
bug.pinc
Log Message:
fixed wrong index
Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- bug.pinc 24 Nov 2002 19:19:05 -0000 1.89
+++ bug.pinc 29 Nov 2002 16:14:48 -0000 1.90
@@ -497,9 +497,9 @@
$q = new query($this->dbconn);
$q->setTable($this->tablename);
$q->addFV("state",$this->state,"INT");
- $q->addFV("name", $this->name,"STRING",$table['bugs']['name'][size]);
+ $q->addFV("name", $this->name,"STRING",$table['bug']['name'][size]);
$q->addFV("class",$this->class,"INT");
- $q->addFV("short",$this->short,"STRING",$table['bugs']['short'][size]);
+ $q->addFV("short",$this->short,"STRING",$table['bug']['short'][size]);
$q->addFV("description",$this->description,"TEXT");
$q->addFV("solver",$this->solver,"OBJ");
$q->addFV("product_id",$this->parent,"OBJ");
|
|
From: Dimitri F. <ta...@us...> - 2002-11-29 10:50:59
|
Update of /cvsroot/tutos/tutos/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv5967
Modified Files:
changelog control files rules tutos.config tutos.logrotate
tutos.postinst tutos.postrm tutos.templates
Log Message:
Merge of the stable branch to the head.
As we test the debian package only on stable TUTOS version, the way I
commit those files may seem a little obfuscated.
Don't hesitate sending me comments or suppositions.
Once the debian package contains no more bugs, it won't have to change
exept for the changelog and version number, which will only change in
STABLE branch.
Index: changelog
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changelog 26 Jul 2002 11:59:19 -0000 1.3
+++ changelog 29 Nov 2002 10:50:55 -0000 1.4
@@ -1,3 +1,57 @@
+tutos (1.0.20021112-2) unstable; urgency=low
+
+ * Debug apache dependency, TUTOS can be run on apache-ssl too.
+
+ -- Dimitri Fontaine <dfo...@cv...> Fri, 15 Nov 2002 10:18:00 +0100
+
+tutos (1.0.20021112-1) unstable; urgency=low
+
+ * Debug creation of new users.
+
+ -- Dimitri Fontaine <dfo...@cv...> Wed, 13 Nov 2002 10:25:37 +0100
+
+tutos (1.0.20021111-1) unstable; urgency=low
+
+ * New tutos release, new debian package
+ * See ChangeLog
+
+ -- Dimitri Fontaine <dfo...@cv...> Tue, 12 Nov 2002 13:16:14 +0100
+
+tutos (1.0.20020917-5) unstable; urgency=low
+
+ * Some install scripts debbug, thanks to Igor Genibel
+ * Added a warning in the config, concerning database scheme creation
+
+ -- Dimitri Fontaine <dfo...@cv...> Fri, 8 Nov 2002 14:08:37 +0100
+
+tutos (1.0.20020917-4) unstable; urgency=low
+
+ * Manage the TUTOS config (webserver, sgbd...)
+ * Added some more debconf parameters handling
+
+ -- Dimitri Fontaine <dfo...@cv...> Fri, 27 Sep 2002 16:10:27 +0200
+
+tutos (1.0.20020917-3) unstable; urgency=low
+
+ * Launch the tutos create database script if such a database does not exists
+
+ -- Dimitri Fontaine <dfo...@cv...> Tue, 24 Sep 2002 15:42:40 +0200
+
+tutos (1.0.20020917-2) unstable; urgency=low
+
+ * Tutos files are now kept in /usr/share/tutos
+ * The upload dir is /var/lib/tutos symlinked from /usr/share/tutos/repository
+ * Section is now « web » (fix the unknown)
+ * Architecture is now all (fix the any)
+
+ -- Dimitri Fontaine <dfo...@cv...> Mon, 23 Sep 2002 11:46:48 +0200
+
+tutos (1.0.20020917-1) unstable; urgency=low
+
+ * New tutos 1.0 release
+
+ -- Dimitri Fontaine <dfo...@cv...> Fri, 20 Sep 2002 13:40:20 +0200
+
tutos (1.0.20020726-1) unstable; urgency=low
* Manage new config files
Index: control
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/control,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control 17 Jun 2002 13:02:10 -0000 1.1
+++ control 29 Nov 2002 10:50:55 -0000 1.2
@@ -1,13 +1,28 @@
Source: tutos
-Section: unknown
-Priority: optional
+Section: web
+Priority: extra
Maintainer: Dimitri Fontaine <dfo...@cv...>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
+Build-Depends-Indep: debhelper (>> 3.0.0)
+Standards-Version: 3.5.7.0
Package: tutos
-Architecture: any
-Depends: debconf, apache, php4, php4-pgsql | php4-mysql, postgresql | mysql-server
+Architecture: all
+Depends: debconf, apache | apache-ssl, php4, php4-pgsql | php4-mysql, wwwconfig-common
+Recommends: postgresql | mysql-server, logrotate
Description: The Ultimate Team Organisation Sofware
TUTOS is a tool to manage the the organizational needs of small groups,
teams, departments ...
+ .
+ To do this it provides some web-based tools as a calendar for users and
+ groups, Group and Team management, address manager for people, companies
+ and departments, bug tracking system, product/project repository, task
+ management, document management, product installation management, support
+ of different roles (manager,developer,customer etc.), support of relations
+ to other projects (base product, subproject etc.), mailboxes (imap/pop),
+ timetracking on projects, installations and bugs, Invoices, Watchlists to
+ stay informed on changes on projects/bugs etc via email, support for teams
+ that are distributed over different timezones, color schemes, fine grained
+ permission handling and change history.
+ .
+ All these parts are heavily linked together to give a unique interface for
+ the day to day needs of people involved in project management and development.
Index: files
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/files,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- files 1 Oct 2002 09:02:20 -0000 1.2
+++ files 29 Nov 2002 10:50:55 -0000 1.3
@@ -1 +1 @@
-tutos_1.0.20020726-1_i386.deb unknown optional
+tutos_1.0.20021112-2_all.deb web extra
Index: rules
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/rules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rules 17 Jun 2002 13:02:10 -0000 1.1
+++ rules 29 Nov 2002 10:50:56 -0000 1.2
@@ -8,15 +8,6 @@
# This is the debhelper compatibility version to use.
export DH_COMPAT=3
-
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -27,7 +18,7 @@
build: build-stamp
-build-stamp: configure-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -58,10 +49,6 @@
# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
dh_testdir
dh_testroot
dh_installdebconf
@@ -90,5 +77,5 @@
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+binary: binary-indep
+.PHONY: build clean binary-indep binary install configure
Index: tutos.config
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/tutos.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tutos.config 1 Oct 2002 09:02:20 -0000 1.1
+++ tutos.config 29 Nov 2002 10:50:56 -0000 1.2
@@ -9,7 +9,7 @@
db_input high tutos/sgbd || true
STATE=1
-while [ "$STATE" != 0 -a "$STATE" != 12 ]
+while [ "$STATE" != 0 -a "$STATE" != 13 ]
do
case "$STATE" in
1)
@@ -64,7 +64,7 @@
db_input critical tutos/dba_password || true
if db_go; then
db_get tutos/dba_password || true
- STATE=5
+ STATE=6
else
STATE=4
fi
@@ -134,6 +134,12 @@
db_input critical tutos/mismatch || true
db_go
STATE=8
+ ;;
+
+ 12)
+ db_input critical tutos/create_tables || true
+ db_go
+ STATE=13
;;
esac
done
Index: tutos.logrotate
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/tutos.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutos.logrotate 1 Oct 2002 09:02:20 -0000 1.2
+++ tutos.logrotate 29 Nov 2002 10:50:56 -0000 1.3
@@ -1,4 +1,4 @@
-/var/log/tutos.log {
+/var/log/tutos/tutos.log {
weekly
missingok
rotate 52
Index: tutos.postinst
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/tutos.postinst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutos.postinst 1 Oct 2002 09:02:20 -0000 1.2
+++ tutos.postinst 29 Nov 2002 10:50:56 -0000 1.3
@@ -65,16 +65,17 @@
*/
# This part is generated by debconf
- $tutos[debug] = 1;
- $tutos[errlog] = "/var/log/tutos.log"
+ \$tutos[debug] = 1;
+ \$tutos[errlog] = "/var/log/tutos/tutos.log";
+ \$tutos[sessionpath] = "/tmp";
+
+ \$tutos[dbhost][0] = "${db_host}";
+ \$tutos[dbport][0] = "${db_port}";
+ \$tutos[dbuser][0] = "${dbu_name}";
+ \$tutos[dbpasswd][0] = "${dbu_password}";
- $tutos[dbhost][0] = "${db_host}";
- $tutos[dbport][0] = "${db_port}";
- $tutos[dbuser][0] = "${dbu_name}";
- $tutos[dbpasswd][0] = "${dbu_password}";
-
- $tutos[dbtype][0] = ${db_type};
- $tutos[dbalias][0] = ${db_alias};
+ \$tutos[dbtype][0] = ${db_type};
+ \$tutos[dbalias][0] = "${db_alias}";
# end of debconf generated config
?>
@@ -93,8 +94,16 @@
# care about config files
tutosdir=/usr/share/tutos
+
+ for f in config_default.pinc config.pinc
+ do
+ if [ -r /etc/tutos/$f ]; then
+ [ -f $tutosdir/php/$f ] && rm $tutosdir/php/$f
+ ln -s /etc/tutos/$f $tutosdir/php/$f
+ fi
+ done
- for f in php/config_default.pinc apache.conf config.pinc lang_custom.p3
+ for f in apache.conf lang_custom.p3
do
if [ -r /etc/tutos/$f ]; then
[ -f $tutosdir/$f ] && rm $tutosdir/$f
@@ -111,11 +120,18 @@
fi
# Create the tutos log file if necessary
- logfile=/var/log/tutos.log
- if [ ! -f $logfile ]; then
- touch $logfile
- chown www-data:www-data $logfile
- chmod 664 $logfile
+ logdir=/var/log/tutos
+ logfile=tutos.log
+
+ if [ ! -d $logdir ]; then
+ mkdir -p $logdir
+ chown www-data:www-data $logdir
+ chmod 664 $logdir
+ fi
+ if [ ! -f $logdir/$logfile ]; then
+ touch $logdir/$logfile
+ chown www-data:www-data $logdir/$logfile
+ chmod 664 $logdir/$logfile
fi
# Add the Include line in the apache.conf
@@ -142,10 +158,10 @@
db_not_installed
exit 0
fi
- db_exists=`su postgres -c 'psql -l' | awk '/tutos/ {print $1}'`
+ su postgres -c 'psql -l' | grep -q 'tutos' && db_exists=1 || db_exists=0
else
opts="-U $dba_name -W -h $db_host -p $db_port -l"
- db_exists=`echo $dba_password | psql $opts | awk '/tutos/ {print $1}'`
+ echo $dba_password | psql $opts | grep -q 'tutos' && db_exists=1 || db_exists=0
fi
;;
@@ -157,24 +173,25 @@
db_not_installed
exit 0
fi
- db_exists=`mysql -BN -e 'show databases' | awk '/tutos/ {print $1}'`
+ mysql -BN -e 'show databases' | grep -q 'tutos' && db_exists=1 || db_exists=0
else
opts="-h $db_host -P $db_port -BN -e 'show databases'"
- db_exists=`mysql $opts | awk '/tutos/ {print $1}'`
+ mysql $opts | grep -q 'tutos' || db_exists=1 && db_exists=0
+
fi
;;
esac
- if [ ! $db_exists = "tutos" ]; then
+ if [ $db_exists -eq 0 ]; then
# install the database, just call the right script
echo "Creating the $dbase TUTOS database..."
- export $db_host $db_port $dba_name $dba_password
+ export db_host db_port dba_name dba_password dbu_name dbu_password
case $db_server in
"postgres")
- su postgres -c "${tutosdir}/create.sh $dbase CREATE"
+ su postgres -c "${tutosdir}/createdb.sh $dbase CREATE"
;;
"mysql-server")
- ${tutosdir}/create.sh $dbase CREATE
+ ${tutosdir}/createdb.sh $dbase CREATE
;;
esac
exit 0
@@ -199,6 +216,7 @@
fi
fi
fi
+ chmod o-rwx /usr/share/tutos/*.sh
;;
abort-upgrade|abort-remove|abort-deconfigure)
Index: tutos.postrm
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/tutos.postrm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutos.postrm 1 Oct 2002 09:02:20 -0000 1.2
+++ tutos.postrm 29 Nov 2002 10:50:56 -0000 1.3
@@ -37,6 +37,8 @@
. /usr/share/wwwconfig-common/restart.sh
fi
fi
+ rm -rf /usr/share/tutos
+ rm -rf /etc/tutos
;;
remove)
Index: tutos.templates
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/tutos.templates,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutos.templates 1 Oct 2002 09:02:20 -0000 1.2
+++ tutos.templates 29 Nov 2002 10:50:56 -0000 1.3
@@ -70,4 +70,14 @@
Please note you have not completed the tutos configuration. To be able to
complete it later, please just type
.
- dpkg-reconfigure tutos
\ No newline at end of file
+ dpkg-reconfigure tutos
+
+
+Template: tutos/create_tables
+Type: note
+Description: Warning - Tutos database tables need to be created
+ The tutos install script will take care about the database creation, but
+ the tables it must contains are to be created with a PHP script. Please
+ launch it right after the install.
+ .
+ http://localhost/tutos/php/scheme.php
|
|
From: Serget K. <ser...@us...> - 2002-11-29 08:56:59
|
Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1:/tmp/cvs-serv20285
Modified Files:
invoice.pinc
Log Message:
Task name instead of description for invoices
Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- invoice.pinc 5 Nov 2002 19:47:10 -0000 1.24
+++ invoice.pinc 29 Nov 2002 08:56:56 -0000 1.25
@@ -170,7 +170,7 @@
if ( $obj->gettype() == "task" ) {
$this->items = 1;
$this->itype = $lang['pcs'];
- $this->description = $lang[$obj->getType()] ."\n". $obj->desc;
+ $this->description = $lang[$obj->getType()] ."\n". $obj->name;
$this->sum_single = 0;
$obj->readtimetrack();
@reset($obj->ttlist) ;
|
|
From: Serget K. <ser...@us...> - 2002-11-29 08:51:33
|
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv16372
Modified Files:
bug_new.php task_new.php
Log Message:
Make the all description fields width 80 chars
Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_new.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- bug_new.php 14 Nov 2002 20:26:24 -0000 1.48
+++ bug_new.php 29 Nov 2002 08:51:29 -0000 1.49
@@ -153,7 +153,7 @@
} else {
echo $this->showfield($lang['BugLong'],1,"description");
}
- echo " <td colspan=\"3\" valign=\"top\"><textarea wrap=\"hard\" rows=\"20\" cols=\"80\" name=\"description\">". $this->obj->newdesc;
+ echo " <td colspan=\"3\" valign=\"top\"><textarea wrap=\"hard\" rows=\"10\" cols=\"80\" name=\"description\">". $this->obj->newdesc;
echo "</textarea></TD>\n";
echo "</tr>\n";
Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- task_new.php 17 Nov 2002 14:36:33 -0000 1.41
+++ task_new.php 29 Nov 2002 08:51:30 -0000 1.42
@@ -79,7 +79,7 @@
echo " <tr>\n";
echo $this->showfield($lang['TaskDesc'],1,"desc");
- echo " <td colspan=\"3\"><textarea wrap=\"hard\" rows=\"10\" cols=\"40\" name=\"desc\">". $this->obj->desc ."</textarea></td>\n";
+ echo " <td colspan=\"3\"><textarea wrap=\"hard\" rows=\"10\" cols=\"80\" name=\"desc\">". $this->obj->desc ."</textarea></td>\n";
echo " </tr>\n";
echo " <tr>\n";
|
|
From: Serget K. <ser...@us...> - 2002-11-29 08:51:33
|
Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv16372/note
Modified Files:
note_new.php
Log Message:
Make the all description fields width 80 chars
Index: note_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_new.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- note_new.php 6 Nov 2002 07:51:08 -0000 1.12
+++ note_new.php 29 Nov 2002 08:51:30 -0000 1.13
@@ -54,7 +54,7 @@
echo "<tr>\n";
echo $this->showfield($lang['NoteDescription'],1,"note");
- echo " <TD COLSPAN=5><TEXTAREA wrap=hard rows=20 cols=40 name=\"note\">". $this->obj->note ."</TEXTAREA></TD>\n";
+ echo " <TD COLSPAN=5><TEXTAREA wrap=hard rows=20 cols=80 name=\"note\">". $this->obj->note ."</TEXTAREA></TD>\n";
echo "</tr>\n";
echo "<tr>\n";
|
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:46
|
Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv32147/php/note
Modified Files:
Tag: BRANCH-1-0
cs.p3
Log Message:
fix trailing newline
Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/cs.p3,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- cs.p3 27 Nov 2002 17:39:49 -0000 1.1.2.3
+++ cs.p3 27 Nov 2002 20:29:43 -0000 1.1.2.4
@@ -37,4 +37,3 @@
$lang['perm'][usenotes] = "pou¾ít poznámky";
?>
-
|
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:46
|
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv32147/php
Modified Files:
Tag: BRANCH-1-0
cs.p3
Log Message:
fix trailing newline
Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/cs.p3,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- cs.p3 27 Nov 2002 17:39:49 -0000 1.1.2.4
+++ cs.p3 27 Nov 2002 20:29:42 -0000 1.1.2.5
@@ -890,4 +890,3 @@
#
### End: ***
?>
-
|
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:46
|
Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs1:/tmp/cvs-serv32147
Modified Files:
Tag: BRANCH-1-0
Makefile
Added Files:
Tag: BRANCH-1-0
langdiff.sh
Log Message:
fix trailing newline
--- NEW FILE: langdiff.sh ---
#!/bin/sh
#
# check language files for completeness
#
CD=`basename $PWD`
doit() {
if [ ! -f $1.p3 ]
then
return
fi
cut -f1 -d "=" $1.p3 | grep "^.lang" > l.$1
echo "---------------------- $CD ------- $1 ---------------------------"
diff -b l.en l.$1
TAIL=`tail -1 $1.p3`
HEAD=`head -1 $1.p3`
#echo $HEAD $TAIL
if [ $HEAD != "<?php" ]
then
echo HEADBUG $HEAD
fi
if [ $TAIL != "?>" ]
then
echo TAILBUG $TAIL
fi
/bin/rm l.$1
}
cut -f1 -d "=" en.p3 | grep "^.lang" > l.en
doit "de"
doit "it"
doit "es"
doit "fr"
doit "tw"
doit "zh"
doit "ru"
doit "ko"
doit "pl"
doit "nl"
doit "sv"
doit "el"
doit "ja"
doit "ca"
doit "hu"
doit "cs"
doit "es-mx"
doit "es-ni"
doit "pt-br"
/bin/rm l.en
Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.25.2.13
retrieving revision 1.25.2.14
diff -u -r1.25.2.13 -r1.25.2.14
--- Makefile 27 Nov 2002 17:39:48 -0000 1.25.2.13
+++ Makefile 27 Nov 2002 20:29:43 -0000 1.25.2.14
@@ -11,6 +11,9 @@
#
#
# $Log$
+# Revision 1.25.2.14 2002/11/27 20:29:43 gokohnert
+# fix trailing newline
+#
# Revision 1.25.2.13 2002/11/27 17:39:48 gokohnert
# language updates
#
@@ -532,65 +535,13 @@
# Show the language differences (undefined fields in PHP language files)
#
langdiff: ${LANGFILES}
- cut -f1 -d "=" php/en.p3 | grep "^.lang" > l.en
- cut -f1 -d "=" php/de.p3 | grep "^.lang" > l.de
- cut -f1 -d "=" php/it.p3 | grep "^.lang" > l.it
- cut -f1 -d "=" php/es.p3 | grep "^.lang" > l.es
- cut -f1 -d "=" php/fr.p3 | grep "^.lang" > l.fr
- cut -f1 -d "=" php/tw.p3 | grep "^.lang" > l.tw
- cut -f1 -d "=" php/zh.p3 | grep "^.lang" > l.zh
- cut -f1 -d "=" php/ru.p3 | grep "^.lang" > l.ru
- cut -f1 -d "=" php/ko.p3 | grep "^.lang" > l.ko
- cut -f1 -d "=" php/pl.p3 | grep "^.lang" > l.pl
- cut -f1 -d "=" php/nl.p3 | grep "^.lang" > l.nl
- cut -f1 -d "=" php/sv.p3 | grep "^.lang" > l.sv
- cut -f1 -d "=" php/el.p3 | grep "^.lang" > l.el
- cut -f1 -d "=" php/ja.p3 | grep "^.lang" > l.ja
- cut -f1 -d "=" php/ca.p3 | grep "^.lang" > l.ca
- cut -f1 -d "=" php/hu.p3 | grep "^.lang" > l.hu
- cut -f1 -d "=" php/cs.p3 | grep "^.lang" > l.cs
- cut -f1 -d "=" php/es-mx.p3 | grep "^.lang" > l.mx
- cut -f1 -d "=" php/pt-br.p3 | grep "^.lang" > l.pt
- cut -f1 -d "=" php/es-ni.p3 | grep "^.lang" > l.ni
- @echo "----------------------------------------"
- -diff l.en l.de
- @echo "----------------------------------------"
- -diff l.en l.it
- @echo "----------------------------------------"
- -diff l.en l.es
- @echo "----------------------------------------"
- -diff l.en l.fr
- @echo "----------------------------------------"
- -diff l.en l.tw
- @echo "----------------------------------------"
- -diff l.en l.zh
- @echo "----------------------------------------"
- -diff l.en l.ru
- @echo "----------------------------------------"
- -diff l.en l.ko
- @echo "----------------------------------------"
- -diff l.en l.pl
- @echo "----------------------------------------"
- -diff l.en l.pt
- @echo "----------------------------------------"
- -diff l.en l.mx
- @echo "----------------------------------------"
- -diff l.en l.ni
- @echo "----------------------------------------"
- -diff l.en l.nl
- @echo "----------------------------------------"
- -diff l.en l.sv
- @echo "----------------------------------------"
- -diff l.en l.el
- @echo "----------------------------------------"
- -diff l.en l.ja
- @echo "----------------------------------------"
- -diff l.en l.ca
- @echo "----------------------------------------"
- -diff l.en l.hu
- @echo "----------------------------------------"
- -diff l.en l.cs
- -@/bin/rm l.??
+ cd php; ../langdiff.sh
+ cd php/group; ../../langdiff.sh
+ cd php/resource; ../../langdiff.sh
+ cd php/note; ../../langdiff.sh
+ cd php/invoice; ../../langdiff.sh
+ cd php/watchlist; ../../langdiff.sh
+
#
# put it all on zaphod == demo.tutos.org (this will only work for me !!!)
#
|
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:46
|
Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1:/tmp/cvs-serv32147/php/invoice
Modified Files:
Tag: BRANCH-1-0
cs.p3
Log Message:
fix trailing newline
Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/cs.p3,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- cs.p3 27 Nov 2002 17:39:49 -0000 1.1.2.3
+++ cs.p3 27 Nov 2002 20:29:43 -0000 1.1.2.4
@@ -69,4 +69,3 @@
$lang['InvoiceReference'] = "Reference";
?>
-
|
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:20
|
Update of /cvsroot/tutos/tutos In directory sc8-pr-cvs1:/tmp/cvs-serv31759 Modified Files: langdiff.sh Log Message: fix trailing newline Index: langdiff.sh =================================================================== RCS file: /cvsroot/tutos/tutos/langdiff.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- langdiff.sh 27 Nov 2002 17:52:10 -0000 1.2 +++ langdiff.sh 27 Nov 2002 20:29:17 -0000 1.3 @@ -15,7 +15,19 @@ echo "---------------------- $CD ------- $1 ---------------------------" diff -b l.en l.$1 - + + TAIL=`tail -1 $1.p3` + HEAD=`head -1 $1.p3` + #echo $HEAD $TAIL + if [ $HEAD != "<?php" ] + then + echo HEADBUG $HEAD + fi + if [ $TAIL != "?>" ] + then + echo TAILBUG $TAIL + fi + /bin/rm l.$1 } |
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:19
|
Update of /cvsroot/tutos/tutos/php/localization In directory sc8-pr-cvs1:/tmp/cvs-serv31759/php/localization Modified Files: cs.p3 Log Message: fix trailing newline Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cs.p3 27 Nov 2002 14:20:07 -0000 1.10 +++ cs.p3 27 Nov 2002 20:29:15 -0000 1.11 @@ -875,4 +875,3 @@ # ### End: *** ?> - |
|
From: Gero K. <gok...@us...> - 2002-11-27 20:29:18
|
Update of /cvsroot/tutos/tutos/php/note In directory sc8-pr-cvs1:/tmp/cvs-serv31759/php/note Modified Files: cs.p3 Log Message: fix trailing newline Index: cs.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/note/cs.p3,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cs.p3 27 Nov 2002 14:20:07 -0000 1.5 +++ cs.p3 27 Nov 2002 20:29:15 -0000 1.6 @@ -38,4 +38,3 @@ $lang['perm'][usenotes] = "pou¾ít poznámky"; $lang['note'] = &$lang['Note']; ?> - |
|
From: Gero K. <gok...@us...> - 2002-11-27 20:28:46
|
Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv31207/php
Modified Files:
database.pinc database_new.php database_show.php
admin_sync.php
Log Message:
use overview link from database object
Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- database.pinc 5 Nov 2002 19:57:46 -0000 1.28
+++ database.pinc 27 Nov 2002 20:28:42 -0000 1.29
@@ -512,10 +512,24 @@
return myentities($text);
}
}
- /* ---------------------------------------------------------------------------
+ /**
+ * get the type of object
*/
function gettype() {
return "database";
+ }
+ /**
+ * create a link to a select page
+ */
+ function getOverviewLink (&$user, $text = "") {
+ global $lang,$tutos;
+
+ return array( url => "database_overview.php",
+ image => $tutos[image][bugs],
+ text => ($text == "" ? 'DB Overview' : $text),
+ info => 'Database Overview',
+ category => array("database","overview")
+ );
}
}
?>
Index: database_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_new.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- database_new.php 13 Nov 2002 21:29:59 -0000 1.20
+++ database_new.php 27 Nov 2002 20:28:42 -0000 1.21
@@ -94,7 +94,7 @@
}
echo $this->showfieldc($lang['AdminDBPass'],0,"pass");
if ( ($this->obj->id > 1000) || ($this->obj->id == -1) ) {
- echo "<td COLSPAN=1><INPUT SIZE=10 MAXLENGTH=30 name=\"pass\" value=\"". $this->obj->pass ."\"></td>\n";
+ echo "<td colspan=\"1\"><input size=\"10\" maxlength=\"30\" name=\"pass\" value=\"". $this->obj->pass ."\"></td>\n";
} else {
echo $this->showdata($this->obj->pass,1);
$this->addHidden("pass",$this->obj->pass);
@@ -104,7 +104,7 @@
echo "<tr>\n";
echo $this->showfieldc($lang['AdminDBRep'],0,"rep");
if ( ($this->obj->id > 1000) || ($this->obj->id == -1) ) {
- echo "<td COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"rep\" value=\"". myentities($this->obj->repository) ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"60\" maxlength=\"60\" name=\"rep\" value=\"". myentities($this->obj->repository) ."\"></td>\n";
} else {
echo $this->showdata($this->obj->repository,3);
$this->addHidden("rep",$this->obj->repository);
@@ -113,32 +113,32 @@
echo "<tr>\n";
echo $this->showfieldc($lang['AdminDBHome'],0,"home");
- echo "<td COLSPAN=3><INPUT SIZE=60 MAXLENGTH=60 name=\"home\" value=\"". myentities($this->obj->home) ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"60\" maxlength=\"60\" name=\"home\" value=\"". myentities($this->obj->home) ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['CfgLogo'],0,"logo");
- echo "<td COLSPAN=3><INPUT SIZE=60 MAXLENGTH=90 name=\"logo\" value=\"". $this->obj->logo ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"60\" maxlength=\"90\" name=\"logo\" value=\"". $this->obj->logo ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['CfgLogoLink'],0,"logolink");
- echo "<td COLSPAN=3><INPUT SIZE=60 MAXLENGTH=90 name=\"logolink\" value=\"". $this->obj->logolink ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"60\" maxlength=\"90\" name=\"logolink\" value=\"". $this->obj->logolink ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['CfgBugAutoName'],0,"bugautoname");
- echo "<td COLSPAN=3><INPUT SIZE=30 MAXLENGTH=30 name=\"bugautoname\" value=\"". $this->obj->bugautoname ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"30\" maxlength=\"30\" name=\"bugautoname\" value=\"". $this->obj->bugautoname ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['CfgInvAutoName'],0,"invautoname");
- echo "<td COLSPAN=3><INPUT SIZE=30 MAXLENGTH=60 name=\"invautoname\" value=\"". $this->obj->invautoname ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"30\" maxlength=\"60\" name=\"invautoname\" value=\"". $this->obj->invautoname ."\"></td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo $this->showfieldc($lang['CfgVATlist'],0,"vatlist");
- echo "<td COLSPAN=3><INPUT SIZE=30 MAXLENGTH=60 name=\"vatlist\" value=\"". $this->obj->vatlist ."\"></td>\n";
+ echo "<td colspan=\"3\"><input size=\"30\" maxlength=\"60\" name=\"vatlist\" value=\"". $this->obj->vatlist ."\"></td>\n";
echo "</tr>\n";
# References to modules
@@ -167,7 +167,6 @@
global $lang;
echo "<tr><td>\n";
- echo menulink("database_overview.php", "Overview","DB Overview") ."<BR>\n";
if ( $this->obj->del_ok() && ($this->obj->id > 0) ) {
echo confirmlink("database_del.php?id=".$this->obj->id, $lang['Delete'],sprintf($lang['Delete'],$this->obj->getFullName())) ."<BR>\n";
}
@@ -180,54 +179,56 @@
* prepare
*/
Function prepare() {
- global $msg,$HTTP_GET_VARS,$lang;
+ global $msg,$lang;
$this->obj = new database($this->dbconn);
- if ( isset($HTTP_GET_VARS['id']) && ($HTTP_GET_VARS['id'] > -1) ) {
+ if ( isset($_GET['id']) && ($_GET['id'] > -1) ) {
$this->name = $lang['DBModify'];
- $this->obj->read($HTTP_GET_VARS['id']);
+ $this->obj->read($_GET['id']);
} else {
$this->name = $lang['DBCreate'];
$this->obj->name = $lang['PlsChangeName'];
}
- if ( !empty($HTTP_GET_VARS['name']) ) {
- $this->obj->name = StripSlashes($HTTP_GET_VARS['name']);
+ if ( !empty($_GET['name']) ) {
+ $this->obj->name = StripSlashes($_GET['name']);
}
- if ( !empty($HTTP_GET_VARS['user']) ) {
- $this->obj->user = StripSlashes($HTTP_GET_VARS['user']);
+ if ( !empty($_GET['user']) ) {
+ $this->obj->user = StripSlashes($_GET['user']);
}
- if ( !empty($HTTP_GET_VARS['pass']) ) {
- $this->obj->pass = StripSlashes($HTTP_GET_VARS['pass']);
+ if ( !empty($_GET['pass']) ) {
+ $this->obj->pass = StripSlashes($_GET['pass']);
}
- if ( !empty($HTTP_GET_VARS['host']) ) {
- $this->obj->host = StripSlashes($HTTP_GET_VARS['host']);
+ if ( !empty($_GET['host']) ) {
+ $this->obj->host = StripSlashes($_GET['host']);
}
- if ( !empty($HTTP_GET_VARS['port']) ) {
- $this->obj->port = StripSlashes($HTTP_GET_VARS['port']);
+ if ( !empty($_GET['port']) ) {
+ $this->obj->port = StripSlashes($_GET['port']);
}
- if ( !empty($HTTP_GET_VARS['type']) ) {
- $this->obj->type = StripSlashes($HTTP_GET_VARS['type']);
+ if ( !empty($_GET['type']) ) {
+ $this->obj->type = StripSlashes($_GET['type']);
}
- if ( !empty($HTTP_GET_VARS['logo']) ) {
- $this->obj->logo = StripSlashes($HTTP_GET_VARS['logo']);
+ if ( !empty($_GET['logo']) ) {
+ $this->obj->logo = StripSlashes($_GET['logo']);
}
- if ( !empty($HTTP_GET_VARS['logolink']) ) {
- $this->obj->logolink = StripSlashes($HTTP_GET_VARS['logolink']);
+ if ( !empty($_GET['logolink']) ) {
+ $this->obj->logolink = StripSlashes($_GET['logolink']);
}
- if ( !empty($HTTP_GET_VARS['bugautoname']) ) {
- $this->obj->bugautoname = StripSlashes($HTTP_GET_VARS['bugautoname']);
+ if ( !empty($_GET['bugautoname']) ) {
+ $this->obj->bugautoname = StripSlashes($_GET['bugautoname']);
}
- if ( !empty($HTTP_GET_VARS['invautoname']) ) {
- $this->obj->invautoname = StripSlashes($HTTP_GET_VARS['invautoname']);
+ if ( !empty($_GET['invautoname']) ) {
+ $this->obj->invautoname = StripSlashes($_GET['invautoname']);
}
- if ( !empty($HTTP_GET_VARS['vatlist']) ) {
- $this->obj->vatlist = StripSlashes($HTTP_GET_VARS['vatlist']);
+ if ( !empty($_GET['vatlist']) ) {
+ $this->obj->vatlist = StripSlashes($_GET['vatlist']);
}
if ( ! $this->obj->mod_ok() ) {
$msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
$this->stop = true;
}
# menu
+ $x = database::getOverviewLink($this->user);
+ $this->addmenu($x);
add_module_newlinks($this,$this->obj);
}
}
Index: database_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_show.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- database_show.php 5 Nov 2002 19:57:46 -0000 1.24
+++ database_show.php 27 Nov 2002 20:28:42 -0000 1.25
@@ -20,23 +20,23 @@
global $tutos,$lang;
echo $this->DataTableStart();
- echo "<TR>\n";
- echo " <TH COLSPAN=4>". sprintf($lang['Showing'],$this->obj->getFullName()) ."</TH>\n";
- echo "</TR>\n";
+ echo "<tr>\n";
+ echo " <th colspan=\"4\">". sprintf($lang['Showing'],$this->obj->getFullName()) ."</th>\n";
+ echo "</tr>\n";
if ( is_object($this->obj->creator) ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['createdby']);
- echo " <TD COLSPAN=3>". $this->obj->creator->getLink() ."</TD>\n";
- echo "</TR>\n";
+ echo " <td colspan=\"3\">". $this->obj->creator->getLink() ."</td>\n";
+ echo "</tr>\n";
}
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['AdminDBName']);
echo $this->showdata($this->obj->name);
echo $this->showfield($lang['AdminDBType']);
echo $this->showdata($this->obj->tlist[$this->obj->type]);
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['AdminDBAlias']);
echo $this->showdata($this->obj->alias,3);
@@ -74,32 +74,32 @@
echo $this->showdata($this->obj->home,3);
}
if ( ($tutos[usedocmanagement] == 1) ) {
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['AdminDBRep']);
echo $this->showdata($this->obj->repository,3);
}
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['CfgLogo']);
echo $this->showdata($this->obj->logo,3);
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['CfgLogoLink']);
echo $this->showdata($this->obj->logolink,3);
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['CfgBugAutoName']);
echo $this->showdata($this->obj->bugautoname,3);
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['CfgInvAutoName']);
echo $this->showdata($this->obj->invautoname,3);
- echo "</TR><TR>\n";
+ echo "</tr><tr>\n";
echo $this->showfield($lang['CfgVATlist']);
echo $this->showdata($this->obj->vatlist,3);
- echo "</TR>\n";
+ echo "</tr>\n";
# References to modules
show_module_infolists($this->user,$this->obj,4,$this->format);
@@ -112,8 +112,7 @@
Function navigate() {
global $tutos,$lang,$dbnr;
- echo "<TR><TD>";
- echo menulink("database_overview.php", "Overview","DB Overview") ."<BR>\n";
+ echo "<tr><td>";
if ( ($this->user->isAdmin()) ) {
echo menulink("database_new.php",$lang['NewEntry'],$lang['DBCreate']) ."<BR>";
}
@@ -130,19 +129,19 @@
echo menulink("admin_sync.php",$lang['AdminDBSync'],$lang['AdminDBSync']) ."<BR>";
- echo "</TD></TR>";
+ echo "</td></tr>";
}
/**
* prepare
*/
Function prepare() {
- global $msg,$lang,$HTTP_GET_VARS;
+ global $msg,$lang;
$this->name = $lang['DBDetail'];
$this->obj = new database($this->dbconn);
- if ( isset($HTTP_GET_VARS['id']) ) {
- $this->obj->read($HTTP_GET_VARS['id']);
+ if ( isset($_GET['id']) ) {
+ $this->obj->read($_GET['id']);
}
if ( ! $this->obj->see_ok() ) {
$msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
@@ -152,6 +151,8 @@
$this->stop = true;
}
# menu
+ $x = database::getOverviewLink($this->user);
+ $this->addmenu($x);
add_module_addlinks($this,$this->obj);
}
}
Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- admin_sync.php 10 Nov 2002 11:45:56 -0000 1.26
+++ admin_sync.php 27 Nov 2002 20:28:42 -0000 1.27
@@ -101,7 +101,7 @@
$vals .= $pre. $fv;
$upd .= $fv;
} else {
- echo "<SPAN CLASS=warn>". $dbconn2->colname($fn)." = ". $ft ." === </SPAN> ". $r->get($a,$b);
+ echo "<span class=\"warn\">". $dbconn2->colname($fn)." = ". $ft ." === </span> ". $r->get($a,$b);
echo "<BR>". $flds ."......". $vals .".......";
exit;
}
@@ -111,7 +111,7 @@
$b++;
}
if ( $pre == "(" ) {
- echo "<SPAN CLASS=warn> no values ???</SPAN><BR>\n";
+ echo "<span class=\"warn\"> no values ???</span><BR>\n";
return;
}
$flds .= ")";
@@ -306,7 +306,7 @@
$db1->read($this->from);
$db2->read($this->to);
- echo "<SPAN CLASS=warn>". $lang['AdminDBSyncM'][$this->what] ."</SPAN><P><P>\n";
+ echo "<span class=\"warn\">". $lang['AdminDBSyncM'][$this->what] ."</span><P><P>\n";
echo "connecting to databases ...<BR>\n";
flush();
@@ -320,7 +320,7 @@
$this->copy_selected($dbconn1,$dbconn2);
$this->copy_all($dbconn1,$dbconn2);
} else {
- echo "<SPAN CLASS=warn>Action :". $lang['AdminDBSyncM'][$this->what] ." not yet implemented </SPAN>\n";
+ echo "<span class=\"warn\">Action :". $lang['AdminDBSyncM'][$this->what] ." not yet implemented </span>\n";
}
echo "disconnecting from databases ...<BR>\n";
@@ -351,42 +351,42 @@
flush();
$stop = 0;
- echo "<TABLE CLASS=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
- echo "<TR>\n";
- echo " <TH COLSPAN=3>". $lang['AdminDBSync'] ."</TH>\n";
- echo "</TR>\n";
- echo "<TR>\n";
- echo " <TH> </TH>\n";
- echo " <TH>". $lang['AdminDBSource'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBTarget'] ."</TH>\n";
- echo "</TR>\n";
-
-
- echo "<TR>\n";
- echo " <TD> </TD>\n";
- echo " <TD>". $db1->getLink() ."</TD>\n";
- echo " <TD>". $db2->getLink() ."</TD>\n";
- echo "</TR>\n";
+ echo "<table class=single BORDER=0 CELLPADDING=3 CELLSPACING=0>\n";
+ echo "<tr>\n";
+ echo " <th colspan=\"3\">". $lang['AdminDBSync'] ."</th>\n";
+ echo "</tr>\n";
+ echo "<tr>\n";
+ echo " <th> </th>\n";
+ echo " <th>". $lang['AdminDBSource'] ."</th>\n";
+ echo " <th>". $lang['AdminDBTarget'] ."</th>\n";
+ echo "</tr>\n";
+
+
+ echo "<tr>\n";
+ echo " <td> </td>\n";
+ echo " <td>". $db1->getLink() ."</td>\n";
+ echo " <td>". $db2->getLink() ."</td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['DBLastDate']);
- echo " <TD>". $db1->lastsync->getDateTime() ."</TD>\n";
- echo " <TD>". $db2->lastsync->getDateTime() ."</TD>\n";
- echo "</TR>\n";
+ echo " <td>". $db1->lastsync->getDateTime() ."</td>\n";
+ echo " <td>". $db2->lastsync->getDateTime() ."</td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['DBLastID']);
- echo " <TD>". $db1->lastid ."</TD>\n";
- echo " <TD>". $db2->lastid ."</TD>\n";
- echo "</TR>\n";
+ echo " <td>". $db1->lastid ."</td>\n";
+ echo " <td>". $db2->lastid ."</td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['DBCurrID']);
$seq1 = $dbconn1->NextID();
$seq2 = $dbconn2->NextID();
- echo " <TD>". $seq1 ."</TD>\n";
- echo " <TD>". $seq2 ."</TD>\n";
- echo "</TR>\n";
+ echo " <td>". $seq1 ."</td>\n";
+ echo " <td>". $seq2 ."</td>\n";
+ echo "</tr>\n";
$q1 = "SELECT * from ". $dbconn1->prefix ."history where m_field = ". $dbconn1->String("created");
if ( $db1->lastsync->notime != 1) {
@@ -400,11 +400,11 @@
}
$r2 = $dbconn2->Exec($q2);
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield("History new");
- echo " <TD>". $r1->numrows() ."</TD>\n";
- echo " <TD>". $r2->numrows() ."</TD>\n";
- echo "</TR>\n";
+ echo " <td>". $r1->numrows() ."</td>\n";
+ echo " <td>". $r2->numrows() ."</td>\n";
+ echo "</tr>\n";
$q3 = "SELECT * from ". $dbconn1->prefix ."history where m_field = ". $dbconn1->String("Delete");
if ( $db1->lastsync->notime != 1) {
@@ -418,11 +418,11 @@
}
$r4 = $dbconn2->Exec($q4);
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield("History del");
- echo " <TD>". $r3->numrows() ."</TD>\n";
- echo " <TD>". $r4->numrows() ."</TD>\n";
- echo "</TR>\n";
+ echo " <td>". $r3->numrows() ."</td>\n";
+ echo " <td>". $r4->numrows() ."</td>\n";
+ echo "</tr>\n";
$r1->free();
$r2->free();
@@ -430,52 +430,52 @@
$r4->free();
# Does this make sense ?
if ( ($this->what != 1 ) && ($db1->lastsync->notime) ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield(" ");
- echo " <TD COLSPAN=2><SPAN CLASS=warn>You must first sync before update</SPAN></TD>\n";
- echo "</TR>\n";
+ echo " <td colspan=\"2\"><span class=\"warn\">You must first sync before update</span></td>\n";
+ echo "</tr>\n";
$stop = 1;
}
# Check IDs
# if the current source ID is below its last sync then a update sync is not possible
# because it the source was reinstalled or something like this
if ( ($this->what != 1 ) && ($seq1 < $db1->lastid) ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield(" ");
- echo " <TD COLSPAN=2><SPAN CLASS=warn>Source out of sync (". $seq1 ." < ". $db1->lastid .")</SPAN></TD>\n";
- echo "</TR>\n";
+ echo " <td colspan=\"2\"><span class=\"warn\">Source out of sync (". $seq1 ." < ". $db1->lastid .")</span></td>\n";
+ echo "</tr>\n";
$stop = 1;
}
# if the current target ID is below its last sync then a update sync is not possible
# because it the target was reinstalled or something like this
if ( ($this->what != 1 ) && ($seq2 < $db1->lastid) ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield(" ");
- echo " <TD COLSPAN=2><SPAN CLASS=warn>Target out of sync (". $seq2 ." < ". $db1->lastid .")</SPAN></TD>\n";
- echo "</TR>\n";
+ echo " <td colspan=\"2\"><span class=\"warn\">Target out of sync (". $seq2 ." < ". $db1->lastid .")</span></td>\n";
+ echo "</tr>\n";
$stop = 1;
}
if ( $stop == 0 ) {
- echo "<TR>\n";
+ echo "<tr>\n";
echo $this->showfield($lang['AdminDBWhat']);
- echo " <TD COLSPAN=2><SPAN CLASS=warn>". $lang['AdminDBSyncM'][$this->what] ."</SPAN></TD>\n";
- echo "</TR>\n";
+ echo " <td colspan=\"2\"><span class=\"warn\">". $lang['AdminDBSyncM'][$this->what] ."</span></td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
- echo " <TH COLSPAN=3>\n";
+ echo "<tr>\n";
+ echo " <th colspan=\"3\">\n";
echo confirmlink("admin_sync.php?step=3&from=". $this->from ."&to=". $this->to ."&what=". $this->what ,"Are you sure ?","Are you sure");
- echo " </TH>\n";
- echo "</TR>\n";
+ echo " </th>\n";
+ echo "</tr>\n";
} else {
- echo "<TR>\n";
- echo " <TD COLSPAN=3>\n";
+ echo "<tr>\n";
+ echo " <td colspan=\"3\">\n";
echo makelink("admin_sync.php?step=1&from=". $this->from ."&to=". $this->to ."&what=". $this->what ,"Go back","Go back");
- echo " </TD>\n";
- echo "</TR>\n";
+ echo " </td>\n";
+ echo "</tr>\n";
}
- echo "</TABLE>\n";
+ echo "</table>\n";
$dbconn1->Close();
$dbconn2->Close();
@@ -494,55 +494,55 @@
echo "<form name=\"adminsync\" method=\"get\" action=\"admin_sync.php\">\n";
echo $this->DataTableStart();
echo "<tr>\n";
- echo " <th COLSPAN=3>". $lang['AdminDBSync'] ." (Step 1)</TH>\n";
+ echo " <th colspan=\"3\">". $lang['AdminDBSync'] ." (Step 1)</th>\n";
echo "</tr>\n";
- echo "<TR>\n";
- echo " <TH>". $lang['AdminDBSource'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBWhat'] ."</TH>\n";
- echo " <TH>". $lang['AdminDBTarget'] ."</TH>\n";
- echo "</TR>\n";
-
- echo "<TR>\n";
- echo " <TD>\n";
- echo " <SELECT SIZE=". $tutos[maxshow]." name=\"from\">\n";
+ echo "<tr>\n";
+ echo " <th>". $lang['AdminDBSource'] ."</th>\n";
+ echo " <th>". $lang['AdminDBWhat'] ."</th>\n";
+ echo " <th>". $lang['AdminDBTarget'] ."</th>\n";
+ echo "</tr>\n";
+
+ echo "<tr>\n";
+ echo " <td>\n";
+ echo " <select size=\"". $tutos[maxshow]."\" name=\"from\">\n";
@reset($dblist);
while ( list ($i,$f) = @each ($dblist) ) {
- echo "<OPTION VALUE=\"". $i ."\"". ($this->from == $i ? " selected":"") .">". $i .": ". $f->getFullName(). ($i == $this->dbconn->db->id ? "(*)":"") ."</OPTION>\n";
+ echo "<option value=\"". $i ."\"". ($this->from == $i ? " selected":"") .">". $i .": ". $f->getFullName(). ($i == $this->dbconn->db->id ? "(*)":"") ."</option>\n";
}
- echo " </SELECT>\n";
- echo " </TD>\n";
+ echo " </select>\n";
+ echo " </td>\n";
- echo " <TD>\n";
- echo " <SELECT SIZE=". $tutos[maxshow]." name=\"what\">\n";
+ echo " <td>\n";
+ echo " <select size=\"". $tutos[maxshow]."\" name=\"what\">\n";
@reset($lang['AdminDBSyncM']);
while ( list ($i,$f) = @each ($lang['AdminDBSyncM']) ) {
- echo " <OPTION VALUE=\"". $i ."\"". ($this->what == $i ? " selected":"") .">". $lang['AdminDBSyncM'][$i]."</OPTION>\n";
+ echo " <option value=\"". $i ."\"". ($this->what == $i ? " selected":"") .">". $lang['AdminDBSyncM'][$i]."</option>\n";
}
- echo " </SELECT>\n";
- echo " </TD>\n";
+ echo " </select>\n";
+ echo " </td>\n";
- echo " <TD VALIGN=top>\n";
- if ( ($current_user->admin != 1) || (count($tutos[dbname]) == 1) ) {
- echo "<BR>\n". $current_user->dbconn->db->getLink();
+ echo " <td valign=\"top\">\n";
+ if ( ($this->user->admin != 1) || (count($tutos[dbname]) == 1) ) {
+ echo "<br>\n". $current_user->dbconn->db->getLink();
$this->addHidden("to",$this->dbconn->db->id);
} else {
# show local available DBs
echo " <SELECT SIZE=". $tutos[maxshow]." name=\"to\">\n";
@reset($dblist);
while ( list ($i,$f) = @each ($dblist) ) {
- if ( $i < 1000 ) {
+ if ( $i < 1000 ) {
echo "<OPTION VALUE=\"". $i ."\" ". ($this->to == $i ? "selected":"") .">". $i .": ". $f->getFullName(). ($i == $current_user->dbconn->db->id ? "(*)":"") ."</OPTION>\n";
+ }
}
+ echo " </select>\n";
}
- echo " </SELECT>\n";
- }
- echo " </TD>\n";
- echo "</TR>\n";
+ echo " </td>\n";
+ echo "</tr>\n";
- echo "<TR>\n";
+ echo "<tr>\n";
$this->addHidden("step","2");
- echo " <TD COLSPAN=3><input type=\"submit\" value=\"SYNC\" TITLE=\"". $lang['AdminDBSync'] ."\"></TD>\n";
- echo "</TR>\n";
+ echo " <td colspan=\"3\"><input type=\"submit\" value=\"SYNC\" TITLE=\"". $lang['AdminDBSync'] ."\"></td>\n";
+ echo "</tr>\n";
echo "</table>\n";
hiddenFormElements();
@@ -567,18 +567,17 @@
Function navigate() {
global $lang;
- echo "<TR><TD>";
- echo menulink("database_overview.php", $lang['DBOverview'],$lang['DBOverview']) ."<BR>\n";
+ echo "<tr><td>";
if ( ($this->user->admin == 1) ) {
echo menulink("database_new.php", $lang['NewEntry'],$lang['DBCreate']) ."<BR>\n";
}
- echo "</TD></TR>";
+ echo "</td></tr>";
}
/**
* prepare
*/
Function prepare() {
- global $msg,$HTTP_GET_VARS,$tutos,$lang,$table,$tableidx,$sequence;
+ global $msg,$tutos,$lang,$table,$tableidx,$sequence;
# read the table definitions of modules
foreach ($tutos[modules] as $r => $x) {
@@ -587,28 +586,28 @@
$this->name = $lang['AdminDBSync'];
- if ( ! isset($HTTP_GET_VARS['step']) ) {
+ if ( ! isset($_GET['step']) ) {
$this->step = 1;
} else {
- $this->step = $HTTP_GET_VARS['step'];
+ $this->step = $_GET['step'];
}
- if ( !isset($HTTP_GET_VARS['from']) ) {
+ if ( !isset($_GET['from']) ) {
$this->from = -1;
$this->step = 1;
} else {
- $this->from = $HTTP_GET_VARS['from'];
+ $this->from = $_GET['from'];
}
- if ( !isset($HTTP_GET_VARS['to']) ) {
+ if ( !isset($_GET['to']) ) {
$this->to = $this->dbconn->db->id;
$this->step = 1;
} else {
- $this->to = $HTTP_GET_VARS['to'];
+ $this->to = $_GET['to'];
}
- if ( !isset($HTTP_GET_VARS['what']) ) {
+ if ( !isset($_GET['what']) ) {
$this->what = 1;
$this->step = 1;
} else {
- $this->what = $HTTP_GET_VARS['what'];
+ $this->what = $_GET['what'];
}
if ( $this->from == $this->to ) {
$msg .= "Source and target must be different !";
@@ -617,13 +616,15 @@
if ( $this->user->admin == 0 ) {
$msg .= "Only admins are allowed to see this<BR>";
if ( $tutos[demo] == 1 ) {
- $msg .= "<SPAN CLASS=warn>exceptionally enabled for this demo</SPAN><BR>\n";
+ $msg .= "<span class=\"warn\">exceptionally enabled for this demo</span><br>\n";
$this->step = min($this->step,2);
} else {
$this->stop = true;
}
}
+ $x = database::getOverviewLink($this->user);
+ $this->addmenu($x);
}
}
|
|
From: Jeroen B. <kw...@us...> - 2002-11-27 20:13:25
|
Update of /cvsroot/tutos/tutos/php/watchlist In directory sc8-pr-cvs1:/tmp/cvs-serv18569 Modified Files: nl.p3 Log Message: update. Index: nl.p3 =================================================================== RCS file: /cvsroot/tutos/tutos/php/watchlist/nl.p3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nl.p3 5 Nov 2002 19:47:02 -0000 1.3 +++ nl.p3 27 Nov 2002 20:13:22 -0000 1.4 @@ -16,12 +16,12 @@ $lang['WatchOverview'] = "Observatielijst"; $lang['WatchOverviewI'] = "Toon de observatielijst van %s"; $lang['Watcher'] = "Observerende"; -$lang['WatchLastCall'] = "last call"; +$lang['WatchLastCall'] = "Laatste oproep"; #Email Subject Lines $lang['EmailChanged'] = "%s werd gewijzigd"; $lang['EmailDeleted'] = "%s werd verwijderd"; -$lang['EmailBirthday'] = "Birthday Reminder for %s"; +$lang['EmailBirthday'] = "Verjaardags herinnering voor %s"; $lang['perm'][usewatchlist] = "gebruik observatielijst"; ?> |
6 messages has been excluded from this view by a project administrator.