tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/note

Modified Files:
	note.pinc note_del.php note_ins.php 
Log Message:
cleanups for HTML

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- note.pinc	23 Dec 2002 10:01:39 -0000	1.25
+++ note.pinc	31 Dec 2002 14:33:49 -0000	1.26
@@ -35,7 +35,7 @@
       }
       break;
     }
-    echo "  ". $tutos[image][paper] ." ". $f->getLink() ." ". $f->creation->getDateTime() ." ".$f->creator->getLink($f->creator->getShortname())."<BR>\n";
+    echo "  ". $tutos[image][paper] ." ". $f->getLink() ." ". $f->creation->getDateTime() ." ".$f->creator->getLink($f->creator->getShortname())."<br>\n";
     if ( $cols > 0 ) {
       echo "</td></tr>\n";
     }
@@ -115,7 +115,7 @@
   function getPopInfo() {
     global $lang;
 
-    $n =str_replace("\n","<BR>",myentities($this->note));
+    $n =str_replace("\n","<br>",myentities($this->note));
     $n =str_replace("\r","",$n);
     $n =str_replace("\\","\\\\",$n);
     $n =str_replace("'","\'",$n);

Index: note_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_del.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- note_del.php	7 Dec 2002 16:49:38 -0000	1.6
+++ note_del.php	31 Dec 2002 14:33:50 -0000	1.7
@@ -23,16 +23,16 @@
  $u = new note($dbconn);
 
  if ( !isset($_GET['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$u->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0040'],$lang[$u->getType()]) ."<br>";
  } else {
    $u->read($_GET['id']);
    $gotourl = $u->getUrl();
  }
  if ( $u->id < 1 ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$u->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0040'],$lang[$u->getType()]) ."<br>";
  }
  if ( ! $u->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$u->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$u->getType()]) ."<br>";
  }
  if ( $msg == "" ) {
    $u->read_reference();

Index: note_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_ins.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- note_ins.php	23 Nov 2002 14:11:54 -0000	1.5
+++ note_ins.php	31 Dec 2002 14:33:50 -0000	1.6
@@ -32,19 +32,19 @@
    $u->creator = $current_user;
  }
  if ( empty($_POST['name']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['NoteName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['NoteName']) ."<br>";
  } else {
    $u->setName(StripSlashes($_POST['name']));
    $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($u->name));
  }
  if ( empty($_POST['note']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['NoteDescription']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['NoteDescription']) ."<br>";
  } else {
    $u->setText(StripSlashes($_POST['note']));
    $gotourl= addUrlParameter($gotourl,"note=". UrlEncode($u->note));
  }
  if ( empty($_POST['link_id']) ) {
-   $msg .= "No Link ID given !<BR>";
+   $msg .= "No Link ID given !<br>";
  } else {
    $u->link_id = $_POST['link_id'];
    $gotourl= addUrlParameter($gotourl,"link_id=". $u->link_id);
@@ -57,7 +57,7 @@
 
  $gotourl= addUrlParameter($gotourl,"remember=". $u->remember->getYYYYMMDD() );
  if ( 1 != $r->checkDMY() ) {
-   $msg .= sprintf($lang['Err0038'],$lang['NoteRemember']) ."<BR>";
+   $msg .= sprintf($lang['Err0038'],$lang['NoteRemember']) ."<br>";
  }
 
  # other modules

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/localization

Modified Files:
	ca.p3 cs.p3 de.p3 el.p3 en.p3 fr.p3 it.p3 nl.p3 pl.p3 pt-br.p3 
	ru.p3 sv.p3 
Log Message:
cleanups for HTML

Index: ca.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ca.p3,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ca.p3	18 Dec 2002 14:27:51 -0000	1.16
+++ ca.p3	31 Dec 2002 14:33:46 -0000	1.17
@@ -137,7 +137,7 @@
 $lang['ThousandPoint']   = ",";
 $lang['yes']             = "si";
 $lang['no']              = "no";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Els camps marcats <FONT COLOR=red>(*)</FONT> son obligatoris.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Els camps marcats <font color=\"red\">(*)</font> son obligatoris.</font>";
 $lang['any']             = "qualsevol";
 $lang['all']             = "tots";
 $lang['extended']        = "avançada";
@@ -740,22 +740,22 @@
 $lang['Err0001']         = "No hi ha participants !";
 $lang['Err0002']         = "inici després de final !";
 $lang['Err0003']         = "Falta descripció de cita !";
-$lang['Err0004']         = "Producte desconegut <I>%s</I> !";
-$lang['Err0005']         = "La descripció <I>%s</I> serveix per a <B>%d</B> productes !";
+$lang['Err0004']         = "Producte desconegut <i>%s</i> !";
+$lang['Err0005']         = "La descripció <i>%s</i> serveix per a <b>%d</b> productes !";
 $lang['Err0006']         = "Si us plau fes una sel·lecciçó detallada";
-$lang['Err0007']         = "Client desconegut. <I>%s</I> no s'ha trobat a la <A HREF=address_select.php>llibreta d'adreces</A>";
-$lang['Err0008']         = "Nom client <I>%s</I> serveix per a %d Entrades";
-$lang['Err0009']         = "Si us plau ompli el camp <I>%s</I>";
-$lang['Err0010']         = "Nom departament <I>%s</I> serveix per a <B>%d</B> departaments !";
-$lang['Err0011']         = "Nom empresa <I>%s</I> serveix per a <B>%d</B> empresa !";
-$lang['Err0012']         = "Empresa desconeguda <I>%s</I> !";
-$lang['Err0013']         = "Departament desconegut <I>%s</I> !";
-$lang['Err0014']         = "Si us plau fes una sel·lecció de camp <I>%s</I>";
+$lang['Err0007']         = "Client desconegut. <i>%s</i> no s'ha trobat a la <a href=\"address_select.php\">llibreta d'adreces</a>";
+$lang['Err0008']         = "Nom client <i>%s</i> serveix per a %d Entrades";
+$lang['Err0009']         = "Si us plau ompli el camp <i>%s</i>";
+$lang['Err0010']         = "Nom departament <i>%s</i> serveix per a <b>%d</b> departaments !";
+$lang['Err0011']         = "Nom empresa <i>%s</i> serveix per a <b>%d</b> empresa !";
+$lang['Err0012']         = "Empresa desconeguda <i>%s</i> !";
+$lang['Err0013']         = "Departament desconegut <i>%s</i> !";
+$lang['Err0014']         = "Si us plau fes una sel·lecció de camp <i>%s</i>";
 $lang['Err0015']         = "No es permeten modificacions !";
 $lang['Err0016']         = "No té permis per eliminar la nota !";
-$lang['Err0017']         = "Si us plau introdueixi un número en el camp <I>%s</I> field !";
-$lang['Err0018']         = "El nom <I>%s</I> serveix per a  %d entrades";
-$lang['Err0019']         = "Persona desconeguda <I>%s</I> !";
+$lang['Err0017']         = "Si us plau introdueixi un número en el camp <i>%s</i> field !";
+$lang['Err0018']         = "El nom <i>%s</i> serveix per a  %d entrades";
+$lang['Err0019']         = "Persona desconeguda <i>%s</i> !";
 $lang['Err0020']         = "No té permis per a eliminar el fitxer!";
 $lang['Err0021']         = "No es pot modificar l'equip virtual 0";
 $lang['Err0022']         = "Ho sento, no té permis per a veure %s";
@@ -769,7 +769,7 @@
 $lang['Err0030']         = "Fax was not spooled !";
 $lang['Err0031']         = "Missing Fax Number !";
 $lang['Err0032']         = "Fax sending is diasabled !";
-$lang['Err0033']         = "Enviament de missatges deshabilitat ! Missatge \"%s\" <U>no</U> ha estat enviat.";
+$lang['Err0033']         = "Enviament de missatges deshabilitat ! Missatge \"%s\" <u>no</u> ha estat enviat.";
 $lang['Err0034']         = "mail not sent ! missing senders \"%s\" email.";
 $lang['Err0035']         = "Missatge no enviat! No hi ha destinataris/es.";
 $lang['Err0036']         = "Producte/Projecte ja existeix aquí (%s) amb el nom i versió donats !";
@@ -789,7 +789,7 @@
 $lang['Err0050']         = "Could not find CSV contents !";
 $lang['Err0051']         = "Could not find CSV Separator";
 $lang['Err0052']         = "You must provide a classification";
-$lang['Err0053']         = "Unknown Installation <I>%s</I> !";
+$lang['Err0053']         = "Unknown Installation <i>%s</i> !";
 
 ### Local Variables: ***
 ### End: ***

Index: cs.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/cs.p3,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cs.p3	18 Dec 2002 14:27:51 -0000	1.15
+++ cs.p3	31 Dec 2002 14:33:46 -0000	1.16
@@ -43,7 +43,7 @@
 $lang['InviteEmail']     = "Pøivítat e-mailem";
 $lang['Invitation']      = "Uvítání";
 $lang['IgnoreTime']      = "Ignorovat èasy vý¹e";
-$lang['IgnoreTime2']     = "(t.j. místo nezabírá dílèí èas<BR>harmonogramu dne / dnù)";
+$lang['IgnoreTime2']     = "(t.j. místo nezabírá dílèí èas<br>harmonogramu dne / dnù)";
 $lang['forphrase']       = "Pro";
 $lang['nextweek']        = "Pøí¹tí týden";
 $lang['lastweek']        = "Minulý týden";
@@ -140,7 +140,7 @@
 $lang['ThousandPoint']   = " ";
 $lang['yes']             = "Ano";
 $lang['no']              = "Ne";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Oznaèená pole <FONT COLOR=red>(*)</FONT> musí být vyplnìna.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Oznaèená pole <font color=\"red\">(*)</font> musí být vyplnìna.</font>";
 $lang['any']             = "nìjaký";
 $lang['all']             = "V¹e";
 $lang['extended']        = "Roz¹íøené";
@@ -743,22 +743,22 @@
 $lang['Err0001']         = "®ádní úèastníci !";
 $lang['Err0002']         = "Zaèátek po konci !";
 $lang['Err0003']         = "Chybí popis pro schùzku !";
-$lang['Err0004']         = "Neznámý produkt <I>%s</I> !";
-$lang['Err0005']         = "Popis produktu <I>%s</I> je platný  pro produkty <B>%d</B> !";
+$lang['Err0004']         = "Neznámý produkt <i>%s</i> !";
+$lang['Err0005']         = "Popis produktu <i>%s</i> je platný  pro produkty <b>%d</b> !";
 $lang['Err0006']         = "Prosím, proveï podrobný výbìr";
-$lang['Err0007']         = "Neznámý náv¹tìvník. <I>%s</I> nebyl nalezen v <A HREF=address_select.php>knize adres</A>";
-$lang['Err0008']         = "Jméno náv¹tìvníka <I>%s</I> pro %d záznam souhlasí";
-$lang['Err0009']         = "Prosím, vyplò pole <I>%s</I>";
-$lang['Err0010']         = "Název støediska <I>%s</I> <B>%d</B> souhlasí !";
-$lang['Err0011']         = "Název firmy <I>%s</I> <B>%d</B> souhlasí !";
-$lang['Err0012']         = "Neznámá firma <I>%s</I> !";
-$lang['Err0013']         = "Neznámé støedisko <I>%s</I> !";
-$lang['Err0014']         = "Prosím, proveï výbìr v poli <I>%s</I>";
+$lang['Err0007']         = "Neznámý náv¹tìvník. <i>%s</i> nebyl nalezen v <a href=\"address_select.php\">knize adres</A>";
+$lang['Err0008']         = "Jméno náv¹tìvníka <i>%s</i> pro %d záznam souhlasí";
+$lang['Err0009']         = "Prosím, vyplò pole <i>%s</i>";
+$lang['Err0010']         = "Název støediska <i>%s</i> <b>%d</b> souhlasí !";
+$lang['Err0011']         = "Název firmy <i>%s</i> <b>%d</b> souhlasí !";
+$lang['Err0012']         = "Neznámá firma <i>%s</i> !";
+$lang['Err0013']         = "Neznámé støedisko <i>%s</i> !";
+$lang['Err0014']         = "Prosím, proveï výbìr v poli <i>%s</i>";
 $lang['Err0015']         = "Zmìny nejsou povoleny !";
 $lang['Err0016']         = "Nemá¹ právo smazat tento záznam !";
-$lang['Err0017']         = "Prosím, vlo¾ èíslo do pole <I>%s</I> !";
-$lang['Err0018']         = "Název záznamu <I>%s</I> %d souhlasí !";
-$lang['Err0019']         = "Neznámá osoba <I>%s</I> !";
+$lang['Err0017']         = "Prosím, vlo¾ èíslo do pole <i>%s</i> !";
+$lang['Err0018']         = "Název záznamu <i>%s</i> %d souhlasí !";
+$lang['Err0019']         = "Neznámá osoba <i>%s</i> !";
 $lang['Err0020']         = "Nemá¹ právo smazat tento soubor !";
 $lang['Err0021']         = "Nemù¾e¹ zmìnit virtualní tým 0";
 $lang['Err0022']         = "Promiò, ale díky pøístupovým právùm ti %s nemohu zobrazit.";
@@ -772,7 +772,7 @@
 $lang['Err0030']         = "Fax nebyl odeslán !";
 $lang['Err0031']         = "Chybí faxove èíslo !";
 $lang['Err0032']         = "Neni povoleno odesílání faxu !";
-$lang['Err0033']         = "Neni povoleno odesílání e-mailu ! Mail \"%s\" <U>nebyl</U> poslán.";
+$lang['Err0033']         = "Neni povoleno odesílání e-mailu ! Mail \"%s\" <u>nebyl</u> poslán.";
 $lang['Err0034']         = "E-mail nebyl odeslán ! Chybí odesílatel dopisu \"%s\".";
 $lang['Err0035']         = "E-mail nebyl odeslán ! Dopis chybí a nebo u¾ byl poslán.";
 $lang['Err0036']         = "Produkt/projekt u¾ s tímto jménem (%s) a verzí existuje !";
@@ -792,7 +792,7 @@
 $lang['Err0050']         = "Nemohu najít cSV obsahy !";
 $lang['Err0051']         = "Nemohu najít CSV oddìlovaèe";
 $lang['Err0052']         = "Musí¹ dodat klasifikaci";
-$lang['Err0053']         = "Unknown Installation <I>%s</I> !";
+$lang['Err0053']         = "Unknown Installation <i>%s</i> !";
 
 ### Local Variables: ***
 #

Index: de.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/de.p3,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- de.p3	16 Dec 2002 20:36:19 -0000	1.17
+++ de.p3	31 Dec 2002 14:33:46 -0000	1.18
@@ -43,7 +43,7 @@
 $lang['InviteEmail']     = "Einladen per E-mail";
 $lang['Invitation']      = "Einladung";
 $lang['IgnoreTime']      = "Obige Zeiten ignorieren";
-$lang['IgnoreTime2']     = "(d.h. der Termin findet zu keiner bestimmten<BR>Uhrzeit an den Tag(en) statt)";
+$lang['IgnoreTime2']     = "(d.h. der Termin findet zu keiner bestimmten<br>Uhrzeit an den Tag(en) statt)";
 $lang['forphrase']       = "für";
 $lang['nextweek']        = "Nächste Woche";
 $lang['lastweek']        = "Letzte Woche";
@@ -139,7 +139,7 @@
 $lang['ThousandPoint']   = ".";
 $lang['yes']             = "ja";
 $lang['no']              = "nein";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Mit <FONT COLOR=red>(*)</FONT> gekennzeichnete Felder müssen ausgefüllt werden.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Mit <font color=\"red\">(*)</font> gekennzeichnete Felder müssen ausgefüllt werden.</font>";
 $lang['any']             = "Alle";
 $lang['all']             = "Alle";
 $lang['extended']        = "Erweitert";
@@ -742,22 +742,22 @@
 $lang['Err0001']         = "Keine Teilnehmer angegeben !";
 $lang['Err0002']         = "Anfangszeit liegt nach Endzeit !";
 $lang['Err0003']         = "Termine benötigen eine Beschreibung !";
-$lang['Err0004']         = "Unbekanntes Produkt/Projekt <I>%s</I> !";
-$lang['Err0005']         = "Produkt-/Projektbeschreibung <I>%s</I> passt zu <B>%d</B> Produkten/Projekten !";
+$lang['Err0004']         = "Unbekanntes Produkt/Projekt <i>%s</i> !";
+$lang['Err0005']         = "Produkt-/Projektbeschreibung <i>%s</i> passt zu <b>%d</b> Produkten/Projekten !";
 $lang['Err0006']         = "Bitte geben Sie ein genauere Beschreibung";
-$lang['Err0007']         = "Unbekannter Besucher. <I>%s</I> konnte nicht im <A HREF=address_select.php>Adressbuch</A> gefunden werden";
-$lang['Err0008']         = "Besuchername <I>%s</I> trifft auf %d Einträge zu";
-$lang['Err0009']         = "Bitte füllen sie das Feld <I>%s</I>";
-$lang['Err0010']         = "Abteilungsbezeichnung <I>%s</I> passt zu <B>%d</B> Abteilungen !";
-$lang['Err0011']         = "Firmenname <I>%s</I> passt zu <B>%d</B> Firmen !";
-$lang['Err0012']         = "Unbekannte Firma <I>%s</I> !";
-$lang['Err0013']         = "Unbekannte Abteilung <I>%s</I> !";
-$lang['Err0014']         = "Bitte wählen sie im Feld <I>%s</I>";
+$lang['Err0007']         = "Unbekannter Besucher. <i>%s</i> konnte nicht im <a href=\"address_select.php\">Adressbuch</a> gefunden werden";
+$lang['Err0008']         = "Besuchername <i>%s</i> trifft auf %d Einträge zu";
+$lang['Err0009']         = "Bitte füllen sie das Feld <i>%s</i>";
+$lang['Err0010']         = "Abteilungsbezeichnung <i>%s</i> passt zu <b>%d</b> Abteilungen !";
+$lang['Err0011']         = "Firmenname <i>%s</i> passt zu <b>%d</b> Firmen !";
+$lang['Err0012']         = "Unbekannte Firma <i>%s</i> !";
+$lang['Err0013']         = "Unbekannte Abteilung <i>%s</i> !";
+$lang['Err0014']         = "Bitte wählen sie im Feld <i>%s</i>";
 $lang['Err0015']         = "Änderung nicht erlaubt !";
 $lang['Err0016']         = "Sie dürfen diese Notiz nicht löschen !";
-$lang['Err0017']         = "Bitte geben Sie eine Zahl im Feld <I>%s</I> ein !";
-$lang['Err0018']         = "Name <I>%s</I> trifft auf %d Einträge zu";
-$lang['Err0019']         = "Unbekannte Person <I>%s</I> !";
+$lang['Err0017']         = "Bitte geben Sie eine Zahl im Feld <i>%s</i> ein !";
+$lang['Err0018']         = "Name <i>%s</i> trifft auf %d Einträge zu";
+$lang['Err0019']         = "Unbekannte Person <i>%s</i> !";
 $lang['Err0020']         = "Sie dürfen dieses Dokument nicht löschen !";
 $lang['Err0021']         = "Die virtuelle Gruppe 0 kann nicht geändert werden !";
 $lang['Err0022']         = "Sie dürfen diese(n/s) %s aufgrund der gesetzten Berechtigungen leider nicht ansehen !";
@@ -771,7 +771,7 @@
 $lang['Err0030']         = "Fax wurde nicht versandt";
 $lang['Err0031']         = "Bitte eine Faxnummer angeben !";
 $lang['Err0032']         = "Fax Versand ist abgeschaltet !";
-$lang['Err0033']         = "E-mail-Versand ist abgeschaltet ! E-mail %s wurde <U>nicht</U> abgeschickt.";
+$lang['Err0033']         = "E-mail-Versand ist abgeschaltet ! E-mail %s wurde <u>nicht</u> abgeschickt.";
 $lang['Err0034']         = "E-mail wurde nicht verschickt ! E-mailadresse des Absenders \"%s\" fehlt.";
 $lang['Err0035']         = "E-mail wurde nicht verschickt ! Empfänger fehlen.";
 $lang['Err0036']         = "Es existiert bereits ein Produkt oder Projekt (%s) mit diesem Namen und dieser Versionsnummer !";
@@ -791,7 +791,7 @@
 $lang['Err0050']         = "CSV-Inhalt konnte nicht gefunden werden !";
 $lang['Err0051']         = "CSV-Trennzeichen konnte nicht gefunden werden !";
 $lang['Err0052']         = "Eine Klassifikation muss angegeben werden !";
-$lang['Err0053']         = "Unbekannte Installation <I>%s</I> !";
+$lang['Err0053']         = "Unbekannte Installation <i>%s</i> !";
 
 ### Local Variables: ***
 ### mode:iso-accents ***

Index: el.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/el.p3,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- el.p3	18 Dec 2002 14:27:51 -0000	1.17
+++ el.p3	31 Dec 2002 14:33:46 -0000	1.18
@@ -42,7 +42,7 @@
 $lang['InviteEmail']     = "Ðñüóêëçóç ìå Email";
 $lang['Invitation']      = "Ðñüóêëçóç";
 $lang['IgnoreTime']      = "Áãíüçóå ôïõò ðáñáðÜíù ÷ñüíïõò";
-$lang['IgnoreTime2']     = "(ð.÷. ç óõíÜíôçóç äåí ãßíåôáé<BR>óå óõãêåêñéìÝíç þñá)";
+$lang['IgnoreTime2']     = "(ð.÷. ç óõíÜíôçóç äåí ãßíåôáé<br>óå óõãêåêñéìÝíç þñá)";
 $lang['forphrase']       = "ãéá";
 $lang['nextweek']        = "åðüìåíç åâäïìÜäá";
 $lang['lastweek']        = "ðñïçãïýìåíç åâäïìÜäá";
@@ -138,7 +138,7 @@
 $lang['ThousandPoint']   = ",";
 $lang['yes']             = "íáé";
 $lang['no']              = "ü÷é";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Ôá ðåäßá ìå óÞìáíóç<FONT COLOR=red>(*)</FONT> ðñÝðåé íá óõìðëçñùèïýí.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Ôá ðåäßá ìå óÞìáíóç<font color=\"red\">(*)</font> ðñÝðåé íá óõìðëçñùèïýí.</font>";
 $lang['any']             = "ïðïéïäÞðïôå";
 $lang['all']             = "¼ëá";
 $lang['extended']        = "åêôåôáìÝíç";
@@ -741,22 +741,22 @@
 $lang['Err0001']         = "ÊáíÝíáò ÓõììåôÝ÷ùí !";
 $lang['Err0002']         = "Ýíáñîç ìåôÜ ôï ôÝëïò !";
 $lang['Err0003']         = "Áðïõóßá ÐåñéãñáöÞò óõíÜíôçóçò !";
-$lang['Err0004']         = "¢ãíùóôï Ðñïúüí <I>%s</I> !";
-$lang['Err0005']         = "ÐåñéãñáöÞ Ðñïúüíôïò <I>%s</I> éó÷ýåé ãéá <B>%d</B> ðñïúüíôá !";
+$lang['Err0004']         = "¢ãíùóôï Ðñïúüí <i>%s</i> !";
+$lang['Err0005']         = "ÐåñéãñáöÞ Ðñïúüíôïò <i>%s</i> éó÷ýåé ãéá <b>%d</b> ðñïúüíôá !";
 $lang['Err0006']         = "ÊÜíå ëåðôïìåñÞ åðéëïãÞ";
-$lang['Err0007']         = "¢ãíùóôïò åðéóêÝðôçò. <I>%s</I> äå âñÝèçêå óôçí <A HREF=address_select.php>áôæÝíôá</A>";
-$lang['Err0008']         = "¼íïìá åðéóêÝðôç <I>%s</I> éó÷ýåé ãéá %d êáôá÷ùñßóåéò";
-$lang['Err0009']         = "ÓõìðëÞñùóå ôï ðåäßï<I>%s</I> ";
-$lang['Err0010']         = "Ôï üíïìá ôìÞìáôïò <I>%s</I> éó÷ýåé ãéá <B>%d</B> ôìÞìáôá !";
-$lang['Err0011']         = "Ôï ¼íïìá ôçò Åôáéñåßáò <I>%s</I> éó÷ýåé ãéá <B>%d</B> åôáéñåßåò !";
-$lang['Err0012']         = "¢ãíùóôç åôáéñåßá <I>%s</I> !";
-$lang['Err0013']         = "¢ãíùóôï ôìÞìá <I>%s</I>!";
-$lang['Err0014']         = "ÅðÝëåîå ìÝóá óôï <I>%s</I> ðåäßï";
+$lang['Err0007']         = "¢ãíùóôïò åðéóêÝðôçò. <i>%s</i> äå âñÝèçêå óôçí <a href=\"address_select.php\">áôæÝíôá</a>";
+$lang['Err0008']         = "¼íïìá åðéóêÝðôç <i>%s</i> éó÷ýåé ãéá %d êáôá÷ùñßóåéò";
+$lang['Err0009']         = "ÓõìðëÞñùóå ôï ðåäßï<i>%s</i> ";
+$lang['Err0010']         = "Ôï üíïìá ôìÞìáôïò <i>%s</i> éó÷ýåé ãéá <b>%d</b> ôìÞìáôá !";
+$lang['Err0011']         = "Ôï ¼íïìá ôçò Åôáéñåßáò <i>%s</i> éó÷ýåé ãéá <b>%d</b> åôáéñåßåò !";
+$lang['Err0012']         = "¢ãíùóôç åôáéñåßá <i>%s</i> !";
+$lang['Err0013']         = "¢ãíùóôï ôìÞìá <i>%s</i>!";
+$lang['Err0014']         = "ÅðÝëåîå ìÝóá óôï <i>%s</i> ðåäßï";
 $lang['Err0015']         = "Äåí åðéôñÝðïíôáé ôñïðïðïéÞóåéò !";
 $lang['Err0016']         = "Äåí åðéôñÝðåôáé íá äéáãñÜøåéò áõôÞ ôç óçìåßùóç !";
-$lang['Err0017']         = "Êáôá÷þñéóå Ýíáí áñéèìü óôï <I>%s</I> ðåäßï !";
-$lang['Err0018']         = "Ôï üíïìá <I>%s</I> éó÷ýåé ãéá %d Êáôá÷ùñßóåéò";
-$lang['Err0019']         = "¢ãíùóôï ¢ôïìï <I>%s</I> !";
+$lang['Err0017']         = "Êáôá÷þñéóå Ýíáí áñéèìü óôï <i>%s</i> ðåäßï !";
+$lang['Err0018']         = "Ôï üíïìá <i>%s</i> éó÷ýåé ãéá %d Êáôá÷ùñßóåéò";
+$lang['Err0019']         = "¢ãíùóôï ¢ôïìï <i>%s</i> !";
 $lang['Err0020']         = "Äåí åðéôñÝðåôáé íá äéáãñÜøåéò áõôü ôï áñ÷åßï !";
 $lang['Err0021']         = "Äåí ìðïñåßò íá áëëÜîåéò ôçí åéêïíéêÞ ïìÜäá 0";
 $lang['Err0022']         = "Óõããíþìç, åîáéôßáò äéêáéùìÜôùí, äåí åðéôñÝðåôáé íá ôï äåéò áõôü %s";
@@ -770,7 +770,7 @@
 $lang['Err0030']         = "Ôï Fax äåí åíåñãïðïéÞèçêå!";
 $lang['Err0031']         = "¸ëëåéøç  Áñéèìïý Fax!";
 $lang['Err0032']         = "Ç ÁðïóôïëÞ Fax  áíåóôÜëç/áðåíåñãïðïéÞèçêå!";
-$lang['Err0033']         = "ç áðïóôïëÞ mail áðåíåñãïðïéÞèçêå ! Ôï Mail \"%s\" äåí <U>not</U> óôÜëèçêå.";
+$lang['Err0033']         = "ç áðïóôïëÞ mail áðåíåñãïðïéÞèçêå ! Ôï Mail \"%s\" äåí <u>not</u> óôÜëèçêå.";
 $lang['Err0034']         = "ôï mail äåí óôÜëèçêå ! Üãíùóôïé áðïóôïëåßò \"%s\" email.";
 $lang['Err0035']         = "ôï mail äåí óôÜëèçêå ! ÷ùñßò ðáñáëÞðôåò Þ Ý÷åé Þäç áðïóôáëåß.";
 $lang['Err0036']         = "Ðñïúüí/¸ñãï Þäç õðÜñ÷åé åäþ (%s) ìå äïóìÝíá ¼íïìá êáé ¸êäïóç!";
@@ -790,7 +790,7 @@
 $lang['Err0050']         = "Could not find CSV contents !";
 $lang['Err0051']         = "Could not find CSV Separator";
 $lang['Err0052']         = "You must provide a classification";
-$lang['Err0053']         = "Unknown Installation <I>%s</I> !";
+$lang['Err0053']         = "Unknown Installation <i>%s</i> !";
 
 ### Local Variables: ***
 ### End: ***

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- en.p3	18 Dec 2002 14:27:51 -0000	1.18
+++ en.p3	31 Dec 2002 14:33:46 -0000	1.19
@@ -43,7 +43,7 @@
 $lang['InviteEmail']     = "Invite by Email";
 $lang['Invitation']      = "Invitation";
 $lang['IgnoreTime']      = "ignore above times";
-$lang['IgnoreTime2']     = "(i.e. the appointment takes place<BR>at no particular time on these day(s) )";
+$lang['IgnoreTime2']     = "(i.e. the appointment takes place<br>at no particular time on these day(s) )";
 $lang['forphrase']       = "for";
 $lang['nextweek']        = "next week";
 $lang['lastweek']        = "last week";
@@ -139,7 +139,7 @@
 $lang['ThousandPoint']   = ",";
 $lang['yes']             = "yes";
 $lang['no']              = "no";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Fields marked <FONT COLOR=red>(*)</FONT> must be filled.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Fields marked <font color=\"red\">(*)</font> must be filled.</font>";
 $lang['any']             = "any";
 $lang['all']             = "All";
 $lang['extended']        = "More options";
@@ -742,22 +742,22 @@
 $lang['Err0001']         = "No Participants !";
 $lang['Err0002']         = "start after end !";
 $lang['Err0003']         = "Missing Description for appointment !";
-$lang['Err0004']         = "Unknown Product <I>%s</I> !";
-$lang['Err0005']         = "Product Description <I>%s</I> is valid for <B>%d</B> products !";
+$lang['Err0004']         = "Unknown Product <i>%s</i> !";
+$lang['Err0005']         = "Product Description <i>%s</i> is valid for <b>%d</b> products !";
 $lang['Err0006']         = "Please make a detailed selection";
-$lang['Err0007']         = "Unknown visitor. <I>%s</I> was not found in the <A HREF=address_select.php>addressbooks</A>";
-$lang['Err0008']         = "Visitorname <I>%s</I> is valid for %d Entries";
-$lang['Err0009']         = "Please fill the <I>%s</I> field";
-$lang['Err0010']         = "Departmentname <I>%s</I> is valid for <B>%d</B> departments !";
-$lang['Err0011']         = "Company Name <I>%s</I> is valid for <B>%d</B> companies !";
-$lang['Err0012']         = "Unknown company <I>%s</I> !";
-$lang['Err0013']         = "Unknown department <I>%s</I> !";
-$lang['Err0014']         = "Please select in the <I>%s</I> field";
+$lang['Err0007']         = "Unknown visitor. <i>%s</i> was not found in the <a href=\"address_select.php\">addressbooks</a>";
+$lang['Err0008']         = "Visitorname <i>%s</i> is valid for %d Entries";
+$lang['Err0009']         = "Please fill the <i>%s</i> field";
+$lang['Err0010']         = "Departmentname <i>%s</i> is valid for <b>%d</b> departments !";
+$lang['Err0011']         = "Company Name <i>%s</i> is valid for <b>%d</b> companies !";
+$lang['Err0012']         = "Unknown company <i>%s</i> !";
+$lang['Err0013']         = "Unknown department <i>%s</i> !";
+$lang['Err0014']         = "Please select in the <i>%s</i> field";
 $lang['Err0015']         = "Modifications not allowed !";
 $lang['Err0016']         = "You are not allowed to delete this note !";
-$lang['Err0017']         = "Please enter a number in the <I>%s</I> field !";
-$lang['Err0018']         = "Name <I>%s</I> is valid for %d Entries";
-$lang['Err0019']         = "Unknown Person <I>%s</I> !";
+$lang['Err0017']         = "Please enter a number in the <i>%s</i> field !";
+$lang['Err0018']         = "Name <i>%s</i> is valid for %d Entries";
+$lang['Err0019']         = "Unknown Person <i>%s</i> !";
 $lang['Err0020']         = "You are not allowed to delete this file !";
 $lang['Err0021']         = "You cannot change the virtual team 0";
 $lang['Err0022']         = "Sorry, due to permissions, you are not allowed to see this %s";
@@ -771,7 +771,7 @@
 $lang['Err0030']         = "Fax was not spooled !";
 $lang['Err0031']         = "Missing Fax Number !";
 $lang['Err0032']         = "Fax sending is diasabled !";
-$lang['Err0033']         = "mail sending is disabled ! Mail \"%s\" was <U>not</U> sent.";
+$lang['Err0033']         = "mail sending is disabled ! Mail \"%s\" was <u>not</u> sent.";
 $lang['Err0034']         = "mail not sent ! missing sender \"%s\" email.";
 $lang['Err0035']         = "mail not sent ! no recipents or already sent.";
 $lang['Err0036']         = "Product/Project already exists here (%s) with given Name and Version !";
@@ -791,7 +791,7 @@
 $lang['Err0050']         = "Could not find CSV contents !";
 $lang['Err0051']         = "Could not find CSV Separator";
 $lang['Err0052']         = "You must provide a classification";
-$lang['Err0053']         = "Unknown Installation <I>%s</I> !";
+$lang['Err0053']         = "Unknown Installation <i>%s</i> !";
 
 ### Local Variables: ***
 #

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fr.p3	17 Dec 2002 21:08:36 -0000	1.15
+++ fr.p3	31 Dec 2002 14:33:47 -0000	1.16
@@ -40,7 +40,7 @@
 $lang['InviteEmail']     = "Inviter par Email";
 $lang['Invitation']      = "Invitation";
 $lang['IgnoreTime']      = "Pas d'heure";
-$lang['IgnoreTime2']     = "(i.e. l'évenement n'a pas<BR>d'heure precise)";
+$lang['IgnoreTime2']     = "(i.e. l'évenement n'a pas<br>d'heure precise)";
 $lang['forphrase']       = "pour";
 $lang['nextweek']        = "Semaine suivante";
 $lang['lastweek']        = "Semaine précedente";

Index: it.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/it.p3,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- it.p3	18 Dec 2002 14:27:53 -0000	1.16
+++ it.p3	31 Dec 2002 14:33:47 -0000	1.17
@@ -134,7 +134,7 @@
 $lang['ThousandPoint']   = ",";
 $lang['yes']             = "si";
 $lang['no']              = "no";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Fields marked <FONT COLOR=red>(*)</FONT> must be filled.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Fields marked <font color=\"red\">(*)</font> must be filled.</font>";
 $lang['any']             = "qualsiasi";
 $lang['all']             = "All";
 $lang['extended']        = "esteso";
@@ -738,22 +738,22 @@
 $lang['Err0001']         = "Nessun partecipante !";
 $lang['Err0002']         = "Inizio dopo la fine !";
 $lang['Err0003']         = "Descrizione mancante per l'appuntamento !";
-$lang['Err0004']         = "Prodotto Sconosciuto <I>%s</I> !";
-$lang['Err0005']         = "La descrizione del prodotto <I>%s</I> e' valida per i prodotti <B>%d</B> !";
+$lang['Err0004']         = "Prodotto Sconosciuto <i>%s</i> !";
+$lang['Err0005']         = "La descrizione del prodotto <i>%s</i> e' valida per i prodotti <b>%d</b> !";
 $lang['Err0006']         = "Effettuare un selezione piu' dettagliata";
-$lang['Err0007']         = "Visitatore sconosciuto. <I>%s</I> non e' stato trovato nell'<A HREF=address_select.php>indirizzario</A>";
-$lang['Err0008']         = "Il visitatore <I>%s</I> non e' valido per %d";
-$lang['Err0009']         = "Riempire il campo <I>%s</I> ";
-$lang['Err0010']         = "Il nome del dipartimento <I>%s</I> e' valido per i dipartimenti <B>%d</B> !";
-$lang['Err0011']         = "Azienda <I>%s</I> e' valida per le aziende <B>%d</B> !";
-$lang['Err0012']         = "Azienda sconosciuta <I>%s</I> !";
-$lang['Err0013']         = "Dipartimento non conosciuto <I>%s</I> !";
-$lang['Err0014']         = "Selezionare il campo <I>%s</I> ";
+$lang['Err0007']         = "Visitatore sconosciuto. <i>%s</i> non e' stato trovato nell'<a href=\"address_select.php\">indirizzario</a>";
+$lang['Err0008']         = "Il visitatore <i>%s</i> non e' valido per %d";
+$lang['Err0009']         = "Riempire il campo <i>%s</i> ";
+$lang['Err0010']         = "Il nome del dipartimento <i>%s</i> e' valido per i dipartimenti <b>%d</b> !";
+$lang['Err0011']         = "Azienda <i>%s</i> e' valida per le aziende <b>%d</b> !";
+$lang['Err0012']         = "Azienda sconosciuta <i>%s</i> !";
+$lang['Err0013']         = "Dipartimento non conosciuto <i>%s</i> !";
+$lang['Err0014']         = "Selezionare il campo <i>%s</i> ";
 $lang['Err0015']         = "Modifiche non consentite !";
 $lang['Err0016']         = "Non sei autorzzato ad eliminare questa nota !";
-$lang['Err0017']         = "Inserire un numero nel campo <I>%s</I> !";
-$lang['Err0018']         = "<I>%s</I> non e' valido per %d";
-$lang['Err0019']         = "Azienda Persona <I>%s</I> !";
+$lang['Err0017']         = "Inserire un numero nel campo <i>%s</i> !";
+$lang['Err0018']         = "<i>%s</i> non e' valido per %d";
+$lang['Err0019']         = "Azienda Persona <i>%s</i> !";
 $lang['Err0020']         = "Non sei autorizzato ad eliminare il file !";
 $lang['Err0021']         = "Non puoi cambiare il 'virtual team 0'";
 $lang['Err0022']         = "Spiacente, a causa dei permessi, non sei autorizzato a visualizzare questo %s";
@@ -767,7 +767,7 @@
 $lang['Err0030']         = "Il Fax non &egrave stato accodato per l'invio!";
 $lang['Err0031']         = "Numero del Fax mancante!";
 $lang['Err0032']         = "L'invio dei Fax &egrave stato disabilitato!";
-$lang['Err0033']         = "Linvio dell'e-mail &egrave stato disabilitato! E-mail \"%s\" <U>non</U> inviata.";
+$lang['Err0033']         = "Linvio dell'e-mail &egrave stato disabilitato! E-mail \"%s\" <u>non</u> inviata.";
 $lang['Err0034']         = "E-mail non inviata! nessun mittente \"%s\" email.";
 $lang['Err0035']         = "E-mail non inviata! nessun destinatario.";
 $lang['Err0036']         = "Il Prodotto/Progetto (%s) &egrave gi&aacute esistente con il Nome e la Versione data!";
@@ -787,7 +787,7 @@
 $lang['Err0050']         = "Could not find CSV contents !";
 $lang['Err0051']         = "Could not find CSV Separator";
 $lang['Err0052']         = "You must provide a classification";
-$lang['Err0053']         = "Unknown Installation <I>%s</I> !";
+$lang['Err0053']         = "Unknown Installation <i>%s</i> !";
 
 ### Local Variables: ***
 ### End: ***

Index: nl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/nl.p3,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nl.p3	18 Dec 2002 14:27:53 -0000	1.19
+++ nl.p3	31 Dec 2002 14:33:47 -0000	1.20
@@ -47,7 +47,7 @@
 $lang['InviteEmail']     = "Nodig uit per e-mail";
 $lang['Invitation']      = "Invitation";
 $lang['IgnoreTime']      = "negeer bovenstaande tijden";
-$lang['IgnoreTime2']     = "(i.e.; de afspraak vindt plaats<BR>op een niet bepaalde tijd op deze datum)";
+$lang['IgnoreTime2']     = "(i.e.; de afspraak vindt plaats<br>op een niet bepaalde tijd op deze datum)";
 $lang['forphrase']       = "voor";
 $lang['nextweek']        = "volgende week";
 $lang['lastweek']        = "vorige week";
@@ -143,7 +143,7 @@
 $lang['ThousandPoint']   = ".";
 $lang['yes']             = "ja";
 $lang['no']              = "nee";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Velden gemarkeerd met <FONT COLOR=red>(*)</FONT> zijn verplicht.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\'>Velden gemarkeerd met <font color=\"red\">(*)</font> zijn verplicht.</font>";
 $lang['any']             = "elke";
 $lang['all']             = "Alle";
 $lang['extended']        = "uitgebreid";
@@ -747,22 +747,22 @@
 $lang['Err0001']         = "Geen deelnemers !";
 $lang['Err0002']         = "start ligt na einde !";
 $lang['Err0003']         = "De beschrijving ontbreekt bij de afspraak !";
-$lang['Err0004']         = "Onbekend product <I>%s</I> !";
-$lang['Err0005']         = "Product omschrijving <I>%s</I> is geldig voor <B>%d</B> producten !";
+$lang['Err0004']         = "Onbekend product <i>%s</i> !";
+$lang['Err0005']         = "Product omschrijving <i>%s</i> is geldig voor <b>%d</b> producten !";
 $lang['Err0006']         = "Maak aub een gedetailleerde selectie";
-$lang['Err0007']         = "Onbekende bezoeker. <I>%s</I> was niet gevonden in de <A HREF=address_select.php>addressboeken</A>";
-$lang['Err0008']         = "Bezoekersnaam <I>%s</I> is geldig voor %d Invoeren";
-$lang['Err0009']         = "Voer aub het <I>%s</I> veld in";
-$lang['Err0010']         = "Naam van de afdeling <I>%s</I> is is geldig voor <B>%d</B> afdelingen !";
-$lang['Err0011']         = "Bedrijfsnaam <I>%s</I> is geldig voor <B>%d</B> bedrijven !";
-$lang['Err0012']         = "Onbekend bedrijf <I>%s</I> !";
-$lang['Err0013']         = "Onbekende afdeling <I>%s</I> !";
-$lang['Err0014']         = "Selecteer aub in het <I>%s</I> veld";
+$lang['Err0007']         = "Onbekende bezoeker. <i>%s</i> was niet gevonden in de <a href=\"address_select.php\">addressboeken</a>";
+$lang['Err0008']         = "Bezoekersnaam <i>%s</i> is geldig voor %d Invoeren";
+$lang['Err0009']         = "Voer aub het <i>%s</i> veld in";
+$lang['Err0010']         = "Naam van de afdeling <i>%s</i> is is geldig voor <b>%d</b> afdelingen !";
+$lang['Err0011']         = "Bedrijfsnaam <i>%s</i> is geldig voor <b>%d</B> bedrijven !";
+$lang['Err0012']         = "Onbekend bedrijf <i>%s</i> !";
+$lang['Err0013']         = "Onbekende afdeling <i>%s</i> !";
+$lang['Err0014']         = "Selecteer aub in het <i>%s</i> veld";
 $lang['Err0015']         = "Wijzigingen niet toegestaan !";
 $lang['Err0016']         = "U heeft geen permissies om deze notitie te verwijderen !";
-$lang['Err0017']         = "Voer aug een nummer in in het <I>%s</I> veld !";
-$lang['Err0018']         = "Naam <I>%s</I> is geldig voor %d Invoer";
-$lang['Err0019']         = "Onbekend persoon <I>%s</I> !";
+$lang['Err0017']         = "Voer aug een nummer in in het <i>%s</i> veld !";
+$lang['Err0018']         = "Naam <i>%s</i> is geldig voor %d Invoer";
+$lang['Err0019']         = "Onbekend persoon <i>%s</i> !";
 $lang['Err0020']         = "U heeft geen permissies om dit bestand te wissen !";
 $lang['Err0021']         = "U kunt virtueel team 0 niet wijzigen";
 $lang['Err0022']         = "Sorry, door de permissies mag u dit niet zien %s";
@@ -776,7 +776,7 @@
 $lang['Err0030']         = "Fax is niet gespoold !";
 $lang['Err0031']         = "Ontbrekend Faxnummer !";
 $lang['Err0032']         = "Sturen van Faxen is afgesloten !";
-$lang['Err0033']         = "Mail sturen is afgesltoen ! Mail \"%s\" is <U>niet</U> verzonden.";
+$lang['Err0033']         = "Mail sturen is afgesltoen ! Mail \"%s\" is <u>niet</u> verzonden.";
 $lang['Err0034']         = "mail is niet verzonden ! ontbrekende verzender \"%s\" e-mail.";
 $lang['Err0035']         = "mail is niet verzonden ! geen ontvangers of is al verzonden.";
 $lang['Err0036']         = "Product/Project bestaat al (%s) met deze naam en versie !";
@@ -796,7 +796,7 @@
 $lang['Err0050']         = "Kon geen CSV inhoud vinden !";
 $lang['Err0051']         = "Kon geen CSV separator vinden !";
 $lang['Err0052']         = "U moet een classificatie selecteren!";
-$lang['Err0053']         = "Onbekende Installatie <I>%s</I> !";
+$lang['Err0053']         = "Onbekende Installatie <i>%s</i> !";
 
 ### Local Variables: ***
 ### End: ***

Index: pl.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pl.p3,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pl.p3	18 Dec 2002 14:27:53 -0000	1.17
+++ pl.p3	31 Dec 2002 14:33:47 -0000	1.18
@@ -140,7 +140,7 @@
 $lang['ThousandPoint']   = ",";
 $lang['yes']             = "tak";
 $lang['no']              = "nie";
-$lang['FldsRequired']    = "<FONT SIZE=-1>Pola zaznaczone <FONT COLOR=red>(*)</FONT> musz± zostaæ wype³nione.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">Pola zaznaczone <font color=\"red\">(*)</font> musz± zostaæ wype³nione.</font>";
 $lang['any']             = "ka¿dy";
 $lang['all']             = "wszystko";
 $lang['extended']        = "rozszerzone";
@@ -744,22 +744,22 @@
 $lang['Err0001']         = "Brak uczestników!";
 $lang['Err0002']         = "pocz±tek po koñcu!";
 $lang['Err0003']         = "Brak opisu spotkania!";
-$lang['Err0004']         = "Nieznany produkt <I>%s</I> !";
-$lang['Err0005']         = "Opis produktu <I>%s</I> jest u¿ywany w <B>%d</B> produktach!";
+$lang['Err0004']         = "Nieznany produkt <i>%s</i> !";
+$lang['Err0005']         = "Opis produktu <i>%s</i> jest u¿ywany w <b>%d</b> produktach!";
 $lang['Err0006']         = "Dokonaj szczegó³owego wyboru";
-$lang['Err0007']         = "Nieznany go¶æ. <I>%s</I> nie zosta³ znaleziony w <A HREF=address_select.php>ksi±¿ce adresowej</A>";
-$lang['Err0008']         = "Dane go¶cia <I>%s</I> obowi±zuj± dla %d wpisów";
-$lang['Err0009']         = "Wype³nij pole <I>%s</I>";
-$lang['Err0010']         = "Nazwa departamantu <I>%s</I> jest u¿ywana w <B>%d</B> departamentach!";
-$lang['Err0011']         = "Nazwa firmy <I>%s</I> jest u¿ywana w <B>%d</B> firmach!";
-$lang['Err0012']         = "Nieznana firma<I>%s</I>!";
-$lang['Err0013']         = "Nieznany departament<I>%s</I>!";
-$lang['Err0014']         = "Dokonaj wyboru pola <I>%s</I>";
+$lang['Err0007']         = "Nieznany go¶æ. <i>%s</i> nie zosta³ znaleziony w <a href=\"address_select.php\">ksi±¿ce adresowej</a>";
+$lang['Err0008']         = "Dane go¶cia <i>%s</i> obowi±zuj± dla %d wpisów";
+$lang['Err0009']         = "Wype³nij pole <i>%s</i>";
+$lang['Err0010']         = "Nazwa departamantu <i>%s</i> jest u¿ywana w <b>%d</b> departamentach!";
+$lang['Err0011']         = "Nazwa firmy <i>%s</i> jest u¿ywana w <b>%d</b> firmach!";
+$lang['Err0012']         = "Nieznana firma<i>%s</i>!";
+$lang['Err0013']         = "Nieznany departament<i>%s</i>!";
+$lang['Err0014']         = "Dokonaj wyboru pola <i>%s</i>";
 $lang['Err0015']         = "Modyfikacje nie s± dozwolone!";
 $lang['Err0016']         = "Nie masz uprawnieñ do zmiany tej notki!";
-$lang['Err0017']         = "Wprowad¼ numer w polu <I>%s</I>!";
-$lang['Err0018']         = "Nazwa <I>%s</I> jest wa¿na dla %d wpisów";
-$lang['Err0019']         = "Nieznana osoba <I>%s</I>!";
+$lang['Err0017']         = "Wprowad¼ numer w polu <i>%s</i>!";
+$lang['Err0018']         = "Nazwa <i>%s</i> jest wa¿na dla %d wpisów";
+$lang['Err0019']         = "Nieznana osoba <i>%s</i>!";
 $lang['Err0020']         = "Nie masz uprawnieñ do zmiany tego pliku!";
 $lang['Err0021']         = "Nie masz uprawnieñ do zmiany zespo³u 0";
 $lang['Err0022']         = "Z powodu niewystarczaj±cych uprawnieñ nie mo¿esz obejrzeæ  %s";
@@ -773,7 +773,7 @@
 $lang['Err0030']         = "Nie ma ¿adnego faksu w kolejce!";
 $lang['Err0031']         = "Brak numeru faxu!";
 $lang['Err0032']         = "Wysy³anie faxów wy³±czone!";
-$lang['Err0033']         = "wysy³anie poczty wy³±czone! Poczta \"%s\" <U>nie</U> zosta³a wys³ana.";
+$lang['Err0033']         = "wysy³anie poczty wy³±czone! Poczta \"%s\" <u>nie</u> zosta³a wys³ana.";
 $lang['Err0034']         = "poczta nie zosta³a wys³ana! nie wpisano nadawcy \"%s\" listu.";
 $lang['Err0035']         = "poczta nie zosta³a wys³ana! nie wpisano odbiorców albo ju¿ ten list nadano.";
 $lang['Err0036']         = "Produkt/projekt ju¿ istnieje (%s) z podan± nazw± i wersj±!";
@@ -793,7 +793,7 @@
 $lang['Err0050']         = "Nie potrafiê odnale¼æ zawarto¶ci CSV !";
 $lang['Err0051']         = "Nie potrafiê odnale¼æ separatora CSV";
 $lang['Err0052']         = "Musisz podaæ klasyfikacjê";
-$lang['Err0053']         = "Nieznana instalacja <I>%s</I> !";
+$lang['Err0053']         = "Nieznana instalacja <i>%s</i> !";
 
 ### Local Variables: ***
 ### End: ***

Index: pt-br.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/pt-br.p3,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pt-br.p3	18 Dec 2002 14:27:53 -0000	1.16
+++ pt-br.p3	31 Dec 2002 14:33:47 -0000	1.17
@@ -38,7 +38,7 @@
 $lang['InviteEmail']     = "Convidar por e-mail";
 $lang['Invitation']      = "Invitation";
 $lang['IgnoreTime']      = "Ignorar nesses horários";
-$lang['IgnoreTime2']     = "(Ex.: O compromisso toma lugar<BR>em nenhum horário nesses dias)";
+$lang['IgnoreTime2']     = "(Ex.: O compromisso toma lugar<br>em nenhum horário nesses dias)";
 $lang['forphrase']       = "para";
 $lang['nextweek']        = "próxima semana";
 $lang['lastweek']        = "última semana";

Index: ru.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/ru.p3,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ru.p3	18 Dec 2002 14:27:53 -0000	1.19
+++ ru.p3	31 Dec 2002 14:33:47 -0000	1.20
@@ -40,7 +40,7 @@
 $lang['InviteEmail']     = "ðÒÉÇÌÁÛÅÎÉÅ ÐÏ Email";
 $lang['Invitation']      = "ðÒÉÇÌÁÛÅÎÉÅ";
 $lang['IgnoreTime']      = "éÇÎÏÒÉÒÏ×ÁÔØ ×ÒÅÍÑ";
-$lang['IgnoreTime2']     = "(Ô.e. ×ÓÔÒÅÞÁ ÓÏÓÔÏÉÔÓÑ × ÎÅÏÐÒÅÄÅÌÅÎÎÏÅ ×ÒÅÍÑ<BR>ÜÔÏÇÏ ÄÎÑ(ÅÊ))";
+$lang['IgnoreTime2']     = "(Ô.e. ×ÓÔÒÅÞÁ ÓÏÓÔÏÉÔÓÑ × ÎÅÏÐÒÅÄÅÌÅÎÎÏÅ ×ÒÅÍÑ<br>ÜÔÏÇÏ ÄÎÑ(ÅÊ))";
 $lang['forphrase']       = "ÄÌÑ";
 $lang['nextweek']        = "ÓÌÅÄÕÀÝÁÑ ÎÅÄÅÌÑ";
 $lang['lastweek']        = "ÐÏÓÌÅÄÎÑ ÎÅÄÅÌÑ";
@@ -136,7 +136,7 @@
 $lang['ThousandPoint']   = ",";
 $lang['yes']             = "ÄÁ";
 $lang['no']              = "ÎÅÔ";
-$lang['FldsRequired']    = "<FONT SIZE=-1>ðÏÍÅÞÅÎÙÅ ÐÏÌÑ<FONT COLOR=red>(*)</FONT> ÄÏÌÖÎÙ ÂÙÔØ ÚÁÐÏÌÎÅÎÙ.</FONT>";
+$lang['FldsRequired']    = "<font size=\"-1\">ðÏÍÅÞÅÎÙÅ ÐÏÌÑ<font color=\"red\">(*)</font> ÄÏÌÖÎÙ ÂÙÔØ ÚÁÐÏÌÎÅÎÙ.</font>";
 $lang['any']             = "ÌÀÂÏÊ";
 $lang['all']             = "×ÓÅ";
 $lang['extended']        = "ÒÁÓÛÉÒÅÎÎÙÊ";
@@ -741,22 +741,22 @@
 $lang['Err0001']         = "îÅÔ ÕÞÁÓÔÎÉËÏ× !";
 $lang['Err0002']         = "ÎÁÞÁÌÏ ÐÏÓÌÅ ËÏÎÃÁ !";
 $lang['Err0003']         = "ïÔÓÕÔÓÔ×ÕÅÔ ÏÐÉÓÁÎÉÅ ÓÏÂÙÔÉÑ !";
-$lang['Err0004']         = "îÅÉÚ×ÅÓÔÎÙÊ ÐÒÏÄÕËÔ <I>%s</I> !";
-$lang['Err0005']         = "ïÐÉÓÁÎÅÉ ÐÒÏÄÕËÔÁ <I>%s</I> ÐÏÄÈÏÄÉÔØ ÄÌÑ <B>%d</B> ÐÒÏÄÕËÔÏ× !";
+$lang['Err0004']         = "îÅÉÚ×ÅÓÔÎÙÊ ÐÒÏÄÕËÔ <i>%s</i> !";
+$lang['Err0005']         = "ïÐÉÓÁÎÅÉ ÐÒÏÄÕËÔÁ <i>%s</i> ÐÏÄÈÏÄÉÔØ ÄÌÑ <b>%d</b> ÐÒÏÄÕËÔÏ× !";
 $lang['Err0006']         = "ðÏÖÁÌÕÊÓÔÁ ÓÄÅÌÁÊÔÅ ÐÏÄÒÏÂÎÙÊ ×ÙÂÏÒ";
-$lang['Err0007']         = "îÅÉÚ×ÅÓÔÎÙÊ ÐÏÓÅÔÉÔÅÌØ. <I>%s</I> ÎÅ ÎÁÊÄÅÎ × <A HREF=address_select.php3>ÁÄÒÅÓÎÏÊ ËÎÉÇÅ</A>";
-$lang['Err0008']         = "éÍÑ ÐÏÓÅÔÉÔÅÌÑ <I>%s</I> ÓÏ×ÐÁÄÁÅÔ Ó %d ÚÁÐÉÓÑÍÉ";
-$lang['Err0009']         = "ðÏÖÁÌÕÊÓÔÁ ÚÁÐÏÌÎÉÔÅ <I>%s</I> ÐÏÌÑ";
-$lang['Err0010']         = "éÍÑ ÏÔÄÅÌÁ <I>%s</I> ÓÏ×ÐÁÄÁÅÔ Ó <B>%d</B> ÏÔÄÅÌÁÍÉ !";
-$lang['Err0011']         = "éÍÑ ËÏÍÐÁÎÉÉ <I>%s</I> ÓÏ×ÐÁÄÁÅÔ Ó <B>%d</B> ËÏÍÐÁÎÉÑÍÉ !";
-$lang['Err0012']         = "îÅÉÚ×ÅÔÎÁÑ ËÏÍÐÁÎÉÑ <I>%s</I> !";
-$lang['Err0013']         = "îÅÉÚ×ÅÓÔÎÙÊ ÏÔÄÅÌ <I>%s</I> !";
-$lang['Err0014']         = "ðÏÖÁÌÕÊÓÔÁ ×ÙÂÅÒÉÔÅ <I>%s</I> ÐÏÌÑ";
+$lang['Err0007']         = "îÅÉÚ×ÅÓÔÎÙÊ ÐÏÓÅÔÉÔÅÌØ. <i>%s</i> ÎÅ ÎÁÊÄÅÎ × <a href=\"address_select.php3\">ÁÄÒÅÓÎÏÊ ËÎÉÇÅ</a>";
+$lang['Err0008']         = "éÍÑ ÐÏÓÅÔÉÔÅÌÑ <i>%s</i> ÓÏ×ÐÁÄÁÅÔ Ó %d ÚÁÐÉÓÑÍÉ";
+$lang['Err0009']         = "ðÏÖÁÌÕÊÓÔÁ ÚÁÐÏÌÎÉÔÅ <i>%s</i> ÐÏÌÑ";
+$lang['Err0010']         = "éÍÑ ÏÔÄÅÌÁ <i>%s</i> ÓÏ×ÐÁÄÁÅÔ Ó <b>%d</b> ÏÔÄÅÌÁÍÉ !";
+$lang['Err0011']         = "éÍÑ ËÏÍÐÁÎÉÉ <i>%s</i> ÓÏ×ÐÁÄÁÅÔ Ó <b>%d</b> ËÏÍÐÁÎÉÑÍÉ !";
+$lang['Err0012']         = "îÅÉÚ×ÅÔÎÁÑ ËÏÍÐÁÎÉÑ <i>%s</i> !";
+$lang['Err0013']         = "îÅÉÚ×ÅÓÔÎÙÊ ÏÔÄÅÌ <i>%s</i> !";
+$lang['Err0014']         = "ðÏÖÁÌÕÊÓÔÁ ×ÙÂÅÒÉÔÅ <i>%s</i> ÐÏÌÑ";
 $lang['Err0015']         = "éÚÍÅÎÅÎÉÑ ÎÅ ÄÏÐÕÓÔÉÍÙ !";
 $lang['Err0016']         = "÷ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÜÔÕ ÚÁÍÅÔËÕ !";
-$lang['Err0017']         = "ðÏÖÁÌÕÊÓÔÁ ××ÅÄÉÔÅ ÞÉÓÌÏ × ÐÏÌÅ <I>%s</I> !";
-$lang['Err0018']         = "éÍÑ <I>%s</I> ÓÏ×ÐÁÄÁÅÔ Ó %d ÚÁÐÉÓÑÍÉ";
-$lang['Err0019']         = "îÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÓÏÎÁ <I>%s</I> !";
+$lang['Err0017']         = "ðÏÖÁÌÕÊÓÔÁ ××ÅÄÉÔÅ ÞÉÓÌÏ × ÐÏÌÅ <i>%s</i> !";
+$lang['Err0018']         = "éÍÑ <i>%s</i> ÓÏ×ÐÁÄÁÅÔ Ó %d ÚÁÐÉÓÑÍÉ";
+$lang['Err0019']         = "îÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÓÏÎÁ <i>%s</i> !";
 $lang['Err0020']         = "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÜÔÏÔ ÆÁÊÌ !";
 $lang['Err0021']         = "÷Ù ÎÅ ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ×ÉÒÔÕÁÌØÎÕÀ ÇÒÕÐÐÕ 0";
 $lang['Err0022']         = "éÚ×ÉÎÉÔÅ, Õ ÷ÁÓ ÎÅ ÐÒÁ× ÄÌÑ ÐÒÏÓÍÏÔÒÁ %s";
@@ -770,7 +770,7 @@
 $lang['Err0030']         = "æÁËÓ ÎÅ ÏÔÐÒÁ×ÌÅÎ !";
 $lang['Err0031']         = "ïÔÓÕÔÓÔ×ÕÅÔ ÎÏÍÅÒ ÆÁËÓÁ !";
 $lang['Err0032']         = "ðÏÓÙÌËÁ ÆÁËÓÁ ÏÔËÌÀÞÅÎÁ !";
-$lang['Err0033']         = "ÏÔÐÒÁ×ËÁ ÐÏÞÔÙ ÏÔËÌÀÞÅÎÁ! ðÏÞÔÁ  \"%s\" <U>ÎÅ ÂÙÌÁ</U> ÏÔÐÒÁ×ÌÅÎÁ.";
+$lang['Err0033']         = "ÏÔÐÒÁ×ËÁ ÐÏÞÔÙ ÏÔËÌÀÞÅÎÁ! ðÏÞÔÁ  \"%s\" <u>ÎÅ ÂÙÌÁ</u> ÏÔÐÒÁ×ÌÅÎÁ.";
 $lang['Err0034']         = "ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ ! ÏÔÓÕÔÓÔ×ÕÅÔ ÁÄÒÅÓ ÏÔÐÒÁ×ÉÔÅÌÑ \"%s\" .";
 $lang['Err0035']         = "ÐÏÞÔÁ ÎÅ ÏÔÐÒÁ×ÌÅÎÁ ! ÎÅÔ ÐÏÌÕÞÁÔÅÌÅÊ ÉÌÉ ÕÖÅ ÕÛÌÏ.";
 $lang['Err0036']         = "ðÒÏÄÕËÔ/ðÒÏÅËÔ (%s) ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!";
@@ -790,7 +790,7 @@
 $lang['Err0050']         = "îÅ×ÅÒÎÏÅ ÓÏÄÅÒÖÉÍÏÅ CSV-ÆÁÊÌÁ !";
 $lang['Err0051']         = "îÅ ÎÁÊÄÅÎ ÓÅÐÁÒÁÔÏÒ CSV";
 $lang['Err0052']         = "÷Ù ÄÏÌÖÎÙ ÐÒÅÄÏÓÔÁ×ÉÔØ ËÌÁÓÓÉÆÉËÁÃÉÀ";
-$lang['Err0053']         = "Unknown Installation <I>%s</I> !";
+$lang['Err0053']         = "Unknown Installation <i>%s</i> !";
 
 ### Local Variables: ***
 ### End: ***

Index: sv.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/sv.p3,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sv.p3	18 Dec 2002 14:27:53 -0000	1.17
+++ sv.p3	31 Dec 2002 14:33:48 -0000	1.18
@@ -41,7 +41,7 @@
 $lang['InviteEmail']     = "Inbjudan via E-post";
 $lang['Invitation']      = "Inbjudan";
 $lang['IgnoreTime']      = "ignorera ovan tider";
-$lang['IgnoreTime2']     = "(i.e. dessa dag(ar) inträffar inte<BR>mötet på någon speciell tid )";
+$lang['IgnoreTime2']     = "(i.e. dessa dag(ar) inträffar inte<br>mötet på någon speciell tid )";
 $lang['forphrase']       = "för";
 $lang['nextweek']        = "nästa vecka";
 $lang['lastweek']        = "föregående vecka";

Update of /cvsroot/tutos/tutos/php/merge
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/merge

Modified Files:
	merge.pinc merge_ins.php merge_new.php 
Log Message:
cleanups for HTML

Index: merge.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/merge/merge.pinc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merge.pinc	5 Nov 2002 19:57:48 -0000	1.6
+++ merge.pinc	31 Dec 2002 14:33:49 -0000	1.7
@@ -104,7 +104,7 @@
    * create a link where a given object could be merged with an template
    */
   function getaddlink (&$user,&$obj,$text = "") {
-     global $lang,$HTTP_SERVER_VARS;
+     global $lang;
 
      if ( $obj == -1 ) return; 
      if (! is_object($obj) ) return;
@@ -135,7 +135,7 @@
     if ( ereg("^acl",basename($PHP_SELF) )) {
       return;
     }
-    return menulink("merge/merge_new.php" ,($text == "" ?  $lang['DocCreate']: $text),$lang['DocCreateInfo'])."<BR>";
+    return menulink("merge/merge_new.php" ,($text == "" ?  $lang['DocCreate']: $text),$lang['DocCreateInfo'])."<br>";
   }
 
 }

Index: merge_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/merge/merge_ins.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- merge_ins.php	5 Nov 2002 19:46:40 -0000	1.4
+++ merge_ins.php	31 Dec 2002 14:33:49 -0000	1.5
@@ -26,30 +26,30 @@
  
  $u = new merge($dbconn);
 
- if ( empty($HTTP_POST_VARS['gotourl']) ) {
+ if ( empty($_POST['gotourl']) ) {
    $gotourl = "merge/merge_new.php";
  } else {
-   $gotourl = $HTTP_POST_VARS['gotourl'];
+   $gotourl = $_POST['gotourl'];
  }
- if ( isset($HTTP_POST_VARS['id']) ) {
-   $gotourl= addUrlParameter($gotourl,"id=". $HTTP_POST_VARS['id']);
+ if ( isset($_POST['id']) ) {
+   $gotourl= addUrlParameter($gotourl,"id=". $_POST['id']);
    $u->read($HTPP_POST_VARS['id']);
  } else {
    $u->creator = $current_user;
  }
 
- if ( empty($HTTP_POST_VARS['template']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['Template']) ."<BR>";
+ if ( empty($_POST['template']) ) {
+   $msg .= sprintf($lang['Err0009'],$lang['Template']) ."<br>";
  } else {
-   $gotourl= addUrlParameter($gotourl,"template=". UrlEncode(StripSlashes($HTTP_POST_VARS['template'])));
-   $u->template =$HTTP_POST_VARS['template'];
+   $gotourl= addUrlParameter($gotourl,"template=". UrlEncode(StripSlashes($_POST['template'])));
+   $u->template =$_POST['template'];
  }
 
- if ( empty($HTTP_POST_VARS['link_id']) ) {
-   $msg .= "No Link ID given !<BR>";
+ if ( empty($_POST['link_id']) ) {
+   $msg .= "No Link ID given !<br>";
  } else {
-   $gotourl= addUrlParameter($gotourl,"link_id=". $HTTP_POST_VARS['link_id']);
-   $u->link_id = $HTTP_POST_VARS['link_id'];
+   $gotourl= addUrlParameter($gotourl,"link_id=". $_POST['link_id']);
+   $u->link_id = $_POST['link_id'];
    $u->read_reference();
  }
 

Index: merge_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/merge/merge_new.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merge_new.php	5 Nov 2002 19:46:41 -0000	1.5
+++ merge_new.php	31 Dec 2002 14:33:49 -0000	1.6
@@ -141,10 +141,6 @@
     *
     */
    Function navigate() {
-     global $lang,$tutos;
-
-     echo "<TR><TD>";
-     echo "</TD></TR>";
    }
    /**
     * prepare
@@ -155,29 +151,29 @@
      $this->name = $lang['MergeDocuments'];
      $this->obj = new merge($this->dbconn);
 
-     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 ( isset($HTTP_GET_VARS['template']) ){
-       $this->obj->template = $HTTP_GET_VARS['template'];
+     if ( isset($_GET['template']) ){
+       $this->obj->template = $_GET['template'];
      }
-     if ( isset($HTTP_GET_VARS['merge_with']) ){
-       $this->obj->merge_with = $HTTP_GET_VARS['merge_with'];
+     if ( isset($_GET['merge_with']) ){
+       $this->obj->merge_with = $_GET['merge_with'];
      }
-     if ( isset($HTTP_GET_VARS['returnreceipt']) ){
-       $this->obj->returnreceipt = $HTTP_GET_VARS['returnreceipt'];
+     if ( isset($_GET['returnreceipt']) ){
+       $this->obj->returnreceipt = $_GET['returnreceipt'];
      }
-     if ( isset($HTTP_GET_VARS['attachcontacts']) ){
-       $this->obj->attachcontacts = $HTTP_GET_VARS['attachcontacts'];
+     if ( isset($_GET['attachcontacts']) ){
+       $this->obj->attachcontacts = $_GET['attachcontacts'];
      }
-     if ( isset($HTTP_GET_VARS['archive']) ){
-       $this->obj->archive = $HTTP_GET_VARS['archive'];
+     if ( isset($_GET['archive']) ){
+       $this->obj->archive = $_GET['archive'];
      }
-     if ( isset($HTTP_GET_VARS['regarding']) ){
-       $this->obj->regarding = $HTTP_GET_VARS['regarding'];
+     if ( isset($_GET['regarding']) ){
+       $this->obj->regarding = $_GET['regarding'];
      }
-     if ( isset($HTTP_GET_VARS['send_to']) ) {
-       $this->obj->send_to= $HTTP_GET_VARS['send_to'];
+     if ( isset($_GET['send_to']) ) {
+       $this->obj->send_to= $_GET['send_to'];
      } else {
        $this->obj->send_to='wordprocessor';
      }

Update of /cvsroot/tutos/tutos/php/mailbox
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/mailbox

Modified Files:
	mail_show.php mailbox.pinc mailbox_del.php mailbox_new.php 
	mailbox_show.php 
Log Message:
cleanups for HTML

Index: mail_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mail_show.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mail_show.php	23 Dec 2002 10:01:39 -0000	1.3
+++ mail_show.php	31 Dec 2002 14:33:49 -0000	1.4
@@ -84,7 +84,6 @@
    Function show_part(&$arr,$pnr = -1) {
      global $lang, $enc, $type, $header, $tutos;
 
-#     echo "AT:". $arr->type ." AE:". $arr->encoding ." PNR:". $pnr ."<BR>";
      if ( !isset($arr->type) ) {
        $arr->type = "";
      }

Index: mailbox.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mailbox.pinc	23 Dec 2002 10:01:39 -0000	1.2
+++ mailbox.pinc	31 Dec 2002 14:33:49 -0000	1.3
@@ -182,12 +182,12 @@
     $r = @imap_createmailbox($this->mbox,imap_utf7_encode($c ."/". $name));
     $this->errors("imap_createmailbox");
     if ( $r == false ) {
-      echo "CREATING ". $c ."/". $name ." failed<BR>";
+      echo "CREATING ". $c ."/". $name ." failed<br>";
     }
     $r = @imap_subscribe($this->mbox,imap_utf7_encode($c ."/". $name));
     $this->errors("imap_subscribe");
     if ( $r == false ) {
-      echo "SUBSCRIBE ". $c ."/". $name ." failed<BR>";
+      echo "SUBSCRIBE ". $c ."/". $name ." failed<br>";
     }
     return;
   }
@@ -199,7 +199,7 @@
     $r = @imap_deletemailbox($this->mbox,imap_utf7_encode($c . $name));
     $this->errors("imap_deletemailbox");
     if ( $r == false ) {
-      echo "DELETE ". $c ."/". $name ." failed<BR>";
+      echo "DELETE ". $c ."/". $name ." failed<br>";
     }
     return;
   }
@@ -224,9 +224,9 @@
     } else {
       reset($f);
       while (list ($key, $val) = @each($f)) {
-#     echo imap_utf7_decode($val->name)."  '".$val->delimiter."'  ".$val->attributes ."<BR>\n";
+#     echo imap_utf7_decode($val->name)."  '".$val->delimiter."'  ".$val->attributes ."<br>\n";
         $n = substr($val->name,strlen($c),strlen($val->name));
-#	echo $key ."|". var_dump($val) ."|".imap_utf7_decode($n) ."<BR>\n";
+#	echo $key ."|". var_dump($val) ."|".imap_utf7_decode($n) ."<br>\n";
 #        $nx = eregi_replace("&ANY-","Ö",$n);
 #        $nx = eregi_replace("&APY-","ö",$nx);
 #        $nx = eregi_replace("&AOQ-","ä",$nx);
@@ -262,7 +262,7 @@
   function ask_password () {
     global $lang, $tutos;
 
-    echo "<form action=\"mailbox_overview.php?id=". $this->id ."\" method=\"POST\">";
+    echo "<form action=\"mailbox_overview.php?id=". $this->id ."\" method=\"post\">";
     hiddenFormElements();
     DoubleTableStart();
     echo "<tr>\n";
@@ -284,7 +284,7 @@
     $c = $this->getConnString();
 #    $this->mbox = @imap_open($c, $this->user, $this->pw,OP_READONLY);
     $this->mbox = @imap_open($c, $this->user, $this->pw);
-#	echo $c ." U:". $this->user ." P:". $this->pw ."<BR>";
+#	echo $c ." U:". $this->user ." P:". $this->pw ."<br>";
     return $this->errors("open");
   }
   /**

Index: mailbox_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox_del.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailbox_del.php	7 Dec 2002 16:51:53 -0000	1.1
+++ mailbox_del.php	31 Dec 2002 14:33:49 -0000	1.2
@@ -23,17 +23,17 @@
  $m = new mailbox($dbconn);
 
  if ( ! isset($_GET['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$m->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0040'],$lang[$m->getType()]) ."<br>";
  } else {
    $m->read($_GET['id']);
  }
  if ( $m->id < 0 ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$m->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0040'],$lang[$m->getType()]) ."<br>";
  } else {
    $gotourl= $m->getURL();
  }
  if ( ! $m->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$m->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$m->getType()]) ."<br>";
  }
 
  if ( $msg == "" ) {

Index: mailbox_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox_new.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mailbox_new.php	23 Dec 2002 10:01:39 -0000	1.2
+++ mailbox_new.php	31 Dec 2002 14:33:49 -0000	1.3
@@ -27,7 +27,7 @@
    Function info() {
      global $tutos,$lang;
 
-     echo "<form action=\"mailbox_ins.php\" method=\"POST\">\n";
+     echo "<form action=\"mailbox_ins.php\" method=\"post\">\n";
      echo $this->DataTableStart();
      $this->addHidden("parent",$this->obj->parent->id);
      echo "<tr><th colspan=\"6\">";
@@ -103,32 +103,27 @@
      echo $this->DataTableEnd();
      hiddenFormElements();
      echo $this->getHidden();
-     echo "</FORM>\n";
+     echo "</form>\n";
      echo $lang['FldsRequired'] ."\n";
    }
    /**
     * naviagte
     */
    Function navigate() {
-     global $lang;
-
-     echo "<tr><td>";
-     echo "&nbsp;\n";
-     echo "</td></tr>";
    }
    /**
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS;
+     global $msg,$lang;
 
      $this->obj = new mailbox($this->dbconn);
-     if ( isset($HTTP_GET_VARS['id']) ) {
-       $this->obj->read($HTTP_GET_VARS['id']);
-     } else if ( isset($HTTP_GET_VARS['parent']) ) {
-       $this->obj->parent = GetObject($this->dbconn,$HTTP_GET_VARS['parent']);
+     if ( isset($_GET['id']) ) {
+       $this->obj->read($_GET['id']);
+     } else if ( isset($_GET['parent']) ) {
+       $this->obj->parent = GetObject($this->dbconn,$_GET['parent']);
      } else {
-       $msg .= " Missing parameter<BR>";
+       $msg .= " Missing parameter<br>";
        $this->stop = true;
      }
 

Index: mailbox_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mailbox_show.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mailbox_show.php	23 Dec 2002 10:01:39 -0000	1.2
+++ mailbox_show.php	31 Dec 2002 14:33:49 -0000	1.3
@@ -70,7 +70,7 @@
      if ( $this->search ) {
        echo "<b>". sprintf($lang['MailCountInfoS'],$cnt,$this->search) ."</b><br>";
      } else {
-       echo "<b>". sprintf($lang['MailCountInfo'],$cnt) ."</B><BR>";
+       echo "<b>". sprintf($lang['MailCountInfo'],$cnt) ."</b><br>";
      }
 
      echo $this->actionformStart("mailbox_show.php");
@@ -214,7 +214,7 @@
      @ksort($this->obj->allfolders);
      while (list ($key, $val) = @each($this->obj->allfolders)) {
        if ( $val != $this->obj->addpath ) {
-         echo "<Option value=\"". base64_encode("-". $key) ."\">". sprintf($lang['MailActionMove'],$val) ."</option>\n";
+         echo "<option value=\"". base64_encode("-". $key) ."\">". sprintf($lang['MailActionMove'],$val) ."</option>\n";
 	   }
      }
      echo "<option value=\"". base64_encode("TRASH") ."\" selected>". $lang['MailActionDel']."</option>\n";

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php

Modified Files:
	Date.pinc acl.pinc acl_ins.php acl_overview.php address.pinc 
	address_del.php address_ins.php address_new.php 
	address_show.php address_tools.p3 admin_sync.php app_del.php 
	app_do_vote.php app_ins.php app_new.php app_overview.php 
	app_show.php app_vote.php appointment.pinc bug.pinc 
	bug_del.php calendar_day.php calendar_week.php company_del.php 
	company_ins.php company_overview.php database.pinc 
	database_del.php database_ins.php database_new.php 
	database_show.php department_del.php department_ins.php 
	department_new.php gantt_png.php graph_bars.php 
	location_del.php location_ins.php login.pinc logout.php 
	mail.pinc minical.php product.pinc product_del.php 
	product_ins.php product_overview.php res_cal.php 
	sales_forecast.php scheme.php showobject.php task.pinc 
	task_del.php task_gantt.php task_import_csv.php task_ins.php 
	task_new.php task_overview.php team.pinc team_ins.php 
	team_new.php team_overview.php team_show.php timetrack_del.php 
	timetrack_finish.php timetrack_ins.php timetrack_overview.php 
	timetrack_select.php user.pinc user_del.php user_ins.php 
	user_new.php user_overview.php webelements.p3 
	webelements_special.p3 
Log Message:
cleanups for HTML

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Date.pinc	23 Dec 2002 10:01:32 -0000	1.70
+++ Date.pinc	31 Dec 2002 14:33:34 -0000	1.71
@@ -320,9 +320,9 @@
      return array(color => "appday");
    } else {
      if ( $mark > 0 ) {
-       return array(color => "holiday", Desc => "<FONT SIZE=-3>".substr($desc,0,-1*strlen($br))."</FONT>");
+       return array(color => "holiday", Desc => "<font size=\"-3\">".substr($desc,0,-1*strlen($br))."</font>");
      } else {
-       return array(color => "appday", Desc => "<FONT SIZE=-3>".substr($desc,0,-1*strlen($br))."</FONT>");
+       return array(color => "appday", Desc => "<font size=\"-3\">".substr($desc,0,-1*strlen($br))."</font>");
      }
    }
  }

Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- acl.pinc	23 Dec 2002 10:01:33 -0000	1.45
+++ acl.pinc	31 Dec 2002 14:33:34 -0000	1.46
@@ -104,7 +104,6 @@
   } else {
     $id = $obj->id;
   }
-  //echo "". $obj->gettype() ." ". $id ."<BR>";
 
   $q = "DELETE FROM ". $obj->dbconn->prefix ."acl WHERE obj_id = ". $id;
   $r = $obj->dbconn->Exec($q);
@@ -112,8 +111,6 @@
   if ( isset($obj->acl) && (count($obj->acl) > 0) ) {
     @reset($obj->acl);
     while ( list ($i,$f) = @each ($obj->acl) ) {
-      //$i = "";
-      //echo "". $i ." ". gettype($i) ."<BR>";
       if ( ($i > -1) && (gettype($i) == "integer") && ($f > 0) ) {
         $q = "INSERT INTO ". $obj->dbconn->prefix ."acl (obj_id,adr_id,perm) VALUES (". $id .",". $i .",". $f .")";
         $r = $obj->dbconn->Exec($q);

Index: acl_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_ins.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- acl_ins.php	16 Dec 2002 20:40:26 -0000	1.20
+++ acl_ins.php	31 Dec 2002 14:33:34 -0000	1.21
@@ -21,12 +21,12 @@
  $msg = "";
 
  if ( !isset($_POST['id']) ) {
-   $msg .= "Missing ID<BR>";
+   $msg .= "Missing ID<br>";
    $gotourl = "mytutos.php";
  } else {
    $obj = getObject($dbconn,$_POST['id']);
    if (!$current_user->isadmin() && ($obj->del_ok() == 0) ) {
-     $msg .= "Not allowed !<BR>";
+     $msg .= "Not allowed !<br>";
      $gotourl = $obj->getURL();
    }
  }

Index: acl_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_overview.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- acl_overview.php	23 Dec 2002 10:01:33 -0000	1.37
+++ acl_overview.php	31 Dec 2002 14:33:34 -0000	1.38
@@ -186,7 +186,7 @@
        echo $this->UpdateRowEnd(2);
      }
 
-     echo "</TFOOT>\n";
+     echo "</tfoot>\n";
      echo $this->OverviewTableEnd();
      echo $this->actionformEnd("acl_overview.php");
      $result->free();
@@ -236,7 +236,7 @@
            continue;
          }
          if ( method_exists($b,"del_ok") && method_exists($b,"delete") &&  $b->del_ok() ) {
-           $msg .= $lang['Delete'] .":&nbsp;". $lang[$b->getType()] ." ". $b->getFullName() ."<BR>";
+           $msg .= $lang['Delete'] .":&nbsp;". $lang[$b->getType()] ." ". $b->getFullName() ."<br>";
            $msg .= $b->delete();
          } else {
            $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]);

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- address.pinc	16 Dec 2002 20:33:42 -0000	1.84
+++ address.pinc	31 Dec 2002 14:33:34 -0000	1.85
@@ -157,11 +157,11 @@
       while( list ($i,$f) = @each ($this->location)) {
         if ( $f->phone_1 != "" ) {
           $info .= $pre . $f->phone_1;
-          $pre = "<BR>";
+          $pre = "<br>";
         }
         if ( $f->phone_2 != "" ) {
           $info .= $pre . $f->phone_2;
-          $pre = "<BR>";
+          $pre = "<br>";
         }
       }
     }
@@ -175,11 +175,7 @@
    * set the title
    */
   function setTitle($new) {
-    if ( $this->title != $new ) {
-      $this->modified[] = array ( "field" => "AdrTitle" , "old" => $this->title , "new" => $new  );
-      $this->title = $new;
-    }
-    return;
+    $this->setStrField("title",$new,"AdrTitle");
   }
   /**
    * set the first name

Index: address_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_del.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- address_del.php	16 Dec 2002 20:33:46 -0000	1.21
+++ address_del.php	31 Dec 2002 14:33:34 -0000	1.22
@@ -20,11 +20,11 @@
  $msg = "";
 
  $a = new tutos_address($dbconn);
- if ( isset($HTTP_GET_VARS['id']) ) {
-   $a->read($HTTP_GET_VARS['id']);
+ if ( isset($_GET['id']) ) {
+   $a->read($_GET['id']);
    $gotourl = $a->getUrl();
- } elseif ( isset($HTTP_GET_VARS['id']) ) {
-   $a->read($HTTP_GET_VARS['id']);
+ } elseif ( isset($_GET['id']) ) {
+   $a->read($_GET['id']);
    $gotourl = $a->getUrl();
  } else {
    $gotourl = "address_select.php";

Index: address_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_ins.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- address_ins.php	16 Dec 2002 20:33:48 -0000	1.33
+++ address_ins.php	31 Dec 2002 14:33:35 -0000	1.34
@@ -25,7 +25,7 @@
    $a->read_picture();
    if ( ! $a->mod_ok() ) {
      # Not allowed
-     $msg .= sprintf($lang['Err0015']) ."<BR>";
+     $msg .= sprintf($lang['Err0015']) ."<br>";
    }
    $new = 0;
  } else {
@@ -39,19 +39,19 @@
 
 
  if ( 1 != $birthday->checkDMY() ) {
-   $msg .= sprintf($lang['Err0038'],$lang['AdrBirthday']) ."<BR>";
+   $msg .= sprintf($lang['Err0038'],$lang['AdrBirthday']) ."<br>";
  } else {
    $gotourl= addUrlParameter($gotourl,"bd=". $birthday->getYYYYMMDD());
  }
  if ( empty($_POST['f_name']) || ($_POST['f_name'] == "Unknown" ) || !isset($_POST['f_name']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['AdrFirstName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['AdrFirstName']) ."<br>";
  } else {
    $f_name = trim(StripSlashes($_POST['f_name']));
    $gotourl= addUrlParameter($gotourl,"f_name=". UrlEncode(StripSlashes($f_name)));
  }
 
  if ( empty($_POST['l_name']) || !isset($_POST['l_name']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['AdrLastName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['AdrLastName']) ."<br>";
  } else {
    $l_name = trim(StripSlashes($_POST['l_name']));
    $gotourl= addUrlParameter($gotourl,"l_name=". UrlEncode(StripSlashes($l_name)));
@@ -73,8 +73,8 @@
    $file = $HTTP_POST_FILES['file'];
    $gotourl= addUrlParameter($gotourl,"pic_path=". $file);
  }
-#echo var_dump($_POST) ."<BR>";
-#echo var_dump($HTTP_POST_FILES) ."<BR>";
+#echo var_dump($_POST) ."<br>";
+#echo var_dump($HTTP_POST_FILES) ."<br>";
 
  # If no other problems than check if name is already used
  if ( $msg == "" ) {
@@ -93,7 +93,7 @@
      if ( 0 != $n) {
        $x = new tutos_address($dbconn);
        $x->read_result($r,0);
-       $msg .= sprintf($lang['Err0039'],$x->getLink()) ."<BR>";
+       $msg .= sprintf($lang['Err0039'],$x->getLink()) ."<br>";
      }
      $r->free();
    }

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- address_new.php	23 Dec 2002 10:01:33 -0000	1.48
+++ address_new.php	31 Dec 2002 14:33:35 -0000	1.49
@@ -240,7 +240,7 @@
          echo " <input size=\"30\" name=\"file\" type=\"file\" value=\"". myentities($varvalue->pic_path) ."\">\n";
          $this->addHidden("pic_id",$varvalue->id);
          if ( $varvalue->id > 0 ) {
-           echo "<BR>". $varvalue->getLink($lang['AdrPicture']);
+           echo "<br>". $varvalue->getLink($lang['AdrPicture']);
          }
        }
      } elseif ( $varname == "category" ) {
@@ -318,7 +318,7 @@
            }
            DoubleTableEnd();
          }
-         echo menulink("address_new.php?id=". $this->obj->id ."&loc_id=-1",$lang['AdrLNew'],sprintf($lang['AdrLNewInfo'],$this->obj->getFullName())) ."<BR>";
+         echo menulink("address_new.php?id=". $this->obj->id ."&loc_id=-1",$lang['AdrLNew'],sprintf($lang['AdrLNewInfo'],$this->obj->getFullName())) ."<br>";
        }
 
        echo "<p>\n";

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- address_show.php	23 Dec 2002 10:01:33 -0000	1.65
+++ address_show.php	31 Dec 2002 14:33:35 -0000	1.66
@@ -146,16 +146,16 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$g_hash,$HTTP_GET_VARS;
+     global $msg,$langd,$g_hash;
 
      $this->name = $lang['AddressDetail'];
      $this->lif = -1;
      $this->obj = new tutos_address($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 ( isset($HTTP_GET_VARS['lid']) ) {
-       $this->lid = $HTTP_GET_VARS['lid'];
+     if ( isset($_GET['lid']) ) {
+       $this->lid = $_GET['lid'];
        $q = "SELECT adr_id FROM ". $this->dbconn->prefix ."adrloc WHERE loc_id = ". $this->lid;
        $r = $this->dbconn->Exec($q);
        if ($r->numrows() == 1) {

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- address_tools.p3	18 Dec 2002 22:04:58 -0000	1.55
+++ address_tools.p3	31 Dec 2002 14:33:35 -0000	1.56
@@ -323,7 +323,7 @@
 #                $b = eregi_replace("(". $atool['search']['phone'] .")","<span class=\"found\">\\1</span>",$b);
                }
                echo handle('phone',$location,$b) ."\n";
-               $pre = "<BR>&nbsp;";
+               $pre = "<br>&nbsp;";
              }
              if ( $location->phone_2 != "" ) {
                $b = $location->phone_2;
@@ -339,7 +339,7 @@
            echo " <td>&nbsp;". handle('fax',$location,$location->fax_1) ."</td>\n";
          }
          if ( $ashow['street'] ) {
-           $b = $location->street1 ."<BR>". $location->street2;
+           $b = $location->street1 ."<br>". $location->street2;
            if ( $atool['search']['street'] != "" ) {
              $b = eregi_replace("(". $atool['search']['street'] .")","<span class=\"found\">\\1</span>",$b);
            }

Index: admin_sync.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_sync.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- admin_sync.php	4 Dec 2002 21:23:48 -0000	1.28
+++ admin_sync.php	31 Dec 2002 14:33:35 -0000	1.29
@@ -23,7 +23,7 @@
     */
    Function result2insert(&$dbconn1,&$dbconn2,$t,&$r,$a) {
 
-#   echo $r->numfields()." :".$r->numrows() ."<BR>\n";
+#   echo $r->numfields()." :".$r->numrows() ."<br>\n";
      $fc = $r->numfields();
      $b = 0;
      $upd  = "UPDATE ". $dbconn2->prefix . $t[name] ;
@@ -42,7 +42,7 @@
        $fn = strtoupper($r->fieldname($b));
        $ft = strtoupper($r->fieldtype($b));
        $fv = $r->get($a,$fn);
-#    echo $b .": |". $fn ."|". $fv ."|". $ft ."|<BR>";
+#    echo $b .": |". $fn ."|". $fv ."|". $ft ."|<br>";
      # OLD VERSIONS
        if ( ($t[name] == "products") && ( ($fn == "MANAGER") || ($fn == "SELLER") || ($fn == "MANAGER2") ) ) {
          $b++;
@@ -63,18 +63,18 @@
          if ( ($dbconn1->db->crypt == 1) && ($dbconn2->db->crypt != 1) ) {
            # Create a new password
            $fv = "tutos";
-           echo "MODIFYING  PASSWORD to tutos<BR>\n";
+           echo "MODIFYING  PASSWORD to tutos<br>\n";
            $modpass = 1;
          } else if ( ($dbconn1->db->crypt != 1) && ($dbconn2->db->crypt == 1) ) {
            # encrypt previously  unencrypted password
          } else if ( ($dbconn1->db->crypt == 1) && ($dbconn1->db->crypt == 1) && ($dbconn1->gettype() == "MySQL") && ($dbconn2->gettype() != "MySQL") ) {
            # Create a new password
            $fv = "tutos";
-           echo "MODIFYING  PASSWORD to tutos<BR>\n";
+           echo "MODIFYING  PASSWORD to tutos<br>\n";
          } else if ( ($dbconn1->db->crypt == 1) && ($dbconn1->db->crypt == 1) && ($dbconn1->gettype() != "MySQL") && ($dbconn2->gettype() == "MySQL") ) {
            # Create a new password
            $fv = "tutos";
-           echo "MODIFYING  PASSWORD to tutos<BR>\n";
+           echo "MODIFYING  PASSWORD to tutos<br>\n";
          }
        }
 
@@ -118,7 +118,7 @@
        $b++;
      }
      if ( $pre == "(" ) {
-       echo "<span class=\"warn\"> no values  ???</span><BR>\n";
+       echo "<span class=\"warn\"> no values  ???</span><br>\n";
        return;
      }
      $flds .= ")";
@@ -136,7 +136,7 @@
      global $lang,$tutos;
 
      $msg = "";
-     echo "changes since last sync (". $dbconn1->db->lastsync->getDateTime() .")<BR>\n";
+     echo "changes since last sync (". $dbconn1->db->lastsync->getDateTime() .")<br>\n";
      $q1 = "SELECT obj_id,val_old,m_field from ". $dbconn2->prefix ."history"; 
      if ( $dbconn1->db->lastsync->notime != 1) {
        $q1 .= " WHERE m_time > ". $dbconn2->DateTime($dbconn1->db->lastsync);
@@ -161,7 +161,7 @@
        # GET a new ID on source DB for this object
        $newid = $dbconn1->NextID();
 
-       echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." ---&gt;". $newid ." T:". $x->tablename ."<BR>\n";
+       echo "NEW: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." ---&gt;". $newid ." T:". $x->tablename ."<br>\n";
        $trans[$xid] = $newid;
        $table[$xid] = $x->tablename;
        $obj[$xid] = $x;
@@ -170,13 +170,13 @@
        # DELETED Stuff
        $typ = $r1->get($a,"val_old");
        if ( $xid <  $dbconn1->db->lastid ) {
-         echo "DEL: ". $xid ." : ". $typ ."<BR>\n";
+         echo "DEL: ". $xid ." : ". $typ ."<br>\n";
          $trans[$xid] = -1;
          $table[$xid] = $typ;
          $del++;
-         echo "DEL: ". $xid ." : ". $typ ."<BR>\n";
+         echo "DEL: ". $xid ." : ". $typ ."<br>\n";
        } else {
-         echo "DEL (was new): ". $xid ." : ". $typ ."<BR>\n";
+         echo "DEL (was new): ". $xid ." : ". $typ ."<br>\n";
        }
      } else if ( $mf == "AdminDBSync" ) {
        # Do nothing
@@ -185,25 +185,25 @@
        $trans[$xid] = $xid;
        $table[$xid] = $x->tablename;
        $obj[$xid] = $x;
-       echo "MOD: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." ---&gt;". $mf ."T:". $x->tablename ."<BR>\n";
+       echo "MOD: ". $xid ." : ". $lang[$x->getType()] ." ". $x->getFullName() ." ---&gt;". $mf ."T:". $x->tablename ."<br>\n";
      }
 
      $a++;
    }   
    @reset($trans);
    while( list ($i,$f) = @each ($trans)) {
-     echo "TR:". $i ."->".$f."<BR>\n";
+     echo "TR:". $i ."->".$f."<br>\n";
    }
    @reset($obj);
    while( list ($i,$f) = @each ($obj)) {
-     echo $i ." ". $obj[$i]->id . "<BR>\n";
+     echo $i ." ". $obj[$i]->id . "<br>\n";
      if ( method_exists($obj[$i],"transfer_ids") ) {
        $obj[$i]->transfer_ids($trans);
      }
    }   
 
-   echo "New on target: ". $new ."<BR>\n";
-   echo "Deleted on target: ". $del ."<BR>\n";
+   echo "New on target: ". $new ."<br>\n";
+   echo "Deleted on target: ". $del ."<br>\n";
 
 
    # NOW we walk along the trans array
@@ -212,9 +212,9 @@
      while( list ($i,$f) = @each ($trans)) {
        # DELETE
        if ( $f == -1 ) {
-         echo "SOURCE: Delete ". $i ." : ". $dbconn1->prefix . $table[$i] ."<BR>\n";
+         echo "SOURCE: Delete ". $i ." : ". $dbconn1->prefix . $table[$i] ."<br>\n";
        } else if ( $f == $i ) {
-         echo "SOURCE: Update ". $i ." in table ". $dbconn1->prefix . $table[$i] ."<BR>\n";
+         echo "SOURCE: Update ". $i ." in table ". $dbconn1->prefix . $table[$i] ."<br>\n";
          $obj[$i]->dbconn = $dbconn1;
          $obj[$i]->save();
          # READ history since last sync
@@ -226,7 +226,7 @@
                                      );
          $msg .= history_save($obj[$i]);
        } else {
-         echo "SOURCE: Create ". $i ." as ". $f ." in table ". $table[$i] ."<BR>\n";
+         echo "SOURCE: Create ". $i ." as ". $f ." in table ". $table[$i] ."<br>\n";
          $obj[$i]->dbconn = $dbconn1;
          $obj[$i]->newid = $f;
          $obj[$i]->id = -2;
@@ -270,7 +270,7 @@
        while ( $a < $n ) {
          $q2 = $this->result2insert($dbconn1,$dbconn2,$table[$i],$r,$a);
          $dbconn2->Exec($q2[0]);
-#       echo "&nbsp; ". $fc ."&nbsp;". $q2[0] ."<BR>\n";
+#       echo "&nbsp; ". $fc ."&nbsp;". $q2[0] ."<br>\n";
          flush();
          $a++;
        }
@@ -313,8 +313,8 @@
      $db1->read($this->from);
      $db2->read($this->to);
 
-     echo "<span class=\"warn\">". $lang['AdminDBSyncM'][$this->what] ."</span><P><P>\n";
-     echo "connecting to databases ...<BR>\n";
+     echo "<span class=\"warn\">". $lang['AdminDBSyncM'][$this->what] ."</span><p><p>\n";
+     echo "connecting to databases ...<br>\n";
 
      flush();
 
@@ -330,7 +330,7 @@
        echo "<span class=\"warn\">Action :". $lang['AdminDBSyncM'][$this->what] ." not yet implemented </span>\n";
      }
 
-     echo "disconnecting from databases ...<BR>\n";
+     echo "disconnecting from databases ...<br>\n";
      flush();
      $dbconn1->Close();
      $dbconn2->Close();
@@ -347,121 +347,121 @@
      $db1->read($this->from);
      $db2->read($this->to);
 
-   echo "connecting to databases ...<BR>\n";
-   flush();
+     echo "connecting to databases ...<br>\n";
+     flush();
 
-   $dbconn2 = $db2->getConnection();
-   echo $db2->getFullName()." ...<BR>\n";
-   flush();
-   $dbconn1 = $db1->getConnection();
-   echo $db1->getFullName()." ...<BR>\n";
-   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>&nbsp;</th>\n";
-   echo " <th>". $lang['AdminDBSource'] ."</th>\n";
-   echo " <th>". $lang['AdminDBTarget'] ."</th>\n";
-   echo "</tr>\n";
-
-
-   echo "<tr>\n";
-   echo " <td>&nbsp;</td>\n";
-   echo " <td>". $db1->getLink() ."</td>\n";
-   echo " <td>". $db2->getLink() ."</td>\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 "<tr>\n";
-   echo $this->showfield($lang['DBLastID']);
-   echo " <td>". $db1->lastid ."</td>\n";
-   echo " <td>". $db2->lastid ."</td>\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";
-   
-   $q1 = "SELECT * from ". $dbconn1->prefix ."history where m_field = ". $dbconn1->String("created");
-   if ( $db1->lastsync->notime != 1) {
-     $q1 .= " AND m_time > ". $dbconn1->DateTime($db1->lastsync);
-   }
-   $r1 = $dbconn1->Exec($q1);
+     $dbconn2 = $db2->getConnection();
+     echo $db2->getFullName()." ...<br>\n";
+     flush();
+     $dbconn1 = $db1->getConnection();
+     echo $db1->getFullName()." ...<br>\n";
+     flush();
 
-   $q2 = "SELECT * from ". $dbconn2->prefix ."history where m_field = ". $dbconn2->String("created");
-   if ( $db1->lastsync->notime != 1) {
-     $q2 .= " AND m_time > ". $dbconn2->DateTime($db1->lastsync);
-   }
-   $r2 = $dbconn2->Exec($q2);
+     $stop = 0;
+     echo $this->DataTableStart();
+     echo "<tr>\n";
+     echo " <th colspan=\"3\">". $lang['AdminDBSync'] ."</th>\n";
+     echo "</tr>\n";
+     echo "<tr>\n";
+     echo " <th>&nbsp;</th>\n";
+     echo " <th>". $lang['AdminDBSource'] ."</th>\n";
+     echo " <th>". $lang['AdminDBTarget'] ."</th>\n";
+     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";
-
-   $q3 = "SELECT * from ". $dbconn1->prefix ."history where m_field = ". $dbconn1->String("Delete");
-   if ( $db1->lastsync->notime != 1) {
-     $q3 .= " AND m_time > ". $dbconn1->DateTime($db1->lastsync);
-   }
-   $r3 = $dbconn1->Exec($q3);
 
-   $q4 = "SELECT * from ". $dbconn2->prefix ."history where m_field = ". $dbconn2->String("Delete");
-   if ( $db1->lastsync->notime != 1) {
-     $q4 .= " AND m_time > ". $dbconn2->DateTime($db1->lastsync);
-   }
-   $r4 = $dbconn2->Exec($q4);
+     echo "<tr>\n";
+     echo " <td>&nbsp;</td>\n";
+     echo " <td>". $db1->getLink() ."</td>\n";
+     echo " <td>". $db2->getLink() ."</td>\n";
+     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";
-  
-   $r1->free();
-   $r2->free();
-   $r3->free();
-   $r4->free();
-   # Does this make sense ?
-   if ( ($this->what != 1 ) && ($db1->lastsync->notime) ) {
      echo "<tr>\n";
-     echo $this->showfield("&nbsp;");
-     echo " <td colspan=\"2\"><span class=\"warn\">You must first sync before update</span></td>\n";
+     echo $this->showfield($lang['DBLastDate']);
+     echo " <td>". $db1->lastsync->getDateTime() ."</td>\n";
+     echo " <td>". $db2->lastsync->getDateTime() ."</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 $this->showfield("&nbsp;");
-     echo " <td colspan=\"2\"><span class=\"warn\">Source out of sync (". $seq1 ." < ". $db1->lastid .")</span></td>\n";
+     echo $this->showfield($lang['DBLastID']);
+     echo " <td>". $db1->lastid ."</td>\n";
+     echo " <td>". $db2->lastid ."</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 $this->showfield("&nbsp;");
-     echo " <td colspan=\"2\"><span class=\"warn\">Target out of sync (". $seq2 ." < ". $db1->lastid .")</span></td>\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";
-     $stop = 1;
-   }
+   
+     $q1 = "SELECT * from ". $dbconn1->prefix ."history where m_field = ". $dbconn1->String("created");
+     if ( $db1->lastsync->notime != 1) {
+       $q1 .= " AND m_time > ". $dbconn1->DateTime($db1->lastsync);
+     }
+     $r1 = $dbconn1->Exec($q1);
+
+     $q2 = "SELECT * from ". $dbconn2->prefix ."history where m_field = ". $dbconn2->String("created");
+     if ( $db1->lastsync->notime != 1) {
+       $q2 .= " AND m_time > ". $dbconn2->DateTime($db1->lastsync);
+     }
+     $r2 = $dbconn2->Exec($q2);
+
+     echo "<tr>\n";
+     echo $this->showfield("History new");
+     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) {
+       $q3 .= " AND m_time > ". $dbconn1->DateTime($db1->lastsync);
+     }
+     $r3 = $dbconn1->Exec($q3);
+  
+     $q4 = "SELECT * from ". $dbconn2->prefix ."history where m_field = ". $dbconn2->String("Delete");
+     if ( $db1->lastsync->notime != 1) {
+       $q4 .= " AND m_time > ". $dbconn2->DateTime($db1->lastsync);
+     }
+     $r4 = $dbconn2->Exec($q4);
+
+     echo "<tr>\n";
+     echo $this->showfield("History del");
+     echo " <td>". $r3->numrows() ."</td>\n";
+     echo " <td>". $r4->numrows() ."</td>\n";
+     echo "</tr>\n";
+  
+     $r1->free();
+     $r2->free();
+     $r3->free();
+     $r4->free();
+     # Does this make sense ?
+     if ( ($this->what != 1 ) && ($db1->lastsync->notime) ) {
+       echo "<tr>\n";
+       echo $this->showfield("&nbsp;");
+       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 $this->showfield("&nbsp;");
+       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 $this->showfield("&nbsp;");
+       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 ) {
@@ -482,7 +482,7 @@
        echo " </td>\n";
        echo "</tr>\n";
      }
-     echo "</table>\n";
+     echo $this->DataTableEnd();
 
      $dbconn1->Close();
      $dbconn2->Close();
@@ -534,11 +534,11 @@
        $this->addHidden("to",$this->dbconn->db->id);
      } else {
        # show local available DBs
-       echo "  <SELECT SIZE=". $tutos[maxshow]." name=\"to\">\n";
+       echo "  <select size=\"". $tutos[maxshow]."\" name=\"to\">\n";
        @reset($dblist);
        while ( list ($i,$f) = @each ($dblist) ) {
          if ( $i < 1000 ) {
-          echo "<OPTION VALUE=\"". $i ."\" ". ($this->to == $i ? "selected":"") .">". $i .": ". $f->getFullName(). ($i == $current_user->dbconn->db->id ? "(*)":"") ."</OPTION>\n";
+          echo "<option value=\"". $i ."\"". ($this->to == $i ? " selected":"") .">". $i .": ". $f->getFullName(). ($i == $current_user->dbconn->db->id ? "(*)":"") ."</option>\n";
          }
        }
        echo "  </select>\n";
@@ -548,7 +548,7 @@
 
      echo "<tr>\n";
      $this->addHidden("step","2");
-     echo " <td colspan=\"3\"><input type=\"submit\" value=\"SYNC\" TITLE=\"". $lang['AdminDBSync'] ."\"></td>\n";
+     echo " <td colspan=\"3\"><input type=\"submit\" value=\"SYNC\" title=\"". $lang['AdminDBSync'] ."\"></td>\n";
      echo "</tr>\n";
 
      echo "</table>\n";
@@ -576,7 +576,7 @@
 
      echo "<tr><td>";
      if ( ($this->user->admin == 1) ) {
-       echo menulink("database_new.php", $lang['NewEntry'],$lang['DBCreate']) ."<BR>\n";
+       echo menulink("database_new.php", $lang['NewEntry'],$lang['DBCreate']) ."<br>\n";
      }
      echo "</td></tr>";
    }
@@ -621,7 +621,7 @@
        $this->step = 1;
      }
      if ( $this->user->admin == 0 ) {
-       $msg .= "Only admins are allowed to see this<BR>";
+       $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";
          $this->step = min($this->step,2);

Index: app_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_del.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- app_del.php	6 Nov 2002 07:38:11 -0000	1.12
+++ app_del.php	31 Dec 2002 14:33:35 -0000	1.13
@@ -18,16 +18,16 @@
  $msg = "";
  $a = new appointment($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$a->getType()]) ."<BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= sprintf($lang['Err0040'],$lang[$a->getType()]) ."<br>";
  } else {
-   $a->read($HTTP_GET_VARS['id']);
+   $a->read($_GET['id']);
    $a->read_participants();
  }
 
  /* Check for existance and rights */
  if ( ! $a->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$a->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$a->getType()]) ."<br>";
    if ( $a->repeat != 0 ) {
      $gotourl = "app_new_r.php?id=".$id;
    } else {

Index: app_do_vote.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_do_vote.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- app_do_vote.php	23 Dec 2002 10:01:33 -0000	1.8
+++ app_do_vote.php	31 Dec 2002 14:33:35 -0000	1.9
@@ -21,23 +21,23 @@
  $a = new appointment($dbconn);
 
  $gotourl = "calendar.php";
- if ( ! isset($HTTP_GET_VARS['id']) ) {
+ if ( ! isset($_GET['id']) ) {
    $msg .= "Missing Appointment ID<br>";
  } else {
-   $a->read($HTTP_GET_VARS['id']);
+   $a->read($_GET['id']);
    $a->read_participants();
-   $gotourl= addUrlParameter($gotourl,"id=".$HTTP_GET_VARS['id']);
+   $gotourl= addUrlParameter($gotourl,"id=".$_GET['id']);
  }
- if ( ! isset($HTTP_GET_VARS['adr_id']) ) {
+ if ( ! isset($_GET['adr_id']) ) {
    $msg .= "Missing User ID<br>";
  }
- if ( ! isset($HTTP_GET_VARS['vote']) ) {
+ if ( ! isset($_GET['vote']) ) {
    $msg .= "Missing Vote<br>";
  }
 
  if ( $msg == "" ) {
    $dbconn->Begin("WORK");
-   $a->save_vote($HTTP_GET_VARS['vote'],$HTTP_GET_VARS['adr_id']);
+   $a->save_vote($_GET['vote'],$_GET['adr_id']);
    $dbconn->Commit("WORK");
  }
  $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));

Index: app_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_ins.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- app_ins.php	2 Dec 2002 20:47:05 -0000	1.28
+++ app_ins.php	31 Dec 2002 14:33:35 -0000	1.29
@@ -52,14 +52,14 @@
 
  $a->start->setDateTimeF("start");
  if ( (1 != $a->start->checkDMY()) || (-1 == $a->start->getTimeStamp() ) ) {
-   $msg .= sprintf($lang['Err0038'],$lang['StartDate']) ."<BR>";
+   $msg .= sprintf($lang['Err0038'],$lang['StartDate']) ."<br>";
  } else {
    $gotourl= addUrlParameter($gotourl,"start=".$a->start->getYYYYMMDDHHMM() );
  }
 
  $a->end->setDateTimeF("end");
  if ( (1 != $a->end->checkDMY()) || (-1 == $a->end->getTimeStamp()) ) {
-   $msg .= sprintf($lang['Err0038'],$lang['EndDate']) ."<BR>";
+   $msg .= sprintf($lang['Err0038'],$lang['EndDate']) ."<br>";
  } else {
    $gotourl= addUrlParameter($gotourl,"end=".$a->end->getYYYYMMDDHHMM() );
  }
@@ -69,12 +69,12 @@
  #
  if ( ($a->start->ts > $a->end->ts) && ($a->r_ignore == 0) ) {
    # Start after End
-   $msg .= $lang['Err0002'] ."<BR>";
+   $msg .= $lang['Err0002'] ."<br>";
  }
 
  if ( !isset($_POST['people']) || (count($_POST['people']) < 1)) {
    # No Participants
-   $msg .= $lang['Err0001'] ."<BR>";
+   $msg .= $lang['Err0001'] ."<br>";
  } else {
    $cnt = 0;
    @reset($_POST['people']);
@@ -95,19 +95,19 @@
      }
    }
    if ( $cnt == 0 ) {
-     $msg .= $lang['Err0001'] ."<BR>";
+     $msg .= $lang['Err0001'] ."<br>";
    }
  }
 
  if ( !isset($_POST['mod_allow']) ) {
-   $msg .= "Missing mod_allow<BR>";
+   $msg .= "Missing mod_allow<br>";
  } else {
    $gotourl= addUrlParameter($gotourl,"mod_allow=".$_POST['mod_allow'] );
    $a->mod_allow = $_POST['mod_allow'];
  }
 
  if ( !isset($_POST['creator']) ) {
-   $msg .= "Missing creator<BR>";
+   $msg .= "Missing creator<br>";
  } else {
    $a->creator = new tutos_user($dbconn);
    $a->creator->read($_POST['creator']);
@@ -173,7 +173,7 @@
  # DESCRIPTION
  #
  if ( !isset($_POST['descr']) || empty($_POST['descr']) ) {
-#   $msg .= $lang['Err0003'] ."<BR>";
+#   $msg .= $lang['Err0003'] ."<br>";
  } else {
    $a->SetDescription(StripSlashes(trim($_POST['descr'])));
  }

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- app_new.php	23 Dec 2002 10:01:33 -0000	1.46
+++ app_new.php	31 Dec 2002 14:33:35 -0000	1.47
@@ -71,7 +71,7 @@
      if ( !isset($_SERVER['HTTP_USER_AGENT']) || ereg("Lynx",$_SERVER['HTTP_USER_AGENT']) || ereg("w3m",$_SERVER['HTTP_USER_AGENT']) ) {
        echo $lang['StartTime'];
      } 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=start&". SID ."'; mywindow.focus();\"
  "self.status='minitimer' ;return true\">";

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- app_overview.php	23 Dec 2002 10:01:33 -0000	1.43
+++ app_overview.php	31 Dec 2002 14:33:36 -0000	1.44
@@ -34,7 +34,7 @@
        return;
      }
 
-	 echo $this->actionformStart("app_overview.php");
+     echo $this->actionformStart("app_overview.php");
      echo $this->OverviewTableStart();
      echo "<thead>\n";
      echo "<tr>\n";
@@ -95,8 +95,8 @@
        }
        $x = myentities($f->descr);
        if ( $this->filter['name'] != "" ) {
-         $x = eregi_replace("(". $this->filter['name'] .")","<SPAN CLASS=found>\\1</SPAN>",$x);
-	   }
+         $x = eregi_replace("(". $this->filter['name'] .")","<span class=\"found\">\\1</span>",$x);
+       }
        echo " <td valign=\"top\">".$x."&nbsp;</td>\n";
        echo " <td valign=\"top\">".  $f->getLocation() ."</td>\n";
        if ( $f->product->id > 0 ) {
@@ -114,16 +114,16 @@
 
        if ( $tutos[massupdate] == 1 ) {
          echo " <td align=\"center\">\n";
-	  	 if ( $f->mod_ok() ) {
+         if ( $f->mod_ok() ) {
            echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $f->id ."\">\n";
          } else {
-	       echo "-\n";
+           echo "-\n";
          }
          echo "</td>\n";
        }
 
        echo $this->OverviewRowEnd($line++);
-	   unset($f);
+       unset($f);
      }
      echo "</tbody>\n";
 
@@ -142,7 +142,7 @@
 
      echo "</tfoot>\n";
      echo $this->OverviewTableEnd();
-	 echo $this->actionformEnd("bug_overview.php");
+     echo $this->actionformEnd("bug_overview.php");
    }
    /**
     * navigate
@@ -165,10 +165,10 @@
            continue;
          }
          if ( $b->del_ok() ) {
-           $msg .= $lang['Delete'] ."&nbsp;". $b->getFullName() ."<BR>";
+           $msg .= $lang['Delete'] ."&nbsp;". $b->getFullName() ."<br>";
            $msg .= $b->delete();
          } else {
-           $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]) ."<BR>";
+           $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]) ."<br>";
          }
          unset($b);
        }
@@ -285,7 +285,7 @@
      # menu
      $m = appointment::getSelectLink($this->user);
      $this->addmenu($m);
-	 if ( isset($obj) ) {
+     if ( isset($obj) ) {
        $m = appointment::getAddLink($this->user,$obj);
      } else {
        $m = appointment::getAddLink($this->user,$this->user);

Index: app_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_show.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- app_show.php	10 Nov 2002 13:24:46 -0000	1.35
+++ app_show.php	31 Dec 2002 14:33:36 -0000	1.36
@@ -31,13 +31,13 @@
     * the data display part
     */
    Function info() {
-     global $tutos,$lang,$HTTP_SERVER_VARS;
+     global $tutos,$lang;
 
      if ( $this->format == "ical") {
        Header("Expires: 0");
        Header("Pragma: no-cache");
        # set content to text/calendar
-       if (strstr($HTTP_SERVER_VARS["HTTP_USER_AGENT"],"MSIE 5") || strstr($HTTP_SERVER_VARS["HTTP_USER_AGENT"],"MSIE 6") ) {
+       if (strstr($_SERVER["HTTP_USER_AGENT"],"MSIE 5") || strstr($_SERVER["HTTP_USER_AGENT"],"MSIE 6") ) {
          Header("Cache-Control:");
          Header("Connection: close");
          Header("Content-Transfer-Encoding: binary");
@@ -150,7 +150,7 @@
      if ( $this->obj->descr != "" ) {
        echo "<tr>\n";
        echo $this->showfield($lang['Description']);
-       $descr = eregi_replace("\n","<BR>",$this->obj->descr);
+       $descr = eregi_replace("\n","<br>",$this->obj->descr);
        echo $this->showdata(urlReplace($descr),3);
        echo "</tr>\n";
      }
@@ -206,12 +206,12 @@
     * prepare
     */
    Function prepare() {
-     global $tutos, $lang,$HTTP_GET_VARS;
+     global $tutos, $lang;
 
      $this->name = $lang['AppointDetail'];
      $this->obj = new appointment($this->dbconn);
-     if ( isset($HTTP_GET_VARS['id']) ) {
-       $this->obj->read($HTTP_GET_VARS['id']);
+     if ( isset($_GET['id']) ) {
+       $this->obj->read($_GET['id']);
      } else {
        $this->stop = true;
 	 }

Index: app_vote.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_vote.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- app_vote.php	23 Dec 2002 10:01:33 -0000	1.18
+++ app_vote.php	31 Dec 2002 14:33:36 -0000	1.19
@@ -89,7 +89,7 @@
 
      echo "<tr><td>\n";
      if ( $this->obj->id > 0 ) {
-       echo  menulink("app_show.php?id=". $this->obj->id ,$lang['AppSeeEntry'],$lang['AppSeeEntryI']) . "<BR>";
+       echo  menulink("app_show.php?id=". $this->obj->id ,$lang['AppSeeEntry'],$lang['AppSeeEntryI']) . "<br>";
      }
      echo "</td></tr>\n";
    }
@@ -103,7 +103,7 @@
      $this->obj = new appointment($this->dbconn);
 
      if ( !isset($_GET['id']) || !isset($_GET['adr_id']) ) {
-       $msg .= "No appointment or no adr given !<BR>";
+       $msg .= "No appointment or no adr given !<br>";
        $this->stop = true;
      } else {
        $this->obj->read($_GET['id']);
@@ -115,7 +115,7 @@
        $this->stop = true;
      }
      if ( 1 != $this->obj->trace ) {
-       echo "You can not vote for this appointment<BR>";
+       echo "You can not vote for this appointment<br>";
        $this->stop = true;
      }
      # menu

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- appointment.pinc	23 Dec 2002 10:01:33 -0000	1.129
+++ appointment.pinc	31 Dec 2002 14:33:36 -0000	1.130
@@ -17,19 +17,19 @@
  * options for calendar selection
  */
 function cal_options($team,$teamname) {
-  global $lang,$current_user,$HTTP_SERVER_VARS;
+  global $lang,$current_user;
 
   echo "<select name=\"team\">\n";
   $showed = 0;
 
   $useOPTGROUP = true;
-  if (!isset ($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) {
+  if (!isset ($_SERVER['HTTP_USER_AGENT'])) {
     $useOPTGROUP = false;
   }
-  if ($useOPTGROUP && ereg("Opera",$HTTP_SERVER_VARS['HTTP_USER_AGENT'])) {
+  if ($useOPTGROUP && ereg("Opera",$_SERVER['HTTP_USER_AGENT'])) {
     $useOPTGROUP = false;
   }
-  if ($useOPTGROUP && ereg ("MSIE.*Mac",$HTTP_SERVER_VARS['HTTP_USER_AGENT'])) {
+  if ($useOPTGROUP && ereg ("MSIE.*Mac",$_SERVER['HTTP_USER_AGENT'])) {
     $useOPTGROUP = false;
   }
   if ($useOPTGROUP) {
@@ -753,7 +753,6 @@
       }
       # raise visibility to the participants teams if neccessary
       if ( $this->mod_allow != 3 ) {
-#   echo "ADR:". $f->id ."<BR>\n";
         acl_default($this,$f);
       }
     }
@@ -766,7 +765,6 @@
       $m = new mail();
       $m->setFrom($this->creator);
 
-#      $msg = $msg . count($this->participant) . "<BR>\n";
       $pl = $this->participant;
 
       @reset($pl);
@@ -775,7 +773,7 @@
         $body = "";
         
         if ( ! findMailTemplate("app_new.proto",$f,$body) ) {
-          $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<BR>\n";
+          $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<br>\n";
           continue;
         }
 
@@ -1138,7 +1136,7 @@
     }
 
     if ( $tutos[applocdesc][$this->outside] == 1 ) {
-      $descr = eregi_replace("\n","<BR>",$this->descr);
+      $descr = eregi_replace("\n","<br>",$this->descr);
       if ($descr != "" ) {
         echo "  <tr><td class=\"". $class ."\" colspan=\"3\">". urlReplace($descr) ."</td></tr>\n";
       }
@@ -1477,7 +1475,7 @@
         $m->addTo($f);
         $body = "";
         if ( ! findMailTemplate("app_remember.proto",$f,$body) ) {
-          $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<BR>\n";
+          $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<br>\n";
           continue;
         }
         if ( $app->notime == 0) {

Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug.pinc,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- bug.pinc	16 Dec 2002 20:40:39 -0000	1.93
+++ bug.pinc	31 Dec 2002 14:33:37 -0000	1.94
@@ -345,9 +345,9 @@
     global $lang;
 
     if ( ! empty($c) ) {
-      return "<FONT color=\"". $this->c_class[$c] ."\">". $lang['BugClasses'][$c] ."</FONT>";
+      return "<font color=\"". $this->c_class[$c] ."\">". $lang['BugClasses'][$c] ."</font>";
     }
-    return "<FONT color=\"". $this->c_class[$this->class] ."\">". $lang['BugClasses'][$this->class] ."</FONT>";
+    return "<font color=\"". $this->c_class[$this->class] ."\">". $lang['BugClasses'][$this->class] ."</font>";
   }
   /**
    * ask for a class
@@ -622,7 +622,7 @@
       $body = "";
 
       if ( ! findMailTemplate($bugmailtxt,$ml[$i],$body) ) {
-        $msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<BR>\n";
+        $msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<br>\n";
         continue;
       }
 
@@ -837,7 +837,6 @@
         $q2 = "INSERT INTO ". $user->dbconn->prefix ."bugremember (id,r_time) VALUES(". $b->id .",". $user->dbconn->DateTime($d) .")";
         $r2 = $user->dbconn->Exec($q2);
         $r2->free();
-        //       echo "(new) remember nr ". ($n1 + 1)  ."<BR>";
 
         $bugmailtxt = "bug_remember.proto";
         $m = new mail();
@@ -855,7 +854,7 @@
           $body = "";
 
           if ( ! findMailTemplate($bugmailtxt,$f,$body) ) {
-            $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<BR>\n";
+            $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<br>\n";
             continue;
           }
           $m->setSubject(sprintf($f->lg['EmailStillOpen'],$b->getFullName(),$f->lg['BugStates'][BUG_STATE_OPEN]));
@@ -867,9 +866,6 @@
           $m->addBody("<pre>". $b->description ."</pre>","text/html" , $lang['BugHistory']);
           $msg .= $m->send();
         }
-      } else {
-        # already remembered
-        //       echo "(old)<BR>";
       }
     }
     $r->free();

Index: bug_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_del.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bug_del.php	16 Dec 2002 20:34:09 -0000	1.17
+++ bug_del.php	31 Dec 2002 14:33:37 -0000	1.18
@@ -22,10 +22,10 @@
 
  $b = new bug($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
+ if ( !isset($_GET['id']) ) {
    $msg .= sprintf($lang['Err0040'],$lang[$b->getType()]);
  } else {
-   $b->read($HTTP_GET_VARS['id']);
+   $b->read($_GET['id']);
    $gotourl = $b->parent->getUrl();
  }
  if ( ! $b->del_ok() ) {

Index: calendar_day.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_day.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- calendar_day.php	23 Dec 2002 10:01:34 -0000	1.24
+++ calendar_day.php	31 Dec 2002 14:33:37 -0000	1.25
@@ -41,9 +41,6 @@
      $wn = sprintf("%02d", Round( (Date("z",$ts)+7 ) / 7) );
      $yy = Date("y",$ts);
 
-  #   echo $last_day->getDateTime() ."<BR>";
-  #   echo $next_day->getDateTime() ."<BR>";
-  #   echo $from->getDateTime() ."<BR>";
 
      $this->user->callist = array();
      appointment::readCal($this->user,$from,$next_day);
@@ -85,11 +82,9 @@
          $rowspan[-1][] = 1;
          continue;
        }
-#     echo  $this->user->callist[$a]->s_out ."<BR>";
        if ( ($this->user->callist[$a]->s_out == 1) && ($this->user->callist[$a]->e_out == 1) ) {
          $table[-1][] = &$this->user->callist[$a];
          $rowspan[-1][] = 1;
-#        echo "X ". $this->user->callist[$a]->id ." X<BR>";
          continue;
        }
        $x1 = Date("G",$this->user->callist[$a]->start->getTimeStamp());
@@ -183,14 +178,14 @@
     * prepare
     */
    Function prepare() {
-     global $tutos, $lang,$msg,$HTTP_GET_VARS;
+     global $tutos, $lang,$msg;
 
      $this->name = $lang['Appointments'];
      $this->teamname = "";
      $this->t = Date("Ymd");
 
-     if ( isset ($HTTP_GET_VARS['t']) ) {
-       $this->t = $HTTP_GET_VARS['t'];
+     if ( isset ($_GET['t']) ) {
+       $this->t = $_GET['t'];
      }
      $this->addHidden("t", $this->t);
      $this->uids = cal_parse_options($this->user,$this->teamname);

Index: calendar_week.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/calendar_week.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- calendar_week.php	23 Dec 2002 10:01:34 -0000	1.31
+++ calendar_week.php	31 Dec 2002 14:33:37 -0000	1.32
@@ -158,14 +158,14 @@
     * prepare
     */
    Function prepare() {
-     global $tutos, $lang,$HTTP_GET_VARS;
+     global $tutos, $lang;
 
      $this->name = $lang['Appointments'];
 
      $this->team = $this->user->get_prefteam();
      $this->teamname = "";
      $this->uids = cal_parse_options($this->user,$this->teamname);
-     $this->t = $HTTP_GET_VARS['t'];
+     $this->t = $_GET['t'];
      # menu
      $m = appointment::getSelectLink($this->user);
      $this->addmenu($m);
@@ -174,7 +174,7 @@
    }
  }
 
-# info($HTTP_GET_VARS['t'],$current_user->get_prefteam(),$teamname,$uids);
+# info($_GET['t'],$current_user->get_prefteam(),$teamname,$uids);
 
  $l = new calendar_week($current_user);
  $l->display();

Index: company_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_del.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- company_del.php	16 Dec 2002 20:34:11 -0000	1.16
+++ company_del.php	31 Dec 2002 14:33:37 -0000	1.17
@@ -18,10 +18,10 @@
  $msg = "";
  $c = new company($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= "Could not delete company <BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= "Could not delete company<br>";
  } else {
-   $c->read($HTTP_GET_VARS['id']);
+   $c->read($_GET['id']);
  }
 
  if ( ! $c->del_ok() ) {

Index: company_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_ins.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- company_ins.php	23 Dec 2002 10:01:34 -0000	1.18
+++ company_ins.php	31 Dec 2002 14:33:37 -0000	1.19
@@ -20,19 +20,19 @@
  $msg = "";
  $c = new company($dbconn);
 
- if ( !isset($HTTP_POST_VARS['id']) ) {
+ if ( !isset($_POST['id']) ) {
    $msg .= "Please enter a id<br>";
  } else {
-   $c->read($HTTP_POST_VARS['id']);
+   $c->read($_POST['id']);
    if ( $c->id > 0 ) {
      $gotourl = addUrlParameter($gotourl,"id=". $id);
    }
  }
 
- if ( !isset($HTTP_POST_VARS['name']) || ($HTTP_POST_VARS['name'] == $lang['PlsChangeName']) ) {
+ if ( !isset($_POST['name']) || ($_POST['name'] == $lang['PlsChangeName']) ) {
    $msg .= sprintf($lang['Err0009'],$lang['Company']) ."<br>";
  } else {
-   $name = trim(StripSlashes($HTTP_POST_VARS['name']));
+   $name = trim(StripSlashes($_POST['name']));
    $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($name));
  }
 

Index: company_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_overview.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- company_overview.php	23 Dec 2002 10:01:34 -0000	1.36
+++ company_overview.php	31 Dec 2002 14:33:37 -0000	1.37
@@ -88,7 +88,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS;
+     global $msg,$lang;
 
      $this->name = $lang['CompanyOverview'];
 
@@ -98,11 +98,11 @@
      $q = "SELECT * FROM ". $this->dbconn->prefix ."companies";
      $pre = "WHERE";
 
-     if ( isset($HTTP_GET_VARS['name']) && ($HTTP_GET_VARS['name'] != "*") && ($HTTP_GET_VARS['name'] != "") ) {
-       $q .= " ".  $pre ." ". $this->dbconn->Like("name",$HTTP_GET_VARS['name']);
+     if ( isset($_GET['name']) && ($_GET['name'] != "*") && ($_GET['name'] != "") ) {
+       $q .= " ".  $pre ." ". $this->dbconn->Like("name",$_GET['name']);
        $pre = " AND ";
-       $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($HTTP_GET_VARS['name']));
-       $this->link2 = addUrlParameter($this->link2,"name=". UrlEncode($HTTP_GET_VARS['name']));
+       $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
+       $this->link2 = addUrlParameter($this->link2,"name=". UrlEncode($_GET['name']));
      }
 
      check_dbacl( $q, $this->user->id);

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- database.pinc	23 Dec 2002 10:01:34 -0000	1.34
+++ database.pinc	31 Dec 2002 14:33:37 -0000	1.35
@@ -286,7 +286,7 @@
 
     $msg = "";
     if ( $this->dbconn == -1 ) {
-      return "NO Connection to save ". $this->getFullname() ."<BR>\n";
+      return "NO Connection to save ". $this->getFullname() ."<br>\n";
 	}
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);

Index: database_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_del.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- database_del.php	5 Nov 2002 19:57:46 -0000	1.7
+++ database_del.php	31 Dec 2002 14:33:37 -0000	1.8
@@ -16,14 +16,14 @@
  $gotourl = "admin_show.php";
  $obj = new database($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br>";
  } else {
-   $obj->read($HTTP_GET_VARS['id']);
+   $obj->read($_GET['id']);
    $gotourl = $obj->getUrl();
  }
  if ( ! $obj->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br>";
  }
  if ( $msg == "" ) {
    $gotourl = "admin_show.php";

Index: database_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_ins.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- database_ins.php	5 Nov 2002 19:57:46 -0000	1.11
+++ database_ins.php	31 Dec 2002 14:33:37 -0000	1.12
@@ -14,55 +14,55 @@
  $msg = "";
 
  $obj = new database($dbconn);
- if ( isset($HTTP_POST_VARS['id']) ) {
-   $obj->read($HTTP_POST_VARS['id']);
+ if ( isset($_POST['id']) ) {
+   $obj->read($_POST['id']);
    $gotourl= addUrlParameter($gotourl,"id=". $obj->id);
  }
 
- if ( empty($HTTP_POST_VARS['name']) || !isset($HTTP_POST_VARS['name']) || ($HTTP_POST_VARS['name'] == $lang['PlsChangeName']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['AdminDBName']) ."<BR>";
+ if ( empty($_POST['name']) || !isset($_POST['name']) || ($_POST['name'] == $lang['PlsChangeName']) ) {
+   $msg .= sprintf($lang['Err0009'],$lang['AdminDBName']) ."<br>";
  } else {
-   $name = trim(StripSlashes($HTTP_POST_VARS['name']));
+   $name = trim(StripSlashes($_POST['name']));
    $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($name));
  }
 
- $type = trim(StripSlashes($HTTP_POST_VARS['type']));
+ $type = trim(StripSlashes($_POST['type']));
  $gotourl = addUrlParameter($gotourl,"type=". UrlEncode($type));
 
- $alias = trim(StripSlashes($HTTP_POST_VARS['alias']));
+ $alias = trim(StripSlashes($_POST['alias']));
  $gotourl = addUrlParameter($gotourl,"alias=". UrlEncode($alias));
 
- $host = trim(StripSlashes($HTTP_POST_VARS['host']));
+ $host = trim(StripSlashes($_POST['host']));
  $gotourl = addUrlParameter($gotourl,"host=". UrlEncode($host));
 
- $port = trim(StripSlashes($HTTP_POST_VARS['port']));
+ $port = trim(StripSlashes($_POST['port']));
  $gotourl = addUrlParameter($gotourl,"port=". UrlEncode($port));
 
- $user = trim(StripSlashes($HTTP_POST_VARS['user']));
+ $user = trim(StripSlashes($_POST['user']));
  $gotourl = addUrlParameter($gotourl,"user=". UrlEncode($user));
 
- $pass = trim(StripSlashes($HTTP_POST_VARS['pass']));
+ $pass = trim(StripSlashes($_POST['pass']));
  $gotourl = addUrlParameter($gotourl,"pass=". UrlEncode($pass));
 
- $home = trim(StripSlashes($HTTP_POST_VARS['home']));
+ $home = trim(StripSlashes($_POST['home']));
  $gotourl = addUrlParameter($gotourl,"home=". UrlEncode($home));
 
- $rep = trim(StripSlashes($HTTP_POST_VARS['rep']));
+ $rep = trim(StripSlashes($_POST['rep']));
  $gotourl = addUrlParameter($gotourl,"rep=". UrlEncode($rep));
 
- $logo = trim(StripSlashes($HTTP_POST_VARS['logo']));
+ $logo = trim(StripSlashes($_POST['logo']));
  $gotourl = addUrlParameter($gotourl,"logo=". UrlEncode($logo));
 
- $logolink = trim(StripSlashes($HTTP_POST_VARS['logolink']));
+ $logolink = trim(StripSlashes($_POST['logolink']));
  $gotourl = addUrlParameter($gotourl,"logolink=". UrlEncode($logolink));
 
- $vatlist = trim(StripSlashes($HTTP_POST_VARS['vatlist']));
+ $vatlist = trim(StripSlashes($_POST['vatlist']));
  $gotourl = addUrlParameter($gotourl,"vatlist=". UrlEncode($vatlist));
 
- $bugautoname = trim(StripSlashes($HTTP_POST_VARS['bugautoname']));
+ $bugautoname = trim(StripSlashes($_POST['bugautoname']));
  $gotourl = addUrlParameter($gotourl,"bugautoname=". UrlEncode($bugautoname));
 
- $invautoname = trim(StripSlashes($HTTP_POST_VARS['invautoname']));
+ $invautoname = trim(StripSlashes($_POST['invautoname']));
  $gotourl = addUrlParameter($gotourl,"invautoname=". UrlEncode($invautoname));
 
  # other modules

Index: database_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_new.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- database_new.php	23 Dec 2002 10:01:34 -0000	1.22
+++ database_new.php	31 Dec 2002 14:33:37 -0000	1.23
@@ -168,10 +168,10 @@
 
      echo "<tr><td>\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";
+       echo confirmlink("database_del.php?id=".$this->obj->id, $lang['Delete'],sprintf($lang['Delete'],$this->obj->getFullName())) ."<br>\n";
      }
      if ( ($this->user->admin == 1) ) {
-       echo menulink("database_new.php",$lang['NewEntry'],$lang['DBCreate']) ."<BR>";
+       echo menulink("database_new.php",$lang['NewEntry'],$lang['DBCreate']) ."<br>";
      }
      echo "</td></tr>";
    }

Index: database_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database_show.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- database_show.php	23 Dec 2002 10:01:35 -0000	1.26
+++ database_show.php	31 Dec 2002 14:33:37 -0000	1.27
@@ -114,20 +114,20 @@
 
      echo "<tr><td>";
      if ( ($this->user->isAdmin()) ) {
-       echo menulink("database_new.php",$lang['NewEntry'],$lang['DBCreate']) ."<BR>";
+       echo menulink("database_new.php",$lang['NewEntry'],$lang['DBCreate']) ."<br>";
      }
      if ( $this->obj->mod_ok()  ) {
-       echo menulink("database_new.php?id=". $this->obj->id ,$lang['Modify'],sprintf($lang['DBModifyI'],$this->obj->getFullName())) ."<BR>\n";
+       echo menulink("database_new.php?id=". $this->obj->id ,$lang['Modify'],sprintf($lang['DBModifyI'],$this->obj->getFullName())) ."<br>\n";
      }
-     echo "<BR>\n";
+     echo "<br>\n";
      if ( $this->obj->is_supported() ) {
-       echo menulink("update.php?id=". $this->obj->id ,$lang['DBUpdate'],sprintf($lang['DBUpdateI'],$this->obj->getFullName())) ."<BR>";
+       echo menulink("update.php?id=". $this->obj->id ,$lang['DBUpdate'],sprintf($lang['DBUpdateI'],$this->obj->getFullName())) ."<br>";
      }
      if ( ($this->obj->id >= 0) && $this->obj->see_ok() && (isset($tutos[dbname][$this->obj->id])) ) {
-       echo menulink("logout.php?db=". $this->obj->id ,$lang['DBrelogin'],sprintf($lang['DBreloginI'],$this->obj->getFullName())) ."<BR>\n";
+       echo menulink("logout.php?db=". $this->obj->id ,$lang['DBrelogin'],sprintf($lang['DBreloginI'],$this->obj->getFullName())) ."<br>\n";
      }
 
-     echo menulink("admin_sync.php",$lang['AdminDBSync'],$lang['AdminDBSync']) ."<BR>";
+     echo menulink("admin_sync.php",$lang['AdminDBSync'],$lang['AdminDBSync']) ."<br>";
 
      echo "</td></tr>";
    }

Index: department_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_del.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- department_del.php	16 Dec 2002 20:34:12 -0000	1.16
+++ department_del.php	31 Dec 2002 14:33:37 -0000	1.17
@@ -18,10 +18,10 @@
  $msg = "";
  $d = new department($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= "Could not delete department <BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= "Could not delete department<br>";
  } else {
-   $d->read($HTTP_GET_VARS['id']);
+   $d->read($_GET['id']);
  }
 
  if ( ! $d->del_ok() ) {

Index: department_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/department_ins.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- department_ins.php	5 Nov 2002 19:57:46 -0000	1.19
+++ department_ins.php	31 Dec 2002 14:33:37 -0000	1.20
@@ -21,35 +21,35 @@
  $gotourl = "department_new.php";
  $msg = "";
 
- if ( !isset($HTTP_POST_VARS['id']) ) {
-   $msg .= "Please enter a id<BR>";
+ if ( !isset($_POST['id']) ) {
+   $msg .= "P...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/layout

Modified Files:
	classic_layout.pinc layout_base.pinc test_layout.pinc 
Log Message:
cleanups for HTML

Index: classic_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/classic_layout.pinc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- classic_layout.pinc	23 Dec 2002 10:01:39 -0000	1.24
+++ classic_layout.pinc	31 Dec 2002 14:33:45 -0000	1.25
@@ -40,7 +40,7 @@
         echo "</a>";
       }
       echo "</td>\n";
-      echo "  <td width=\"8%\" valign=\"middle\" align=\"left\">&nbsp;<a class=\"nodeco\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"TUTOS ". $tutos[version] ."\">TUTOS</A></td>\n";
+      echo "  <td width=\"8%\" valign=\"middle\" align=\"left\">&nbsp;<a class=\"nodeco\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"TUTOS ". $tutos[version] ."\">TUTOS</a></td>\n";
     }
     echo "  <td width=\"50%\" align=\"center\" class=\"pagetitle\">". ($name == "" ? $this->name:$name) ."</td>\n";
     echo "  <td width=\"34%\" valign=\"middle\" align=\"right\" class=\"headline\">";
@@ -109,9 +109,9 @@
    * display the screen
    */
   function display () {
-    global $msg,$HTTP_GET_VARS;
+    global $msg;
 
-    if ( isset($HTTP_GET_VARS['mark']) && isset($HTTP_GET_VARS['action']) && ($HTTP_GET_VARS['action'] != -1) ) {
+    if ( isset($_GET['mark']) && isset($_GET['action']) && ($_GET['action'] != -1) ) {
       $this->action = $this->action();
     }
     $this->prepare();

Index: layout_base.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/layout_base.pinc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- layout_base.pinc	10 Nov 2002 13:24:46 -0000	1.13
+++ layout_base.pinc	31 Dec 2002 14:33:46 -0000	1.14
@@ -27,7 +27,7 @@
    * initialize
    */
   function init (&$user) {
-    global $msg,$HTTP_GET_VARS;
+    global $msg;
 
     list($usec,$sec) = explode(" ",microtime());
     $this->start_ts = (float)$usec + (float)$sec;
@@ -35,13 +35,13 @@
     $this->dbconn = $user->dbconn;
     $this->user->layout = &$this;
 
-    if (isset($HTTP_GET_VARS['format'])) {
-      $this->format = $HTTP_GET_VARS['format'];
+    if (isset($_GET['format'])) {
+      $this->format = $_GET['format'];
     } else {
       $this->format = "html";
     }
-    if ( isset($HTTP_GET_VARS['start']) ) {
-      $this->start = $HTTP_GET_VARS['start'];
+    if ( isset($_GET['start']) ) {
+      $this->start = $_GET['start'];
     } else {
       $this->start = 0;
     }
@@ -291,9 +291,14 @@
 		}
 	  }
     }
+	$x =  $this->obj->getFullName();
+
+    if ( strlen($x) > 20 ) {
+      $x = substr($x,0,15) ."...". substr($x,-2);
+    }
 
     $_SESSION['history'][] = array(url => $this->obj->getUrl(),
-                                   text => $this->obj->getFullName(),
+                                   text => $x,
                                    info => $lang[$this->obj->getType()] .":" . $this->obj->getFullName()
                                   );
     return "";

Index: test_layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/test_layout.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- test_layout.pinc	13 Nov 2002 20:10:10 -0000	1.28
+++ test_layout.pinc	31 Dec 2002 14:33:46 -0000	1.29
@@ -40,7 +40,7 @@
         echo "</a>";
       }
       echo "</td>\n";
-      echo "  <td class=\"headline\" width=\"8%\" valign=\"middle\" align=\"left\">&nbsp;<a class=\"nodeco\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"TUTOS ". $tutos[version] ."\">TUTOS</A></td>\n";
+      echo "  <td class=\"headline\" width=\"8%\" valign=\"middle\" align=\"left\">&nbsp;<a class=\"nodeco\" href=\"". $tutos['base'] ."/html/copyright.html\" title=\"TUTOS ". $tutos[version] ."\">TUTOS</a></td>\n";
     }
     echo "  <td class=\"headline\" width=\"50%\" align=\"center\"><span class=\"pagetitle\">". ($name == "" ? $this->name:$name) ."</span></td>\n";
     echo "  <td class=\"headline\" width=\"10%\" valign=\"middle\" align=\"right\">";
@@ -49,7 +49,7 @@
     } else {
       echo Date("l d. M Y");
     }
-    echo "&nbsp;<BR>";
+    echo "&nbsp;<br>";
     if ( isset($lang['TimeFormatPHP']) ) {
       echo Date($lang['TimeFormatPHP']);
     } else {

Update of /cvsroot/tutos/tutos/php/invoice
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/invoice

Modified Files:
	invoice.pinc invoice_del.php invoice_ins.php invoice_new.php 
	invoice_overview.php 
Log Message:
cleanups for HTML

Index: invoice.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice.pinc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- invoice.pinc	23 Dec 2002 10:01:38 -0000	1.28
+++ invoice.pinc	31 Dec 2002 14:33:44 -0000	1.29
@@ -874,7 +874,7 @@
    * create a link where a invoice for the given object could be added
    */
   function getaddlink (&$user,&$obj,$text = "") {
-     global $lang,$HTTP_SERVER_VARS;
+     global $lang;
 
      if ( $obj == -1 ) return ""; 
      if (! is_object($obj) ) return "";
@@ -882,10 +882,10 @@
      if (! $user->feature_ok(useinvoice,PERM_NEW) ) return "";
      if (! $obj->see_ok() ) return "";
 
-     if ( "company_show.php" == basename($HTTP_SERVER_VARS['PHP_SELF']) ) {
+     if ( "company_show.php" == basename($_SERVER['PHP_SELF']) ) {
        return;
 	 }
-     if ( "department_show.php" == basename($HTTP_SERVER_VARS['PHP_SELF']) ) {
+     if ( "department_show.php" == basename($_SERVER['PHP_SELF']) ) {
        return;
 	 }
      $x = array( url => "invoice/invoice_new.php?link_id=". $obj->id,

Index: invoice_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_del.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- invoice_del.php	20 Dec 2002 07:24:22 -0000	1.7
+++ invoice_del.php	31 Dec 2002 14:33:45 -0000	1.8
@@ -22,22 +22,22 @@
  loadmodule('invoice');
 
  $msg = "";
- $gotourl = $HTTP_SERVER_VARS['HTTP_REFERER'];
+ $gotourl = $_SERVER['HTTP_REFERER'];
  $obj = new invoice($dbconn);
 
- if ( empty($HTTP_GET_VARS['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<BR>";
+ if ( empty($_GET['id']) ) {
+   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br>";
  } else {
-   $obj->read($HTTP_GET_VARS['id']);
+   $obj->read($_GET['id']);
    $obj->read_pos();
    if ( $obj->id < 1 ) {
-     $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) . "<BR>";
+     $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) . "<br>";
    } else {
      $gotourl = $obj->getUrl();
    }
  }
  if ( ! $obj->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br>";
  }
 
  if ( $msg == "" ) {
@@ -45,14 +45,14 @@
    $msg .= $obj->delete();
    $dbconn->Commit("WORK");
 
-   $gotourl = "invoice_overview.php";
+   $gotourl = "invoice/invoice_overview.php";
  }
 
  $gotourl= addUrlParameter($gotourl,"msg=". UrlEncode($msg));
  $gotourl = addSessionKey($gotourl);
 
  Header("Status: 302 Moved Temporarily");
- Header("Location: $gotourl");
+ Header("Location: ". dirname(getBaseUrl()) ."/". $gotourl);
  $dbconn->Close();
  /*
   *  CVS Info:  $Id$

Index: invoice_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_ins.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- invoice_ins.php	16 Dec 2002 06:20:42 -0000	1.7
+++ invoice_ins.php	31 Dec 2002 14:33:45 -0000	1.8
@@ -24,9 +24,9 @@
  $msg = "";
 
  $i = new invoice($dbconn);
- if ( isset($HTTP_POST_VARS['id']) ) {
-   $i->read($HTTP_POST_VARS['id']);
-   if ( $i->id != $HTTP_POST_VARS['id'] ) {
+ if ( isset($_POST['id']) ) {
+   $i->read($_POST['id']);
+   if ( $i->id != $_POST['id'] ) {
      $msg .= sprintf($lang['Err0040'],$lang[$i->getType()]);
    } else {
      $gotourl= addUrlParameter($gotourl,"id=". $i->id);
@@ -36,25 +36,25 @@
    $i->creator = $current_user;
  }
 
- if ( isset($HTTP_POST_VARS['link_id']) ) {
-   $i->link_id = $HTTP_POST_VARS['link_id'];
+ if ( isset($_POST['link_id']) ) {
+   $i->link_id = $_POST['link_id'];
    $gotourl= addUrlParameter($gotourl,"link_id=". $i->link_id);
  }
 
- if ( isset($HTTP_POST_VARS['accountant']) ) {
-   $i->setAccountant($HTTP_POST_VARS['accountant']);
+ if ( isset($_POST['accountant']) ) {
+   $i->setAccountant($_POST['accountant']);
    $gotourl= addUrlParameter($gotourl,"accountant=". $i->accountant);
  }
 
- if ( isset($HTTP_POST_VARS['name']) && ($HTTP_POST_VARS['name'] != "") ) {
-   $i->setName(Stripslashes($HTTP_POST_VARS['name']));
+ if ( isset($_POST['name']) && ($_POST['name'] != "") ) {
+   $i->setName(Stripslashes($_POST['name']));
    $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($i->name));
  } else {
-   $msg .= sprintf($lang['Err0009'],$lang['InvoiceName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['InvoiceName']) ."<br>";
  }
 
- if ( isset($HTTP_POST_VARS['state']) ) {
-   $i->setState($HTTP_POST_VARS['state']);
+ if ( isset($_POST['state']) ) {
+   $i->setState($_POST['state']);
    $gotourl= addUrlParameter($gotourl,"state=". $i->state);
  }
 
@@ -63,7 +63,7 @@
    $d->setDateTimeF("d". $x);
    $gotourl= addUrlParameter($gotourl,"d".$x."=". $d->getYYYYMMDD() );
    if ( 1 != $d->checkDMY() ) {
-     $msg .= sprintf($lang['Err0038'],$lang['InvDateDue'][$i]) ."<BR>";
+     $msg .= sprintf($lang['Err0038'],$lang['InvDateDue'][$i]) ."<br>";
    } else {
      $i->setDateDue($x,$d);
    }
@@ -72,39 +72,39 @@
    $d->setDateTimeF("s". $x);
    $gotourl= addUrlParameter($gotourl,"s".$x."=". $d->getYYYYMMDD() );
    if ( 1 != $d->checkDMY() ) {
-     $msg .= sprintf($lang['Err0038'],$lang['InvDateSent'][$i]) ."<BR>";
+     $msg .= sprintf($lang['Err0038'],$lang['InvDateSent'][$i]) ."<br>";
    } else {
      $i->setDateSent($x,$d);
    }
  }
 
- if ( isset($HTTP_POST_VARS['cfn']) ) {
-   if ( empty($HTTP_POST_VARS['cfn']) ) {
-     $msg .= sprintf($lang['Err0009'],$lang['InvoiceCustomer']) ."<BR>";
+ if ( isset($_POST['cfn']) ) {
+   if ( empty($_POST['cfn']) ) {
+     $msg .= sprintf($lang['Err0009'],$lang['InvoiceCustomer']) ."<br>";
    } else {
-     $customer = check_field($HTTP_POST_VARS['cfn'],"cfn","cl","acd");
+     $customer = check_field($_POST['cfn'],"cfn","cl","acd");
      $i->setCustomer($customer);
    }
  }
- if ( isset($HTTP_POST_VARS['cid']) ) {
-   $m = getObject($dbconn,$HTTP_POST_VARS['cid']);
+ if ( isset($_POST['cid']) ) {
+   $m = getObject($dbconn,$_POST['cid']);
    $i->setCustomer($m);
  }
  # Add Positions
- if ( isset($HTTP_POST_VARS['add']) ) {
-   @reset($HTTP_POST_VARS['add']);
-   while (list ($key,$val) = @each ($HTTP_POST_VARS['add'])) {
+ if ( isset($_POST['add']) ) {
+   @reset($_POST['add']);
+   while (list ($key,$val) = @each ($_POST['add'])) {
      $i->add_Pos($val);
    }
  }
 
  # Actions in fields
 
- @reset($HTTP_POST_VARS);
- while (list ($key,$val) = @each ($HTTP_POST_VARS)) {
+ @reset($_POST);
+ while (list ($key,$val) = @each ($_POST)) {
    if ( ereg("^([CIDST])-(.*)",$key,$a) ) {
      if ( !isset($i->pos[$a[2]]) ) {
-	   $msg .= "missing ". $a[2] ."<BR>";
+	   $msg .= "missing ". $a[2] ."<br>";
      }
      if ( $a[1] == "T" ) {
        $i->pos[$a[2]]->tax = $val;
@@ -124,9 +124,9 @@
    }
  }
  # Delete Positions
- if ( isset($HTTP_POST_VARS['del']) ) {
-   @reset($HTTP_POST_VARS['del']);
-   while (list ($key,$val) = @each ($HTTP_POST_VARS['del'])) {
+ if ( isset($_POST['del']) ) {
+   @reset($_POST['del']);
+   while (list ($key,$val) = @each ($_POST['del'])) {
      $i->pos[$val]->DELETE = 1;
    }
  }

Index: invoice_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_new.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- invoice_new.php	23 Dec 2002 10:01:38 -0000	1.23
+++ invoice_new.php	31 Dec 2002 14:33:45 -0000	1.24
@@ -304,7 +304,7 @@
 
      echo "<tr><td>";
      if ( $this->obj->id > 0 ) {
-       echo  menulink("invoice/invoice_show.php?id=". $this->obj->id ,$lang['AppSeeEntry'],$lang['AppSeeEntryI']) . "<BR>";
+       echo  menulink("invoice/invoice_show.php?id=". $this->obj->id ,$lang['AppSeeEntry'],$lang['AppSeeEntryI']) . "<br>";
      } 
      echo "</td></tr>";
    }
@@ -320,7 +320,7 @@
      if ( isset($_GET['id']) ) {
        $this->obj->read($_GET['id']);
        if ($this->obj->id == -1) {
-         $msg .= sprintf($lang['Err0040'],$lang[$i->getType()]) . "<BR>";
+         $msg .= sprintf($lang['Err0040'],$lang[$i->getType()]) . "<br>";
          $this->stop = true;
        }
        $this->name .= " : ". $this->obj->getFullName();
@@ -351,7 +351,7 @@
        }
      } else if ( $this->obj->id == -1 ) {
        # new and no link_id
-       $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]) . "<BR>";
+       $msg .= sprintf($lang['Err0040'],$lang[$this->obj->getType()]) . "<br>";
        $this->stop = true;
      }
 

Index: invoice_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/invoice/invoice_overview.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- invoice_overview.php	23 Dec 2002 10:01:38 -0000	1.24
+++ invoice_overview.php	31 Dec 2002 14:33:45 -0000	1.25
@@ -139,10 +139,10 @@
            continue;
          }
          if ( $b->del_ok() ) {
-           $msg .= sprintf($lang['InvDelInfo'], $b->getFullName()) ."<BR>";
+           $msg .= sprintf($lang['InvDelInfo'], $b->getFullName()) ."<br>";
            $msg .= $b->delete();
          } else {
-           $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]) ."<BR>\n";
+           $msg .= $b->getLink() .": ". sprintf($lang['Err0023'],$lang[$b->getType()]) ."<br>\n";
          }
          unset($p);
        }

Update of /cvsroot/tutos/tutos/php/installation
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/installation

Modified Files:
	installation.pinc installation_del.php installation_ins.php 
Log Message:
cleanups for HTML

Index: installation.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- installation.pinc	23 Dec 2002 10:01:38 -0000	1.12
+++ installation.pinc	31 Dec 2002 14:33:44 -0000	1.13
@@ -46,7 +46,7 @@
       echo $f->getLink();
 	}
     echo " : ". $f->description;
-    echo  "<BR>\n";
+    echo  "<br>\n";
     if ( $cols > 0 ) {
       echo "</td></tr>\n";
     }

Index: installation_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_del.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- installation_del.php	16 Dec 2002 20:36:41 -0000	1.6
+++ installation_del.php	31 Dec 2002 14:33:44 -0000	1.7
@@ -24,10 +24,10 @@
 
  $i = new installation($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
+ if ( !isset($_GET['id']) ) {
    $msg .= sprintf($lang['Err0040'],$lang[$t->getType()]);
  } else {
-   $i->read($HTTP_GET_VARS['id']);
+   $i->read($_GET['id']);
    $gotourl = $i->product->getUrl();
  }
  if ( ! $i->del_ok() ) {

Index: installation_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/installation/installation_ins.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- installation_ins.php	14 Nov 2002 20:26:25 -0000	1.4
+++ installation_ins.php	31 Dec 2002 14:33:44 -0000	1.5
@@ -29,14 +29,14 @@
  }
 
  if ( empty($_POST['pid']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['Product']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['Product']) ."<br>";
  } else {
    $gotourl= addUrlParameter($gotourl,"pid=". $_POST['pid']);
  }
 
  if ( isset($_POST['cfn']) ) {
    if ( empty($_POST['cfn']) ) {
-     $msg .= sprintf($lang['Err0009'],$lang['Customer']) ."<BR>";
+     $msg .= sprintf($lang['Err0009'],$lang['Customer']) ."<br>";
    } else {
      $x = check_field($_POST['cfn'],"cfn","cl","acd");
 	 $obj->setCustomer($x->id);
@@ -60,7 +60,7 @@
  $money = 0.0;
  sscanf($_POST['money'],"%f",&$money);
  if ( !empty($money) && !is_double($money) ) {
-   $msg .= sprintf($lang['Err0017'],$lang['Money']) ."<BR>";
+   $msg .= sprintf($lang['Err0017'],$lang['Money']) ."<br>";
  }
  $gotourl= addUrlParameter($gotourl,"money=". UrlEncode($money));
  $gotourl= addUrlParameter($gotourl,"currency=". UrlEncode($_POST['currency']));

Update of /cvsroot/tutos/tutos/php/group
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/group

Modified Files:
	group.pinc group_del.php group_ins.php group_new.php 
	group_show.php 
Log Message:
cleanups for HTML

Index: group.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group.pinc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- group.pinc	18 Dec 2002 13:06:17 -0000	1.23
+++ group.pinc	31 Dec 2002 14:33:43 -0000	1.24
@@ -331,16 +331,16 @@
    * parse the values
    */
   function parseform (&$user,&$obj,&$gotourl) {
-    global $lang,$HTTP_POST_VARS,$HTTP_GET_VARS;
+    global $lang;
 
     if ( ! $user->feature_ok(usegroups,PERM_SEE) ) {
       return;
     }
     $msg = "";
-    if ( isset($HTTP_POST_VARS['crm']) ) {
-      $crm = $HTTP_POST_VARS['crm'];
-    } else if ( isset($HTTP_GET_VARS['crm']) )  {
-      $crm = $HTTP_GET_VARS['crm'];
+    if ( isset($_POST['crm']) ) {
+      $crm = $_POST['crm'];
+    } else if ( isset($_GET['crm']) )  {
+      $crm = $_GET['crm'];
     } else {
       return $msg;
     }

Index: group_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_del.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- group_del.php	6 Nov 2002 08:01:22 -0000	1.6
+++ group_del.php	31 Dec 2002 14:33:43 -0000	1.7
@@ -13,25 +13,25 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("group");
+ loadmodules("group","del");
  loadmodule("group");
 
  /* Check Input */
  $msg = "";
- $gotourl = "group_overview.php";
+ $gotourl = "group/group_overview.php";
  $obj = new group($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br>";
  } else {
-   $obj->read($HTTP_GET_VARS['id']);
+   $obj->read($_GET['id']);
    $gotourl = $obj->getUrl();
  }
  if ( ! $obj->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br>";
  }
  if ( $msg == "" ) {
-   $gotourl = "group_overview.php";
+   $gotourl = "group/group_overview.php";
 
    $dbconn->Begin("WORK");
    $msg .= $obj->delete();
@@ -42,7 +42,7 @@
  $gotourl = addSessionKey($gotourl);
 
  Header("Status: 302 Moved Temporarily");
- Header("Location:". $gotourl);
+ Header("Location: ". dirname(getBaseUrl()) ."/". $gotourl);
  $dbconn->Close();
  /*
   *  CVS Info:  $Id$

Index: group_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_ins.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- group_ins.php	16 Dec 2002 12:56:23 -0000	1.8
+++ group_ins.php	31 Dec 2002 14:33:44 -0000	1.9
@@ -29,7 +29,7 @@
  }
 
  if ( !isset($_POST['name']) || empty($_POST['name']) ||  ($_POST['name'] == $lang['PlsChangeName']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['GroupName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['GroupName']) ."<br>";
  } else {
    $b->setName(trim(StripSlashes($_POST['name'])));
    $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($b->name));

Index: group_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- group_new.php	16 Dec 2002 12:56:23 -0000	1.16
+++ group_new.php	31 Dec 2002 14:33:44 -0000	1.17
@@ -39,7 +39,7 @@
        echo "<tr>\n";
        echo " <td colspan=\"3\">". sprintf ($lang['BugCreation'],$this->obj->creator->getLink(),$this->obj->creation->getDateTime()) ."</td>\n";
        echo " <td align=\"right\">". acl_link($this->obj) ."</td>\n";
-       echo "</TR>\n";
+       echo "</tr>\n";
      }
 
      echo "<tr>\n";
@@ -116,7 +116,7 @@
      if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
        $x = array( url => "group/group_del.php?id=". $this->obj->id,
                    text => $lang['Delete'],
-                   info => sprintf($lang['Delete'],$this->obj->getFullname()),
+                   info => $lang['Delete'] ." ". $this->obj->getFullname(),
                    confirm => true,
                    category => array("group","del","obj")
                  );

Index: group_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/group/group_show.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- group_show.php	23 Dec 2002 10:01:38 -0000	1.19
+++ group_show.php	31 Dec 2002 14:33:44 -0000	1.20
@@ -83,7 +83,7 @@
              echo " <td>". $f2->desc1 ."&nbsp;</td>\n";
              echo " <td>". asEmail($f2->email_1,$f2->email_1,$f2->getFullName());
              if ( $f2->email_2 != "" ) {
-               echo "<BR>". asEmail($f2->email_2,$f2->email_2,$f2->getFullName());
+               echo "<br>". asEmail($f2->email_2,$f2->email_2,$f2->getFullName());
              }
              echo "&nbsp;</td>\n";
              echo " <td>". handle('phone',$f2,$f2->phone_1);
@@ -112,13 +112,13 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$tutos,$lang,$HTTP_GET_VARS;
+     global $msg,$tutos,$lang;
 
      $this->name = $lang['GroupDetail'];
      $this->obj = new group($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()]);

Update of /cvsroot/tutos/tutos/php/file
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/file

Modified Files:
	file.pinc file_del.php file_ins.php file_new.php 
	file_overview.php 
Log Message:
cleanups for HTML

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- file.pinc	23 Dec 2002 10:01:38 -0000	1.3
+++ file.pinc	31 Dec 2002 14:33:43 -0000	1.4
@@ -107,8 +107,8 @@
     if ( $this->author->id == -1 ) {
       $this->author     = new team($this->dbconn);
       $this->author->read($cid);
-	}
-	parent::read_result($r,$pos);
+    }
+    parent::read_result($r,$pos);
     return;
   }
   /**
@@ -149,13 +149,13 @@
     global $lang;
 
     if ( empty($text) ) {
-		$text = $this->name;
-	}
+        $text = $this->name;
+    }
     if ( ! file_exists($this->base ."/". $this->fileloc) ) {
-      $text = "<STRIKE>". myentities($text) ."</STRIKE>";
+      $text = "<strike>". myentities($text) ."</strike>";
     } else {
       $text = myentities($text);
-	}
+    }
     if ( $this->see_ok() ) {
       return makelink( $this->getURL(), $text ,$lang['File'] ." ". $this->name);
     } else {
@@ -171,7 +171,7 @@
     $fname = $this->base ."/". $this->fileloc;
 
     if ( ! file_exists($fname) ) {
-      echo "<SPAN CLASS=warn>Missing file !\n" . $fname . "</SPAN>";
+      echo "<span class=\"warn\">Missing file !\n" . $fname . "</span>";
       return;
     }
 
@@ -180,33 +180,45 @@
         $im = getimagesize($fname,$info) ;
         echo $im[3] ."\n";
         if (isset ($info["APP13"])) {
-	  $iptc = iptcparse ($info["APP13"]);
-	  if (is_array($iptc)) {
-	    while(list($key, $val) = each($iptc)) {
-	      while(list($k, $v) = each($val)) {
-            echo "$k => \"$v\"\n";
-	      }
-	    }
-	  }
-	}
+          $iptc = iptcparse ($info["APP13"]);
+          if (is_array($iptc)) {
+            while(list($key, $val) = each($iptc)) {
+              while(list($k, $v) = each($val)) {
+                echo "$k => \"$v\"\n";
+              }
+            }
+          }
+        }
       }
     }
-    if ( function_exists('read_exif_data') ) {
+    if ( function_exists('exif_read_data') ) {
       if ( ($this->filetype == "image/jpeg") ) {
         echo "EXIF:\n";
-        $exif = read_exif_data ($fname);
+        $exif = exif_read_data ($fname,"ANY_TAG",true,true);
         while(list($key, $val) = each($exif)) {
-          if ( $key == "Thumbnail" ) {
-            echo "\t". $key ." => <img alt=\"". $this->getFullName() ."\" align=\"top\" border=\"1\" src=\"".  addSessionKey("file_show.php?format=thumbnail&id=". $this->id) ."\">\n\n";
-          } else {
-            echo "\t". $key ." => ". $val ."\n";
-          }
+            if (gettype($val) == "array") {
+              echo "\t". $key ."\n";
+              foreach($val as $k2 => $v2) { 
+                if ($k2 == "MakerNote") {
+                  echo "\t\t". $k2 ." => ". gettype($v2)."\n";
+                } else if ($k2 == "UserComment") {
+                  echo "\t\t". $k2 ." => ". gettype($v2)."\n";
+                } else if ($k2 == "THUMBNAIL") {
+                  echo "\t\t". $key ." => <img alt=\"". $this->getFullName() ."\" align=\"top\" border=\"1\" src=\"".  dirname(getBaseUrl()) ."/". addSessionKey($this->getUrl()."&amp;format=thumbnail") ."\">\n\n";
+                } else {
+                  echo "\t\t". $k2 ." => ". chop($v2)."\n";
+                }
+              }
+            } else {
+              echo "\t". $key ." => ". chop($val) ."\n";
+            }
         }
       }
     }
     if (  file_exists($tutos[wvSummary]) && is_executable($tutos[wvSummary])) {
       if ( ($this->filetype == "application/vnd.ms-excel")
         || ($this->filetype == "application/msword" )
+        || ($this->filetype == "application/vnd.ms-project" )
         || ($this->filetype == "application/doc" ) ) {
         @passthru($tutos[wvSummary] ." \"". $fname ."\" | grep -v \"^no\"");
       }
@@ -228,9 +240,9 @@
     if ( $this->vsys == 1 ) {
       if (  file_exists($this->base ."/". $this->fileloc . $v)) {
         readfile ($this->base ."/". $this->fileloc . $v);
-	  } else {
+      } else {
         readfile ($this->base ."/". $this->fileloc);
-	  }
+      }
     }
     if ( $this->vsys == 2 ) {
       if ( $v != $this->version ) {
@@ -245,20 +257,20 @@
    */
   function thumbnail($v = "") {
     if ( ($v == "") || ($this->vsys == 0) ) {
-      $exif = read_exif_data ($this->base ."/". $this->fileloc);
-      echo $exif["Thumbnail"];
+      $exif = exif_read_data ($this->base ."/". $this->fileloc,"ANY_TAG",true,true);
+      echo $exif["THUMBNAIL"]["THUMBNAIL"];
       return;
     }
     if ( $this->vsys == 1 ) {
       if (  file_exists($this->base ."/". $this->fileloc ."_". $v)) {
-        $exif = read_exif_data ($this->base ."/". $this->fileloc ."_". $v);
-        echo $exif["Thumbnail"];
-	  } else {
-        $exif = read_exif_data($this->base ."/". $this->fileloc);
-        echo $exif["Thumbnail"];
-	  }
+        $exif = exif_read_data ($this->base ."/". $this->fileloc ."_". $v,"ANY_TAG",true,true);
+        echo $exif["THUMBNAIL"]["THUMBNAIL"];
+      } else {
+        $exif = exif_read_data($this->base ."/". $this->fileloc,"ANY_TAG",true,true);
+        echo $exif["THUMBNAIL"]["THUMBNAIL"];
+      }
     }
-	return;
+    return;
   }
   /**
    * Show this file
@@ -327,6 +339,13 @@
       $fp = fopen($this->base ."/". $this->fileloc, "r");
       @fpassthru ($fp);
       return;
+    } else if ( ($this->filetype == "application/vnd-ms-excel") && ($this->filetype == "application/vnd-ms-project"))  {
+      Header("Content-type: ".$this->filetype);
+      Header("Content-Length: ". filesize($this->base ."/". $this->fileloc));
+      Header("Content-Disposition: inline; filename=\"". $this->filename ."\"");
+      $fp = fopen($this->base ."/". $this->fileloc, "r");
+      @fpassthru ($fp);
+      return;
     } else if ( (($this->filetype == "application/msword") || ($this->filetype == "application/doc")) 
                 && file_exists($tutos[wvHtml]) && is_executable($tutos[wvHtml]) ) {
       Header("Content-Description: ". $this->name );
@@ -365,8 +384,8 @@
     if ( $this->locked > 0 ) {
       if ( $this->locker->id != $current_user->id ) {
         return 0;
-	  }
-	}
+      }
+    }
     return acl_del_ok($this);
   }
   /**
@@ -381,8 +400,8 @@
     if ( $this->locked > 0 ) {
       if ( $this->locker->id != $current_user->id ) {
         return 0;
-	  }
-	}
+      }
+    }
     return acl_mod_ok($this);
   }
   /**
@@ -395,9 +414,9 @@
     if ( $this->vsys == 1 ) {
       # Read all files that look like $xx
       $d = @opendir(dirname($xx));
-	  if ( $d == false ) {
+      if ( $d == false ) {
         return;
-	  }
+      }
       @rewinddir($d);
       while (($f = @readdir($d))!= false) {
         if ( $f == "." ) { continue; }
@@ -467,8 +486,8 @@
     if ( $msg != "" ) {
       $this->id = -1;
       $msg .= "<br>FILE NOT SAVED";
-  	  return $msg;
-	}
+      return $msg;
+    }
     if ( $this->link_id == -1 ) {
       $this->ref = $this->creator;
       $this->link_id = $this->creator->id;
@@ -490,7 +509,7 @@
       $newfile = 1;
     } else {
       $newfile = 0;
-	}
+    }
 
     # Make the Directories
     if ( ! @file_exists($this->base . "/" . $this->link_id)) {
@@ -509,8 +528,8 @@
     if ( $msg != "" ) {
       $this->id = -1;
       $msg .= "<br>FILE NOT SAVED";
-  	  return $msg;
-	}
+      return $msg;
+    }
 
     $q->addFV("name",$this->name,"STRING",$table['file']['name'][size]);
     $q->addFV("filename",$this->filename,"STRING",$table['file']['filename'][size]);
@@ -531,9 +550,9 @@
       # Transfer the file to the repository
       if ( $this->vsys == FILE_NOCHECK ) {
         @copy ($this->tmploc , $this->base ."/". $this->fileloc);
-	  } else {
+      } else {
         @move_uploaded_file ($this->tmploc , $this->base ."/". $this->fileloc);
-	  }
+      }
       @chmod ($this->base ."/". $this->fileloc, 0600);
       if ( $this->vsys == FILE_NOVERS ) {
         # No Version Control
@@ -574,7 +593,7 @@
         if ( $this->vsys == FILE_NOCHECK ) {
           @copy ($this->tmploc , $this->base ."/". $this->fileloc);
           @chmod ($this->base ."/". $this->fileloc, 0600);
-		} else
+        } else
         if ( $this->vsys == FILE_NOVERS ) {
           # No Version Control
           @move_uploaded_file($this->tmploc , $this->base ."/". $this->fileloc);
@@ -719,9 +738,9 @@
        echo $user->layout->showfield($lang['Files']);
        echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
        if ( $format == "paper" ) {
-	     show_Files($obj,-1);
+         show_Files($obj,-1);
        } else {
-	     show_Files($obj);
+         show_Files($obj);
        }
        echo " </td>\n";
        echo "</tr>\n";
@@ -754,8 +773,7 @@
     $msg = "";
     tutos_file::obj_read($obj);
     if ( count($obj->filelist) > 0 ) {
-      @reset ($obj->filelist);
-      while ( list ($i,$f) = @each ($obj->filelist) ) {
+      foreach ($obj->filelist as $i => $f) {
         $msg .= $f->delete();
       }
     }
@@ -790,7 +808,7 @@
 
     $r = info_table_start();
     $r .= " <tr>\n";
-	$m = tutos_file::getSelectLink($user);
+    $m = tutos_file::getSelectLink($user);
     $r .= " <th colspan=\"3\">". menulink($m[url],$m[text],$m[info]) ."</th>\n";
     $r .= " </tr>\n";
     $r .= " <tr>\n";
@@ -801,7 +819,7 @@
     while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) {
       $f = new tutos_file($user->dbconn);
       $f->read_result($res,$a);
-	  if ( $f->see_ok() ) {
+      if ( $f->see_ok() ) {
         $r .= " <tr>\n";
         $r .= "  <td>" . $f->getLink() ."</td>\n";
         $r .= "  <td>" . $f->version ."</td>\n";

Index: file_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_del.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_del.php	16 Dec 2002 20:34:40 -0000	1.1
+++ file_del.php	31 Dec 2002 14:33:43 -0000	1.2
@@ -21,16 +21,16 @@
  $f = new tutos_file($dbconn);
 
  if ( !isset($_GET['id']) ) {
-   $msg .= "No ID given !<BR>";
+   $msg .= "No ID given !<br>";
    $gotourl = "file_overview.php";
  } else {
    $f->read($_GET['id']);
    $gotourl = $f->getURL();
    if ( $f->locked != 0 ) {
-     $msg .= $lang['Err0020'] ."<BR>";
+     $msg .= $lang['Err0020'] ."<br>";
    }
    if ( ! $f->del_ok() ) {
-     $msg .= sprintf($lang['Err0023'],$lang[$f->getType()]) ."<BR>";
+     $msg .= sprintf($lang['Err0023'],$lang[$f->getType()]) ."<br>";
    }
  }
 

Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_ins.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- file_ins.php	23 Dec 2002 10:01:38 -0000	1.3
+++ file_ins.php	31 Dec 2002 14:33:43 -0000	1.4
@@ -55,8 +55,8 @@
 
  $file = 'none';
  # Hack for Konquerer
- if ( isset($HTTP_POST_VARS['file']) ) {
-   $file = $HTTP_POST_VARS['file'];
+ if ( isset($_POST['file']) ) {
+   $file = $_POST['file'];
    if ( $file != "none" ) {
      $farr = $HTTP_POST_FILES["file"];
      if ( $farr['name'] == "" ) {
@@ -148,7 +148,7 @@
    $f->setVersion($version);
 
    if ( isset($_POST['aid']) ) {
-     $author = getObject($f->dbconn,$HTTP_POST_VARS['aid']);
+     $author = getObject($f->dbconn,$_POST['aid']);
    }
    if ( isset($author) ) {
      if ( $f->author->id != $author->id ) {

Index: file_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_new.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file_new.php	17 Dec 2002 10:54:55 -0000	1.2
+++ file_new.php	31 Dec 2002 14:33:43 -0000	1.3
@@ -87,7 +87,7 @@
        echo "<tr>\n";
        echo $this->showfield($lang['FileVersionType'],0,"vsys");
        echo " <td colspan=\"3\">&nbsp;\n";
-       echo " <font size=\"-1\">". $lang['FileVersionTypeI'] ."</font><BR>\n";
+       echo " <font size=\"-1\">". $lang['FileVersionTypeI'] ."</font><br>\n";
        echo "  <input type=\"radio\" name=\"vsys\" value=\"0\"". ( $this->obj->vsys == 0 ? " checked":"") .">&nbsp;none \n";
        echo "  <input type=\"radio\" name=\"vsys\" value=\"1\"". ( $this->obj->vsys == 1 ? " checked":"") .">&nbsp;TUTOS \n";
        if ( file_exists($tutos[ci]) && is_executable($tutos[ci]) ) {

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file_overview.php	23 Dec 2002 10:01:38 -0000	1.2
+++ file_overview.php	31 Dec 2002 14:33:43 -0000	1.3
@@ -66,7 +66,7 @@
        echo $this->OverviewRowStart($line);
        $x = myentities($f->name);
 	   if ( $this->filter['name'] != "" ) {
-         $x = eregi_replace("(". $this->filter['name'] .")","<span class=\"found\">\\1</SPAN>",$x);
+         $x = eregi_replace("(". $this->filter['name'] .")","<span class=\"found\">\\1</span>",$x);
        }
        if ( $f->see_ok() ) {
          echo " <td>". makelink($f->getUrl(),$x) ."</td>\n";

Update of /cvsroot/tutos/tutos/php/fax
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/fax

Modified Files:
	fax_ins.php 
Log Message:
cleanups for HTML

Index: fax_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/fax/fax_ins.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fax_ins.php	10 Dec 2002 18:17:44 -0000	1.1
+++ fax_ins.php	31 Dec 2002 14:33:43 -0000	1.2
@@ -16,7 +16,7 @@
 
  /* Check Input */
  if ( !isset($_POST['nr']) || empty($_POST['nr']) ) {
-   $msg .= $lang['Err0031'] ."<BR>\n";
+   $msg .= $lang['Err0031'] ."<br>\n";
  } else {
    $gotourl= addUrlParameter($gotourl,"nr=". UrlEncode($_POST['nr']));
  }
@@ -50,7 +50,7 @@
      $fd = popen($cmd ,"w");
      fputs ($fd,$fax);
      pclose($fd);
-     $msg .= sprintf($lang['FaxSpooledTo'], $nr) ."<BR>\n";
+     $msg .= sprintf($lang['FaxSpooledTo'], $nr) ."<br>\n";
      $gotourl = "fax_new.php";
    } else if ( $tutos[faxmode] == 2 ) {
      $hdr = "";
@@ -71,7 +71,7 @@
      $msg .= sprintf($lang['FaxSpooledTo'], $faxmail) ."<br>\n";
      $gotourl = "fax_new.php";
    } else {
-     $msg .= "Unknown faxmode ". $tutos[faxmode] ." please fix config.pinc<BR>";
+     $msg .= "Unknown faxmode ". $tutos[faxmode] ." please fix config.pinc<br>";
    }
    if ( isset($_POST['savenote']) ) {
      if ( ! class_exists ("note") ) {
@@ -90,7 +90,7 @@
      $gotourl = $a->getURL();
    }
  } else {
-   $msg .= $lang['Err0030'] ."<BR>\n";
+   $msg .= $lang['Err0030'] ."<br>\n";
  }
 
 

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/db

Modified Files:
	db_interbase.pinc db_mysql.pinc db_ora.pinc 
Log Message:
cleanups for HTML

Index: db_interbase.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_interbase.pinc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- db_interbase.pinc	4 Dec 2002 21:24:07 -0000	1.10
+++ db_interbase.pinc	31 Dec 2002 14:33:42 -0000	1.11
@@ -133,7 +133,6 @@
     $result = array();
     $r = @ibase_query($this->conn,$query);
     $this->lastquery = $query;
-    #echo "<BR>Q:".$query ."<BR>\n";
     if ( $r == false) {
       if ($showerror == 1) {
         Fatal_Error("Exec ". $this->conn ."|". $this->error(),$query);
@@ -145,17 +144,14 @@
     if ( gettype($r) != "resource" ) {
       return $x;
 	}
-#	echo "<BR>P:" . $r ."<BR>\n";
     $y = 0;
     $nf = ibase_num_fields($r);
     while ($row = ibase_fetch_row ($r)) {
-#	echo var_dump($row);
       for ($c = 0 ; $c < $nf; $c++) {
         $fn = ibase_field_info($r,$c);
         $cn = $this->colnameREV(strtoupper($fn['alias']));
 		if ( isset( $row[$c] ) ) {
           $result[$y][$cn] = $row[$c];
-# 	      echo  $x ." ". $c ." N:". $fn['name'] ." A:". $fn['alias'] ." V:". $row[$c] ."<BR>\n";
 		} else {
           $result[$y][$cn] = null;
 		}
@@ -501,7 +497,7 @@
     if ( isset($this->result[$pos][$fld]) || (0 == $this->result[$pos][$fld]) ) {
       return $this->result[$pos][$fld];
     } else {
-      echo "<BR>POS:".$pos ." | FLD:". $fld ." | * <BR>\n";
+#      echo "<br>POS:".$pos ." | FLD:". $fld ." | * <br>\n";
       return;
     }
   }

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- db_mysql.pinc	4 Dec 2002 15:46:24 -0000	1.11
+++ db_mysql.pinc	31 Dec 2002 14:33:42 -0000	1.12
@@ -120,7 +120,6 @@
 
     $result = @mysql_query($query,$this->conn);
     $this->lastquery = $query;
-#	echo $query."<BR>\n";
     if ( ! $result) {
       if ($showerror == 1) {
         Fatal_Error("Exec ". $this->conn ."|". $this->error(),$query);
@@ -317,7 +316,6 @@
       if ( !is_array($f) ) {
         continue;
 	  }
-#        echo $f[column] ." ". $f[type] ."<BR>\n";
       if ($f[type] == "ID_TYPE") {
         $t = "int4";
       } else if ($f[type] == "TS_TYPE") {

Index: db_ora.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_ora.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- db_ora.pinc	4 Dec 2002 15:46:24 -0000	1.12
+++ db_ora.pinc	31 Dec 2002 14:33:42 -0000	1.13
@@ -100,7 +100,6 @@
       $msg = "No Connection";
       return -1;
     }
-    # echo "Q: $query<BR>";
 
     if (0) {
       $cur = Ora_Do($this->conn,$query);
@@ -122,7 +121,6 @@
     # Parse will fail on nonexistant tables
     $p = @ora_parse($x->cur,$query);
     if ( false == $p ) {
-      # echo "P: ".$p ." ". getType($p)." ". $query ."<BR>";flush();
       if ($showerror == 1) {
         Fatal_Error("Exec ". $this->conn ." !PARSE|". $this->error($x->cur),$query);
       } else {
@@ -134,7 +132,7 @@
     $this->lastquery = $query;
     $p = @ora_exec($x->cur);
     if ( false == $p ) {
-      echo "E: ".$p ." ". getType($p)." ". $query ." ". ora_errorcode($x->cur) ."<BR>";flush();
+      echo "E: ".$p ." ". getType($p)." ". $query ." ". ora_errorcode($x->cur) ."<br>";flush();
       if ($showerror == 1) {
         Fatal_Error("Exec ". $this->conn ." !EXEC|". $this->error($x->cur),$query);
       } else {
@@ -152,9 +150,6 @@
       return $x;
     }
 
-
-    //echo "ROWS: $numrows  COLS: $numcols |   $query<BR>";
-
     if ( ! @ora_fetch($x->cur) ) {
       return $x;
     }
@@ -163,7 +158,6 @@
       do {
         for ($c = 0 ; $c < $numcols; $c++) {
           $result[$row][@ora_columnname($x->cur,$c)] = Ora_GetColumn($x->cur,$c);
-          //echo "SET ROWS: $row  COLS: $fld | ".$r[$pos][$fld]."<BR>";
         }
         $row++;
       } while ( 1 ==  @Ora_Fetch($x->cur) );
@@ -549,7 +543,6 @@
   function get($pos,$fld) {
     # Copy the whole thing
     $x = $this->result[$pos][strtoupper($fld)];
-    # echo "GET ROWS: $pos  COLS: $fld | ".$x."|<BR>";
     return $x;
 
   }

Update of /cvsroot/tutos/tutos
In directory sc8-pr-cvs1:/tmp/cvs-serv12551

Modified Files:
	Makefile 
Log Message:
cleanups for HTML

Index: Makefile
===================================================================
RCS file: /cvsroot/tutos/tutos/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Makefile	18 Dec 2002 22:04:58 -0000	1.54
+++ Makefile	31 Dec 2002 14:33:33 -0000	1.55
@@ -11,6 +11,9 @@
 #
 #
 # $Log$
+# Revision 1.55  2002/12/31 14:33:33  gokohnert
+# cleanups for HTML
+#
 # Revision 1.54  2002/12/18 22:04:58  gokohnert
 # fixes
 #
@@ -589,8 +592,8 @@
 DSLFILE      = ../tutos.dsl\#html
 STYLEVERSION = dsssl-stylesheets
 
-#COLLATEINDEX = ${SGMLBASE}/docbook/${STYLEVERSION}/bin/collateindex.pl
-COLLATEINDEX = $(shell which collateindex.pl)
+COLLATEINDEX = ${SGMLBASE}/docbook/${STYLEVERSION}/bin/collateindex.pl
+#COLLATEINDEX = $(shell which collateindex.pl)
 
 book0: documentation/tutos.sgml
 	@rm -rf documentation/$@

Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/watchlist

Modified Files:
	watchlist.pinc watchlist_ins.php 
Log Message:
cleanups for HTML

Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- watchlist.pinc	30 Nov 2002 19:04:49 -0000	1.19
+++ watchlist.pinc	31 Dec 2002 14:33:56 -0000	1.20
@@ -266,7 +266,7 @@
       $body = "";
 
       if ( ! findMailTemplate("watch_del.proto",$f,$body) ) {
-        $msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<BR>\n";
+        $msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<br>\n";
         continue;
       }
       $mail->setSubject(sprintf("TUTOS:". $$f->lg['EmailDeleted'],$obj->getFullName()));
@@ -316,7 +316,7 @@
       $f->read($r->get($a,"adr_id"));
 
 	  if ( $d->getDateShort() !=  $bd->getDateShort() ) {
-#       $msg .= "Not Tomorrow : ". $d->getDateShort() ." != ".  $bd->getDateShort()  ." ". $f->getFullName() ." ". $x->getFullName() ."<BR>";
+#       $msg .= "Not Tomorrow : ". $d->getDateShort() ." != ".  $bd->getDateShort()  ." ". $f->getFullName() ." ". $x->getFullName() ."<br>";
         $a++;
         unset($x);
         unset($f);
@@ -324,7 +324,7 @@
 	  }
 
 	  if (($d->getTimestamp() - $lc->getTimestamp()) < 86400 ) {
-#        $msg .= "Skipping : ". ($d->getTimestamp() - $lc->getTimestamp()) ." seconds<BR>";
+#        $msg .= "Skipping : ". ($d->getTimestamp() - $lc->getTimestamp()) ." seconds<br>";
         $a++;
         unset($x);
         unset($f);
@@ -338,7 +338,7 @@
       $m->setFrom($f);
       $body = "";
       if ( ! findMailTemplate($watchmailtxt,$f,$body) ) {
-        $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<BR>\n";
+        $msg .= sprintf($lang['Err0037'],$m->subject,$body) ."<br>\n";
         continue;
       }
       $m->setSubject("TUTOS:".sprintf($f->lg['EmailBirthday'],$x->getFullName()));

Index: watchlist_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_ins.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- watchlist_ins.php	6 Nov 2002 07:51:09 -0000	1.6
+++ watchlist_ins.php	31 Dec 2002 14:33:56 -0000	1.7
@@ -18,20 +18,20 @@
  /* Check Input */
  $msg = "";
  $w = new watchlist($dbconn);
- if ( empty($HTTP_GET_VARS['gotourl']) && isset($HTTP_SERVER_VARS['HTTP_REFERER']) ) {
-   $gotourl = $HTTP_SERVER_VARS['HTTP_REFERER'];
+ if ( empty($_GET['gotourl']) && isset($_SERVER['HTTP_REFERER']) ) {
+   $gotourl = $_SERVER['HTTP_REFERER'];
  }
 
- if ( empty($HTTP_GET_VARS['adr']) ) {
+ if ( empty($_GET['adr']) ) {
    $a = $current_user;
  } else {
    $a = new tutos_address($dbconn);
-   $a->read($HTTP_GET_VARS['adr']);
+   $a->read($_GET['adr']);
  }
- if ( empty($HTTP_GET_VARS['id']) ) {
-   $msg .= "Missing ID" ."<BR>";
+ if ( empty($_GET['id']) ) {
+   $msg .= "Missing ID" ."<br>";
  } else {
-   $obj = getObject($dbconn,$HTTP_GET_VARS['id']);
+   $obj = getObject($dbconn,$_GET['id']);
    $gotourl = dirname(getBaseUrl()) ."/". $obj->getUrl();
  }
 

Update of /cvsroot/tutos/tutos/php/ticker
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/ticker

Modified Files:
	ticker_overview.php 
Log Message:
cleanups for HTML

Index: ticker_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ticker/ticker_overview.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ticker_overview.php	19 Dec 2002 20:51:47 -0000	1.5
+++ ticker_overview.php	31 Dec 2002 14:33:55 -0000	1.6
@@ -65,7 +65,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS;
+     global $msg,$lang;
 
      $this->name = $lang['NewsTicker'];
      if ( ! $this->user->feature_ok(useticker,PERM_SEE) ) {

Update of /cvsroot/tutos/tutos/php/url
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/url

Modified Files:
	url_del.php url_ins.php 
Log Message:
cleanups for HTML

Index: url_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_del.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- url_del.php	6 Nov 2002 08:01:26 -0000	1.3
+++ url_del.php	31 Dec 2002 14:33:55 -0000	1.4
@@ -21,10 +21,10 @@
 
  $gotourl = "mytutos.php";
  $u = new url($dbconn);
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= "No ID for Url deletion  given !<BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= "No ID for Url deletion  given !<br>";
  } else {
-   $u->read($HTTP_GET_VARS['id']);
+   $u->read($_GET['id']);
  }
 
  if ( $msg == "" ) {

Index: url_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/url/url_ins.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- url_ins.php	6 Nov 2002 08:01:26 -0000	1.3
+++ url_ins.php	31 Dec 2002 14:33:55 -0000	1.4
@@ -29,21 +29,21 @@
    $u->creator = $current_user;
  }
 
- if ( empty($HTTP_POST_VARS['link_id']) ) {
-   $msg .= "No Link ID given !<BR>";
+ if ( empty($_POST['link_id']) ) {
+   $msg .= "No Link ID given !<br>";
  } else {
-   $u->link_id = $HTTP_POST_VARS['link_id'];
+   $u->link_id = $_POST['link_id'];
  }
 
- if ( empty($HTTP_POST_VARS['urlname']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['URLName']) ."<BR>";
+ if ( empty($_POST['urlname']) ) {
+   $msg .= sprintf($lang['Err0009'],$lang['URLName']) ."<br>";
  } else {
    $u->setName(StripSlashes($_POST['urlname']));
    $gotourl= addUrlParameter($gotourl,"urlname=". UrlEncode($u->name));
  }
 
- if ( empty($HTTP_POST_VARS['url']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['URL']) ."<BR>";
+ if ( empty($_POST['url']) ) {
+   $msg .= sprintf($lang['Err0009'],$lang['URL']) ."<br>";
  } else {
    $u->setURL(StripSlashes($_POST['url']));
    $gotourl= addUrlParameter($gotourl,"url=". UrlEncode($u->url));

Update of /cvsroot/tutos/tutos/php/resource
In directory sc8-pr-cvs1:/tmp/cvs-serv12551/php/resource

Modified Files:
	resource.pinc resource_del.php resource_ins.php 
	resource_new.php resource_overview.php 
Log Message:
cleanups for HTML

Index: resource.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource.pinc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- resource.pinc	14 Dec 2002 16:48:26 -0000	1.19
+++ resource.pinc	31 Dec 2002 14:33:51 -0000	1.20
@@ -334,7 +334,7 @@
       echo "  <tr><td class=\"". $class ."\" colspan=\"". $cols ."\" align=\"left\">";
       while ( list ($i,$f) = @each ($obj->resuselist) ) {
         echo $sep . "+" . $f->getLink();
-        $sep = "<BR>\n";
+        $sep = "<br>\n";
       }
       echo "</td></tr>\n";
     }

Index: resource_del.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_del.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- resource_del.php	6 Nov 2002 07:51:08 -0000	1.4
+++ resource_del.php	31 Dec 2002 14:33:52 -0000	1.5
@@ -21,14 +21,14 @@
  $gotourl = "resource_overview.php";
  $obj = new resource($dbconn);
 
- if ( !isset($HTTP_GET_VARS['id']) ) {
-   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<BR>";
+ if ( !isset($_GET['id']) ) {
+   $msg .= sprintf($lang['Err0040'],$lang[$obj->getType()]) ."<br>";
  } else {
-   $obj->read($HTTP_GET_VARS['id']);
+   $obj->read($_GET['id']);
    $gotourl = dirname(getBaseUrl())."/". $obj->getUrl();
  }
  if ( ! $obj->del_ok() ) {
-   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<BR>";
+   $msg .= sprintf($lang['Err0023'],$lang[$obj->getType()]) ."<br>";
  }
  if ( $msg == "" ) {
    $gotourl = getBaseUrl(). "resource_overview.php";

Index: resource_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_ins.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resource_ins.php	6 Nov 2002 07:51:08 -0000	1.3
+++ resource_ins.php	31 Dec 2002 14:33:53 -0000	1.4
@@ -16,26 +16,26 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("resource");
+ loadmodules("resource","ins");
  loadmodule("resource");
 
- $gotourl = "resource_new.php";
+ $gotourl = "resource/resource_new.php";
  $msg = "";
 
  $b = new resource($dbconn);
- if ( isset($HTTP_POST_VARS['id']) ) {
-   $gotourl= addUrlParameter($gotourl,"id=". $HTTP_POST_VARS['id']);
-   $b->read($HTTP_POST_VARS['id']);
+ if ( isset($_POST['id']) ) {
+   $gotourl= addUrlParameter($gotourl,"id=". $_POST['id']);
+   $b->read($_POST['id']);
  }
 
- if ( empty($HTTP_POST_VARS['name']) || !isset($HTTP_POST_VARS['name']) || ($HTTP_POST_VARS['name'] == $lang['PlsChangeName']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['ResName']) ."<BR>";
+ if ( empty($_POST['name']) || !isset($_POST['name']) || ($_POST['name'] == $lang['PlsChangeName']) ) {
+   $msg .= sprintf($lang['Err0009'],$lang['ResName']) ."<br>";
  } else {
-   $b->setName(trim(StripSlashes($HTTP_POST_VARS['name'])));
+   $b->setName(trim(StripSlashes($_POST['name'])));
    $gotourl = addUrlParameter($gotourl,"name=". UrlEncode($b->name));
  }
 
- $b->setDesc(trim(StripSlashes($HTTP_POST_VARS['desc'])));
+ $b->setDesc(trim(StripSlashes($_POST['desc'])));
  $gotourl = addUrlParameter($gotourl,"desc=". UrlEncode($b->desc));
 
  $msg .= module_parseforms($current_user,$b,$gotourl);
@@ -51,7 +51,7 @@
 
 
  Header("Status: 302 Moved Temporarily");
- Header("Location: ../". $gotourl);
+ Header("Location: ". dirname(getBaseUrl()) ."/". $gotourl);
  $dbconn->Close();
  /*
   *  CVS Info:  $Id$

Index: resource_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_new.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- resource_new.php	10 Nov 2002 11:45:57 -0000	1.13
+++ resource_new.php	31 Dec 2002 14:33:53 -0000	1.14
@@ -76,12 +76,12 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS;
+     global $msg,$lang;
 
      $this->obj = new resource($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->id > 0 ) {
@@ -90,11 +90,11 @@
        $this->name = $lang['ResCreate'];
      }
 
-     if ( isset($HTTP_GET_VARS['name']) ) {
-       $this->obj->name = StripSlashes($HTTP_GET_VARS['name']);
+     if ( isset($_GET['name']) ) {
+       $this->obj->name = StripSlashes($_GET['name']);
      }
-     if ( isset($HTTP_GET_VARS['desc']) ) {
-       $this->obj->desc = StripSlashes($HTTP_GET_VARS['desc']);
+     if ( isset($_GET['desc']) ) {
+       $this->obj->desc = StripSlashes($_GET['desc']);
      }
      if (! $this->obj->mod_ok() ) {
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);

Index: resource_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/resource/resource_overview.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- resource_overview.php	10 Nov 2002 11:45:57 -0000	1.14
+++ resource_overview.php	31 Dec 2002 14:33:54 -0000	1.15
@@ -79,7 +79,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$HTTP_GET_VARS,$lang;
+     global $msg,$lang;
 
      $this->name = $lang['ResOverview'];
 
@@ -87,10 +87,10 @@
      $this->q = "SELECT * FROM ". $this->dbconn->prefix ."resources";
      $pre = " WHERE ";
 
-     if ( isset($HTTP_GET_VARS['name']) && ($HTTP_GET_VARS['name'] != "*") && ($HTTP_GET_VARS['name'] != "") ) {
-       $this->q .= $pre . $this->dbconn->Like("name",$HTTP_GET_VARS['name']);
+     if ( isset($_GET['name']) && ($_GET['name'] != "*") && ($_GET['name'] != "") ) {
+       $this->q .= $pre . $this->dbconn->Like("name",$_GET['name']);
        $pre = " AND ";
-       $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($HTTP_GET_VARS['name']));
+       $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
      }
 
      check_dbacl( $this->q, $this->user->id);

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php

Modified Files:
	Date.pinc acl.pinc acl_new.php acl_overview.php 
	address_new.php address_overview.php address_select.php 
	address_show.php admin_show.php app_do_vote.php app_new.php 
	app_new_r.php app_overview.php app_select.php app_vote.php 
	appointment.pinc bug_ins.php bug_new.php bug_overview.php 
	bug_select.php bug_show.php calendar_day.php calendar_week.php 
	company_ins.php company_new.php company_overview.php 
	company_show.php database.pinc database_new.php 
	database_overview.php database_show.php department_new.php 
	department_show.php help.php location.pinc location_ins.php 
	login.pinc mail.pinc message_overview.php minical.php 
	minitimer.php mytutos.php product.pinc product_new.php 
	product_overview.php product_show.php res_cal.php 
	sales_forecast.php scheme.php task.pinc task_gantt.php 
	task_import_csv.php task_new.php task_overview.php 
	task_show.php team.pinc team_del.php team_new.php 
	team_overview.php team_show.php timetrack.pinc 
	timetrack_new.php timetrack_overview.php timetrack_select.php 
	update.php user_new.php 
Log Message:
a lot html stuff

Index: Date.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Date.pinc,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Date.pinc	14 Dec 2002 16:48:25 -0000	1.69
+++ Date.pinc	23 Dec 2002 10:01:32 -0000	1.70
@@ -336,11 +336,11 @@
    $dinfo = GetExtendedDayInfo($t);
 
    if (!empty($dinfo[Desc])) {
-     $dinfo[popinfo]  = '<HTML><BODY>';
-     $dinfo[popinfo] .= '<TABLE CLASS=inner BORDER=0 CELLSPACING=0 CELLPADDING=1>';
-     $dinfo[popinfo] .= '<TR><TD VALIGN=top><FONT SIZE=-1><STRONG>';
+     $dinfo[popinfo]  = '<html><body>';
+     $dinfo[popinfo] .= '<table class=\"inner\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">';
+     $dinfo[popinfo] .= '<tr><td valign=\"top\"><font size=\"-1\'><strong>';
      $dinfo[popinfo] .= eregi_replace("'","\'",$dinfo[Desc]);
-     $dinfo[popinfo] .= '</STRONG></FONT></TD></TR></TABLE></BODY></HTML>';
+     $dinfo[popinfo] .= '</strong></font></td></tr></table></body></html>';
    }
 
    # Today

Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- acl.pinc	18 Dec 2002 19:56:57 -0000	1.44
+++ acl.pinc	23 Dec 2002 10:01:33 -0000	1.45
@@ -449,7 +449,7 @@
       echo "<td align=\"center\" width=\"15%\">*<input type=\"checkbox\" name=\"checkit". $i ."\" "CheckAll(this,'f". $i ."[]')\" ". ($obj->p[$i] > 61 ? " checked":"") .">*</td>\n";
       echo "<td>&nbsp;</td>\n";
     } else if ( $tutos[$i] == 0 ) {
-      echo "<TD align=\"center\" colspan=\"7\">". $lang['FeatureOff'] ."</TD>\n";
+      echo "<td align=\"center\" colspan=\"7\">". $lang['FeatureOff'] ."</td>\n";
     } else {
       echo "<td align=\"center\" width=\"15%\">";
 	  if ( isset($permskip[$i][PERM_NEW]) ) {

Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- acl_new.php	11 Nov 2002 07:10:24 -0000	1.26
+++ acl_new.php	23 Dec 2002 10:01:33 -0000	1.27
@@ -114,7 +114,7 @@
 
      if ( ($this->obj->gettype() == "user") || ($this->obj->gettype() == "team") ) {
        echo "<tr valign=\"top\">\n";
-       echo " <td COLSPAN=6><font size=\"-1\">(other users/teams need at least the see permission for ". $this->obj->getFullName()." to appear in selection lists)</font></td>\n";
+       echo " <td colspan=\"6\"><font size=\"-1\">(other users/teams need at least the see permission for ". $this->obj->getFullName()." to appear in selection lists)</font></td>\n";
        echo "</tr>\n";
      }
      if ( $this->obj->gettype() == "file" ) {

Index: acl_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_overview.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- acl_overview.php	18 Dec 2002 19:56:58 -0000	1.36
+++ acl_overview.php	23 Dec 2002 10:01:33 -0000	1.37
@@ -68,7 +68,7 @@
      echo "<tr>\n";
      echo "<th>#</th><th>ID</th><th>type</th><th>object</th><th>owner</th><th>". $lang['permissions'] ."</th>\n";
      if ( $tutos[massupdate] == 1 ) {
-       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></TH>\n";
+       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
      }
      echo "</tr>\n";
      echo "</thead>\n";

Index: address_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_new.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- address_new.php	16 Dec 2002 20:33:51 -0000	1.47
+++ address_new.php	23 Dec 2002 10:01:33 -0000	1.48
@@ -251,12 +251,12 @@
          $cchecked[2] = "";
          $cchecked[$varvalue] = "checked";
          echo $lang['AdrCat1'] ."<input type=\"radio\" name=\"". $varname ."\"  value=\"1\" ". $cchecked[1] .">";
-         echo "&nbsp;&nbsp;". $lang['AdrCat2'] ."<INPUT type=\"radio\" name=\"". $varname ."\"  value=\"2\" ". $cchecked[2] .">";
+         echo "&nbsp;&nbsp;". $lang['AdrCat2'] ."<input type=\"radio\" name=\"". $varname ."\"  value=\"2\" ". $cchecked[2] .">";
        }
      } elseif ( $varname == "company" ) {
        if ( $mod == true ) {
          echo "<input id=\"". $varname ."\" name=\"". $varname ."\" size=\"". $showsize ."\" maxlength=\"". $size ."\" value=\"". myentities($varvalue->company_name) ."\">";
-         echo "<br><input type=\"checkbox\" value=\"1\" name=\"cploc\" ". ( $varvalue->cploc == 1 ? "CHECKED":"") .">". $lang['AdrCpLoc'];
+         echo "<br><input type=\"checkbox\" value=\"1\" name=\"cploc\"". ( $varvalue->cploc == 1 ? " checked":"") .">". $lang['AdrCpLoc'];
        } else {
          if ( $varvalue == "" ) {
            echo "&nbsp;";
@@ -279,7 +279,7 @@
          $this->addHidden($varname,$varvalue);
        }
      }
-     echo "</TD>\n";
+     echo "</td>\n";
    }
    /**
     * navigate
@@ -287,52 +287,52 @@
    Function navigate() {
      global $lang;
 
-     echo "<TR><TD>";
+     echo "<tr><td>\n";
 
      if ( $this->obj->id > 0 ) {
-       echo menulink("address_show.php?id=". $this->obj->id,$lang['AdrSeeEntry'],sprintf($lang['AdrSeeEntryI'],$this->obj->getFullName())) ."<BR>";
-       echo "<P>\n";
+       echo menulink("address_show.php?id=". $this->obj->id,$lang['AdrSeeEntry'],sprintf($lang['AdrSeeEntryI'],$this->obj->getFullName())) ."<br>";
+       echo "<p>\n";
 
        if ( $this->obj->mod_ok()  ) {
          if ( count($this->obj->location) > 0 ) {
            DoubleTableStart();
            foreach ($this->obj->location as $i => $f) {
-             echo "<TR><TH COLSPAN=2>". sprintf($lang['AdrLocTitle'],$f->lname) ."</TH></TR>\n";
-             echo "<TR>";
-             echo "<TD>";
+             echo "<tr><th colspan=\"2\">". sprintf($lang['AdrLocTitle'],$f->lname) ."</th></tr>\n";
+             echo "<tr>\n";
+             echo " <td>\n";
              # FIXME check mod_ok
              if ( $f->mod_ok() ) {
                echo menulink("address_new.php?id=". $this->obj->id ."&loc_id=". $i,$lang['Change'],sprintf($lang['ChangeLocInfo'],$f->lname, $this->obj->getFullName()));
              } else {
                echo $lang['Change'];
              }
-             echo "</TD><TD>\n";
+             echo " </td><td>\n";
              # FIXME check del_ok
              if ( $f->del_ok() ) {
                echo confirmlink("location_del.php?ref=". $this->obj->id ."&id=". $i,$lang['Delete'],sprintf($lang['DeleteLocInfo'],$f->lname, $this->obj->getFullName()));
              } else {
                echo $lang['Delete'];
              }
-             echo "</TD>\n";
-             echo "</TR>\n";
+             echo " </td>\n";
+             echo "</tr>\n";
            }
            DoubleTableEnd();
          }
          echo menulink("address_new.php?id=". $this->obj->id ."&loc_id=-1",$lang['AdrLNew'],sprintf($lang['AdrLNewInfo'],$this->obj->getFullName())) ."<BR>";
        }
 
-       echo "<P>\n";
+       echo "<p>\n";
        if ( $this->obj->isUser() != 0 ) {
          $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";
+           echo menulink("user_new.php?id=". $this->obj->id ,$lang['UserModify'],sprintf($lang['UserModInfo'],$this->obj->getFullName())) ."<br>\n";
          }
        } else if ( $this->user->admin == 1 ) {
-         echo menulink("user_new.php?id=". $this->obj->id ,$lang['UserCreate'],sprintf($lang['UserNewInfo'],$this->obj->getFullName())) . "<BR>\n";
+         echo menulink("user_new.php?id=". $this->obj->id ,$lang['UserCreate'],sprintf($lang['UserNewInfo'],$this->obj->getFullName())) . "<br>\n";
        }
      }
-     echo "</TD></TR>";
+     echo "</td></tr>\n";
    }
    /**
     * prepare

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- address_overview.php	5 Nov 2002 19:57:45 -0000	1.27
+++ address_overview.php	23 Dec 2002 10:01:33 -0000	1.28
@@ -37,7 +37,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$tutos,$lang,$HTTP_GET_VARS,$HTTP_SESSION_VARS;
+     global $msg,$tutos,$lang;
 
      $this->name = $lang['AddressOverview'];
 
@@ -52,20 +52,20 @@
      $this->atool['link1'] = "address_overview.php";
      $this->atool['maxshow'] = $tutos[maxshow];
 
-     if ( isset($HTTP_GET_VARS['astart']) ) {
-       $this->atool['start'] = $HTTP_GET_VARS['astart'];
+     if ( isset($_GET['astart']) ) {
+       $this->atool['start'] = $_GET['astart'];
      } else {
        $this->atool['start'] = 0;
      }
 
-     if ( isset($HTTP_GET_VARS['name']) ) {
-       $name = $HTTP_GET_VARS['name'];
+     if ( isset($_GET['name']) ) {
+       $name = $_GET['name'];
        $this->atool['link1'] = addUrlParameter($this->atool['link1'],"name=".UrlEncode($name));
      } else {
        $name = "";
      }
-     if ( isset($HTTP_GET_VARS['ext']) ) {
-       $ext = $HTTP_GET_VARS['ext'];
+     if ( isset($_GET['ext']) ) {
+       $ext = $_GET['ext'];
      }
 
      $e['name'] = 0;
@@ -79,7 +79,7 @@
        $aids = "0";
 
 #       session_register('adrsearch');
-       $HTTP_SESSION_VARS['adrsearch'] = $ext;
+       $_SESSION['adrsearch'] = $ext;
 
        @reset($ext);
        while( list ($i,$f) = @each ($ext)) {
@@ -134,7 +134,7 @@
      if ( ($name != "*") && ($name != "") ) {
        $name = StripSlashes($name);
 #       session_register('adrlook');
-       $HTTP_SESSION_VARS['adrlook'] = $name;
+       $_SESSION['adrlook'] = $name;
      } else {
        $this->atool['search']['name'] = "";
        $this->atool['search']['phone'] = "";

Index: address_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_select.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- address_select.php	23 Nov 2002 14:09:15 -0000	1.29
+++ address_select.php	23 Dec 2002 10:01:33 -0000	1.30
@@ -72,7 +72,7 @@
      echo "</form>\n";
 
      if ( $this->user->feature_ok(useldap,PERM_SEL) ) {
-       echo "<form name=\"adrsearch2\" method=\"GET\" action=\"ldap/ldap_overview.php\">\n";
+       echo "<form name=\"adrsearch2\" method=\"get\" action=\"ldap/ldap_overview.php\">\n";
        DoubleTableStart();
        echo "<tr>\n";
        echo "<th colspan=\"3\">". $lang['SearchLdapAdr'] ."</th>\n";
@@ -82,7 +82,7 @@
        echo "<td><input type=\"submit\" value=\"". $lang['Search'] ."\" title=\"". $lang['SearchLdapAdr'] ."\"></td>\n";
 
        if ( count($tutos[ldapserver])  > 1 ) {
-         echo "</TR><TR>\n";
+         echo "</tr><tr>\n";
          echo $this->showfieldc($lang['LDAPServer']);
          echo "<td colspan=2>\n";
          echo "<select name=\"sv\">\n";
@@ -122,15 +122,7 @@
     *
     */
    Function navigate() {
-     global $lang;
-
-     echo "<TR><TD>";
-     if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
-       echo menulink("address_new.php",$lang['NewEntry'],$lang['AdrCreateInfo']) . "<BR>\n";
-     }
-     echo "</TD></TR>";
    }
-
    /**
     * preapre everything read data , parse args etc
     */
@@ -162,6 +154,14 @@
        $this->stop = true;
      }
      # menu
+     if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
+       $x = array( url => "address_new.php",
+                   text => $lang['NewEntry'],
+                   info => $lang['AdrCreateInfo'],
+                   category => array("address","new","obj")
+                 );
+       $this->addMenu($x);
+     }
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array( url => "company_new.php",
                    text => $lang['CompanyCreate'],

Index: address_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_show.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- address_show.php	16 Dec 2002 20:33:55 -0000	1.64
+++ address_show.php	23 Dec 2002 10:01:33 -0000	1.65
@@ -119,28 +119,28 @@
    Function navigate() {
      global $tutos,$lang;
 
-     echo "<TR><TD>";
+     echo "<tr><td>\n";
 
      if ( $this->obj->id != -1 ) {
        if ( $this->obj->isUser() ) {
          if ( $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-           echo menulink("calendar.php?team=". $this->obj->id ,$lang['Calendar'],sprintf($lang['ShowCal'],$this->obj->getFullName())) ."<BR>\n";
+           echo menulink("calendar.php?team=". $this->obj->id ,$lang['Calendar'],sprintf($lang['ShowCal'],$this->obj->getFullName())) ."<br>\n";
          }
          if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) ) {
-		   echo menulink("task_overview.php?id=". $this->obj->id ,$lang['TaskOverview'],sprintf($lang['TaskOverviewInfo'],$this->obj->getFullName())) ."<BR>\n";
+		   echo menulink("task_overview.php?id=". $this->obj->id ,$lang['TaskOverview'],sprintf($lang['TaskOverviewInfo'],$this->obj->getFullName())) ."<br>\n";
          }
          if ( $this->user->feature_ok(usetaskmanagement,PERM_SEE) &&  $this->user->feature_ok(usecalendar,PERM_SEE) ) {
-           echo menulink("res_cal.php?id=".$this->obj->id,$lang['ResCal'],$lang['ResCal']) ."<BR>\n";
+           echo menulink("res_cal.php?id=".$this->obj->id,$lang['ResCal'],$lang['ResCal']) ."<br>\n";
          }
          if ( $this->user->feature_ok(usetimetrack,PERM_SEE) ) {
-		   echo menulink("timetrack_overview.php?worker=".$this->obj->id,$lang['TimetrackBooked'],sprintf($lang['TimetrackBookedI'],$this->obj->getFullName())) ."<BR>\n";
+		   echo menulink("timetrack_overview.php?worker=".$this->obj->id,$lang['TimetrackBooked'],sprintf($lang['TimetrackBookedI'],$this->obj->getFullName())) ."<br>\n";
          }
        }
        if ( $this->user->feature_ok(usevcard,PERM_SEE) ) {
-         echo  menulink($this->obj->getUrl() ."&format=vcard" ,$lang['AdrGetVcard'],$lang['AdrGetVcardI']) . "<BR>\n";
+         echo  menulink($this->obj->getUrl() ."&format=vcard" ,$lang['AdrGetVcard'],$lang['AdrGetVcardI']) . "<br>\n";
 	   }
      }
-     echo "</TD></TR>";
+     echo "</td></tr>\n";
    }
    /**
     * prepare

Index: admin_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin_show.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- admin_show.php	20 Dec 2002 07:14:30 -0000	1.49
+++ admin_show.php	23 Dec 2002 10:01:33 -0000	1.50
@@ -166,7 +166,7 @@
        }
        echo "</td>\n";
        echo " <td valign=\"top\" colspan=\"2\" align=\"left\">". $f[Desc] ."</td>\n";
-       echo " <td valign=\"top\" ALIGN=left>". $f[file] ."</td>\n";
+       echo " <td valign=\"top\" align=\"left\">". $f[file] ."</td>\n";
        echo " <td align=\"right\">&nbsp;";
        @reset($table);
        $pre = "";
@@ -207,7 +207,7 @@
        $uid = $result->get($a, "id");
        $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>";
+       echo " <td align=\"right\">". makelink("user_new.php?uid=".$uid ,$result->get($a, "login")) ."</td>";
        $ls = $result->getDateTime($a, "last_seen");
        echo " <td colspan=\"2\">". $ls->getLinkDateTime() ."</td>";
        echo " <td>&nbsp;". $result->get($a, "last_host") ."</td>";
@@ -225,10 +225,10 @@
    Function navigate() {
      global $lang;
 
-     echo "<tr><td>";
+     echo "<tr><td>\n";
      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>";
+     echo "</td></tr>\n";
    }
    /**
     * preparation

Index: app_do_vote.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_do_vote.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- app_do_vote.php	5 Nov 2002 19:57:45 -0000	1.7
+++ app_do_vote.php	23 Dec 2002 10:01:33 -0000	1.8
@@ -14,7 +14,7 @@
 
  /* Check if user is allowed to use it */
  check_user();
- loadmodules("appointment");
+ loadmodules('appointment','mod');
 
  /* Check the input */
  $msg = "";
@@ -22,17 +22,17 @@
 
  $gotourl = "calendar.php";
  if ( ! isset($HTTP_GET_VARS['id']) ) {
-   $msg .= "Missing Appointment ID<BR>";
+   $msg .= "Missing Appointment ID<br>";
  } else {
    $a->read($HTTP_GET_VARS['id']);
    $a->read_participants();
    $gotourl= addUrlParameter($gotourl,"id=".$HTTP_GET_VARS['id']);
  }
  if ( ! isset($HTTP_GET_VARS['adr_id']) ) {
-   $msg .= "Missing User ID<BR>";
+   $msg .= "Missing User ID<br>";
  }
  if ( ! isset($HTTP_GET_VARS['vote']) ) {
-   $msg .= "Missing Vote<BR>";
+   $msg .= "Missing Vote<br>";
  }
 
  if ( $msg == "" ) {

Index: app_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- app_new.php	30 Nov 2002 19:04:45 -0000	1.45
+++ app_new.php	23 Dec 2002 10:01:33 -0000	1.46
@@ -32,12 +32,12 @@
      $a_checked[1] = "";
      $a_checked[2] = "";
      $a_checked[3] = "";
-     $a_checked[$this->obj->mod_allow] = "CHECKED";
+     $a_checked[$this->obj->mod_allow] = " checked";
 
      if ( $this->obj->allowed == 0 ) {
        echo $this->error($lang['ReadOnlyAppoint']);
      }
-     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"POST\">\n";
+     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
      $this->addHidden("repeat","0");
      $this->addHidden("r_ignore","0");
      if ( $this->obj->id > 0 ) {
@@ -45,7 +45,7 @@
      }
 
      echo $this->DataTableStart();
-     echo "<TR>\n";
+     echo "<tr>\n";
      echo "<th colspan=\"6\">";
      if ( $this->obj->id > 0 ) {
        echo $lang['ModOldAppoint'];
@@ -113,14 +113,14 @@
      echo " <td colspan=\"2\">\n";
      echo "  <select name=\"outside\">\n";
      foreach ($lang['AppLoc'] as $i => $f) {
-       echo "   <option value=\"". $i ."\" ". ($this->obj->outside == $i ? "SELECTED":"") .">". $lang['AppLoc'][$i] ."</option>\n";
+       echo "   <option value=\"". $i ."\"". ($this->obj->outside == $i ? " selected":"") .">". $lang['AppLoc'][$i] ."</option>\n";
      }
      echo "  </select>\n";
      echo " </td>\n";
 
      # 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";
@@ -134,22 +134,22 @@
 
      echo "</tr><tr>\n";
      # Customer/Visitor name
-     echo $this->showfieldc($lang['VisitAt'] ."<BR>". $lang['VisitFrom'],0,"vfn");
+     echo $this->showfieldc($lang['VisitAt'] ."<br>". $lang['VisitFrom'],0,"vfn");
      echo " <td colspan=\"5\">";
      select_from_array_or_input($this->obj,"v",$this->obj->visitor,1);
      echo " </td>\n";
 
      if ( $this->user->feature_ok(useprojects,PERM_SEE) ) {
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
        echo $this->showfieldc($lang['Product'],0,"pfn");
        echo " <td colspan=\"5\">\n";
        select_from_array_or_input($this->obj,"p",$this->obj->product,1);
-       echo " </TD>\n";
+       echo " </td>\n";
      }
 
      # list of possible participants
      echo "</tr><tr>\n";
-     echo " <td class=\"desc\" rowspan=\"3\" valign=top><label for=\"people[]\">". $lang['Participants'] ."</label>&nbsp;<FONT COLOR=red>(*)</FONT></TD>";
+     echo " <td class=\"desc\" rowspan=\"3\" valign=top><label for=\"people[]\">". $lang['Participants'] ."</label>&nbsp;<font color=\"red\">(*)</font></td>";
      echo " <td rowspan=\"3\" valign=\"top\">\n";
 
      echo "". $this->user->askPeople("people[]",$this->obj->people,1) ."\n";
@@ -158,28 +158,28 @@
 
      # Voting
      echo " <td colspan=\"1\">\n";
-     echo "<input type=\"checkbox\" name=\"trace\" value=\"1\" ". ($this->obj->trace == 1 ? "CHECKED":"") .">\n";
+     echo "<input type=\"checkbox\" name=\"trace\" value=\"1\"". ($this->obj->trace == 1 ? " checked":"") .">\n";
      echo $lang['AppTrace']."<br><font size=\"-1\">". $lang['AppTraceDesc'] ."</font></td>\n";
 
      # Permissions
-     echo " <td rowspan=\"2\" colspan=\"3\">&nbsp;<B>". $lang['AppChangeOrDel'] ."</B>&nbsp;<BR>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=2 ". $a_checked[2] .">&nbsp;". $lang['only'] ." ". $this->obj->creator->getLink() ."<BR>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=1 ". $a_checked[1] .">&nbsp;". $lang['Participants'] ."<BR>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=0 ". $a_checked[0] .">&nbsp;". $lang['everybody'] ."<BR>\n";
-     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=3 ". $a_checked[3] .">&nbsp;". $lang['AppPrivate'] ."<BR>\n";
+     echo " <td rowspan=\"2\" colspan=\"3\">&nbsp;<b>". $lang['AppChangeOrDel'] ."</b>&nbsp;<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"2\"". $a_checked[2] .">&nbsp;". $lang['only'] ." ". $this->obj->creator->getLink() ."<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"1\"". $a_checked[1] .">&nbsp;". $lang['Participants'] ."<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"0\"". $a_checked[0] .">&nbsp;". $lang['everybody'] ."<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"3\"". $a_checked[3] .">&nbsp;". $lang['AppPrivate'] ."<br>\n";
      echo " </td>\n";
 
      echo "</tr><tr>\n";
 
      # check available
      echo "<td colspan=\"1\">\n";
-     echo "<input type=\"checkbox\" name=\"check\" value=\"1\" ". ($this->obj->check == 1 ? "CHECKED":"") .">\n";
+     echo "<input type=\"checkbox\" name=\"check\" value=\"1\"" . ($this->obj->check == 1 ? " checked":"") .">\n";
      echo $lang['AppCheck']."<br><font size=\"-1\">". $lang['AppCheckDesc'] ."</font></td>\n";
      echo "</tr><tr>\n";
 
      # email invite/inform
      echo " <td colspan=\"1\">\n";
-     echo "<input type=\"checkbox\" name=\"email\" value=\"1\" ". ($this->obj->email == 1 ? "CHECKED":"") .">\n";
+     echo "<input type=\"checkbox\" name=\"email\" value=\"1\"". ($this->obj->email == 1 ? " checked":"") .">\n";
      if ( $this->obj->id > 0 ) {
        echo $lang['InfoEmail'];
      } else {
@@ -191,7 +191,7 @@
      echo " <td colspan=\"3\"><b>". $lang['AppEmailRemind'] ."</b><br>\n";
      echo "  <select name=\"remember\">\n";
      foreach ($lang['AppRemind'] as $i => $f) {
-	   echo "   <option value=\"". $i ."\"". ($i == $this->obj->remember ? " SELECTED":"") .">". $f ."</option>\n";
+	   echo "   <option value=\"". $i ."\"". ($i == $this->obj->remember ? " selected":"") .">". $f ."</option>\n";
      }
      echo "  </select>";
      echo " </td>\n";
@@ -226,13 +226,13 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$tutos, $lang,$HTTP_GET_VARS;
+     global $msg,$tutos,$lang;
 
      $this->obj = new appointment($this->dbconn);
 
-     if ( isset($HTTP_GET_VARS['id']) ) {
+     if ( isset($_GET['id']) ) {
        $this->name =  $lang['AppointModify'];
-       $this->obj->read($HTTP_GET_VARS['id']);
+       $this->obj->read($_GET['id']);
        $this->obj->read_participants();
        /* only the owner may change */
        if ( $this->user->id == $this->obj->creator->id )  {
@@ -251,41 +251,41 @@
      } else {
        $this->name = $lang['AppointCreate'];
        /* New event */
-       if (isset($HTTP_GET_VARS['t'])) {
-         $this->obj->start->setDateTime($HTTP_GET_VARS['t']);
-         $this->obj->end->setDateTime($HTTP_GET_VARS['t']);
+       if (isset($_GET['t'])) {
+         $this->obj->start->setDateTime($_GET['t']);
+         $this->obj->end->setDateTime($_GET['t']);
        }
        $p[$this->user->id] = 2;
      }
 
 
      # Set available Parameters
-     if ( isset($HTTP_GET_VARS['descr']) ) {
-       $this->obj->descr = StripSlashes($HTTP_GET_VARS['descr']);
+     if ( isset($_GET['descr']) ) {
+       $this->obj->descr = StripSlashes($_GET['descr']);
      }
-     if ( isset($HTTP_GET_VARS['trace']) ) {
-       $this->obj->trace = $HTTP_GET_VARS['trace'];
+     if ( isset($_GET['trace']) ) {
+       $this->obj->trace = $_GET['trace'];
      }
-     if ( isset($HTTP_GET_VARS['email']) ) {
-       $this->obj->email = $HTTP_GET_VARS['email'];
+     if ( isset($_GET['email']) ) {
+       $this->obj->email = $_GET['email'];
      }
-     if ( isset($HTTP_GET_VARS['mod_allow']) ) {
-       $this->obj->mod_allow = $HTTP_GET_VARS['mod_allow'];
+     if ( isset($_GET['mod_allow']) ) {
+       $this->obj->mod_allow = $_GET['mod_allow'];
      }
-     if ( isset($HTTP_GET_VARS['start']) ) {
-       $this->obj->start->setDateTime($HTTP_GET_VARS['start']);
+     if ( isset($_GET['start']) ) {
+       $this->obj->start->setDateTime($_GET['start']);
      }
-     if ( isset($HTTP_GET_VARS['end']) ) {
-       $this->obj->end->setDateTime($HTTP_GET_VARS['end']);
+     if ( isset($_GET['end']) ) {
+       $this->obj->end->setDateTime($_GET['end']);
      }
-     if ( isset($HTTP_GET_VARS['remember']) ) {
-       $this->obj->remember = $HTTP_GET_VARS['remember'];
+     if ( isset($_GET['remember']) ) {
+       $this->obj->remember = $_GET['remember'];
      }
-     if ( isset($HTTP_GET_VARS['t_ignore']) ) {
-       $this->obj->t_ignore = $HTTP_GET_VARS['t_ignore'];
+     if ( isset($_GET['t_ignore']) ) {
+       $this->obj->t_ignore = $_GET['t_ignore'];
      }
-     if ( isset($HTTP_GET_VARS['check']) ) {
-       $this->obj->check = $HTTP_GET_VARS['check'];
+     if ( isset($_GET['check']) ) {
+       $this->obj->check = $_GET['check'];
      } else {
        $this->obj->check = 0;
 	 }
@@ -293,23 +293,23 @@
      preset_from_array_or_input($this->obj,'visitor','v');
      preset_from_array_or_input($this->obj,'product','p');
 
-     if ( isset($HTTP_GET_VARS['people']) ) {
-       @reset($HTTP_GET_VARS['people']);
-       while ( list ($i,$f) = @each ($HTTP_GET_VARS['people']) ) {
+     if ( isset($_GET['people']) ) {
+       @reset($_GET['people']);
+       while ( list ($i,$f) = @each ($_GET['people']) ) {
          $p[$f] = 2;
        }
      }
      $this->obj->people = $p;
 
-     if ( isset($HTTP_GET_VARS['outside']) ) {
-       $this->obj->outside = $HTTP_GET_VARS['outside'];
+     if ( isset($_GET['outside']) ) {
+       $this->obj->outside = $_GET['outside'];
      }
 
      $this->obj->allowed = $this->obj->mod_ok();
 
      if (  ! $this->obj->mod_ok() ) {
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
-       $msg .= "<BR>". $this->obj->creator->id ." ". $this->user->id ." ". $this->obj->mod_ok();
+       $msg .= "<br>". $this->obj->creator->id ." ". $this->user->id ." ". $this->obj->mod_ok();
        $this->stop = true;
      }
      # menu

Index: app_new_r.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_new_r.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- app_new_r.php	13 Nov 2002 20:10:06 -0000	1.40
+++ app_new_r.php	23 Dec 2002 10:01:33 -0000	1.41
@@ -32,19 +32,19 @@
      $a_checked[1] = "";
      $a_checked[2] = "";
      $a_checked[3] = "";
-     $a_checked[$this->obj->mod_allow] = "CHECKED";
+     $a_checked[$this->obj->mod_allow] = " checked";
 
      $r_checked[1] = "";
      $r_checked[2] = "";
      $r_checked[3] = "";
      $r_checked[4] = "";
-     $r_checked[$this->obj->repeat] = "CHECKED";
+     $r_checked[$this->obj->repeat] = " checked";
 
 
      if ( $this->obj->allowed == 0 ) {
-        echo "<B>". $lang['ReadOnlyAppoint'] ."</B><BR>\n";
+        echo "<b>". $lang['ReadOnlyAppoint'] ."</b><br>\n";
      }
-     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"POST\">\n";
+     echo "<form name=\"appnew\" action=\"app_ins.php\" method=\"post\">\n";
      $this->addHidden("gotourl","app_new_r.php");
      if ( $this->obj->id > 0 ) {
        $this->addHidden("id",$this->obj->id);
@@ -85,7 +85,7 @@
        echo $lang['StartTime'];
        echo "</a>";
      }
-     echo "</b>&nbsp;<BR>&nbsp;<font size=\"-1\">(HH:MM)</font></td>\n";
+     echo "</b>&nbsp;<br>&nbsp;<font size=\"-1\">(HH:MM)</font></td>\n";
      echo " <td colspan=\"2\">";
      $this->obj->start->EnterTime("start");
      echo " </td>\n";
@@ -109,7 +109,7 @@
        echo $lang['EndTime'];
        echo "</a>";
      }
-     echo "</b>&nbsp;<br>&nbsp;<font size=\"-1\">(HH:MM)</font></TD>\n";
+     echo "</b>&nbsp;<br>&nbsp;<font size=\"-1\">(HH:MM)</font></td>\n";
      echo "<td colspan=\"2\">";
      $this->obj->end->EnterTime("end");
      echo "</td>\n";
@@ -119,10 +119,10 @@
      # REPEAT TYPE
      echo $this->showfield($lang['AppRepeatType'],0,"repeat");
      echo " <td colspan=\"2\">\n";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_DAY ."\" ". $r_checked[APP_REP_DAY] .">&nbsp;". $lang['AppRepeatDay'] ."<br>";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_WEEK ."\" ". $r_checked[APP_REP_WEEK] .">&nbsp;". $lang['AppRepeatWeek'] ."<br>";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_MONTH ."\" ". $r_checked[APP_REP_MONTH] .">&nbsp;". $lang['AppRepeatMonth'] ."<br>";
-     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_YEAR ."\" ". $r_checked[APP_REP_YEAR] .">&nbsp;". $lang['AppRepeatYear'] ."<br>";
+     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_DAY ."\"". $r_checked[APP_REP_DAY] .">&nbsp;". $lang['AppRepeatDay'] ."<br>";
+     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_WEEK ."\"". $r_checked[APP_REP_WEEK] .">&nbsp;". $lang['AppRepeatWeek'] ."<br>";
+     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_MONTH ."\"". $r_checked[APP_REP_MONTH] .">&nbsp;". $lang['AppRepeatMonth'] ."<br>";
+     echo "  <input type=\"radio\" name=\"repeat\" value=\"". APP_REP_YEAR ."\"". $r_checked[APP_REP_YEAR] .">&nbsp;". $lang['AppRepeatYear'] ."<br>";
      echo " </td>\n";
 
      # Ignore times
@@ -152,7 +152,7 @@
 
      echo "</tr><tr>\n";
      # Customer/Visitor name
-     echo $this->showfieldc($lang['VisitAt'] ."<BR>". $lang['VisitFrom'],0,"vfn");
+     echo $this->showfieldc($lang['VisitAt'] ."<br>". $lang['VisitFrom'],0,"vfn");
      echo " <td colspan=\"5\">";
      select_from_array_or_input($this->obj,"v",$this->obj->visitor,1);
      echo " </td>\n";
@@ -175,15 +175,15 @@
      echo " </td>\n";
 
      echo " <td colspan=\"4\">&nbsp;<b>". $lang['AppChangeOrDel'] ."</b>&nbsp;<br>\n";
-     echo "&nbsp;<INPUT type=\"radio\" name=\"mod_allow\" value=2 ". $a_checked[2] .">&nbsp;". $lang['only'] ." ". $this->obj->creator->getLink() ."<BR>\n";
-     echo "&nbsp;<INPUT type=\"radio\" name=\"mod_allow\" value=1 ". $a_checked[1] .">&nbsp;". $lang['Participants'] ."<BR>\n";
-     echo "&nbsp;<INPUT type=\"radio\" name=\"mod_allow\" value=0 ". $a_checked[0] .">&nbsp;". $lang['everybody'] ."<BR>\n";
-     echo "&nbsp;<INPUT type=\"radio\" name=\"mod_allow\" value=3 ". $a_checked[3] .">&nbsp;". $lang['AppPrivate'] ."<BR>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"2\"". $a_checked[2] .">&nbsp;". $lang['only'] ." ". $this->obj->creator->getLink() ."<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"1\"". $a_checked[1] .">&nbsp;". $lang['Participants'] ."<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"0\"". $a_checked[0] .">&nbsp;". $lang['everybody'] ."<br>\n";
+     echo "&nbsp;<input type=\"radio\" name=\"mod_allow\" value=\"3\"". $a_checked[3] .">&nbsp;". $lang['AppPrivate'] ."<br>\n";
 
      echo " </td>\n";
 
      if ( $this->obj->mod_ok() ) {
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
        if ( $this->obj->id > 0 ) {
          submit_reset(0,1,2,1,2,0);
        } else {
@@ -207,13 +207,13 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$tutos, $lang,$HTTP_GET_VARS;
+     global $msg,$tutos, $lang;
 
      $this->obj = new appointment($this->dbconn);
 
-     if ( isset($HTTP_GET_VARS['id']) ) {
+     if ( isset($_GET['id']) ) {
        $this->name = $lang['AppointModify'];
-       $this->obj->read($HTTP_GET_VARS['id']);
+       $this->obj->read($_GET['id']);
        $this->obj->read_participants();
         /* only the owner may change */
        if ( $this->user->id == $this->obj->creator->id )  {
@@ -232,59 +232,59 @@
      } else {
        $this->name = $lang['AppointCreate'];
        /* New event */
-       if (isset($HTTP_GET_VARS['t'])) {
-         $this->obj->start->setDateTime($HTTP_GET_VARS['t']);
-         $this->obj->end->setDateTime($HTTP_GET_VARS['t']);
+       if (isset($_GET['t'])) {
+         $this->obj->start->setDateTime($_GET['t']);
+         $this->obj->end->setDateTime($_GET['t']);
        }
        $this->obj->repeat = 1;
        $p[$this->user->id] = 2;
      }
 
      # Set available Parameters
-     if ( isset($HTTP_GET_VARS['descr']) ) {
-       $this->obj->descr = StripSlashes($HTTP_GET_VARS['descr']);
+     if ( isset($_GET['descr']) ) {
+       $this->obj->descr = StripSlashes($_GET['descr']);
      }
-     if ( isset($HTTP_GET_VARS['trace']) ) {
-       $this->obj->trace = $HTTP_GET_VARS['trace'];
+     if ( isset($_GET['trace']) ) {
+       $this->obj->trace = $_GET['trace'];
      }
-     if ( isset($HTTP_GET_VARS['email']) ) {
-       $this->obj->email = $HTTP_GET_VARS['email'];
+     if ( isset($_GET['email']) ) {
+       $this->obj->email = $_GET['email'];
      }
-     if ( isset($HTTP_GET_VARS['mod_allow']) ) {
-       $this->obj->mod_allow = $HTTP_GET_VARS['mod_allow'];
+     if ( isset($_GET['mod_allow']) ) {
+       $this->obj->mod_allow = $_GET['mod_allow'];
      }
-     if ( isset($HTTP_GET_VARS['start']) ) {
-       $this->obj->start->setDateTime($HTTP_GET_VARS['start']);
+     if ( isset($_GET['start']) ) {
+       $this->obj->start->setDateTime($_GET['start']);
      }
-     if ( isset($HTTP_GET_VARS['end']) ) {
-       $this->obj->end->setDateTime($HTTP_GET_VARS['end']);
+     if ( isset($_GET['end']) ) {
+       $this->obj->end->setDateTime($_GET['end']);
      }
-     if ( isset($HTTP_GET_VARS['remember']) ) {
-       $this->obj->remember = $HTTP_GET_VARS['remember'];
+     if ( isset($_GET['remember']) ) {
+       $this->obj->remember = $_GET['remember'];
      }
-     if ( isset($HTTP_GET_VARS['t_ignore']) ) {
-       $this->obj->t_ignore = $HTTP_GET_VARS['t_ignore'];
+     if ( isset($_GET['t_ignore']) ) {
+       $this->obj->t_ignore = $_GET['t_ignore'];
      }
 
      preset_from_array_or_input($this->obj,'visitor','v');
      preset_from_array_or_input($this->obj,'product','p');
 
-     if ( isset($HTTP_GET_VARS['people']) ) {
-       @reset($HTTP_GET_VARS['people']);
-       while ( list ($i,$f) = @each ($HTTP_GET_VARS['people']) ) {
+     if ( isset($_GET['people']) ) {
+       @reset($_GET['people']);
+       while ( list ($i,$f) = @each ($_GET['people']) ) {
          $p[$f] = 2;
        }
      }
      $this->obj->people = $p;
 
-     if ( isset($HTTP_GET_VARS['outside']) ) {
-       $this->obj->outside = $HTTP_GET_VARS['outside'];
+     if ( isset($_GET['outside']) ) {
+       $this->obj->outside = $_GET['outside'];
      }
 
      $this->obj->allowed = $this->obj->mod_ok();
      if (  ! $this->obj->mod_ok() ) {
        $msg .= sprintf($lang['Err0024'],$lang[$this->obj->getType()]);
-       $msg .= "<BR>". $this->obj->creator->id ." ". $this->user->id ." ". $this->obj->mod_ok();
+       $msg .= "<br>". $this->obj->creator->id ." ". $this->user->id ." ". $this->obj->mod_ok();
        $this->stop = true;
      }
      # menu

Index: app_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_overview.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- app_overview.php	7 Dec 2002 16:50:48 -0000	1.42
+++ app_overview.php	23 Dec 2002 10:01:33 -0000	1.43
@@ -153,12 +153,12 @@
     * action
     */
    Function action() {
-     global $lang,$msg,$HTTP_GET_VARS;
+     global $lang,$msg;
 
-     @reset($HTTP_GET_VARS['mark']);
-     if ( $HTTP_GET_VARS['action'] == -2 ) {
+     @reset($_GET['mark']);
+     if ( $_GET['action'] == -2 ) {
        $this->dbconn->Begin("WORK");
-       while (list ($key,$val) = @each ($HTTP_GET_VARS['mark'])) {
+       while (list ($key,$val) = @each ($_GET['mark'])) {
          $b = new appointment($this->dbconn);
          $b->read($val);
          if ( $b->id != $val ) {
@@ -179,7 +179,7 @@
     * prepare
     */
    Function prepare() {
-     global $lang,$msg,$HTTP_GET_VARS,$HTTP_SESSION_VARS;
+     global $lang,$msg;
 
      $this->name = $lang['AppointOverview'];
      $this->q = "SELECT * from ". $this->dbconn->prefix ."calendar";
@@ -191,25 +191,25 @@
      #
      # Text Search
      #
-     if ( isset($HTTP_GET_VARS['name']) && !empty($HTTP_GET_VARS['name']) && ($HTTP_GET_VARS['name'] != "*") ) {
-       $this->q .= " " . $pre ."(". $this->dbconn->Like("description",$HTTP_GET_VARS['name']) .")";
+     if ( isset($_GET['name']) && !empty($_GET['name']) && ($_GET['name'] != "*") ) {
+       $this->q .= " " . $pre ."(". $this->dbconn->Like("description",$_GET['name']) .")";
        $pre = " AND";
-       $this->link1 = addUrlParameter($this->link1,"name=". urlencode($HTTP_GET_VARS['name']));
-       $this->addHidden("name",$HTTP_GET_VARS['name']);
-       $this->filter['name'] = $HTTP_GET_VARS['name'];
+       $this->link1 = addUrlParameter($this->link1,"name=". urlencode($_GET['name']));
+       $this->addHidden("name",$_GET['name']);
+       $this->filter['name'] = $_GET['name'];
      }
      #
      # Show all apps with given link (addr,company or department)
      #
-     if ( isset($HTTP_GET_VARS['link_id']) ) {
-       $obj = getObject($this->dbconn,$HTTP_GET_VARS['link_id']);
+     if ( isset($_GET['link_id']) ) {
+       $obj = getObject($this->dbconn,$_GET['link_id']);
        if ( $obj->id > 0 ) {
          if ( $obj->getType() == "product" ) {
-           $this->q .= $pre . " product = ". $HTTP_GET_VARS['link_id'];
+           $this->q .= $pre . " product = ". $_GET['link_id'];
            $pre = " AND";
          } else if ( $obj->getType() == "company" ) {
            $obj->read_members();
-           $this->q .= $pre . " visitor in (". $HTTP_GET_VARS['link_id'];
+           $this->q .= $pre . " visitor in (". $_GET['link_id'];
            while ( list ($i,$f) = @each ($obj->member) ) {
              $this->q .= ",". $i;
            }
@@ -217,29 +217,29 @@
            $pre = " AND";
          } else if ( $obj->getType() == "department" ) {
            $obj->read_members();
-           $this->q .= $pre . " visitor in (". $HTTP_GET_VARS['link_id'];
+           $this->q .= $pre . " visitor in (". $_GET['link_id'];
            while ( list ($i,$f) = @each ($obj->member) ) {
              $this->q .= ",". $i;
            }
            $this->q .= " )";
            $pre = " AND";
          } else if ( $obj->getType() == "address" ) {
-           $this->q .= $pre . " visitor = ". $HTTP_GET_VARS['link_id'];
+           $this->q .= $pre . " visitor = ". $_GET['link_id'];
          }
          $this->name .= " : ".$obj->getFullName();
        }
-       $this->link1 = addUrlParameter($this->link1,"link_id=".$HTTP_GET_VARS['link_id']);
-       $this->addHidden("link_id",$HTTP_GET_VARS['link_id']);
+       $this->link1 = addUrlParameter($this->link1,"link_id=".$_GET['link_id']);
+       $this->addHidden("link_id",$_GET['link_id']);
      }
      # 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
 #       session_register('appsearchfrom');
-       $HTTP_SESSION_VARS['appsearchfrom'] = $from->getYYYYMMDD();
+       $_SESSION['appsearchfrom'] = $from->getYYYYMMDD();
      }
      if ( $from->notime == 0 ) {
        $this->q .= $pre ."(a_start >= ". $this->dbconn->Date($from) .")";
@@ -250,13 +250,13 @@
      }
      # 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
 #       session_register('appsearchto');
-       $HTTP_SESSION_VARS['appsearchto'] = $to->getYYYYMMDD();
+       $_SESSION['appsearchto'] = $to->getYYYYMMDD();
      }
      if ( $to->notime == 0 ) {
        $this->q .= $pre ."(a_end <= ". $this->dbconn->Date($to) .")";
@@ -265,12 +265,12 @@
        $this->addHidden("td",$to->getYYYYMMDD());
        $this->filter['to'] = $to;
      }
-     if ( isset($HTTP_GET_VARS['loc']) && ($HTTP_GET_VARS['loc'] != -1) ) {
-       $this->q .= $pre ."(outside = ". $HTTP_GET_VARS['loc'] .")";
+     if ( isset($_GET['loc']) && ($_GET['loc'] != -1) ) {
+       $this->q .= $pre ."(outside = ". $_GET['loc'] .")";
        $pre = " AND ";
-       $this->link1 = addUrlParameter($this->link1,"loc=".$HTTP_GET_VARS['loc']);
-       $this->addHidden("loc",$HTTP_GET_VARS['loc']);
-       $this->filter['loc'] = $HTTP_GET_VARS['loc'];
+       $this->link1 = addUrlParameter($this->link1,"loc=".$_GET['loc']);
+       $this->addHidden("loc",$_GET['loc']);
+       $this->filter['loc'] = $_GET['loc'];
      }
 
      check_dbacl( $this->q, $this->user->id);

Index: app_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_select.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- app_select.php	11 Nov 2002 19:15:19 -0000	1.17
+++ app_select.php	23 Dec 2002 10:01:33 -0000	1.18
@@ -30,43 +30,43 @@
      echo "<form name=\"appsearch\" action=\"app_overview.php\" method=\"GET\">\n";
      DoubleTableStart();
 
-     echo "<TR>\n";
+     echo "<tr>\n";
      if ( $this->ext == false ) {
-       echo "<TH COLSPAN=3>". $lang['SearchForApp'] ."</TH>\n";
+       echo "<th colspan=\"3\">". $lang['SearchForApp'] ."</th>\n";
 
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
 
        echo $this->showfieldc($lang['AdrName']);
-       echo " <TD><CENTER>&nbsp;<INPUT type=\"text\" value=\"\" name=\"name\"></CENTER></TD>\n";
-       echo " <TD><CENTER>\n";
-       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></CENTER></TD>\n";
-       echo "</TR><TR>\n";
-       echo " <TD COLSPAN=2><CENTER><FONT SIZE=-1>". $lang['AppSelInfo'] ."</FONT></CENTER></TD>\n";
-       echo " <TD><CENTER>". makelink("app_select.php?ext=1",$lang['extended']) ."</CENTER></TD>\n";
+       echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
+       echo " <td align=\"center\">\n";
+       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
+       echo "</tr><tr>\n";
+       echo " <td align=\"center\" colspan=\"2\"><font size=\"-1\">". $lang['AppSelInfo'] ."</font></td>\n";
+       echo " <td align=\"center\">". makelink("app_select.php?ext=1",$lang['extended']) ."</td>\n";
      } else {
-       echo "<TH COLSPAN=3>". $lang['SearchForAppExt'] ."</TH>\n";
+       echo "<th colspan=\"3\">". $lang['SearchForAppExt'] ."</th>\n";
 
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
        echo $this->showfieldc($lang['AdrName']);
-       echo " <TD>&nbsp;<INPUT type=\"text\" value=\"\" name=\"name\">";
-       echo " </TD>\n";
-       echo " <TD><CENTER><input type=\"submit\" value=\"". $lang['Search'] ."\"></CENTER></TD>\n";
+       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">";
+       echo " </td>\n";
+       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
   
-       echo "</TR><TR>\n";
-       echo " <TD ROWSPAN=2 CLASS=\"desc\">". $lang['TimetrackBetween'] ."</TD>\n";
-       echo " <TD COLSPAN=2>&nbsp;";
+       echo "</tr><tr>\n";
+       echo " <td rowspan=\"2\" class=\"desc\">". $lang['TimetrackBetween'] ."</td>\n";
+       echo " <td colspan=\"2\">&nbsp;";
        $this->asfd->EnterDate("f",1);
-       echo "&nbsp;</TD>\n";
+       echo "&nbsp;</td>\n";
 
-       echo "</TR><TR>\n";
-       echo " <TD COLSPAN=2>&nbsp;";
+       echo "</tr><tr>\n";
+       echo " <td colspan=\"2\">&nbsp;";
        $this->astd->EnterDate("t",1);
-       echo "&nbsp;</TD>\n";
+       echo "&nbsp;</td>\n";
 
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
        echo $this->showfieldc($lang['Location2'],"loc");
-       echo " <TD COLSPAN=2>&nbsp;<SELECT name=\"loc\">\n";
-       echo " <option value=\"-1\">all</option>\n";
+       echo " <td colspan=\"2\">&nbsp;<select name=\"loc\">\n";
+       echo " <option value=\"-1\">". $lang['all'] ."</option>\n";
        foreach ($lang['AppLoc'] as $i => $f ) {
          echo "   <option VALUE=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
        }
@@ -92,7 +92,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS,$HTTP_SESSION_VARS;
+     global $msg,$lang;
     
      $this->name = $lang['AppsSearch'];
 
@@ -100,14 +100,14 @@
      $this->asfd = new DateTime(0);
      $this->astd = new DateTime(0);
 
-     if ( isset($HTTP_SESSION_VARS['appsearchfrom']) ) {
-       $this->asfd->setDateTime($HTTP_SESSION_VARS['appsearchfrom']);
+     if ( isset($_SESSION['appsearchfrom']) ) {
+       $this->asfd->setDateTime($_SESSION['appsearchfrom']);
      }
-     if ( isset($HTTP_SESSION_VARS['appsearchto']) ) {
-       $this->astd->setDateTime($HTTP_SESSION_VARS['appsearchto']);
+     if ( isset($_SESSION['appsearchto']) ) {
+       $this->astd->setDateTime($_SESSION['appsearchto']);
      }
-     if ( isset($HTTP_GET_VARS['ext']) ) {
-       $this->ext = $HTTP_GET_VARS['ext'];
+     if ( isset($_GET['ext']) ) {
+       $this->ext = $_GET['ext'];
      } else {
        $this->ext = false;
      }

Index: app_vote.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_vote.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- app_vote.php	6 Nov 2002 07:38:11 -0000	1.17
+++ app_vote.php	23 Dec 2002 10:01:33 -0000	1.18
@@ -29,37 +29,33 @@
      global $lang;
 
      echo $this->DataTableStart();
-     echo "<TH NOWRAP COLSPAN=3>". sprintf($lang['AppVoteHead'], menulink($this->obj->getUrl(),$this->obj->start->GetDate())) ."</TH>\n";
+     echo "<th nowrap colspan=\"3\">". sprintf($lang['AppVoteHead'], menulink($this->obj->getUrl(),$this->obj->start->GetDate())) ."</th>\n";
 
-     echo "<TR>\n";
+     echo "<tr>\n";
      echo $this->showfield($lang['StartDate']);
-     echo "<TD COLSPAN=2>". $this->obj->start->getDateTime() ."</TD>\n";
-
-     echo "</TR><TR>\n";
+     echo $this->showdata($this->obj->start->getDateTime(),2);
+     echo "</tr><tr>\n";
      echo $this->showfield($lang['EndDate']);
-     echo "<TD COLSPAN=2>". $this->obj->end->getDateTime() ."</TD>\n";
-
-     echo "</TR><TR>\n";
+     echo $this->showdata($this->obj->end->getDateTime(),2);
+     echo "</tr><tr>\n";
      echo $this->showfield($lang['Description']);
-     echo "<TD COLSPAN=2>".  urlReplace($this->obj->descr) ."</TD>\n";
-
-     echo "</TR><TR>\n";
+     echo $this->showdata(urlReplace($this->obj->descr),2);
+     echo "</tr><tr>\n";
      echo $this->showfield($lang['Participants']);
-     echo " <TD COLSPAN=2>";
-     @reset($this->obj->participant);
-     while ( list ($i,$f) = @each ($this->obj->participant) ) {
+     echo " <td colspan=\"2\">";
+     foreach ($this->obj->participant as $f) {
        echo $f->getLink() ;
-       echo "<BR>" ;
+       echo "<br>" ;
      }
-
-     echo "</TR><TR>\n";
+     echo "</td>\n" ;
+     echo "</tr><tr>\n";
      echo $this->showfield($lang['AppVoteState']);
      $s = sprintf("state%d",$this->obj->participant_state[$this->adr_id]);
-     echo "<TD COLSPAN=2 CLASS=\"". $s ."\"><CENTER><B>". $lang['AppState'][$this->obj->participant_state[$this->adr_id]] ."</B></CENTER></TD>\n";
+     echo "<td colspan=\"2\" align=\"center\" class=\"". $s ."\"><b>". $lang['AppState'][$this->obj->participant_state[$this->adr_id]] ."</b></td>\n";
 
-     echo "</TR><TR>\n";
-     echo "<TD COLSPAN=3><CENTER><B>". $lang['AppVoteSelect'] ."</B></CENTER></TD>\n";
-     echo "</TR><TR>\n";
+     echo "</tr><tr>\n";
+     echo "<td colspan=\"3\" align=\"center\"><b>". $lang['AppVoteSelect'] ."</b></td>\n";
+     echo "</tr><tr>\n";
 
 
      $url = "app_do_vote.php";
@@ -67,22 +63,22 @@
      $url = addUrlParameter($url,"adr_id=".$this->adr_id);
      $url = addSessionKey($url);
 
-     echo "<TD WIDTH=\"30%\" CLASS=state1><CENTER><B>";
+     echo "<td width=\"30%\" class=\"state1\" align=\"center\"><b>";
      $vurl =  addUrlParameter($url,"vote=1");
      echo makelink($vurl,$lang['AppState'][1],"Vote ". $lang['AppState'][1]);
-     echo "</B></CENTER></TD>\n";
+     echo "</b></td>\n";
 
-     echo "<TD WIDTH=\"30%\" CLASS=state0><CENTER><B>";
+     echo "<td width=\"30%\" class=\"state0\" align=\"center\"><b>";
      $vurl =  addUrlParameter($url,"vote=0");
      echo makelink($vurl,$lang['AppState'][0],"Vote ". $lang['AppState'][0]);
-     echo "</B></CENTER></TD>\n";
+     echo "</b></td>\n";
 
-     echo "<TD WIDTH=\"30%\" CLASS=state2><CENTER><B>";
+     echo "<td width=\"30%\" class=\"state2\" align=\"center\"><b>";
      $vurl =  addUrlParameter($url,"vote=2");
      echo makelink($vurl,$lang['AppState'][2],"Vote ". $lang['AppState'][2]);
-     echo "</B></CENTER></TD>\n";
+     echo "</b></td>\n";
 
-     echo "</TR>\n";
+     echo "</tr>\n";
      echo $this->DataTableEnd();
    }
    /**
@@ -91,28 +87,28 @@
    Function navigate() {
      global $lang;
 
-     echo "<TR><TD>";
+     echo "<tr><td>\n";
      if ( $this->obj->id > 0 ) {
        echo  menulink("app_show.php?id=". $this->obj->id ,$lang['AppSeeEntry'],$lang['AppSeeEntryI']) . "<BR>";
      }
-     echo "</TD></TR>";
+     echo "</td></tr>\n";
    }
    /**
     * prepare
     */
    Function prepare() {
-     global $lang,$HTTP_GET_VARS;
+     global $lang;
 
      $this->name = $lang['AppointCommit'];
      $this->obj = new appointment($this->dbconn);
 
-     if ( !isset($HTTP_GET_VARS['id']) || !isset($HTTP_GET_VARS['adr_id']) ) {
+     if ( !isset($_GET['id']) || !isset($_GET['adr_id']) ) {
        $msg .= "No appointment or no adr given !<BR>";
        $this->stop = true;
      } else {
-       $this->obj->read($HTTP_GET_VARS['id']);
+       $this->obj->read($_GET['id']);
        $this->obj->read_participants();
-       $this->adr_id =  $HTTP_GET_VARS['adr_id'];
+       $this->adr_id =  $_GET['adr_id'];
      }
      if ( ! $this->obj->see_ok() ) {
        $msg .= sprintf($lang['Err0022'],$lang[$this->obj->getType()]);
@@ -131,8 +127,6 @@
      add_module_addlinks($this,$this->obj);
    }
  }
-
-
 
  $l = new app_vote($current_user);
  $l->display();

Index: appointment.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/appointment.pinc,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- appointment.pinc	13 Dec 2002 15:22:19 -0000	1.128
+++ appointment.pinc	23 Dec 2002 10:01:33 -0000	1.129
@@ -260,12 +260,12 @@
   @reset ($xx);
   while ( list ($i,$f) = @each ($xx) ) {
     if ( $cols > 0 ) {
-      echo "<TR><TD COLSPAN=". $cols .">\n";
+      echo "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x > $rows ) ) {
       echo  "  ". $tutos[image][folder] ." ". makelink("app_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->applist)));
       if ( $cols > 0 ) {
-        echo "</TD></TR>\n";
+        echo "</td></tr>\n";
       }
       break;
     }
@@ -282,9 +282,9 @@
       }
       echo $f->visitor->getLink();
     }
-    echo "<BR>\n";
+    echo "<br>\n";
     if ( $cols > 0 ) {
-      echo "</TD></TR>\n";
+      echo "</td></tr>\n";
     }
     $n++;
   }
@@ -1104,7 +1104,7 @@
 
     foreach ( $this->participant as $i => $fp) {
       $fp = &$this->participant[$i];
-      echo "  <TR>\n";
+      echo "  <tr>\n";
       if ( ($this->trace == 1) && ( ($fp->gettype() == "address") || ($fp->gettype() == "user") )) {
         $cols = 2;
       } else {
@@ -1424,9 +1424,9 @@
     appointment::obj_read($obj);
     if ( count($obj->applist) > 0 ) {
        @reset($obj->applist);
-       echo "<TR>\n";
+       echo "<tr>\n";
        echo $user->layout->showfield($lang['Appointments']);
-       echo " <TD VALIGN=top COLSPAN=".($cols-1).">\n";
+       echo " <td valign=\"top\" Colspan=\"".($cols-1)."\">\n";
        $ext = 0;
        if ($obj->getType() == "product") {
          $ext = 2;
@@ -1436,8 +1436,8 @@
        } else {
          showApps($obj,0,$ext);
        }
-       echo " </TD>\n";
-       echo "</TR>\n";
+       echo " </td>\n";
+       echo "</tr>\n";
     }
   }
   /**

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_ins.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bug_ins.php	29 Nov 2002 16:19:40 -0000	1.29
+++ bug_ins.php	23 Dec 2002 10:01:33 -0000	1.30
@@ -33,21 +33,21 @@
  }
 
  if ( empty($_POST['name']) || !isset($_POST['name']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['BugID']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['BugID']) ."<br>";
  } else {
    $name = StripSlashes($_POST['name']);
    $gotourl= addUrlParameter($gotourl,"name=". UrlEncode($name));
  }
 
  if ( (empty($_POST['description']) || !isset($_POST['description']) ) && ($b->id < 0 )) {
-   $msg .= sprintf($lang['Err0009'],$lang['BugAdditional']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['BugAdditional']) ."<br>";
  } else {
    $description = StripSlashes($_POST['description']);
    $gotourl= addUrlParameter($gotourl,"description=". UrlEncode($description));
  }
 
  if ( empty($_POST['short']) || !isset($_POST['short']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['BugShort']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['BugShort']) ."<br>";
  } else {
    $short = StripSlashes($_POST['short']);
    $gotourl= addUrlParameter($gotourl,"short=". UrlEncode($short));
@@ -58,17 +58,17 @@
    $oldparent = $b->parent;
    $b->setParent(getObject($dbconn,$_POST['pid']));
  } else {
-   $msg .= sprintf($lang['Err0009'],$lang['Product']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['Product']) ."<br>";
  }
 
  if ( empty($_POST['state']) || !isset($_POST['state']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['BugState']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['BugState']) ."<br>";
  } else {
    $state = $_POST['state'];
    $gotourl= addUrlParameter($gotourl,"state=". $state);
  }
  if ( empty($_POST['class']) || !isset($_POST['class']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['BugClass']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['BugClass']) ."<br>";
  } else {
    $class = $_POST['class'];
    $gotourl= addUrlParameter($gotourl,"class=". $class);
@@ -100,16 +100,16 @@
  if ( $b->id > 0 )  {
    $newlines = "";
    if ( !empty($description) ) {
-     $newlines = sprintf("<B>%s -- Added by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$current_user->getFullname() , myentities($description));
+     $newlines = sprintf("<b>%s -- Added by %s</b>\n%s" ,Date("d.m.Y H:i:s"),$current_user->getFullname() , myentities($description));
    }
    #
    # Solver Change
    #
    if ( $b->solver->id != $solver->id ) {
      if ( ($solver->id > 0) && ($b->solver->id > 0 ) ) {
-       $newlines = sprintf("<B>%s -- Solver changed from <I>%s</I> to <I>%s</I> by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$b->solver->getFullName(),$solver->getFullName(),$current_user->getFullname() , $newlines);
+       $newlines = sprintf("<b>%s -- Solver changed from <i>%s</i> to <i>%s</i> by %s</b>\n%s" ,Date("d.m.Y H:i:s"),$b->solver->getFullName(),$solver->getFullName(),$current_user->getFullname() , $newlines);
      } else {
-       $newlines = sprintf("<B>%s -- Solver changed by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$current_user->getFullname() , $newlines);
+       $newlines = sprintf("<b>%s -- Solver changed by %s</b>\n%s" ,Date("d.m.Y H:i:s"),$current_user->getFullname() , $newlines);
      }
      $b->setSolver($solver);
    }
@@ -117,22 +117,22 @@
    # Parent Change
    #
    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);
+     $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);
    }
    #
    # State Change
    #
    if ( $b->state != $state ) {
-     $newlines = sprintf("<B>%s -- State changed from <I>%s</I> to <I>%s</I> by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$b->getState(),$b->getState($state),$current_user->getFullname() , $newlines);
+     $newlines = sprintf("<b>%s -- State changed from <i>%s</i> to <i>%s</i> by %s</b>\n%s" ,Date("d.m.Y H:i:s"),$b->getState(),$b->getState($state),$current_user->getFullname() , $newlines);
    }
    #
    # Class Change
    #
    if ( $b->class != $class ) {
-     $newlines = sprintf("<B>%s -- Class changed from <I>%s</I> to <I>%s</I> by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$b->getClass(),$b->getClass($class),$current_user->getFullname() , $newlines);
+     $newlines = sprintf("<b>%s -- Class changed from <i>%s</i> to <i>%s</i> by %s</b>\n%s" ,Date("d.m.Y H:i:s"),$b->getClass(),$b->getClass($class),$current_user->getFullname() , $newlines);
    }
    if ( $b->short != $short ) {
-     $newlines = sprintf("<B>%s -- ShortDescription changed from <I>%s</I> to <I>%s</I> by %s</B>\n%s" ,Date("d.m.Y H:i:s"),$b->short,$short,$current_user->getFullname() , $newlines);
+     $newlines = sprintf("<b>%s -- ShortDescription changed from <i>%s</i> to <i>%s</i> by %s</b>\n%s" ,Date("d.m.Y H:i:s"),$b->short,$short,$current_user->getFullname() , $newlines);
    }
    if ( !empty($newlines) ) {
      $b->description = sprintf("%s\n%s" ,rtrim($b->description) , $newlines);

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bug_new.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.5...
 
[truncated message content]

Update of /cvsroot/tutos/tutos/php/file
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php/file

Modified Files:
	file.pinc file_ins.php file_overview.php file_show.php 
Log Message:
a lot html stuff

Index: file.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file.pinc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file.pinc	17 Dec 2002 10:54:55 -0000	1.2
+++ file.pinc	23 Dec 2002 10:01:38 -0000	1.3
@@ -30,20 +30,11 @@
 
   @reset ($obj->filelist);
   while ( list ($i,$f) = @each ($obj->filelist) ) {
-#    if ( $cols > 0 ) {
-#      echo "<TR><TD COLSPAN=$cols>\n";
-#    }
     if ( ($n >= $rows) && ( $x != $rows ) ) {
       echo  "  ". $tutos[image][folder] ." ". makelink("file_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->filelist)));
-#      if ( $cols > 0 ) {
-#        echo "</TD></TR>\n";
-#      }
       break;
     }
-    echo "  ". $tutos[image][paper] ." ". $f->getLink() ."<BR>\n";
-#    if ( $cols > 0 ) {
-#      echo "</TD></TR>\n";
-#    }
+    echo "  ". $tutos[image][paper] ." ". $f->getLink() ."<br>\n";
     $n++;
   }
 }
@@ -206,7 +197,7 @@
         $exif = read_exif_data ($fname);
         while(list($key, $val) = each($exif)) {
           if ( $key == "Thumbnail" ) {
-            echo "\t". $key ." => <IMG ALT=\"". $this->getFullName() ."\" ALIGN=top BORDER=1 SRC=\"".  addSessionKey("file_show.php?format=thumbnail&id=". $this->id) ."\">\n\n";
+            echo "\t". $key ." => <img alt=\"". $this->getFullName() ."\" align=\"top\" border=\"1\" src=\"".  addSessionKey("file_show.php?format=thumbnail&id=". $this->id) ."\">\n\n";
           } else {
             echo "\t". $key ." => ". $val ."\n";
           }
@@ -348,7 +339,7 @@
       @readfile ($this->base ."/". $this->fileloc);
       return;
     }
-    echo $this->filename . ": <span class=\"warn\">Cannot Show files in this format ". $this->filetype . "<B> please use download</B> !</span>";
+    echo $this->filename . ": <span class=\"warn\">Cannot Show files in this format ". $this->filetype . "<b> please use download</b> !</span>";
     return;
   }
   /**
@@ -505,19 +496,19 @@
     if ( ! @file_exists($this->base . "/" . $this->link_id)) {
       $x = @mkdir($this->base . "/" .$this->link_id ,0755);
       if ( $x == FALSE ) {
-        $msg .= "<BR>Could not create ". $this->base . "/" .$this->link_id ." ". $php_errormsg;
+        $msg .= "<br>Could not create ". $this->base . "/" .$this->link_id ." ". $php_errormsg;
       }
     }
     if ( ! @file_exists($this->base . "/" . $this->link_id ."/". $this->id )) {
       $x = @mkdir($this->base . "/" .$this->link_id ."/". $this->id ,0755);
       if ( $x == FALSE ) {
-        $msg .= "<BR>Could not create ". $this->base . "/" .$this->link_id ."/". $this->id ." ". $php_errormsg;
+        $msg .= "<br>Could not create ". $this->base . "/" .$this->link_id ."/". $this->id ." ". $php_errormsg;
       }
     }
 
     if ( $msg != "" ) {
       $this->id = -1;
-      $msg .= "<BR>FILE NOT SAVED";
+      $msg .= "<br>FILE NOT SAVED";
   	  return $msg;
 	}
 
@@ -724,16 +715,16 @@
 
     if ( count($obj->filelist) > 0 ) {
        @reset($obj->filelist);
-       echo "<TR>\n";
+       echo "<tr>\n";
        echo $user->layout->showfield($lang['Files']);
-       echo " <TD VALIGN=top COLSPAN=".($cols-1).">\n";
+       echo " <td valign=\"top\" colspan=\"".($cols-1)."\">\n";
        if ( $format == "paper" ) {
 	     show_Files($obj,-1);
        } else {
 	     show_Files($obj);
        }
-       echo " </TD>\n";
-       echo "</TR>\n";
+       echo " </td>\n";
+       echo "</tr>\n";
     }
   }
   /**
@@ -781,7 +772,7 @@
     return array( url => "file/file_select.php",
                   text => ($text == "" ? $lang['Files'] : $text),
                   info => $lang['SearchForFile'],
-                  category => array("search","file")
+                  category => array("search","file","module")
                 );
   }
   /**
@@ -812,8 +803,8 @@
       $f->read_result($res,$a);
 	  if ( $f->see_ok() ) {
         $r .= " <tr>\n";
-        $r .= "  <td>" . $f->getLink() ."</TD>\n";
-        $r .= "  <td>" . $f->version ."</TD>\n";
+        $r .= "  <td>" . $f->getLink() ."</td>\n";
+        $r .= "  <td>" . $f->version ."</td>\n";
         $r .= "  <td align=\"right\">" . $f->creation->getDateTime() ."</td>\n";
         $r .= " </tr>\n";
       }

Index: file_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_ins.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file_ins.php	17 Dec 2002 10:54:55 -0000	1.2
+++ file_ins.php	23 Dec 2002 10:01:38 -0000	1.3
@@ -47,7 +47,7 @@
  }
 
  if ( !isset($_POST['link_id']) ) {
-   $msg .= sprintf($lang['Err0009'],$lang['FileReference']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['FileReference']) ."<br>";
  } else {
    $f->link_id = $_POST['link_id'];
    $gotourl = addUrlParameter($gotourl,"link_id=". UrlEncode($f->link_id));
@@ -71,11 +71,11 @@
  }
  # New files need a path !
  if ( ($file == "none") && ($f->id == -1)  ) {
-   $msg .= sprintf($lang['Err0009'],$lang['FileName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['FileName']) ."<br>";
  }
 
  if ( ( !isset($_POST['name']) || $_POST['name'] == "") && ($file == "none") ) {
-   $msg .= sprintf($lang['Err0009'],$lang['FileName']) ."<BR>";
+   $msg .= sprintf($lang['Err0009'],$lang['FileName']) ."<br>";
    $name = "";
  } else {
    $name = trim($_POST['name']);
@@ -163,7 +163,7 @@
    $f->setName($name);
 
    if ( $log != "" ) {
-     $log = "----------- <B>". Date("j M Y  H:i:s") ." -- ". $current_user->getFullName() ." </B>---\n" . $log;
+     $log = "----------- <b>". Date("j M Y  H:i:s") ." -- ". $current_user->getFullName() ." </b>---\n" . $log;
      $f->logtxt = $log. $f->logtxt;
    }
    # Save the new part of logmessage for RCS

Index: file_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_overview.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_overview.php	16 Dec 2002 20:35:35 -0000	1.1
+++ file_overview.php	23 Dec 2002 10:01:38 -0000	1.2
@@ -161,7 +161,7 @@
      } else {
        $from->setDateTimeF("f");
        # remember this
-       $HTTP_SESSION_VARS['filesearchfrom'] = $from->getYYYYMMDD();
+       $_SESSION['filesearchfrom'] = $from->getYYYYMMDD();
      }
      if ( $from->notime != 1 ) {
        $this->q .= $pre ."(creation >= ". $this->dbconn->Date($from) .")";
@@ -177,7 +177,7 @@
      } else {
        $to->setDateTimeF("t");
        # remember this
-       $HTTP_SESSION_VARS['filesearchto'] = $to->getYYYYMMDD();
+       $_SESSION['filesearchto'] = $to->getYYYYMMDD();
      }
      if ( $to->notime != 1 ) {
        $this->q .= $pre ."(creation <= ". $this->dbconn->Date($to) .")";

Index: file_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/file_show.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file_show.php	16 Dec 2002 20:36:03 -0000	1.1
+++ file_show.php	23 Dec 2002 10:01:38 -0000	1.2
@@ -185,13 +185,13 @@
    Function navigate() {
      global $lang;
 
-     echo "<TR><TD>";
+     echo "<tr><td>\n";
 
      if ( ($this->obj->id > 0) && $this->obj->see_ok() ) {
-       echo menulink($this->obj->getUrl() ."&format=show" ,$lang['FileShow'],sprintf($lang['FileShowI'],$this->obj->getFullName())) ."&nbsp;<BR>";
-       echo menulink($this->obj->getUrl() ."&format=download" ,$lang['FileDownload'],sprintf($lang['FileDownloadI'],$this->obj->getFullName())) ."&nbsp;<BR>";
+       echo menulink($this->obj->getUrl() ."&format=show" ,$lang['FileShow'],sprintf($lang['FileShowI'],$this->obj->getFullName())) ."&nbsp;<br>";
+       echo menulink($this->obj->getUrl() ."&format=download" ,$lang['FileDownload'],sprintf($lang['FileDownloadI'],$this->obj->getFullName())) ."&nbsp;<br>";
      }
-     echo "</TD></TR>\n";
+     echo "</td></tr>\n";
    }
    /**
     * prepare

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php/db

Modified Files:
	db_oci.pinc db_pg.pinc 
Log Message:
a lot html stuff

Index: db_oci.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_oci.pinc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- db_oci.pinc	4 Dec 2002 15:46:24 -0000	1.12
+++ db_oci.pinc	23 Dec 2002 10:01:37 -0000	1.13
@@ -116,7 +116,6 @@
     # Parse will fail on nonexistant tables
     $p = ociparse($this->conn,$query);
     if ( false == $p ) {
-      #echo "P: ".$p ." ". getType($p)." ". $query ."<BR>";flush();
       if ($showerror == 1) {
         Fatal_Error("Exec ". $this->conn ." !PARSE|". $this->error(),$query);
       } else {
@@ -129,7 +128,6 @@
     $this->lastquery = $query;
     $ex = @ociexecute($p);
     if ( false == $ex ) {
-#      echo "E: ".$ex ." ". getType($ex)." ". $query ." ". $this->error($p) ."<BR>";flush();
       if ($showerror == 1) {
         Fatal_Error("Exec ". $this->conn ." !EXEC|". $this->error($p),$query);
       } else {
@@ -148,7 +146,6 @@
     if ( $numcols > 0 ) {
       $c = array();
       while (  @OciFetchInto($p,&$c,OCI_ASSOC | OCI_RETURN_NULLS) ) {
-#           echo var_dump($c) ."<BR>\n";
         $x->result[$row] = $c;
         $row++;
         $c = array();
@@ -157,9 +154,6 @@
       OCIFreeStatement ($p);
     }
 
-#    echo "ROWS: $numrows  COLS: $numcols |   $query<BR>";
- 
-
     return $x;
   }
   /* ---------------------------------------------------------------------------
@@ -526,7 +520,6 @@
   function get($pos,$fld) {
     # Copy the whole thing
     $x = $this->result[$pos][strtoupper($fld)];
-    # echo "GET ROWS: $pos  COLS: $fld | ".$x."|<BR>";
     return $x;
 
   }

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- db_pg.pinc	4 Dec 2002 15:46:23 -0000	1.9
+++ db_pg.pinc	23 Dec 2002 10:01:37 -0000	1.10
@@ -145,7 +145,6 @@
       echo  "No Database Connection";
       return;
     }
-#	echo "<BR>". $this->db->id ." ".$query;
     $result = @pg_Exec($this->conn,$query);
     $this->lastquery = $query;
 

Update of /cvsroot/tutos/tutos/homepage
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/homepage

Modified Files:
	foot1.html install_easy.html 
Log Message:
a lot html stuff

Index: foot1.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/foot1.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foot1.html	5 Nov 2000 11:03:53 -0000	1.5
+++ foot1.html	23 Dec 2002 10:01:32 -0000	1.6
@@ -8,6 +8,23 @@
  <A HREF="http://petition.eurolinux.org"><img src="http://aful.org/images/patent_button.png" border="0" ALT="No Software Patents"></A>
  <BR>
  <img src="../html/msfree.gif" border="0" ALT="Proud to be Microsoft free">
+<br>
+
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_xclick">
+<input type="hidden" name="business" value="gok...@us...">
+<input type="hidden" name="item_name" value="TUTOS">
+<input type="hidden" name="no_shipping" value="1">
+<input type="hidden" name="return" value="http://www.tutos.org">
+<input type="hidden" name="cancel_return" value="http://www.tutos.org">
+<input type="hidden" name="cn" value="Special Instructions (optional">
+<input type="hidden" name="no_note" value="0">
+<input type="hidden" name="currency_code" value="EUR">
+<input type="hidden" name="tax" value="0">
+<input type="image" src="https://www.paypal.com/images/x-click-butcc-donate.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and
+ secure!">
+</form>
+
  </CENTER></TD>
  <TD>
  </TD>
@@ -19,4 +36,4 @@
 </FONT>
 </ADDRESS>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>

Index: install_easy.html
===================================================================
RCS file: /cvsroot/tutos/tutos/homepage/install_easy.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- install_easy.html	16 Oct 2002 19:59:07 -0000	1.10
+++ install_easy.html	23 Dec 2002 10:01:32 -0000	1.11
@@ -11,7 +11,7 @@
 <LI>get the latest tarball from <A HREF=TUTOS" rel="nofollow">http://sourceforge.net/project/showfiles.php?group_id=8047>TUTOS
 Project</A>. Go to the directory where you like to install the software.<BR>
 <LI>if you got the bzip version<BR>
-	<TT>tar xvIf tutos.....bz2</TT><BR>
+	<TT>tar xvjf tutos.....bz2</TT><BR>
 	or<BR>
 	<TT>cat tutos.....bz2 | bunzip | tar xvf -</TT>
 <LI>if you got the gzip version<BR>

Update of /cvsroot/tutos/tutos/php/sms
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php/sms

Modified Files:
	sms_new.php 
Log Message:
a lot html stuff

Index: sms_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/sms/sms_new.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sms_new.php	10 Dec 2002 18:17:45 -0000	1.1
+++ sms_new.php	23 Dec 2002 10:01:39 -0000	1.2
@@ -51,30 +51,30 @@
 
      echo "<tr>\n";
      echo " <td colspan=\"2\"><a href=\"http://www.sms.de/privat/send.php?action=form2&networkkey=%2B\" target=\"map\">www.sms.de</a></td>\n";
-     echo "</TR>\n";
+     echo "</tr>\n";
 
-     echo "<TR>\n";
-     echo " <TD COLSPAN=2><A HREF=\"http://freesms.web.de\" TARGET=map>freesms.web.de</A></TD>\n";
-     echo "</TR>\n";
-
-     echo "<TR>\n";
-     echo " <TD COLSPAN=2><A HREF=\"http://sms.t-online.de\" TARGET=map>sms.t-online.de</A></TD>\n";
-     echo "</TR>\n";
-
-     echo "<TR>\n";
-     echo " <TD COLSPAN=2><A HREF=\"http://www.billiger-telefonieren.de/sms/send.php3?action=form2&othernetwork=yes\" TARGET=map>www.billiger-telefonieren.de</A></TD>\n";
-
-     echo "<TR>\n";
-     echo " <TD COLSPAN=2><A HREF=\"http://www.lycos.de/service/sms/eingabe.html\" TARGET=map>www.lycos.de</A></TD>\n";
-     echo "</TR>\n";
-
-     echo "<TR>\n";
-     echo " <TD COLSPAN=2><A HREF=\"http://www.spray.net/telekommunikation/sms/index.jsp?step=s2w\" TARGET=map>www.spray.net</A></TD>\n";
-     echo "</TR>\n";
-
-     echo "<TR>\n";
-     echo " <TD COLSPAN=2><A HREF=\"\"  TARGET=map></A>-</TD>";
-     echo "</TR>\n";
+     echo "<tr>\n";
+     echo " <td colspan=\"2\"><a href=\"http://freesms.web.de\" target=\"map\">freesms.web.de</a></td>\n";
+     echo "</tr>\n";
+
+     echo "<tr>\n";
+     echo " <td colspan=\"2\"><a href=\"http://sms.t-online.de\" target=\"map\">sms.t-online.de</a></td>\n";
+     echo "</tr>\n";
+
+     echo "<tr>\n";
+     echo " <td colspan=\"2\"><a href=\"http://www.billiger-telefonieren.de/sms/send.php3?action=form2&othernetwork=yes\" target=\"map\">www.billiger-telefonieren.de</a></td>\n";
+
+     echo "<tr>\n";
+     echo " <td colspan=\"2\"><a href=\"http://www.lycos.de/service/sms/eingabe.html\" target=\"map\">www.lycos.de</a></td>\n";
+     echo "</tr>\n";
+
+     echo "<tr>\n";
+     echo " <td colspan=\"2\"><a href=\"http://www.spray.net/telekommunikation/sms/index.jsp?step=s2w\" target=\"map\">www.spray.net</a></td>\n";
+     echo "</tr>\n";
+
+     echo "<tr>\n";
+     echo " <td colspan=\"2\"><a href=\"\"  target=\"map\"></a>-</td>";
+     echo "</tr>\n";
 
      DoubleTableEnd();
 	 echo $this->getHidden();

Update of /cvsroot/tutos/tutos/php/watchlist
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php/watchlist

Modified Files:
	watchlist_overview.php 
Log Message:
a lot html stuff

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_overview.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- watchlist_overview.php	30 Nov 2002 19:04:49 -0000	1.18
+++ watchlist_overview.php	23 Dec 2002 10:01:40 -0000	1.19
@@ -88,7 +88,7 @@
        echo $this->OverviewRowStart($line);
        if ( $this->id == -1 ) {
          if ( $obj == -1 ) {
-           echo " <td nowrap align=\"right\">ID:". $oid ."</TD>\n";
+           echo " <td nowrap align=\"right\">ID:". $oid ."</td>\n";
            echo " <td nowrap align=\"right\"><i>". makelink("history_show.php?id=".$oid,$lang['HistoryDeleted']) ."</i></td>\n";
            $remove = true;
          } else {
@@ -109,7 +109,7 @@
        $d = $r->getDateTime($a, "creation");
        echo " <td nowrap align=\"right\">". $d->getDateTime() ."&nbsp;</td>\n";
        $d = $r->getDateTime($a, "lastcall");
-       echo " <td nowrap ALIGN=right>". $d->getDateTime() ."&nbsp;</TD>\n";
+       echo " <td nowrap align=\"right\">". $d->getDateTime() ."&nbsp;</td>\n";
  
        if ( !$remove && (($this->user->id == $aid) || ($obj != -1 ) || $obj->mod_ok() ) ) {
          $url = confirmlink("watchlist/watchlist_del.php?id=". $oid ."&adr=". $aid ."&gotourl=". $this->link1 ,$lang['Delete'],$lang['WatchDel']);
@@ -134,16 +134,12 @@
     * navigate
     */
    Function navigate() {
-     global $lang;
-
-     echo "<TR><TD>";
-     echo "</TD></TR>";
    }
    /**
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS;
+     global $msg,$lang;
 
      $this->name = $lang['WatchOverview'];
      $this->link1 = "watchlist/watchlist_overview.php";
@@ -154,14 +150,14 @@
      $this->q = "SELECT * FROM ". $this->dbconn->prefix ."watchlist ";
      $pre = "WHERE ";
 
-     if ( isset($HTTP_GET_VARS['adr']) && ($HTTP_GET_VARS['adr'] != "") ) {
-       $this->adr = $HTTP_GET_VARS['adr'];
+     if ( isset($_GET['adr']) && ($_GET['adr'] != "") ) {
+       $this->adr = $_GET['adr'];
        $this->q .=" " . $pre ." adr_id = ". $this->adr;
        $pre = "AND ";
        $this->link1 = addUrlParameter($this->link1,"adr=".$this->adr);
      }
-     if ( isset($HTTP_GET_VARS['id']) && ($HTTP_GET_VARS['id'] != "") ) {
-       $this->id = $HTTP_GET_VARS['id'];
+     if ( isset($_GET['id']) && ($_GET['id'] != "") ) {
+       $this->id = $_GET['id'];
        $this->q .= " " . $pre ." obj_id = ". $this->id;
        $pre = "AND ";
        $this->link1 = addUrlParameter($this->link1,"id=".$this->id);

Update of /cvsroot/tutos/tutos/php/note
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php/note

Modified Files:
	note.pinc note_overview.php note_select.php 
Log Message:
a lot html stuff

Index: note.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note.pinc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- note.pinc	30 Nov 2002 19:04:49 -0000	1.24
+++ note.pinc	23 Dec 2002 10:01:39 -0000	1.25
@@ -24,21 +24,20 @@
     $rows = count($obj->notelist);
   }
 
-  @reset ($obj->notelist);
-  while ( list ($i,$f) = @each ($obj->notelist) ) {
+  foreach ($obj->notelist as $i => $f) {
     if ( $cols > 0 ) {
-      echo "<TR><TD COLSPAN=\"". $cols ."\">\n";
+      echo "<tr><td colspan=\"". $cols ."\">\n";
     }
     if ( ($n >= $rows) && ( $x != $rows ) ) {
       echo  "  ". $tutos[image][folder] ." ". makelink("note/note_overview.php?link_id=". $obj->id,sprintf($lang['AllEntries'], count($obj->notelist)));
       if ( $cols > 0 ) {
-        echo "</TD></TR>\n";
+        echo "</td></tr>\n";
       }
       break;
     }
     echo "  ". $tutos[image][paper] ." ". $f->getLink() ." ". $f->creation->getDateTime() ." ".$f->creator->getLink($f->creator->getShortname())."<BR>\n";
     if ( $cols > 0 ) {
-      echo "</TD></TR>\n";
+      echo "</td></tr>\n";
     }
     $n++;
   }
@@ -393,12 +392,12 @@
     if ( count($obj->notelist) > 0 ) {
       $sep = "";
       @reset($obj->notelist);
-      echo "  <TR><TD CLASS=". $class ." COLSPAN=". $cols ." ALIGN=left>";
+      echo "  <tr><td class=\"". $class ."\" colspan=". $cols ." align=\"left\">";
       while ( list ($i,$f) = @each ($obj->notelist) ) {
         echo $sep . "-" . $f->getLink();
-        $sep = "<BR>\n";
+        $sep = "<br>\n";
       }
-      echo "</TD></TR>\n";
+      echo "</td></tr>\n";
     }
   }
   /**

Index: note_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_overview.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- note_overview.php	10 Nov 2002 11:45:57 -0000	1.22
+++ note_overview.php	23 Dec 2002 10:01:39 -0000	1.23
@@ -88,7 +88,7 @@
        $b->read_reference();
 
        echo $this->OverviewRowStart($line);
-       echo " <td>". $b->creation->getDateTime() ."</TD>\n";
+       echo " <td>". $b->creation->getDateTime() ."</td>\n";
 	   $x = myentities($b->getFullName());
        if ( $this->filter['name'] != "" ) {
          $x = eregi_replace("(". $this->filter['name'] .")","<span class=\"found\">\\1</span>",$x);
@@ -114,7 +114,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS,$HTTP_SESSION_VARS;
+     global $msg,$lang;
 
      $this->name = $lang['NotesOverview'];
      $this->link1 = "note/note_overview.php";
@@ -125,17 +125,17 @@
      $nsrn = "";
      $nscr = "";
 
-     if ( isset($HTTP_GET_VARS['reftype']) ) {
-       $reftype = $HTTP_GET_VARS['reftype'];
+     if ( isset($_GET['reftype']) ) {
+       $reftype = $_GET['reftype'];
      }
-     if ( isset($HTTP_GET_VARS['name']) ) {
-       $name = $HTTP_GET_VARS['name'];
+     if ( isset($_GET['name']) ) {
+       $name = $_GET['name'];
      }
-     if ( isset($HTTP_GET_VARS['nsrn']) ) {
-       $nsrn = $HTTP_GET_VARS['nsrn'];
+     if ( isset($_GET['nsrn']) ) {
+       $nsrn = $_GET['nsrn'];
      }
-     if ( isset($HTTP_GET_VARS['nscr']) ) {
-       $nscr = $HTTP_GET_VARS['nscr'];
+     if ( isset($_GET['nscr']) ) {
+       $nscr = $_GET['nscr'];
      }
 
 
@@ -152,16 +152,16 @@
        $this->filter['name'] = "";
      }
 
-     if ( isset($HTTP_GET_VARS['id']) ) {
-       $q .= " ". $pre ." n.id = ".$HTTP_GET_VARS['id'];
+     if ( isset($_GET['id']) ) {
+       $q .= " ". $pre ." n.id = ".$_GET['id'];
        $pre = " AND ";
-       $this->link1 = addUrlParameter($this->link1,"id=". $HTTP_GET_VARS['id']);
+       $this->link1 = addUrlParameter($this->link1,"id=". $_GET['id']);
      }
 
-     if ( isset($HTTP_GET_VARS['link_id']) ) {
-       $q .= " ". $pre ." n.link_id = ".$HTTP_GET_VARS['link_id'];
+     if ( isset($_GET['link_id']) ) {
+       $q .= " ". $pre ." n.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']);
      }
 
      # References to display
@@ -241,7 +241,7 @@
        $this->link1 = addUrlParameter($this->link1,"reftype=". $reftype);
        $this->link1 = addUrlParameter($this->link1,"nsrn=". $nsrn);
        # remember this
-       $HTTP_SESSION_VARS['notesearchreftype'] = $reftype;
+       $_SESSION['notesearchreftype'] = $reftype;
        $this->filter['reftype'] = $reftype;
      }
      if ( ($nscr != "*") && ($nscr != "") ) {
@@ -258,13 +258,13 @@
 
      # 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
 #       session_register('notesearchfrom');
-       $HTTP_SESSION_VARS['notesearchfrom'] = $from->getYYYYMMDD();
+       $_SESSION['notesearchfrom'] = $from->getYYYYMMDD();
      }
      if ( $from->notime != 1 ) {
        $q .= $pre ."(n.creation >= ". $this->dbconn->Date($from) .")";
@@ -274,13 +274,13 @@
      }
      # 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
 #       session_register('notesearchto');
-       $HTTP_SESSION_VARS['notesearchto'] = $to->getYYYYMMDD();
+       $_SESSION['notesearchto'] = $to->getYYYYMMDD();
      }
      if ( $to->notime != 1 ) {
        $q .= $pre ."(n.creation <= ". $this->dbconn->Date($to) .")";

Index: note_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/note/note_select.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- note_select.php	22 Nov 2002 07:56:04 -0000	1.8
+++ note_select.php	23 Dec 2002 10:01:39 -0000	1.9
@@ -42,43 +42,43 @@
 
        echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteName']);
-       echo " <TD><CENTER>&nbsp;<INPUT type=\"text\" value=\"\" name=\"name\"></CENTER></TD>\n";
-       echo " <TD><CENTER>\n";
-       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></CENTER></TD>\n";
+       echo " <td align=\"center\">&nbsp;<input type=\"text\" value=\"\" name=\"name\"></td>\n";
+       echo " <td align=\"center\">\n";
+       echo " <input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
        echo "</tr><tr>\n";
-       echo " <TD COLSPAN=2><CENTER><FONT SIZE=-1>". $lang['NoteSelInfo'] ."</FONT></CENTER></TD>\n";
-       echo " <TD><CENTER>". makelink("note/note_select.php?ext=1",$lang['extended']) ."</CENTER></TD>\n";
+       echo " <td colspan=\"2\" align=\"center\"><font size=\"-1\">". $lang['NoteSelInfo'] ."</font></td>\n";
+       echo " <td align=\"center\">". makelink("note/note_select.php?ext=1",$lang['extended']) ."</td>\n";
      } else {
        echo "<th colspan=\"3\">". $lang['SearchForNoteExt'] ."</th>\n";
 
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteName']);
-       echo " <TD>&nbsp;<INPUT type=\"text\" value=\"\" name=\"name\">";
-       echo " </TD>\n";
-       echo " <TD><CENTER><input type=\"submit\" value=\"". $lang['Search'] ."\"></CENTER></TD>\n";
+       echo " <td>&nbsp;<input type=\"text\" value=\"\" name=\"name\">";
+       echo " </td>\n";
+       echo " <td align=\"center\"><input type=\"submit\" value=\"". $lang['Search'] ."\"></td>\n";
 
-       echo "</TR><TR>\n";
+       echo "</tr><tr>\n";
        echo $this->showfieldc($lang['NoteRefType']);
-       echo " <TD COLSPAN=2>&nbsp;<B>". $this->NoteAskRefType($this->nsrt,0) ."</B>&nbsp;</TD>\n";
+       echo " <td colspan=\"2\">&nbsp;<b>". $this->NoteAskRefType($this->nsrt,0) ."</b>&nbsp;</td>\n";
 
-     echo "</TR><TR>\n";
+     echo "</tr><tr>\n";
      echo $this->showfieldc($lang['NoteRefName']);
-     echo " <TD COLSPAN=2>&nbsp;<INPUT type=\"text\" value=\"\" name=\"nsrn\">&nbsp;</TD>\n";
+     echo " <td colspan=\"2\">&nbsp;<input type=\"text\" value=\"\" name=\"nsrn\">&nbsp;</td>\n";
 
-     echo "</TR><TR>\n";
+     echo "</tr><tr>\n";
      echo $this->showfieldc($lang['NoteCreator']);
-     echo " <TD COLSPAN=2>&nbsp;<INPUT type=\"text\" value=\"\" name=\"nscr\">&nbsp;</TD>\n";
-     echo "</TR><TR>\n";
+     echo " <td colspan=\"2\">&nbsp;<input type=\"text\" value=\"\" name=\"nscr\">&nbsp;</td>\n";
+     echo "</tr><tr>\n";
 
-     echo " <TD ROWSPAN=2 CLASS=\"desc\">". $lang['NoteBetween'] ."</TD>\n";
-     echo " <TD COLSPAN=2>&nbsp;";
+     echo " <td rowspan=\"2\" class=\"desc\">". $lang['NoteBetween'] ."</td>\n";
+     echo " <td colspan=\"2\">&nbsp;";
      $this->nsfd->EnterDate("f",1);
-     echo "&nbsp;</TD>\n";
+     echo "&nbsp;</td>\n";
 
-     echo "</TR><TR>\n";
-     echo " <TD COLSPAN=2>&nbsp;";
+     echo "</tr><tr>\n";
+     echo " <td colspan=\"2\">&nbsp;";
      $this->nstd->EnterDate("t",1);
-     echo "&nbsp;</TD>\n";
+     echo "&nbsp;</td>\n";
    }
 
      echo "</tr>\n";
@@ -123,7 +123,7 @@
     * prepare
     */
    Function prepare() {
-     global $msg,$lang,$HTTP_GET_VARS,$HTTP_SESSION_VARS;
+     global $msg,$lang;
 
      $this->name = $lang['NoteSearch'];
 
@@ -132,19 +132,19 @@
      $this->nstd = new DateTime(0);
      $this->nsrt = -1;
 
-     if ( isset($HTTP_SESSION_VARS['notesearchfrom']) ) {
-       $this->nsfd->setDateTime($HTTP_SESSION_VARS['notesearchfrom']);
+     if ( isset($_SESSION['notesearchfrom']) ) {
+       $this->nsfd->setDateTime($_SESSION['notesearchfrom']);
      }
-     if ( isset($HTTP_SESSION_VARS['notesearchto']) ) {
-       $this->nstd->setDateTime($HTTP_SESSION_VARS['notesearchto']);
+     if ( isset($_SESSION['notesearchto']) ) {
+       $this->nstd->setDateTime($_SESSION['notesearchto']);
      }
-     if ( isset($HTTP_SESSION_VARS['notesearchreftype']) ) {
-       $this->nsrt = $HTTP_SESSION_VARS['notesearchreftype'];
+     if ( isset($_SESSION['notesearchreftype']) ) {
+       $this->nsrt = $_SESSION['notesearchreftype'];
      }
-     if ( ! isset($HTTP_GET_VARS['ext']) ) {
+     if ( ! isset($_GET['ext']) ) {
        $this->ext = 0;
      } else {
-       $this->ext = $HTTP_GET_VARS['ext'];
+       $this->ext = $_GET['ext'];
      }
 
      $lang['NoteReferences'][1]  = &$lang['Company'];

Update of /cvsroot/tutos/tutos/php/palm
In directory sc8-pr-cvs1:/tmp/cvs-serv32022/php/palm

Modified Files:
	en.p3 
Log Message:
a lot html stuff

Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/palm/en.p3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- en.p3	18 Nov 2002 05:55:54 -0000	1.3
+++ en.p3	23 Dec 2002 10:01:39 -0000	1.4
@@ -10,6 +10,7 @@
 
 # Resource
 $lang['PalmExport']        = "Export to PALM";
+$lang['PalmImport']        = "Import from PALM";
 $lang['PalmFile']          = "Filename";
 $lang['PalmType']          = "Type";
 $lang['PalmTypes'][2]      = "Addresses";