fixes

DB/ChangeLog.sql

@@ -18,8 +18,8 @@
 
 DROP TABLE IF EXISTS `ChangeLog`;
 CREATE TABLE IF NOT EXISTS `ChangeLog` (
-  `Time` timestamp(14) NOT NULL,
+  `Time` timestamp NOT NULL,
-  `UID` int(11) NOT NULL default '0',
+  `UID` int(11) NOT NULL default 0,
   `Commend` text NOT NULL,
   `SQLCommad` text NOT NULL
-) TYPE=MyISAM;
+) ENGINE=MyISAM;

DB/Himmel.sql

@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `EngelType` (
   `Man` text,
   PRIMARY KEY  (`TID`),
   UNIQUE KEY `Name` (`Name`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -43,23 +43,23 @@ CREATE TABLE IF NOT EXISTS `FAQ` (
   `Frage` text NOT NULL,
   `Antwort` text NOT NULL,
   PRIMARY KEY  (`FID`)
-) TYPE=MyISAM AUTO_INCREMENT=24 ;
+) ENGINE=MyISAM AUTO_INCREMENT=24 ;
 
 --
 -- Daten für Tabelle `FAQ`
 --
 
-INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?<br>\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.<br>\r\nNo, every angel has to pay full price.'),
+INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?<br />\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.<br />\r\nNo, every angel has to pay full price.'),
-(2, 'Was bekomme ich f&uuml;r meine Mitarbeit?<br>\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung <br>\r\nEvery working angel gets a free shirt after the event. '),
+(2, 'Was bekomme ich f&uuml;r meine Mitarbeit?<br />\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung <br />\r\nEvery working angel gets a free shirt after the event. '),
-(3, 'Wie lange muss ich als Engel arbeiten?<br>\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es h&auml;ngt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen. <br>\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '),
+(3, 'Wie lange muss ich als Engel arbeiten?<br />\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es h&auml;ngt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen. <br />\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '),
-(6, 'Ich bin erst XX Jahre alt. Kann ich &uuml;berhaupt helfen?<br>\r\nI''m only XX years old. Can I help anyway?', 'Wir k&ouml;nnen jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen. <br>\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'),
+(6, 'Ich bin erst XX Jahre alt. Kann ich &uuml;berhaupt helfen?<br />\r\nI''m only XX years old. Can I help anyway?', 'Wir k&ouml;nnen jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen. <br />\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'),
-(8, 'Wer sind eigentlich die Erzengel?<br>\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty<br> \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'),
+(8, 'Wer sind eigentlich die Erzengel?<br />\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty<br /> \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'),
-(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?<br>\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!<br>\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'),
+(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?<br />\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!<br />\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'),
-(10, 'Wie gehe ich mit den Besuchern um? <br>\r\nHow do I treat visitors?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)  <br>\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
+(10, 'Wie gehe ich mit den Besuchern um? <br />\r\nHow do I treat visitors?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)  <br />\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
-(11, 'Wann sind die Engelbesprechungen? <br>\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.<br>\r\nThe information on the Angel Briefings will be in the news section of this system.'),
+(11, 'Wann sind die Engelbesprechungen? <br />\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.<br />\r\nThe information on the Angel Briefings will be in the news section of this system.'),
-(12, 'Was muss ich noch bedenken?<br>\r\nAnything else I should know?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br>\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
+(12, 'Was muss ich noch bedenken?<br />\r\nAnything else I should know?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br />\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
-(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden? <br>\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.<br>\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'),
+(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden? <br />\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.<br />\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'),
-(20, 'Wer muss alles Eintritt zahlen?<br>\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...<br>\r\nEveryone who is at older than 12 years old.');
+(20, 'Wer muss alles Eintritt zahlen?<br />\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...<br />\r\nEveryone who is at older than 12 years old.');
 
 -- --------------------------------------------------------
 
@@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS `News` (
   `UID` int(11) NOT NULL default '0',
   `Treffen` tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (`ID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `Questions` (
   `AID` int(11) NOT NULL default '0',
   `Answer` text NOT NULL,
   PRIMARY KEY  (`QID`)
-) TYPE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ;
+) ENGINE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ;
 
 -- --------------------------------------------------------
 
@@ -118,7 +118,7 @@ CREATE TABLE IF NOT EXISTS `Room` (
   `show` char(1) NOT NULL default 'Y',
   `Number` int(11) default NULL,
   PRIMARY KEY  (`RID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 
 -- --------------------------------------------------------
@@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` (
   `TID` int(11) NOT NULL default '0',
   `UID` int(11) NOT NULL default '0',
   `Comment` text
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 
 -- --------------------------------------------------------
@@ -161,7 +161,7 @@ CREATE TABLE IF NOT EXISTS `Shifts` (
   `URL` text,
   `PSID` text,
   PRIMARY KEY  (`SID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -180,7 +180,7 @@ CREATE TABLE IF NOT EXISTS `Wecken` (
   `Ort` text NOT NULL,
   `Bemerkung` text NOT NULL,
   PRIMARY KEY  (`ID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 
 -- --------------------------------------------------------
@@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `news_comments` (
   `UID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`ID`),
   KEY `Refid` (`Refid`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 --
 -- Tabellenstruktur für Tabelle `Counter`
@@ -212,7 +212,7 @@ CREATE TABLE IF NOT EXISTS `Counter` (
   `URL` varchar(255) NOT NULL default '',
    `Anz` bigint(20) NOT NULL default '0',
    PRIMARY KEY  (`URL`)
-) TYPE=MyISAM COMMENT='Counter der Seiten';
+) ENGINE=MyISAM COMMENT='Counter der Seiten';
 
 --
 -- Tabellenstruktur für Tabelle `ShiftFreeloader`
@@ -225,5 +225,5 @@ CREATE TABLE IF NOT EXISTS `ShiftFreeloader` (
   `Length` int(11) NOT NULL,
   `Comment` text NOT NULL,
   PRIMARY KEY  (`ID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 

DB/SDrohnen.sql

@@ -22,7 +22,7 @@ CREATE TABLE `Sprache` (
   `Sprache` char(2) NOT NULL default 'DE',
   `Text` text NOT NULL,
   KEY `TextID` (`TextID`,`Sprache`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 --
 -- Daten fuer Tabelle `Sprache`

DB/Sprache.sql

@@ -22,7 +22,7 @@ CREATE TABLE `Sprache` (
   `Sprache` char(2) NOT NULL default 'DE',
   `Text` text NOT NULL,
   KEY `TextID` (`TextID`,`Sprache`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 --
 -- Daten für Tabelle `Sprache`

DB/UserPicture.sql

@@ -22,7 +22,7 @@ CREATE TABLE `UserPicture` (
   `ContentType` varchar(20) NOT NULL default '',
   `show` char(1) NOT NULL default 'N',
   PRIMARY KEY  (`UID`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 -- 
 -- Daten für Tabelle `UserPicture`

default-conf/var_www_includes/config.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 // Adresse des Webservers
 $url = "https://SEDENGELURL";
 
@@ -27,7 +27,7 @@ $arch_angels="fnord";
 $gmdateOffset=3600;
 
 // für Developen 1, sonst = 0
-$DEBUG = 0;
+$debug = 0;
 
 // SSL Cert-KEY
 $show_SSLCERT = "MD5:<br>MD5SED<br>\n".

default-conf/var_www_includes/config_IAX.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $IAXenable = TRUE;
 

default-conf/var_www_includes/config_modem.php

@@ -1,11 +1,10 @@
-<?PHP
+<?php
-
   // ist ein modem angeschlossen
   $ModemEnable = false;
 
   // COM port
   $ModemDev ="/dev/ttyS0";
 
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
+  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
-$WackupNumber="**3";
+  $WakeupNumber="**3";
 ?>

includes/UserCVS.php

@@ -1,6 +1,4 @@
 <?php
-
-
   if(!isset($_SESSION['UID']))
     $_SESSION['UID'] = -1;
 
@@ -9,37 +7,30 @@ $SQL_CVS = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['UID'];
   $Erg_CVS =  mysql_query($SQL_CVS, $con);
   $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
 
-
   // Group import Data, if nesseary
-if( isset( $_SESSION['CVS'][ "GroupID" ]))
+  if(isset($_SESSION['CVS']["GroupID"])) {
-{
     $SQL_GRP = "SELECT * FROM `UserCVS` WHERE UID=" . $_SESSION['CVS'][ "GroupID" ];
     $Erg_GRP =  mysql_query($SQL_GRP, $con);
     $_SESSION['CVS_Group'] = mysql_fetch_array($Erg_GRP);
   
-	foreach( $_SESSION['CVS'] as $k => $v)
+    foreach($_SESSION['CVS'] as $k => $v) {
-	{
+      if($v == "G")
-		if($v=="G") // Right == Group 
         $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k];
     }
   }
 
   // pagename ermitteln
-$Page["Name"] = substr( $_SERVER['PHP_SELF'], strlen($ENGEL_ROOT) );
+  $Page["Name"] = basename($_SERVER['PHP_SELF']);
 
-//recht f?r diese seite auslesen
+  //recht fuer diese seite auslesen
   if(isset($_SESSION['CVS'][$Page["Name"]]))
     $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]];
-else
+  else {
-{
+    echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists.";
-	echo "SYSTEM ERROR: now right for ". $Page["Name"]. "exist";
     die;
   }
 
-if( $DEBUG ) 
+  if($debug) {
-{
-//	foreach( $_SESSION as $k => $v)
-//		echo "$k = $v<br>\n";
     echo "<pre>\$_SESSION:\n";
     print_r($_SESSION);
     echo "</pre>";
@@ -47,57 +38,42 @@ if( $DEBUG )
     if( strlen($Page["CVS"]) == 0 )
       echo "<h1><u> CVS ERROR, on page '". $Page["Name"]. "'</u></h1>";
     else
-		echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'<br>";
+      echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'<br />";
-	
   }
 
-function funktion_isLinkAllowed( $PageName)
+  function funktion_isLinkAllowed($PageName) {
-{
     global $_SESSION;
 
     // separate page parameter
     $ParameterPos = strpos($PageName, ".php?");
-	if( $ParameterPos === FALSE)
+
-	{
+    if($ParameterPos === false)
       $pName = $PageName;
-	}
     else
-	{
       $pName = substr($PageName, 0, $ParameterPos + 4);
-	}
   
     // check rights
-	if( (isset( $_SESSION['CVS'][ $pName ]) === TRUE) &&
+    if((isset( $_SESSION['CVS'][ $pName ]) === true) && $_SESSION['CVS'][ $pName ] == "Y")
-	    ($_SESSION['CVS'][ $pName ] == "Y") )
+      return true;
-	{
+
-		return TRUE;
+    return false;
   }
 
-	return FALSE;
+  function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) {
-}
-
-function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText)
-{
     global $url, $ENGEL_ROOT;
 
-	if( funktion_isLinkAllowed( $PageName) === TRUE)
+    if(funktion_isLinkAllowed( $PageName) === true)
-	{
       return "<a href=\"" . $url. $ENGEL_ROOT . $PageName . "\">" . $LinkText . "</a>";
-	}
   
     return $LinkText;
   }
 
-function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText)
+  function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) {
-{
     global $url, $ENGEL_ROOT;
 
-	if( funktion_isLinkAllowed( $PageName) === TRUE)
+    if(funktion_isLinkAllowed( $PageName) === true)
-	{
       return "<a href=\"" . $url . $ENGEL_ROOT . $PageName . "\">" . $LinkText . "</a>";
-	}
 
     return "";
   }
-
 ?>

includes/config_MessegeServer.php

@@ -1,8 +1,7 @@
-<?
+<?php
   // Set the ip and port we will listen on
   define(SERVER_ADDRESS, "127.0.0.1");
   define(SERVER_PORT, 9000);
 
-define( DEBUG, TRUE);
+  define(DEBUG, true);
-
 ?>

includes/config_modem.php

@@ -1,11 +1,10 @@
-<?PHP
+<?php
-
   // ist ein modem angeschlossen
   $ModemEnable = false;
 
   // COM port
   $ModemDev = "/dev/ttyS0";
 
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
+  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
-$WackupNumber="**3";
+  $WakeupNumber = "**3";
 ?>

includes/crypt.php

@@ -1,6 +1,4 @@
 <?php
-
-
   function PassCrypt($passwort) {
     include "config.php";
 
@@ -10,9 +8,5 @@ switch ($crypt_system) {
       case "md5":
         return md5($passwort);
     }
-
   }
-													      
-
-
 ?>

includes/error_handler.php

@@ -1,13 +1,11 @@
 <?php
-
+  require_once "funktion_jabber.php";
-  require_once("funktion_jabber.php");
 
   // global array for collected error_messages
   $error_messages = array();
 
   // general error handler collecting all messages in an array
-  function Error_Handler($error_number, $error_string, $error_file, $error_line, $error_context)
+  function Error_Handler($error_number, $error_string, $error_file, $error_line, $error_context) {
-  {
     global $error_messages, $con;
 
     // SQL error genauer analysiert
@@ -19,49 +17,49 @@
     if((strpos( "0$error_string", "MySQL") > 0))
       $Temp .= "Error MySQL: ". mysql_error($con). "\n";
 
-    //übergeben des arrays
+    // Uebergeben des arrays
-    array_push( $error_messages, "Error Number: $error_number\n".
+    array_push($error_messages, "Error Number: " . $error_number . "\n".
-    				 "Error String: $error_string\n".
+         "Error String: " . $error_string . "\n".
-				 "Error File: $error_file\n".
+         "Error File: " . $error_file . "\n".
-				 "Error Line: $error_line\n".
+         "Error Line: " . $error_line . "\n".
-				 (strlen($Temp)? "$Temp": "")
+         (strlen($Temp)? "$Temp": ""));
-				 );
   }
 
   // register error handler
   set_error_handler("Error_Handler");
 
-  ini_set( "error_reporting", E_ALL);
+  error_reporting(E_ALL);
-  if( $DEBUG)
+
-  {
+  if($debug) {
     ini_set("display_errors", "On");
     ini_set("display_startup_errors", "On");
     ini_set("html_errors", "On");
   }
   
   // send errors 
-  function send_errors()
+  function send_errors() {
-  {
     global $error_messages;
 
-    if (!$error_messages) return;
+    if(!$error_messages)
+      return;
 
     $message = "";
     foreach($error_messages as $value)
       $message .= $value."\n";
+
     $message .= "\n";
 
-    if( isset( $_POST))
+    if(isset($_POST)) {
-    {
       foreach ($_POST as $k => $v)
           $message .= "_POST: $k = ". ( $k!="password"? $v : "???..."). "\n"; 
+
       $message .= "\n";
     }
 
-    if( isset( $_GET))
+    if(isset($_GET)) {
-    {
       foreach ($_GET as $k => $v)
         $message .= "_GET: $k = $v\n";
+
       $message .= "\n";
     }
 

includes/footer.php

@@ -1,46 +1,29 @@
-<?PHP
-
-?>
-
-
-
 <!-- anfang des footers //-->
-
+    <br />
-
-
-
-		<br>
       <p align="center">
-				<?PHP If (IsSet($_SESSION['oldurl']))
+        <?php if(IsSet($_SESSION['oldurl']))
           echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
         ?>
-				<a href="#top"><?PHP echo Get_Text("top"); ?></a>
+        <a href="#top"><?php echo Get_Text("top"); ?></a>
       </p>
     </td>
   </tr>
 </table>
 </td>
 
-
-
-
 <!-- anfang des menue parts //-->
-<?PHP
+<?php
-if( $_SESSION['Menu'] =="R")            include("menu.php");
+if($_SESSION['Menu'] == "R")
+  include("menu.php");
 ?>
-		</td> 
-
-
 
 <!-- ende des menue parts //-->
 
-
-
   </tr>
   <tr>
     <td colspan="2">
       <h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
-			<?PHP 
+      <?php
         include("funktion_counter.php"); 
         include("funktion_flag.php"); 
       ?></h5>
@@ -50,8 +33,7 @@ if( $_SESSION['Menu'] =="R")            include("menu.php");
 
 <!-- </div> -->
 <?php mysql_close($con); ?>
-</div>
+<!-- </div> -->
 
-
+</body>
-</BODY>
+</html>
-</HTML>

includes/funktion_SendMessenges.php

@@ -1,18 +1,14 @@
 <?php
-
+  function SendData($Data) {
-
+    include "config_MessegeServer.php";
-function SendData($Data)
-{
-	include("config_MessegeServer.php");
     // Create a UDP socket
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+
     //send packed
     socket_sendto($sock, $Data, 9999, 0x4, SERVER_ADDRESS, SERVER_PORT);
   }
 
-function SendMessageJabber($Adresse, $Nachricht)
+  function SendMessageJabber($Adresse, $Nachricht) {
-{
     SendData( "#message $Adresse $Nachricht");
   }
-
 ?>

includes/funktion_activeUser.php

@@ -1,23 +1,17 @@
-<?PHP
+<?php
-
+  // Funktionen gibt es nicht auf allen Rechnern
-// Functionen gibt es nicht auf ellen rechern
+  if(!function_exists("bcdiv")) {
-if( !function_exists("bcdiv"))
+    function bcdiv( $param1, $param2) {
-{
-	function bcdiv( $param1, $param2)
-	{
       return floor( $param1 / $param2);
     }
   }
 
-if( !function_exists("bcmod"))
+  if(!function_exists("bcmod")) {
-{
+    function bcmod( $param1, $param2) {
-	function bcmod( $param1, $param2)
-	{
       return $param1 - ( $param2 * bcdiv( $param1, $param2));
     }
   }
 
-
   echo "<h4 class=\"menu\">Engel online</h4>";
 
   $SQL = "SELECT UID, Nick, lastLogIn " . 
@@ -27,21 +21,21 @@ $SQL = "SELECT UID, Nick, lastLogIn ".
 
   $Erg = mysql_query($SQL, $con);
   
-
   $Tist = (gmdate("d", time()) * 60 * 60 * 24) +  // Tag
           (gmdate("H", time()) * 60 * 60) +       // Stunde
           (gmdate("i", time()) * 60) +            // Minute
           (gmdate("s", time()) );                 // Sekunde
 
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
+  echo "<ul>";
-{
+
-	echo "\t\t\t<li>";
+  for($i = 0; $i < mysql_num_rows($Erg); $i++) {
+    echo "<li>";
+
     if($_SESSION['UID'] > 0)
       echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
-	// Schow Admin Page
+
-	echo funktion_isLinkAllowed_addLink_OrLinkText(
+    // Show Admin Page
-		"admin/userChangeNormal.php?enterUID=". mysql_result( $Erg, $i, "UID"). "&Type=Normal",
+    echo funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=" . mysql_result($Erg, $i, "UID") . "&Type=Normal", mysql_result($Erg, $i, "Nick"));
-		mysql_result( $Erg, $i, "Nick"));
 
     $Tlog =  (substr(mysql_result($Erg, $i, "lastLogIn"),  8, 2) * 60 * 60 * 24) +  // Tag
              (substr(mysql_result($Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) +       // Stunde
@@ -49,11 +43,15 @@ for( $i=0; $i<mysql_num_rows($Erg); $i++)
              (substr(mysql_result($Erg, $i, "lastLogIn"), 17, 2) );                 // Sekunde
   
     $Tlog = $Tist - $Tlog;
+
     echo " " . bcdiv($Tlog, 60) . ":";
+
     if(strlen(bcmod($Tlog, 60)) == 1)
       echo "0";
+
     echo bcmod($Tlog, 60);
     echo "</li>\n";
   }
   
+  echo "</ul>";
 ?>

includes/funktion_counter.php

@@ -1,24 +1,14 @@
-<?PHP
+<?php
-
   $SQL = "SELECT `Anz` FROM `Counter` WHERE `URL`=\"" . $Page["Name"] . "\"";
   $Erg = mysql_query($SQL, $con);
 
   echo mysql_error($con);
 
-if(mysql_num_rows($Erg)==0)
+  if(mysql_num_rows($Erg) == 0) {
-{
+    $SQL = "INSERT INTO `Counter` ( `URL` , `Anz` ) VALUES ('" . $Page["Name"] . "', '1');";
-//	echo "Counter: 1";
+    $Erg = mysql_query($SQL, $con);
-	$SQL = "INSERT INTO `Counter` ( `URL` , `Anz` ) ".
+  } elseif(mysql_num_rows($Erg) == 1) {
-		"VALUES ('". $Page["Name"]. "', '1');";
+    $SQL = "UPDATE `Counter` SET `Anz` = '" . (mysql_result($Erg, 0, 0) +1) . "' WHERE `URL` = '" . $Page["Name"] . "' LIMIT 1 ;";
     $Erg = mysql_query($SQL, $con);
   }
-elseif(mysql_num_rows($Erg)==1)
-{
-//	echo "Counter: ". (mysql_result($Erg, 0, 0)+1);
-	$SQL = "UPDATE `Counter` SET `Anz` = '". (mysql_result($Erg, 0, 0) +1). "' ".
-		"WHERE `URL` = '". $Page["Name"]. "' LIMIT 1 ;";
-	$Erg = mysql_query($SQL, $con);
-}
-
-
 ?>

includes/funktion_cron.php

@@ -1,31 +1,31 @@
-<?PHP
+<?php
-
+  function UID2DECT($UID) {
-function UID2DECT($UID) 
-{
     global $con;
     $SQL = "SELECT DECT FROM `User` WHERE UID='$UID'";
     $Erg = mysql_query($SQL, $con);
+
     if(mysql_num_rows( $Erg) == 1)
       return mysql_result($Erg, 0);
     else
       return "";
   }
-function RID2Room($RID) 
+
-{
+  function RID2Room($RID) {
     global $con;
     $SQL = "SELECT Name FROM `Room` WHERE RID='$RID'";
     $Erg = mysql_query($SQL, $con);
+
     if(mysql_num_rows( $Erg) == 1)
       return mysql_result($Erg, 0);
     else
       return "";
   }
 
-function TID2Engeltype($TID) 
+  function TID2Engeltype($TID) {
-{
     global $con;
     $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
     $Erg = mysql_query($SQL, $con);
+
     if(mysql_num_rows( $Erg) == 1)
       return mysql_result($Erg, 0);
     else
@@ -33,29 +33,29 @@ function TID2Engeltype($TID)
   }
 
 
-function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
+  function DialNumberIAX( $DECTnumber, $Time, $RID, $TID) {
-{
     global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT, $Tempdir, $AsteriskOutputDir;
   
     // Parameter verarbeiten
     $TimeH = substr( $Time, 11, 2);
     $TimeM = substr( $Time, 14, 2);
     $TimeM = substr( $Time, 14, 2) + $AnrufDelay;
-	if( $TimeM < 0 )
+
-	{
+    if($TimeM < 0) {
       $TimeM += 60;
       $TimeH -= 1;
     }
+
     if($TimeH < 0)
       $TimeH += 24;
   
     if(strlen( $TimeH) == 1)
       $TimeH = "0" . $TimeH;
   
-	if( $IAXenable)
+    if($IAXenable) {
-	{	$Message="die-nee shisht beh-kinned , in where-neegin me-nooten . . . your shift beginns in a few minutes";
+      $Message = "die-nee shisht beh-kinned, in where-neegin me-nooten . . . your shift beginns in a few minutes";
-		if (isset($SetHttpIAX))
+
-		{
+      if(isset($SetHttpIAX)) {
         $post_data = array();
         $post_data['code'] = "89o8eu9cg4";
         $post_data['callerid'] = "1023";
@@ -65,10 +65,10 @@ function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
         $url = "https://23c3.eventphone.de/~bef/call.php";
 
         $o = "";
-			foreach ($post_data as $k=>$v)
+        foreach ($post_data as $k => $v) {
-			{
           $o.= "$k=" . urlencode(utf8_encode($v)) . "&";
         }
+
         $post_data = substr($o, 0, -1);
 
         $ch = curl_init();
@@ -76,59 +76,50 @@ function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_URL, $url);   
         curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         $result = curl_exec($ch);
         echo curl_error($ch);
         curl_close($ch);
-		}
+      } else {
-		else
-		{
         // IAX file Schareiebn
         $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber";
   
-			if($DebugDECT) echo "IAX create file for dialing Number $DECTnumber\n";
+        if($DebugDECT)
+          echo "IAX create file for dialing Number $DECTnumber\n";
+
         $file = fopen( $CallFile, 'w');
-			if( $file != FALSE)
+
-			{
+        if($file != false) {
-				fputs( $file, "Channel: SIP/$DECTnumber@$IAXserver\n");  //Ziel nummer
+          fputs($file, "Channel: SIP/$DECTnumber@$IAXserver\n");
           fputs($file, "Callerid: Engelserver\n");
-	//			fputs( $file, "Callerid: $IAXcontent\n");
- 	//				fputs( $file, "Context: $DECTnumber@$IAXserver\n");
           fputs($file, "Extension: s\n");
           fputs($file, "MaxRetries: 1\n");
           fputs($file, "RetryTime: 10\n");
           fputs($file, "SetVar: msg=$Message\n");
-//				fputs( $file, "SetVar: TimeH=$TimeH\n");
-//				fputs( $file, "SetVar: TimeM=$TimeM\n");
-//				fputs( $file, "SetVar: DECTnumber=$DECTnumber\n");
-//				fputs( $file, "SetVar: Room=".  RID2Room( $RID). "\n");
-//				fputs( $file, "SetVar: Engeltype=". TID2Engeltype( $TID). "\n");
           fclose($file);
           system("chmod 777 " . $CallFile);
           system("mv " . $CallFile . " " . $AsteriskOutputDir);
-				
+        } else
-			}
-			else
           echo "error: $CallFile not created";
       }
-	}
+    } else
-	else
+      if($DebugDECT)
-		if($DebugDECT) echo "IAX is disable\n";
+        echo "IAX is disable\n";
   }
 
-function DialNumberModem( $DECTnumber, $Time)
+  function DialNumberModem($DECTnumber, $Time) {
-{
     global $AnrufDelay;
   
     // Parameter verarbeiten
     $TimeH = substr($Time, 11, 2);
     $TimeM = substr($Time, 14, 2);
     $TimeM = substr($Time, 14, 2) + $AnrufDelay;
-	if( $TimeM < 0 )
+
-	{
+    if($TimeM < 0) {
       $TimeM += 60;
       $TimeH -= 1;
     }
+
     if($TimeH < 0)
       $TimeH += 24;
   
@@ -137,8 +128,4 @@ function DialNumberModem( $DECTnumber, $Time)
   
     SetWackeup($DECTnumber, $TimeH, $TimeM);
   }
-
-return 0;
-
 ?>
-

includes/funktion_db.php

@@ -1,9 +1,6 @@
-<?PHP
+<?php
-
+  if( !function_exists("db_query")) {
-if( !function_exists("db_query"))
+    function Ausgabe_Daten($SQL) {
-{
-	function Ausgabe_Daten($SQL)
-	{
       global $con;
       $Erg = mysql_query($SQL, $con); 
 
@@ -14,61 +11,62 @@ if( !function_exists("db_query"))
 
       $Diff  = "<table border=1>"; 
       $Diff .= "<tr>"; 
+
       for ($m = 0 ; $m < $Anzahl_Felder ; $m++) 
         $Diff .= "<th>". mysql_field_name($Erg, $m). "</th>"; 
+
       $Diff .= "</tr>"; 
 
-		for ($n = 0 ; $n < $Zeilen ; $n++)  
+      for ($n = 0 ; $n < $Zeilen ; $n++) { 
-		{ 
         $Diff .= "<tr>";
+
         for ($m = 0 ; $m < $Anzahl_Felder ; $m++) 
           $Diff .= "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+
         $Diff .= "</tr>"; 
       } 
+
       $Diff .= "</table>"; 
       return $Diff; 
     }
   
-	function db_querry_getDatenAssocArray($SQL)
+    function db_querry_getDatenAssocArray($SQL) {
-	{
       global $con;
     
       $Erg = mysql_query($SQL, $con);
       echo mysql_error($con);
     
       $Daten = array();
+
       for( $i=0; $i<mysql_num_rows($Erg); $i++)
         $Daten[$i] = mysql_fetch_assoc($Erg);
     
       return $Daten;
     }
 
-	function db_querry_diffDaten($Daten1, $Daten2)
+    function db_querry_diffDaten($Daten1, $Daten2) {
-	{
+      $Gefunden = false;
-		$Gefunden=False;
 
       $Diff  = "\n<table border=1>\n";
       $Diff .= "<tr>\n\t<th>Feldname</th>\n\t<th>old Value</th>\n\t<th>new Value</th>\n";
       $Diff .= "</tr>\n";
-		foreach($Daten1 as $DataKey => $Data1)
+
-		{
+      foreach($Daten1 as $DataKey => $Data1) {
-			if( isset( $Daten2[$DataKey]))
+        if(isset( $Daten2[$DataKey])) {
-			{
           $Data2 = $Daten2[$DataKey];
+
           foreach($Data1 as $key => $value)
-					if( $value != $Data2[$key])
+            if( $value != $Data2[$key]) {
-					{
+            $Gefunden = true;
-						$Gefunden=TRUE;
             $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td>" . $Data2[$key] . "</rd>\n</tr>";
           }
-			}
+        } else
-			else
+          foreach($Data1 as $key => $value) {
-				foreach($Data1 as $key => $value)
+            $Gefunden = true;
-				{
-					$Gefunden=TRUE;
             $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td></rd>\n</tr>";
           }
       }
+
       $Diff .= "</table>\n";
 
       if($Gefunden)
@@ -77,14 +75,12 @@ if( !function_exists("db_query"))
         return "\nno changes Fount\n";
     }
 
-	function db_query( $SQL, $comment)
+    function db_query( $SQL, $comment) {
-	{
       global $con, $Page;  
       $Diff = "";
 
       // commed anlyse udn daten sicherung
-		if( strpos( "#$SQL", "UPDATE") > 0)
+      if(strpos("#$SQL", "UPDATE") > 0) {
-		{
         // Tabellen name ermitteln
         $Table_Start = strpos( $SQL, "`");
         $Table_End = strpos( $SQL, "`", $Table_Start+1);
@@ -130,9 +126,9 @@ if( !function_exists("db_query"))
       $querry_erg = mysql_query($SQL, $con);
     }
 
-		$SQLCommand = "SQL:<br>". htmlentities( $SQL, ENT_QUOTES);
+    $SQLCommand = "SQL:<br />". htmlentities( $SQL, ENT_QUOTES);
     if( strlen($Diff) > 0)
-			$SQLCommand .= "<br><br>Diff:<br>$Diff";
+      $SQLCommand .= "<br /><br />Diff:<br />$Diff";
 
     $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES);
     //LOG commands in DB

includes/funktion_db_list.php

@@ -1,7 +1,5 @@
-<?PHP
+<?php
-
+  function funktion_db_list($Table_Name) {
-function funktion_db_list($Table_Name) 
-{
     global $con;
 
     $SQL = "SELECT * FROM `".$Table_Name."`";

includes/funktion_faq.php

@@ -1,5 +1,4 @@
-<?PHP
+<?php
-
   function noAnswer() {
     global $con;
 
@@ -8,5 +7,4 @@ function noAnswer() {
 
     return mysql_num_rows($Res);
   }
-
 ?>

includes/funktion_flag.php

@@ -1,12 +1,9 @@
-<?PHP
+<?php
-echo "<br>";
-
    if(strpos($_SERVER["REQUEST_URI"], "?") > 0)
     $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
   else
     $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
 
-echo "<a href=\"". $URL. "DE\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/de.gif\" alt=\"DE\"></a> ";
+  echo "<a href=\"" . $URL . "DE\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/de.gif\" alt=\"DE\" /></a> ";
-echo "<a href=\"". $URL. "EN\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/en.gif\" alt=\"EN\"></a> ";
+  echo "<a href=\"" . $URL . "EN\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/en.gif\" alt=\"EN\" /></a> ";
-
 ?>

includes/funktion_lang.php

@@ -1,9 +1,6 @@
-<?PHP
+<?php
-
+  function Get_Text ($TextID, $NoError = false) {
-
+    global $con, $error_messages, $debug;
-function Get_Text ($TextID, $NoError=FALSE)
-{
-	GLOBAL $con, $error_messages, $DEBUG;
 
     if( !isset($_SESSION['Sprache'])) 
       $_SESSION['Sprache'] = "EN";
@@ -17,19 +14,15 @@ function Get_Text ($TextID, $NoError=FALSE)
 
     if( mysql_num_rows( $Erg) == 1)
       return (@mysql_result($Erg, 0, "Text"));
-	elseif( $NoError && !$DEBUG)
+    elseif( $NoError && !$debug)
       return "";
-	else
+    else {
-	{
       array_push($error_messages, "Get_Text, '$TextID' found ". mysql_num_rows( $Erg). "x in Sprache Database Table for Language (".$_SESSION['Sprache'].")\n");
       return "Error Data, '$TextID' found ". mysql_num_rows( $Erg). "x";
     }
-	
   }
 
-function Print_Text ($TextID, $NoError=FALSE)
+  function Print_Text($TextID, $NoError = false) {
-{
     echo Get_Text($TextID, $NoError);
   }
-
 ?>

includes/funktion_menu.php

@@ -1,39 +1,36 @@
-<?PHP
+<?php
+  function ShowMenu( $MenuName) {
+    global $MenueTableStart, $MenueTableEnd, $_SESSION, $debug, $url, $ENGEL_ROOT;
+    $Gefunden = false;
 
-function ShowMenu( $MenuName)
+    // Ueberschift
-{
+    $Text = "<h4 class=\"menu\">". Get_Text("$MenuName/"). "</h4><ul>";
-	global $MenueTableStart, $MenueTableEnd, $_SESSION, $DEBUG, $url, $ENGEL_ROOT;
-	$Gefunden=FALSE;
 
-	//Überschift
+    // Eintraege
-	$Text = "<h4 class=\"menu\">". Get_Text("$MenuName/"). "</h4>";
-	
-	//einträge
     foreach($_SESSION['CVS'] as $Key => $Entry)
       if( strpos( $Key, ".php") > 0)
         if( (strpos( "00$Key", "0$MenuName") > 0) ||
-			    ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) )
+          ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) ) {
-			{
+          $TempName = Get_Text($Key, true);
-				$TempName = Get_Text($Key, TRUE);
+
-				if(( TRUE||$DEBUG) && (strlen($TempName)==0) )
+          if(( true||$debug) && (strlen($TempName)==0) )
             $TempName = "not found: \"$Key\"";
 
-				if( $Entry == "Y")
+          if( $Entry == "Y") {
-				{
             //zum absichtlkichen ausblenden von einträgen
-					if( strlen($TempName)>1)
+            if( strlen($TempName)>1) {
-					{
               //sonderfälle:
+
               if( $Key=="admin/faq.php")
                 $TempName .= " (". noAnswer(). ")";
             //ausgabe
             $Text .= "\t\t\t<li><a href=\"". $url. $ENGEL_ROOT. $Key. "\">$TempName</a></li>\n";
-						$Gefunden = TRUE;
+            $Gefunden = true;
           }
         }
-				elseif( $DEBUG ) 
+        elseif( $debug ) 
         {
-					$Gefunden = TRUE;
+          $Gefunden = true;
           $Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
         }
       }

includes/funktion_modem.php

@@ -1,13 +1,12 @@
-<?PHP
+<?php
   include "config_modem.php";
 
-function DialNumber( $Number )
+  function DialNumber($Number) {
-{
     global $Dev, $ModemEnable;
 
-	if( $ModemEnable)
+    if($ModemEnable) {
-	{
+      echo "Dial number: '<u>$Number</u>' was called<br />\n";
-		echo "Dial number: '<u>$Number</u>' was called<br>\n";
+
       $fp = fopen( $ModemDev, "w");
     sleep(1);
     fwrite( $fp, "+++");
@@ -22,14 +21,14 @@ function DialNumber( $Number )
     sleep(1);
   }
   else
-		echo "Modem is Disable, number: '<u>$Number</u>' was not called<br>\n";
+    echo "Modem is Disable, number: '<u>$Number</u>' was not called<br />\n";
 }
 
 
 function SetWackeup( $Number, $TimeH, $TimeM)
 {
-	global $WackupNumber;
+  global $WakeupNumber;
-	DialNumber( "$WackupNumber$TimeH$TimeM$Number");
+  DialNumber( "$WakeupNumber$TimeH$TimeM$Number");
 }
 
 ?>

includes/funktion_schichtplan.php

@@ -8,7 +8,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
 {
 // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung,
 // die eingetragenden und und offenden Schichteintäge zurück
-	global $EngelType, $EngelTypeID, $TID2Name, $con, $DEBUG, $gmdateOffset;
+  global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset;
 
   $Spalten = "";
 
@@ -20,7 +20,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
   ///////////////////////////////////////////////////////////////////
   $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
     "admin/schichtplan.php?action=change&SID=$SID",
-		"edit<br>\n\t\t");
+    "edit<br />\n\t\t");
 
   ///////////////////////////////////////////////////////////////////
     // Ausgabe des Schischtnamens
@@ -28,9 +28,9 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
   $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
   $Erg = mysql_query($SQL, $con);
   if( mysql_result($Erg, 0, 0) != "")
-		$Spalten.="<a href=\"". mysql_result($Erg, 0, 0). "\" target=\"_black\"><u>$Man:</u></a><br>";
+    $Spalten.="<a href=\"". mysql_result($Erg, 0, 0). "\" target=\"_black\"><u>$Man:</u></a><br />";
   else
-  		$Spalten.="<u>".$Man.":</u><br>";
+      $Spalten.="<u>".$Man.":</u><br />";
 
 
   ///////////////////////////////////////////////////////////////////
@@ -96,9 +96,9 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
       if( count($TempValue["Engel"]) > 0  )
       {
       if( count($TempValue["Engel"]) == 1  )
-				$Spalten.= Get_Text("inc_schicht_ist"). ":<br>\n\t\t";
+        $Spalten.= Get_Text("inc_schicht_ist"). ":<br />\n\t\t";
       else 
-				$Spalten.= Get_Text("inc_schicht_sind"). ":<br>\n\t\t";
+        $Spalten.= Get_Text("inc_schicht_sind"). ":<br />\n\t\t";
       
       foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
       {
@@ -123,7 +123,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
         
         $Spalten.= "&nbsp;&nbsp;". $TempText.
             ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
-						"<br>\n\t\t";
+            "<br />\n\t\t";
 
 
       }
@@ -145,7 +145,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
       if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
         if( $TempValue["free"] > 0 )
         {
-					$Spalten.= "<br>\n\t\t&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
+          $Spalten.= "<br />\n\t\t&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
                $TempValue["TID"]."\">";
           $Spalten.= $TempValue["free"];
           if( $TempValue["free"] != 1 )
@@ -164,10 +164,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
     {
       if( isset($TempValue["free"]))
         if( $TempValue["free"] > 0 )
-					$Spalten.= "<br>\n\t\t&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
+          $Spalten.= "<br />\n\t\t&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
               $TempValue["free"]. "</a></h3>";
     }
-		$Spalten.= "<br>\n\t\t";
+    $Spalten.= "<br />\n\t\t";
   
   } // FOREACH
   return $Spalten;
@@ -194,7 +194,7 @@ function Ausgabe_Feld_Inhalt_Druck($RID, $Man )
 #######################################################*/
 function CreateRoomShifts( $raum )
 {
-	global $Spalten, $ausdatum, $con, $DEBUG, $GlobalZeileProStunde, $error_messages;
+  global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages;
   
   /////////////////////////////////////////////////////////////
   // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus
@@ -214,7 +214,7 @@ function CreateRoomShifts( $raum )
           mysql_result($ErgSonder, $i, "SID"). "\">".
           mysql_result($ErgSonder, $i, "DateS"). 
           " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
-					"</a><br>\n\t\t";
+          "</a><br />\n\t\t";
       }
     }
   }
@@ -249,7 +249,7 @@ function CreateRoomShifts( $raum )
           mysql_result($ErgSonder, $i, "SID"). "\">".
           mysql_result($ErgSonder, $i, "DateS"). 
           " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
-					"</a><br>\n\t\t";
+          "</a><br />\n\t\t";
       }
     }
   }
@@ -310,7 +310,7 @@ function CreateRoomShifts( $raum )
         mysql_result($Erg, $i, "SID"). "\">".
         mysql_result($Erg, $i, "DateS"). 
         " '". mysql_result($Erg, $i, "Man"). "' ".
-				" (".  mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)</a><br><br>";
+        " (".  mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)</a><br /><br />";
     }
   }
   if( $ZeitZeiger < 24 )
@@ -326,7 +326,7 @@ function CreateRoomShifts( $raum )
 #######################################################*/
 function showEmptyShifts( )
 {
-	global $con, $DEBUG, $RoomID, $gmdateOffset;
+  global $con, $debug, $RoomID, $gmdateOffset;
 
   echo "<table border=\"1\">\n";
   echo "<tr>\n";
@@ -375,7 +375,7 @@ function showEmptyShifts( )
 #######################################################*/
 function SummRoomShifts( $raum )
 {
-	global $ausdatum, $con, $DEBUG, $GlobalZeileProStunde;
+  global $ausdatum, $con, $debug, $GlobalZeileProStunde;
   
   $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
          "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ".

includes/funktion_schichtplan_Tage.php

@@ -1,39 +1,57 @@
-<?PHP
+<?php
-
+  if(!function_exists("DatumUm1TagErhoehen")) {
-if( !function_exists("DatumUm1TagErhoehen"))
+    function DatumUm1TagErhoehen( $Datum) {
-{
-    function DatumUm1TagErhoehen( $Datum)
-    {
       $Jahr = substr($Datum, 0, 4);
       $Monat = substr($Datum, 5, 2);
       $Tag = substr($Datum, 8, 2);
 
       $Tag++;
 
-	switch( $Monat)
+      switch( $Monat) {
-	{
+        case 1:
-		case 1:		$Mmax=31;	break;
+          $Mmax = 31;
-		case 2:		$Mmax=28;       break;
+          break;
-		case 3:		$Mmax=31;       break;
+        case 2:
-		case 4:		$Mmax=30;       break;
+          $Mmax = 28;
-		case 5:		$Mmax=31;       break;
+          break;
-		case 6:		$Mmax=30;       break;
+        case 3:
-		case 7:		$Mmax=31;       break;
+          $Mmax = 31;
-		case 8:		$Mmax=31;       break;
+          break;
-		case 9:		$Mmax=30;       break;
+        case 4:
-		case 10:	$Mmax=31;       break;
+          $Mmax = 30;
-		case 11:	$Mmax=30;       break;
+          break;
-		case 12:	$Mmax=31;       break;
+        case 5:
+          $Mmax = 31;
+          break;
+        case 6:
+          $Mmax = 30;
+          break;
+        case 7:
+          $Mmax = 31;
+          break;
+        case 8:
+          $Mmax = 31;
+          break;
+        case 9:
+          $Mmax = 30;
+          break;
+        case 10:
+          $Mmax = 31;
+          break;
+        case 11:
+          $Mmax = 30;
+          break;
+        case 12:
+          $Mmax = 31;
+          break;
       }
 
-	if( $Tag > $Mmax)
+      if($Tag > $Mmax) {
-	{
         $Tag = 1;
         $Monat++;
       }
 
-	if( $Monat > 12 ) 
+      if($Monat > 12) {
-	{
         $Monat = 1;
         $Jahr++;
       }
@@ -42,7 +60,7 @@ if( !function_exists("DatumUm1TagErhoehen"))
       $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat;
 
       return ("$Jahr-$Monat-$Tag");
-    } //function DatumUm1Tagerhoehen(
+    }
   }
 
   // suchen den ersten eintrags
@@ -51,30 +69,26 @@ $Erg = mysql_query($SQL, $con);
 
   $Pos = 0;
 
-if( mysql_num_rows($Erg)>0)
+  if(mysql_num_rows($Erg) > 0) {
-{
+    do {
-    do
-    {
       // Startdatum einlesen und link ausgeben
       $DateS = substr(mysql_result($Erg, 0 , 0), 0,10);
       $VeranstaltungsTage[$Pos++] = $DateS;
   
       // auslesen den endes und eventuelle weitere tage ausgeben
-	$SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` ".
+      $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))";
-		"WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))";
       $Erg2 = mysql_query($SQL2, $con);
       $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10);
 
       if(strlen($DateE) == 0)
         $DateE = $DateS;
       else
-		while( $DateS != $DateE)
+        while( $DateS != $DateE) {
-		{
           $DateS = DatumUm1TagErhoehen( $DateS);
           $VeranstaltungsTage[$Pos++] = $DateS;
         }
 
-	//suchen den nästen eintrag
+        // suchen den naesten eintrag
         $SQL = "SELECT `DateS` FROM `Shifts` ".
                "WHERE (`DateS` > '$DateE 23:59:59' ) ".
                "ORDER BY `DateS` ".
@@ -82,6 +96,6 @@ if( mysql_num_rows($Erg)>0)
         $Erg = mysql_query($SQL, $con);
     } while( mysql_fetch_row($Erg) > 0);
   }
-$VeranstaltungsTageMax = $Pos-1;
 
+  $VeranstaltungsTageMax = $Pos - 1;
 ?>

includes/funktion_schichtplan_beamer.php

@@ -43,7 +43,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man )
 // die eingetragenden und und offenden Schichteintäge zurück
   global $EngelType, $EngelTypeID, $con;
   //form Config
-	global $DEBUG;
+  global $debug;
 
   $Out = "";
 
@@ -165,7 +165,7 @@ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege )
       $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), 
               mysql_result( $ErgRoom, $i-1, "Man"));
       if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) )
-				$Out.= "<br>";
+        $Out.= "<br />";
 //        $Out.= "<hr width=\"95%\" align=\"center\">\n\t\t\t\t";
       
     }

includes/funktion_user.php

@@ -1,23 +1,19 @@
 <?php
-
+  function UID2Nick($UID) {
-function UID2Nick($UID) 
-{
     global $con;
 
-  if( $UID>0) {
+    if($UID > 0)
       $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'";
-  } else {
+    else
       $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'";
-  }
+
     $Erg = mysql_query($SQL, $con);
 
-  //echo $UID."#";
     if(mysql_num_rows($Erg)) {
-	if( $UID>0 ) {
+      if($UID > 0)
         return mysql_result($Erg, 0);
-	} else {
+      else
         return "Group-".mysql_result($Erg, 0);
-	}
     } else {
       if($UID == -1)
         return "logout User";
@@ -26,9 +22,7 @@ function UID2Nick($UID)
     }
   }
 
-
+  function TID2Type($TID) {
-function TID2Type($TID) 
-{
     global $con;
   
     $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
@@ -40,12 +34,9 @@ function TID2Type($TID)
       return "";
   }
 
-
+  function ReplaceSmilies($neueckig) {
-function ReplaceSmilies($eckig) 
-{
     global $url, $ENGEL_ROOT;
 
-	$neueckig = $eckig;
     $neueckig = str_replace(";o))",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_redface.gif\">", $neueckig);
     $neueckig = str_replace(":-))",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_redface.gif\">", $neueckig);
     $neueckig = str_replace(";o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_wind.gif\">", $neueckig);
@@ -66,41 +57,32 @@ function ReplaceSmilies($eckig)
     $neueckig = str_replace(";P",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_mad.gif\">", $neueckig);
     $neueckig = str_replace(";oP",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_mad.gif\">", $neueckig);
     $neueckig = str_replace("?)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_question.gif\">", $neueckig);
+
     return $neueckig;
   }
 
-
+  function GetPicturShow($UID) {
-function GetPicturShow($UID)
-{
     global $con;
 
     $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'";
     $res = mysql_query( $SQL, $con);
+
     if(mysql_num_rows($res) == 1)
       return mysql_result($res, 0, 0);
     else
       return "";
   }
 
-
+  function displayPictur($UID, $height = "30") {
-/* Parameter: 
-	<UserID>
-	[<Höhe des Bildes (wenn die höhe kleiner 1 ist wird die höhe nicht begrenzt)>] */
-function displayPictur($UID, $height="30") 
-{
     global $url, $ENGEL_ROOT;
+
     if($height > 0)
       return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" height=\"$height\" alt=\"picture of USER$UID\" class=\"photo\">");
     else
       return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" alt=\"picture of USER$UID\">");
   }
 
-
+  function displayavatar($UID, $height="30") {
-/* Parameter: 
-	<UserID>
-	[<Höhe des Bildes (wenn die höhe kleiner 1 ist wird die höhe nicht begrenzt)>] */
-function displayavatar( $UID, $height="30") 
-{
     global $con, $url, $ENGEL_ROOT;
 
     if( GetPicturShow($UID) == 'Y')
@@ -109,24 +91,21 @@ function displayavatar( $UID, $height="30")
     // show avator
     $asql = "select * from User where UID = $UID";
     $aerg = mysql_query ($asql, $con);
+
     if(mysql_num_rows($aerg))
       if(mysql_result($aerg, 0, "Avatar") > 0)
         return ("&nbsp;<img src=\"". $url. $ENGEL_ROOT. "pic/avatar/avatar". mysql_result($aerg, 0, "Avatar"). ".gif\">");
-
   }
 
-function UIDgekommen($UID) 
+  function UIDgekommen($UID) {
-{
     global $con;
   
     $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'";
     $Erg = mysql_query($SQL, $con);
 
-  //echo $UID."#";
     if(mysql_num_rows($Erg))
       return mysql_result($Erg, 0);
     else
       return "0";
   }
-
 ?>

includes/funktion_xml.php

@@ -1,8 +1,5 @@
-<?PHP
+<?php
-
+class element {
-
-class element
-{
   var $name = '';
   var $attributes = array();
   var $data = '';
@@ -16,40 +13,35 @@ $XMLmain = new element;
 $XMLpos = array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 //$XMLpos = array( 0, 0, 0, 0, 0, 0);
    
-function convertValues( $Data)
+function convertValues( $Data) {
-{
   global $XMLDEBUG;
-	if( $XMLDEBUG)
+
-	{
+  if($XMLDEBUG) {
     $Data = htmlspecialchars($Data);
     $Data = mysql_escape_string($Data);
     $Data = htmlentities($Data);
   }
+
   $Data = utf8_decode($Data);
   return $Data;
 }
 
-
+function dataXMLmain($Data, &$Objekt, $Tiefe) {
-function dataXMLmain( $Data, &$Objekt, $Tiefe )
-{
   global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
   
   if($XMLDEBUG)
     echo "?$Tiefe$depth";
-	if( ($depth-1)==$Tiefe)
+
-	{	
+  if(($depth-1) == $Tiefe) {
-//		$Objekt->sub[ $XMLpos[$Tiefe] ]->data .= convertValues($Data);
     $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES);
      
     if($XMLDEBUG)
-		  echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???<br>";
+      echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???<br />";
-	}
+  } else
-	else
     dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
 }
 
-function startXMLmain( $Data, &$Objekt, $Tiefe )
+function startXMLmain( $Data, &$Objekt, $Tiefe ) {
-{
   global $XMLpos, $depth, $XMLDEBUG;
 
   if( $XMLDEBUG)
@@ -62,7 +54,7 @@ function startXMLmain( $Data, &$Objekt, $Tiefe )
   {
     $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data;
     if( $XMLDEBUG)
-		  echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#<br>";
+      echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#<br />";
   }
   else
     startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);

includes/funktion_xml_room.php

@@ -1,28 +1,23 @@
-<?PHP
+<?php
+  echo "<h1>Rooms:</h1>\n";
 
-
+  function saveRoomData() {
-/*##############################################################################################
-				           R o o m
-  ##############################################################################################*/
-echo "\n\n<br>\n<h1>Rooms:</h1>\n";
-
-function saveRoomData()
-{
     global $con;
-	if( isset($_GET["NameXML"]))
+
-	{
+    if(isset($_GET["NameXML"])) {
       $SQL = "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ".
         "VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');";
       $Erg = mysql_query($SQL, $con);
+
       if($Erg)
-			echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich<br>";
+        echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich<br />";
       else
         echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war <u>nicht</u> erfogreich.(".
-				mysql_error($con). ")<br>[$SQL]<br>";
+
+      mysql_error($con). ")<br />[$SQL]<br />";
+    } else 
+      echo "Fehler in den Parametern!<br />";
   }
-	else 
-		echo "Fehler in den Parametern!<br>";
-} /*function saveRoomData*/
 
   if(isset($_GET["RoomUpdate"]))
     saveRoomData();
@@ -33,24 +28,20 @@ $DS_KO = 0;
   // Ausgabe
   echo "<table border=\"0\">\n";
   echo "<tr><th>Name</th><th>state</th></tr>\n";
-if( $EnableSchudle)
+
-foreach($XMLmain->sub as $EventKey => $Event)
+  if($EnableSchudle) {
-{
+    foreach($XMLmain->sub as $EventKey => $Event) {
-        if( $Event->name == "VEVENT")
+      if( $Event->name == "VEVENT") {
-	{
         $NameXML = getXMLsubData( $Event, "LOCATION");
-		if( !isset( $RoomName[$NameXML]))
+
-		{
+        if( !isset( $RoomName[$NameXML])) {
           $RoomName[$NameXML] = "";
 
-			if( isset($_GET["UpdateALL"]))
+          if(isset($_GET["UpdateALL"])) {
-			{
             $_GET["NameXML"] = $NameXML;
             saveRoomData();
             CreateRoomArrays();
-			}
+          } else {
-			else
-			{
             echo "<form action=\"dbUpdateFromXLS.php\">\n";
             echo "\t<tr>\n";
             echo "\t<td><input name=\"NameXML\" type=\"text\" value=\"$NameXML\" readonly></td>\n";
@@ -58,12 +49,13 @@ foreach($XMLmain->sub as $EventKey => $Event)
             $DS_KO++;
             echo "\t</tr>\n";
             echo "</form>\n";
-				echo "<br>";
+            echo "<br />";
           }
         }
       }
     }
+  }
+
   echo "<tr><td colspan=\"6\">status: $DS_KO nicht vorhanden.</td></tr>\n";
   echo "</table>\n";
-
 ?>

includes/funktion_xml_schudle.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /*##############################################################################################
                 s c h e d u l e 
@@ -69,7 +69,7 @@ function SaveSchedule()
     $Erg = mysql_query($SQL, $con);
     if( $Erg )
     {
-			echo ", war erfogreich<br>\n";
+      echo ", war erfogreich<br />\n";
 
       //SID auslesen
       $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
@@ -109,7 +109,7 @@ function SaveSchedule()
           if( $EngelNeeded > $EngelNeeded_Exist)
           {
             echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ".
-							($EngelNeeded-$EngelNeeded_Exist). "x<br>\n------>\n";
+              ($EngelNeeded-$EngelNeeded_Exist). "x<br />\n------>\n";
             for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ )
             {
               $SQL3  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (".
@@ -120,9 +120,9 @@ function SaveSchedule()
                 echo "pass ";
               else
                 echo "fail <u>". mysql_error($con). 
-									"</u>($SQL3)<br>\n";
+                  "</u>($SQL3)<br />\n";
             }
-						echo "<br>\n";
+            echo "<br />\n";
           }
           else if ($EngelNeeded < $EngelNeeded_Exist)
           {
@@ -138,7 +138,7 @@ function SaveSchedule()
             }
 
             echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ".  
-								($EngelNeeded_Exist-$EngelMin)."x<br>\n------>\n";
+                ($EngelNeeded_Exist-$EngelMin)."x<br />\n------>\n";
             for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ )
             {
               $SQL3  = "DELETE FROM `ShiftEntry` ".
@@ -151,13 +151,13 @@ function SaveSchedule()
                 echo "pass ";
               else
                 echo "fail <u>". mysql_error($con). 
-									"</u>($SQL3)<br>\n";
+                  "</u>($SQL3)<br />\n";
             }
-						echo "<br>\n";
+            echo "<br />\n";
           }
           else
           {
-//						echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "<br>\n";
+//            echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "<br />\n";
           }
         }
       }
@@ -165,10 +165,10 @@ function SaveSchedule()
     }
     else
       echo ", war <u>nicht</u> erfogreich.(". 
-				mysql_error($con). ")<br>[$SQL]<br>\n";
+        mysql_error($con). ")<br />[$SQL]<br />\n";
   }
   else 
-		echo "Fehler in den Parametern!<br>";
+    echo "Fehler in den Parametern!<br />";
 } /*SaveSchedule*/
 
 if( isset($_GET["ScheduleUpdate"]))

includes/funktionen.php

@@ -1,5 +1,4 @@
 <?php
-
   /* Schichtverplanung im Adminbereich */
   function Dsubstr($DateString, $re) {
     if ($re == 1)
@@ -11,7 +10,6 @@ function Dsubstr($DateString,$re) {
   }
 
   /* Schichtverplanung im Engelbereich */
-
   function engeldate($edate, $m) {
     if ($m == t)
       return substr($edate, 8, 2);
@@ -22,5 +20,4 @@ function engeldate($edate,$m) {
     else
       return substr($edate, 0, 4);
   }
-
 ?>

includes/header.php

@@ -1,61 +1,57 @@
-<?PHP 
+<?php
-include ("header_start.php");
+include "header_start.php";
 
 echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
 ?>
-<HTML>
+<html xmlns="http://www.w3.org/1999/xhtml"> 
-<HEAD>
+<head>
-<?PHP
 
-echo "<TITLE>--- $title ---</TITLE>\n";
+<title><?php echo $title; ?></title>
-?>
+
-<meta name="keywords" content="Engel, Himmelsverwaltung">
+<meta name="keywords" content="Engel, Himmelsverwaltung" />
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="expires" content="0">
+<meta http-equiv="expires" content="0" />
-<meta name="robots" content="index">
+<meta name="robots" content="index" />
-<meta name="revisit-after" content="1 days">
+<meta name="revisit-after" content="1 days" />
-<meta http-equiv="content-language" content="de">
+<meta http-equiv="content-language" content="de" />
-<script type="text/javascript" src="<?PHP echo $url. $ENGEL_ROOT; ?>/css/grossbild.js"></script>
+<script type="text/javascript" src="<?php echo $url . $ENGEL_ROOT; ?>/css/grossbild.js"></script>
-<link rel=stylesheet type="text/css" href="<?PHP echo $url. $ENGEL_ROOT; ?>css/style<?PHP
+<link rel="stylesheet" type="text/css" href="<?php echo $url . $ENGEL_ROOT; ?>css/style<?php
-	if (!IsSet($_SESSION['color'])) 
+
+  if(!isset($_SESSION['color'])) 
     echo "6";
   else
     echo $_SESSION['color'];
-	?>.css">
+  ?>.css" />
-<?PHP
+
-if (isset($reload)) 
+<?php
-{
+if(isset($reload)) {
   if ($reload == "")
-	{
     $reload = 3330;
-	}	
+
-	echo "\n<meta http-equiv=\"refresh\" content=\"".$reload.
+  echo "\n<meta http-equiv=\"refresh\" content=\"" . $reload . "; URL=./?reload=" . $reload . "\">\n";
-	"; URL=./?reload=".$reload."\">\n";
 }
 
 if(isset($Page["AutoReload"])) 
-{
   echo "\n<meta http-equiv=\"refresh\" content=\"". $Page["AutoReload"].
     "; URL=". $url. $ENGEL_ROOT. $Page["Name"]."\">\n";
-}
 
-echo "</HEAD>\n";
+echo "</head>\n";
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////// B O D Y
 /////////////////////////////////////////////////////////////////////////////////////////////
-echo "<BODY>\n";
+echo "<body>\n";
 
-echo "<div name=\"topic\" align=\"center\">\n\n";
+echo "<div align=\"center\">\n\n";
 
 if( isset($_SESSION['color']) && ($_SESSION['color']==6) )
 {
-	echo 	"\t<a name=\"#top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel_w.png\" alt=\"Unser Himmel\"></a>\n";
+  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel_w.png\" alt=\"Unser Himmel\" /></a>\n";
 }
 else
 {
-	echo 	"\t<a name=\"#top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel.png\" alt=\"Unser Himmel\"></a>\n";
+  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel.png\" alt=\"Unser Himmel\" /></a>\n";
 }
 echo "</div>\n\n";
 
@@ -68,16 +64,16 @@ if( isset($_SESSION['CVS']["nonpublic/messages.php"]))
   $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'";
   $erg = mysql_query($SQL, $con);
   if( mysql_num_rows( $erg ) > 0 )
-		echo "<br><a href=\"". $url. $ENGEL_ROOT.
+    echo "<br /><a href=\"". $url. $ENGEL_ROOT.
       "nonpublic/messages.php\">". Get_Text("pub_messages_new1").
       " ".  mysql_num_rows( $erg ). " ".
-			Get_Text("pub_messages_new2"). "</a><br><br>";
+      Get_Text("pub_messages_new2"). "</a><br /><br />";
     }
 }
 ?>
 <table width="95%" align="center" border="0" cellpadding="7" cellspacing="0">
   <tr>
-<?PHP
+<?php
 //ausgaeb Menu
 if( !isset($_SESSION['Menu']))    $_SESSION['Menu'] = "L";
 if( $_SESSION['Menu'] =="L")    include("menu.php");
@@ -87,23 +83,21 @@ if( $_SESSION['Menu'] =="L")		include("menu.php");
 <table border="0" width="100%" align="center" class="border" cellpadding="5" cellspacing="1">
   <tr class="contenttopic">
     <td>
-<?PHP
+<?php
-		echo "\t<a name=\"#$header\" class=\"contenttopic\">";
+    echo "<a name=\"" . $header . "\" class=\"contenttopic\">";
     if( strlen( $header) == 0 )
-			echo "\n\t<b>". Get_Text($Page["Name"]). "</b></a>\n";
+      echo "\n<b>". Get_Text($Page["Name"]). "</b></a>\n";
     else
-			echo "\n\t<b>$header</b></a>\n";
+      echo "\n<b>$header</b></a>\n";
 
 ?>
     </td>
   </tr>
   <tr class="content">
      <td>
-<br>
+<br />
 <?php 
-echo "\n\n\n";
+if(isset($_SESSION['UID'])) {
- 
-if (IsSet($_SESSION['UID'])) {
   if(isset($_SESSION['oldurl']))
     $BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
   if(isset($_SESSION['newurl']))
@@ -111,27 +105,21 @@ if (IsSet($_SESSION['UID'])) {
   $_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
 }
 
-
+function SetHeaderGo2Back() {
-function SetHeaderGo2Back ()
-{
   global $BACKUP_SESSION_OLDURL;
   $_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
 }
 
+if($Page["CVS"] != "Y") {
+  echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
 
-if ( $Page["CVS"] != "Y" ) 
+  if(isset($_SESSION['oldurl']))
-{
-        echo "Du besitzt kein Rechte für diesen Bereich.<br>\n";
-        If (IsSet($_SESSION['oldurl'])) 
     echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
   else
     echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+
   exit ();
 }
 ?>
 
-
 <!-- ende des header parts //-->
-
-
-

includes/header_start.php

@@ -1,50 +1,40 @@
-<?PHP 
+<?php
   ini_set("session.gc_maxlifetime", "65535");
 
-include ("config.php");
+  include "config.php";
-include ("error_handler.php");
+  include "error_handler.php";
-include ("config_db.php");
+  include "config_db.php";
-include ("funktion_lang.php");
+  include "funktion_lang.php";
-include ("funktion_faq.php"); //für noAnswer() im menu
+  include "funktion_faq.php"; // fuer noAnswer() im menu
-include ("funktion_menu.php");
+  include "funktion_menu.php";
-include ("funktion_user.php");
+  include "funktion_user.php";
 
-
+  if(isset($SystemDisableMessage) && (strlen($SystemDisableMessage) > 0)) {
-if( isset($SystemDisableMessage) && ( strlen($SystemDisableMessage)>0) )
+    echo "<html><head><title>" . $SystemDisableMessage . "</title></head>";
-{
+    echo "<body>" . $SystemDisableMessage . "</body></html>\n";
-	echo "<HTML>\n".
-		"<BODY>\n". $SystemDisableMessage. "\n<BODY>\n".
-		"</HTML>";
     die();
   }
 
   if(!isset($_SESSION))
-{
     session_start();
-}
+
-include ("secure.php");
+  include "secure.php";
 
   if(!isset($_SESSION['IP']))
-{
     $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
-}
 
-if (IsSet($_SESSION['UID']) and ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR']))
+  if(isset($_SESSION['UID']) && ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR'])) {
-{
     session_destroy ();
-	header("Location: $url". $ENGEL_ROOT );
+    header("Location: " . $url . $ENGEL_ROOT);
   }
 
-include ("UserCVS.php");
+  include "UserCVS.php";
 
-
+  // update LASTlogin
-//UPdate LASTlogin
+  if(isset($_SESSION['UID'])) {
-if( isset($_SESSION['UID']))
-{
     $SQLlastLogIn = "UPDATE `User` SET " .
       "`lastLogIn` = '" . gmdate("Y-m-j H:i:s", time()) . "'" . 
       " WHERE `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;";
     mysql_query ($SQLlastLogIn, $con);
   }
-
 ?>

includes/login_eingabefeld.php

@@ -1,18 +1,17 @@
-<?PHP
+<?php
-include ("config.php");
+  include "config.php";
-
+?>
-echo "<form action=\"". $url. $ENGEL_ROOT. "nonpublic/index.php\" method=\"post\">";
-echo "<table>\n".
-	"\t<tr>".
-	"\t\t<td align=\"right\">". Get_Text("index_lang_nick"). "</td>".
-	"\t\t<td><input type=\"text\" name=\"user\" size=\"23\"></td>".
-	"\t</tr>".
-	"\t<tr>".
-	"\t\t<td align=\"right\">". Get_Text("index_lang_pass"). "</td>".
-	"\t\t<td><input type=\"password\" name=\"password\" size=\"23\"></td>".
-	"\t</tr>".
-	"</table>".
-	"<br><input type=\"submit\" value=\"". Get_Text("index_lang_send"). "\">";
-echo "</form>";
-
 
+<form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post">
+<table>
+  <tr>
+  <td align="right"><?php echo Get_Text("index_lang_nick"); ?></td>
+  <td><input type="text" name="user" size="23" /></td>
+  </tr>
+  <tr>
+  <td align="right"><?php echo Get_Text("index_lang_pass"); ?></td>
+  <td><input type="password" name="password" size="23"></td>
+  </tr>
+  </table>
+  <br /><input type="submit" value="<?php echo Get_Text("index_lang_send"); ?>">
+</form>

includes/menu.php

@@ -1,17 +1,17 @@
 
 <!-- anfang des menue parts //-->
   <td width="160"  valign="top">
-<?PHP
+<?php
 $MenueTableStart="
 <table align=\"center\" class=\"border\" cellpadding=\"3\" cellspacing=\"1\">
   <tr> 
     <td width=\"160\" class=\"menu\">
 ";
-$MenueTableEnd="
+$MenueTableEnd="</ul>
-				<br>
+        <br />
     </td>
   </tr>
-</table><br>
+</table><br />
 ";
 
 ShowMenu("");
@@ -40,8 +40,8 @@ if ($submenus >= 1 ) {
   </tr>
 </table>
 
-<br>
+<br />
-<?PHP
+<?php
     }
 }
 
@@ -55,7 +55,7 @@ if( isset($_SESSION['UID']))
     </td>
   </tr>
 </table>
-<?PHP
+<?php
 }
 ?>
     </td> 

includes/secure.php

@@ -1,41 +1,25 @@
 <?php
-//soll dein funktion entahlten die alle übergebenen parameter überprüft
+  if($debug)
-//'`'" 
+    echo "secure.php START<br />\n";
 
-if( $DEBUG)
+  foreach ($_GET as $k => $v) {
-	echo "secure.php START<br>\n";
-
-foreach ($_GET as $k => $v) 
-{	
-//  	$v = htmlspecialchars($v, ENT_QUOTES);
-//	$v = mysql_escape_string($v);
     $v = htmlentities($v, ENT_QUOTES);
-	if (preg_match('/([\'"`\'])/', $v, $match)) 
+    preg_replace('/([\'"`\'])/', '', $v);
-	{
-		print "sorry get has illegal char '$match[1]'";
-		exit;
-	}
     $_GET[$k] = $v;
 
-	if( $DEBUG)
+    if($debug)
-		echo "GET $k=\"$v\"<br>";
+      echo "GET $k=\"$v\"<br />";
   }
   
-foreach ($_POST as $k => $v) 
+  foreach ($_POST as $k => $v) {
-{
-//  	$v = htmlspecialchars($v, ENT_QUOTES);
-//	$v = mysql_escape_string($v);
     $v = htmlentities($v, ENT_QUOTES);
-	if (preg_match('/([\'"`\'])/', $v, $match)) {
+    preg_replace('/([\'"`\'])/', '', $v);
-		print "sorry post has illegal char '$match[1]'";
-		exit;
-	}
     $_POST[$k] = $v;
   
-	if( $DEBUG)
+    if($debug)
-		echo "POST $k=\"$v\"<br>";
+      echo "POST $k=\"$v\"<br />";
   }
-if( $DEBUG)
-	echo "secure.php END<br>\n";
 
+  if($debug)
+    echo "secure.php END<br />\n";
 ?>

services/cron_dect.php

@@ -1,25 +1,23 @@
-<?PHP
+<?php
-
+  include "../includes/config.php";
-include ("../includes/config.php");
+  include "../includes/config_IAX.php";
-include ("../includes/config_IAX.php");
+  include "../includes/config_db.php";
-include ("../includes/config_db.php");
+  include "../includes/error_handler.php";
-include ("../includes/error_handler.php");
+  include "../includes/funktion_modem.php";
-include ("../includes/funktion_modem.php");
+  include "../includes/funktion_cron.php";
-include ("../includes/funktion_cron.php");
-
 
   // ausfuerungs Ruetmuss (in s)
   $StartTimeBeforEvent = (60 / 4) * 60;
   $AnrufDelay = -5;
-$DebugDECT = FALSE;
+  $DebugDECT = false;
-#$DebugDECT = TRUE;
 
-//Timeout erhöhen;
+  // Timeout erhoehen
   set_time_limit(50000);
 
   // SQL zusammensetzen
   $SQL = "SELECT Shifts.DateS, Shifts.RID, ShiftEntry.UID, ShiftEntry.TID ".
          "FROM `Shifts` INNER JOIN `ShiftEntry` ON `Shifts`.`SID` = `ShiftEntry`.`SID` ";
+
   if($DebugDECT)
     $SQL .= "WHERE (Shifts.DateS>'2007-07-09 09:45:00' AND ".
             "Shifts.DateS<='2007-07-09 11:00:00');";
@@ -31,22 +29,17 @@ $Erg = mysql_query($SQL, $con);
   echo mysql_error($con);
 
   $Z = 0;
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
+
-{  
+  for($i = 0; $i < mysql_num_rows($Erg); $i++) {
-   if( mysql_result($Erg, $i, "UID")>0)
+    if(mysql_result($Erg, $i, "UID") > 0) {
-   {
       $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID"));
-	if( $DECTnumber!="")
+
-	{
+      if($DECTnumber != "") {
         echo "dial $DECTnumber\n";
-		DialNumberIAX( $DECTnumber,
+        DialNumberIAX( $DECTnumber, mysql_result($Erg, $i, "DateS"), mysql_result($Erg, $i, "RID"), mysql_result($Erg, $i, "TID"));
-		               mysql_result($Erg, $i, "DateS"),
+        DialNumberModem( $DECTnumber, mysql_result($Erg, $i, "DateS"));
-		               mysql_result($Erg, $i, "RID"),
+
-			       mysql_result($Erg, $i, "TID"));
+        if($Z++ > 10) {
-		DialNumberModem( $DECTnumber,
-		                 mysql_result($Erg, $i, "DateS"));
-		if( $Z++>10)
-		{
           $Z = 0;
           sleep(30);
         }
@@ -55,7 +48,4 @@ for( $i=0; $i<mysql_num_rows($Erg); $i++)
   }
 
   return 0;
-
-
 ?>
-

services/dect_clear.php

@@ -1,25 +1,19 @@
-<?PHP
+<?php
-// löscht alle eintrag in der telefonanlage, indem jede nummer einzähln gelöscht wir (#10<NUMBER>)
+  include "../includes/db.php";
-
+  include "../includes/config.php";
-include ("../includes/db.php");
+  include "../includes/funktion_modem.php";
-include ("../includes/config.php");
-include ("../includes/funktion_modem.php");
-
 
   $SQL = "SELECT DECT FROM `User`;";
-
   $Erg = mysql_query($SQL, $con);
 
   echo mysql_error($con);
 
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
+  for($i=0; $i < mysql_num_rows($Erg); $i++) {
-{ 
     $Number = "#10" . mysql_result($Erg, $i, "DECT");
+
     if(strlen($Number) == 7)
       DialNumber($Number);
   }
 
   return 0;
-
 ?>
-

services/jabberserver.php

@@ -1,54 +1,37 @@
 <?php
-
+  require_once "../includes/config_jabber.php";
-/****************************************************************************************************/
+  require_once "../includes/funktion_jabber.php";
-//					INCLUDE
+  include "../includes/config_MessegeServer.php";
-/****************************************************************************************************/
-require_once('../includes/config_jabber.php');
-require_once("../includes/funktion_jabber.php");
-include("../includes/config_MessegeServer.php");
 
   // Set time limit to indefinite execution
   set_time_limit(0);
 
-/****************************************************************************************************/
-//					show MODE
-/****************************************************************************************************/
   if(DEBUG)
     echo "DEBUG mode is enable\n\tjabber is disable\n\n";
 
-/****************************************************************************************************/
+  if(!DEBUG) {
-//					INIT jabber
-/****************************************************************************************************/
-if( !DEBUG)
-{
     echo "INIT jabber\n";
     $jabber = new Jabber($server, $port, $username, $password, $resource);
+
     if(!($jabber->Connect() && $jabber->SendAuth())) 
       die("Couldn't connect to Jabber Server.");
   }
 
-
-/****************************************************************************************************/
-//					INIT socked
-/****************************************************************************************************/
   echo "INIT socked\n";
-	//http://de3.php.net/manual/de/function.socket-listen.php
+
   // Create a UDP socket
   $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked (' . socket_strerror(socket_last_error()) . ')');
+
   // Bind the socket to an address/port
   socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address (' . socket_strerror(socket_last_error()) . ')');
+
   // Setzt Nonbock Mode
   socket_set_nonblock($sock);
 
+  $RUNNING = true;
 
-/****************************************************************************************************/
+  while($RUNNING) {
-//					Loop continuos
+    if(@socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) {
-/****************************************************************************************************/
-$RUNNING = TRUE;
-while( $RUNNING )
-{
-	if( @socket_recvfrom($sock, $data, 65535, 0, $ip, $port))
-	{
       // daten empfangen
       $data = substr($data, 0, strlen($data)-1); //ENTER entfernen
       echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n";
@@ -65,49 +48,28 @@ if( !DEBUG)
   // Close the master sockets
   socket_close($sock); 
   
-/****************************************************************************************************/
+  function PackedAnalyser($data) {
-/****************************************** MAIN END ************************************************/
+    global $jabber, $RUNNING;
-/****************************************************************************************************/
-
-
-/****************************************************************************************************/
-//***** function PackedAnalyser
-/****************************************************************************************************/
-function PackedAnalyser( $data )
-{
-	GLOBAL $jabber, $RUNNING;
     // init array
     $matches = array();
 
     //#message
-	if( preg_match( "/^#(message) ([^ ]+) (.+)/i", $data, $matches ) )
+    if(preg_match("/^#(message) ([^ ]+) (.+)/i", $data, $matches)) {
-	{
       if($matches[2]=="" || $matches[3]=="")
-		{
-			// Wrong syntax
         echo "\t\t\t\t#messaage parameter fail\n";
-		}
+      else {
-		else
-		{
         // Whisper
         if(!DEBUG)
           $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL);
         else  
           echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n";
       }
-	}
+    } elseif(preg_match("/^#quit/i", $data, $matches)) {
-	elseif( preg_match( "/^#quit/i", $data, $matches ) )
+      if(DEBUG) {
-	{
-		if( DEBUG)
-		{
         echo "\t\t\t\tSystem Shutdown\n\n";
-			$RUNNING = FALSE;
+        $RUNNING = false;
       }
-	}
+    } else
-	else
-	{
       echo "\t\t\t\tcommand not found\n\n";
   }
-}
-
 ?>

txt/README

@@ -3,9 +3,9 @@ DIRS:
 ./DB
 	Standart DB File
 ./www
-	daten für http verbindung
+	daten fuer http verbindung
 ./www-ssl
-	daten für https verbindung
+	daten fuer https verbindung
 
 Anfordeungen:
 -------------

www-ssl/ShowUserPicture.php

@@ -1,11 +1,12 @@
-<?PHP
+<?php
+  include "../../camp2011/includes/config.php";
+  include "../../camp2011/includes/error_handler.php";
+  include "../../camp2011/includes/config_db.php";
 
-include ("../../camp2011/includes/config.php");
+  if(!isset($_SESSION))
-include ("../../camp2011/includes/error_handler.php");
+    session_start();
-include ("../../camp2011/includes/config_db.php");
-if( !isset($_SESSION))	session_start();
-include ("../../camp2011/includes/secure.php");
 
+  include "../../camp2011/includes/secure.php";
 
   // Parameter check
   if(!isset($_GET["UID"]))
@@ -14,30 +15,25 @@ if( !isset($_GET["UID"]) )
   $SQL = "SELECT * FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "'";
   $res = mysql_query($SQL, $con);
 
-if( mysql_num_rows($res) == 1)
+  if(mysql_num_rows($res) == 1) {
-{
+    // genuegend rechte
-	//genügend rechte
+    if(!isset($_SESSION['UID']) || $_SESSION['UID'] == -1) {
-	if( !isset($_SESSION['UID']) || $_SESSION['UID'] == -1)
-	{
       header("HTTP/1.0 403 Forbidden");
       die("403 Forbidden");
     }
 
     // ist das bild sichtbar?
-	if( (mysql_result($res, 0, "show")=="N") AND
+    if((mysql_result($res, 0, "show") == "N") AND ($_SESSION['UID']!=$_GET["UID"]) AND ($_SESSION['CVS'][ "admin/UserPicture.php" ] == "N")) {
-	    ($_SESSION['UID']!=$_GET["UID"]) AND 
-	    ($_SESSION['CVS'][ "admin/UserPicture.php" ] == "N"))
-	{
       $SQL = "SELECT * FROM `UserPicture` WHERE `UID`='-1'";
       $res = mysql_query($SQL, $con);
-		if( mysql_num_rows($res) != 1)
+
-		{
+      if(mysql_num_rows($res) != 1) {
-			header( 'HTTP/1.0 404 Not Found');
+        header("HTTP/1.0 404 Not Found");
         die("404 Not Found");
       }
     }
 
-	/// bild aus db auslesen
+    // bild aus db auslesen
     $bild = mysql_result($res, 0, "Bild");
 
     // ausgabe bild
@@ -48,11 +44,8 @@ if( mysql_num_rows($res) == 1)
     header("Cache-request-directive: min-fresh = 120");
     header("Cache-request-directive: max-age = 360");
     echo $bild;
-}
+  } else {
-else
+    header("HTTP/1.0 404 Not Found");
-{
-	header( 'HTTP/1.0 404 Not Found');
     die( "404 Not Found");
   }
-
 ?>

www-ssl/admin/EngelType.php

@@ -11,15 +11,15 @@ function runSQL( $SQL)
   $Erg = mysql_query($SQL, $con);
   if ($Erg) 
   {
-		echo "&Auml;nderung wurde gesichert...<br>";
+    echo "&Auml;nderung wurde gesichert...<br />";
-		echo "[$SQL]<br>"; 
+    echo "[$SQL]<br />"; 
     return 1;
   } 
   else 
   {
     echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-		echo "<br><br>".mysql_error( $con ). "<br>";
+    echo "<br /><br />".mysql_error( $con ). "<br />";
-		echo "[$SQL]<br>"; 
+    echo "[$SQL]<br />"; 
     return 0;
   }
 }
@@ -31,15 +31,15 @@ function runSQL_log( $SQL, $commed)
   $Erg = db_query($SQL, $commed);
   if ($Erg) 
   {
-		echo "&Auml;nderung wurde gesichert...<br>";
+    echo "&Auml;nderung wurde gesichert...<br />";
-		echo "[$SQL]<br>"; 
+    echo "[$SQL]<br />"; 
     return 1;
   } 
   else 
   {
     echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-		echo "<br><br>".mysql_error( $con ). "<br>";
+    echo "<br /><br />".mysql_error( $con ). "<br />";
-		echo "[$SQL]<br>"; 
+    echo "[$SQL]<br />"; 
     return 0;
   }
 }
@@ -52,10 +52,10 @@ $Erg = mysql_query($Sql, $con);
 if( !IsSet($_GET["action"]) )
 {
   echo "Hallo ".$_SESSION['Nick'].
-		",<br>\nhier hast du die M&ouml;glichkeit, neue Engeltypen f&uuml;r die Schichtpl&auml;ne einzutragen ".
+    ",<br />\nhier hast du die M&ouml;glichkeit, neue Engeltypen f&uuml;r die Schichtpl&auml;ne einzutragen ".
-		"oder vorhandene abzu&auml;ndern:<br><br>\n";
+    "oder vorhandene abzu&auml;ndern:<br /><br />\n";
 
-	echo "<a href=\"./EngelType.php?action=new\">- Neuen EngelType eintragen</a><br>\n";
+  echo "<a href=\"./EngelType.php?action=new\">- Neuen EngelType eintragen</a><br />\n";
   
   echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
   echo "<tr class=\"contenttopic\">\n";
@@ -85,7 +85,7 @@ else
 switch ($_GET["action"]) {
 
 case 'new':
-	echo "Neuen EngelType einrichten: <br>";
+  echo "Neuen EngelType einrichten: <br />";
   echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
   echo "<table>\n";
   

www-ssl/admin/Recentchanges.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "ChangeLog";
 $header = "Datenbank-Auszug";

www-ssl/admin/UserPicture.php

@@ -22,7 +22,7 @@ if( IsSet($_GET["action"]) )
       echo "\t</select>\n";
       echo "\t<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
       echo "\t<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
-			echo "\t(max ". get_cfg_var("post_max_size"). "Byte)<br>\n";
+      echo "\t(max ". get_cfg_var("post_max_size"). "Byte)<br />\n";
       echo "\t<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
       echo "</form>\n";
       break;
@@ -60,7 +60,7 @@ if( IsSet($_GET["action"]) )
     case 'SetN':
       if (IsSet($_GET["UID"]))
       {
-				echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:<br>";
+        echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:<br />";
         $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'";
       }
       else
@@ -69,7 +69,7 @@ if( IsSet($_GET["action"]) )
     case 'SetY':
       if (IsSet($_GET["UID"]))
       {
-				echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:<br>";
+        echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:<br />";
         $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'";
       }
       else
@@ -82,7 +82,7 @@ if( IsSet($_GET["action"]) )
     case 'delYes':
       if (IsSet($_GET["UID"]))
       {
-				echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gel&ouml;scht:<br>";
+        echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gel&ouml;scht:<br />";
         $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1";
       }
       else
@@ -99,14 +99,14 @@ if( IsSet($_GET["action"]) )
     // hier muesste das SQL ausgefuehrt werden...
     $Erg = mysql_query($SQL, $con);
     if ($Erg == 1) 
-		     echo "&Auml;nderung wurde gesichert...<br>";
+         echo "&Auml;nderung wurde gesichert...<br />";
     else
     {
          echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-		     echo "<br><br>".mysql_error( $con ). "<br>($SQL)<br>";
+         echo "<br /><br />".mysql_error( $con ). "<br />($SQL)<br />";
     }
   } // Ende Update                
-	echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
+  echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
 } //IF IsSet($action)
 
 
@@ -114,7 +114,7 @@ if( IsSet($_GET["action"]) )
 $Sql = "SELECT * FROM `UserPicture` WHERE `UID`>0;";
 $Erg = mysql_query($Sql, $con);
   
-echo "Hallo ". $_SESSION['Nick']. ",<br>\nhier hast du die M&ouml;glichkeit, die Bilder der Engel freizugeben:<br><br>\n";
+echo "Hallo ". $_SESSION['Nick']. ",<br />\nhier hast du die M&ouml;glichkeit, die Bilder der Engel freizugeben:<br /><br />\n";
 
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
 echo "<tr class=\"contenttopic\">\n";
@@ -143,7 +143,7 @@ for( $t = 0; $t < mysql_num_rows($Erg); $t++ )
 } // ende Auflistung Raeume
 echo "</table>";
 
-echo "<br><a href=\"./UserPicture.php?action=FormUpload\">picture upload</a>\n";
+echo "<br /><a href=\"./UserPicture.php?action=FormUpload\">picture upload</a>\n";
 
 include ("../../../camp2011/includes/footer.php");
 ?>

www-ssl/admin/aktiv.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "akive Engel";
 $header = "Liste der aktiven Engel";
@@ -6,8 +6,8 @@ include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "<form action=\"./aktiv.php\" method=\"post\">";
-echo Get_Text("pub_aktive_Text1")."<br>\n";
+echo Get_Text("pub_aktive_Text1")."<br />\n";
-echo Get_Text("pub_aktive_Text2")."<br><br>\n";
+echo Get_Text("pub_aktive_Text2")."<br /><br />\n";
   
 // auswahlbox
 echo Get_Text("pub_aktive_Text31")."\n";
@@ -15,13 +15,13 @@ echo "<select name=\"Anzahl\">\n";
 for( $i=0; $i<50; $i++) 
   echo "\t<option value=\"$i\">$i</option>\n";
 echo "</select>";
-echo Get_Text("pub_aktive_Text32")."<br><br>\n";
+echo Get_Text("pub_aktive_Text32")."<br /><br />\n";
 echo "<input type=\"submit\" name=\"SendType\" value=\"Show..\">\n";
 echo "<input type=\"submit\" name=\"SendType\" value=\"Write..\">\n";
 echo "</form>\n";
 
 echo "<form action=\"./aktiv.php\" method=\"post\">\n";
-	echo "\t<br><input type=\"submit\" name=\"ResetActive\" value=\"reset Active setting\">\n";
+  echo "\t<br /><input type=\"submit\" name=\"ResetActive\" value=\"reset Active setting\">\n";
 echo "</form>\n";
 
 if( Isset($_POST["ResetActive"]) )
@@ -35,9 +35,9 @@ if( Isset($_POST["ResetActive"]) )
 }
 
 if( IsSet($_POST["Anzahl"]) )
-	echo "<br>\n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":";
+  echo "<br />\n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":";
 
-echo "<br><br>\n\n";
+echo "<br /><br />\n\n";
 
 //ausgabe tabelle
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
@@ -103,7 +103,7 @@ for ($i=0; $i<$rowcount; $i++)
 
 echo "</table>";
 
-echo "<br>Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br><br>";
+echo "<br />Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br /><br />";
 
 include ("../../../camp2011/includes/footer.php");
 ?>

www-ssl/admin/dbUpdateFromXLS.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 $title = "DB Update from XML";
 $header = "DB Update from XML";
 include ("../../../camp2011/includes/header.php");
@@ -41,7 +41,7 @@ CreateRoomArrays();
 /*##############################################################################################
                    F I L E
   ##############################################################################################*/
-echo "\n\n<br>\n<h1>XML File:</h1>\n";
+echo "\n\n<br />\n<h1>XML File:</h1>\n";
 if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"]))
 {
   echo "Update XCAL-File from Pentabarf..";
@@ -101,7 +101,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
       }
       fclose( $fileOut);
       
-			echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
+      echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
     }
     else
       echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
@@ -126,7 +126,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
           fputs( $fileOut, fgets( $fileIn));  
         }
         fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
+        echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
       }
       else
         echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
@@ -143,9 +143,9 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
       " --no-check-certificate";
     echo system( $Command, $Status);
     if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
     else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
   }
   elseif( $PentabarfGetWith=="lynx")
   {
@@ -153,9 +153,9 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
       "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
     echo system( $Command, $Status);
     if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
     else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
   }
   elseif($PentabarfGetWith=="fopen")
   {
@@ -175,7 +175,7 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
           fputs( $fileOut, fgets( $fileIn));  
         }
         fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
+        echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
       }
       else
         echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
@@ -192,9 +192,9 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
       " --no-check-certificate";
     echo system( $Command, $Status);
     if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
     else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
   }
   elseif( $PentabarfGetWith=="lynx")
   {
@@ -202,9 +202,9 @@ if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST[
       "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
     echo system( $Command, $Status);
     if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
     else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
   }
   else
     echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
@@ -235,17 +235,17 @@ $XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR");
 
 if( $ShowDataStrukture)
 {
-	echo "<pre><br>";
+  echo "<pre><br />";
   echo $XMLmain->name;
-	echo "<br>";
+  echo "<br />";
   print_r(array_values ($XMLmain->sub));
   echo "</pre>";
 }
 
 /*
-echo "<br>";
+echo "<br />";
 $Feld=7;
-echo "$Feld#". $XMLmain->sub[$Feld]->name. "<br>";
+echo "$Feld#". $XMLmain->sub[$Feld]->name. "<br />";
 echo "$Feld#". $XMLmain->sub[$Feld]->sub;
 //print_r(array_values ($XMLmain->sub[$Feld]->sub));
 while(list($key, $value) = each($XMLmain->sub[$Feld]->sub))
@@ -260,9 +260,9 @@ echo "</pre>";
 
 echo "<hr>\n";
 $XMLrelease = getXMLsubPease( $XMLmain, "X-WR-CALDESC");
-echo "release: ". $XMLrelease->data. "<br>\n";
+echo "release: ". $XMLrelease->data. "<br />\n";
 //$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE");
-//echo "release date: ". $XMLreleaseDate->data. "<br>\n";
+//echo "release date: ". $XMLreleaseDate->data. "<br />\n";
 echo "<hr>\n";
 
 
@@ -280,7 +280,7 @@ if( $EnableSchudleFunctions)
 /*##############################################################################################
                  U P D A T E  A L L 
   ##############################################################################################*/
-echo "\n\n<br>\n<h1>Update ALL:</h1>\n";
+echo "\n\n<br />\n<h1>Update ALL:</h1>\n";
 
 echo "<form action=\"dbUpdateFromXLS.php\">\n";
 echo "\t<input type=\"submit\" name=\"UpdateALL\" value=\"now\">\n";

www-ssl/admin/debug.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Debug-Liste";
 $header = "Datenbank-Auszug";
@@ -9,22 +9,22 @@ echo "<h1>Web Counter</h1>";
 funktion_db_list("Counter");
 
 /*
-echo "<h1>Raeume</h1> <br>";
+echo "<h1>Raeume</h1> <br />";
 funktion_db_list("Raeume");
 
-echo "<h1>Schichtbelegung</h1> <br>";
+echo "<h1>Schichtbelegung</h1> <br />";
 funktion_db_list("Schichtbelegung");
 
-echo "<h1>Schichtplan</h1> <br>Hier findest du alle bisher eingetragenen Schichten:";
+echo "<h1>Schichtplan</h1> <br />Hier findest du alle bisher eingetragenen Schichten:";
 funktion_db_list("Schichtplan");
 
-echo "<h1>User</h1> <br>";
+echo "<h1>User</h1> <br />";
 funktion_db_list("User");
 
-echo "<h1>News</h1> <br>";
+echo "<h1>News</h1> <br />";
 funktion_db_list("News");
 
-echo "<h1>FAQ</h1> <br>";
+echo "<h1>FAQ</h1> <br />";
 funktion_db_list("FAQ");
 
 echo "Deaktiviert";
@@ -33,31 +33,31 @@ echo "Deaktiviert";
 echo "<hr>\n";
 funktion_db_element_list_2row( "Tshirt-Size aller engel",
         "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); 
-echo "<br>\n";
+echo "<br />\n";
 funktion_db_element_list_2row( "Tshirt ausgegeben",
         "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); 
-echo "<br>\n";
+echo "<br />\n";
 funktion_db_element_list_2row( "Tshirt nicht  ausgegeben (Gekommen=1)", 
         "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`");
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Hometown", 
         "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
-echo "<br>\n";
+echo "<br />\n";
 funktion_db_element_list_2row( "Engeltypen", 
           "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Gesamte Arbeit",
           "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)");
-echo "<br>\n";
+echo "<br />\n";
 funktion_db_element_list_2row( "Geleisteter Arbeit",
           "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)");
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Gesamte Arbeit (Ohne Raum aufabau (RID=7)",
           "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)");
-echo "<br>\n";
+echo "<br />\n";
 funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)",
           "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)");
 

www-ssl/admin/dect.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Engelsystem - DECT";
 $header = "DECT send call";

www-ssl/admin/dect_call.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 include ("../../../camp2011/includes/header.php");
 
 

www-ssl/admin/faq.1.php

@@ -1,6 +1,6 @@
 <h4 class="menu"> Anfragen und FAQ </h4>
 
 <li><a href="faq.php?quest=all">Alle Anfragen</a></li>
-<li><a href="faq.php?quest=open">Offene Anfragen (<?PHP echo noAnswer(); ?>)</a></li>
+<li><a href="faq.php?quest=open">Offene Anfragen (<?php echo noAnswer(); ?>)</a></li>
 <li><a href="faq.php?quest=faq">FAQ-Liste editiern</a></li>
 

www-ssl/admin/faq.php

@@ -24,7 +24,7 @@ switch ($_GET["quest"])
 case "all":
   $SQL="SELECT * FROM `Questions` ORDER BY QID DESC";
 ?>
-	Alle Anfragen:<br>
+  Alle Anfragen:<br />
         <table  width="100%" class="border" cellpadding="2" cellspacing="1">
                 <tr class="contenttopic">
       <th>Frage</th>
@@ -35,7 +35,7 @@ case "all":
       <th>change</th>
                 </tr>
 
-<?PHP
+<?php
 
         $Erg = mysql_query($SQL, $con);
         // anzahl zeilen
@@ -66,34 +66,34 @@ case "all":
 case "open":
   $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC";
   $quest_bearb=1; // Fragenliste anzeigen
-	echo "\t\tOffene Anfragen:<br>\n";
+  echo "\t\tOffene Anfragen:<br />\n";
   break;
   
 case "edit":
   if (!IsSet($_GET["QID"]))
-		echo "\t\tFehlerhafter Aufruf...<br>Bitte die Bearbeitung nochmals beginnen :)\n";
+    echo "\t\tFehlerhafter Aufruf...<br />Bitte die Bearbeitung nochmals beginnen :)\n";
   else 
   {
     $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
     $Erg = mysql_query($SQL, $con);
     echo "\t\t<form action=\"./faq.php\" method=\"GET\">\n";
-		echo "\t\tAnfrage von <b>". UID2NICK(mysql_result($Erg, 0, "UID")). "</b>:<br>\n";
+    echo "\t\tAnfrage von <b>". UID2NICK(mysql_result($Erg, 0, "UID")). "</b>:<br />\n";
     echo "\t\t<textarea name=\"Question\" rows=\"3\" cols=\"80\">".
       mysql_result($Erg, 0, "Question"). "</textarea>\n";
-		echo "<br><br>Antwort der Erzengel:<br>\n";
+    echo "<br /><br />Antwort der Erzengel:<br />\n";
     if (mysql_result($Erg, 0, "Answer")=="") 
       echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">".
-				"Bitte hier die Antwort eintragen...</textarea><br>\n";
+        "Bitte hier die Antwort eintragen...</textarea><br />\n";
     else 
       echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">". 
-				mysql_result($Erg, 0, "Answer"). "</textarea>\n<br>\n";
+        mysql_result($Erg, 0, "Answer"). "</textarea>\n<br />\n";
     echo "\t\t<input type=\"hidden\" name=\"QID\" value=\"". $_GET["QID"]. "\">\n";
     echo "\t\t<input type=\"hidden\" name=\"quest\" value=\"save\">\n";
     echo "\t\t<input type=\"submit\" value=\"Sichern...\">\n";
     echo "\t</form>\n";
     if (mysql_result($Erg, 0, "AID")<>"0") 
     {
-			echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag &uuml;bernehmen.<br>\n";
+      echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag &uuml;bernehmen.<br />\n";
       echo "<a href=\"./faq.php?quest=transfer&QID=". $_GET["QID"]. "\">Als FAQ-Eintrag sichern...</a>\n";
     }
   } // Abfrage der QID
@@ -110,7 +110,7 @@ case "save":
           $Erg = db_query($SQL, "save Question");
     if ($Erg == 1) 
     {
-			echo "\tDer Eintrag wurde ge&auml;ndert<br>\n";
+      echo "\tDer Eintrag wurde ge&auml;ndert<br />\n";
       SetHeaderGo2Back();
             } 
     else 
@@ -129,7 +129,7 @@ case "transfer":
       mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')";
     $Erg = db_query($SQL2, "trasfert to request to the FAQ");
     if ($Erg == 1) 
-			echo "\tDer Eintrag wurde &uuml;bertragen.<br>\n";
+      echo "\tDer Eintrag wurde &uuml;bertragen.<br />\n";
           else
       echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
   }
@@ -144,7 +144,7 @@ case "transfer":
 // *---------------------------------------------------------------------------
 case "faq":
   $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren...
-	echo "\tFAQ-Liste:<br>";
+  echo "\tFAQ-Liste:<br />";
   echo "<a href=\"./faq.php?quest=faqnew\">Neuen Eintrag</a>";
   
   $SQL = "SELECT * FROM `FAQ`";
@@ -159,13 +159,13 @@ case "faq":
       echo "\t<p class=\"question\">".  mysql_result($Erg, $n, "Frage").  "</p>\n";
       echo "\t<p class=\"answetion\">". mysql_result($Erg, $n, "Antwort")."</p>\n";
       echo "\t<a href=\"./faq.php?quest=faqedit&FAQID=". mysql_result($Erg, $n, "FID"). 
-				"\">Bearbeiten</a>\n<br>---<br>\n";
+        "\">Bearbeiten</a>\n<br />---<br />\n";
     }
   break;
 
 case "faqedit":
        if (!IsSet($_GET["FAQID"]))
-		echo "\tFehlerhafter Aufruf...<br>Bitte die Bearbeitung nochmals beginnen :)\n";
+    echo "\tFehlerhafter Aufruf...<br />Bitte die Bearbeitung nochmals beginnen :)\n";
   else
   {
     $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'";
@@ -175,17 +175,17 @@ case "faqedit":
     $Zeilen  = mysql_num_rows($Erg);
 ?>
   <form action="./faq.php" method="GET">
-		Frage:<br>
+    Frage:<br />
   <textarea name="Frage" rows="3" cols="80"><?php echo mysql_result($Erg, 0, "Frage"); ?></textarea>
-	<br><br>
+  <br /><br />
-	Antwort:<br>
+  Antwort:<br />
-	<textarea name="Antwort" rows="5" cols="80"><?php echo mysql_result($Erg, 0, "Antwort"); ?></textarea><br>
+  <textarea name="Antwort" rows="5" cols="80"><?php echo mysql_result($Erg, 0, "Antwort"); ?></textarea><br />
-	<input type="hidden" name="FAQID" value="<?PHP echo $_GET["FAQID"]; ?>">
+  <input type="hidden" name="FAQID" value="<?php echo $_GET["FAQID"]; ?>">
   <input type="hidden" name="quest" value="faqsave">
   <input type="submit" value="Sichern...">
   </form>
   <form action="./faq.php">  
-        <input type="hidden" name="FAQID" value="<?PHP echo $_GET["FAQID"]; ?>">
+        <input type="hidden" name="FAQID" value="<?php echo $_GET["FAQID"]; ?>">
         <input type="hidden" name="quest" value="faqdelete">
         <input type="submit" value="L&ouml;schen...">
   </form>
@@ -201,7 +201,7 @@ case "faqdelete";
     $SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
     $Erg = db_query($SQL, "delate faq item");
     if ($Erg == 1) 
-			echo "\tDer Eintrag wurde gel&ouml;scht<br>\n";
+      echo "\tDer Eintrag wurde gel&ouml;scht<br />\n";
     else
       echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gel&ouml;scht gewesen?\n";
   }
@@ -216,7 +216,7 @@ case "faqsave";
          "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
     $Erg = db_query($SQL, $con);
     if ($Erg == 1) 
-			echo "\tDer Eintrag wurde ge&auml;ndert<br>\n";
+      echo "\tDer Eintrag wurde ge&auml;ndert<br />\n";
             else
       echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         }
@@ -225,10 +225,10 @@ case "faqsave";
 case "faqnew":
 ?>
   <form action="./faq.php" method="GET">
-        Frage:<br>
+        Frage:<br />
-        <textarea name="Frage" rows="3" cols="80">Frage...</textarea><br><br>
+        <textarea name="Frage" rows="3" cols="80">Frage...</textarea><br /><br />
-        Antwort:<br>
+        Antwort:<br />
-	<textarea name="Antwort" rows="5" cols="80">Antwort</textarea><br>
+  <textarea name="Antwort" rows="5" cols="80">Antwort</textarea><br />
         <input type="hidden" name="quest" value="faqnewsave">
         <input type="submit" value="Sichern...">
         </form>
@@ -239,7 +239,7 @@ case "faqnewsave";
         $SQL = "INSERT INTO `FAQ` VALUES ('', '". $_GET["Frage"]. "', '". $_GET["Antwort"]. "')";
         $Erg = db_query($SQL, "Save new FAQ entry");
         if ($Erg == 1)
-		echo "\tDer Eintrag wurde erfasst.<br>\n";
+    echo "\tDer Eintrag wurde erfasst.<br />\n";
         else
     echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         break;
@@ -260,9 +260,9 @@ if ($quest_bearb==1)
   else
     for ($n = 0 ; $n < $Zeilen ; $n++) 
     {
-			echo "\t<p>". nl2br(mysql_result($Erg, $n, "Question"))."\n</p><br>\n";
+      echo "\t<p>". nl2br(mysql_result($Erg, $n, "Question"))."\n</p><br />\n";
       echo "\t<a href=\"./faq.php?quest=edit&QID=". mysql_result($Erg, $n, "QID"). "\">Bearbeiten</a>\n";
-			echo "<br>---<br>\n";
+      echo "<br />---<br />\n";
     }
   
 }

www-ssl/admin/free.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Erzengel";
 $header = "Freie Engel";
@@ -6,9 +6,9 @@ include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
 
-echo "Hallo ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo ".$_SESSION['Nick'].",<br />\n";
 
-echo "<br><br>\n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:<br><br>\n";
+echo "<br /><br />\n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:<br /><br />\n";
 
 
 #######################################################
@@ -82,7 +82,7 @@ echo "</table>\n";
 
 //##########################################################################################################
 
-echo "<br><br>\n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:<br><br>\n";
+echo "<br /><br />\n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:<br /><br />\n";
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\"\>\n";
 echo "\t<tr class=\"contenttopic\">\n\t\t<td>Nick</td>\n\t\t<td>DECT</td>\n\t</tr>\n";
 

www-ssl/admin/free_DECT.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 include ("../../../camp2011/includes/config_db.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
@@ -71,7 +71,7 @@ for ($i=0; $i < $Zeilen; $i++)
   }
 
   echo "\n";
-//	echo "<br>";
+//  echo "<br />";
 }
 
 ?>

www-ssl/admin/group.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";

www-ssl/admin/index.php

@@ -1,19 +1,19 @@
-<?PHP
+<?php
 
 $title = "Erzengel";
 $header = "Index";
 include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
-echo "Hallo Erzengel ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo Erzengel ".$_SESSION['Nick'].",<br />\n";
 
 ?>
 
-du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.<br><br>
+du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.<br /><br />
 
 Bitte melde dich <a href="../logout.php">hier</a> nach getaner Arbeit immer ab, damit kein anderer hier &Auml;nderungen vornehmen kann.
 
-<?PHP
+<?php
 include ("../../../camp2011/includes/footer.php");
 ?>
 

www-ssl/admin/news.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Newsverwaltung";
 $header = "Verwaltung der News";
@@ -13,9 +13,9 @@ if (!IsSet($_GET["action"]))
 
   $rowcount = mysql_num_rows($Erg);
   ?>
-Hallo <?PHP echo $_SESSION['Nick'] ?>, <br>
+Hallo <?php echo $_SESSION['Nick'] ?>, <br />
 hier kannst du die News s&auml;ubern... falls jemand auf die Idee kommt, 
-hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br><br>
+hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br /><br />
 
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
         <tr class="contenttopic">
@@ -26,7 +26,7 @@ hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br>
          <td>Engeltreff</td>
    <td>&Auml;nd.</td>
   </tr>
-<?PHP			  
+<?php        
 
   for ($i=0; $i < $rowcount; $i++) 
   {
@@ -111,8 +111,8 @@ else
     If ($Erg == 1)
       echo "&Auml;nderung erfolgreich gesichert...";
     else 
-			echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)<br><br>\n".
+      echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)<br /><br />\n".
-				mysql_error($con). "<br><br>\n[$chsql]";
+        mysql_error($con). "<br /><br />\n[$chsql]";
     SetHeaderGo2Back();
   }
 }// IF-ELSE

www-ssl/admin/room.php

@@ -10,10 +10,10 @@ $Erg = mysql_query($Sql, $con);
 if( !IsSet($_GET["action"]) )
 {
   echo "Hallo ".$_SESSION['Nick'].
-		",<br>\nhier hast du die M&ouml;glichkeit, neue R&auml;ume f&uuml;r die Schichtpl&auml;ne einzutragen ".
+    ",<br />\nhier hast du die M&ouml;glichkeit, neue R&auml;ume f&uuml;r die Schichtpl&auml;ne einzutragen ".
-		"oder vorhandene abzu&auml;ndern:<br><br>\n";
+    "oder vorhandene abzu&auml;ndern:<br /><br />\n";
 
-	echo "<a href=\"./room.php?action=new\">- Neuen Raum/Ort eintragen</a><br>\n";
+  echo "<a href=\"./room.php?action=new\">- Neuen Raum/Ort eintragen</a><br />\n";
   
   echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
   echo "<tr class=\"contenttopic\">\n";
@@ -48,7 +48,7 @@ UnSet($SQL);
 switch ($_GET["action"]) {
 
 case 'new':
-	echo "Neuen Raum einrichten: <br>";
+  echo "Neuen Raum einrichten: <br />";
   echo "<form action=\"./room.php\" method=\"GET\">\n";
   echo "<table>\n";
   
@@ -185,11 +185,11 @@ if (IsSet($SQL)){
   // hier muesste das SQL ausgefuehrt werden...
   $Erg = db_query($SQL, "exec SQL");
   if ($Erg == 1) 
-	     echo "&Auml;nderung wurde gesichert...<br>";
+       echo "&Auml;nderung wurde gesichert...<br />";
   else
   {
        echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-	     echo "<br><br>".mysql_error( $con ). "<br>($SQL)<br>";
+       echo "<br /><br />".mysql_error( $con ). "<br />($SQL)<br />";
   }
 } // Ende Update                
 

www-ssl/admin/schichtplan.php

@@ -6,11 +6,11 @@ include ("../../../camp2011/includes/header.php");
 
 function executeSQL( $SQL)
 {
-	global $DEBUG, $con;
+  global $debug, $con;
   
   $Erg = mysql_query($SQL, $con);
-	if( $DEBUG ) 
+  if( $debug ) 
-		echo "DEBUG SQL: $SQL<br>\n";
+    echo "DEBUG SQL: $SQL<br />\n";
   if ($Erg == 1) 
   {
          echo "SQL war erfolgreich";
@@ -22,9 +22,9 @@ function executeSQL( $SQL)
 }
 
 if (!IsSet($_GET["action"])) {
-echo "Hallo ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo ".$_SESSION['Nick'].",<br />\n";
-echo "hier kannst du Schichten anlegen, &auml;ndern oder l&ouml;schen.<br><br>";
+echo "hier kannst du Schichten anlegen, &auml;ndern oder l&ouml;schen.<br /><br />";
-echo "<a href=\"./shiftadd.php\">Neue Schicht einplanen</a><br><br>\n\n";
+echo "<a href=\"./shiftadd.php\">Neue Schicht einplanen</a><br /><br />\n\n";
 
 echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >\n";
 ?>
@@ -36,7 +36,7 @@ echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >\n";
     <td>Dauer</td>
     <td>&Auml;ndern</td>
   </tr>
-<?PHP
+<?php
 
 $sql =  "SELECT `SID`, `DateS`, `RID`, `Len` FROM `Shifts` ".
   "ORDER BY `RID`, `DateS` ";
@@ -85,7 +85,7 @@ case 'change':
   $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )";
   $Erg = mysql_query($sql, $con);
 
-        echo "Schicht ab&auml;ndern: <br>\n";
+        echo "Schicht ab&auml;ndern: <br />\n";
 
   // Anzeige Allgemeiner schaischt daten
         echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
@@ -140,10 +140,10 @@ case 'change':
         echo "<input type=\"submit\" value=\"L&ouml;schen...\">\n";
         echo "</form>\n\n";
   
-	echo "<b>ACHTUNG:</b><br>\n";
+  echo "<b>ACHTUNG:</b><br />\n";
-	echo "Beim L&ouml;schen werden die bisher eingetragenen Engel f&uuml;r diese Schicht mitgel&ouml;scht.<br>\n";
+  echo "Beim L&ouml;schen werden die bisher eingetragenen Engel f&uuml;r diese Schicht mitgel&ouml;scht.<br />\n";
 
-	echo "<br><hr>\n\n\n\n";
+  echo "<br /><hr>\n\n\n\n";
   
   //Freie Engelschichten
   $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'";
@@ -151,14 +151,14 @@ case 'change':
   $rowcount = mysql_num_rows($Erg3);
   
   echo "Folgende Engelschichten sind noch nicht vergeben.\n";
-	echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:<br>\n";
+  echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:<br />\n";
   for ($j=0; $j < $rowcount; $j++)
   {
     $TID = mysql_result($Erg3, $j, 0);
     echo "<a href=\"./schichtplan.php?action=engelshiftdel&SID=". $_GET["SID"]. "&TID=$TID\">". 
-			"freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen</a><br>\n";
+      "freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen</a><br />\n";
   }  
-	echo "<br><hr>\n\n\n\n";
+  echo "<br /><hr>\n\n\n\n";
 
   //Ausgabe eingetragener schischten
   $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'";
@@ -166,7 +166,7 @@ case 'change':
   $rowcount = mysql_num_rows($Erg3);
    
   echo "Folgende Engel Sind fuer die Schicht eingetargen.\n";
-	echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:<br>\n";
+  echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:<br />\n";
   echo "<table border=\"1\">\n".
     "<tr class=\"contenttopic\">".
     "<th>nick</th>". 
@@ -186,7 +186,7 @@ case 'change':
     echo "\t</tr>\n";
   } // FOR
 
-	echo "</table><br><hr>\n\n\n\n";
+  echo "</table><br /><hr>\n\n\n\n";
 
   //Nachtragen von Engeln
   echo "Hat ein anderer Engel die Schicht &uuml;bernommen, trage ihn bitte ein:";
@@ -244,7 +244,7 @@ case 'change':
   
   echo "<input type=\"submit\" value=\"eintragen...\">\n";
   
-	echo "<br>\n<input value=\"1\" type=\"text\" size=\"5\" name=\"eAnzahlNew\"> Anzahl New\n";
+  echo "<br />\n<input value=\"1\" type=\"text\" size=\"5\" name=\"eAnzahlNew\"> Anzahl New\n";
   
   echo "</form>";
 
@@ -271,31 +271,31 @@ case 'engeladd':
                 "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ".
               "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')";
     }
-		echo "Es wird folgende Schicht zus&auml;tzlich eingetragen:<br>\n";
+    echo "Es wird folgende Schicht zus&auml;tzlich eingetragen:<br />\n";
-		echo "Engel: ".UID2Nick($_GET["UIDs"])."<br>\n";
+    echo "Engel: ".UID2Nick($_GET["UIDs"])."<br />\n";
-		echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."<br>\n<br>\n";
+    echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."<br />\n<br />\n";
   }
   else
   {
-		echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zus&auml;tzlich eingetragen:<br>\n";
+    echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zus&auml;tzlich eingetragen:<br />\n";
     for( $i=0; $i<$_GET["eAnzahlNew"]; $i++)
     {
-			echo "$i. <br>\n";
+      echo "$i. <br />\n";
       $SQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (";
       $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)";
       $ERG = mysql_query($SQL, $con);
-			if( $DEBUG ) 
+      if( $debug ) 
-				echo "DEBUG SQL: $SQL<br>\n";
+        echo "DEBUG SQL: $SQL<br />\n";
       if ($ERG == 1) 
       {
-			     	echo "&Auml;nderung wurde gesichert...<br>";
+             echo "&Auml;nderung wurde gesichert...<br />";
       }
       else 
       {
-				echo "Fehler beim speichern... bitte noch ein mal probieren :)<br>";
+        echo "Fehler beim speichern... bitte noch ein mal probieren :)<br />";
         echo mysql_error($con);
       }
-			echo "Es wird eine weitere Schicht eingetragen:<br><br>\n";
+      echo "Es wird eine weitere Schicht eingetragen:<br /><br />\n";
     }
   }
   break;
@@ -353,10 +353,10 @@ case 'deleteShifs':
     {
       echo "Shifts $v wird gelöscht...";
       executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1");
-			echo "<br>\n";
+      echo "<br />\n";
       echo "ShiftEntry $v wird gelöscht...";
       executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'");
-			echo "<br><br>\n";
+      echo "<br /><br />\n";
     }
   break;
 
@@ -366,24 +366,24 @@ if (IsSet($chSQL)){
 //     echo $chSQL;
   // hier muesste das SQL ausgefuehrt werden...
   $Erg = mysql_query($chSQL, $con);
-	if( $DEBUG ) 
+  if( $debug ) 
-		echo "DEBUG SQL: $chSQL<br>\n";
+    echo "DEBUG SQL: $chSQL<br />\n";
   if ($Erg == 1) 
   {
-	     	echo "&Auml;nderung wurde gesichert...<br>";
+         echo "&Auml;nderung wurde gesichert...<br />";
-		if( $DEBUG ) 
+    if( $debug ) 
-			echo "DEBUG: ergebniss". $Erg. "<br>\n";
+      echo "DEBUG: ergebniss". $Erg. "<br />\n";
     if (IsSet($ch2SQL))
     {
       $Erg = mysql_query($ch2SQL, $con);
-			if( $DEBUG ) 
+      if( $debug ) 
-				echo "DEBUG SQL: $ch2SQL<br>\n";
+        echo "DEBUG SQL: $ch2SQL<br />\n";
-			if( $DEBUG ) echo "DEBUG: ergebniss". $Erg. "<br>\n";
+      if( $debug ) echo "DEBUG: ergebniss". $Erg. "<br />\n";
     }
   }
   else 
   {
-		echo "Fehler beim speichern... bitte noch ein mal probieren :)<br>";
+    echo "Fehler beim speichern... bitte noch ein mal probieren :)<br />";
     echo mysql_error($con);
   }
 } // Ende Update

www-ssl/admin/schichtplan_druck.php

@@ -11,9 +11,9 @@ if (!IsSet($_GET["action"]))
   include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
   include ("../../../camp2011/includes/funktion_schichtplan.php");
 
-	echo "Hallo ". $_SESSION['Nick']. "<br>\n".
+  echo "Hallo ". $_SESSION['Nick']. "<br />\n".
     "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. W&auml;hle hierf&uuml;r ein Datum und den Raum:\n".
-		"<br>\n";
+    "<br />\n";
   
   foreach( $VeranstaltungsTage as $k => $v)
   {
@@ -24,11 +24,11 @@ if (!IsSet($_GET["action"]))
       $Tag = $VeranstaltungsTage[$k];
       $RID = mysql_result($res,$i,"RID");
       $Rname = mysql_result($res, $i, "Name");
-			echo "\t<a href=\"./schichtplan_druck.php?action=1&Raum=$RID&ausdatum=$Tag\" target=\"_blank\">$Tag $Rname</a><br>\n";
+      echo "\t<a href=\"./schichtplan_druck.php?action=1&Raum=$RID&ausdatum=$Tag\" target=\"_blank\">$Tag $Rname</a><br />\n";
     }
-		echo "<br>\n";
+    echo "<br />\n";
   }
-	echo "<br><br>";
+  echo "<br /><br />";
   
   include ("../../../camp2011/includes/footer.php");
 } 
@@ -70,11 +70,11 @@ else 	//#################################################################
   <tr>
     <td width="250" align="left">
       <span style="font-weight:bold;font-size:100%">Datum:</span> 
-			<span style="font-weight:bold;font-size:200%"><?PHP echo $ausdatum; ?></span>
+      <span style="font-weight:bold;font-size:200%"><?php echo $ausdatum; ?></span>
     </td>
     <td width="350" align="right">
       <span style="font-weight:bold;font-size:100%">Raum:</span>
-			<span style="font-weight:bold;font-size:200%"><?PHP echo $RoomID[$Raum]; ?> </span>
+      <span style="font-weight:bold;font-size:200%"><?php echo $RoomID[$Raum]; ?> </span>
     </td>
   </tr>
 </table>
@@ -87,7 +87,7 @@ else 	//#################################################################
     <th bgcolor="#E0E0E0">Uhrzeit</th>
     <th bgcolor="#E0E0E0">Schichtplanbelegung</th>
   </tr>
-<?PHP
+<?php
 
 //Zeit Ausgeben
 for( $i = 0; $i < 24; $i++ )

www-ssl/admin/shiftadd.php

@@ -6,7 +6,7 @@ include ("../../../camp2011/includes/header.php");
 
 $Time = time()+3600+3600;
 
-echo "Hallo ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo ".$_SESSION['Nick'].",<br />\n";
 
 // erstellt ein Array der Reume
   $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`";
@@ -70,16 +70,16 @@ Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende d
 &Uuml;ber die L&auml;nge der Schichten errechnet sich dadurch die Anzahl dieser. Dadurch k&ouml;nnen gleich
 mehrere Schichten auf einmal erfasst werden:
 
-<form action="<?PHP echo $_SERVER['SCRIPT_NAME']; ?>" >
+<form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" >
   <table>
   <tr>
     <td align="right">Name:</td>
-    <td><input type="text" name="SchichtName" size="50" value="<?PHP echo $_SESSION["shiftadd.php"]["SchichtName"]; ?>"></td>
+    <td><input type="text" name="SchichtName" size="50" value="<?php echo $_SESSION["shiftadd.php"]["SchichtName"]; ?>"></td>
   </tr>
   <tr>
     <td align="right">Ort:</td>
     <td><select name="RID">
-<?PHP
+<?php
   foreach ($Room As $RTemp)
   {
     echo "\t<option value=\"". $RTemp["RID"]. "\"";
@@ -94,43 +94,43 @@ mehrere Schichten auf einmal erfasst werden:
   <tr><td><u>Zeit:</u></td></tr>
   <tr>
     <td align="right">Month.Jahr:</td>
-    <td><input type="ext" name="MonthJahr" size="7" value="<?PHP echo $_SESSION["shiftadd.php"]["MonthJahr"]; ?>"></td>
+    <td><input type="ext" name="MonthJahr" size="7" value="<?php echo $_SESSION["shiftadd.php"]["MonthJahr"]; ?>"></td>
   </tr>
   <tr>
     <td align="right">Beginn:</td>
-    <td>Date<input type="text" name="SDatum" size="5" value="<?PHP echo $_SESSION["shiftadd.php"]["SDatum"]; ?>">
+    <td>Date<input type="text" name="SDatum" size="5" value="<?php echo $_SESSION["shiftadd.php"]["SDatum"]; ?>">
-        Time<input type="text" name="STime" size="5" value="<?PHP echo $_SESSION["shiftadd.php"]["STime"]; ?>"></td>
+        Time<input type="text" name="STime" size="5" value="<?php echo $_SESSION["shiftadd.php"]["STime"]; ?>"></td>
   </tr>
   <tr>
     <td align="right">More then One</td>
-    <td><input type="checkbox" name="MoreThenOne" value="ON" <?PHP 
+    <td><input type="checkbox" name="MoreThenOne" value="ON" <?php 
      if( $_SESSION["shiftadd.php"]["MoreThenOne"]=="ON")
     echo " CHECKED";
   ?>></td>
   </tr>
   <tr>
     <td align="right">End:</td>
-    <td>Date<input type="text" name="EDatum" size="5" value="<?PHP echo $_SESSION["shiftadd.php"]["EDatum"]; ?>">
+    <td>Date<input type="text" name="EDatum" size="5" value="<?php echo $_SESSION["shiftadd.php"]["EDatum"]; ?>">
-        Time<input type="text" name="ETime" size="5" value="<?PHP echo $_SESSION["shiftadd.php"]["ETime"]; ?>"></td>
+        Time<input type="text" name="ETime" size="5" value="<?php echo $_SESSION["shiftadd.php"]["ETime"]; ?>"></td>
   </tr>
   <tr>
     <td align="right">L&auml;nge in h:</td>
-    <td><input type="text" name="len" size="5" value="<?PHP echo $_SESSION["shiftadd.php"]["len"]; ?>"></td>
+    <td><input type="text" name="len" size="5" value="<?php echo $_SESSION["shiftadd.php"]["len"]; ?>"></td>
   </tr>
   <tr>
     <td align="right">Sonderschichten ein:</td>
-    <td><input type="checkbox" name="NachtON" value="ON" <?PHP 
+    <td><input type="checkbox" name="NachtON" value="ON" <?php 
       if($_SESSION["shiftadd.php"]["NachtON"]=="ON")
     echo " CHECKED";
   ?>></td>
   </tr>
   <tr>
     <td align="right">Sonder in h (Time;Time):</td>
-    <td><input type="text" name="len_night" size="50" value="<?PHP echo $_SESSION["shiftadd.php"]["len_night"]; ?>"></td>
+    <td><input type="text" name="len_night" size="50" value="<?php echo $_SESSION["shiftadd.php"]["len_night"]; ?>"></td>
   </tr>
   
   <tr><td><u>Anzahl Engel je Type:</u></td></tr>
-<?PHP
+<?php
   foreach ($EngelType As $TTemp)
   {
     echo "  <tr><td align=\"right\">". $TTemp["Name"]. ":</td>\n";
@@ -143,13 +143,13 @@ mehrere Schichten auf einmal erfasst werden:
   }
 ?>
 </table>
- <br>
+ <br />
 <input type="hidden" name="OnlyShow" value="ON">
 <input type="hidden" name="action" value="newsave">
 <input type="submit" value="zeig mal Gabriel!">
 </form>
 
-<?PHP
+<?php
   break; // Ende new
 
 case 'newsave':
@@ -258,7 +258,7 @@ case 'engeldel':
 
 function CreateNewEntry() 
 {
-	global $con, $_DateS, $_DateE, $EngelType, $DEBUG;
+  global $con, $_DateS, $_DateE, $EngelType, $debug;
   foreach ($EngelType As $TTemp)
   {
     $Temp = "EngelType".$TTemp["TID"];
@@ -293,10 +293,10 @@ function CreateNewEntry()
     $SQL .= "'". $_GET["SchichtName"]. "');";
     $Erg = db_query($SQL, "create shift");
 
-		$SQLFail = "\n\t<br>[".$SQL. "]";
+    $SQLFail = "\n\t<br />[".$SQL. "]";
 
     if ($Erg == 1) echo "\t<td>pass</td>\n";
-		else           echo "\t<td>fail <br>\n<u>". mysql_error($con). "</u>$SQLFail</td>\n";
+    else           echo "\t<td>fail <br />\n<u>". mysql_error($con). "</u>$SQLFail</td>\n";
 
   } else
     echo "\t<td>only show</td>\n";
@@ -326,7 +326,7 @@ function CreateNewEntry()
     if( $_GET[$Temp] > 0 )
     {
       $i = 0;
-			echo $_GET[$Temp]. " ".$TTemp["Name"]. "<br>\t";
+      echo $_GET[$Temp]. " ".$TTemp["Name"]. "<br />\t";
       while( $i++ < $_GET[$Temp] )
       {
         if( $_GET["OnlyShow"] == "OFF" )
@@ -337,7 +337,7 @@ function CreateNewEntry()
 
           $Erg = mysql_query($SQL, $con);
 
-					if( $DEBUG ) $SQLFail = "\n\t<br>[".$SQL. "]";
+          if( $debug ) $SQLFail = "\n\t<br />[".$SQL. "]";
 
           if ($Erg == 1) echo "'pass' ";
           else           echo "'fail' <u>". mysql_error($con). "</u>$SQLFail</td>\n";
@@ -346,7 +346,7 @@ function CreateNewEntry()
         else
           echo "+";
       }
-			echo "<br>";
+      echo "<br />";
     } // IF $$TEMP
   } // FOREACH
   echo "</td>";

www-ssl/admin/sprache.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Sprache";
 $header = "Liste der existierenden Sprcheintr&auml;ge";
@@ -7,8 +7,8 @@ include ("../../../camp2011/includes/header.php");
 
 if( !isset( $_GET["TextID"] )  )
 {
-	echo Get_Text("Hello").$_SESSION['Nick'].", <br>\n";
+  echo Get_Text("Hello").$_SESSION['Nick'].", <br />\n";
-	echo Get_Text("pub_sprache_text1")."<br><br>\n";
+  echo Get_Text("pub_sprache_text1")."<br /><br />\n";
 
   echo "<a href=\"?ShowEntry=y\">". Get_Text("pub_sprache_ShowEntry"). "</a>";
   // ausgabe Tabellenueberschift
@@ -80,7 +80,7 @@ if( !isset( $_GET["TextID"] )  )
 } /*if( !isset( $TextID )  )*/
 else
 {
-	echo "edit: ". $_GET["TextID"]. "<br><br>";
+  echo "edit: ". $_GET["TextID"]. "<br /><br />";
   foreach ($_GET as $k => $v) {
     if( $k != "TextID" ) 
     {
@@ -92,26 +92,26 @@ else
       {
         $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ".
           "VALUES ('". $_GET["TextID"]. "', '$k', '$v')";
-				  echo $sql_save."<br>";
+          echo $sql_save."<br />";
               $Erg = mysql_query($sql_save, $con);
               if ($Erg == 1)
-			                echo "\t $k Save: OK<br>\n";
+                      echo "\t $k Save: OK<br />\n";
               else
-		        	        echo "\t $k Save: KO<br>\n";
+                      echo "\t $k Save: KO<br />\n";
       }
       else if( mysql_result($erg_test, 0, "Text")!=$v )
       {
         $sql_save = "UPDATE `Sprache` SET `Text`='$v' ".
           "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' ";
-				  echo $sql_save."<br>";
+          echo $sql_save."<br />";
               $Erg = mysql_query($sql_save, $con);
               if ($Erg == 1)
-			                echo "\t $k Update: OK<br>\n";
+                      echo "\t $k Update: OK<br />\n";
               else
-		        	        echo "\t $k Update: KO<br>\n";
+                      echo "\t $k Update: KO<br />\n";
       }
       else
-				echo "\t $k no changes<br>\n";
+        echo "\t $k no changes<br />\n";
     }
   }
      

www-ssl/admin/tshirt.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "T-Shirt-Ausgabe";
 $header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
@@ -12,18 +12,18 @@ If (IsSet($_GET["aktiv"])) {
   $Erg = mysql_query($SQL, $con);
         if ($Erg == 1) {
         } else {
-           echo "Fehler beim speichern bei Engel ". UID2Nick($_GET["aktive"]). "<br>";
+           echo "Fehler beim speichern bei Engel ". UID2Nick($_GET["aktive"]). "<br />";
         }
 }
 
 ?>
 
-&Uuml;ber die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.<br>
+&Uuml;ber die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.<br />
-Hinter diesem erscheint ein Link, &uuml;ber den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.<br><br>
+Hinter diesem erscheint ein Link, &uuml;ber den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.<br /><br />
 
 Liste aller aktiven Engel:
 
-<?PHP
+<?php
 $SQL = "SELECT * FROM `User` WHERE (`Aktiv`='1') ORDER BY `Nick` ASC"; 
 $Erg = mysql_query($SQL, $con);
 
@@ -36,7 +36,7 @@ $rowcount = mysql_num_rows($Erg);
    <td>Gr&ouml;sse</td>
    <td>T-Shirt ausgeben:</td>
   </td>
-<?PHP
+<?php
 for ($i=0; $i<$rowcount; $i++){
   echo "\t<tr class=\"content\">\n";
     $eUID=mysql_result($Erg, $i, "UID");

www-ssl/admin/user.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -9,7 +9,7 @@ if (!IsSet($_GET["enterUID"]))
 {
   // Userliste, keine UID uebergeben...
 
-	echo "<a href=\"../makeuser.php\">Neuen Engel eintragen</a><br><br>\n";
+  echo "<a href=\"../makeuser.php\">Neuen Engel eintragen</a><br /><br />\n";
   
   if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick";
   $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ".
@@ -22,69 +22,69 @@ if (!IsSet($_GET["enterUID"]))
   // anzahl zeilen
   $Zeilen  = mysql_num_rows($Erg);
 
-	echo "Anzahl Engel: $Zeilen<br><br>\n";
+  echo "Anzahl Engel: $Zeilen<br /><br />\n";
 
   ?><table width="100%" class="border" cellpadding="2" cellspacing="1"> 
   <tr class="contenttopic">
     <td>
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Nick">Nick</a> |
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Nick">Nick</a> |
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=CreateDate">CreateDate</a>
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=CreateDate">CreateDate</a>
     </td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Name">Name</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Name">Name</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Vorname">Vorname</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Vorname">Vorname</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Alter">Alter</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Alter">Alter</a></td>
     <td>
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=email">@</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=email">@</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=DECT">DECT</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=DECT">DECT</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Hometown">Hometown</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Hometown">Hometown</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=lastLogIn">lastLogIn</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=lastLogIn">lastLogIn</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Art">Type</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Art">Type</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=ICQ">ICQ</a> |
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=ICQ">ICQ</a> |
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=jabber">jabber</a> |
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=jabber">jabber</a> |
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Group">Group</a> 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Group">Group</a> 
     </td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Size">Gr&ouml;&szlig;e</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Size">Gr&ouml;&szlig;e</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Gekommen">G</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Gekommen">G</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Aktiv">A</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Aktiv">A</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Tshirt">T</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Tshirt">T</a></td>
     <td>&Auml;nd.</td>
     <td>Secure</td>
   </tr>
 
 
-	<?PHP
+  <?php
   $Gekommen = 0;
   $Active = 0;
   $Tshirt = 0;
   
   for ($n = 0 ; $n < $Zeilen ; $n++) {
     echo "<tr class=\"content\">\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Nick"). "<br>(Create: ". mysql_result($Erg, $n, "CreateDate"). ")</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Nick"). "<br />(Create: ". mysql_result($Erg, $n, "CreateDate"). ")</td>\n";
     echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
     echo "\t<td>".mysql_result($Erg, $n, "Vorname")."</td>\n";
     echo "\t<td>".mysql_result($Erg, $n, "Alter")."</td>\n";
     echo "\t<td>";
       if( strlen( mysql_result($Erg, $n, "Telefon"))>0)
-				echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "<br>";
+        echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "<br />";
       if( strlen( mysql_result($Erg, $n, "Handy"))>0)
-				echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "<br>";
+        echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "<br />";
       if( strlen( mysql_result($Erg, $n, "DECT"))>0)
         echo "\n\t\tDECT: <a href=\"./dect.php?custum=". mysql_result($Erg, $n, "DECT"). "\">".
-					mysql_result($Erg, $n, "DECT"). "</a><br>";
+          mysql_result($Erg, $n, "DECT"). "</a><br />";
       if( strlen( mysql_result($Erg, $n, "email"))>0)
         echo "\n\t\temail: <a href=\"mailto:".mysql_result($Erg, $n, "email")."\">".
-					mysql_result($Erg, $n, "email")."</a><br>";
+          mysql_result($Erg, $n, "email")."</a><br />";
       if( strlen( mysql_result($Erg, $n, "Hometown"))>0)
-				echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "<br>";
+        echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "<br />";
       if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0)
-				echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "<br>";
+        echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "<br />";
       if( strlen( mysql_result($Erg, $n, "Art"))>0)
-				echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "<br>";
+        echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "<br />";
       if( strlen( mysql_result($Erg, $n, "ICQ"))>0)
-				echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "<br>";
+        echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "<br />";
       if( strlen( mysql_result($Erg, $n, "jabber"))>0)
-				echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "<br>";
+        echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "<br />";
-			echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "<br>";
+      echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "<br />";
       echo "</td>\n";
     echo "\t<td>".mysql_result($Erg, $n, "Size")."</td>\n";
     $Gekommen += mysql_result($Erg, $n, "Gekommen");
@@ -115,12 +115,12 @@ if (!IsSet($_GET["enterUID"]))
   funktion_db_element_list_2row( "Hometown",
                                   "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
 
-	echo "<br>\n";
+  echo "<br />\n";
 
   funktion_db_element_list_2row( "Engeltypen",
                                         "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
 
-	echo "<br>\n";
+  echo "<br />\n";
 
   funktion_db_element_list_2row( "Used Groups",
     "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ".

www-ssl/admin/userArrived.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Engel Arrived";
 $header = "Engel was arrived";
@@ -17,8 +17,8 @@ If (IsSet($_GET["arrived"])) {
         }
 }
 
-echo Get_Text("pri_userArrived_Text1"). "<br>";
+echo Get_Text("pri_userArrived_Text1"). "<br />";
-echo Get_Text("pri_userArrived_Text2"). "<br><br>";
+echo Get_Text("pri_userArrived_Text2"). "<br /><br />";
 
 echo Get_Text("pri_userArrived_TableToppic");
 $SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC"; 

www-ssl/admin/userChangeNormal.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -9,12 +9,12 @@ if (IsSet($_GET["enterUID"]))
 { 
   // UserID wurde mit uebergeben --> Aendern...
 
-	echo "Hallo,<br>".
+  echo "Hallo,<br />".
      "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
     "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
     "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ".
     "Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel ".
-		"bereits sein T-Shirt erhalten hat.<br><br>\n";
+    "bereits sein T-Shirt erhalten hat.<br /><br />\n";
 
   echo "<form action=\"./userSaveNormal.php?action=change\" method=\"POST\">\n";
   echo "<table border=\"0\">\n";
@@ -114,7 +114,7 @@ if (IsSet($_GET["enterUID"]))
   }
 
   echo "</td></tr>\n";
-	echo "</table>\n<br>\n";
+  echo "</table>\n<br />\n";
   echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
   echo "<input type=\"submit\" value=\"sichern...\">\n";
   echo "</form>";

www-ssl/admin/userChangeSecure.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -9,12 +9,12 @@ if (IsSet($_GET["enterUID"]))
 { 
   // UserID wurde mit uebergeben --> Aendern...
 
-	echo "Hallo,<br>".
+  echo "Hallo,<br />".
      "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
     "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
     "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ".
     "Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel ".
-		"bereits sein T-Shirt erhalten hat.<br><br>\n";
+    "bereits sein T-Shirt erhalten hat.<br /><br />\n";
 
 
   $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'";
@@ -40,7 +40,7 @@ if (IsSet($_GET["enterUID"]))
     echo "<form action=\"./userSaveSecure.php?action=change\" method=\"POST\">\n";
     echo "<table border=\"0\">\n";
     echo "<input type=\"hidden\" name=\"Type\" value=\"Secure\">\n";
-		echo "  <tr><td><br><u>Rights of \"". UID2Nick($_GET["enterUID"]). "\":</u></td></tr>\n";
+    echo "  <tr><td><br /><u>Rights of \"". UID2Nick($_GET["enterUID"]). "\":</u></td></tr>\n";
 
 
     $CVS_Data = mysql_fetch_array($Erg_CVS);
@@ -94,12 +94,12 @@ if (IsSet($_GET["enterUID"]))
     
     // Ende Formular
     echo "</td></tr>\n";
-		echo "</table>\n<br>\n";
+    echo "</table>\n<br />\n";
     echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
     echo "<input type=\"submit\" value=\"sichern...\">\n";
     echo "</form>";
 
-		echo "<br><form action=\"./userSaveSecure.php?action=delete\" method=\"POST\">\n";
+    echo "<br /><form action=\"./userSaveSecure.php?action=delete\" method=\"POST\">\n";
     echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
     echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
     echo "</form>";

www-ssl/admin/userDefaultSetting.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Defalut User Setting";
 $header = "Defalut User Setting";
@@ -6,7 +6,7 @@ include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "Hallo ".$_SESSION['Nick'].
-	",<br>\nhier hast du die M&ouml;glichkeit, die Defaulteinstellungen f&uuml;r neue User einzustellen:<br><br>\n";
+  ",<br />\nhier hast du die M&ouml;glichkeit, die Defaulteinstellungen f&uuml;r neue User einzustellen:<br /><br />\n";
         
 echo "<table border=\"0\" class=\"border\">\n";
 echo "\t<tr class=\"contenttopic\">\n";
@@ -25,7 +25,7 @@ if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"]))
         echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
       else
         echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
       break;
     case "Del":
       echo "\t<tr class=\"content\">\n";
@@ -43,7 +43,7 @@ if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"]))
         echo "<H2>Delete ".$_GET["Field"]. " succesfull</h2>\n";
       else
         echo "<H2>Delete ".$_GET["Field"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
       break;
     case "SetForAllUser":
       $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0";
@@ -52,7 +52,7 @@ if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"]))
         echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull</h2>\n";
       else
         echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
     case "Save":
       $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ".
         "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'";
@@ -61,7 +61,7 @@ if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"]))
         echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
       else
         echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
       break;
   } //SWITCH
 } //IF(

www-ssl/admin/userSaveNormal.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Index";
@@ -10,7 +10,7 @@ include ("../../../camp2011/includes/funktion_db.php");
 if (IsSet($_GET["action"])) 
 {
   SetHeaderGo2Back();
-	echo "Gesendeter Befehl: ". $_GET["action"]. "<br>";
+  echo "Gesendeter Befehl: ". $_GET["action"]. "<br />";
 
   switch ($_GET["action"]) 
   {
@@ -62,7 +62,7 @@ if (IsSet($_GET["action"]))
         echo "Fehler beim speichern...\n(". mysql_error($con). ")";
       }
       
-			echo "<br>\ndelate UserCVS...";
+      echo "<br />\ndelate UserCVS...";
       $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
       $Erg = db_query($SQL2, "User CVS delete");
       if ($Erg == 1) {
@@ -71,7 +71,7 @@ if (IsSet($_GET["action"]))
         echo "Fehler beim speichern...\n(". mysql_error($con). ")";
       }
       
-			echo "<br>\ndelate UserEntry...";
+      echo "<br />\ndelate UserEntry...";
       $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
           "WHERE `UID`='". $_POST["enterUID"]. "';";
       $Erg = db_query($SQL3, "delate UserEntry");
@@ -90,7 +90,7 @@ if (IsSet($_GET["action"]))
     $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'";
     $Erg = mysql_query($USQL, $con);
     echo mysql_result($Erg, 0, "Nick");
-		echo "</b> eingeben:<br>";
+    echo "</b> eingeben:<br />";
     echo "<form action=\"./userSaveNormal.php?action=newpwsave\" method=\"POST\">\n";  
     echo "<input type=\"Password\" name=\"ePasswort\">";
     echo "<input type=\"Password\" name=\"ePasswort2\">";
@@ -122,7 +122,7 @@ if (IsSet($_GET["action"]))
 else 
 {
   // kein Action gesetzt -> abbruch
-	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
+  echo "Unzul&auml;ssiger Aufruf.<br />Bitte neu editieren...";
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/userSaveSecure.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Index";
@@ -19,7 +19,7 @@ if( !IsSet($_POST["enterUID"]) )
 if ( ($Right=="Y") && IsSet($_GET["action"])) 
 {
   SetHeaderGo2Back();
-	echo "Gesendeter Befehl: ". $_GET["action"]. "<br>";
+  echo "Gesendeter Befehl: ". $_GET["action"]. "<br />";
   
   switch ($_GET["action"]) 
   {
@@ -50,7 +50,7 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
         }
         $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 );
         $SQL2.= "  WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-				echo "<br>Secure-";
+        echo "<br />Secure-";
         $Erg = db_query($SQL2, "change user CVS");
         if ($Erg == 1) {
           echo "&Auml;nderung wurde gesichert...\n";
@@ -92,7 +92,7 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
         echo "Fehler beim speichern...\n(". mysql_error($con). ")";
       }
       
-			echo "<br>\ndelate UserCVS...";
+      echo "<br />\ndelate UserCVS...";
       $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
       $Erg = db_query($SQL2, "User CVS delete");
       if ($Erg == 1) {
@@ -101,7 +101,7 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
         echo "Fehler beim speichern...\n(". mysql_error($con). ")";
       }
       
-			echo "<br>\ndelate UserEntry...";
+      echo "<br />\ndelate UserEntry...";
       $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
           "WHERE `UID`='". $_POST["enterUID"]. "';";
       $Erg = db_query($SQL3, "delate UserEntry");
@@ -120,7 +120,7 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
         echo "Fehler beim speichern...\n(". mysql_error($con). ")";
       }
       
-			echo "<br>\ndelate UserCVS...";
+      echo "<br />\ndelate UserCVS...";
       $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
       $Erg = db_query($SQL2, "User CVS delete");
       if ($Erg == 1) {
@@ -135,7 +135,7 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
 
 // ende - Action ist gesetzt 
 } elseif ( IsSet($_GET["new"]) &&  ($_SESSION['CVS']["admin/group.php"]=="Y") ) {
-	echo "Gesendeter Befehl: ". $_GET["new"]. "<br>";
+  echo "Gesendeter Befehl: ". $_GET["new"]. "<br />";
   
   switch ($_GET["new"]) 
   {
@@ -148,14 +148,14 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
       $NewId = mysql_result( $Erg, 0, 0)-1;
       $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );";
       $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );";
-			echo "\t<br>Generate new UserGroup ...\n";
+      echo "\t<br />Generate new UserGroup ...\n";
       $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry");
       if ($ErgNew1 == 1) 
       {
-				echo "\t<br>Generate new User rights...\n";
+        echo "\t<br />Generate new User rights...\n";
         $ErgNew2 = db_query($SQLnew2, "UserCVS Entry");
         if ($ErgNew1 == 1) {
-					echo "\t<br>New group was created.\n";
+          echo "\t<br />New group was created.\n";
         } else {
           echo "Error on creation\n(". mysql_error($con). ")";
         }
@@ -170,7 +170,7 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
   }
 } else {
   // kein Action gesetzt -> abbruch
-	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
+  echo "Unzul&auml;ssiger Aufruf.<br />Bitte neu editieren...";
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/faq.php

@@ -1,22 +1,22 @@
 <?php
   $title = "Index";
   $header = "FAQ";
-include ("../../camp2011/includes/header.php");
+  include "../../camp2011/includes/header.php";
-
 
   $SQL = "SELECT * FROM `FAQ`";
   $Erg = mysql_query($SQL, $con);
 
-// anzahl zeilen
+  // anzahl Zeilen
   $Zeilen  = mysql_num_rows($Erg);
 
   for ($n = 0; $n < $Zeilen; $n++) {
     if (mysql_result($Erg, $n, "Antwort") != "") {
-    echo "<p class='question'>".mysql_result($Erg, $n, "Frage")."</p>";
+      echo "<dl>";
-    echo "<p class='answetion'>".mysql_result($Erg, $n, "Antwort")."</p>";
+      echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
+      echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
+      echo "</dl>";
     }
   }
 
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-

www-ssl/index.php

@@ -1,19 +1,15 @@
 <?php
   $title = "Index";
   $header = "Index";
-include ("../../camp2011/includes/header.php");
+  include "../../camp2011/includes/header.php";
 
-echo Get_Text("index_text1")."<br><br>";
+  echo "<p>" . Get_Text("index_text1") . "</p>\n";
-echo Get_Text("index_text2")."<br>";
+  echo "<p>" . Get_Text("index_text2") . "</p>\n";
-echo Get_Text("index_text3")."<br>";
+  echo "<p>" . Get_Text("index_text3") . "</p>\n";
 
-include ("../../camp2011/includes/login_eingabefeld.php");
+  include "../../camp2011/includes/login_eingabefeld.php";
 
   echo "<h6>" . Get_Text("index_text4") . "</h6>";
 
-//echo Get_Text("index_text5"). "<br>". $show_SSLCERT;
+  include "../../camp2011/includes/footer.php";
-
-include ("../../camp2011/includes/footer.php");
 ?>
-
-

www-ssl/lageplan.php

@@ -1,11 +1,10 @@
 <?php
   $title = "Index";
   $header = "Lageplan";
-include ("../../camp2011/includes/header.php");
+  include "../../camp2011/includes/header.php";
 
   echo "<p>" . Get_Text("lageplan_text1") . "</p>";
-echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>.";
+  echo "<p><img src=\"./pic/lageplan/lageplan.jpg\" alt=\"\" />";
 
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-

www-ssl/logout.php

@@ -1,13 +1,12 @@
 <?php
-include ("../../camp2011/includes/config.php");
+  include "../../camp2011/includes/config.php";
 
   // Die Session zerstoeren...
   session_start();
   session_destroy ();
-// und eine neue erstellen, damit kein Erzengelmenü angezeigt wird (falls sich ein Erzengel abmeldet...)
+  // und eine neue erstellen, damit kein Erzengelmenue angezeigt wird (falls sich ein Erzengel abmeldet...)
   session_start();
 
   header("HTTP/1.1 302 Moved Temporarily");
   header("Location: " . $url . $ENGEL_ROOT);
-
 ?>

www-ssl/makeuser.php

@@ -1,49 +1,36 @@
-<?PHP
+<?php
   $title = "Anmeldung zum Chaos-Engel";
   $header = "";
   $success = "none";
-include ("../../camp2011/includes/config.php");
-include ("../../camp2011/includes/header.php");
-include ("../../camp2011/includes/config_db.php");
-include ("../../camp2011/includes/crypt.php");
 
+  include "../../camp2011/includes/config.php";
+  include "../../camp2011/includes/header.php";
+  include "../../camp2011/includes/config_db.php";
+  include "../../camp2011/includes/crypt.php";
 
-if( isset($_POST["send"]))
+  if(isset($_POST["send"])) {
-{
     $eNick = trim($_POST["Nick"]);
-	if( $_POST["Alter"]=="")	$_POST["Alter"] = 0;
+
+    if($_POST["Alter"] == "")
+      $_POST["Alter"] = 0;
 
     // user vorhanden?
     $SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'";
     $Ergans = mysql_query($SQLans, $con);
 
     if(strlen($_POST["Nick"]) < 2)
-	{
       $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
-	} 
     elseif(mysql_num_rows( $Ergans) > 0)
-	{
       $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3");
-	}
+    elseif(strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false)
-	elseif( strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && 
-		strstr($_POST["email"], ".") == FALSE ) 
-	{
       $error = Get_Text("makeuser_error_mail");
-	} 
     elseif(!is_numeric($_POST["Alter"]))
-	{
       $error = Get_Text("makeuser_error_Alter");
-	}
     elseif($_POST["Passwort"] != $_POST["Passwort2"])
-	{
       $error = Get_Text("makeuser_error_password1");
-	} 
     elseif(strlen($_POST["Passwort"]) < 6)
-	{
       $error = Get_Text("makeuser_error_password2");
-	} 
+    else {
-	else 
-	{
       $_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
       unset($_POST["Passwort2"]);
 
@@ -67,13 +54,10 @@ if( isset($_POST["send"]))
              "'". $_POST["Hometown"]. "',".    "NOW());";
       $Erg = mysql_query($SQL, $con);
 
-		if ($Erg != 1)
+      if ($Erg != 1) {
-		{
+        echo Get_Text("makeuser_error_write1") . "<br />\n";
-			echo Get_Text("makeuser_error_write1"). "<br>\n";
         $error = mysql_error($con);
-		}
+      } else {
-		else
-		{
         echo "<p class=\"important\">" . Get_Text("makeuser_writeOK") . "\n";
 
         $SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "';";
@@ -82,37 +66,31 @@ if( isset($_POST["send"]))
 
         $SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('" . $Data["UID"] . "');";
         $Erg3 = mysql_query($SQL3, $con);
-			if ($Erg3 != 1)
+
-			{
+        if ($Erg3 != 1) {
-				echo "<h1>". Get_Text("makeuser_error_write2"). "<br>\n";
+          echo "<h1>". Get_Text("makeuser_error_write2"). "<br />\n";
           $error = mysql_error($con);
-			}
+        } else {
-			else
+          echo Get_Text("makeuser_writeOK2") . "<br />\n";
-			{
-				echo Get_Text("makeuser_writeOK2"). "<br>\n";
           echo "<h1>" . Get_Text("makeuser_writeOK3") . "</h1>\n";
         }
-			echo Get_Text("makeuser_writeOK4"). "</p><p></p>\n<br><br>\n";
+
+        echo Get_Text("makeuser_writeOK4") . "</p><p></p>\n<br /><br />\n";
         $success = "any";
 
-			if ( isset($SubscribeMailinglist) )
+        if (isset($SubscribeMailinglist)) {
-			{
+          if ($_POST["subscribe-mailinglist"] == "") {
-				if ( $_POST["subscribe-mailinglist"] == "")
-				{
             $headers = "From: " . $_POST["email"] . "\r\n" .
                        "X-Mailer: PHP/" . phpversion();
             mail($SubscribeMailinglist, "subject", "message", $headers);
           }
         }
+      }
+    }
 
-		}
+    if(isset($error))
-	}
+      echo "<p class=\"warning\">\n" . $error . "\n</p>\n\n";
-	if( isset($error) ){
+  } else {
-                echo "<p class=\"warning\">\n$error\n</p>\n\n";
-	}
-}
-else
-{
     // init vars
     $_POST["Nick"] = "";
     $_POST["Name"] = "";
@@ -132,83 +110,72 @@ else
   }
 
   if($success == "none") {
-echo "<h1>".Get_Text("makeuser_text0")."</h1>". "<h2>". Get_Text("makeuser_text1"). "</h2>";
+    echo "<h1>" . Get_Text("makeuser_text0") . "</h1>\n";
-echo "\t<form action=\"\" method=\"post\">\n";
+    echo "<h2>" . Get_Text("makeuser_text1") . "</h2>\n";
-echo "\t\t<table>\n";
+    echo "<form action=\"\" method=\"post\">\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Nickname").
+    echo "<table>\n";
-	"*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"". $_POST["Nick"]. "\"></td></tr>\n";
+    echo "<tr><td>" . Get_Text("makeuser_Nickname") . "*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"" . $_POST["Nick"] . "\" /></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Nachname"). 
+    echo "<tr><td>" . Get_Text("makeuser_Nachname") . "</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"" . $_POST["Name"] . "\" /></td></tr>\n";
-	"</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"". $_POST["Name"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Vorname") . "</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"" . $_POST["Vorname"] . "\" /></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Vorname"). 
+    echo "<tr><td>". Get_Text("makeuser_Alter") . "</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></td></tr>\n";
-	"</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"". $_POST["Vorname"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Telefon"). "</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"". $_POST["Telefon"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Alter"). 
+    echo "<tr><td>". Get_Text("makeuser_DECT"). "</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"". $_POST["DECT"]. "\"></td><td>\n";
-	"</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></td></tr>\n";
+    echo "<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Telefon"). 
+    echo "<tr><td>". Get_Text("makeuser_Handy"). "</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"". $_POST["Handy"]. "\"></td></tr>\n";
-	"</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"". $_POST["Telefon"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_E-Mail"). "*</td><td><input type=\"text\" size=\"40\" name=\"email\" value=\"". $_POST["email"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_DECT"). 
+
-	"</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"". $_POST["DECT"]. "\"></td><td>\n";
-echo "\t\t\t<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Handy"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"". $_POST["Handy"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_E-Mail"). 
-	"*</td><td><input type=\"text\" size=\"40\" name=\"email\" value=\"". $_POST["email"]. "\"></td></tr>\n";
     if(isset($SubscribeMailinglist))
-{
+      echo "<tr><td>". Get_Text("makeuser_subscribe-mailinglist"). "</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"". $_POST["subscribe-mailinglist"]. "\">($SubscribeMailinglist)</td></tr>\n";
-	echo "\t\t\t<tr><td>". Get_Text("makeuser_subscribe-mailinglist"). 
+
-		"</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"". $_POST["subscribe-mailinglist"]. "\">($SubscribeMailinglist)</td></tr>\n";
+    echo "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"". $_POST["ICQ"]. "\"></td></tr>\n";
-}
+    echo "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"". $_POST["jabber"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"". $_POST["ICQ"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_T-Shirt"). " Gr&ouml;sse*</td><td align=\"left\">\n";
-echo "\t\t\t<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"". $_POST["jabber"]. "\"></td></tr>\n";
+    echo "<select name=\"Size\">\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_T-Shirt"). 
+    echo "<option value=\"S\"";  if ($_POST["Size"]=="S")   echo " selected";  echo ">S</option>\n";
-	" Gr&ouml;sse*</td><td align=\"left\">\n";
+    echo "<option value=\"M\"";  if ($_POST["Size"]=="M")   echo " selected";  echo ">M</option>\n";
-echo "\t\t\t<select name=\"Size\">\n";
+    echo "<option value=\"L\"";  if ($_POST["Size"]=="L")   echo " selected";  echo ">L</option>\n";
-echo "\t\t\t\t<option value=\"S\"";	if ($_POST["Size"]=="S") 	echo " selected";	echo ">S</option>\n";
+    echo "<option value=\"XL\"";  if ($_POST["Size"]=="XL")   echo " selected";  echo ">XL</option>\n";
-echo "\t\t\t\t<option value=\"M\"";	if ($_POST["Size"]=="M") 	echo " selected";	echo ">M</option>\n";
+    echo "<option value=\"2XL\"";  if ($_POST["Size"]=="2XL")   echo " selected";  echo ">2XL</option>\n";
-echo "\t\t\t\t<option value=\"L\"";	if ($_POST["Size"]=="L") 	echo " selected";	echo ">L</option>\n";
+    echo "<option value=\"3XL\"";  if ($_POST["Size"]=="3XL")   echo " selected";  echo ">3XL</option>\n";
-echo "\t\t\t\t<option value=\"XL\"";	if ($_POST["Size"]=="XL") 	echo " selected";	echo ">XL</option>\n";
+    echo "<option value=\"4XL\"";  if ($_POST["Size"]=="4XL")   echo " selected";  echo ">4XL</option>\n";
-echo "\t\t\t\t<option value=\"2XL\"";	if ($_POST["Size"]=="2XL") 	echo " selected";	echo ">2XL</option>\n";
+    echo "<option value=\"5XL\"";  if ($_POST["Size"]=="5XL")   echo " selected";  echo ">5XL</option>\n";
-echo "\t\t\t\t<option value=\"3XL\"";	if ($_POST["Size"]=="3XL") 	echo " selected";	echo ">3XL</option>\n";
+    echo "<option value=\"S-G\"";  if ($_POST["Size"]=="S-G")   echo " selected";  echo ">S Girl</option>\n";
-echo "\t\t\t\t<option value=\"4XL\"";	if ($_POST["Size"]=="4XL") 	echo " selected";	echo ">4XL</option>\n";
+    echo "<option value=\"M-G\"";  if ($_POST["Size"]=="M-G")   echo " selected";  echo ">M Girl</option>\n";
-echo "\t\t\t\t<option value=\"5XL\"";	if ($_POST["Size"]=="5XL") 	echo " selected";	echo ">5XL</option>\n";
+    echo "<option value=\"L-G\"";  if ($_POST["Size"]=="L-G")   echo " selected";  echo ">L Girl</option>\n";
-echo "\t\t\t\t<option value=\"S-G\"";	if ($_POST["Size"]=="S-G") 	echo " selected";	echo ">S Girl</option>\n";
+    echo "<option value=\"XL-G\"";  if ($_POST["Size"]=="XL-G")   echo " selected";  echo ">XL Girl</option>\n";
-echo "\t\t\t\t<option value=\"M-G\"";	if ($_POST["Size"]=="M-G") 	echo " selected";	echo ">M Girl</option>\n";
+    echo "</select>\n";
-echo "\t\t\t\t<option value=\"L-G\"";	if ($_POST["Size"]=="L-G") 	echo " selected";	echo ">L Girl</option>\n";
+    echo "</td></tr>\n";
-echo "\t\t\t\t<option value=\"XL-G\"";	if ($_POST["Size"]=="XL-G") 	echo " selected";	echo ">XL Girl</option>\n";
+    echo "<tr><td>". Get_Text("makeuser_Engelart"). "</td><td align=\"left\">\n";
-echo "\t\t\t</select>\n";
+    echo "<select name=\"Art\">\n";
-echo "\t\t\t</td></tr>\n";
+
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Engelart"). 
-	"</td><td align=\"left\">\n";
-echo "\t\t\t<select name=\"Art\">\n";
     $Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`";
     $Erg = mysql_query($Sql, $con);
-for( $t = 0; $t < mysql_num_rows($Erg); $t++ )
+
-{
+    for($t = 0; $t < mysql_num_rows($Erg); $t++) {
       $Name = mysql_result($Erg, $t, "Name"). Get_Text("inc_schicht_engel");
-	echo "\t\t\t\t<option value=\"$Name\"";
+      echo "<option value=\"" . $Name . "\"";
+
       if($_POST["Art"]==$Name)
         echo " selected"; 
+
       echo ">$Name</option>\n";
     }
-echo "\t\t\t</select>\n";
+
-echo "\t\t\t</td>\n";
+    echo "</select>\n";
-echo "\t\t\t</tr>\n";
+    echo "</td>\n";
-echo "\t\t\t<tr>\n";
+    echo "</tr>\n";
-echo "\t\t\t\t<td>". Get_Text("makeuser_text2"). "</td>\n";
+    echo "<tr>\n";
-echo "\t\t\t<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
+    echo "<td>". Get_Text("makeuser_text2"). "</td>\n";
-echo "\t\t\t</tr>\n";
+    echo "<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Hometown"). 
+    echo "</tr>\n";
-	"</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"". $_POST["Hometown"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Hometown"). "</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"". $_POST["Hometown"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Passwort"). 
+    echo "<tr><td>". Get_Text("makeuser_Passwort"). "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
-	"*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Passwort2"). "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Passwort2"). 
+    echo "<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". Get_Text("makeuser_Anmelden"). "\"/></td></tr>\n";
-	"*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
+    echo "</table>\n";
-echo "\t\t\t<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". 
+    echo "</form>\n";
-	Get_Text("makeuser_Anmelden"). "\"/></td></tr>\n";
-echo "\t\t</table>\n";
-echo "\t</form>\n";
     Print_Text("makeuser_text3");
   }
 
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-

www-ssl/nonpublic/auth.php

@@ -1,36 +1,19 @@
-<?PHP
+<?php
-header('Content-Type: application/json');
+  header("Content-Type: application/json");
 
-include ("../../../camp2011/includes/config.php");
+  include "../../../camp2011/includes/config.php";
-include ("../../../camp2011/includes/config_db.php");
+  include "../../../camp2011/includes/config_db.php";
 
   $User = $_POST['user'];
   $Pass = $_POST['pw'];
   $SourceOuth = $_POST['so'];
 
-/*
+  if(isset($CurrentExternAuthPass) && $SourceOuth == $CurrentExternAuthPass) {
-$User = $_GET['user'];
-$Pass = $_GET['pw'];
-$SourceOuth = $_GET['so'];
-*/
-
-/*
-$User = "admin";
-$Pass = "21232f297a57a5a743894a0e4a801fc3"; // "admin";
-$SourceOuth = 23;
-*/
-
-if ( 	isset($CurrentExternAuthPass) &&  
-	($SourceOuth == $CurrentExternAuthPass) )
-{ // User ist noch nicht angemeldet 
     $sql = "SELECT * FROM `User` WHERE `Nick`='" . $User . "'";
     $Erg = mysql_query($sql, $con);
 
-	if ( mysql_num_rows( $Erg)  == 1) 
+    if(mysql_num_rows($Erg) == 1) {
-	{ // Check, ob User angemeldet wird...
+      if(mysql_result($Erg, 0, "Passwort") == $Pass) {
-		if (mysql_result( $Erg, 0, "Passwort") == $Pass)
-		{ // Passwort ok...
-			// Session wird eingeleitet und Session-Variablen gesetzt..
         $UID = mysql_result($Erg, 0, "UID");
 
         // get CVS import Data
@@ -38,29 +21,12 @@ if ( 	isset($CurrentExternAuthPass) &&
         $Erg_CVS =  mysql_query($SQL, $con);
         $CVS = mysql_fetch_array($Erg_CVS);
 
-			$msg = array( 
+        $msg = array('status' => 'success', 'rights' => $CVS);
-					'status' => 'success',
-					'rights' => $CVS
-					);
         echo json_encode($msg);
-			
+      } else
-		} 
-		else 
-		{
         echo json_encode(array('status' => 'failed'));
-		}
+    } else
-	} 
-	else 
-	{
       echo json_encode(array('status' => 'failed'));
-	}
+  } else
-} 
-else 
-{
     echo json_encode(array('status' => 'failed'));
-}
-
-
 ?>
-
-

www-ssl/nonpublic/einstellungen.php

@@ -1,60 +1,78 @@
-<?PHP
+<?php
-/* Todo: -add if-construct with configvar for user-shirt-settings 
- *      
- *
- */
   $title = "Himmel";
   $header = "Deine pers&ouml;nlichen Einstellungen";
-include ("../../../camp2011/includes/header.php");
+  include "../../../camp2011/includes/header.php";
-include ("../../../camp2011/includes/crypt.php");
+  include "../../../camp2011/includes/crypt.php";
 
-if (!IsSet($_POST["action"])) 
+  if(!isset($_POST["action"])) {
-{
+    echo Get_Text("Hallo").$_SESSION['Nick'].",<br />\n\n";
-	echo Get_Text("Hallo").$_SESSION['Nick'].",<br>\n\n";
     Print_Text(13);
 ?>
-<hr width=\"100%\">
+<hr width="100%">
-<?PHP Print_Text("pub_einstellungen_Text_UserData");?>
+<?php Print_Text("pub_einstellungen_Text_UserData"); ?>
 <form action="./einstellungen.php" method="post">
   <input type="hidden" name="action" value="setUserData">
   <table>
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Nick"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eNick" size="23" value="<?PHP echo $_SESSION["Nick"]; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Nick"); ?></td>
+      <td><input type="text" name="eNick" size="23" value="<?php echo $_SESSION["Nick"]; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Name"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eName" size="23" value="<?PHP echo $_SESSION['Name']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Name"); ?></td>
+      <td><input type="text" name="eName" size="23" value="<?php echo $_SESSION['Name']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Vorname"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eVorname" size="23" value="<?PHP echo $_SESSION['Vorname']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Vorname"); ?></td>
+      <td><input type="text" name="eVorname" size="23" value="<?php echo $_SESSION['Vorname']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Alter"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eAlter" size="3" value="<?PHP echo $_SESSION['Alter']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Alter"); ?></td>
+      <td><input type="text" name="eAlter" size="3" value="<?php echo $_SESSION['Alter']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Telefon"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eTelefon" size="40" value="<?PHP echo $_SESSION['Telefon']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Telefon"); ?></td>
+      <td><input type="text" name="eTelefon" size="40" value="<?php echo $_SESSION['Telefon']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Handy"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eHandy" size="40" value="<?PHP echo $_SESSION['Handy']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Handy"); ?></td>
+      <td><input type="text" name="eHandy" size="40" value="<?php echo $_SESSION['Handy']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_DECT"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eDECT" size="4" value="<?PHP echo $_SESSION['DECT']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_DECT"); ?></td>
+      <td><input type="text" name="eDECT" size="4" value="<?php echo $_SESSION['DECT']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_email"); ?></td>
+    <tr>
-	  		<td><input type="text" name="eemail" size="40" value="<?PHP echo $_SESSION['email']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_email"); ?></td>
+      <td><input type="text" name="eemail" size="40" value="<?php echo $_SESSION['email']; ?>"></td>
+    </tr>
 
-		<tr>	<td>ICQ</td>
+    <tr>
-	  		<td><input type="text" name="eICQ" size="40" value="<?PHP echo $_SESSION['ICQ']; ?>"></td></tr>
+      <td>ICQ</td>
+      <td><input type="text" name="eICQ" size="40" value="<?php echo $_SESSION['ICQ']; ?>"></td>
+    </tr>
 
-		<tr>	<td>jabber</td>
+    <tr>
-	  		<td><input type="text" name="ejabber" size="40" value="<?PHP echo $_SESSION['jabber']; ?>"></td></tr>
+      <td>jabber</td>
+      <td><input type="text" name="ejabber" size="40" value="<?php echo $_SESSION['jabber']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Hometown"); ?></td>
+    <tr>
-	  		<td><input type="text" name="Hometown" size="40" value="<?PHP echo $_SESSION['Hometown']; ?>"></td></tr>
+      <td><?php Print_Text("pub_einstellungen_Hometown"); ?></td>
-<?PHP
+      <td><input type="text" name="Hometown" size="40" value="<?php echo $_SESSION['Hometown']; ?>"></td>
-if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
+    </tr>
-{
+
+<?php
+if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
 ?>
-                <tr>    <td><?PHP Print_Text("makeuser_T-Shirt"); ?></td>
+    <tr>
+      <td><?php Print_Text("makeuser_T-Shirt"); ?></td>
       <td><select name="Sizeid">
         <option <?php if($_SESSION['Size'] == 'S') { echo "selected"; } ?> value="S">S</option>
         <option <?php if($_SESSION['Size'] == 'M') { echo "selected"; } ?> value="M">M</option>
@@ -62,37 +80,37 @@ if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
         <option <?php if($_SESSION['Size'] == 'XL') { echo "selected"; } ?> value="XL">XL</option>
         <option <?php if($_SESSION['Size'] == 'XXL') { echo "selected"; } ?> value="XXL">XXL</option>
         <option <?php if($_SESSION['Size'] == 'XXXL') { echo "selected"; } ?> value="XXXL">XXXL</option>
-	                </select></td></tr>
+      </select></td>
-<?PHP
+    </tr>
+<?php
 }
 ?>
   </table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
+<br />
 
-
+<hr width="100%">
-<hr width=\"100%\">
+<?php Print_Text(14); ?>
-<?PHP Print_Text(14);?>
 <form action="./einstellungen.php" method="post">
   <input type="hidden" name="action" value="set">
   <table>
-	  <tr><td><?PHP Print_Text(15); ?></td><td><input type="password" name="old" size="20"></td></tr>
+    <tr><td><?php Print_Text(15); ?></td><td><input type="password" name="old" size="20"></td></tr>
-	  <tr><td><?PHP Print_Text(16); ?></td><td><input type="password" name="new1" size="20"></td></tr>
+    <tr><td><?php Print_Text(16); ?></td><td><input type="password" name="new1" size="20"></td></tr>
-	  <tr><td><?PHP Print_Text(17); ?></td><td><input type="password" name="new2" size="20"></td></tr>
+    <tr><td><?php Print_Text(17); ?></td><td><input type="password" name="new2" size="20"></td></tr>
   </table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
+<br />
-
 
 <hr width="100%">
-<br>
+<br />
-<?PHP Print_Text(18); ?>
+<?php Print_Text(18); ?>
 <form action="./einstellungen.php" method="post">
   <input type="hidden" name="action" value="colour">
   <table>
-	   <tr><td><?PHP Print_Text(19); ?></td>
+     <tr>
+       <td><?php Print_Text(19); ?></td>
        <td>
          <select name="colourid">
            <option <?php if($_SESSION['color'] == 1) { echo "selected"; } ?> value="1">Standard-Style</option>
@@ -105,104 +123,103 @@ if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
            <option <?php if($_SESSION['color'] == 4) { echo "selected"; } ?> value="4">Test Style</option>
            <option <?php if($_SESSION['color'] == 9) { echo "selected"; } ?> value="9">Test Style 21c3 </option>
          </select>
-	   </td></tr>
+       </td>
-	   <tr><td>Menu</td>
+     </tr>
-	   	<td><input type="radio" name="eMenu" value="L"<?PHP 
+     <tr>
-			if ($_SESSION['Menu']=='L') echo " checked"; ?>>L
+       <td>Menu</td>
-		    <input type="radio" name="eMenu" value="R"<?PHP
+       <td><input type="radio" name="eMenu" value="L"<?php if($_SESSION['Menu'] == 'L') echo " checked"; ?>>L
-			if ($_SESSION['Menu']=='R') echo " checked"; ?>>R
+           <input type="radio" name="eMenu" value="R"<?php if($_SESSION['Menu'] == 'R') echo " checked"; ?>>R
-	   	</td></tr>
+       </td>
+     </tr>
   </table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
+<br />
 <hr width="100%">
-<br>
+<br />
-<?PHP Print_Text(20); ?>
+<?php Print_Text(20); ?>
 <form action="./einstellungen.php" method="post">
-        <input type="hidden" name="action" value="sprache">
+  <input type="hidden" name="action" value="sprache" />
   <table>
-	   <tr><td><?PHP Print_Text(21); ?></td>
+  <tr>
+    <td><?php Print_Text(21); ?></td>
     <td>
       <select name="language">
         <option value="DE" <?php if($_SESSION['Sprache'] == 'DE') { echo "selected"; } ?>>Deutsch</option>
         <option value="EN" <?php if($_SESSION['Sprache'] == 'EN') { echo "selected"; } ?>>English</option>
-<?PHP /*		   <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */?>
+<?php /*       <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */ ?>
       </select>
     </td></tr>
   </table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<?PHP 
 
-	
+<?php
-	if( get_cfg_var("file_uploads"))
+  if(get_cfg_var("file_uploads")) {
-	{
+    echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-		echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
+    echo Get_Text('pub_einstellungen_PictureUpload') . "<br />";
-		echo Get_Text('pub_einstellungen_PictureUpload')."<br>";
     echo "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
-		echo "\t<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
+    echo "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
-		echo "\t<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
+    echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
-		echo "\t(max ". get_cfg_var("post_max_size"). "Byte)<br>\n";
+    echo "(max ". get_cfg_var("post_max_size"). "Byte)<br />\n";
-		echo "\t<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
+    echo "<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
     echo "</form>\n";
   }
 
-	switch( GetPicturShow( $_SESSION['UID']))
+  switch( GetPicturShow( $_SESSION['UID'])) {
-	{
     case 'Y':
-			echo Get_Text('pub_einstellungen_PictureShow'). "<br>";
+      echo Get_Text('pub_einstellungen_PictureShow'). "<br />";
       echo displayPictur($_SESSION['UID'], 0);
       echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-			echo "\t<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
+      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
       echo "</form>\n";
       break;
     case 'N':
-			echo Get_Text('pub_einstellungen_PictureNoShow'). "<br>";
+      echo Get_Text('pub_einstellungen_PictureNoShow'). "<br />";
       echo displayPictur($_SESSION['UID'], 0);
       echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-			echo "\t<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
+      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
       echo "</form>\n";
-			echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
+      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
     case '':  
-			echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
+      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-			echo Get_Text(22). "<br>"; 
+      echo Get_Text(22). "<br />"; 
       echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
-			echo "\t<table>\n";
+      echo "<table>\n";
-			echo "\t\t<tr>\n\t\t\t<td>". Get_Text(23). "<br></td>\n\t\t</tr>\n";
+      echo "<tr>\n<td>". Get_Text(23). "<br /></td>\n</tr>\n";
-			echo "\t\t<tr>\n";
+      echo "<tr>\n";
-			echo "\t\t\t<td>\n";
+      echo "<td>\n";
-		    	echo "\t\t\t\t<select name=\"eAvatar\" onChange=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\"".
+      echo "<select name=\"eAvatar\" onChange=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\" onKeyup=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
-		    		"onKeyup=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
+
-			for ($i=1; file_exists("". "../pic/avatar/avatar$i.gif"); $i++ )
+      for($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
-		    		echo "\t\t\t\t\t<option value=\"$i\"". ($_SESSION['Avatar'] == $i ? " selected":""). ">avatar$i</option>\n";
+        echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
-		    	echo "\t\t\t\t</select>&nbsp;&nbsp;\n";
+
-			echo "\t\t\t\t<img src=\"". $url. $ENGEL_ROOT. "pic/avatar/avatar". $_SESSION['Avatar']. ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
+      echo "</select>&nbsp;&nbsp;\n";
-			echo "\t\t\t</td>\n\t\t</tr>\n";
+      echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
-			echo "\t</table>\n";
+      echo "</td>\n</tr>\n";
-			echo "\t<input type=\"submit\" value=\"". Get_Text("save"),"\">\n";
+      echo "</table>\n";
+      echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
       echo "</form>\n";
       break;
   } //CASE
 
   } else {
-
     switch ($_POST["action"]) {
-
       case 'set':
         if($_POST["new1"] == $_POST["new2"]) {
           Print_Text(25); 
           $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'";
           $Erg = mysql_query($sql, $con);
+
           if(PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) {
             Print_Text(26);
             Print_Text(27);
-		$usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' ".
+            $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-                " WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
            $Erg = mysql_query($usql, $con);
+
            if ($Erg==1) {
              Print_Text(28);
            } else {

www-ssl/nonpublic/engelbesprechung.php

@@ -1,12 +1,7 @@
 <?php
   $title = "Himmel";
   $header = "Engelbesprechung";
-include ("../../../camp2011/includes/header.php");
+  include "../../../camp2011/includes/header.php";
-?>
-
-<br>
-
-<?php
 
   $SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC";
   $Erg = mysql_query($SQL, $con);
@@ -14,24 +9,19 @@ $Erg = mysql_query($SQL, $con);
   // anzahl zeilen
   $Zeilen  = mysql_num_rows($Erg);
 
-for ($n = 0 ; $n < $Zeilen ; $n++) 
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
-{
+    if (mysql_result($Erg, $n, "Treffen") == "1") {
-  if (mysql_result($Erg, $n, "Treffen")=="1") 
-  {
       echo "<p class='question'><u>" . mysql_result($Erg, $n, "Betreff") . "</u>";
 
-    // Schow Admin Page
+      // Show Admin Page
       if($_SESSION['CVS']["admin/news.php"] == "Y")
         echo " <a href=\"./../admin/news.php?action=change&date=". mysql_result($Erg, $n, "Datum"). "\">[edit]</a>";
 
-    echo "<br>&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
+      echo "<br />&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
       echo UID2Nick(mysql_result($Erg, $n, "UID"))."</font></p>\n";
-
-		
       echo "<p class='answetion'>".nl2br(mysql_result($Erg, $n, "Text"))."</p>\n";
     }
   }
 
-
   include ("../../../camp2011/includes/footer.php");
 ?>

www-ssl/nonpublic/faq.php

@@ -1,35 +1,32 @@
 <?php
   $title = "Himmel";
   $header = "FAQ / Fragen an die Erzengel";
-include ("../../../camp2011/includes/header.php");
+  include "../../../camp2011/includes/header.php";
-
 
   // Erstaufruf, oder Frage bereits abgeschickt?
-if (!IsSet($_POST["eUID"])) 
+  if(!isset($_POST["eUID"])) {
-{
     Print_Text(35);
 ?>
-<br><br>
+<br /><br />
 <form action="./faq.php" method="POST">
-  <input type="hidden" name="eUID" value="<?PHP echo $_SESSION['UID'] ?>">
+  <input type="hidden" name="eUID" value="<?php echo $_SESSION['UID']; ?>">
-  <textarea name="frage"  cols="40" rows="10"><?PHP Print_Text(36); ?></textarea><br><br>
+  <textarea name="frage"  cols="40" rows="10"><?php Print_Text(36); ?></textarea><br /><br />
-  <input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<?PHP
+<?php
-
 } else {
 // Auswertung d. Formular-Daten:
 
-echo "<b>".Get_Text(37)."</b><br><br>\n".nl2br($_POST["frage"])."<br><br>\n".Get_Text(38)."<br>\n";
+echo "<b>".Get_Text(37)."</b><br /><br />\n".nl2br($_POST["frage"])."<br /><br />\n".Get_Text(38)."<br />\n";
 
 $SQL = "INSERT INTO `Questions` VALUES ('', '".$_SESSION['UID']."', '". $_POST["frage"]. "', '', '')";
 $Erg = mysql_query($SQL, $con);
 
 }
 // Bisherige Anfragen:
-echo "<br>\n<b>".Get_Text(39)."</b><br>\n";
+echo "<br />\n<b>".Get_Text(39)."</b><br />\n";
 echo "<hr width=\"99%\">\n";
-echo "<br><b>".Get_Text(40)."</b><br>\n";
+echo "<br /><b>".Get_Text(40)."</b><br />\n";
 
 $SQL = "SELECT * FROM `Questions` WHERE `UID` = ". $_SESSION['UID']. " AND `AID`='0' ORDER BY 'QID' DESC";
 $Erg = mysql_query($SQL, $con);
@@ -42,15 +39,15 @@ if ($Zeilen==0){
 
 } else {
   for ($n = 0 ; $n < $Zeilen ; $n++) {
-	  echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br>\n";
+    echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br />\n";
 // Es gibt ja noch keine Antwort:
 //    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer"))."</p>\n";
-	  echo "\n<br>---<br>";
+    echo "\n<br />---<br />";
   }
 }
 
 echo "<hr width=\"99%\">\n";
-echo "<br><b>".Get_Text(42)."</b><br>\n";
+echo "<br /><b>".Get_Text(42)."</b><br />\n";
 $SQL = "SELECT * FROM `Questions` WHERE `UID`='".$_SESSION['UID']."' and `AID`<>'0' ORDER BY 'QID' DESC";
 $Erg = mysql_query($SQL, $con);
 
@@ -61,10 +58,10 @@ if ($Zeilen==0){
   Print_Text(41);
 } else {
   for ($n = 0 ; $n < $Zeilen ; $n++) {
-	  echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br>\n";
+    echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br />\n";
     echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer")).
       "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n";
-	  echo "\n<br>---<br>";
+    echo "\n<br />---<br />";
   }
 }