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,11 +27,11 @@ $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".
-		"SHA1:<br>SHA1SED";
+    "SHA1:<br>SHA1SED";
 
 //globale const. fuer schischtplan
 $GlobalZeileProStunde = 4;

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;
 
-//ist ein modem angeschlossen
+  // COM port
-$ModemEnable = false;
+  $ModemDev ="/dev/ttyS0";
 
-// COM port
+  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
-$ModemDev="/dev/ttyS0";
+  $WakeupNumber="**3";
-
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
-$WackupNumber="**3";
 ?>

includes/UserCVS.php

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

includes/config_MessegeServer.php

@@ -1,8 +1,7 @@
-<?
+<?php
-// Set the ip and port we will listen on
+  // Set the ip and port we will listen on
-define( SERVER_ADDRESS, "127.0.0.1" );
+  define(SERVER_ADDRESS, "127.0.0.1");
-define( SERVER_PORT, 9000 );
+  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;
 
-//ist ein modem angeschlossen
+  // COM port
-$ModemEnable = false;
+  $ModemDev = "/dev/ttyS0";
 
-// COM port
+  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
-$ModemDev="/dev/ttyS0";
+  $WakeupNumber = "**3";
-
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
-$WackupNumber="**3";
 ?>

includes/crypt.php

@@ -1,18 +1,12 @@
 <?php
+  function PassCrypt($passwort) {
+    include "config.php";
 
-
+    switch ($crypt_system) {
-function PassCrypt($passwort) {
+      case "crypt":
-include "config.php";
+        return "{crypt}" . crypt($passwort, "77");
-
+      case "md5":
-switch ($crypt_system) {
+        return md5($passwort);
-  case "crypt":
+    }
-          return "{crypt}".crypt($passwort, "77");
-  case "md5":
-          return md5($passwort);
   }
-
-}
-													      
-
-
 ?>

includes/error_handler.php

@@ -1,88 +1,86 @@
 <?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
+    // SQL error genauer analysiert
     $Temp = "";
-    foreach ($error_context as $k => $v )
+    foreach ($error_context as $k => $v)
-        if( (strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0))
+      if((strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0))
-            $Temp .= "Error Context: $k = $v\n";
+        $Temp .= "Error Context: $k = $v\n";
 
-    if( (strpos( "0$error_string", "MySQL") > 0) )
+    if((strpos( "0$error_string", "MySQL") > 0))
-    	$Temp .= "Error MySQL: ". mysql_error($con). "\n";
+      $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_errors", "On");
-	  ini_set( "display_startup_errors", "On");
+    ini_set("display_startup_errors", "On");
-	  ini_set( "html_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)
-      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)
-      foreach ($_GET as $k => $v ) 	 
+        $message .= "_GET: $k = $v\n";
-	$message .= "_GET: $k = $v\n"; 
+
       $message .= "\n";
     }
-    
+
     $message .= "\n\n";
     
     if( isset( $_SESSION))
     {
-      foreach ($_SESSION as $k => $v ) 	 
+      foreach ($_SESSION as $k => $v )    
         $message .= "_SESSION: $k = $v\n"; 
       $message .= "\n";
     }
     
     if( isset( $_SESSION['CVS']))
     {
-      foreach ($_SESSION['CVS'] as $k => $v ) 	 
+      foreach ($_SESSION['CVS'] as $k => $v )    
         if( strlen($k)>3 ) 
           $message .= "_SESSION['CVS']: $k = $v\n"; 
       $message .= "\n";
     }
-    
+
-    foreach ($_SERVER as $k => $v ) 	 
+    foreach ($_SERVER as $k => $v )    
       if( strpos( "0$k", "SERVER_")==0)
           $message .= "_SERVER: $k = $v\n"; 
 

includes/footer.php

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

includes/funktion_SendMessenges.php

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

includes/funktion_activeUser.php

@@ -1,59 +1,57 @@
-<?PHP
+<?php
+  // Funktionen gibt es nicht auf allen Rechnern
+  if(!function_exists("bcdiv")) {
+    function bcdiv( $param1, $param2) {
+      return floor( $param1 / $param2);
+    }
+  }
 
-// Functionen gibt es nicht auf ellen rechern
+  if(!function_exists("bcmod")) {
-if( !function_exists("bcdiv"))
+    function bcmod( $param1, $param2) {
-{
+      return $param1 - ( $param2 * bcdiv( $param1, $param2));
-	function bcdiv( $param1, $param2)
+    }
-	{
+  }
-		return floor( $param1 / $param2);
-	}
-}
 
-if( !function_exists("bcmod"))
+  echo "<h4 class=\"menu\">Engel online</h4>";
-{
-	function bcmod( $param1, $param2)
-	{
-		return $param1 - ( $param2 * bcdiv( $param1, $param2));
-	}
-}
 
+  $SQL = "SELECT UID, Nick, lastLogIn " . 
+         "FROM User " . 
+         "WHERE (`lastLogIn` > '" . gmdate("YmdHis", time() - (60 * 60)) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " . 
+         "ORDER BY lastLogIn DESC;";
 
-echo "<h4 class=\"menu\">Engel online</h4>";
+  $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
 
-$SQL = "SELECT UID, Nick, lastLogIn ".
+  echo "<ul>";
-	"FROM User ".
-	"WHERE (`lastLogIn` > '". gmdate("YmdHis", time()-(60*60)). "' AND NOT (UID=". $_SESSION['UID']. ")) ".
-	"ORDER BY lastLogIn DESC;";
 
-$Erg = mysql_query( $SQL, $con);
+  for($i = 0; $i < mysql_num_rows($Erg); $i++) {
-	
+    echo "<li>";
 
-$Tist =	(gmdate("d", time()) * 60 * 60 * 24) +	// Tag
+    if($_SESSION['UID'] > 0)
-	(gmdate("H", time()) * 60 * 60) +	// Stunde
+      echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
-	(gmdate("i", time()) * 60) +		// Minute
-	(gmdate("s", time()) ); 		// Sekunde
 
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
+    // Show Admin Page
-{
+    echo funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=" . mysql_result($Erg, $i, "UID") . "&Type=Normal", mysql_result($Erg, $i, "Nick"));
-	echo "\t\t\t<li>";
-	if( $_SESSION['UID']>0 )
-		echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
-	// Schow Admin Page
-	echo funktion_isLinkAllowed_addLink_OrLinkText(
-		"admin/userChangeNormal.php?enterUID=". mysql_result( $Erg, $i, "UID"). "&Type=Normal",
-		mysql_result( $Erg, $i, "Nick"));
 
-	$Tlog =	(substr( mysql_result( $Erg, $i, "lastLogIn"),  8, 2) * 60 * 60 * 24) +	// Tag
+    $Tlog =  (substr(mysql_result($Erg, $i, "lastLogIn"),  8, 2) * 60 * 60 * 24) +  // Tag
-		(substr( mysql_result( $Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) +	// Stunde
+             (substr(mysql_result($Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) +       // Stunde
-		(substr( mysql_result( $Erg, $i, "lastLogIn"), 14, 2) * 60) +		// Minute
+             (substr(mysql_result($Erg, $i, "lastLogIn"), 14, 2) * 60) +            // Minute
-		(substr( mysql_result( $Erg, $i, "lastLogIn"), 17, 2) );		// Sekunde
+             (substr(mysql_result($Erg, $i, "lastLogIn"), 17, 2) );                 // Sekunde
-	
+  
- 	$Tlog = $Tist-$Tlog;
+    $Tlog = $Tist - $Tlog;
-	echo " ". bcdiv( $Tlog, 60). ":";
-	if( strlen(bcmod( $Tlog, 60))==1)
-		echo "0";
-	echo bcmod( $Tlog, 60);
-	echo "</li>\n";
-}
 
+    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"] . "\"";
-$SQL = "SELECT `Anz` FROM `Counter` WHERE `URL`=\"". $Page["Name"]. "\"";
+  $Erg = mysql_query($SQL, $con);
-$Erg = mysql_query($SQL, $con);
-
-echo mysql_error($con);
-
-if(mysql_num_rows($Erg)==0)
-{
-//	echo "Counter: 1";
-	$SQL = "INSERT INTO `Counter` ( `URL` , `Anz` ) ".
-		"VALUES ('". $Page["Name"]. "', '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);
-}
 
+  echo mysql_error($con);
 
+  if(mysql_num_rows($Erg) == 0) {
+    $SQL = "INSERT INTO `Counter` ( `URL` , `Anz` ) VALUES ('" . $Page["Name"] . "', '1');";
+    $Erg = mysql_query($SQL, $con);
+  } elseif(mysql_num_rows($Erg) == 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,144 +1,131 @@
-<?PHP
+<?php
+  function UID2DECT($UID) {
+    global $con;
+    $SQL = "SELECT DECT FROM `User` WHERE UID='$UID'";
+    $Erg = mysql_query($SQL, $con);
 
-function UID2DECT($UID) 
+    if(mysql_num_rows( $Erg) == 1)
-{
+      return mysql_result($Erg, 0);
-	global $con;
+    else
-	$SQL = "SELECT DECT FROM `User` WHERE UID='$UID'";
+      return "";
-	$Erg = mysql_query($SQL, $con);
+  }
-	if( mysql_num_rows( $Erg) == 1)
-		return mysql_result($Erg, 0);
-	else
-		return "";
-}
-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 RID2Room($RID) {
-{
+    global $con;
-	global $con;
+    $SQL = "SELECT Name FROM `Room` WHERE RID='$RID'";
-	$SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
+    $Erg = mysql_query($SQL, $con);
-	$Erg = mysql_query($SQL, $con);
+
-	if( mysql_num_rows( $Erg) == 1)
+    if(mysql_num_rows( $Erg) == 1)
-		return mysql_result($Erg, 0);
+      return mysql_result($Erg, 0);
-	else
+    else
-		return "";
+      return "";
-}
+  }
+
+  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
+      return "";
+  }
 
 
-function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
+  function DialNumberIAX( $DECTnumber, $Time, $RID, $TID) {
-{
+    global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT, $Tempdir, $AsteriskOutputDir;
-	global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT, $Tempdir, $AsteriskOutputDir;
+  
-	
+    // Parameter verarbeiten
-	//Parameter verarbeiten
+    $TimeH = substr( $Time, 11, 2);
-	$TimeH = substr( $Time, 11, 2);
+    $TimeM = substr( $Time, 14, 2);
-	$TimeM = substr( $Time, 14, 2);
+    $TimeM = substr( $Time, 14, 2) + $AnrufDelay;
-	$TimeM = substr( $Time, 14, 2) + $AnrufDelay;
-	if( $TimeM < 0 )
-	{
-		$TimeM += 60;
-		$TimeH -= 1;
-	}
-	if( $TimeH < 0 )
-		$TimeH += 24;
-	
-	if( strlen( $TimeH) == 1)
-		$TimeH = "0".$TimeH;
-	
-	if( $IAXenable)
-	{	$Message="die-nee shisht beh-kinned , in where-neegin me-nooten . . . your shift beginns in a few minutes";
-		if (isset($SetHttpIAX))
-		{
-			$post_data = array();
-			$post_data['code'] = "89o8eu9cg4";
-			$post_data['callerid'] = "1023";
-			$post_data['nr'] = "$DECTnumber";
-			//$post_data['message'] = "Deine schicht beginnt in ein paar minuten . . . your shift beginns in a few minutes ";
-			$post_data['message'] = "die-nee shisht beh-kinned , in where-neegin me-nooten . . . your shift beginns in a few minutes ";
-			$url = "https://23c3.eventphone.de/~bef/call.php";
 
-			$o="";
+    if($TimeM < 0) {
-			foreach ($post_data as $k=>$v)
+      $TimeM += 60;
-			{
+      $TimeH -= 1;
-			   $o.= "$k=".urlencode(utf8_encode($v))."&";
+    }
-			}
-			$post_data=substr($o,0,-1);
 
-			$ch = curl_init();
+    if($TimeH < 0)
-			curl_setopt($ch, CURLOPT_POST, 1);
+      $TimeH += 24;
-			curl_setopt($ch, CURLOPT_HEADER, 0);
+  
-			curl_setopt($ch, CURLOPT_URL, $url);   
+    if(strlen( $TimeH) == 1)
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data);
+      $TimeH = "0" . $TimeH;
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
+  
-			$result = curl_exec($ch);
+    if($IAXenable) {
-			echo curl_error($ch);
+      $Message = "die-nee shisht beh-kinned, in where-neegin me-nooten . . . your shift beginns in a few minutes";
-			curl_close($ch);
-		}
-		else
-		{
-			// IAX file Schareiebn
-			$CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber";
-	
-			if($DebugDECT) echo "IAX create file for dialing Number $DECTnumber\n";
-			$file = fopen( $CallFile, 'w' );
-			if( $file != FALSE)
-			{
-				fputs( $file, "Channel: SIP/$DECTnumber@$IAXserver\n");  //Ziel nummer
-				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
-				echo "error: $CallFile not created";
-		}
-	}
-	else
-		if($DebugDECT) echo "IAX is disable\n";
-}
 
-function DialNumberModem( $DECTnumber, $Time)
+      if(isset($SetHttpIAX)) {
-{
+        $post_data = array();
-	global $AnrufDelay;
+        $post_data['code'] = "89o8eu9cg4";
-	
+        $post_data['callerid'] = "1023";
-	//Parameter verarbeiten
+        $post_data['nr'] = "$DECTnumber";
-	$TimeH = substr( $Time, 11, 2);
+        //$post_data['message'] = "Deine schicht beginnt in ein paar minuten . . . your shift beginns in a few minutes ";
-	$TimeM = substr( $Time, 14, 2);
+        $post_data['message'] = "die-nee shisht beh-kinned , in where-neegin me-nooten . . . your shift beginns in a few minutes ";
-	$TimeM = substr( $Time, 14, 2) + $AnrufDelay;
+        $url = "https://23c3.eventphone.de/~bef/call.php";
-	if( $TimeM < 0 )
-	{
-		$TimeM += 60;
-		$TimeH -= 1;
-	}
-	if( $TimeH < 0 )
-		$TimeH += 24;
-	
-	if( strlen( $TimeH) == 1)
-		$TimeH = "0".$TimeH;
-	
-	SetWackeup( $DECTnumber, $TimeH, $TimeM);
-}
 
-return 0;
+        $o = "";
+        foreach ($post_data as $k => $v) {
+          $o.= "$k=" . urlencode(utf8_encode($v)) . "&";
+        }
 
+        $post_data = substr($o, 0, -1);
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_POST, 1);
+        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);
+        $result = curl_exec($ch);
+        echo curl_error($ch);
+        curl_close($ch);
+      } else {
+        // IAX file Schareiebn
+        $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber";
+  
+        if($DebugDECT)
+          echo "IAX create file for dialing Number $DECTnumber\n";
+
+        $file = fopen( $CallFile, 'w');
+
+        if($file != false) {
+          fputs($file, "Channel: SIP/$DECTnumber@$IAXserver\n");
+          fputs($file, "Callerid: Engelserver\n");
+          fputs($file, "Extension: s\n");
+          fputs($file, "MaxRetries: 1\n");
+          fputs($file, "RetryTime: 10\n");
+          fputs($file, "SetVar: msg=$Message\n");
+          fclose($file);
+          system("chmod 777 " . $CallFile);
+          system("mv " . $CallFile . " " . $AsteriskOutputDir);
+        } else
+          echo "error: $CallFile not created";
+      }
+    } else
+      if($DebugDECT)
+        echo "IAX is disable\n";
+  }
+
+  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) {
+      $TimeM += 60;
+      $TimeH -= 1;
+    }
+
+    if($TimeH < 0)
+      $TimeH += 24;
+  
+    if(strlen( $TimeH) == 1)
+      $TimeH = "0" . $TimeH;
+  
+    SetWackeup($DECTnumber, $TimeH, $TimeM);
+  }
 ?>
-

includes/funktion_db.php

@@ -1,149 +1,145 @@
-<?PHP
+<?php
+  if( !function_exists("db_query")) {
+    function Ausgabe_Daten($SQL) {
+      global $con;
+      $Erg = mysql_query($SQL, $con); 
 
-if( !function_exists("db_query"))
+      echo mysql_error($con); 
-{
-	function Ausgabe_Daten($SQL)
-	{
-		global $con;
-		$Erg = mysql_query($SQL, $con); 
-		
-		echo mysql_error($con); 
-		              
-		$Zeilen  = mysql_num_rows($Erg); 
-		$Anzahl_Felder = mysql_num_fields($Erg); 
-		
-		$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++)  
-		{ 
-			$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)
-	{
-		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)
+      $Zeilen  = mysql_num_rows($Erg); 
-	{
+      $Anzahl_Felder = mysql_num_fields($Erg); 
-		$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)
-		{
-			if( isset( $Daten2[$DataKey]))
-			{
-				$Data2 = $Daten2[$DataKey];
-				foreach($Data1 as $key => $value)
-					if( $value != $Data2[$key])
-					{
-						$Gefunden=TRUE;
-						$Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td>".$Data2[$key]."</rd>\n</tr>";
-					}
-			}
-			else
-				foreach($Data1 as $key => $value)
-				{
-					$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)
-			return $Diff;
-		else
-			return "\nno changes Fount\n";
-	}
-	
-	function db_query( $SQL, $comment)
-	{
-		global $con, $Page;	
-		$Diff = "";
-		
-		//commed anlyse udn daten sicherung
-		if( strpos( "#$SQL", "UPDATE") > 0)
-		{
-			//Tabellen name ermitteln
-			$Table_Start = strpos( $SQL, "`");
-			$Table_End   = strpos( $SQL, "`", $Table_Start+1);
-			$Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1));
-			
-			//SecureTest
-			if( $Table_Start == 0 || $Table_End == 0) die("<h1>funktion_db ERROR SQL: '$SQL' nicht OK</h1>");
-	
-			//WHERE ermitteln
-			$Where_Start = strpos( $SQL, "WHERE");
-			$Where = substr( $SQL, $Where_Start);
-			if( $Where_Start == 0)	$Where = ";"; 
-		
-			if( strlen( $Where) < 2) 	
-			{
-				$Diff = "can't show, too mutch data (no filter was set)";
-				$querry_erg = mysql_query($SQL, $con);
-			}
-			else
-			{
-				$Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
-					$querry_erg = mysql_query($SQL, $con);
-				$Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
-				$Diff  = db_querry_diffDaten($Daten1, $Daten2);
-			}
-		}
-		elseif( strpos( "#$SQL", "DELETE") > 0)
-		{
-			$TableWhere = substr( $SQL, 6);
-			$Diff .= Ausgabe_Daten( "SELECT * $TableWhere");
 
-			//execute command
+      $Diff  = "<table border=1>"; 
-			$querry_erg = mysql_query($SQL, $con);
+      $Diff .= "<tr>"; 
-		}
-		elseif( strpos( "#$SQL", "INSERT") > 0)
-		{
-			//execute command
-			$querry_erg = mysql_query($SQL, $con);
-		}
-		else
-		{
-			//execute command
-			$querry_erg = mysql_query($SQL, $con);
-		}
 
-		$SQLCommand = "SQL:<br>". htmlentities( $SQL, ENT_QUOTES);
+      for ($m = 0 ; $m < $Anzahl_Felder ; $m++) 
-		if( strlen($Diff) > 0)
+        $Diff .= "<th>". mysql_field_name($Erg, $m). "</th>"; 
-			$SQLCommand .= "<br><br>Diff:<br>$Diff";
 
-		$Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES);
+      $Diff .= "</tr>"; 
-		//LOG commands in DB
+
-		$SQL_SEC =	"INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ".
+      for ($n = 0 ; $n < $Zeilen ; $n++) { 
-				" VALUES ( '". $_SESSION['UID']. "', ".
+        $Diff .= "<tr>";
-					  "'". mysql_escape_string( $SQLCommand). "', ".
+
-					  "'". mysql_escape_string( $Commend). "' );";
+        for ($m = 0 ; $m < $Anzahl_Felder ; $m++) 
-		$erg = mysql_query($SQL_SEC, $con);
+          $Diff .= "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-		echo mysql_error($con);
+
-		return $querry_erg;
+        $Diff .= "</tr>"; 
-	}//function db_query(
+      } 
+
+      $Diff .= "</table>"; 
+      return $Diff; 
+    }
+  
+    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) {
+      $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) {
+        if(isset( $Daten2[$DataKey])) {
+          $Data2 = $Daten2[$DataKey];
+
+          foreach($Data1 as $key => $value)
+            if( $value != $Data2[$key]) {
+            $Gefunden = true;
+            $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td>" . $Data2[$key] . "</rd>\n</tr>";
+          }
+        } else
+          foreach($Data1 as $key => $value) {
+            $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)
+        return $Diff;
+      else
+        return "\nno changes Fount\n";
+    }
+
+    function db_query( $SQL, $comment) {
+      global $con, $Page;  
+      $Diff = "";
+
+      // commed anlyse udn daten sicherung
+      if(strpos("#$SQL", "UPDATE") > 0) {
+        // Tabellen name ermitteln
+        $Table_Start = strpos( $SQL, "`");
+        $Table_End = strpos( $SQL, "`", $Table_Start+1);
+        $Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1));
+      
+      //SecureTest
+      if( $Table_Start == 0 || $Table_End == 0) die("<h1>funktion_db ERROR SQL: '$SQL' nicht OK</h1>");
+  
+      //WHERE ermitteln
+      $Where_Start = strpos( $SQL, "WHERE");
+      $Where = substr( $SQL, $Where_Start);
+      if( $Where_Start == 0)  $Where = ";"; 
+    
+      if( strlen( $Where) < 2)   
+      {
+        $Diff = "can't show, too mutch data (no filter was set)";
+        $querry_erg = mysql_query($SQL, $con);
+      }
+      else
+      {
+        $Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
+          $querry_erg = mysql_query($SQL, $con);
+        $Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
+        $Diff  = db_querry_diffDaten($Daten1, $Daten2);
+      }
+    }
+    elseif( strpos( "#$SQL", "DELETE") > 0)
+    {
+      $TableWhere = substr( $SQL, 6);
+      $Diff .= Ausgabe_Daten( "SELECT * $TableWhere");
+
+      //execute command
+      $querry_erg = mysql_query($SQL, $con);
+    }
+    elseif( strpos( "#$SQL", "INSERT") > 0)
+    {
+      //execute command
+      $querry_erg = mysql_query($SQL, $con);
+    }
+    else
+    {
+      //execute command
+      $querry_erg = mysql_query($SQL, $con);
+    }
+
+    $SQLCommand = "SQL:<br />". htmlentities( $SQL, ENT_QUOTES);
+    if( strlen($Diff) > 0)
+      $SQLCommand .= "<br /><br />Diff:<br />$Diff";
+
+    $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES);
+    //LOG commands in DB
+    $SQL_SEC =  "INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ".
+        " VALUES ( '". $_SESSION['UID']. "', ".
+            "'". mysql_escape_string( $SQLCommand). "', ".
+            "'". mysql_escape_string( $Commend). "' );";
+    $erg = mysql_query($SQL_SEC, $con);
+    echo mysql_error($con);
+    return $querry_erg;
+  }//function db_query(
 }
 
 ?>

includes/funktion_db_list.php

@@ -1,67 +1,65 @@
-<?PHP
+<?php
+  function funktion_db_list($Table_Name) {
+    global $con;
 
-function funktion_db_list($Table_Name) 
+    $SQL = "SELECT * FROM `".$Table_Name."`";
-{
+    $Erg = mysql_query($SQL, $con);
-	global $con;
 
-	$SQL = "SELECT * FROM `".$Table_Name."`";
+  // anzahl zeilen
-	$Erg = mysql_query($SQL, $con);
+  $Zeilen  = mysql_num_rows($Erg);
 
-	// anzahl zeilen
+  $Anzahl_Felder = mysql_num_fields($Erg);
-	$Zeilen  = mysql_num_rows($Erg);
 
-	$Anzahl_Felder = mysql_num_fields($Erg);
+  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">";
+  echo "<caption>DB: $Table_Name</caption>";
 
-	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">";
+  echo "<tr class=\"contenttopic\">";
-	echo "<caption>DB: $Table_Name</caption>";
+  for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
+  {
+    echo "<th>". mysql_field_name($Erg, $m). "</th>";
+  }
+  echo "</tr>";
 
-	echo "<tr class=\"contenttopic\">";
+  for ($n = 0 ; $n < $Zeilen ; $n++)
-	for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
+  {
-	{
+    echo "<tr class=\"content\">";
-		echo "<th>". mysql_field_name($Erg, $m). "</th>";
+    for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
-	}
+    {
-	echo "</tr>";
+      echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-
+    }
-	for ($n = 0 ; $n < $Zeilen ; $n++)
+    echo "</tr>";
-	{
+  }
-		echo "<tr class=\"content\">";
+  echo "</table>";
-		for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
-		{
-			echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-		}
-		echo "</tr>";
-	}
-	echo "</table>";
 }
 
 function funktion_db_element_list_2row( $TopicName, $SQL) 
 {
-	global $con;
+  global $con;
 
-	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<caption>$TopicName</caption>";
+  echo "<caption>$TopicName</caption>";
-#	echo "\t<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
+#  echo "\t<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
 
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
+  echo mysql_error($con);
-	
+  
-	echo "<tr class=\"contenttopic\">";
+  echo "<tr class=\"contenttopic\">";
-	for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
+  for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
-	{
+  {
-		echo "<th>". mysql_field_name($Erg, $m). "</th>";
+    echo "<th>". mysql_field_name($Erg, $m). "</th>";
-	}
+  }
-	echo "</tr>";
+  echo "</tr>";
 
-	for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
+  for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
-	{
+  {
-		echo "<tr class=\"content\">";
+    echo "<tr class=\"content\">";
-		for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
+    for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
-		{
+    {
-			echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+      echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-		}
+    }
-		echo "</tr>";
+    echo "</tr>";
-	}
+  }
-	echo "</table>\n";
+  echo "</table>\n";
 }
 
 ?>

includes/funktion_faq.php

@@ -1,12 +1,10 @@
-<?PHP
+<?php
+  function noAnswer() {
+    global $con;
 
-function noAnswer() {
+    $SQL = "SELECT UID FROM Questions WHERE `AID`='0'";
-  global $con;
+    $Res = mysql_query($SQL, $con);
-
-  $SQL = "SELECT UID FROM Questions WHERE `AID`='0'";
-  $Res=mysql_query($SQL, $con);
-
-  return mysql_num_rows($Res);
-}
 
+    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=";
-if( strpos( $_SERVER["REQUEST_URI"], "?") >0)
+  else
-	$URL = $_SERVER["REQUEST_URI"]. "&SetLanguage=";
+    $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. "EN\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/en.gif\" alt=\"EN\"></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> ";
 ?>

includes/funktion_lang.php

@@ -1,35 +1,28 @@
-<?PHP
+<?php
+  function Get_Text ($TextID, $NoError = false) {
+    global $con, $error_messages, $debug;
 
+    if( !isset($_SESSION['Sprache'])) 
+      $_SESSION['Sprache'] = "EN";
+    if( $_SESSION['Sprache']=="") 
+      $_SESSION['Sprache']="EN";
+    if( isset($_GET["SetLanguage"]))
+      $_SESSION['Sprache']= $_GET["SetLanguage"];
 
-function Get_Text ($TextID, $NoError=FALSE)
+    $SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='".$_SESSION['Sprache']."'";
-{
+    @$Erg = mysql_query($SQL, $con);
-	GLOBAL $con, $error_messages, $DEBUG;
-	
-	if( !isset($_SESSION['Sprache'])) 
-		$_SESSION['Sprache'] = "EN";
-	if( $_SESSION['Sprache']=="") 
-		$_SESSION['Sprache']="EN";
-	if( isset($_GET["SetLanguage"]))
-		$_SESSION['Sprache']= $_GET["SetLanguage"];
 
-	$SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='".$_SESSION['Sprache']."'";
+    if( mysql_num_rows( $Erg) == 1)
-	@$Erg = mysql_query($SQL, $con);
+      return (@mysql_result($Erg, 0, "Text"));
-	
+    elseif( $NoError && !$debug)
-	if( mysql_num_rows( $Erg) == 1)
+      return "";
-		return (@mysql_result($Erg, 0, "Text"));
+    else {
-	elseif( $NoError && !$DEBUG)
+      array_push($error_messages, "Get_Text, '$TextID' found ". mysql_num_rows( $Erg). "x in Sprache Database Table for Language (".$_SESSION['Sprache'].")\n");
-		return "";
+      return "Error Data, '$TextID' found ". mysql_num_rows( $Erg). "x";
-	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)
-{
-	echo Get_Text ($TextID, $NoError);
-}
 
+  function Print_Text($TextID, $NoError = false) {
+    echo Get_Text($TextID, $NoError);
+  }
 ?>

includes/funktion_menu.php

@@ -1,44 +1,41 @@
-<?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>";
+    foreach($_SESSION['CVS'] as $Key => $Entry)
-	
+      if( strpos( $Key, ".php") > 0)
-	//einträge
+        if( (strpos( "00$Key", "0$MenuName") > 0) ||
-	foreach( $_SESSION['CVS'] as $Key => $Entry )
+          ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) ) {
-		if( strpos( $Key, ".php") > 0)
+          $TempName = Get_Text($Key, true);
-			if( (strpos( "00$Key", "0$MenuName") > 0) ||
+
-			    ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) )
+          if(( true||$debug) && (strlen($TempName)==0) )
-			{
+            $TempName = "not found: \"$Key\"";
-				$TempName = Get_Text($Key, TRUE);
+
-				if(( TRUE||$DEBUG) && (strlen($TempName)==0) )
+          if( $Entry == "Y") {
-					$TempName = "not found: \"$Key\"";
+            //zum absichtlkichen ausblenden von einträgen
-				
+            if( strlen($TempName)>1) {
-				if( $Entry == "Y")
+              //sonderfälle:
-				{
+
-					//zum absichtlkichen ausblenden von einträgen
+              if( $Key=="admin/faq.php")
-					if( strlen($TempName)>1)
+                $TempName .= " (". noAnswer(). ")";
-					{
+            //ausgabe
-						//sonderfälle:
+            $Text .= "\t\t\t<li><a href=\"". $url. $ENGEL_ROOT. $Key. "\">$TempName</a></li>\n";
-						if( $Key=="admin/faq.php")
+            $Gefunden = true;
-							$TempName .= " (". noAnswer(). ")";
+          }
-						//ausgabe
+        }
-						$Text .= "\t\t\t<li><a href=\"". $url. $ENGEL_ROOT. $Key. "\">$TempName</a></li>\n";
+        elseif( $debug ) 
-						$Gefunden = TRUE;
+        {
-					}
+          $Gefunden = true;
-				}
+          $Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
-				elseif( $DEBUG ) 
+        }
-				{
+      }
-					$Gefunden = TRUE;
+  if( $Gefunden)
-					$Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
+    echo $MenueTableStart.$Text.$MenueTableEnd;
-				}
-			}
-	if( $Gefunden)
-		echo $MenueTableStart.$Text.$MenueTableEnd;
 }//function ShowMenue
 
 ?>

includes/funktion_modem.php

@@ -1,35 +1,34 @@
-<?PHP
+<?php
-include "config_modem.php";
+  include "config_modem.php";
 
-function DialNumber( $Number )
+  function DialNumber($Number) {
-{
+    global $Dev, $ModemEnable;
-	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");
+      $fp = fopen( $ModemDev, "w");
-		sleep(1);
+    sleep(1);
-		fwrite( $fp, "+++");
+    fwrite( $fp, "+++");
-		sleep(1);
+    sleep(1);
-		fwrite( $fp, "ATZ\n");
+    fwrite( $fp, "ATZ\n");
-		sleep(1);
+    sleep(1);
-		fwrite( $fp, "ATX1\n");
+    fwrite( $fp, "ATX1\n");
-		sleep(1);
+    sleep(1);
-		fwrite( $fp, "ATD $Number \n");
+    fwrite( $fp, "ATD $Number \n");
-		sleep(8);
+    sleep(8);
-		fclose($fp);
+    fclose($fp);
-		sleep(1);
+    sleep(1);
-	}
+  }
-	else
+  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

@@ -2,181 +2,181 @@
 
 
 /*#######################################################
-#	gibt die engelschischten aus			#
+#  gibt die engelschischten aus      #
 #######################################################*/
 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 = "";
+  $Spalten = "";
 
-	if( !isset($_GET["Icon"]))
+  if( !isset($_GET["Icon"]))
-		$_GET["Icon"]=1;
+    $_GET["Icon"]=1;
 
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	// Schow Admin Page
+  // Schow Admin Page
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	$Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
+  $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
-		"admin/schichtplan.php?action=change&SID=$SID",
+    "admin/schichtplan.php?action=change&SID=$SID",
-		"edit<br>\n\t\t");
+    "edit<br />\n\t\t");
 
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-  	// Ausgabe des Schischtnamens
+    // Ausgabe des Schischtnamens
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	$SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
+  $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	if( mysql_result($Erg, 0, 0) != "")
+  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
+  else
-  		$Spalten.="<u>".$Man.":</u><br>";
+      $Spalten.="<u>".$Man.":</u><br />";
 
 
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	// SQL abfrage für die benötigten schichten
+  // SQL abfrage für die benötigten schichten
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	$SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
+  $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	
+  
-	$Anzahl = mysql_num_rows($Erg);
+  $Anzahl = mysql_num_rows($Erg);
-	$Feld=0;
+  $Feld=0;
-	$Temp_TID_old=-1;
+  $Temp_TID_old=-1;
-	for( $i = 0; $i < $Anzahl; $i++ )
+  for( $i = 0; $i < $Anzahl; $i++ )
-	{
+  {
-		if( isset($Temp[$Feld]["TID"]))
+    if( isset($Temp[$Feld]["TID"]))
-			$Temp_TID_old = $Temp[$Feld]["TID"];
+      $Temp_TID_old = $Temp[$Feld]["TID"];
-		if( isset($Temp[$Feld]["UID"]))
+    if( isset($Temp[$Feld]["UID"]))
-			$Temp_UID_old = $Temp[$Feld]["UID"];
+      $Temp_UID_old = $Temp[$Feld]["UID"];
-		
+    
-		$Temp_TID = mysql_result($Erg, $i, "TID");
+    $Temp_TID = mysql_result($Erg, $i, "TID");
-		
+    
-		// wenn sich der Type ändert wird zumnästen feld geweckselt
+    // wenn sich der Type ändert wird zumnästen feld geweckselt
-		if( $Temp_TID_old != $Temp_TID )
+    if( $Temp_TID_old != $Temp_TID )
-			$Feld++;
+      $Feld++;
-			
+      
-		$Temp[$Feld]["TID"] = $Temp_TID;
+    $Temp[$Feld]["TID"] = $Temp_TID;
-		$Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
+    $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
-		
+    
-		// sonderfall ersten durchlauf
+    // sonderfall ersten durchlauf
-		if( $i == 0 )
+    if( $i == 0 )
-		{
+    {
-			$Temp_TID_old = $Temp[$Feld]["TID"];
+      $Temp_TID_old = $Temp[$Feld]["TID"];
-			$Temp_UID_old = $Temp[$Feld]["UID"];
+      $Temp_UID_old = $Temp[$Feld]["UID"];
-		}
+    }
-		
+    
-		// ist es eine zu vergeben schicht?
+    // ist es eine zu vergeben schicht?
-		if( $Temp[$Feld]["UID"] == 0 )
+    if( $Temp[$Feld]["UID"] == 0 )
-		{
+    {
-			if( isset($Temp[$Feld]["free"]))
+      if( isset($Temp[$Feld]["free"]))
-				$Temp[$Feld]["free"]++;
+        $Temp[$Feld]["free"]++;
-			else
+      else
-				$Temp[$Feld]["free"]=1;
+        $Temp[$Feld]["free"]=1;
-		}
+    }
-		else
+    else
-			$Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
+      $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
-	} // FOR
+  } // FOR
-	
+  
 
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	// Aus gabe der Schicht
+  // Aus gabe der Schicht
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	if( isset($Temp))
+  if( isset($Temp))
-	  if( count($Temp) )
+    if( count($Temp) )
-	    foreach( $Temp as $TempEntry => $TempValue )
+      foreach( $Temp as $TempEntry => $TempValue )
-	    {
+      {
-		if( !isset($TempValue["free"]))
+    if( !isset($TempValue["free"]))
-			$TempValue["free"] = 0;
+      $TempValue["free"] = 0;
-		
+    
-		// ausgabe EngelType
+    // ausgabe EngelType
-		$Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " ";
+    $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " ";
-		
+    
-		// ausgabe Eingetragener Engel
+    // ausgabe Eingetragener Engel
-		if( isset($TempValue["Engel"]))
+    if( isset($TempValue["Engel"]))
-		  if( count($TempValue["Engel"]) > 0  )
+      if( count($TempValue["Engel"]) > 0  )
-		  {
+      {
-			if( count($TempValue["Engel"]) == 1  )
+      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 
+      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 )
+      foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
-			{
+      {
-				if( funktion_isLinkAllowed( "admin/user.php") === TRUE)
+        if( funktion_isLinkAllowed( "admin/user.php") === TRUE)
-				{
+        {
-					// add color, wenn Engel "Gekommen"
+          // add color, wenn Engel "Gekommen"
-	      				$TempText= 
+                $TempText= 
-						((UIDgekommen( $TempEngelID ) == "1")
+            ((UIDgekommen( $TempEngelID ) == "1")
-							? "<span style=\"color: blue;\">"
+              ? "<span style=\"color: blue;\">"
-							: "<span style=\"color: red;\">").
+              : "<span style=\"color: red;\">").
-						UID2Nick( $TempEngelID). "</span>";
+            UID2Nick( $TempEngelID). "</span>";
-				}
+        }
-				else
+        else
-				{
+        {
-					$TempText = UID2Nick( $TempEngelID );
+          $TempText = UID2Nick( $TempEngelID );
-				}
+        }
-				
+        
-				// add link to user
+        // add link to user
-				$TempText= funktion_isLinkAllowed_addLink_OrLinkText(
+        $TempText= funktion_isLinkAllowed_addLink_OrLinkText(
-					"admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal",
+          "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal",
-					$TempText);
+          $TempText);
-				
+        
-				$Spalten.= "&nbsp;&nbsp;". $TempText.
+        $Spalten.= "&nbsp;&nbsp;". $TempText.
-						( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
+            ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
-						"<br>\n\t\t";
+            "<br />\n\t\t";
 
 
-			}
+      }
-			$Spalten = substr( $Spalten, 0, strlen($Spalten)-7 );
+      $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 );
-		  }
+      }
-		
+    
-		// ausgabe benötigter Engel
+    // ausgabe benötigter Engel
-		////////////////////////////
+    ////////////////////////////
-		//in vergangenheit
+    //in vergangenheit
-		$SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". 
+    $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". 
-			gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')";
+      gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')";
-		$Ergtime = mysql_query($SQLtime, $con);
+    $Ergtime = mysql_query($SQLtime, $con);
-		if( mysql_num_rows( $Ergtime) > 0)
+    if( mysql_num_rows( $Ergtime) > 0)
-		{
+    {
-			//wenn keien rechte definiert sind 
+      //wenn keien rechte definiert sind 
-		   	if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ]))
+         if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ]))
-		   	 	$_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y";
+            $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y";
 
-			if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
+      if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
-				if( $TempValue["free"] > 0 )
+        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"]."\">";
+               $TempValue["TID"]."\">";
-					$Spalten.= $TempValue["free"];
+          $Spalten.= $TempValue["free"];
-					if( $TempValue["free"] != 1 )
+          if( $TempValue["free"] != 1 )
-						$Spalten.= Get_Text("inc_schicht_weitere").
+            $Spalten.= Get_Text("inc_schicht_weitere").
-    							" ".Get_Text("inc_schicht_Engel").
+                  " ".Get_Text("inc_schicht_Engel").
-    							Get_Text("inc_schicht_wird");
+                  Get_Text("inc_schicht_wird");
-					else
+          else
-						$Spalten.= Get_Text("inc_schicht_weiterer").
+            $Spalten.= Get_Text("inc_schicht_weiterer").
-    							   " ".Get_Text("inc_schicht_Engel").
+                     " ".Get_Text("inc_schicht_Engel").
-							   Get_Text("inc_schicht_werden");
+                 Get_Text("inc_schicht_werden");
-					$Spalten.= Get_Text("inc_schicht_noch_gesucht");
+          $Spalten.= Get_Text("inc_schicht_noch_gesucht");
-					$Spalten.= "</a>";
+          $Spalten.= "</a>";
-			     }   
+           }   
-		}
+    }
-		else
+    else
-		{
+    {
-			if( isset($TempValue["free"]))
+      if( isset($TempValue["free"]))
-				if( $TempValue["free"] > 0 )
+        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>";
+              $TempValue["free"]. "</a></h3>";
-		}
+    }
-		$Spalten.= "<br>\n\t\t";
+    $Spalten.= "<br />\n\t\t";
-	
+  
-	} // FOREACH
+  } // FOREACH
-	return $Spalten;
+  return $Spalten;
 } // function Ausgabe_Feld_Inhalt
 
 
 
 /*#######################################################
-#	gibt die engelschischten Druckergerecht aus	#
+#  gibt die engelschischten Druckergerecht aus  #
 #######################################################*/
 function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) 
 {
@@ -190,200 +190,200 @@ function Ausgabe_Feld_Inhalt_Druck($RID, $Man )
 
 
 /*#######################################################
-#	Ausgabe der Raum Spalten			#
+#  Ausgabe der Raum Spalten      #
 #######################################################*/
 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
+  // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus
-	/////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////
-	$SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
+  $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
-		     "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ".
+         "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ".
-		     	"(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
+           "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
-	$ErgSonder = mysql_query($SQLSonder, $con);
+  $ErgSonder = mysql_query($SQLSonder, $con);
-	if( (mysql_num_rows( $ErgSonder) > 1) )
+  if( (mysql_num_rows( $ErgSonder) > 1) )
-	{
+  {
-		if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
+    if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
-		{
+    {
-			echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
+      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-			for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
+      for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
-			{
+      {
-				echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
+        echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-					mysql_result($ErgSonder, $i, "SID"). "\">".
+          mysql_result($ErgSonder, $i, "SID"). "\">".
-					mysql_result($ErgSonder, $i, "DateS"). 
+          mysql_result($ErgSonder, $i, "DateS"). 
-					" '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
+          " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
-					"</a><br>\n\t\t";
+          "</a><br />\n\t\t";
-			}
+      }
-		}
+    }
-	}
+  }
-	elseif( (mysql_num_rows( $ErgSonder) == 1) )
+  elseif( (mysql_num_rows( $ErgSonder) == 1) )
-	{
+  {
-		$Spalten[0].=	"\t\t<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
+    $Spalten[0].=  "\t\t<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
-				"\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
+        "\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
-	        		Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
+              Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
-						     mysql_result($ErgSonder, 0, "Man") ).
+                 mysql_result($ErgSonder, 0, "Man") ).
-				"\t\t\t<h3>&darr;&darr;&darr;</h3>".
+        "\t\t\t<h3>&darr;&darr;&darr;</h3>".
-	       			"\n\t\t</td>\n";
+               "\n\t\t</td>\n";
-		return;
+    return;
-	}
+  }
-	
+  
-	$ZeitZeiger = 0;
+  $ZeitZeiger = 0;
 
-	/////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////
-	// beginnt die erste schicht vor dem heutigen tag?
+  // beginnt die erste schicht vor dem heutigen tag?
-	/////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////
-	$SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
+  $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
-		     "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ".
+         "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ".
-		     	"(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
+           "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
-	$ErgSonder = mysql_query($SQLSonder, $con);
+  $ErgSonder = mysql_query($SQLSonder, $con);
-	if( (mysql_num_rows( $ErgSonder) > 1) )
+  if( (mysql_num_rows( $ErgSonder) > 1) )
-	{
+  {
-		if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
+    if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
-		{
+    {
-			echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
+      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-			for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
+      for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
-			{
+      {
-				echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
+        echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-					mysql_result($ErgSonder, $i, "SID"). "\">".
+          mysql_result($ErgSonder, $i, "SID"). "\">".
-					mysql_result($ErgSonder, $i, "DateS"). 
+          mysql_result($ErgSonder, $i, "DateS"). 
-					" '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
+          " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
-					"</a><br>\n\t\t";
+          "</a><br />\n\t\t";
-			}
+      }
-		}
+    }
-	}
+  }
-	elseif( (mysql_num_rows( $ErgSonder) == 1) )
+  elseif( (mysql_num_rows( $ErgSonder) == 1) )
-	{
+  {
-		$ZeitZeiger =	substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+
+    $ZeitZeiger =  substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+
-				(substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60);
+        (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60);
-		$Spalten[0].=	"\t\t<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
+    $Spalten[0].=  "\t\t<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
-				"\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
+        "\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
-	        		Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
+              Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
-						     mysql_result($ErgSonder, 0, "Man") ).
+                 mysql_result($ErgSonder, 0, "Man") ).
-	       			"\n\t\t</td>\n";
+               "\n\t\t</td>\n";
-	}
+  }
-		     
+         
-	/////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////
-	// gibt die schichten für den tag aus
+  // gibt die schichten für den tag aus
-	/////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////
-	$SQL =	"SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
+  $SQL =  "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
-		"WHERE ((`RID` = '$raum') and ".
+    "WHERE ((`RID` = '$raum') and ".
-		"(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ".
+    "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ".
-		"(`DateS` like '$ausdatum%')) ORDER BY `DateS`;";
+    "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;";
-      	$Erg = mysql_query($SQL, $con);
+        $Erg = mysql_query($SQL, $con);
-	for( $i = 0; $i < mysql_num_rows($Erg); ++$i )
+  for( $i = 0; $i < mysql_num_rows($Erg); ++$i )
-	{	
+  {  
-		$ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+
+    $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+
-			  (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60);
+        (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60);
-		$len = mysql_result($Erg, $i, "Len");
+    $len = mysql_result($Erg, $i, "Len");
 
-		if( $len <= 0)
+    if( $len <= 0)
-			array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len");
+      array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len");
-		
+    
-		if( $ZeitZeiger < $ZeitPos  )
+    if( $ZeitZeiger < $ZeitPos  )
-		{
+    {
-	       		$Spalten[$ZeitZeiger * $GlobalZeileProStunde].=	
+             $Spalten[$ZeitZeiger * $GlobalZeileProStunde].=  
-				"\t\t<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
+        "\t\t<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
 
-			$ZeitZeiger += $ZeitPos - $ZeitZeiger;
+      $ZeitZeiger += $ZeitPos - $ZeitZeiger;
-		}
+    }
-		if($ZeitZeiger == $ZeitPos )
+    if($ZeitZeiger == $ZeitPos )
-		{
+    {
-			//sonderfall wenn die schicht über dei 24 stunden hinaus geht
+      //sonderfall wenn die schicht über dei 24 stunden hinaus geht
-			// (eintrag abkürzen, pfeiel ausgeben)
+      // (eintrag abkürzen, pfeiel ausgeben)
-	       		$Spalten[$ZeitZeiger * $GlobalZeileProStunde].= 
+             $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= 
-					"\t\t<td valign=\"top\" rowspan=\"". 
+          "\t\t<td valign=\"top\" rowspan=\"". 
-					( ( ($len+$ZeitZeiger)? $len : 24-$len+$ZeitZeiger) * $GlobalZeileProStunde). 
+          ( ( ($len+$ZeitZeiger)? $len : 24-$len+$ZeitZeiger) * $GlobalZeileProStunde). 
-					"\">\n".
+          "\">\n".
-					"\t\t\t".
+          "\t\t\t".
-	        			Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), 
+                Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), 
-							     mysql_result($Erg, $i, "Man") ).
+                   mysql_result($Erg, $i, "Man") ).
-					(( ($ZeitZeiger+$len) > 24)? "\t\t\t<h3>&darr;&darr;&darr;</h3>" : "").
+          (( ($ZeitZeiger+$len) > 24)? "\t\t\t<h3>&darr;&darr;&darr;</h3>" : "").
-	       				"\n\t\t</td>\n";
+                 "\n\t\t</td>\n";
-			$ZeitZeiger += $len;
+      $ZeitZeiger += $len;
-		}
+    }
-		else
+    else
-		{
+    {
-			echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
+      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-			echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
+      echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-				mysql_result($Erg, $i, "SID"). "\">".
+        mysql_result($Erg, $i, "SID"). "\">".
-				mysql_result($Erg, $i, "DateS"). 
+        mysql_result($Erg, $i, "DateS"). 
-				" '". mysql_result($Erg, $i, "Man"). "' ".
+        " '". 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 )
+  if( $ZeitZeiger < 24 )
-       		$Spalten[($ZeitZeiger * $GlobalZeileProStunde)].=	
+           $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].=  
-					"\t\t<td valign=\"top\" rowspan=\"". 
+          "\t\t<td valign=\"top\" rowspan=\"". 
-					((24 - $ZeitZeiger) * $GlobalZeileProStunde ). 
+          ((24 - $ZeitZeiger) * $GlobalZeileProStunde ). 
-					"\">&nbsp;</td>\n";
+          "\">&nbsp;</td>\n";
 } // function CreateRoomShifts
 
 
 /*#######################################################
-#	Ausgabe der freien schichten			#
+#  Ausgabe der freien schichten      #
 #######################################################*/
 function showEmptyShifts( )
 {
-	global $con, $DEBUG, $RoomID, $gmdateOffset;
+  global $con, $debug, $RoomID, $gmdateOffset;
 
-	echo "<table border=\"1\">\n";
+  echo "<table border=\"1\">\n";
-	echo "<tr>\n";
+  echo "<tr>\n";
-	echo "\t<th>". Get_Text("inc_schicht_date"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_date"). "</th>\n";
-	echo "\t<th>". Get_Text("inc_schicht_time"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_time"). "</th>\n";
-	echo "\t<th>". Get_Text("inc_schicht_room"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_room"). "</th>\n";
-	echo "\t<th>". Get_Text("inc_schicht_commend"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_commend"). "</th>\n";
-	echo "</tr>\n";
+  echo "</tr>\n";
-	
+  
-	$sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ".
+  $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ".
-		"WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ".
+    "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ".
-		"ORDER BY `DateS`, `RID`;";
+    "ORDER BY `DateS`, `RID`;";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
 
-	$angezeigt = 0;
+  $angezeigt = 0;
-	for ($i=0; ($i<mysql_num_rows($Erg)) && ($angezeigt< 15); $i++)
+  for ($i=0; ($i<mysql_num_rows($Erg)) && ($angezeigt< 15); $i++)
-	  if( isset($RoomID[mysql_result( $Erg, $i, "RID")]))
+    if( isset($RoomID[mysql_result( $Erg, $i, "RID")]))
-	   if( $RoomID[mysql_result( $Erg, $i, "RID")]!="" )
+     if( $RoomID[mysql_result( $Erg, $i, "RID")]!="" )
-	   {
+     {
- 		$Sql2 = "SELECT `UID` FROM `ShiftEntry` ".
+     $Sql2 = "SELECT `UID` FROM `ShiftEntry` ".
-			"WHERE `SID`=". mysql_result( $Erg, $i, "SID"). " AND ".
+      "WHERE `SID`=". mysql_result( $Erg, $i, "SID"). " AND ".
-				"`UID`='0';";
+        "`UID`='0';";
-		$Erg2 = mysql_query($Sql2, $con);
+    $Erg2 = mysql_query($Sql2, $con);
-		
+    
-		if( mysql_num_rows($Erg2)>0)
+    if( mysql_num_rows($Erg2)>0)
-		{
+    {
-			$angezeigt++;
+      $angezeigt++;
-			echo "<tr>\n";
+      echo "<tr>\n";
-			echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
+      echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
-			echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
+      echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
-			echo "\t<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
+      echo "\t<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
-			echo "\t<td>". 
+      echo "\t<td>". 
-				ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")).
+        ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")).
-				"</td>\n";
+        "</td>\n";
-			echo "</tr>\n";
+      echo "</tr>\n";
-		}
+    }
-	   }
+     }
-	
+  
-	echo "</table>\n";
+  echo "</table>\n";
-	
+  
 } //function showEmptyShifts
 
-	
+  
 /*#######################################################
-#	Gibt die anzahl der Schichten im Raum zurück	#
+#  Gibt die anzahl der Schichten im Raum zurück  #
 #######################################################*/
 function SummRoomShifts( $raum )
 {
-	global $ausdatum, $con, $DEBUG, $GlobalZeileProStunde;
+  global $ausdatum, $con, $debug, $GlobalZeileProStunde;
-	
+  
-	$SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
+  $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
-		     "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ".
+         "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ".
-		     	"(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;";
+           "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;";
 
-      	$ErgSonder = mysql_query($SQLSonder, $con);
+        $ErgSonder = mysql_query($SQLSonder, $con);
-	
+  
-	return mysql_num_rows($ErgSonder);
+  return mysql_num_rows($ErgSonder);
 }
 
 ?>

includes/funktion_schichtplan_Tage.php

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

includes/funktion_schichtplan_aray.php

@@ -5,34 +5,34 @@
 #######################################################*/
 
 // erstellt ein Array der Reume
-	$sql = "SELECT `RID`, `Name` FROM `Room` ".
+  $sql = "SELECT `RID`, `Name` FROM `Room` ".
-		"WHERE `Show`='Y'". 
+    "WHERE `Show`='Y'". 
-		"ORDER BY `Number`, `Name`;";
+    "ORDER BY `Number`, `Name`;";
-	
+  
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
 
-	for ($i=0; $i<$rowcount; $i++)
+  for ($i=0; $i<$rowcount; $i++)
-	{
+  {
-		$Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
+    $Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-		$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
+    $Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-	
+  
-		$RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
+    $RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
-	}
+  }
 
 // erstellt ein Aray der Engeltypen
-	$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
+  $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
-	for ($i=0; $i<$rowcount; $i++)
+  for ($i=0; $i<$rowcount; $i++)
-	{
+  {
-		$EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
+    $EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
-		$EngelType[$i]["Name"]  = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+    $EngelType[$i]["Name"]  = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
 
-		$EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
+    $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
-			mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+      mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-		$TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
+    $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
-	}												
+  }                        
 
 include ("funktion_schichtplan_Tage.php");
 ?>

includes/funktion_schichtplan_beamer.php

@@ -5,176 +5,176 @@
 #######################################################*/
 
 // erstellt ein Array der Reume
-	$sql = "SELECT `RID`, `Name` FROM `Room` ".
+  $sql = "SELECT `RID`, `Name` FROM `Room` ".
-		"WHERE `Show`='Y'". 
+    "WHERE `Show`='Y'". 
-		"ORDER BY `Number`, `Name`;";
+    "ORDER BY `Number`, `Name`;";
-	
+  
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
 
-	for ($i=0; $i<$rowcount; $i++)
+  for ($i=0; $i<$rowcount; $i++)
-	{
+  {
-		$Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
+    $Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-		$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
+    $Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-	
+  
-		$RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
+    $RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
-	}
+  }
 
 // erstellt ein Aray der Engeltypen
-	$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
+  $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
-	for ($i=0; $i<$rowcount; $i++)
+  for ($i=0; $i<$rowcount; $i++)
-	{
+  {
-		$EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
+    $EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
-		$EngelType[$i]["Name"]  = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+    $EngelType[$i]["Name"]  = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
 
-		$EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
+    $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
-			mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+      mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-	}												
+  }                        
 
 
 /*#######################################################
-#	gibt die engelschischten aus			#
+#  gibt die engelschischten aus      #
 #######################################################*/
 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, $con;
+  global $EngelType, $EngelTypeID, $con;
-	//form Config
+  //form Config
-	global $DEBUG;
+  global $debug;
 
-	$Out = "";
+  $Out = "";
 
-	$Out.= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
+  $Out.= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
 
-	$Out.= "\t\t\t<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
+  $Out.= "\t\t\t<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
-		"\t\t\t\t<col width=\"45%\">\n".
+    "\t\t\t\t<col width=\"45%\">\n".
-		"\t\t\t\t<col width=\"*\">\n".
+    "\t\t\t\t<col width=\"*\">\n".
-		"\t\t\t\t</colgroup>\n";
+    "\t\t\t\t</colgroup>\n";
 
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	// SQL abfrage für die benötigten schichten
+  // SQL abfrage für die benötigten schichten
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	$SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
+  $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	
+  
-	$Anzahl = mysql_num_rows($Erg);
+  $Anzahl = mysql_num_rows($Erg);
-	$Feld=-1;
+  $Feld=-1;
-	for( $i = 0; $i < $Anzahl; $i++ )
+  for( $i = 0; $i < $Anzahl; $i++ )
-	{
+  {
-		
+    
-		$Temp_TID = mysql_result($Erg, $i, "TID");
+    $Temp_TID = mysql_result($Erg, $i, "TID");
-		
+    
-		// wenn sich der Type ändert wird zumnästen feld geweckselt
+    // wenn sich der Type ändert wird zumnästen feld geweckselt
-		if( ($i==0) || ($Temp_TID_old != $Temp_TID) )
+    if( ($i==0) || ($Temp_TID_old != $Temp_TID) )
-		{
+    {
-			$Feld++;
+      $Feld++;
-			$Temp[$Feld]["free"]=0;
+      $Temp[$Feld]["free"]=0;
-			$Temp[$Feld]["Engel"]=array();
+      $Temp[$Feld]["Engel"]=array();
-		}
+    }
-			
+      
-		$Temp[$Feld]["TID"] = $Temp_TID;
+    $Temp[$Feld]["TID"] = $Temp_TID;
-		$Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
+    $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
-		
+    
-		// ist es eine zu vergeben schicht?
+    // ist es eine zu vergeben schicht?
-		if( $Temp[$Feld]["UID"] == 0 )
+    if( $Temp[$Feld]["UID"] == 0 )
-			$Temp[$Feld]["free"]++;
+      $Temp[$Feld]["free"]++;
-		else
+    else
-			$Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
+      $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
-		
+    
-		$Temp_TID_old = $Temp[$Feld]["TID"];
+    $Temp_TID_old = $Temp[$Feld]["TID"];
-	} // FOR
+  } // FOR
-	
+  
 
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	// Aus gabe der Schicht
+  // Aus gabe der Schicht
-	///////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
-	if( isset($Temp) && count($Temp) )
+  if( isset($Temp) && count($Temp) )
-	  foreach( $Temp as $TempEntry => $TempValue )
+    foreach( $Temp as $TempEntry => $TempValue )
-	  {
+    {
-	  	$Out.= "\t\t\t<tr>\n";
+      $Out.= "\t\t\t<tr>\n";
-		
+    
-		// ausgabe EngelType
+    // ausgabe EngelType
-		$Out.= "\t\t\t\t<td>". $EngelTypeID[ $TempValue["TID"] ];
+    $Out.= "\t\t\t\t<td>". $EngelTypeID[ $TempValue["TID"] ];
-		
+    
-		// ausgabe Eingetragener Engel
+    // ausgabe Eingetragener Engel
-		if( count($TempValue["Engel"]) > 0  )
+    if( count($TempValue["Engel"]) > 0  )
-		{
+    {
-			if( count($TempValue["Engel"]) == 1  )
+      if( count($TempValue["Engel"]) == 1  )
-				$Out.= " ". trim(Get_Text("inc_schicht_ist")). ":";
+        $Out.= " ". trim(Get_Text("inc_schicht_ist")). ":";
-			else 
+      else 
-				$Out.= " ". trim(Get_Text("inc_schicht_sind")). ":";
+        $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":";
-			$Out.= "</td>\n";
+      $Out.= "</td>\n";
-			$Out.= "\t\t\t\t<td>";
+      $Out.= "\t\t\t\t<td>";
-			
+      
-			foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
+      foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
-      				$Out.= UID2Nick( $TempEngelID ). ", ";
+              $Out.= UID2Nick( $TempEngelID ). ", ";
-//      				$Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", ";
+//              $Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", ";
-			$Out = substr( $Out, 0, strlen($Out)-2 );
+      $Out = substr( $Out, 0, strlen($Out)-2 );
-		}
+    }
-		else
+    else
-		{
+    {
-			$Out.= ":</td>\n";
+      $Out.= ":</td>\n";
-			$Out.= "\t\t\t\t<td>\n";
+      $Out.= "\t\t\t\t<td>\n";
-		}
+    }
-	  	
+      
-		
+    
-		// ausgabe benötigter Engel
+    // ausgabe benötigter Engel
-		////////////////////////////
+    ////////////////////////////
-		if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y")
+    if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y")
                 {
-			if ( $TempValue["free"] > 0)
+      if ( $TempValue["free"] > 0)
-			{
+      {
-				if( count($TempValue["Engel"]) > 0)
+        if( count($TempValue["Engel"]) > 0)
-					$Out.= ", ";
+          $Out.= ", ";
-				$Out.= $TempValue["free"]. "x free ";
+        $Out.= $TempValue["free"]. "x free ";
-			}
+      }
-		}
+    }
-		$Out.= "</td>\n";
+    $Out.= "</td>\n";
-		$Out.= "\t\t\t</tr>\n";
+    $Out.= "\t\t\t</tr>\n";
-	
+  
-	} // FOREACH
+  } // FOREACH
 
-	$Out.= "\t\t\t</table>\n\t";
+  $Out.= "\t\t\t</table>\n\t";
-	
+  
-	return $Out;
+  return $Out;
 } // function Ausgabe_Feld_Inhalt
 
 
 
 /*#######################################################
-#	gibt die engelschischten  für einen Ruam aus	#
+#  gibt die engelschischten  für einen Ruam aus  #
 #######################################################*/
 function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) 
 {
-	global $con;
+  global $con;
-	
+  
-	$SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ".
+  $SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ".
-		"WHERE (  (`RID` = '$RID') AND ".
+    "WHERE (  (`RID` = '$RID') AND ".
-			"((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ".
+      "((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ".
-			" (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;";
+      " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;";
-	
+  
-	$ErgRoom = mysql_query($SQL, $con);
+  $ErgRoom = mysql_query($SQL, $con);
-	$Out= "\t<td>";
+  $Out= "\t<td>";
-	if( mysql_num_rows( $ErgRoom)>0 )
+  if( mysql_num_rows( $ErgRoom)>0 )
-		for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ )
+    for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ )
-		{
+    {
-			$AnzahlEintraege++;
+      $AnzahlEintraege++;
-			$Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), 
+      $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), 
-							mysql_result( $ErgRoom, $i-1, "Man"));
+              mysql_result( $ErgRoom, $i-1, "Man"));
-			if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) )
+      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";
+//        $Out.= "<hr width=\"95%\" align=\"center\">\n\t\t\t\t";
-			
+      
-		}
+    }
-	else
+  else
-		$Out.= "&nbsp;";
+    $Out.= "&nbsp;";
-	
+  
-	$Out.= "</td>\n";
+  $Out.= "</td>\n";
-	
+  
-	return $Out;
+  return $Out;
 }
 
 ?>

includes/funktion_user.php

@@ -1,132 +1,111 @@
 <?php
+  function UID2Nick($UID) {
+    global $con;
 
-function UID2Nick($UID) 
+    if($UID > 0)
-{
+      $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'";
-  global $con;
+    else
+      $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'";
 
-  if( $UID>0) {
+    $Erg = mysql_query($SQL, $con);
-	$SQL = "SELECT Nick FROM `User` WHERE UID='$UID'";
+
-  } else {
+    if(mysql_num_rows($Erg)) {
-	$SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'";
+      if($UID > 0)
+        return mysql_result($Erg, 0);
+      else
+        return "Group-".mysql_result($Erg, 0);
+    } else {
+      if($UID == -1)
+        return "logout User";
+      else
+        return "UserID $UID not found";
+    }
   }
-  $Erg = mysql_query($SQL, $con);
 
-  //echo $UID."#";
+  function TID2Type($TID) {
-  if( mysql_num_rows($Erg)) {
+    global $con;
-	if( $UID>0 ) {
-		return mysql_result($Erg, 0);
-	} else {
-		return "Group-".mysql_result($Erg, 0);
-	}
-  } else {
-  	if( $UID == -1)
-		return "logout User";
-	else
-	  	return "UserID $UID not found";
-  }
-}
-
-
-function TID2Type($TID) 
-{
-  global $con;
   
-  $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
+    $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
-  $Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
 
-  if( mysql_num_rows($Erg))
+    if(mysql_num_rows($Erg))
-  	return mysql_result($Erg, 0);
+      return mysql_result($Erg, 0);
-  else
+    else
-  	return "";
+      return "";
-}
+  }
 
+  function ReplaceSmilies($neueckig) {
+    global $url, $ENGEL_ROOT;
 
-function ReplaceSmilies($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);
-	global $url, $ENGEL_ROOT;
+    $neueckig = str_replace(";o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_wind.gif\">", $neueckig);
+    $neueckig = str_replace(":)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_smile.gif\">", $neueckig);
+    $neueckig = str_replace(":-)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_smile.gif\">", $neueckig);
+    $neueckig = str_replace(":(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_sad.gif\">", $neueckig);
+    $neueckig = str_replace(":-(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_sad.gif\">", $neueckig);
+    $neueckig = str_replace(":o(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_sad.gif\">", $neueckig);
+    $neueckig = str_replace(":o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_lol.gif\">", $neueckig);
+    $neueckig = str_replace(";o(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_cry.gif\">", $neueckig);
+    $neueckig = str_replace(";(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_cry.gif\">", $neueckig);
+    $neueckig = str_replace(";-(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_cry.gif\">", $neueckig);
+    $neueckig = str_replace("8)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_rolleyes.gif\">", $neueckig);
+    $neueckig = str_replace("8o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_rolleyes.gif\">", $neueckig);
+    $neueckig = str_replace(":P",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_evil.gif\">", $neueckig);
+    $neueckig = str_replace(":-P",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_evil.gif\">", $neueckig);
+    $neueckig = str_replace(":oP",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_evil.gif\">", $neueckig);
+    $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);
 
-	$neueckig = $eckig;
+    return $neueckig;
-	$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);
-	$neueckig = str_replace(":)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_smile.gif\">",$neueckig);
-        $neueckig = str_replace(":-)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_smile.gif\">",$neueckig);
-	$neueckig = str_replace(":(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_sad.gif\">",$neueckig);
-        $neueckig = str_replace(":-(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_sad.gif\">",$neueckig);
-	$neueckig = str_replace(":o(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_sad.gif\">",$neueckig);
-	$neueckig = str_replace(":o)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_lol.gif\">",$neueckig);
-	$neueckig = str_replace(";o(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_cry.gif\">",$neueckig);
-	$neueckig = str_replace(";(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_cry.gif\">",$neueckig);
-        $neueckig = str_replace(";-(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_cry.gif\">",$neueckig);
-        $neueckig = str_replace("8)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_rolleyes.gif\">",$neueckig);
-	$neueckig = str_replace("8o)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_rolleyes.gif\">",$neueckig);
-	$neueckig = str_replace(":P",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_evil.gif\">",$neueckig);
-	$neueckig = str_replace(":-P",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_evil.gif\">",$neueckig);
-	$neueckig = str_replace(":oP",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_evil.gif\">",$neueckig);
-	$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) {
+    global $con;
 
-function GetPicturShow($UID)
+    $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'";
-{
+    $res = mysql_query( $SQL, $con);
-	global $con;
 
-	$SQL= "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'";
+    if(mysql_num_rows($res) == 1)
-	$res = mysql_query( $SQL, $con);
+      return mysql_result($res, 0, 0);
-	if( mysql_num_rows($res) == 1)
+    else
-		return mysql_result( $res, 0, 0);
+      return "";
-	else
+  }
-		return "";
-}
 
+  function displayPictur($UID, $height = "30") {
+    global $url, $ENGEL_ROOT;
 
-/* Parameter: 
+    if($height > 0)
-	<UserID>
+      return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" height=\"$height\" alt=\"picture of USER$UID\" class=\"photo\">");
-	[<Höhe des Bildes (wenn die höhe kleiner 1 ist wird die höhe nicht begrenzt)>] */
+    else
-function displayPictur($UID, $height="30") 
+      return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" alt=\"picture of USER$UID\">");
-{
+  }
-	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") {
+    global $con, $url, $ENGEL_ROOT;
 
-/* Parameter: 
+    if( GetPicturShow($UID) == 'Y')
-	<UserID>
+      return "&nbsp;". displayPictur(  $UID, $height);
-	[<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')
-		return "&nbsp;". displayPictur(  $UID, $height);
         
-	// show avator
+    // show avator
-	$asql = "select * from User where UID = $UID";
+    $asql = "select * from User where UID = $UID";
-	$aerg = mysql_query ($asql, $con);
+    $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\">");
 
-}
+    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;
-  global $con;
   
-  $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'";
+    $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'";
-  $Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
-
-  //echo $UID."#";
-  if( mysql_num_rows($Erg))
-	return mysql_result($Erg, 0);
-  else
-  	return "0";
-}
 
+    if(mysql_num_rows($Erg))
+      return mysql_result($Erg, 0);
+    else
+      return "0";
+  }
 ?>

includes/funktion_xml.php

@@ -1,13 +1,10 @@
-<?PHP
+<?php
-
+class element {
-
+  var $name = '';
-class element
+  var $attributes = array();
-{
+  var $data = '';
-	var $name = '';
+  var $depth = 0;
-	var $attributes = array();
+  var $sub = array();
-	var $data = '';
-	var $depth = 0;
-	var $sub = array();
 }
 
 $XMLDEBUG = 0;
@@ -16,147 +13,142 @@ $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;
-	global $XMLDEBUG;
+
-	if( $XMLDEBUG)
+  if($XMLDEBUG) {
-	{
+    $Data = htmlspecialchars($Data);
-		$Data = htmlspecialchars($Data);
+    $Data = mysql_escape_string($Data);
-		$Data = mysql_escape_string($Data);
+    $Data = htmlentities($Data);
-		$Data = htmlentities($Data);
+  }
-	}
+
-	$Data = utf8_decode($Data);
+  $Data = utf8_decode($Data);
-	return $Data;
+  return $Data;
 }
 
+function dataXMLmain($Data, &$Objekt, $Tiefe) {
+  global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
+  
+  if($XMLDEBUG)
+    echo "?$Tiefe$depth";
 
-function dataXMLmain( $Data, &$Objekt, $Tiefe )
+  if(($depth-1) == $Tiefe) {
-{
+    $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES);
-	global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
+     
-	
+    if($XMLDEBUG)
-	if( $XMLDEBUG)	
+      echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???<br />";
-	  echo "?$Tiefe$depth";
+  } else
-	if( ($depth-1)==$Tiefe)
+    dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
-	{	
-//		$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>";
-	}
-	else
-		dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
 }
 
-function startXMLmain( $Data, &$Objekt, $Tiefe )
+function startXMLmain( $Data, &$Objekt, $Tiefe ) {
-{
+  global $XMLpos, $depth, $XMLDEBUG;
-	global $XMLpos, $depth, $XMLDEBUG;
 
-	if( $XMLDEBUG)
+  if( $XMLDEBUG)
-	 if($Tiefe==1) 
+   if($Tiefe==1) 
-	 { print_r(array_values ($XMLpos)); echo "--".$Data->name;
+   { print_r(array_values ($XMLpos)); echo "--".$Data->name;
-	   echo " #$Tiefe/$depth#";
+     echo " #$Tiefe/$depth#";
-	 }
+   }
-	
+  
-	if( $depth==$Tiefe)
+  if( $depth==$Tiefe)
-	{
+  {
-		$Objekt->sub[ $XMLpos[$Tiefe] ] = $Data;
+    $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data;
-		if( $XMLDEBUG)
+    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
+  else
-		startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
+    startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
 }
 
 function start_element_handler($parser, $name, $attribs)
 {
-	global $depth, $XMLmain, $XMLpos;
+  global $depth, $XMLmain, $XMLpos;
 
-	$Data = new element;
+  $Data = new element;
-	$Data->name = $name;
+  $Data->name = $name;
-	while(list($key, $value) = each($attribs))
+  while(list($key, $value) = each($attribs))
-		$Data->attributes[$key] = convertValues($value);
+    $Data->attributes[$key] = convertValues($value);
-	$Data->depth = $depth;
+  $Data->depth = $depth;
- 	$XMLpos[$depth]++;
+   $XMLpos[$depth]++;
 
-	if( $depth==0)
+  if( $depth==0)
-		$XMLmain= $Data;
+    $XMLmain= $Data;
-	else
+  else
-		startXMLmain( $Data, $XMLmain, 1);
+    startXMLmain( $Data, $XMLmain, 1);
 
-	$depth++;
+  $depth++;
 }
 
 function end_element_handler($parser, $name)
 {
-	global $depth, $XMLpos;
+  global $depth, $XMLpos;
-	$XMLpos[$depth]=0;
+  $XMLpos[$depth]=0;
-	$depth--;
+  $depth--;
 }
 
 function character_data_handler($parser, $data)
 {
-	global $XMLmain;
+  global $XMLmain;
-	if( strlen(trim($data)) )
+  if( strlen(trim($data)) )
-		dataXMLmain( $data, $XMLmain, 1);
+    dataXMLmain( $data, $XMLmain, 1);
 }
 
 /*#######################################################################################*/
 function readXMLfile( $file ) 
 {
-	global $XMLDEBUG;
+  global $XMLDEBUG;
-	
+  
-	//$xml_parser = xml_parser_create_ns();
+  //$xml_parser = xml_parser_create_ns();
-	$xml_parser = xml_parser_create("UTF-8");
+  $xml_parser = xml_parser_create("UTF-8");
-	xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
+  xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
-	xml_set_character_data_handler($xml_parser, "character_data_handler");
+  xml_set_character_data_handler($xml_parser, "character_data_handler");
-	
+  
-	if (file_exists($file)) 
+  if (file_exists($file)) 
-	{
+  {
-		if (!($fp = fopen($file, "r")))
+    if (!($fp = fopen($file, "r")))
-		{
+    {
-			echo(" <h1>could not open XML file \"$file\"</h1>");
+      echo(" <h1>could not open XML file \"$file\"</h1>");
-			return -1;
+      return -1;
-		}
+    }
-	}
+  }
-	else
+  else
-	{
+  {
-		echo(" <h1>XML file \"$file\" not exist</h1>");
+    echo(" <h1>XML file \"$file\" not exist</h1>");
-		return -1;
+    return -1;
-	}
+  }
 
-	if( $XMLDEBUG)	echo "<pre>";
+  if( $XMLDEBUG)  echo "<pre>";
-	while ($data = fread($fp, 4096)) 
+  while ($data = fread($fp, 4096)) 
-	{
+  {
-		if (!xml_parse($xml_parser, $data, feof($fp))) 
+    if (!xml_parse($xml_parser, $data, feof($fp))) 
-		{
+    {
-			die(sprintf("XML error: %s at line %d",
+      die(sprintf("XML error: %s at line %d",
-				    xml_error_string(xml_get_error_code($xml_parser)),
+            xml_error_string(xml_get_error_code($xml_parser)),
-				    xml_get_current_line_number($xml_parser)));
+            xml_get_current_line_number($xml_parser)));
-		}
+    }
-	}
+  }
-	if( $XMLDEBUG)	echo "</pre>";
+  if( $XMLDEBUG)  echo "</pre>";
-	xml_parser_free($xml_parser);
+  xml_parser_free($xml_parser);
-	return 0;
+  return 0;
 }
 
 /*#######################################################################################*/
 function getXMLsubPease( $Sourse, $Name ) 
 {
-	foreach($Sourse->sub as $key => $value) {
+  foreach($Sourse->sub as $key => $value) {
-		if ($value->name == $Name) {
+    if ($value->name == $Name) {
-			return $value; 
+      return $value; 
-		}
+    }
-	}
+  }
 
-	echo "<h1>Fehler: getXMLsubPease( $Sourse, $Name ) not found</h1>";
+  echo "<h1>Fehler: getXMLsubPease( $Sourse, $Name ) not found</h1>";
-//		die;  
+//    die;  
 }
 
 /*#######################################################################################*/
 function getXMLsubData( $Sourse, $Name ) 
 {
-	$XML = getXMLsubPease( $Sourse, $Name);
+  $XML = getXMLsubPease( $Sourse, $Name);
-	return $XML->data;
+  return $XML->data;
 }
 ?>

includes/funktion_xml_room.php

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

includes/funktion_xml_schudle.php

@@ -1,178 +1,178 @@
-<?PHP
+<?php
 
 /*##############################################################################################
-				        s c h e d u l e 
+                s c h e d u l e 
   ##############################################################################################*/
 echo "\n\n<h1>Schedule:</h1>\n";
 
 
 function SaveSchedule()
 {
-	global  $RoomID, $RoomName;
+  global  $RoomID, $RoomName;
-	global $con;
+  global $con;
 
-	if( isset($_GET["PSIDXML"]) && 
+  if( isset($_GET["PSIDXML"]) && 
-	    isset($_GET["DateXML"]) &&
+      isset($_GET["DateXML"]) &&
-	    isset($_GET["RIDXML"]) &&
+      isset($_GET["RIDXML"]) &&
-	    isset($_GET["LenXML"]) &&
+      isset($_GET["LenXML"]) &&
-	    isset($_GET["ManXML"]) &&
+      isset($_GET["ManXML"]) &&
-	    isset($_GET["URLXML"])  )
+      isset($_GET["URLXML"])  )
-	{
+  {
-		//erzeuge von `DateE`
+    //erzeuge von `DateE`
-		$TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60);
+    $TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60);
-		$TimeEnd  = ($_GET["LenXML"] + $TimeStart) * 60;
+    $TimeEnd  = ($_GET["LenXML"] + $TimeStart) * 60;
-		$TimeM = $TimeEnd % 60;
+    $TimeM = $TimeEnd % 60;
-		$TimeH = ($TimeEnd - $TimeM)/60;
+    $TimeH = ($TimeEnd - $TimeM)/60;
-		if( $TimeH>=24 )
+    if( $TimeH>=24 )
-		{
+    {
-			$TimeH -= 24;
+      $TimeH -= 24;
-			$DateEnd = substr($_GET["DateXML"], 0, 8). 
+      $DateEnd = substr($_GET["DateXML"], 0, 8). 
-				   (substr($_GET["DateXML"], 8, 2)+1). " ";
+           (substr($_GET["DateXML"], 8, 2)+1). " ";
-		}
+    }
-		else
+    else
-			$DateEnd = substr($_GET["DateXML"], 0, 11);
+      $DateEnd = substr($_GET["DateXML"], 0, 11);
-		$DateEnd .= "$TimeH:$TimeM:00";
+    $DateEnd .= "$TimeH:$TimeM:00";
-		
+    
-		//Namen ermitteln
+    //Namen ermitteln
-		$_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]];
+    $_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]];
-		
+    
-		//Update OR insert ?
+    //Update OR insert ?
-		$SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
+    $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
-		$Erg1 =  mysql_query($SQL1, $con);
+    $Erg1 =  mysql_query($SQL1, $con);
-		
+    
-		if( mysql_num_rows($Erg1)==0)
+    if( mysql_num_rows($Erg1)==0)
-		{
+    {
-			echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'";
+      echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'";
-			$SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ".
+      $SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ".
-				"VALUES ('". $_GET["PSIDXML"]. "', ".
+        "VALUES ('". $_GET["PSIDXML"]. "', ".
-					"'". $_GET["DateXML"]. "', ".
+          "'". $_GET["DateXML"]. "', ".
-					"'". $DateEnd. "', ".
+          "'". $DateEnd. "', ".
-					"'". $_GET["LenXML"]. "', ".
+          "'". $_GET["LenXML"]. "', ".
-					"'". $_GET["RIDXML"]. "', ".
+          "'". $_GET["RIDXML"]. "', ".
-					"'". mysql_escape_string($_GET["ManXML"]). "', ".
+          "'". mysql_escape_string($_GET["ManXML"]). "', ".
-					"'". $_GET["URLXML"]. "'".
+          "'". $_GET["URLXML"]. "'".
-					");";
+          ");";
-		}
+    }
-		else
+    else
-		{
+    {
-			echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". 
+      echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". 
-				mysql_result( $Erg1, 0, "SID"). ")";
+        mysql_result( $Erg1, 0, "SID"). ")";
-			$SQL= "UPDATE `Shifts` SET ".
+      $SQL= "UPDATE `Shifts` SET ".
-				"`DateS` = '". $_GET["DateXML"]. "', ".
+        "`DateS` = '". $_GET["DateXML"]. "', ".
-				"`DateE` = '". $DateEnd. "', ".
+        "`DateE` = '". $DateEnd. "', ".
-				"`Len` = '". $_GET["LenXML"]. "', ".
+        "`Len` = '". $_GET["LenXML"]. "', ".
-				"`RID` = '". $_GET["RIDXML"]. "', ".
+        "`RID` = '". $_GET["RIDXML"]. "', ".
-				"`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ".
+        "`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ".
-				"`URL`= '". $_GET["URLXML"]. "' ".
+        "`URL`= '". $_GET["URLXML"]. "' ".
-				"WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;";
+        "WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;";
-		}
+    }
-		$Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
-		if( $Erg )
+    if( $Erg )
-		{
+    {
-			echo ", war erfogreich<br>\n";
+      echo ", war erfogreich<br />\n";
 
-			//SID auslesen
+      //SID auslesen
-			$SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
+      $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
-			$Erg1 =  mysql_query($SQL1, $con);
+      $Erg1 =  mysql_query($SQL1, $con);
-			$newSID = mysql_result($Erg1, 0, 0);
+      $newSID = mysql_result($Erg1, 0, 0);
 
-			// erstellt ein Array der Reume
+      // erstellt ein Array der Reume
-		        $sql2 =	"SELECT * FROM `Room` ".
+            $sql2 =  "SELECT * FROM `Room` ".
-				"WHERE `RID`='".$_GET["RIDXML"]. "' ".
+        "WHERE `RID`='".$_GET["RIDXML"]. "' ".
-	        		"ORDER BY `Number`, `Name`;";
+              "ORDER BY `Number`, `Name`;";
-			$Erg2 = mysql_query( $sql2, $con);
+      $Erg2 = mysql_query( $sql2, $con);
-			for( $j=0; $j<mysql_num_fields( $Erg2); $j++)
+      for( $j=0; $j<mysql_num_fields( $Erg2); $j++)
-			{
+      {
-				if( substr( mysql_field_name($Erg2, $j), 0, 12)=="DEFAULT_EID_" )
+        if( substr( mysql_field_name($Erg2, $j), 0, 12)=="DEFAULT_EID_" )
-				{
+        {
-					// extract db values
+          // extract db values
-					$EngelNeeded = mysql_result($Erg2, 0, $j);
+          $EngelNeeded = mysql_result($Erg2, 0, $j);
-					$EngelTypeID = substr( mysql_field_name($Erg2, $j), 12);
+          $EngelTypeID = substr( mysql_field_name($Erg2, $j), 12);
 
 
-					// chech exist shifts
+          // chech exist shifts
-		        		$sqlShifts =	"SELECT * FROM `ShiftEntry` ".
+                $sqlShifts =  "SELECT * FROM `ShiftEntry` ".
-							"WHERE   `SID`='". $newSID. "' AND ".
+              "WHERE   `SID`='". $newSID. "' AND ".
-								"`TID` = '". $EngelTypeID. "';";
+                "`TID` = '". $EngelTypeID. "';";
-					$ErgShifts = mysql_query( $sqlShifts, $con);
+          $ErgShifts = mysql_query( $sqlShifts, $con);
-					$EngelNeeded_Exist = mysql_num_rows( $ErgShifts);
+          $EngelNeeded_Exist = mysql_num_rows( $ErgShifts);
-					
+          
-					// check for not empty shifts
+          // check for not empty shifts
-		        		$sqlShiftsNotEmpty =	"SELECT * FROM `ShiftEntry` ".
+                $sqlShiftsNotEmpty =  "SELECT * FROM `ShiftEntry` ".
-								"WHERE   `SID`='". $newSID. "' AND ".
+                "WHERE   `SID`='". $newSID. "' AND ".
-									"`TID` = '". $EngelTypeID. "' AND ".
+                  "`TID` = '". $EngelTypeID. "' AND ".
-									"`UID` != 0 ;";
+                  "`UID` != 0 ;";
-					$ErgShiftsNotEmpty = mysql_query( $sqlShiftsNotEmpty, $con);
+          $ErgShiftsNotEmpty = mysql_query( $sqlShiftsNotEmpty, $con);
-					$EngelNeeded_NotEmpty = mysql_num_rows( $ErgShiftsNotEmpty);
+          $EngelNeeded_NotEmpty = mysql_num_rows( $ErgShiftsNotEmpty);
-					
+          
-					// Angel create/delte?
+          // Angel create/delte?
-					if( $EngelNeeded > $EngelNeeded_Exist)
+          if( $EngelNeeded > $EngelNeeded_Exist)
-					{
+          {
-						echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ".
+            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++ )
+            for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ )
-						{
+            {
-							$SQL3  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (".
+              $SQL3  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (".
-								 "'". $newSID. "', ".
+                 "'". $newSID. "', ".
-								 "'". $EngelTypeID. "');";
+                 "'". $EngelTypeID. "');";
-							$Erg3 = mysql_query($SQL3, $con);
+              $Erg3 = mysql_query($SQL3, $con);
-							if ($Erg3 == 1) 
+              if ($Erg3 == 1) 
-								echo "pass ";
+                echo "pass ";
-							else
+              else
-								echo "fail <u>". mysql_error($con). 
+                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)
+          else if ($EngelNeeded < $EngelNeeded_Exist)
-					{
+          {
-						if( $EngelNeeded > $EngelNeeded_NotEmpty)
+            if( $EngelNeeded > $EngelNeeded_NotEmpty)
-						{
+            {
-							$EngelMin = $EngelNeeded;
+              $EngelMin = $EngelNeeded;
-						}
+            }
-						else
+            else
-						{
+            {
-							$EngelMin = $EngelNeeded_NotEmpty;
+              $EngelMin = $EngelNeeded_NotEmpty;
-							echo "---> WARING ". $EngelNeeded_NotEmpty. 
+              echo "---> WARING ". $EngelNeeded_NotEmpty. 
-								" shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t";
+                " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t";
-						}
+            }
 
-						echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ".  
+            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++ )
+            for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ )
-						{
+            {
-							$SQL3  = "DELETE FROM `ShiftEntry` ".
+              $SQL3  = "DELETE FROM `ShiftEntry` ".
-								 "WHERE  `SID` = ". $newSID. " AND ".
+                 "WHERE  `SID` = ". $newSID. " AND ".
-								 	"`TID` = ". $EngelTypeID. " AND ".
+                   "`TID` = ". $EngelTypeID. " AND ".
-									"`UID` = 0 ".
+                  "`UID` = 0 ".
-									"LIMIT 1;";
+                  "LIMIT 1;";
-							$Erg3 = mysql_query($SQL3, $con);
+              $Erg3 = mysql_query($SQL3, $con);
-							if ($Erg3 == 1) 
+              if ($Erg3 == 1) 
-								echo "pass ";
+                echo "pass ";
-							else
+              else
-								echo "fail <u>". mysql_error($con). 
+                echo "fail <u>". mysql_error($con). 
-									"</u>($SQL3)<br>\n";
+                  "</u>($SQL3)<br />\n";
-						}
+            }
-						echo "<br>\n";
+            echo "<br />\n";
-					}
+          }
-					else
+          else
-					{
+          {
-//						echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "<br>\n";
+//            echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "<br />\n";
-					}
+          }
-				}
+        }
-			}
+      }
 
-		}
+    }
-		else
+    else
-			echo ", war <u>nicht</u> erfogreich.(". 
+      echo ", war <u>nicht</u> erfogreich.(". 
-				mysql_error($con). ")<br>[$SQL]<br>\n";
+        mysql_error($con). ")<br />[$SQL]<br />\n";
-	}
+  }
-	else 
+  else 
-		echo "Fehler in den Parametern!<br>";
+    echo "Fehler in den Parametern!<br />";
 } /*SaveSchedule*/
 
 if( isset($_GET["ScheduleUpdate"]))
-	SaveSchedule();
+  SaveSchedule();
 
 //INIT Status counter
 $DS_OK = 0;
@@ -182,127 +182,127 @@ $Where = "";
 //ausgabe
 echo "<table border=\"0\">\n";
 echo "<tr><th>PSID</th><th>Date</th>".
-	"<th>Room</th><th>Len</th><th>Name</th><th>state</th></tr>\n";
+  "<th>Room</th><th>Len</th><th>Name</th><th>state</th></tr>\n";
 echo "<tr align=\"center\"><td>XML - DB</td><td>XML - DB</td>".
-	"<td>XML - DB</td><td>XML - DB</td><td>XML - DB</td><td></td></tr>\n";
+  "<td>XML - DB</td><td>XML - DB</td><td>XML - DB</td><td></td></tr>\n";
 
 if( $EnableSchudle)
 foreach($XMLmain->sub as $EventKey => $Event)
 {
-	if( $Event->name == "VEVENT")
+  if( $Event->name == "VEVENT")
-	{
+  {
-		echo "<form action=\"dbUpdateFromXLS.php\">\n";
+    echo "<form action=\"dbUpdateFromXLS.php\">\n";
-		echo "\t<tr>\n";
+    echo "\t<tr>\n";
-	
+  
-		$PSIDXML  = getXMLsubData( $Event, "UID"); 
+    $PSIDXML  = getXMLsubData( $Event, "UID"); 
-		$DateXML = 
+    $DateXML = 
-			substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-".
+      substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-".
-			substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-".
+      substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-".
-			substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ".
+      substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ".
-			   substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":".
+         substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":".
-			   substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00";
+         substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00";
-		$LenXML  = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60);
+    $LenXML  = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60);
-		$RIDXML  = getXMLsubData( $Event, "LOCATION");
+    $RIDXML  = getXMLsubData( $Event, "LOCATION");
-		$ManXML  = getXMLsubData( $Event, "SUMMARY");
+    $ManXML  = getXMLsubData( $Event, "SUMMARY");
-		$URLXML  = getXMLsubData( $Event, "URL");
+    $URLXML  = getXMLsubData( $Event, "URL");
-	
+  
-		if( isset($_GET["UpdateALL"]))
+    if( isset($_GET["UpdateALL"]))
-		{
+    {
-			$_GET["PSIDXML"]  = $PSIDXML;
+      $_GET["PSIDXML"]  = $PSIDXML;
-			$_GET["DateXML"] = $DateXML;
+      $_GET["DateXML"] = $DateXML;
-			$_GET["LenXML"]  = $LenXML;
+      $_GET["LenXML"]  = $LenXML;
-			$_GET["RIDXML"]  = $RIDXML;
+      $_GET["RIDXML"]  = $RIDXML;
-			$_GET["ManXML"]  = $ManXML;
+      $_GET["ManXML"]  = $ManXML;
-			$_GET["URLXML"]  = $URLXML;
+      $_GET["URLXML"]  = $URLXML;
-			SaveSchedule();
+      SaveSchedule();
-		}
+    }
-			
+      
-		$SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'";
+    $SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'";
-		$Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
-		if(mysql_num_rows($Erg)>0)
+    if(mysql_num_rows($Erg)>0)
-		{
+    {
-			$SIDDB  = mysql_result($Erg, 0, "SID");
+      $SIDDB  = mysql_result($Erg, 0, "SID");
-			$PSIDDB  = mysql_result($Erg, 0, "PSID");
+      $PSIDDB  = mysql_result($Erg, 0, "PSID");
-			$TimeDB = mysql_result($Erg, 0, "DateS");
+      $TimeDB = mysql_result($Erg, 0, "DateS");
-			$LenDB  = mysql_result($Erg, 0, "Len");
+      $LenDB  = mysql_result($Erg, 0, "Len");
-			if( isset($RoomID[mysql_result($Erg, 0, "RID")]))
+      if( isset($RoomID[mysql_result($Erg, 0, "RID")]))
-				$RIDDB  = $RoomID[mysql_result($Erg, 0, "RID")];
+        $RIDDB  = $RoomID[mysql_result($Erg, 0, "RID")];
-			else
+      else
-				$RIDDB  = "RID". mysql_result($Erg, 0, "RID");
+        $RIDDB  = "RID". mysql_result($Erg, 0, "RID");
-			
+      
-			$ManDB  = mysql_result($Erg, 0, "Man");
+      $ManDB  = mysql_result($Erg, 0, "Man");
-			$URLDB  = mysql_result($Erg, 0, "URL");
+      $URLDB  = mysql_result($Erg, 0, "URL");
-		}
+    }
-		else
+    else
-			$SIDDB = $PSIDDB  = $TimeDB = $LenDB  = $RIDDB  = $ManDB =  $URLDB = "";
+      $SIDDB = $PSIDDB  = $TimeDB = $LenDB  = $RIDDB  = $ManDB =  $URLDB = "";
 
-		echo "\t<td><input name=\"PSIDXML\" type=\"text\" value=\"$PSIDXML\" size=\"2\" eadonly></td>\n";
+    echo "\t<td><input name=\"PSIDXML\" type=\"text\" value=\"$PSIDXML\" size=\"2\" eadonly></td>\n";
-		echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"$DateXML\" size=\"17\" readonly>\n\t\t".
+    echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"$DateXML\" size=\"17\" readonly>\n\t\t".
-		   "<input name=\"DateDB\" type=\"text\" value=\"$TimeDB\" size=\"17\" readonly></td>\n";
+       "<input name=\"DateDB\" type=\"text\" value=\"$TimeDB\" size=\"17\" readonly></td>\n";
-		echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"$RIDXML\" size=\"15\" readonly>\n\t\t".
+    echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"$RIDXML\" size=\"15\" readonly>\n\t\t".
-		   "<input name=\"RIDDB\" type=\"text\" value=\"$RIDDB\" size=\"15\" readonly></td>\n";
+       "<input name=\"RIDDB\" type=\"text\" value=\"$RIDDB\" size=\"15\" readonly></td>\n";
-		echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"$LenXML\" size=\"1\"readonly>\n\t\t".
+    echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"$LenXML\" size=\"1\"readonly>\n\t\t".
-		   "<input name=\"LenDB\" type=\"text\" value=\"$LenDB\" size=\"1\"readonly></td>\n";
+       "<input name=\"LenDB\" type=\"text\" value=\"$LenDB\" size=\"1\"readonly></td>\n";
-		echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"$ManXML\" size=\"40\"readonly>\n\t\t".
+    echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"$ManXML\" size=\"40\"readonly>\n\t\t".
-		   "<input name=\"ManDB\" type=\"text\" value=\"$ManDB\" size=\"40\"readonly></td>\n";
+       "<input name=\"ManDB\" type=\"text\" value=\"$ManDB\" size=\"40\"readonly></td>\n";
-		echo "\t<td><input name=\"URLXML\" type=\"hidden\" value=\"$URLXML\"></td>\n";
+    echo "\t<td><input name=\"URLXML\" type=\"hidden\" value=\"$URLXML\"></td>\n";
-		echo "\t<td><input name=\"URLDB\" type=\"hidden\" value=\"$URLDB\"></td>\n";
+    echo "\t<td><input name=\"URLDB\" type=\"hidden\" value=\"$URLDB\"></td>\n";
-		if( !(	$PSIDXML==$PSIDDB && 
+    if( !(  $PSIDXML==$PSIDDB && 
-			$DateXML==$TimeDB && 
+      $DateXML==$TimeDB && 
-			$RIDXML==$RIDDB && 
+      $RIDXML==$RIDDB && 
-			$LenXML==$LenDB &&
+      $LenXML==$LenDB &&
-			$ManXML==$ManDB &&
+      $ManXML==$ManDB &&
-			$URLXML==$URLDB) )
+      $URLXML==$URLDB) )
-		{
+    {
-			echo "\t<td><input type=\"submit\" name=\"ScheduleUpdate\" value=\"update\"></td>\n";
+      echo "\t<td><input type=\"submit\" name=\"ScheduleUpdate\" value=\"update\"></td>\n";
-			$DS_KO++;
+      $DS_KO++;
-		}
+    }
-		else
+    else
-		{
+    {
-			echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "</td>\n";
+      echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "</td>\n";
-			$DS_OK++;
+      $DS_OK++;
-		}
+    }
-		echo "\t</tr>\n";
+    echo "\t</tr>\n";
-		echo "</form>\n";
+    echo "</form>\n";
-		$Where.= " OR `PSID`='$PSIDXML'";
+    $Where.= " OR `PSID`='$PSIDXML'";
-	}
+  }
 }
 echo "<tr><td colspan=\"6\">status: $DS_KO/$DS_OK nicht Aktuel.</td></tr>\n";
 
 
 //Anzeige von nicht im XML File vorkommende entraege
 if( $Where =="")
-	$SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';";
+  $SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';";
 else
-	$SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';";
+  $SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';";
-	
+  
 $Erg2 = mysql_query($SQL2, $con);
 echo mysql_error($con);
 if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB )
-	for( $i=0; $i<mysql_num_rows( $Erg2); $i++)
+  for( $i=0; $i<mysql_num_rows( $Erg2); $i++)
-	{
+  {
-		echo "\t<tr>\n";
+    echo "\t<tr>\n";
-		$SID  = mysql_result($Erg2, $i, "SID");
+    $SID  = mysql_result($Erg2, $i, "SID");
-		$Time = mysql_result($Erg2, $i, "DateS");
+    $Time = mysql_result($Erg2, $i, "DateS");
-		$Len  = mysql_result($Erg2, $i, "Len");
+    $Len  = mysql_result($Erg2, $i, "Len");
-		if( isset($RoomID[ mysql_result($Erg2, $i, "RID")]))
+    if( isset($RoomID[ mysql_result($Erg2, $i, "RID")]))
-			$RID  = $RoomID[ mysql_result($Erg2, $i, "RID")];
+      $RID  = $RoomID[ mysql_result($Erg2, $i, "RID")];
-		else
+    else
-			$RID  = "RID.". mysql_result($Erg2, $i, "RID");
+      $RID  = "RID.". mysql_result($Erg2, $i, "RID");
-		$Man  = mysql_result($Erg2, $i, "Man");
+    $Man  = mysql_result($Erg2, $i, "Man");
-		echo "\t<td><input name=\"SIDXML\" type=\"text\" value=\"$SID\" size=\"2\" eadonly></td>\n";
+    echo "\t<td><input name=\"SIDXML\" type=\"text\" value=\"$SID\" size=\"2\" eadonly></td>\n";
-		echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"\" size=\"17\" readonly>\n\t\t".
+    echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"\" size=\"17\" readonly>\n\t\t".
-			   "<input name=\"DateDB\" type=\"text\" value=\"$Time\" size=\"17\" readonly></td>\n";
+         "<input name=\"DateDB\" type=\"text\" value=\"$Time\" size=\"17\" readonly></td>\n";
-		echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"\" size=\"15\" readonly>\n\t\t".
+    echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"\" size=\"15\" readonly>\n\t\t".
-			   "<input name=\"RIDDB\" type=\"text\" value=\"$RID\" size=\"15\" readonly></td>\n";
+         "<input name=\"RIDDB\" type=\"text\" value=\"$RID\" size=\"15\" readonly></td>\n";
-		echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"\" size=\"1\"readonly>\n\t\t".
+    echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"\" size=\"1\"readonly>\n\t\t".
-			   "<input name=\"LenDB\" type=\"text\" value=\"$Len\" size=\"1\"readonly></td>\n";
+         "<input name=\"LenDB\" type=\"text\" value=\"$Len\" size=\"1\"readonly></td>\n";
-		echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"\" size=\"40\"readonly>\n\t\t".
+    echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"\" size=\"40\"readonly>\n\t\t".
-			   "<input name=\"ManDB\" type=\"text\" value=\"$Man\" size=\"40\"readonly></td>\n";
+         "<input name=\"ManDB\" type=\"text\" value=\"$Man\" size=\"40\"readonly></td>\n";
-		echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). 
+    echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). 
-				"</td>\n";
+        "</td>\n";
-		echo "\t<tr>\n";
+    echo "\t<tr>\n";
-	}
+  }
 echo "</table>";
 
 

includes/funktionen.php

@@ -1,26 +1,23 @@
 <?php
+  /* Schichtverplanung im Adminbereich */
+  function Dsubstr($DateString, $re) {
+    if ($re == 1)
+      return substr($DateString, 0, 2);
+    elseif ($re == 2)
+      return substr($DateString, 3, 2);
+    else
+      return substr($DateString, 6, 4);
+  }
 
-/* Schichtverplanung im Adminbereich */
+  /* Schichtverplanung im Engelbereich */
-function Dsubstr($DateString,$re) {
+  function engeldate($edate, $m) {
-  if ($re==1)
+    if ($m == t)
-    return substr($DateString, 0, 2);
+      return substr($edate, 8, 2);
-  elseif ($re==2)
+    elseif ($m == m)
-    return substr($DateString, 3, 2);
+      return substr($edate, 5, 2);
-  else
+    elseif ($m == u)
-    return substr($DateString, 6, 4);
+      return substr($edate, 11, 5);
-}
+    else
-
+      return substr($edate, 0, 4);
-/* Schichtverplanung im Engelbereich */
+  }
-
-function engeldate($edate,$m) {
-	if ($m==t)
-    return substr($edate, 8, 2);
-  elseif ($m==m)
-    return substr($edate, 5, 2);
-  elseif ($m==u)
-    return substr($edate, 11, 5);
-  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'])) 
+
-		echo "6"; 
+  if(!isset($_SESSION['color'])) 
-	else 
+    echo "6";
-		echo $_SESSION['color'];
+  else
-	?>.css">
+    echo $_SESSION['color'];
-<?PHP
+  ?>.css" />
-if (isset($reload)) 
+
-{
+<?php
-	if ($reload=="") 
+if(isset($reload)) {
-	{
+  if ($reload == "")
-		$reload=3330;
+    $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"])) 
+if(isset($Page["AutoReload"])) 
-{
+  echo "\n<meta http-equiv=\"refresh\" content=\"". $Page["AutoReload"].
-	echo "\n<meta http-equiv=\"refresh\" content=\"". $Page["AutoReload"].
+    "; URL=". $url. $ENGEL_ROOT. $Page["Name"]."\">\n";
-		"; 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";
 
@@ -65,73 +61,65 @@ if( isset($_SESSION['CVS']["nonpublic/messages.php"]))
 {
     if( $_SESSION['CVS']["nonpublic/messages.php"] == "Y")
     {
-	$SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'";
+  $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'";
-	$erg = mysql_query($SQL, $con);
+  $erg = mysql_query($SQL, $con);
-	if( mysql_num_rows( $erg ) > 0 )
+  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").
+      "nonpublic/messages.php\">". Get_Text("pub_messages_new1").
-			" ".  mysql_num_rows( $erg ). " ".
+      " ".  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>
+  <tr>
-<?PHP
+<?php
 //ausgaeb Menu
-if( !isset($_SESSION['Menu']))		$_SESSION['Menu'] = "L";
+if( !isset($_SESSION['Menu']))    $_SESSION['Menu'] = "L";
-if( $_SESSION['Menu'] =="L")		include("menu.php");
+if( $_SESSION['Menu'] =="L")    include("menu.php");
 ?>
 
-		<td valign="top" align="center">
+    <td valign="top" align="center">
 <table border="0" width="100%" align="center" class="border" cellpadding="5" cellspacing="1">
-	<tr class="contenttopic">
+  <tr class="contenttopic">
-		<td>
+    <td>
-<?PHP
+<?php
-		echo "\t<a name=\"#$header\" class=\"contenttopic\">";
+    echo "<a name=\"" . $header . "\" class=\"contenttopic\">";
-		if( strlen( $header) == 0 )
+    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
+    else
-			echo "\n\t<b>$header</b></a>\n";
+      echo "\n<b>$header</b></a>\n";
 
 ?>
-		</td>
+    </td>
-	</tr>
+  </tr>
-	<tr class="content">
+  <tr class="content">
-	 	<td>
+     <td>
-<br>
+<br />
 <?php 
-echo "\n\n\n";
+if(isset($_SESSION['UID'])) {
- 
+  if(isset($_SESSION['oldurl']))
-if (IsSet($_SESSION['UID'])) {
+    $BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
-	if( isset($_SESSION['oldurl']))
+  if(isset($_SESSION['newurl']))
-		$BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
+    $_SESSION['oldurl'] = $_SESSION['newurl'];
-	if( isset($_SESSION['newurl']))
+  $_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
-		$_SESSION['oldurl'] = $_SESSION['newurl'];
-	$_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
-} 
-
-
-function SetHeaderGo2Back ()
-{
-	global $BACKUP_SESSION_OLDURL;
-	$_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
 }
 
+function SetHeaderGo2Back() {
+  global $BACKUP_SESSION_OLDURL;
+  $_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
+}
 
-if ( $Page["CVS"] != "Y" ) 
+if($Page["CVS"] != "Y") {
-{
+  echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
-        echo "Du besitzt kein Rechte für diesen Bereich.<br>\n";
+
-        If (IsSet($_SESSION['oldurl'])) 
+  if(isset($_SESSION['oldurl']))
-		echo "<a href=\"". $_SESSION["oldurl"]. "\">".Get_Text("back")."</a> geht's zur&uuml;ck...\n";
+    echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
-	else
+  else
-		echo "<a href=\"". $url. $ENGEL_ROOT. "\">".Get_Text("back")."</a> geht's zur&uuml;ck...\n";
+    echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
-        exit ();
+
+  exit ();
 }
 ?>
 
-
 <!-- ende des header parts //-->
-
-
-

includes/header_start.php

@@ -1,50 +1,40 @@
-<?PHP 
+<?php
-ini_set( "session.gc_maxlifetime", "65535");
+  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)) {
+    echo "<html><head><title>" . $SystemDisableMessage . "</title></head>";
+    echo "<body>" . $SystemDisableMessage . "</body></html>\n";
+    die();
+  }
 
-if( isset($SystemDisableMessage) && ( strlen($SystemDisableMessage)>0) )
+  if(!isset($_SESSION))
-{
+    session_start();
-	echo "<HTML>\n".
-		"<BODY>\n". $SystemDisableMessage. "\n<BODY>\n".
-		"</HTML>";
-	die();
-}
 
-if( !isset($_SESSION)) 
+  include "secure.php";
-{
-	session_start(); 
-}
-include ("secure.php");
 
-if( !isset($_SESSION['IP'])) 
+  if(!isset($_SESSION['IP']))
-{
+    $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
-	$_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 ();
-	session_destroy ();
+    header("Location: " . $url . $ENGEL_ROOT);
-	header("Location: $url". $ENGEL_ROOT );
+  }
-}
 
-include ("UserCVS.php");
+  include "UserCVS.php";
-
-
-//UPdate LASTlogin
-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);
-}								  
 
+  // update LASTlogin
+  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,30 +1,30 @@
 
 <!-- anfang des menue parts //-->
-	<td width="160"  valign="top">
+  <td width="160"  valign="top">
-<?PHP
+<?php
 $MenueTableStart="
 <table align=\"center\" class=\"border\" cellpadding=\"3\" cellspacing=\"1\">
-	<tr> 
+  <tr> 
-		<td width=\"160\" class=\"menu\">
+    <td width=\"160\" class=\"menu\">
 ";
-$MenueTableEnd="
+$MenueTableEnd="</ul>
-				<br>
+        <br />
-		</td>
+    </td>
-	</tr>
+  </tr>
-</table><br>
+</table><br />
 ";
 
 ShowMenu("");
 ShowMenu("nonpublic");
 ShowMenu("admin");
 
-if( !isset($submenus))
+if(!isset($submenus))
-	$submenus = 0;
+  $submenus = 0;
 
-if ($submenus >= 1 ) {
+if ($submenus >= 1) {
-  $inc_name=$_SERVER['PHP_SELF'];
+  $inc_name = $_SERVER['PHP_SELF'];
-  $filenamepos=strrpos($inc_name, '/');
+  $filenamepos = strrpos($inc_name, '/');
-  $filenamepos+=1;
+  $filenamepos += 1;
   $filename = substr ($inc_name, $filenamepos );
   $filepost = substr ($filename, 0, -4);
   $filepre = substr ($filename, -4 );
@@ -33,15 +33,15 @@ if ($submenus >= 1 ) {
   for ($index_nummer=1; $index_nummer <= $submenus; $index_nummer++) {
 ?>
 <table align="center" class="border" cellpadding="3" cellspacing="1">
-	<tr>
+  <tr>
-		<td width="160" class="menu"> 
+    <td width="160" class="menu"> 
-		<?php include ("./".$filepost.".".$index_nummer.$filepre); ?>
+    <?php include ("./".$filepost.".".$index_nummer.$filepre); ?>
-		</td>
+    </td>
-	</tr>
+  </tr>
 </table>
 
-<br>
+<br />
-<?PHP
+<?php
     }
 }
 
@@ -49,15 +49,15 @@ if( isset($_SESSION['UID']))
 {
 ?>
 <table align="center" class="border" cellpadding="3" cellspacing="1">
-	<tr>
+  <tr>
-		<td width="160" class="menu">
+    <td width="160" class="menu">
-		<?php include("funktion_activeUser.php"); ?>
+    <?php include("funktion_activeUser.php"); ?>
-		</td>
+    </td>
-	</tr>
+  </tr>
 </table>
-<?PHP
+<?php
 }
 ?>
-		</td> 
+    </td> 
 
 <!-- ende des menue parts //-->

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";
+    $v = htmlentities($v, ENT_QUOTES);
+    preg_replace('/([\'"`\'])/', '', $v);
+    $_GET[$k] = $v;
 
-foreach ($_GET as $k => $v) 
+    if($debug)
-{	
+      echo "GET $k=\"$v\"<br />";
-//  	$v = htmlspecialchars($v, ENT_QUOTES);
+  }
-//	$v = mysql_escape_string($v);
-	$v = htmlentities($v, ENT_QUOTES);
-	if (preg_match('/([\'"`\'])/', $v, $match)) 
-	{
-		print "sorry get has illegal char '$match[1]'";
-		exit;
-	}
-	$_GET[$k] = $v;
-
-	if( $DEBUG)
-		echo "GET $k=\"$v\"<br>";
-}
   
-foreach ($_POST as $k => $v) 
+  foreach ($_POST as $k => $v) {
-{
+    $v = htmlentities($v, ENT_QUOTES);
-//  	$v = htmlspecialchars($v, ENT_QUOTES);
+    preg_replace('/([\'"`\'])/', '', $v);
-//	$v = mysql_escape_string($v);
+    $_POST[$k] = $v;
-	$v = htmlentities($v, ENT_QUOTES);
+  
-	if (preg_match('/([\'"`\'])/', $v, $match)) {
+    if($debug)
-		print "sorry post has illegal char '$match[1]'";
+      echo "POST $k=\"$v\"<br />";
-		exit;
+  }
-	}
-	$_POST[$k] = $v;
-	
-	if( $DEBUG)
-		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,61 +1,51 @@
-<?PHP
+<?php
+  include "../includes/config.php";
+  include "../includes/config_IAX.php";
+  include "../includes/config_db.php";
+  include "../includes/error_handler.php";
+  include "../includes/funktion_modem.php";
+  include "../includes/funktion_cron.php";
 
-include ("../includes/config.php");
+  // ausfuerungs Ruetmuss (in s)
-include ("../includes/config_IAX.php");
+  $StartTimeBeforEvent = (60 / 4) * 60;
-include ("../includes/config_db.php");
+  $AnrufDelay = -5;
-include ("../includes/error_handler.php");
+  $DebugDECT = false;
-include ("../includes/funktion_modem.php");
-include ("../includes/funktion_cron.php");
 
+  // Timeout erhoehen
+  set_time_limit(50000);
 
-//ausfuerungs Ruetmuss (in s)
+  // SQL zusammensetzen
-$StartTimeBeforEvent = (60/4)*60; 
+  $SQL = "SELECT Shifts.DateS, Shifts.RID, ShiftEntry.UID, ShiftEntry.TID ".
-$AnrufDelay = -5;
+         "FROM `Shifts` INNER JOIN `ShiftEntry` ON `Shifts`.`SID` = `ShiftEntry`.`SID` ";
-$DebugDECT = FALSE;
-#$DebugDECT = TRUE;
 
-//Timeout erhöhen;
+  if($DebugDECT)
-set_time_limit(50000); 
+    $SQL .= "WHERE (Shifts.DateS>'2007-07-09 09:45:00' AND ".
+            "Shifts.DateS<='2007-07-09 11:00:00');";
+  else
+    $SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ".
+    "(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );";
 
-//SQL zusammensetzen
+  $Erg = mysql_query($SQL, $con);
-$SQL =  "SELECT Shifts.DateS, Shifts.RID, ShiftEntry.UID, ShiftEntry.TID ".
+  echo mysql_error($con);
-	"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');";
-else
-	$SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ".
-		"(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );";
 
-$Erg = mysql_query($SQL, $con);
+  $Z = 0;
-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) {
-{  
+      $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID"));
-   if( mysql_result($Erg, $i, "UID")>0)
+
-   {
+      if($DECTnumber != "") {
-	$DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID"));
+        echo "dial $DECTnumber\n";
-	if( $DECTnumber!="")
+        DialNumberIAX( $DECTnumber, mysql_result($Erg, $i, "DateS"), mysql_result($Erg, $i, "RID"), mysql_result($Erg, $i, "TID"));
-	{
+        DialNumberModem( $DECTnumber, mysql_result($Erg, $i, "DateS"));
-		echo "dial $DECTnumber\n";
+
-		DialNumberIAX( $DECTnumber,
+        if($Z++ > 10) {
-		               mysql_result($Erg, $i, "DateS"),
+          $Z = 0;
-		               mysql_result($Erg, $i, "RID"),
+          sleep(30);
-			       mysql_result($Erg, $i, "TID"));
+        }
-		DialNumberModem( $DECTnumber,
+      }
-		                 mysql_result($Erg, $i, "DateS"));
+    }
-		if( $Z++>10)
-		{
-			$Z=0;
-			sleep(30);
-		}
-	}
   }
-}
-
-return 0;
-
 
+  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/funktion_modem.php";
 
-include ("../includes/db.php");
+  $SQL = "SELECT DECT FROM `User`;";
-include ("../includes/config.php");
+  $Erg = mysql_query($SQL, $con);
-include ("../includes/funktion_modem.php");
 
+  echo mysql_error($con);
 
-$SQL =  "SELECT DECT FROM `User`;";
+  for($i=0; $i < mysql_num_rows($Erg); $i++) {
+    $Number = "#10" . mysql_result($Erg, $i, "DECT");
 
-$Erg = mysql_query($SQL, $con);
+    if(strlen($Number) == 7)
-
+      DialNumber($Number);
-echo mysql_error($con);
+  }
-
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
-{ 
- 	$Number = "#10". mysql_result($Erg, $i, "DECT");
-	if( strlen($Number)==7)
-		DialNumber(  $Number);
-}
-
-return 0;
 
+  return 0;
 ?>
-

services/jabberserver.php

@@ -1,113 +1,75 @@
-<?php
+<?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');
+  // Set time limit to indefinite execution
-require_once("../includes/funktion_jabber.php");
+  set_time_limit(0);
-include("../includes/config_MessegeServer.php");
+
-
+  if(DEBUG)
-// Set time limit to indefinite execution
+    echo "DEBUG mode is enable\n\tjabber is disable\n\n";
-set_time_limit( 0 );
+
-
+  if(!DEBUG) {
-/****************************************************************************************************/
+    echo "INIT jabber\n";
-//					show MODE
+    $jabber = new Jabber($server, $port, $username, $password, $resource);
-/****************************************************************************************************/
+
-if( DEBUG)
+    if(!($jabber->Connect() && $jabber->SendAuth())) 
-	echo "DEBUG mode is enable\n\tjabber is disable\n\n";
+      die("Couldn't connect to Jabber Server.");
-
+  }
-/****************************************************************************************************/
+
-//					INIT jabber
+  echo "INIT socked\n";
-/****************************************************************************************************/
+
-if( !DEBUG)
+  // Create a UDP socket
-{
+  $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked (' . socket_strerror(socket_last_error()) . ')');
-	echo "INIT jabber\n";
+
-	$jabber = new Jabber($server, $port, $username, $password, $resource);
+  // Bind the socket to an address/port
-	if ( !($jabber->Connect() && $jabber->SendAuth())) 
+  socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address (' . socket_strerror(socket_last_error()) . ')');
-		die("Couldn't connect to Jabber Server.");
+
-}
+  // Setzt Nonbock Mode
-
+  socket_set_nonblock($sock);
-
+
-/****************************************************************************************************/
+  $RUNNING = true;
-//					INIT socked
+
-/****************************************************************************************************/
+  while($RUNNING) {
-echo "INIT socked\n";
+    if(@socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) {
-	//http://de3.php.net/manual/de/function.socket-listen.php
+      // daten empfangen
-// Create a UDP socket
+      $data = substr($data, 0, strlen($data)-1); //ENTER entfernen
-$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked ('.socket_strerror(socket_last_error()). ')');
+      echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n";
-// Bind the socket to an address/port
+      PackedAnalyser( $data);
-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);
+    usleep(100000); // 100ms delay keeps the doctor away
-
+  } // end while
-
+  
-/****************************************************************************************************/
+  // disconnect jabber  
-//					Loop continuos
+  if(!DEBUG)
-/****************************************************************************************************/
+    $jabber->Disconnect();
-$RUNNING = TRUE;
+
-while( $RUNNING )
+  // Close the master sockets
-{
+  socket_close($sock); 
-	if( @socket_recvfrom($sock, $data, 65535, 0, $ip, $port))
+  
-	{
+  function PackedAnalyser($data) {
-		//daten empfangen
+    global $jabber, $RUNNING;
-		$data = substr($data,0, strlen($data)-1); //ENTER entfernen
+    // init array
-		echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n";
+    $matches = array();
-		PackedAnalyser( $data);
+
-	}
+    //#message
-
+    if(preg_match("/^#(message) ([^ ]+) (.+)/i", $data, $matches)) {
-	usleep(100000); // 100ms delay keeps the doctor away
+      if($matches[2]=="" || $matches[3]=="")
-} // end while
+        echo "\t\t\t\t#messaage parameter fail\n";
-	
+      else {
-//disconnect jabber	
+        // Whisper
-if( !DEBUG)
+        if(!DEBUG)
-	$jabber->Disconnect();
+          $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL);
-
+        else  
-// Close the master sockets
+          echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n";
-socket_close($sock); 
+      }
-	
+    } elseif(preg_match("/^#quit/i", $data, $matches)) {
-/****************************************************************************************************/
+      if(DEBUG) {
-/****************************************** MAIN END ************************************************/
+        echo "\t\t\t\tSystem Shutdown\n\n";
-/****************************************************************************************************/
+        $RUNNING = false;
-
+      }
-
+    } else
-/****************************************************************************************************/
+      echo "\t\t\t\tcommand not found\n\n";
-//***** function PackedAnalyser
+  }
-/****************************************************************************************************/
+?>
-function PackedAnalyser( $data )
-{
-	GLOBAL $jabber, $RUNNING;
-	// init array
-	$matches = array();
-
-	//#message
-	if( preg_match( "/^#(message) ([^ ]+) (.+)/i", $data, $matches ) )
-	{
-		if( $matches[2]=="" || $matches[3]=="")
-		{
-			// Wrong syntax
-			echo "\t\t\t\t#messaage parameter fail\n";
-		}
-		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 ) )
-	{
-		if( DEBUG)
-		{
-			echo "\t\t\t\tSystem Shutdown\n\n";
-			$RUNNING = FALSE;
-		}
-	}
-	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,58 +1,51 @@
-<?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
+  // Parameter check
-if( !isset($_GET["UID"]) )
+  if(!isset($_GET["UID"]))
-	$_GET["UID"]= "-1";
+    $_GET["UID"] = "-1";
 
-$SQL= "SELECT * FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "'";
+  $SQL = "SELECT * FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "'";
-$res = mysql_query( $SQL, $con);
+  $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");
-		header( "HTTP/1.0 403 Forbidden");
+    }
-		die( "403 Forbidden");
-	}
-	
-	// ist das bild sichtbar?
-	if( (mysql_result($res, 0, "show")=="N") AND
-	    ($_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)
-		{
-			header( 'HTTP/1.0 404 Not Found');
-			die( "404 Not Found");
-		}
-	}
 
-	/// bild aus db auslesen
+    // ist das bild sichtbar?
-	$bild = mysql_result($res, 0, "Bild");
+    if((mysql_result($res, 0, "show") == "N") AND ($_SESSION['UID']!=$_GET["UID"]) AND ($_SESSION['CVS'][ "admin/UserPicture.php" ] == "N")) {
-	
+      $SQL = "SELECT * FROM `UserPicture` WHERE `UID`='-1'";
-	// ausgabe bild
+      $res = mysql_query($SQL, $con);
-	header( "Accept-Ranges: bytes");
-	header( "Content-Length: ". strlen($bild));
-	header( "Content-type: ". mysql_result($res, 0, "ContentType"));
-	header( "Cache-control: public");
-	header( "Cache-request-directive: min-fresh = 120");
-	header( "Cache-request-directive: max-age = 360");
-	echo $bild;
-}
-else
-{
-	header( 'HTTP/1.0 404 Not Found');
-	die( "404 Not Found");
-}
 
+      if(mysql_num_rows($res) != 1) {
+        header("HTTP/1.0 404 Not Found");
+        die("404 Not Found");
+      }
+    }
+
+    // bild aus db auslesen
+    $bild = mysql_result($res, 0, "Bild");
+
+    // ausgabe bild
+    header("Accept-Ranges: bytes");
+    header("Content-Length: " . strlen($bild));
+    header("Content-type: " . mysql_result($res, 0, "ContentType"));
+    header("Cache-control: public");
+    header("Cache-request-directive: min-fresh = 120");
+    header("Cache-request-directive: max-age = 360");
+    echo $bild;
+  } else {
+    header("HTTP/1.0 404 Not Found");
+    die( "404 Not Found");
+  }
 ?>

www-ssl/admin/EngelType.php

@@ -6,42 +6,42 @@ include("../../../camp2011/includes/funktion_db.php");
 
 function runSQL( $SQL)
 {
-	global $con;
+  global $con;
-	// hier muesste das SQL ausgefuehrt werden...
+  // hier muesste das SQL ausgefuehrt werden...
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	if ($Erg) 
+  if ($Erg) 
-	{
+  {
-		echo "&Auml;nderung wurde gesichert...<br>";
+    echo "&Auml;nderung wurde gesichert...<br />";
-		echo "[$SQL]<br>"; 
+    echo "[$SQL]<br />"; 
-		return 1;
+    return 1;
-	} 
+  } 
-	else 
+  else 
-	{
+  {
-		echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+    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;
+    return 0;
-	}
+  }
 }
 
 function runSQL_log( $SQL, $commed)
 {
-	global $con;
+  global $con;
-	// hier muesste das SQL ausgefuehrt werden...
+  // hier muesste das SQL ausgefuehrt werden...
-	$Erg = db_query($SQL, $commed);
+  $Erg = db_query($SQL, $commed);
-	if ($Erg) 
+  if ($Erg) 
-	{
+  {
-		echo "&Auml;nderung wurde gesichert...<br>";
+    echo "&Auml;nderung wurde gesichert...<br />";
-		echo "[$SQL]<br>"; 
+    echo "[$SQL]<br />"; 
-		return 1;
+    return 1;
-	} 
+  } 
-	else 
+  else 
-	{
+  {
-		echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+    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;
+    return 0;
-	}
+  }
 }
 
 
@@ -51,33 +51,33 @@ $Erg = mysql_query($Sql, $con);
 
 if( !IsSet($_GET["action"]) )
 {
-	echo "Hallo ".$_SESSION['Nick'].
+  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 "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<tr class=\"contenttopic\">\n";
+  echo "<tr class=\"contenttopic\">\n";
 
-	for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
+  for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
-	{
+  {
-		echo "\t<td>". mysql_field_name($Erg, $i). "</td>";
+    echo "\t<td>". mysql_field_name($Erg, $i). "</td>";
-	}
+  }
-	echo "\t<td>&Auml;ndern</td>";
+  echo "\t<td>&Auml;ndern</td>";
-	echo "</tr>";
+  echo "</tr>";
 
-	for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
+  for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-	{	
+  {  
-		echo "\t<tr class=\"content\">\n";
+    echo "\t<tr class=\"content\">\n";
-		for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
+    for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
-		{
+    {
-  			echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
+        echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
-		}
+    }
-		echo "\t\t<td><a href=\"./EngelType.php?action=change&TID=".mysql_result($Erg, $t, "TID")."\">###</a></td>\n";
+    echo "\t\t<td><a href=\"./EngelType.php?action=change&TID=".mysql_result($Erg, $t, "TID")."\">###</a></td>\n";
-		echo "\t</tr>\n";
+    echo "\t</tr>\n";
-	} // ende Auflistung Raeume
+  } // ende Auflistung Raeume
-	echo "</table>";
+  echo "</table>";
 } 
 else 
 {
@@ -85,105 +85,105 @@ 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 "<form action=\"./EngelType.php\" method=\"GET\">\n";
-	echo "<table>\n";
+  echo "<table>\n";
-	
+  
-	for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
+  for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
-	{
+  {
-	    echo "<td>".mysql_field_name($Erg, $Uj)."</td>".
+      echo "<td>".mysql_field_name($Erg, $Uj)."</td>".
-	         "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\"></td></tr>\n";
+           "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\"></td></tr>\n";
-				                 }
+                         }
-	echo "</table>\n";
+  echo "</table>\n";
-	echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
+  echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
-	echo "<input type=\"submit\" value=\"sichern...\">\n";
+  echo "<input type=\"submit\" value=\"sichern...\">\n";
-	echo "</form>";
+  echo "</form>";
-	break;
+  break;
 
 case 'newsave':
-	$vars = $_GET;
+  $vars = $_GET;
-	$count = count($vars) - 1;
+  $count = count($vars) - 1;
-	$vars = array_splice($vars, 0, $count);
+  $vars = array_splice($vars, 0, $count);
-	$Keys="";
+  $Keys="";
-	$Values="";
+  $Values="";
-	foreach($vars as $key => $value){
+  foreach($vars as $key => $value){
-		$Keys   .= ", `$key`";
+    $Keys   .= ", `$key`";
-		$Values .= ", '$value'";
+    $Values .= ", '$value'";
-	}
+  }
-	
+  
-	if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", 
+  if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", 
-			"save new EngelType") )
+      "save new EngelType") )
-	{
+  {
-		SetHeaderGo2Back();
+    SetHeaderGo2Back();
-		
+    
-		$SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'";
+    $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'";
-		$ERG = mysql_query($SQL2, $con);
+    $ERG = mysql_query($SQL2, $con);
-	
+  
-		if( mysql_num_rows($ERG) == 1)
+    if( mysql_num_rows($ERG) == 1)
-			runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). 
+      runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). 
-				     "` INT DEFAULT '0' NOT NULL;",
+             "` INT DEFAULT '0' NOT NULL;",
-				    "add new EngelType in Romm Table");
+            "add new EngelType in Romm Table");
-	}
+  }
-	break;
+  break;
 
 case 'change':
-	if (! IsSet($_GET["TID"])) 
+  if (! IsSet($_GET["TID"])) 
-		echo "Fehlerhafter Aufruf!"; 
+    echo "Fehlerhafter Aufruf!"; 
-	else
+  else
-	{
+  {
-		echo "Raum ab&auml;ndern:\n";
+    echo "Raum ab&auml;ndern:\n";
-		echo "Hier kannst du eintragen, den EngelType &auml;ndern.";
+    echo "Hier kannst du eintragen, den EngelType &auml;ndern.";
-		echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
+    echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
-		echo "<table>\n";
+    echo "<table>\n";
-	
+  
-		$SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'";
+    $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'";
-		$ERG = mysql_query($SQL2, $con);
+    $ERG = mysql_query($SQL2, $con);
         
-	        for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
+          for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
-			echo "<tr><td>". mysql_field_name($ERG, $Uj). "</td>".
+      echo "<tr><td>". mysql_field_name($ERG, $Uj). "</td>".
-		     		"<td><input type=\"text\" size=\"40\" name=\"e". mysql_field_name($ERG, $Uj). "\" ".
+             "<td><input type=\"text\" size=\"40\" name=\"e". mysql_field_name($ERG, $Uj). "\" ".
-		     		"value=\"". mysql_result($ERG, 0, $Uj). "\"></td></tr>\n";
+             "value=\"". mysql_result($ERG, 0, $Uj). "\"></td></tr>\n";
 
-		echo "</table>\n";
+    echo "</table>\n";
-		echo "<input type=\"hidden\" name=\"eTID\" value=\"". $_GET["TID"]. "\">\n";
+    echo "<input type=\"hidden\" name=\"eTID\" value=\"". $_GET["TID"]. "\">\n";
-		echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
+    echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
-		echo "<input type=\"submit\" value=\"sichern...\">\n";
+    echo "<input type=\"submit\" value=\"sichern...\">\n";
-		echo "</form>";
+    echo "</form>";
-	        echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
+          echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
-	        echo "<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n";
+          echo "<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n";
-	        echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
+          echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
-	        echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
+          echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
-	        echo "</form>";
+          echo "</form>";
-	}
+  }
-	break;
+  break;
-	
+  
 case 'changesave':
         $vars = $_GET;
         $count = count($vars) - 2;
         $vars = array_splice($vars, 0, $count);
-	$keys="";
+  $keys="";
-	$sql="";
+  $sql="";
         foreach($vars as $key => $value)
-	{
+  {
-  	      $keys = substr( $key, 1);
+          $keys = substr( $key, 1);
-	      $sql .= ", `". $keys. "`='". $value. "'";
+        $sql .= ", `". $keys. "`='". $value. "'";
         }
-	runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", 
+  runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", 
-		    "Save Change EngelType");
+        "Save Change EngelType");
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
 
 case 'delete':
-	if (IsSet($_GET["TID"])) 
+  if (IsSet($_GET["TID"])) 
-	{
+  {
-		if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType"))
+    if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType"))
-			runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", 
+      runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", 
-					"delete EngelType in Room Table");
+          "delete EngelType in Room Table");
-	}
+  }
-	else
+  else
-		echo "Fehlerhafter Aufruf";
+    echo "Fehlerhafter Aufruf";
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
 }
 }
 

www-ssl/admin/Recentchanges.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "ChangeLog";
 $header = "Datenbank-Auszug";
@@ -14,12 +14,12 @@ echo "<tr>\n\t<th>Time</th>\n\t<th>User</th>\n\t<th>Commend</th>\n\t<th>SQL Comm
 
 for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
 {
-	echo "<tr>\n";
+  echo "<tr>\n";
-	echo "\t<td>". mysql_result( $Erg, $n, "Time"). "</td>\n";
+  echo "\t<td>". mysql_result( $Erg, $n, "Time"). "</td>\n";
-	echo "\t<td>". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "</td>\n";
+  echo "\t<td>". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "</td>\n";
-	echo "\t<td>". mysql_result( $Erg, $n, "Commend"). "</td>\n";
+  echo "\t<td>". mysql_result( $Erg, $n, "Commend"). "</td>\n";
-	echo "\t<td>". mysql_result( $Erg, $n, "SQLCommad"). "</td>\n";
+  echo "\t<td>". mysql_result( $Erg, $n, "SQLCommad"). "</td>\n";
-	echo "</tr>\n";
+  echo "</tr>\n";
 }
 
 echo "</table>\n";

www-ssl/admin/UserPicture.php

@@ -7,114 +7,114 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 if( IsSet($_GET["action"]) )
 {
-	UnSet($SQL);
+  UnSet($SQL);
 
-	switch ($_GET["action"]) 
+  switch ($_GET["action"]) 
-	{
+  {
-		case 'FormUpload':
+    case 'FormUpload':
-			echo "Hier kannst Du ein Foto hochladen för:";
+      echo "Hier kannst Du ein Foto hochladen för:";
-			echo "<form action=\"./UserPicture.php?action=sendPicture\" method=\"post\" enctype=\"multipart/form-data\">\n";
+      echo "<form action=\"./UserPicture.php?action=sendPicture\" method=\"post\" enctype=\"multipart/form-data\">\n";
-			echo "\t<select name=\"UID\">\n";
+      echo "\t<select name=\"UID\">\n";
-			$usql="SELECT * FROM `User` ORDER BY `Nick`";
+      $usql="SELECT * FROM `User` ORDER BY `Nick`";
-			$uErg = mysql_query($usql, $con);
+      $uErg = mysql_query($usql, $con);
-			for ($k=0; $k<mysql_num_rows($uErg); $k++)
+      for ($k=0; $k<mysql_num_rows($uErg); $k++)
-				echo "\t\t<option value=\"".mysql_result($uErg, $k, "UID")."\">". mysql_result($uErg, $k, "Nick"). "</option>\n";
+        echo "\t\t<option value=\"".mysql_result($uErg, $k, "UID")."\">". mysql_result($uErg, $k, "Nick"). "</option>\n";
-			echo "\t</select>\n";
+      echo "\t</select>\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\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<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 "\t<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
-			echo "</form>\n";
+      echo "</form>\n";
-			break;
+      break;
-		case 'sendPicture':
+    case 'sendPicture':
-		        if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) )
+            if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) )
-		        {
+            {
-			        if( ($_FILES["file"]["type"] == "image/jpeg") ||
+              if( ($_FILES["file"]["type"] == "image/jpeg") ||
-			            ($_FILES["file"]["type"] == "image/png")  ||
+                  ($_FILES["file"]["type"] == "image/png")  ||
-			            ($_FILES["file"]["type"] == "image/gif")  )
+                  ($_FILES["file"]["type"] == "image/gif")  )
-		        	{
+              {
-	                		$data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
+                      $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
 
-					if( GetPicturShow( $_POST['UID']) == "")
+          if( GetPicturShow( $_POST['UID']) == "")
-	                		        $SQL = "INSERT INTO `UserPicture` ".
+                              $SQL = "INSERT INTO `UserPicture` ".
-			                                "( `UID`,`Bild`, `ContentType`, `show`) ".
+                                      "( `UID`,`Bild`, `ContentType`, `show`) ".
-                			                "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
+                                      "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
-		        	        else
+                      else
-                			        $SQL = "UPDATE `UserPicture` SET ".
+                              $SQL = "UPDATE `UserPicture` SET ".
-		                        	        "`Bild`='$data', ".
+                                      "`Bild`='$data', ".
-                		                	"`ContentType`='". $_FILES["file"]["type"]. "' ".
+                                      "`ContentType`='". $_FILES["file"]["type"]. "' ".
-			                                "WHERE `UID`='". $_POST['UID']. "'";
+                                      "WHERE `UID`='". $_POST['UID']. "'";
 
-			                	echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ".
+                        echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ".
-							"MIME-Type: " . $_FILES["file"]["type"]. ", ". 
+              "MIME-Type: " . $_FILES["file"]["type"]. ", ". 
-							$_FILES["file"]["size"]. " Byte ".
+              $_FILES["file"]["size"]. " Byte ".
-							"for ". UID2Nick( $_POST["UID"]);
+              "for ". UID2Nick( $_POST["UID"]);
-				}
+        }
-				else
+        else
-			                Print_Text("pub_einstellungen_send_KO");
+                      Print_Text("pub_einstellungen_send_KO");
-		        }
+            }
-		        else
+            else
-                		Print_Text("pub_einstellungen_send_KO");
+                    Print_Text("pub_einstellungen_send_KO");
-		        break;
+            break;
 
-		case 'SetN':
+    case 'SetN':
-			if (IsSet($_GET["UID"]))
+      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"]. "'";
+        $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'";
-			}
+      }
-			else
+      else
-				echo "Fehlerhafter Aufruf";
+        echo "Fehlerhafter Aufruf";
-			break;
+      break;
-		case 'SetY':
+    case 'SetY':
-			if (IsSet($_GET["UID"]))
+      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"]. "'";
+        $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'";
-			}
+      }
-			else
+      else
-				echo "Fehlerhafter Aufruf";
+        echo "Fehlerhafter Aufruf";
-			break;
+      break;
-		case 'del':
+    case 'del':
-			echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich l&ouml;schen? ".
+      echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich l&ouml;schen? ".
-				"<a href=\"./UserPicture.php?action=delYes&UID=". $_GET["UID"]. "\">Yes</a>";
+        "<a href=\"./UserPicture.php?action=delYes&UID=". $_GET["UID"]. "\">Yes</a>";
-			break;
+      break;
-		case 'delYes':
+    case 'delYes':
-			if (IsSet($_GET["UID"]))
+      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";
+        $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1";
-			}
+      }
-			else
+      else
-				echo "Fehlerhafter Aufruf";
+        echo "Fehlerhafter Aufruf";
-			break;
+      break;
-		default:	
+    default:  
-			echo "Fehlerhafter Aufruf";
+      echo "Fehlerhafter Aufruf";
-			
+      
-	} //switch
+  } //switch
 
-	// Update ???
+  // Update ???
-	if (IsSet($SQL))
+  if (IsSet($SQL))
-	{ 
+  { 
-		// hier muesste das SQL ausgefuehrt werden...
+    // hier muesste das SQL ausgefuehrt werden...
-		$Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
-		if ($Erg == 1) 
+    if ($Erg == 1) 
-		     echo "&Auml;nderung wurde gesichert...<br>";
+         echo "&Auml;nderung wurde gesichert...<br />";
-		else
+    else
-		{
+    {
-		     echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+         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								
+  } // 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)
 
 
 //ausgabe der Liste
 $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";
@@ -125,25 +125,25 @@ echo "\t<td>L&ouml;schen</td>\n";
 echo "</tr>";
 
 for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-{	
+{  
-	$UIDs = mysql_result($Erg, $t, "UID");
+  $UIDs = mysql_result($Erg, $t, "UID");
-	echo "\t<tr class=\"content\">\n";
+  echo "\t<tr class=\"content\">\n";
- 		
+     
-	echo "\t\t<td>". UID2Nick(mysql_result($Erg, $t, "UID")). "</td>\n";
+  echo "\t\t<td>". UID2Nick(mysql_result($Erg, $t, "UID")). "</td>\n";
-	echo "\t\t<td>". displayPictur( $UIDs, 0). "</td>\n";
+  echo "\t\t<td>". displayPictur( $UIDs, 0). "</td>\n";
-	
+  
-	if( GetPicturShow( $UIDs) == "Y")	
+  if( GetPicturShow( $UIDs) == "Y")  
-		echo "\t\t<td><a href=\"./UserPicture.php?action=SetN&UID=$UIDs\">sperren</a></td>\n";
+    echo "\t\t<td><a href=\"./UserPicture.php?action=SetN&UID=$UIDs\">sperren</a></td>\n";
-	elseif( GetPicturShow( $UIDs) == "N")
+  elseif( GetPicturShow( $UIDs) == "N")
-		echo "\t\t<td><a href=\"./UserPicture.php?action=SetY&UID=$UIDs\">freigeben</a></td>\n";
+    echo "\t\t<td><a href=\"./UserPicture.php?action=SetY&UID=$UIDs\">freigeben</a></td>\n";
-	else
+  else
-		echo "\t\t<td>ERROR: show='". GetPicturShow( $UIDs). "'</td>\n";
+    echo "\t\t<td>ERROR: show='". GetPicturShow( $UIDs). "'</td>\n";
-	echo "\t\t<td><a href=\"./UserPicture.php?action=del&UID=$UIDs\">del</a></td>\n";
+  echo "\t\t<td><a href=\"./UserPicture.php?action=del&UID=$UIDs\">del</a></td>\n";
-	echo "\t</tr>\n";
+  echo "\t</tr>\n";
 } // 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,38 +6,38 @@ 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";
 echo "<select name=\"Anzahl\">\n";
 for( $i=0; $i<50; $i++) 
-	echo "\t<option value=\"$i\">$i</option>\n";
+  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"]) )
 {
-	$SQLreset = "UPDATE `User` SET `Aktiv`='0'";
+  $SQLreset = "UPDATE `User` SET `Aktiv`='0'";
-	$ErgReset = db_query($SQLreset, "Reset Active");
+  $ErgReset = db_query($SQLreset, "Reset Active");
-	if ($ErgReset != 1)
+  if ($ErgReset != 1)
-		echo "Fehler beim zuruecksetzen der Activ\n";
+    echo "Fehler beim zuruecksetzen der Activ\n";
-	else
+  else
-		echo "Active wurde erfolgreich zurueckgesetzt\n";
+    echo "Active wurde erfolgreich zurueckgesetzt\n";
 }
 
 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";
@@ -51,15 +51,15 @@ echo "\t<td>Freeloader ". Get_Text("pub_aktive_Time"). "</td>\n";
 echo "\t<td>". Get_Text("pub_aktive_Time"). " result</td>\n";
 echo "\t<td>". Get_Text("pub_aktive_Active"). "</td>\n";
 echo "</tr>\n";
-	
+  
 $SQL = "
 SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal
-	FROM
+  FROM
-		(SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d
+    (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d
-		LEFT JOIN
+    LEFT JOIN
-		(SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f
+    (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f
-		USING(UID)
+    USING(UID)
-	ORDER BY lenReal DESC, nr DESC, UID";
+  ORDER BY lenReal DESC, nr DESC, UID";
 
 $Erg = mysql_query($SQL, $con);
 echo mysql_error($con);
@@ -68,42 +68,42 @@ $rowcount = mysql_num_rows($Erg);
 $aktivecount=0;
 for ($i=0; $i<$rowcount; $i++)
 {
-	echo "\n\n\t<tr class=\"content\">\n";
+  echo "\n\n\t<tr class=\"content\">\n";
-	echo "\t\t<td>". UID2Nick(mysql_result($Erg, $i, "UID")). "</td>\n";
+  echo "\t\t<td>". UID2Nick(mysql_result($Erg, $i, "UID")). "</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "nr"). "x</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "nr"). "x</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "len"). "h</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "len"). "h</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "lenWeight"). "h</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "lenWeight"). "h</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "nrFree"). "x</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "nrFree"). "x</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "lenFree"). "h</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "lenFree"). "h</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "lenReal"). "h</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "lenReal"). "h</td>\n";
 
-	
+  
-	echo "\t\t<td>";
+  echo "\t\t<td>";
-	if (IsSet($_POST["Anzahl"]))
+  if (IsSet($_POST["Anzahl"]))
-	{	
+  {  
-		if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") )
+    if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") )
-		{
+    {
-			$aktivecount++;
+      $aktivecount++;
-			if( $_POST["SendType"]=="Show..")
+      if( $_POST["SendType"]=="Show..")
-				echo "show set";
+        echo "show set";
-			else
+      else
-			{
+      {
-				$SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1";
+        $SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1";
-				$Erg2 = db_query($SQL2, "update Active State");
+        $Erg2 = db_query($SQL2, "update Active State");
-				if ($Erg2 != 1)
+        if ($Erg2 != 1)
-					echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID"));
+          echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID"));
-				else
+        else
-					echo "write set";
+          echo "write set";
-			}
+      }
-		}
+    }
-	}
+  }
-	echo "</td>\n";
+  echo "</td>\n";
-	echo "\t</tr>\n";
+  echo "\t</tr>\n";
 } // ende Auflistung aktive Engel 
 
 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");
@@ -16,213 +16,213 @@ $EnableSchudleDB = 1;
 
 
 /*##############################################################################################
-				erstellt Arrays der Reume
+        erstellt Arrays der Reume
   ##############################################################################################*/
 function CreateRoomArrays()
 {
-	global $Room, $RoomID, $RoomName, $con;
+  global $Room, $RoomID, $RoomName, $con;
 
-	$sql =	"SELECT `RID`, `Name` FROM `Room` ".
+  $sql =  "SELECT `RID`, `Name` FROM `Room` ".
-		"WHERE `Show`='Y'".
+    "WHERE `Show`='Y'".
-		"ORDER BY `Number`, `Name`;";
+    "ORDER BY `Number`, `Name`;";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
 
-	for ($i=0; $i<$rowcount; $i++)
+  for ($i=0; $i<$rowcount; $i++)
-	{
+  {
-		$Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
+    $Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-		$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
+    $Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-		$RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
+    $RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
-		$RoomName[ mysql_result($Erg, $i, "Name") ] = mysql_result($Erg, $i, "RID");
+    $RoomName[ mysql_result($Erg, $i, "Name") ] = mysql_result($Erg, $i, "RID");
-	}
+  }
 }
 CreateRoomArrays();
 
 /*##############################################################################################
-				           F I L E
+                   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..";
+  echo "Update XCAL-File from Pentabarf..";
-	if($PentabarfGetWith=="fsockopen")
+  if($PentabarfGetWith=="fsockopen")
-	{
+  {
 
-	//backup error messeges and delate
+  //backup error messeges and delate
-	$Backuperror_messages = $error_messages;
+  $Backuperror_messages = $error_messages;
-		$fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
+    $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
-//	$error_messages = $Backuperror_messages;
+//  $error_messages = $Backuperror_messages;
-	
+  
-	if( !$fp)
+  if( !$fp)
-	{
+  {
-	   echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
+     echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
-	   	"[$errstr ($errno)]</h2>";
+       "[$errstr ($errno)]</h2>";
-	}
+  }
-	else
+  else
-	{
+  {
-		if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+    if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-		{
+    {
-			$head =	'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
+      $head =  'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
-				'Host: '. $PentabarfXMLhost. "\r\n".
+        'Host: '. $PentabarfXMLhost. "\r\n".
-				'User-Agent: Engelsystem'. "\r\n".
+        'User-Agent: Engelsystem'. "\r\n".
-				'Authorization: Basic '.
+        'Authorization: Basic '.
-				base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n".
+        base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n".
-				"\r\n";
+        "\r\n";
-			fputs( $fp, $head);
+      fputs( $fp, $head);
-			$Zeilen = -1;
+      $Zeilen = -1;
-			while (!feof($fp))
+      while (!feof($fp))
-			{	
+      {  
-				$Temp= fgets($fp,1024);
+        $Temp= fgets($fp,1024);
-				
+        
-				// ende des headers
+        // ende des headers
-				if( $Temp== "f20\r\n" )
+        if( $Temp== "f20\r\n" )
-				{
+        {
-					$Zeilen = 0;
+          $Zeilen = 0;
-					$Temp="";
+          $Temp="";
-				}
+        }
-				
+        
-				//file ende?
+        //file ende?
-				if( $Temp=="0\r\n")
+        if( $Temp=="0\r\n")
-					break;
+          break;
 
-				if( ($Zeilen>-1) && ($Temp!="ffb\r\n") )
+        if( ($Zeilen>-1) && ($Temp!="ffb\r\n") )
-				{
+        {
-					//steuerzeichen ausfiltern
+          //steuerzeichen ausfiltern
-					if( strpos( "#$Temp", "\r\n") > 0)
+          if( strpos( "#$Temp", "\r\n") > 0)
-						$Temp = substr($Temp, 0, strlen($Temp)-2);
+            $Temp = substr($Temp, 0, strlen($Temp)-2);
-					if( strpos( "#$Temp", "1005") > 0)
+          if( strpos( "#$Temp", "1005") > 0)
-						$Temp = "";
+            $Temp = "";
-					if( strpos( "#$Temp", "783") > 0)
+          if( strpos( "#$Temp", "783") > 0)
-						$Temp = "";
+            $Temp = "";
-					//schreiben in file
+          //schreiben in file
-					fputs( $fileOut, $Temp);
+          fputs( $fileOut, $Temp);
-					$Zeilen++;
+          $Zeilen++;
-				}
+        }
-			}
+      }
-			fclose( $fileOut);
+      fclose( $fileOut);
-			
+      
-			echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
+      echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
-		}
+    }
-		else
+    else
-			echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+      echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-		fclose($fp);
+    fclose($fp);
-	}
+  }
-	}
+  }
-	elseif($PentabarfGetWith=="fopen")
+  elseif($PentabarfGetWith=="fopen")
-	{
+  {
-		//user uns password in url einbauen
+    //user uns password in url einbauen
-		$FileNameIn =	"https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
+    $FileNameIn =  "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
-				$PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
+        $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
 
 
-		if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
+    if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
-		{
+    {
-			if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+      if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-			{
+      {
-				$Zeilen = 0;
+        $Zeilen = 0;
-				while (!feof($fileIn)) 
+        while (!feof($fileIn)) 
-				{	
+        {  
-					$Zeilen++;
+          $Zeilen++;
-					fputs( $fileOut, fgets( $fileIn));	
+          fputs( $fileOut, fgets( $fileIn));  
-				}
+        }
-				fclose( $fileOut);
+        fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
+        echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
-			}
+      }
-			else
+      else
-				echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+        echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-			fclose( $fileIn);
+      fclose( $fileIn);
-		}
+    }
-		else
+    else
-			echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
+      echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
-	}
+  }
-	elseif( $PentabarfGetWith=="wget")
+  elseif( $PentabarfGetWith=="wget")
-	{
+  {
-		$Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
+    $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
-			" --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
+      " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
-			" --no-check-certificate";
+      " --no-check-certificate";
-		echo system( $Command, $Status);
+    echo system( $Command, $Status);
-		if( $Status==0)
+    if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
-		else
+    else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
-	}
+  }
-	elseif( $PentabarfGetWith=="lynx")
+  elseif( $PentabarfGetWith=="lynx")
-	{
+  {
-		$Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
+    $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
-		echo system( $Command, $Status);
+    echo system( $Command, $Status);
-		if( $Status==0)
+    if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
-		else
+    else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
-	}
+  }
-	elseif($PentabarfGetWith=="fopen")
+  elseif($PentabarfGetWith=="fopen")
-	{
+  {
-		//user uns password in url einbauen
+    //user uns password in url einbauen
-		$FileNameIn =	"https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
+    $FileNameIn =  "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
-				$PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
+        $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
 
 
-		if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
+    if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
-		{
+    {
-			if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+      if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-			{
+      {
-				$Zeilen = 0;
+        $Zeilen = 0;
-				while (!feof($fileIn)) 
+        while (!feof($fileIn)) 
-				{	
+        {  
-					$Zeilen++;
+          $Zeilen++;
-					fputs( $fileOut, fgets( $fileIn));	
+          fputs( $fileOut, fgets( $fileIn));  
-				}
+        }
-				fclose( $fileOut);
+        fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
+        echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
-			}
+      }
-			else
+      else
-				echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+        echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-			fclose( $fileIn);
+      fclose( $fileIn);
-		}
+    }
-		else
+    else
-			echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
+      echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
-	}
+  }
-	elseif( $PentabarfGetWith=="wget")
+  elseif( $PentabarfGetWith=="wget")
-	{
+  {
-		$Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
+    $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
-			" --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
+      " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
-			" --no-check-certificate";
+      " --no-check-certificate";
-		echo system( $Command, $Status);
+    echo system( $Command, $Status);
-		if( $Status==0)
+    if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
-		else
+    else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
-	}
+  }
-	elseif( $PentabarfGetWith=="lynx")
+  elseif( $PentabarfGetWith=="lynx")
-	{
+  {
-		$Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
+    $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
-		echo system( $Command, $Status);
+    echo system( $Command, $Status);
-		if( $Status==0)
+    if( $Status==0)
-			echo "OK.<br>";
+      echo "OK.<br />";
-		else
+    else
-			echo "fail ($Status)($Command).<br>";
+      echo "fail ($Status)($Command).<br />";
-	}
+  }
-	else
+  else
-		echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
+    echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
 }
 else
 {
-	echo "<form action=\"dbUpdateFromXLS.php\" method=\"post\">\n";
+  echo "<form action=\"dbUpdateFromXLS.php\" method=\"post\">\n";
-	echo "<table border=\"0\">\n";
+  echo "<table border=\"0\">\n";
-	echo "\t<tr><td>XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath</td>".
+  echo "\t<tr><td>XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath</td>".
-		"<td><input name=\"PentabarfURL\" type=\"text\" size=\"4\" maxlength=\"5\" ".
+    "<td><input name=\"PentabarfURL\" type=\"text\" size=\"4\" maxlength=\"5\" ".
-		"value=\"$PentabarfXMLEventID\"></td></tr>\n";
+    "value=\"$PentabarfXMLEventID\"></td></tr>\n";
-	echo "\t<tr><td>Username:</td>".
+  echo "\t<tr><td>Username:</td>".
-		"<td><input name=\"PentabarfUser\" type=\"text\" size=\"30\" maxlength=\"30\"></td></tr>\n";
+    "<td><input name=\"PentabarfUser\" type=\"text\" size=\"30\" maxlength=\"30\"></td></tr>\n";
-	echo "\t<tr><td>Password:</td>".
+  echo "\t<tr><td>Password:</td>".
-		"<td><input name=\"password\" type=\"password\" size=\"30\" maxlength=\"30\"></td></tr>\n";
+    "<td><input name=\"password\" type=\"password\" size=\"30\" maxlength=\"30\"></td></tr>\n";
-	echo "\t<tr><td></td><td><input type=\"submit\" name=\"FileUpload\" value=\"upload\"></td></tr>\n";
+  echo "\t<tr><td></td><td><input type=\"submit\" name=\"FileUpload\" value=\"upload\"></td></tr>\n";
-	echo "</table>\n";
+  echo "</table>\n";
-	echo "</form>\n";
+  echo "</form>\n";
 }
 
 
@@ -235,52 +235,52 @@ $XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR");
 
 if( $ShowDataStrukture)
 {
-	echo "<pre><br>";
+  echo "<pre><br />";
-	echo $XMLmain->name;
+  echo $XMLmain->name;
-	echo "<br>";
+  echo "<br />";
-	print_r(array_values ($XMLmain->sub));
+  print_r(array_values ($XMLmain->sub));
-	echo "</pre>";
+  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))
-	echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n";
+  echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n";
 echo "</pre>";
 */
 
 
 /*##############################################################################################
-				           V e r s i o n
+                   V e r s i o n
   ##############################################################################################*/
 
 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";
 
 
 
 /*##############################################################################################
-				           V e r s i o n
+                   V e r s i o n
   ##############################################################################################*/
 if( $EnableRoomFunctions)
-	include("../../../camp2011/includes/funktion_xml_room.php");
+  include("../../../camp2011/includes/funktion_xml_room.php");
 
 if( $EnableSchudleFunctions)
-	include("../../../camp2011/includes/funktion_xml_schudle.php");
+  include("../../../camp2011/includes/funktion_xml_schudle.php");
 
 
 /*##############################################################################################
-				         U P D A T E  A L L 
+                 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";
@@ -32,34 +32,34 @@ echo "Deaktiviert";
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Tshirt-Size aller engel",
-				"SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); 
+        "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`"); 
+        "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`");
+        "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`");
+        "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`");
+          "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)");
+          "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)");
+          "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)");
+          "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)");
+          "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";
@@ -13,56 +13,56 @@ if( !isset($_GET["custum"])) $_GET["custum"] = "";
 
 if( $_GET["dial"]=="dial")
 {
-	if( $_GET["DECT"]=="")
+  if( $_GET["DECT"]=="")
-		$Number = $_GET["custum"];
+    $Number = $_GET["custum"];
-	else
+  else
-		$Number = $_GET["DECT"];
+    $Number = $_GET["DECT"];
-	
+  
-	if( strlen( $_GET["timeh"])== 1)
+  if( strlen( $_GET["timeh"])== 1)
-		 $_GET["timeh"] = "0". $_GET["timeh"];
+     $_GET["timeh"] = "0". $_GET["timeh"];
-	
+  
-	if( strlen( $_GET["timem"])== 1)
+  if( strlen( $_GET["timem"])== 1)
-		 $_GET["timem"] = "0".  $_GET["timem"];
+     $_GET["timem"] = "0".  $_GET["timem"];
-		
+    
-//	SetWackeup( $Number, $_GET["timeh"], $_GET["timem"]);
+//  SetWackeup( $Number, $_GET["timeh"], $_GET["timem"]);
-	DialNumberIAX($Number, $_GET["timeh"], $_GET["timem"],0);
+  DialNumberIAX($Number, $_GET["timeh"], $_GET["timem"],0);
 
-	$_GET["custum"] = $Number;
+  $_GET["custum"] = $Number;
 }
 
 
-	echo "<form action=\"./dect.php\" method=\"GET\">\n";
+  echo "<form action=\"./dect.php\" method=\"GET\">\n";
-	echo "<table>\n";
+  echo "<table>\n";
 
-	echo "<tr><th>Number</th><th>h:m</th><th></th></tr>\n";
+  echo "<tr><th>Number</th><th>h:m</th><th></th></tr>\n";
 
-	echo "<tr><td>\n";
+  echo "<tr><td>\n";
-	// Listet alle Nicks auf
+  // Listet alle Nicks auf
-	echo "<select name=\"DECT\">\n";
+  echo "<select name=\"DECT\">\n";
-	echo "\t<option value=\"\">costum</option>\n";
+  echo "\t<option value=\"\">costum</option>\n";
 
-	$usql="SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`";
+  $usql="SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`";
-	$uErg = mysql_query($usql, $con);
+  $uErg = mysql_query($usql, $con);
-	$urowcount = mysql_num_rows($uErg);
+  $urowcount = mysql_num_rows($uErg);
-	for ($k=0; $k<$urowcount; $k++)
+  for ($k=0; $k<$urowcount; $k++)
-	{
+  {
-		echo "\t<option value=\"".mysql_result($uErg, $k, "DECT")."\">".
+    echo "\t<option value=\"".mysql_result($uErg, $k, "DECT")."\">".
-		mysql_result($uErg, $k, "Nick").
+    mysql_result($uErg, $k, "Nick").
-		" (". mysql_result($uErg, $k, "DECT"). ")".
+    " (". mysql_result($uErg, $k, "DECT"). ")".
-		"</option>\n";
+    "</option>\n";
-	}
+  }
-	echo "</select>\n";
+  echo "</select>\n";
-	
+  
-	echo "<input type=\"text\" name=\"custum\" size=\"4\" maxlength=\"4\" value=\"". $_GET["custum"]. "\">\n";
+  echo "<input type=\"text\" name=\"custum\" size=\"4\" maxlength=\"4\" value=\"". $_GET["custum"]. "\">\n";
-	echo "</td>\n";
+  echo "</td>\n";
 
-	echo "<td><input type=\"text\" name=\"timeh\" size=\"2\" maxlength=\"2\" value=\"". gmdate("H", time()+90+3600). "\">:";
+  echo "<td><input type=\"text\" name=\"timeh\" size=\"2\" maxlength=\"2\" value=\"". gmdate("H", time()+90+3600). "\">:";
-	echo "<input type=\"text\" name=\"timem\" size=\"2\" maxlength=\"2\" value=\"". gmdate("i", time()+90+3600). "\"></td>\n";
+  echo "<input type=\"text\" name=\"timem\" size=\"2\" maxlength=\"2\" value=\"". gmdate("i", time()+90+3600). "\"></td>\n";
-	echo "<td><input type=\"submit\" name=\"dial\" value=\"dial\"></td>\n";
+  echo "<td><input type=\"submit\" name=\"dial\" value=\"dial\"></td>\n";
-	echo "</tr>";
+  echo "</tr>";
-	echo "</table>\n";
+  echo "</table>\n";
-	
+  
-	echo "</form>";
+  echo "</form>";
 
 
 include ("../../../camp2011/includes/footer.php");

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

@@ -22,119 +22,119 @@ switch ($_GET["quest"])
 // *---------------------------------------------------------------------------
 
 case "all":
-	$SQL="SELECT * FROM `Questions` ORDER BY QID DESC";
+  $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>
+      <th>Frage</th>
-			<th>Anfragender</th>
+      <th>Anfragender</th>
                         <th>Beantwortet?</th>
                         <th>Antwort</th>
                         <th>Antwort von</th>
-			<th>change</th>
+      <th>change</th>
                 </tr>
 
-<?PHP
+<?php
 
         $Erg = mysql_query($SQL, $con);
         // anzahl zeilen
         $Zeilen  = mysql_num_rows($Erg);
         for ($n = 0 ; $n < $Zeilen ; $n++) {
-		echo "<tr class=\"content\">\n";
+    echo "<tr class=\"content\">\n";
-		echo "<td>".mysql_result($Erg, $n, "Question")."</td>\n";
+    echo "<td>".mysql_result($Erg, $n, "Question")."</td>\n";
-		echo "<td>".UID2Nick(mysql_result($Erg, $n, "UID"))."</td>\n";
+    echo "<td>".UID2Nick(mysql_result($Erg, $n, "UID"))."</td>\n";
-		echo "<td>";
+    echo "<td>";
-		if (mysql_result($Erg, $n, "AID")>0) 
+    if (mysql_result($Erg, $n, "AID")>0) 
-		{ 
+    { 
-			echo "Ja</td>\n";
+      echo "Ja</td>\n";
-			echo "<td>".mysql_result($Erg, $n, "Answer")."</td>\n";
+      echo "<td>".mysql_result($Erg, $n, "Answer")."</td>\n";
-			echo "<td>".UID2Nick(mysql_result($Erg, $n, "AID"))."</td>\n";
+      echo "<td>".UID2Nick(mysql_result($Erg, $n, "AID"))."</td>\n";
-		} 
+    } 
-		else 
+    else 
-		{
+    {
-			echo "Nein</td>\n";
+      echo "Nein</td>\n";
-			echo "<td>&nbsp;</td>\n";
+      echo "<td>&nbsp;</td>\n";
-			echo "<td>&nbsp;</td>\n";
+      echo "<td>&nbsp;</td>\n";
-		}
+    }
-		echo "<td><a href=\"faq.php?quest=edit&QID=".mysql_result($Erg, $n, "QID")."\">xxx</a></td>";
+    echo "<td><a href=\"faq.php?quest=edit&QID=".mysql_result($Erg, $n, "QID")."\">xxx</a></td>";
-		echo "</tr>\n";
+    echo "</tr>\n";
-	}
+  }
-	echo "</table>\n";
+  echo "</table>\n";
-	break;
+  break;
-	
+  
 case "open":
-	$SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC";
+  $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC";
-	$quest_bearb=1; // Fragenliste anzeigen
+  $quest_bearb=1; // Fragenliste anzeigen
-	echo "\t\tOffene Anfragen:<br>\n";
+  echo "\t\tOffene Anfragen:<br />\n";
-	break;
+  break;
-	
+  
 case "edit":
-	if (!IsSet($_GET["QID"]))
+  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 
+  else 
-	{
+  {
-		$SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
+    $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
-		$Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
-		echo "\t\t<form action=\"./faq.php\" method=\"GET\">\n";
+    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\">".
+    echo "\t\t<textarea name=\"Question\" rows=\"3\" cols=\"80\">".
-			mysql_result($Erg, 0, "Question"). "</textarea>\n";
+      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")=="") 
+    if (mysql_result($Erg, 0, "Answer")=="") 
-			echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">".
+      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 
+    else 
-			echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">". 
+      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=\"QID\" value=\"". $_GET["QID"]. "\">\n";
-		echo "\t\t<input type=\"hidden\" name=\"quest\" value=\"save\">\n";
+    echo "\t\t<input type=\"hidden\" name=\"quest\" value=\"save\">\n";
-		echo "\t\t<input type=\"submit\" value=\"Sichern...\">\n";
+    echo "\t\t<input type=\"submit\" value=\"Sichern...\">\n";
-		echo "\t</form>\n";
+    echo "\t</form>\n";
-		if (mysql_result($Erg, 0, "AID")<>"0") 
+    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";
+      echo "<a href=\"./faq.php?quest=transfer&QID=". $_GET["QID"]. "\">Als FAQ-Eintrag sichern...</a>\n";
-		}
+    }
-	} // Abfrage der QID
+  } // Abfrage der QID
-	break;
+  break;
 
 case "save":
-	if (!IsSet($_GET["QID"]))
+  if (!IsSet($_GET["QID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...";
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...";
         else
-	{
+  {
-		$SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. 
+    $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. 
-	  		 "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ".
+         "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ".
-			 "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1";
+       "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1";
-        	$Erg = db_query($SQL, "save Question");
+          $Erg = db_query($SQL, "save Question");
-		if ($Erg == 1) 
+    if ($Erg == 1) 
-		{
+    {
-			echo "\tDer Eintrag wurde ge&auml;ndert<br>\n";
+      echo "\tDer Eintrag wurde ge&auml;ndert<br />\n";
-			SetHeaderGo2Back();
+      SetHeaderGo2Back();
-          	} 
+            } 
-		else 
+    else 
-			echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+      echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         }
-	break;
+  break;
 
 case "transfer":
-	if (!IsSet($_GET["QID"]))
+  if (!IsSet($_GET["QID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
-	else
+  else
-	{
+  {
-		$SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
+    $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
-		$Erg = mysql_query($SQL1, $con);
+    $Erg = mysql_query($SQL1, $con);
-		$SQL2="INSERT INTO `FAQ` Values ('', '".
+    $SQL2="INSERT INTO `FAQ` Values ('', '".
-			mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')";
+      mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')";
-		$Erg = db_query($SQL2, "trasfert to request to the FAQ");
+    $Erg = db_query($SQL2, "trasfert to request to the FAQ");
-		if ($Erg == 1) 
+    if ($Erg == 1) 
-			echo "\tDer Eintrag wurde &uuml;bertragen.<br>\n";
+      echo "\tDer Eintrag wurde &uuml;bertragen.<br />\n";
-	        else
+          else
-			echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+      echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
-	}
+  }
-	
+  
-	break;
+  break;
 
 // *---------------------------------------------------------------------------
 // * FAQ - Bearbeitung
@@ -143,105 +143,105 @@ case "transfer":
 // * geaendert oder geloscht werden...
 // *---------------------------------------------------------------------------
 case "faq":
-	$quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren...
+  $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>";
+  echo "<a href=\"./faq.php?quest=faqnew\">Neuen Eintrag</a>";
-	
+  
-	$SQL = "SELECT * FROM `FAQ`";
+  $SQL = "SELECT * FROM `FAQ`";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
 
-	// anzahl zeilen
+  // anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  $Zeilen  = mysql_num_rows($Erg);
 
-	for ($n = 0 ; $n < $Zeilen ; $n++)
+  for ($n = 0 ; $n < $Zeilen ; $n++)
-		if (mysql_result($Erg, $n, "Antwort")!="")
+    if (mysql_result($Erg, $n, "Antwort")!="")
-		{
+    {
-			echo "\t<p class=\"question\">".  mysql_result($Erg, $n, "Frage").  "</p>\n";
+      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<p class=\"answetion\">". mysql_result($Erg, $n, "Antwort")."</p>\n";
-			echo "\t<a href=\"./faq.php?quest=faqedit&FAQID=". mysql_result($Erg, $n, "FID"). 
+      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;
+  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
+  else
-	{
+  {
-		$SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'";
+    $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'";
-		$Erg = mysql_query($SQL, $con);
+    $Erg = mysql_query($SQL, $con);
 
-		// anzahl zeilen
+    // anzahl zeilen
-		$Zeilen  = mysql_num_rows($Erg);
+    $Zeilen  = mysql_num_rows($Erg);
 ?>
-	<form action="./faq.php" method="GET">
+  <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>
+  <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="hidden" name="quest" value="faqsave">
-	<input type="submit" value="Sichern...">
+  <input type="submit" value="Sichern...">
-	</form>
+  </form>
-	<form action="./faq.php">	
+  <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>
+  </form>
 <?php 
-	}
+  }
-	break;
+  break;
 
 case "faqdelete";
-	if (!IsSet($_GET["FAQID"]))
+  if (!IsSet($_GET["FAQID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
-	else 
+  else 
-	{
+  {
-		$SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
+    $SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
-		$Erg = db_query($SQL, "delate faq item");
+    $Erg = db_query($SQL, "delate faq item");
-		if ($Erg == 1) 
+    if ($Erg == 1) 
-			echo "\tDer Eintrag wurde gel&ouml;scht<br>\n";
+      echo "\tDer Eintrag wurde gel&ouml;scht<br />\n";
-		else
+    else
-			echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gel&ouml;scht gewesen?\n";
+      echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gel&ouml;scht gewesen?\n";
-	}
+  }
-	break;
+  break;
 
 case "faqsave";
         if (!IsSet($_GET["FAQID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
         else 
-	{
+  {
-        	$SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. 
+          $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. 
-	  	 	"' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
+         "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
-		$Erg = db_query($SQL, $con);
+    $Erg = db_query($SQL, $con);
-		if ($Erg == 1) 
+    if ($Erg == 1) 
-			echo "\tDer Eintrag wurde ge&auml;ndert<br>\n";
+      echo "\tDer Eintrag wurde ge&auml;ndert<br />\n";
-          	else
+            else
-			echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+      echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         }
-	break;
+  break;
 
 case "faqnew":
 ?>
-	<form action="./faq.php" method="GET">
+  <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>
 <?php
-	break;
+  break;
 
 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";
+    echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         break;
 
 } //switch ($_GET["quest"])
@@ -251,32 +251,32 @@ case "faqnewsave";
 // Fragenliste anzeigen???
 if ($quest_bearb==1) 
 {
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	// anzahl zeilen
+  // anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  $Zeilen  = mysql_num_rows($Erg);
 
-	if ($Zeilen==0)
+  if ($Zeilen==0)
-		echo "\tkeine vorhanden...\n";
+    echo "\tkeine vorhanden...\n";
-	else
+  else
-		for ($n = 0 ; $n < $Zeilen ; $n++) 
+    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 "\t<a href=\"./faq.php?quest=edit&QID=". mysql_result($Erg, $n, "QID"). "\">Bearbeiten</a>\n";
-			echo "<br>---<br>\n";
+      echo "<br />---<br />\n";
-		}
+    }
-	
+  
 }
 
 } //if (IsSet($_GET["quest"]))
 else 
 {
-	echo "Bitte w&auml;hle aus, ob du:\n";
+  echo "Bitte w&auml;hle aus, ob du:\n";
-	echo "<ul>\n";
+  echo "<ul>\n";
-	echo "\t<li><a href=\"./faq.php?quest=all\">Alle Anfragen anzeigen/bearbeiten m&ouml;chtest</a></li>\n";
+  echo "\t<li><a href=\"./faq.php?quest=all\">Alle Anfragen anzeigen/bearbeiten m&ouml;chtest</a></li>\n";
-	echo "\t<li><a href=\"./faq.php?quest=open\">Alle offenen Anfragen anzeigen/bearbeiten m&ouml;chtest (". 
+  echo "\t<li><a href=\"./faq.php?quest=open\">Alle offenen Anfragen anzeigen/bearbeiten m&ouml;chtest (". 
-		noAnswer(). ")</a></li>\n";
+    noAnswer(). ")</a></li>\n";
-	echo "\t<li><a href=\"./faq.php?quest=faq\">Die FAQ's anzeigen/bearbeiten</a></li>\n";
+  echo "\t<li><a href=\"./faq.php?quest=faq\">Die FAQ's anzeigen/bearbeiten</a></li>\n";
-	echo "</ul>\n";
+  echo "</ul>\n";
 }
 
 include ("../../../camp2011/includes/footer.php");

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";
 
 
 #######################################################
@@ -21,21 +21,21 @@ echo "<br><br>\n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht
 
 /* geht nicht ??? unter stabel !!
 $SQL= "SELECT User.Nick, Schichtplan.*, Schichtbelegung.* ".
-	"FROM Schichtplan, User LEFT OUTER ".
+  "FROM Schichtplan, User LEFT OUTER ".
-	"JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ".
+  "JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ".
-	"WHERE Schichtplan.SID = Schichtbelegung.SID AND ".
+  "WHERE Schichtplan.SID = Schichtbelegung.SID AND ".
-		"Schichtplan.Date < now() and ".
+    "Schichtplan.Date < now() and ".
-		"Schichtplan.EndDate > now() ".
+    "Schichtplan.EndDate > now() ".
-	"ORDER BY Nick";
+  "ORDER BY Nick";
-	
+  
 $SQL =  "SELECT Shifts.*, ShiftEntry.*, User.Nick ".
-	"FROM User ".
+  "FROM User ".
-	"INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ".
+  "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ".
-	"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );";		
+  "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );";    
 */
 $SQL =  "SELECT Shifts.*, ShiftEntry.* ".
-	"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ".
+  "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ".
-	"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";		
+  "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";    
 
 //SELECT User.Nick, Schichtplan.*, Schichtbelegung. * FROM User LEFT JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID, Schichtplan LEFT JOIN Schichtbelegung ON Schichtplan.SID = Schichtbelegung.SID WHERE Schichtplan.Date < now() and Schichtplan.EndDate > now() ORDER BY Nick
 
@@ -62,27 +62,27 @@ echo "\t</tr>\n";
 $inuse="";
 for ($i=0; $i < $Zeilen; $i++)
 {
-	echo "<tr class=\"content\">\n";
+  echo "<tr class=\"content\">\n";
-	echo "<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=". mysql_result($Erg, $i, "UID"). "\">". 
+  echo "<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=". mysql_result($Erg, $i, "UID"). "\">". 
-		UID2Nick(mysql_result($Erg, $i, "UID")). "</td></a>\n";
+    UID2Nick(mysql_result($Erg, $i, "UID")). "</td></a>\n";
-	echo "<td></td>\n";
+  echo "<td></td>\n";
-	echo "<td>". mysql_result($Erg, $i, "RID"). "</td>\n";
+  echo "<td>". mysql_result($Erg, $i, "RID"). "</td>\n";
-	echo "<td>". mysql_result($Erg, $i, "DateS"). "</td>\n";
+  echo "<td>". mysql_result($Erg, $i, "DateS"). "</td>\n";
-	echo "<td>". mysql_result($Erg, $i, "DateE"). "</td>\n";
+  echo "<td>". mysql_result($Erg, $i, "DateE"). "</td>\n";
-	echo "</tr>\n";
+  echo "</tr>\n";
 
-	if ($inuse!="") 
+  if ($inuse!="") 
-  		$inuse.= " OR ";
+      $inuse.= " OR ";
-	$inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")";
+  $inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")";
 }
 if ($inuse!="") 
-	$inuse=" WHERE NOT (".$inuse.")";
+  $inuse=" WHERE NOT (".$inuse.")";
 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";
 
@@ -91,11 +91,11 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 for ($i=0; $i < $Zeilen; $i++)
 {
-	echo "\t<tr class=\"content\">\n";
+  echo "\t<tr class=\"content\">\n";
-	echo "\t\t<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=". mysql_result($Erg, $i, "UID"). "\">".
+  echo "\t\t<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=". mysql_result($Erg, $i, "UID"). "\">".
-		mysql_result($Erg, $i, "Nick"). "</a></td>\n";
+    mysql_result($Erg, $i, "Nick"). "</a></td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "DECT"). "</td>\n";
+  echo "\t\t<td>". mysql_result($Erg, $i, "DECT"). "</td>\n";
- 	echo "\n</tr>\n";
+   echo "\n</tr>\n";
 }
 echo "</table>\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");
@@ -12,8 +12,8 @@ include ("../../../camp2011/includes/funktion_user.php");
 #######################################################
 
 $SQL =  "SELECT Shifts.*, ShiftEntry.* ".
-	"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ".
+  "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ".
-	"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";		
+  "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";    
 
 $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
@@ -21,17 +21,17 @@ $Zeilen  = mysql_num_rows($Erg);
 $inuse="";
 for ($i=0; $i < $Zeilen; $i++)
 {
-	if ($inuse!="") 
+  if ($inuse!="") 
-  		$inuse.= " OR ";
+      $inuse.= " OR ";
-	$inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")";
+  $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")";
 }
 if ($inuse!="") 
 {
-	$inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')";
+  $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')";
 }
 else
 {
-	$inuse=" WHERE (DECT!='')";
+  $inuse=" WHERE (DECT!='')";
 }
 
 
@@ -42,36 +42,36 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 for ($i=0; $i < $Zeilen; $i++)
 {
-	// get DECT number
+  // get DECT number
-	echo mysql_result($Erg, $i, "DECT"). "\t";
+  echo mysql_result($Erg, $i, "DECT"). "\t";
 
-	// get all user rights
+  // get all user rights
-	$SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";";
+  $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";";
-	$Erg_RIGHT = mysql_query($SQL_RIGHT, $con);
+  $Erg_RIGHT = mysql_query($SQL_RIGHT, $con);
-	$UserRights = mysql_fetch_array($Erg_RIGHT);
+  $UserRights = mysql_fetch_array($Erg_RIGHT);
 
-	foreach( $UserRights as $Var => $Value)
+  foreach( $UserRights as $Var => $Value)
-	{
+  {
-		if( 	(strpos( $Var, ".php") === false) AND 
+    if(   (strpos( $Var, ".php") === false) AND 
-			(strpos( $Var, "/") === false) AND
+      (strpos( $Var, "/") === false) AND
-			(strpos( $Var, "UID") === false) AND
+      (strpos( $Var, "UID") === false) AND
-			(is_numeric($Var) === false) )
+      (is_numeric($Var) === false) )
-		{
+    {
-			echo "\"".$Var. "\"=". $Value. "\t";
+      echo "\"".$Var. "\"=". $Value. "\t";
-		}
+    }
-	}
+  }
 
-	// get shift types
+  // get shift types
-	$SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;";
+  $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;";
-	$Erg_TYPES = mysql_query($SQL_TYPES, $con);
+  $Erg_TYPES = mysql_query($SQL_TYPES, $con);
-	$Zeilen_Typen  = mysql_num_rows($Erg_TYPES);
+  $Zeilen_Typen  = mysql_num_rows($Erg_TYPES);
-	for ($j=0; $j < $Zeilen_Typen; $j++)
+  for ($j=0; $j < $Zeilen_Typen; $j++)
-	{
+  {
-		echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t";	
+    echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t";  
-	}
+  }
 
-	echo "\n";
+  echo "\n";
-//	echo "<br>";
+//  echo "<br />";
 }
 
 ?>

www-ssl/admin/group.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,40 +7,40 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["enterGID"]))
 {
-	// Userliste, keine UID uebergeben...
+  // Userliste, keine UID uebergeben...
 
-	$SQL = "SELECT * FROM `UserGroups` ORDER BY `Name` ASC";
+  $SQL = "SELECT * FROM `UserGroups` ORDER BY `Name` ASC";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
+  echo mysql_error($con);
 
-	// anzahl zeilen
+  // anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  $Zeilen  = mysql_num_rows($Erg);
 
-	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<tr class=\"contenttopic\">\n";
+  echo "<tr class=\"contenttopic\">\n";
-	echo "\t<td>Groupname</td>\n";
+  echo "\t<td>Groupname</td>\n";
-	echo "\t<td>Link</td>\n";
+  echo "\t<td>Link</td>\n";
-	echo "</tr>\n";
+  echo "</tr>\n";
 
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
-		echo "<tr class=\"content\">\n";
+    echo "<tr class=\"content\">\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
-		
+    
-		echo "<td><a href=\"./userChangeSecure.php?enterUID=".
+    echo "<td><a href=\"./userChangeSecure.php?enterUID=".
-			mysql_result($Erg, $n, "UID")."&Type=Secure\">change</a></td>\n";
+      mysql_result($Erg, $n, "UID")."&Type=Secure\">change</a></td>\n";
-		echo "</tr>\n";
+    echo "</tr>\n";
-	}
+  }
-	
+  
-	// new form
+  // new form
-	echo "<tr class=\"content\">\n";
+  echo "<tr class=\"content\">\n";
-	echo "\t<form action=\"userSaveSecure.php?new=newGroup\"  method=\"POST\">\n";
+  echo "\t<form action=\"userSaveSecure.php?new=newGroup\"  method=\"POST\">\n";
-	echo "\t\t<td><input name=\"GroupName\" type=\"text\" value=\"--new group--\"></td>\n";
+  echo "\t\t<td><input name=\"GroupName\" type=\"text\" value=\"--new group--\"></td>\n";
-	echo "\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\"></td>\n";
+  echo "\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\"></td>\n";
-	echo "\t</form>\n";
+  echo "\t</form>\n";
-	echo "</tr>\n";
+  echo "</tr>\n";
 
-	echo "\t</table>\n";
+  echo "\t</table>\n";
-	// Ende Userliste
+  // Ende Userliste
 } 
 
 include ("../../../camp2011/includes/footer.php");

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";
@@ -8,14 +8,14 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["action"]))
 {
-	$SQL = "SELECT * FROM `News` ORDER BY `Datum` DESC";
+  $SQL = "SELECT * FROM `News` ORDER BY `Datum` DESC";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
 
-	$rowcount = mysql_num_rows($Erg);
+  $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">
@@ -24,97 +24,97 @@ hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br>
          <td>Text</td>
          <td>Erfasser</td>
          <td>Engeltreff</td>
-	 <td>&Auml;nd.</td>
+   <td>&Auml;nd.</td>
-	</tr>
+  </tr>
-<?PHP			  
+<?php        
 
-	for ($i=0; $i < $rowcount; $i++) 
+  for ($i=0; $i < $rowcount; $i++) 
-	{
+  {
-		echo "\t<tr class=\"content\">\n";
+    echo "\t<tr class=\"content\">\n";
-		echo "\t <td>".mysql_result($Erg, $i, "Datum")."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Datum")."</td>";
-		echo "\t <td>".mysql_result($Erg, $i, "Betreff")."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Betreff")."</td>";
-		echo "\t <td>".mysql_result($Erg, $i, "Text")."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Text")."</td>";
-		echo "\t <td>".UID2Nick(mysql_result($Erg, $i, "UID"))."</td>";
+    echo "\t <td>".UID2Nick(mysql_result($Erg, $i, "UID"))."</td>";
-		echo "\t <td>".mysql_result($Erg, $i, "Treffen")."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Treffen")."</td>";
-		echo "\t <td><a href=\"./news.php?action=change&date=".mysql_result($Erg, $i, "Datum")."\">XXX</a></td>";
+    echo "\t <td><a href=\"./news.php?action=change&date=".mysql_result($Erg, $i, "Datum")."\">XXX</a></td>";
-		echo "\t</tr>\n";
+    echo "\t</tr>\n";
-	}
+  }
-	echo "</table>";
+  echo "</table>";
 } 
 else 
 {
 
-	unSet($chsql);
+  unSet($chsql);
 
-	switch ($_GET["action"]) 
+  switch ($_GET["action"]) 
-	{
+  {
-	case 'change':
+  case 'change':
-		if (isset($_GET["date"]))
+    if (isset($_GET["date"]))
-		{
+    {
-			$SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')";
+      $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')";
-			$Erg = mysql_query($SQL, $con);
+      $Erg = mysql_query($SQL, $con);
 
-			if( mysql_num_rows( $Erg)>0)
+      if( mysql_num_rows( $Erg)>0)
-			{
+      {
-				echo "<form action=\"./news.php\" method=\"GET\">\n";
+        echo "<form action=\"./news.php\" method=\"GET\">\n";
 
-				echo "<table>\n";
+        echo "<table>\n";
-				echo "  <tr><td>Datum</td><td><input type=\"text\" size=\"40\" name=\"date\" value=\"".
+        echo "  <tr><td>Datum</td><td><input type=\"text\" size=\"40\" name=\"date\" value=\"".
-					mysql_result($Erg, 0, "Datum")."\" disabled></td></tr>\n";
+          mysql_result($Erg, 0, "Datum")."\" disabled></td></tr>\n";
-				echo "  <tr><td>Betreff</td><td><input type=\"text\" size=\"40\" name=\"eBetreff\" value=\"".
+        echo "  <tr><td>Betreff</td><td><input type=\"text\" size=\"40\" name=\"eBetreff\" value=\"".
-					mysql_result($Erg, 0, "Betreff")."\"></td></tr>\n";
+          mysql_result($Erg, 0, "Betreff")."\"></td></tr>\n";
-				echo "  <tr><td>Text</td><td><textarea rows=\"10\" cols=\"80\" name=\"eText\">".
+        echo "  <tr><td>Text</td><td><textarea rows=\"10\" cols=\"80\" name=\"eText\">".
-					mysql_result($Erg, 0, "Text")."</textarea></td></tr>\n";
+          mysql_result($Erg, 0, "Text")."</textarea></td></tr>\n";
-				echo "  <tr><td>Engel</td><td><input type=\"text\" size=\"40\" name=\"eUser\" value=\"".
+        echo "  <tr><td>Engel</td><td><input type=\"text\" size=\"40\" name=\"eUser\" value=\"".
-					UID2Nick(mysql_result($Erg, 0, "UID"))."\" disabled></td></tr>\n";
+          UID2Nick(mysql_result($Erg, 0, "UID"))."\" disabled></td></tr>\n";
-				echo "  <tr><td>Treffen</td><td><input type=\"text\" size=\"40\" name=\"eTreffen\" value=\"".
+        echo "  <tr><td>Treffen</td><td><input type=\"text\" size=\"40\" name=\"eTreffen\" value=\"".
-					mysql_result($Erg, 0, "Treffen")."\"></td></tr>\n";
+          mysql_result($Erg, 0, "Treffen")."\"></td></tr>\n";
-				echo "</table>";
+        echo "</table>";
 
-			        echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
+              echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"change_save\">\n";
+        echo "<input type=\"hidden\" name=\"action\" value=\"change_save\">\n";
-				echo "<input type=\"submit\" value=\"Abschicken...\">\n";
+        echo "<input type=\"submit\" value=\"Abschicken...\">\n";
-				echo "</form>";
+        echo "</form>";
 
-				echo "<form action=\"./news.php?action=delete\" method=\"POST\">\n";
+        echo "<form action=\"./news.php?action=delete\" method=\"POST\">\n";
-				echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
+        echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
-				echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
+        echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
-				echo "</form>";
+        echo "</form>";
-			}
+      }
-			else
+      else
-				echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden";
+        echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden";
-		}
+    }
-		else
+    else
-			echo "Fehler: \"date\" nicht übergeben";
+      echo "Fehler: \"date\" nicht übergeben";
-		break;
+    break;
 
-	case 'change_save':
+  case 'change_save':
-		if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) )
+    if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) )
-			$chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. 
+      $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. 
-				"', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1";
+        "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1";
-		else
+    else
-			echo "Fehler: nicht genügend parameter übergeben";
+      echo "Fehler: nicht genügend parameter übergeben";
-		break;
+    break;
 
-	case 'delete':
+  case 'delete':
-		if (isset($_POST["date"]))
+    if (isset($_POST["date"]))
-		        $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1";
+            $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1";
-		else
+    else
-			echo "Fehler: \"date\" nicht übergeben";
+      echo "Fehler: \"date\" nicht übergeben";
-		break;
+    break;
-	} //SWITCH
+  } //SWITCH
 
-	if (IsSet($chsql)) 
+  if (IsSet($chsql)) 
-	{
+  {
-		// SQL-Statement ausführen...
+    // SQL-Statement ausführen...
-		$Erg = mysql_query($chsql, $con);
+    $Erg = mysql_query($chsql, $con);
-		If ($Erg == 1)
+    If ($Erg == 1)
-			echo "&Auml;nderung erfolgreich gesichert...";
+      echo "&Auml;nderung erfolgreich gesichert...";
-		else 
+    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();
+    SetHeaderGo2Back();
-	}
+  }
 }// IF-ELSE
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/room.php

@@ -9,36 +9,36 @@ $Erg = mysql_query($Sql, $con);
 
 if( !IsSet($_GET["action"]) )
 {
-	echo "Hallo ".$_SESSION['Nick'].
+  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 "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<tr class=\"contenttopic\">\n";
+  echo "<tr class=\"contenttopic\">\n";
 
-	for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
+  for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
-	{
+  {
-		if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_")
+    if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_")
-			echo "\t<td> Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "</td>";
+      echo "\t<td> Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "</td>";
-		else
+    else
-			echo "\t<td>". mysql_field_name($Erg, $i)."</td>";
+      echo "\t<td>". mysql_field_name($Erg, $i)."</td>";
-	}
+  }
-	echo "\t<td>&Auml;ndern</td>";
+  echo "\t<td>&Auml;ndern</td>";
-	echo "</tr>";
+  echo "</tr>";
 
-	for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
+  for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-	{	
+  {  
-		echo "\t<tr class=\"content\">\n";
+    echo "\t<tr class=\"content\">\n";
-		for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
+    for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
-		{
+    {
-  			echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
+        echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
-		}
+    }
-		echo "\t\t<td><a href=\"./room.php?action=change&RID=".mysql_result($Erg, $t, "RID")."\">###</a></td>\n";
+    echo "\t\t<td><a href=\"./room.php?action=change&RID=".mysql_result($Erg, $t, "RID")."\">###</a></td>\n";
-		echo "\t</tr>\n";
+    echo "\t</tr>\n";
-	} // ende Auflistung Raeume
+  } // ende Auflistung Raeume
-	echo "</table>";
+  echo "</table>";
 } 
 else 
 {
@@ -48,132 +48,132 @@ 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 "<form action=\"./room.php\" method=\"GET\">\n";
-	echo "<table>\n";
+  echo "<table>\n";
-	
+  
-	for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
+  for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
-	{
+  {
-		if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") )
+    if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") )
-		{
+    {
-			echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
+      echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
-			     "<td>".
+           "<td>".
-			     "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"Y\">Yes".
+           "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"Y\">Yes".
-			     "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"N\">No".
+           "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"N\">No".
-			     "</td></tr>\n";
+           "</td></tr>\n";
-		}
+    }
-		else
+    else
-		{
+    {
-			//sonderfall fuer Default Engel 
+      //sonderfall fuer Default Engel 
-			if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_")
+      if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_")
-				$FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)];
+        $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)];
-			else
+      else
-				$FeldName = mysql_field_name($Erg, $Uj);
+        $FeldName = mysql_field_name($Erg, $Uj);
-		
+    
-			echo "<td>$FeldName</td>".
+      echo "<td>$FeldName</td>".
-		        	"<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\">";
+              "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\">";
-			echo "</td></tr>\n";
+      echo "</td></tr>\n";
-		}
+    }
-	}
+  }
-	echo "</table>\n";
+  echo "</table>\n";
-	echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
+  echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
-	echo "<input type=\"submit\" value=\"sichern...\">\n";
+  echo "<input type=\"submit\" value=\"sichern...\">\n";
-	echo "</form>";
+  echo "</form>";
-	break;
+  break;
 
 case 'newsave':
-	$vars = $_GET;
+  $vars = $_GET;
-	$count = count($vars) - 1;
+  $count = count($vars) - 1;
-	$vars = array_splice($vars, 0, $count);
+  $vars = array_splice($vars, 0, $count);
-	$Keys = "";
+  $Keys = "";
-	$Values = "";
+  $Values = "";
-	foreach($vars as $key => $value)
+  foreach($vars as $key => $value)
-	{
+  {
-		$Keys   .= ", `$key`";
+    $Keys   .= ", `$key`";
-		$Values .= ", '$value'";
+    $Values .= ", '$value'";
-	}
+  }
-	$SQL  = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")";
+  $SQL  = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")";
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
 
 case 'change':
-	if (! IsSet($_GET["RID"])) 
+  if (! IsSet($_GET["RID"])) 
-		echo "Fehlerhafter Aufruf!"; 
+    echo "Fehlerhafter Aufruf!"; 
-	else
+  else
-	{
+  {
-		$SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";
+    $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";
-		$ERG = mysql_query($SQL2, $con);
+    $ERG = mysql_query($SQL2, $con);
-		
+    
-		if( mysql_num_rows( $ERG)>0)
+    if( mysql_num_rows( $ERG)>0)
-		{
+    {
-			echo "Raum ab&auml;ndern:\n";
+      echo "Raum ab&auml;ndern:\n";
-			echo "Hier kannst du eintragen, welche und wieviele Engel f&uuml;r den Raum zur Verf?gung stehen m&uuml;ssen.";	
+      echo "Hier kannst du eintragen, welche und wieviele Engel f&uuml;r den Raum zur Verf?gung stehen m&uuml;ssen.";  
-			echo "<form action=\"./room.php\" method=\"GET\">\n";
+      echo "<form action=\"./room.php\" method=\"GET\">\n";
-			echo "<table>\n";
+      echo "<table>\n";
-		
+    
-			for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
+      for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
-			{
+      {
-				if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") )
+        if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") )
-				{
+        {
-					echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
+          echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
-					     "<td>".
+               "<td>".
-					     "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
+               "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
-					     	"\" value=\"Y\"". (mysql_result($ERG, 0, $Uj)=='Y'? " checked":""). ">Yes".
+                 "\" value=\"Y\"". (mysql_result($ERG, 0, $Uj)=='Y'? " checked":""). ">Yes".
-					     "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
+               "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
-					     	"\" value=\"N\"". (mysql_result($ERG, 0, $Uj)=='N'? " checked":""). ">No".
+                 "\" value=\"N\"". (mysql_result($ERG, 0, $Uj)=='N'? " checked":""). ">No".
-					     "</td></tr>\n";
+               "</td></tr>\n";
-				}
+        }
-				else
+        else
-				{
+        {
-					if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_")
+          if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_")
-						//sonderfall fuer Default Engel 
+            //sonderfall fuer Default Engel 
-						$FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)];
+            $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)];
-					else
+          else
-						$FeldName = mysql_field_name($ERG, $Uj);
+            $FeldName = mysql_field_name($ERG, $Uj);
-					echo "<tr><td>$FeldName</td>".
+          echo "<tr><td>$FeldName</td>".
-					     "<td><input type=\"text\" size=\"40\" name=\"e".mysql_field_name($ERG, $Uj)."\" ".
+               "<td><input type=\"text\" size=\"40\" name=\"e".mysql_field_name($ERG, $Uj)."\" ".
-					     "value=\"".mysql_result($ERG, 0, $Uj)."\">".
+               "value=\"".mysql_result($ERG, 0, $Uj)."\">".
-					     "</td></tr>\n";
+               "</td></tr>\n";
-				}
+        }
-			}
+      }
-			echo "</table>\n";
+      echo "</table>\n";
-			echo "<input type=\"hidden\" name=\"eRID\" value=\"". $_GET["RID"]. "\">\n";
+      echo "<input type=\"hidden\" name=\"eRID\" value=\"". $_GET["RID"]. "\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
-			echo "<input type=\"submit\" value=\"sichern...\">\n";
+      echo "<input type=\"submit\" value=\"sichern...\">\n";
-			echo "</form>";
+      echo "</form>";
-			echo "<form action=\"./room.php\" method=\"GET\">\n";
+      echo "<form action=\"./room.php\" method=\"GET\">\n";
-			echo "<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">\n";
+      echo "<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
-			echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
+      echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
-			echo "</form>";
+      echo "</form>";
-		}
+    }
-		else
+    else
-			echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden";
+      echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden";
-	}
+  }
-	break;
+  break;
-	
+  
 case 'changesave':
-	$sql="";
+  $sql="";
-		$vars = $_GET;
+    $vars = $_GET;
-		$count = count($vars) - 2;
+    $count = count($vars) - 2;
-		$vars = array_splice($vars, 0, $count);
+    $vars = array_splice($vars, 0, $count);
-		foreach($vars as $key => $value)
+    foreach($vars as $key => $value)
-		{
+    {
-	 		$keys = substr($key,1);
+       $keys = substr($key,1);
-			$sql .= ", `".$keys."`='".$value."' ";
+      $sql .= ", `".$keys."`='".$value."' ";
-		}
+    }
-	$SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'";
+  $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'";
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
 
 case 'delete':
-	if (IsSet($_GET["RID"])) {
+  if (IsSet($_GET["RID"])) {
-		$SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";		
+    $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";    
-	} else {
+  } else {
-		echo "Fehlerhafter Aufruf";
+    echo "Fehlerhafter Aufruf";
-	}
+  }
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
 
 } //switch
 
@@ -181,17 +181,17 @@ case 'delete':
 // Update ???
 
 if (IsSet($SQL)){ 
-//	echo $SQL; 
+//  echo $SQL; 
-	// hier muesste das SQL ausgefuehrt werden...
+  // hier muesste das SQL ausgefuehrt werden...
-	$Erg = db_query($SQL, "exec SQL");
+  $Erg = db_query($SQL, "exec SQL");
-	if ($Erg == 1) 
+  if ($Erg == 1) 
-	     echo "&Auml;nderung wurde gesichert...<br>";
+       echo "&Auml;nderung wurde gesichert...<br />";
-	else
+  else
-	{
+  {
-	     echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+       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								
+} // Ende Update                
 
 } //IF IsSet($action)
 

www-ssl/admin/schichtplan.php

@@ -6,59 +6,59 @@ include ("../../../camp2011/includes/header.php");
 
 function executeSQL( $SQL)
 {
-	global $DEBUG, $con;
+  global $debug, $con;
-	
+  
-	$Erg = mysql_query($SQL, $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) 
+  if ($Erg == 1) 
-	{
+  {
-	     	echo "SQL war erfolgreich";
+         echo "SQL war erfolgreich";
-	}
+  }
-	else 
+  else 
-	{
+  {
-		echo "SQL Fehler (". mysql_error($con).")" ;
+    echo "SQL Fehler (". mysql_error($con).")" ;
-	}
+  }
 }
 
 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";
 ?>
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
-	<tr class="contenttopic">
+  <tr class="contenttopic">
-		<td></td>
+    <td></td>
-		<td>Datum</td>
+    <td>Datum</td>
-		<td>Raum</td>
+    <td>Raum</td>
-		<td>Dauer</td>
+    <td>Dauer</td>
-		<td>&Auml;ndern</td>
+    <td>&Auml;ndern</td>
-	</tr>
+  </tr>
-<?PHP
+<?php
 
 $sql =  "SELECT `SID`, `DateS`, `RID`, `Len` FROM `Shifts` ".
-	"ORDER BY `RID`, `DateS` ";
+  "ORDER BY `RID`, `DateS` ";
 $Erg = mysql_query($sql, $con);
 $rowcount = mysql_num_rows($Erg);
 for( $i = 0; $i < $rowcount; $i++)
 {
-	echo "\t<tr class=\"content\">\n";
+  echo "\t<tr class=\"content\">\n";
-	echo "\t\t<td><input type=\"checkbox\" name=\"SID". mysql_result($Erg, $i, "SID"). "\" ".
+  echo "\t\t<td><input type=\"checkbox\" name=\"SID". mysql_result($Erg, $i, "SID"). "\" ".
-		"value=\"". mysql_result($Erg, $i, "SID"). "\"></td>\n";
+    "value=\"". mysql_result($Erg, $i, "SID"). "\"></td>\n";
-	echo "\t\t<td>".mysql_result($Erg, $i, "DateS")."</td>\n";
+  echo "\t\t<td>".mysql_result($Erg, $i, "DateS")."</td>\n";
   
-	$sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'";
+  $sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'";
-	$Erg2 = mysql_query($sql2, $con);
+  $Erg2 = mysql_query($sql2, $con);
-	if( mysql_num_rows($Erg2) > 0)
+  if( mysql_num_rows($Erg2) > 0)
-		echo "\t\t<td>".mysql_result($Erg2, 0, "Name")."</td>\n";
+    echo "\t\t<td>".mysql_result($Erg2, 0, "Name")."</td>\n";
-	else
+  else
-		echo "\t\t<td>Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")</td>\n";
+    echo "\t\t<td>Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")</td>\n";
-	echo "\t\t<td>".mysql_result($Erg, $i, "Len")." Std. </td>\n";
+  echo "\t\t<td>".mysql_result($Erg, $i, "Len")." Std. </td>\n";
-	echo "\t\t<td><a href=\"./schichtplan.php?action=change&SID=".
+  echo "\t\t<td><a href=\"./schichtplan.php?action=change&SID=".
-		mysql_result($Erg, $i, "SID")."\">####</a></td>\n";
+    mysql_result($Erg, $i, "SID")."\">####</a></td>\n";
-	echo "\t</tr>\n";
+  echo "\t</tr>\n";
 }
 echo "</table>\n";
 
@@ -75,317 +75,317 @@ UnSet($chSQL);
 switch ($_GET["action"]){
 
 case 'change':
-	if ( !IsSet($_GET["SID"]) )
+  if ( !IsSet($_GET["SID"]) )
-	{
+  {
-		echo "Fehlerhafter Aufruf!\n";
+    echo "Fehlerhafter Aufruf!\n";
-	} 
+  } 
-	else 
+  else 
-	{
+  {
-	
+  
-	$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )";
+  $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
 
-        echo "Schicht ab&auml;ndern: <br>\n";
+        echo "Schicht ab&auml;ndern: <br />\n";
 
-	// Anzeige Allgemeiner schaischt daten
+  // Anzeige Allgemeiner schaischt daten
         echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
         echo "<table>\n";
         echo "  <tr><td>Schichtbeginn</td>".
-		"<td><input value=\"". mysql_result($Erg, 0, "DateS"). 
+    "<td><input value=\"". mysql_result($Erg, 0, "DateS"). 
-		"\" type=\"text\" size=\"40\" name=\"eDate\"></td></tr>\n";
+    "\" type=\"text\" size=\"40\" name=\"eDate\"></td></tr>\n";
-	echo "  <tr><td>Raum</td><td>\n<select name=\"eRID\">\n";
+  echo "  <tr><td>Raum</td><td>\n<select name=\"eRID\">\n";
-	
+  
-	$sql2 = "SELECT `RID`, `Name`, `FromPentabarf` FROM `Room`";
+  $sql2 = "SELECT `RID`, `Name`, `FromPentabarf` FROM `Room`";
         $Erg2 = mysql_query($sql2, $con);
-	$rowcount = mysql_num_rows($Erg2);
+  $rowcount = mysql_num_rows($Erg2);
-	$FromPentabarf = "N";
+  $FromPentabarf = "N";
-	for( $i = 0; $i < $rowcount; $i++ )
+  for( $i = 0; $i < $rowcount; $i++ )
-	{
+  {
-		$RID=mysql_result($Erg2, $i, "RID");
+    $RID=mysql_result($Erg2, $i, "RID");
-		echo "   <option value=\"".$RID."\"";
+    echo "   <option value=\"".$RID."\"";
-		if( $RID == mysql_result($Erg, 0, "RID") )
+    if( $RID == mysql_result($Erg, 0, "RID") )
-		{
+    {
-			echo " selected";
+      echo " selected";
-			$FromPentabarf = mysql_result($Erg2, $i, "FromPentabarf");
+      $FromPentabarf = mysql_result($Erg2, $i, "FromPentabarf");
-		}
+    }
-		echo ">".mysql_result($Erg2, $i, "Name")."</option>\n";
+    echo ">".mysql_result($Erg2, $i, "Name")."</option>\n";
-	}
+  }
-	echo "  </select>\n</td></tr>\n";
+  echo "  </select>\n</td></tr>\n";
-	 
+   
-	echo "  <tr><td>Dauer in h</td>".
+  echo "  <tr><td>Dauer in h</td>".
-	 	"<td><input value=\"". mysql_result($Erg, 0, "Len").
+     "<td><input value=\"". mysql_result($Erg, 0, "Len").
-		"\" type=\"text\" size=\"40\" name=\"eDauer\"></td></tr>\n";
+    "\" type=\"text\" size=\"40\" name=\"eDauer\"></td></tr>\n";
-	echo "  <tr><td>Beschreibung</td>".
+  echo "  <tr><td>Beschreibung</td>".
-	 	"<td><input value=\"". mysql_result($Erg, 0, "Man").
+     "<td><input value=\"". mysql_result($Erg, 0, "Man").
-		"\" type=\"text\" size=\"40\" name=\"eName\"></td></tr>\n";
+    "\" type=\"text\" size=\"40\" name=\"eName\"></td></tr>\n";
-	echo "  <tr><td>URL</td>".
+  echo "  <tr><td>URL</td>".
-	 	"<td><input value=\"". mysql_result($Erg, 0, "URL").
+     "<td><input value=\"". mysql_result($Erg, 0, "URL").
-		"\" type=\"text\" size=\"40\" name=\"eURL\"></td></tr>\n";
+    "\" type=\"text\" size=\"40\" name=\"eURL\"></td></tr>\n";
-	if( $FromPentabarf == "Y")
+  if( $FromPentabarf == "Y")
-	{
+  {
-		echo "  <tr><td></td>".
+    echo "  <tr><td></td>".
-		 	"<td><h1>!!! Imported from Pentabarf !!!</h1></td></tr>\n";
+       "<td><h1>!!! Imported from Pentabarf !!!</h1></td></tr>\n";
-	}
+  }
         echo "</table>\n";
-	 
+   
         echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
         echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
         echo "<input type=\"submit\" value=\"sichern...\">\n";
         echo "</form>\n\n";
          
-	// Löschen
+  // Löschen
-	echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "\" method=\"GET\" >\n";
+  echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "\" method=\"GET\" >\n";
         echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
         echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
         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
+  //Freie Engelschichten
-	$sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'";
+  $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'";
-	$Erg3 = mysql_query($sql3, $con);
+  $Erg3 = mysql_query($sql3, $con);
-	$rowcount = mysql_num_rows($Erg3);
+  $rowcount = mysql_num_rows($Erg3);
-	
+  
-	echo "Folgende Engelschichten sind noch nicht vergeben.\n";
+  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++)
+  for ($j=0; $j < $rowcount; $j++)
-	{
+  {
-		$TID = mysql_result($Erg3, $j, 0);
+    $TID = mysql_result($Erg3, $j, 0);
-		echo "<a href=\"./schichtplan.php?action=engelshiftdel&SID=". $_GET["SID"]. "&TID=$TID\">". 
+    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
+  //Ausgabe eingetragener schischten
-	$sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'";
+  $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'";
-	$Erg3 = mysql_query($sql3, $con);
+  $Erg3 = mysql_query($sql3, $con);
-	$rowcount = mysql_num_rows($Erg3);
+  $rowcount = mysql_num_rows($Erg3);
-	 
+   
-	echo "Folgende Engel Sind fuer die Schicht eingetargen.\n";
+  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".
+  echo "<table border=\"1\">\n".
-		"<tr class=\"contenttopic\">".
+    "<tr class=\"contenttopic\">".
-		"<th>nick</th>". 
+    "<th>nick</th>". 
-		"<th>type</th>". 
+    "<th>type</th>". 
-		"<th>normal</th>". 
+    "<th>normal</th>". 
-		"<th>freeloader :-(</th>". 
+    "<th>freeloader :-(</th>". 
-		"</tr>";
+    "</tr>";
-	
+  
-	for ($j=0; $j < $rowcount; $j++)
+  for ($j=0; $j < $rowcount; $j++)
-	{
+  {
-		$userUID=mysql_result($Erg3, $j, "UID");
+    $userUID=mysql_result($Erg3, $j, "UID");
-		echo "\t<tr>\n";
+    echo "\t<tr>\n";
-		echo "\t\t<td>". UID2Nick($userUID). "</td>\n";
+    echo "\t\t<td>". UID2Nick($userUID). "</td>\n";
-		echo "\t\t<td>". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "</td>\n";
+    echo "\t\t<td>". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "</td>\n";
-		echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=0\">###-austragen-###</a></td>\n";
+    echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=0\">###-austragen-###</a></td>\n";
-		echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=1\">###-austragen-freeloader-###</a></td>\n";
+    echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=1\">###-austragen-freeloader-###</a></td>\n";
-		echo "\t</tr>\n";
+    echo "\t</tr>\n";
-	} // FOR
+  } // FOR
 
-	echo "</table><br><hr>\n\n\n\n";
+  echo "</table><br /><hr>\n\n\n\n";
 
-	//Nachtragen von Engeln
+  //Nachtragen von Engeln
-	echo "Hat ein anderer Engel die Schicht &uuml;bernommen, trage ihn bitte ein:";
+  echo "Hat ein anderer Engel die Schicht &uuml;bernommen, trage ihn bitte ein:";
-	echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >\n";
+  echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >\n";
-	echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
+  echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
         echo "<input type=\"hidden\" name=\"action\" value=\"engeladd\">\n";
-	
+  
-	// Listet alle Nicks auf
+  // Listet alle Nicks auf
-	echo "<select name=\"UIDs\">\n";
+  echo "<select name=\"UIDs\">\n";
-	if( $FromPentabarf != "Y")
+  if( $FromPentabarf != "Y")
-	{
+  {
-		echo "\t<option value=\"0\">--neu--</option>\n";
+    echo "\t<option value=\"0\">--neu--</option>\n";
-	}
+  }
-	
+  
-	$usql="SELECT * FROM `User` ORDER BY `Nick`";
+  $usql="SELECT * FROM `User` ORDER BY `Nick`";
-	$uErg = mysql_query($usql, $con);
+  $uErg = mysql_query($usql, $con);
-	$urowcount = mysql_num_rows($uErg);
+  $urowcount = mysql_num_rows($uErg);
-	for ($k=0; $k<$urowcount; $k++)
+  for ($k=0; $k<$urowcount; $k++)
-	{
+  {
-		echo "\t<option value=\"".mysql_result($uErg, $k, "UID")."\">".
+    echo "\t<option value=\"".mysql_result($uErg, $k, "UID")."\">".
-			mysql_result($uErg, $k, "Nick").
+      mysql_result($uErg, $k, "Nick").
-			"</option>\n";
+      "</option>\n";
-	}
+  }
-	echo "</select>\n";
+  echo "</select>\n";
-	
+  
-	echo " als \n";
+  echo " als \n";
-	
+  
-	// holt eine liste der benötigten Engel zu dieser Schischt
+  // holt eine liste der benötigten Engel zu dieser Schischt
-	$sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` ";
+  $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` ";
-	$sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') ";
+  $sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') ";
-	$sql3.= "GROUP BY `SID`, `TID`, `UID` ";
+  $sql3.= "GROUP BY `SID`, `TID`, `UID` ";
-	$Erg3 = mysql_query($sql3, $con);
+  $Erg3 = mysql_query($sql3, $con);
-	$i=-1;
+  $i=-1;
-	while( ++$i < mysql_num_rows($Erg3))
+  while( ++$i < mysql_num_rows($Erg3))
-	{
+  {
-		$EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID");
+    $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID");
-	}
+  }
-	
+  
-	// Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden
+  // Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden
-	echo "<select name=\"TID\">\n";
+  echo "<select name=\"TID\">\n";
-	$SQL2 = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
+  $SQL2 = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-	$Erg2 = mysql_query($SQL2, $con);
+  $Erg2 = mysql_query($SQL2, $con);
         for ($l = 0; $l < mysql_num_rows($Erg2); $l++) 
-	{
+  {
-		$EngelTID = mysql_result($Erg2, $l, "TID");
+    $EngelTID = mysql_result($Erg2, $l, "TID");
-		echo "<option value=\"$EngelTID\">";
+    echo "<option value=\"$EngelTID\">";
-		echo mysql_result($Erg2, $l, "Name"). Get_Text("inc_schicht_engel");
+    echo mysql_result($Erg2, $l, "Name"). Get_Text("inc_schicht_engel");
-		if( !isset($EngelNeed[$EngelTID]) )
+    if( !isset($EngelNeed[$EngelTID]) )
-			echo " (0)";
+      echo " (0)";
-		else
+    else
-			echo " (".$EngelNeed[$EngelTID].")";
+      echo " (".$EngelNeed[$EngelTID].")";
-		echo "</option>\n";
+    echo "</option>\n";
         }
-	echo "</select>\n";
+  echo "</select>\n";
-	
+  
-	echo "<input type=\"submit\" value=\"eintragen...\">\n";
+  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>";
+  echo "</form>";
 
-	} // IF ISSET(
+  } // IF ISSET(
-	break;
+  break;
 
 case 'engeladd':
-	if( $_GET["UIDs"]>0)
+  if( $_GET["UIDs"]>0)
-	{
+  {
-		
+    
-		$SQL = "SELECT * FROM `ShiftEntry` ".
+    $SQL = "SELECT * FROM `ShiftEntry` ".
-			"WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')";
+      "WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')";
-		$ERG = mysql_query($SQL, $con);
+    $ERG = mysql_query($SQL, $con);
-		if( mysql_num_rows($ERG) != 0 )
+    if( mysql_num_rows($ERG) != 0 )
-		{
+    {
-			$chSQL  = "UPDATE `ShiftEntry` SET ".
+      $chSQL  = "UPDATE `ShiftEntry` SET ".
-				  "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ".
+          "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ".
-			      "WHERE (`SID`='". $_GET["SID"]. "' AND ".
+            "WHERE (`SID`='". $_GET["SID"]. "' AND ".
-				  "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1";
+          "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1";
-		}
+    }
-		else
+    else
-		{
+    {
-			$chSQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (".
+      $chSQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (".
-			          "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ".
+                "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ".
-				      "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')";
+              "'". $_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
+  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++)
+    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  = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (";
-			$SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)";
+      $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)";
-			$ERG = mysql_query($SQL, $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) 
+      if ($ERG == 1) 
-			{
+      {
-			     	echo "&Auml;nderung wurde gesichert...<br>";
+             echo "&Auml;nderung wurde gesichert...<br />";
-			}
+      }
-			else 
+      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 mysql_error($con);
-			}
+      }
-			echo "Es wird eine weitere Schicht eingetragen:<br><br>\n";
+      echo "Es wird eine weitere Schicht eingetragen:<br /><br />\n";
-		}
+    }
-	}
+  }
-	break;
+  break;
 
 case 'engeldel':
-	$chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. 
+  $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. 
-		 "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; 
+     "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; 
-	if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1)
+  if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1)
-	{
+  {
-		$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )";
+    $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )";
-		$Erg = mysql_query($sql, $con);
+    $Erg = mysql_query($sql, $con);
-		if( mysql_num_rows( $Erg) == 1)
+    if( mysql_num_rows( $Erg) == 1)
-		{
+    {
-			$UID = $_GET["UIDs"];
+      $UID = $_GET["UIDs"];
-	 		$Length = mysql_result($Erg, 0, "Len");
+       $Length = mysql_result($Erg, 0, "Len");
-			$Comment = 	"Start: ". mysql_result($Erg, 0, "DateS"). "; ".
+      $Comment =   "Start: ". mysql_result($Erg, 0, "DateS"). "; ".
-					"Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ".
+          "Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ".
-					"Removed by ". $_SESSION['Nick'];
+          "Removed by ". $_SESSION['Nick'];
-			$ch2SQL = 
+      $ch2SQL = 
-				"INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ".
+        "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ".
-				"VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');";
+        "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');";
-		}
+    }
-	}
+  }
-	break;
+  break;
 
 case 'engelshiftdel':
-	$chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". 
+  $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". 
-			$_GET["TID"]. "' AND `UID`='0' LIMIT 1"; 
+      $_GET["TID"]. "' AND `UID`='0' LIMIT 1"; 
-	break;
+  break;
 
 case 'changesave':
-	$query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con);
+  $query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con);
-	$enddate = mysql_fetch_row($query);
+  $enddate = mysql_fetch_row($query);
-	
+  
-	$chSQL = "UPDATE `Shifts` SET ".
+  $chSQL = "UPDATE `Shifts` SET ".
-			"`DateS`='". $_GET["eDate"]. "', ".
+      "`DateS`='". $_GET["eDate"]. "', ".
-			"`DateE`='".$enddate[0]. "', ".
+      "`DateE`='".$enddate[0]. "', ".
-			"`RID`='". $_GET["eRID"]. "', ".
+      "`RID`='". $_GET["eRID"]. "', ".
-			"`Len`='". $_GET["eDauer"]. "', ".
+      "`Len`='". $_GET["eDauer"]. "', ".
-			"`Man`='". $_GET["eName"]. "', ".
+      "`Man`='". $_GET["eName"]. "', ".
-			"`URL`='". $_GET["eURL"]. "' ".
+      "`URL`='". $_GET["eURL"]. "' ".
-			"WHERE `SID`='". $_GET["SID"]. "'";
+      "WHERE `SID`='". $_GET["SID"]. "'";
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
-	
+  
 case 'delete':
-	$chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1";
+  $chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1";
-	$ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'";
+  $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'";
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	break;
+  break;
 
 case 'deleteShifs':
-	foreach ($_GET as $k => $v)
+  foreach ($_GET as $k => $v)
-		if( strpos( " ".$k, "SID") == 1)
+    if( strpos( " ".$k, "SID") == 1)
-		{
+    {
-			echo "Shifts $v wird gelöscht...";
+      echo "Shifts $v wird gelöscht...";
-			executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1");
+      executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1");
-			echo "<br>\n";
+      echo "<br />\n";
-			echo "ShiftEntry $v wird gelöscht...";
+      echo "ShiftEntry $v wird gelöscht...";
-			executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'");
+      executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'");
-			echo "<br><br>\n";
+      echo "<br /><br />\n";
-		}
+    }
-	break;
+  break;
 
 } // end switch
 
 if (IsSet($chSQL)){
 //     echo $chSQL;
-	// hier muesste das SQL ausgefuehrt werden...
+  // hier muesste das SQL ausgefuehrt werden...
-	$Erg = mysql_query($chSQL, $con);
+  $Erg = mysql_query($chSQL, $con);
-	if( $DEBUG ) 
+  if( $debug ) 
-		echo "DEBUG SQL: $chSQL<br>\n";
+    echo "DEBUG SQL: $chSQL<br />\n";
-	if ($Erg == 1) 
+  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))
+    if (IsSet($ch2SQL))
-		{
+    {
-			$Erg = mysql_query($ch2SQL, $con);
+      $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 
+  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 mysql_error($con);
-	}
+  }
 } // Ende Update
 
 }

www-ssl/admin/schichtplan_druck.php

@@ -6,49 +6,49 @@ $submenus = 1;
 
 if (!IsSet($_GET["action"])) 
 {
-	include ("../../../camp2011/includes/header.php");
+  include ("../../../camp2011/includes/header.php");
-	include ("../../../camp2011/includes/funktionen.php");
+  include ("../../../camp2011/includes/funktionen.php");
-	include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-	include ("../../../camp2011/includes/funktion_schichtplan.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".
+    "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)
+  foreach( $VeranstaltungsTage as $k => $v)
-	{
+  {
-	
+  
-		$res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con);
+    $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con);
-		for ($i = 0; $i < mysql_num_rows($res); $i++) 
+    for ($i = 0; $i < mysql_num_rows($res); $i++) 
-		{
+    {
-			$Tag = $VeranstaltungsTage[$k];
+      $Tag = $VeranstaltungsTage[$k];
-			$RID = mysql_result($res,$i,"RID");
+      $RID = mysql_result($res,$i,"RID");
-			$Rname = mysql_result($res, $i, "Name");
+      $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");
+  include ("../../../camp2011/includes/footer.php");
 } 
-else 	//#################################################################
+else   //#################################################################
 {
    if (IsSet($_GET["Raum"]) AND IsSet($_GET["ausdatum"])) 
-	{
+  {
-   	$Raum = $_GET["Raum"];
+     $Raum = $_GET["Raum"];
-	$ausdatum = $_GET["ausdatum"];
+  $ausdatum = $_GET["ausdatum"];
 
-	include ("../../../camp2011/includes/config_db.php");
+  include ("../../../camp2011/includes/config_db.php");
-	include ("../../../camp2011/includes/config.php");
+  include ("../../../camp2011/includes/config.php");
-	include ("../../../camp2011/includes/secure.php");
+  include ("../../../camp2011/includes/secure.php");
-	//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
+  //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
-	$_SESSION['CVS'][ "admin/schichtplan.php" ] = "N";	
+  $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N";  
-	include ("../../../camp2011/includes/funktion_lang.php");
+  include ("../../../camp2011/includes/funktion_lang.php");
-	include ("../../../camp2011/includes/funktion_schichtplan.php");
+  include ("../../../camp2011/includes/funktion_schichtplan.php");
-	include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-	include ("../../../camp2011/includes/funktion_user.php");
+  include ("../../../camp2011/includes/funktion_user.php");
-	?>
+  ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -67,55 +67,55 @@ else 	//#################################################################
 <h1>Schichtplan</h1>
 
 <table>
-	<tr>
+  <tr>
-		<td width="250" align="left">
+    <td width="250" align="left">
-			<span style="font-weight:bold;font-size:100%">Datum:</span> 
+      <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>
-		<td width="350" align="right">
+    <td width="350" align="right">
-			<span style="font-weight:bold;font-size:100%">Raum:</span>
+      <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>
+    </td>
-	</tr>
+  </tr>
 </table>
 
 <table border="2" width="650" class="border" cellpadding="2" cellspacing="1">
  
 <!--Ausgabe Spalten überschrift-->
 
-	<tr class="contenttopic">
+  <tr class="contenttopic">
-		<th bgcolor="#E0E0E0">Uhrzeit</th>
+    <th bgcolor="#E0E0E0">Uhrzeit</th>
-		<th bgcolor="#E0E0E0">Schichtplanbelegung</th>
+    <th bgcolor="#E0E0E0">Schichtplanbelegung</th>
-	</tr>
+  </tr>
-<?PHP
+<?php
 
 //Zeit Ausgeben
 for( $i = 0; $i < 24; $i++ )
-	for( $j = 0; $j < $GlobalZeileProStunde; $j++)
+  for( $j = 0; $j < $GlobalZeileProStunde; $j++)
-	{
+  {
-		$Spalten[$i * $GlobalZeileProStunde + $j] =
+    $Spalten[$i * $GlobalZeileProStunde + $j] =
-			"\t<tr class=\"content\">\n";
+      "\t<tr class=\"content\">\n";
-		if( $j==0)
+    if( $j==0)
-		{
+    {
-			$Spalten[$i * $GlobalZeileProStunde + $j].=
+      $Spalten[$i * $GlobalZeileProStunde + $j].=
-				"\t\t<td rowspan=\"$GlobalZeileProStunde\">";
+        "\t\t<td rowspan=\"$GlobalZeileProStunde\">";
-			if( $i < 10 )
+      if( $i < 10 )
-				$Spalten[$i * $GlobalZeileProStunde + $j].= "0";
+        $Spalten[$i * $GlobalZeileProStunde + $j].= "0";
-			$Spalten[$i * $GlobalZeileProStunde + $j].= "$i:";
+      $Spalten[$i * $GlobalZeileProStunde + $j].= "$i:";
-			if( ( ($j*60) / $GlobalZeileProStunde) < 10 )
+      if( ( ($j*60) / $GlobalZeileProStunde) < 10 )
-				$Spalten[$i * $GlobalZeileProStunde + $j].= "0";
+        $Spalten[$i * $GlobalZeileProStunde + $j].= "0";
-			$Spalten[$i * $GlobalZeileProStunde + $j].=
+      $Spalten[$i * $GlobalZeileProStunde + $j].=
-				( ($j*60) / $GlobalZeileProStunde). "</td>\n";
+        ( ($j*60) / $GlobalZeileProStunde). "</td>\n";
-			
+      
-		}
+    }
-	}
+  }
 
 
 CreateRoomShifts( $Raum );
 
 
 // Ausgabe Zeilen
-	for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i];
+  for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i];
 // Ende
 echo "</table>\n";
 

www-ssl/admin/shiftadd.php

@@ -6,61 +6,61 @@ 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`";
+  $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
 
-	for ($i=0; $i<$rowcount; $i++) 
+  for ($i=0; $i<$rowcount; $i++) 
-	{
+  {
-		$Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
+    $Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-		$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
+    $Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-	}
+  }
 
 // erstellt ein Aray der Engeltypen
-	$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
+  $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-	$Erg = mysql_query($sql, $con);
+  $Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $rowcount = mysql_num_rows($Erg);
 
-	for ($i=0; $i<$rowcount; $i++) 
+  for ($i=0; $i<$rowcount; $i++) 
-	{
+  {
-		$EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
+    $EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
-		$EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+    $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-	}
+  }
 
 // sesion mit stanadrt werten befüllen
 if( !isset( $_SESSION['shiftadd.php']['SchichtName']))
 {
-	$_SESSION['shiftadd.php']['SchichtName'] = "--???--";
+  $_SESSION['shiftadd.php']['SchichtName'] = "--???--";
-	$_SESSION['shiftadd.php']['RID'] = "";
+  $_SESSION['shiftadd.php']['RID'] = "";
-	$_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time);
+  $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time);
-	$_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time);
+  $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time);
-	$_SESSION['shiftadd.php']['STime'] = "10";
+  $_SESSION['shiftadd.php']['STime'] = "10";
-	$_SESSION['shiftadd.php']['MoreThenOne'] = "ON";
+  $_SESSION['shiftadd.php']['MoreThenOne'] = "ON";
-	$_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time);
+  $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time);
-	$_SESSION['shiftadd.php']['ETime'] = "12";
+  $_SESSION['shiftadd.php']['ETime'] = "12";
-	$_SESSION['shiftadd.php']['len'] = "2";
+  $_SESSION['shiftadd.php']['len'] = "2";
-	$_SESSION['shiftadd.php']['NachtON'] = "OFF";
+  $_SESSION['shiftadd.php']['NachtON'] = "OFF";
-	$_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24";
+  $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24";
 }
 // wenn werte übergeben in sesion eintragen
 if( !isset($_GET["NachtON"]))
-	$_GET["NachtON"] = "OFF";
+  $_GET["NachtON"] = "OFF";
 if( !isset($_GET["MoreThenOne"]))
-	$_GET["MoreThenOne"] = "OFF";
+  $_GET["MoreThenOne"] = "OFF";
 if( isset( $_GET["SchichtName"]))
 {
-	foreach ($_GET as $k => $v)
+  foreach ($_GET as $k => $v)
-	{
+  {
-		$_SESSION['shiftadd.php'][$k] = $v;
+    $_SESSION['shiftadd.php'][$k] = $v;
-	}
+  }
 }
 
 
 if (!IsSet($_GET["action"])) 
-	$_GET["action"] = "new";
+  $_GET["action"] = "new";
 
 switch( $_GET["action"])
 {
@@ -70,187 +70,187 @@ 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)
+  foreach ($Room As $RTemp)
-	{
+  {
-		echo "\t<option value=\"". $RTemp["RID"]. "\"";
+    echo "\t<option value=\"". $RTemp["RID"]. "\"";
-		if( $RTemp["RID"] == $_SESSION["shiftadd.php"]["RID"])
+    if( $RTemp["RID"] == $_SESSION["shiftadd.php"]["RID"])
-			echo " SELECTED";
+      echo " SELECTED";
-		echo ">". $RTemp["Name"]. "</option>\n";
+    echo ">". $RTemp["Name"]. "</option>\n";
-	}
+  }
-	?>
+  ?>
     </select></td>
   </tr>
   
   <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")
+     if( $_SESSION["shiftadd.php"]["MoreThenOne"]=="ON")
-		echo " CHECKED";
+    echo " CHECKED";
-	?>></td>
+  ?>></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")
+      if($_SESSION["shiftadd.php"]["NachtON"]=="ON")
-		echo " CHECKED";
+    echo " CHECKED";
-	?>></td>
+  ?>></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)
+  foreach ($EngelType As $TTemp)
-	{
+  {
-		echo "  <tr><td align=\"right\">". $TTemp["Name"]. ":</td>\n";
+    echo "  <tr><td align=\"right\">". $TTemp["Name"]. ":</td>\n";
-		echo "      <td><input type=\"text\" name=\"EngelType". $TTemp["TID"]. "\" size=\"5\" value=\"";
+    echo "      <td><input type=\"text\" name=\"EngelType". $TTemp["TID"]. "\" size=\"5\" value=\"";
-		if( isset($_SESSION["shiftadd.php"][ "EngelType". $TTemp["TID"] ]))
+    if( isset($_SESSION["shiftadd.php"][ "EngelType". $TTemp["TID"] ]))
-			echo $_SESSION["shiftadd.php"][ "EngelType". $TTemp["TID"] ];
+      echo $_SESSION["shiftadd.php"][ "EngelType". $TTemp["TID"] ];
-		else
+    else
-			echo "0";
+      echo "0";
-		echo "\"></td>\n";
+    echo "\"></td>\n";
-	}
+  }
 ?>
 </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
+  break; // Ende new
 
 case 'newsave':
     if (isset($_GET["SDatum"]) && ($_GET["len"] > 0))
     {
-	$lenOrg = $_GET["len"];
+  $lenOrg = $_GET["len"];
-	if( $_GET["NachtON"] == "ON" )
+  if( $_GET["NachtON"] == "ON" )
-	{	
+  {  
-		$lenArrayDummy = explode( "-", $_GET["len_night"]);
+    $lenArrayDummy = explode( "-", $_GET["len_night"]);
                 foreach ( $lenArrayDummy as $Temp )
                 {
-			if( isset($Temp2) )
+      if( isset($Temp2) )
-				$lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2);
+        $lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2);
-			$Temp2 = $Temp;
+      $Temp2 = $Temp;
-        	}//foreach
+          }//foreach
-	}//IF( $NachtON == "ON" )
+  }//IF( $NachtON == "ON" )
 
-	echo "<table border=\"1\">\n";
+  echo "<table border=\"1\">\n";
-	echo "<tr>\n";
+  echo "<tr>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Start</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">Start</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">End</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">End</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">len</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">len</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">RID</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">RID</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Beschreibung</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">Beschreibung</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Entry 'Shifts'</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">Entry 'Shifts'</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">SID</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">SID</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Entrys</td>\n";
+  echo "\t<td valign=\"top\" align=\"center\">Entrys</td>\n";
-	echo "</tr>\n";
+  echo "</tr>\n";
- 	
+   
-	$DateEnd = $_GET["SDatum"];
+  $DateEnd = $_GET["SDatum"];
- 	$TimeEnd = intval($_GET["STime"]);
+   $TimeEnd = intval($_GET["STime"]);
-	$len=0;
+  $len=0;
-	do
+  do
-	{	
+  {  
-		// define Start time
+    // define Start time
-		$Date = $DateEnd;
+    $Date = $DateEnd;
-		$Time = $TimeEnd;
+    $Time = $TimeEnd;
-		$_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00";
+    $_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00";
-			
+      
-		// define End time
+    // define End time
-	 	if( $_GET["NachtON"] == "ON" )
+     if( $_GET["NachtON"] == "ON" )
-		{
+    {
-			if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert.");
+      if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert.");
-			$_GET["len"] = $lenArray[$Time];
+      $_GET["len"] = $lenArray[$Time];
-			if( $_GET["len"]<1) die("len <1");
+      if( $_GET["len"]<1) die("len <1");
-		}
+    }
-		$TimeEnd = $Time+ $_GET["len"];
+    $TimeEnd = $Time+ $_GET["len"];
-		
+    
-		//Tagesüberschreitung
+    //Tagesüberschreitung
-		while( $TimeEnd >= 24 )
+    while( $TimeEnd >= 24 )
-		{
+    {
-			$TimeEnd -= 24;
+      $TimeEnd -= 24;
-			$DateEnd += 1;
+      $DateEnd += 1;
-		}
+    }
-		//ist schischt zu lang dan verkürzen
+    //ist schischt zu lang dan verkürzen
-		if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) 
+    if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) 
-		{
+    {
-			$_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; 
+      $_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; 
-			$_GET["len"] -= ($TimeEnd- $_GET["ETime"]);		// -(-) ->> +
+      $_GET["len"] -= ($TimeEnd- $_GET["ETime"]);    // -(-) ->> +
-			$DateEnd = $_GET["EDatum"];
+      $DateEnd = $_GET["EDatum"];
-			$TimeEnd = $_GET["ETime"];
+      $TimeEnd = $_GET["ETime"];
-		}
+    }
-		$_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00";
+    $_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00";
 
-		if( $_DateS != $_DateE )
+    if( $_DateS != $_DateE )
-			CreateNewEntry();
+      CreateNewEntry();
-		
+    
-		if( $_GET["MoreThenOne"]!="ON" ) break;
+    if( $_GET["MoreThenOne"]!="ON" ) break;
-		if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break;
+    if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break;
-	} while( true );
+  } while( true );
-	echo "</table>";
+  echo "</table>";
-	
+  
-	if( $_GET["OnlyShow"]=="ON" ) 
+  if( $_GET["OnlyShow"]=="ON" ) 
-	{
+  {
-		echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "\">";
+    echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "\">";
-		echo "\n\t<Input type=\"hidden\" name=\"SchichtName\" value=\"". $_GET["SchichtName"]. "\">";
+    echo "\n\t<Input type=\"hidden\" name=\"SchichtName\" value=\"". $_GET["SchichtName"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"MonthJahr\" value=\"". $_GET["MonthJahr"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"MonthJahr\" value=\"". $_GET["MonthJahr"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"SDatum\" value=\"". $_GET["SDatum"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"SDatum\" value=\"". $_GET["SDatum"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"STime\" value=\"". $_GET["STime"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"STime\" value=\"". $_GET["STime"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"MoreThenOne\" value=\"". $_GET["MoreThenOne"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"MoreThenOne\" value=\"". $_GET["MoreThenOne"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"EDatum\" value=\"". $_GET["EDatum"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"EDatum\" value=\"". $_GET["EDatum"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"ETime\" value=\"". $_GET["ETime"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"ETime\" value=\"". $_GET["ETime"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"len\" value=\"". $lenOrg. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"len\" value=\"". $lenOrg. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"NachtON\" value=\"". $_GET["NachtON"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"NachtON\" value=\"". $_GET["NachtON"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"len_night\" value=\"". $_GET["len_night"]. "\">";
+    echo "\n\t<input type=\"hidden\" name=\"len_night\" value=\"". $_GET["len_night"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"OnlyShow\" value=\"OFF\">";
+    echo "\n\t<input type=\"hidden\" name=\"OnlyShow\" value=\"OFF\">";
-		foreach ($EngelType As $TTemp)
+    foreach ($EngelType As $TTemp)
-		{
+    {
-			$Temp = "EngelType".$TTemp["TID"];
+      $Temp = "EngelType".$TTemp["TID"];
-			echo "\n\t<input type=\"hidden\" name=\"". $Temp. "\" value=\"". $_GET[$Temp]. "\">";
+      echo "\n\t<input type=\"hidden\" name=\"". $Temp. "\" value=\"". $_GET[$Temp]. "\">";
-		}	
+    }  
-		echo "\n\t<input type=\"hidden\" name=\"action\" value=\"newsave\">";
+    echo "\n\t<input type=\"hidden\" name=\"action\" value=\"newsave\">";
-		echo "\n\t<input type=\"submit\" value=\"mach mal Gabriel!\">";
+    echo "\n\t<input type=\"submit\" value=\"mach mal Gabriel!\">";
-		echo "\n</form>";
+    echo "\n</form>";
-	} //if
+  } //if
     } //IF
     break;
 
 case 'engeldel':
-	break;
+  break;
 
 } // end switch
 
@@ -258,100 +258,100 @@ case 'engeldel':
 
 function CreateNewEntry() 
 {
-	global $con, $_DateS, $_DateE, $EngelType, $DEBUG;
+  global $con, $_DateS, $_DateE, $EngelType, $debug;
-	foreach ($EngelType As $TTemp)
+  foreach ($EngelType As $TTemp)
-	{
+  {
-		$Temp = "EngelType".$TTemp["TID"];
+    $Temp = "EngelType".$TTemp["TID"];
-		global $$Temp;
+    global $$Temp;
-	}	
+  }  
 
-	echo "<tr>\n";
+  echo "<tr>\n";
 
-	echo "\t<td>$_DateS</td>\n";
+  echo "\t<td>$_DateS</td>\n";
-	echo "\t<td>$_DateE</td>\n";
+  echo "\t<td>$_DateE</td>\n";
-	echo "\t<td>". $_GET["len"]. "</td>\n";
+  echo "\t<td>". $_GET["len"]. "</td>\n";
-	echo "\t<td>". $_GET["RID"]. "</td>\n";
+  echo "\t<td>". $_GET["RID"]. "</td>\n";
-	echo "\t<td>". $_GET["SchichtName"]. "</td>\n";
+  echo "\t<td>". $_GET["SchichtName"]. "</td>\n";
-	
+  
-	
+  
-	// Ist eintarg schon vorhanden?	
+  // Ist eintarg schon vorhanden?  
-	$SQL  = "SELECT `SID` FROM `Shifts` ";
+  $SQL  = "SELECT `SID` FROM `Shifts` ";
-	$SQL .=	"WHERE (".
+  $SQL .=  "WHERE (".
-		"`DateS` = '". $_DateS. "' AND ".
+    "`DateS` = '". $_DateS. "' AND ".
-		"`DateE` = '". $_DateE. "' AND ".
+    "`DateE` = '". $_DateE. "' AND ".
-		"`RID` = '". $_GET["RID"]. "');";
+    "`RID` = '". $_GET["RID"]. "');";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	
+  
-	if( mysql_num_rows($Erg) != 0 )
+  if( mysql_num_rows($Erg) != 0 )
-		echo "\t<td>exists</td>";
+    echo "\t<td>exists</td>";
-	elseif( $_GET["OnlyShow"] == "OFF" )   
+  elseif( $_GET["OnlyShow"] == "OFF" )   
-	{
+  {
-		// erstellt Eintrag in Shifts für die algemeine schicht
+    // erstellt Eintrag in Shifts für die algemeine schicht
-		$SQL  = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( ";
+    $SQL  = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( ";
-		$SQL .= "'". $_DateS. "', '". $_DateE. "', ";
+    $SQL .= "'". $_DateS. "', '". $_DateE. "', ";
-		$SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', ";
+    $SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', ";
-		$SQL .= "'". $_GET["SchichtName"]. "');";
+    $SQL .= "'". $_GET["SchichtName"]. "');";
-		$Erg = db_query($SQL, "create shift");
+    $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";
+    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
+  } else
-		echo "\t<td>only show</td>\n";
+    echo "\t<td>only show</td>\n";
-		
+    
-	// sucht SID von eingetragennen schiten
+  // sucht SID von eingetragennen schiten
-	$SQL  = "SELECT SID FROM `Shifts` ";
+  $SQL  = "SELECT SID FROM `Shifts` ";
-	$SQL .=	"WHERE (".
+  $SQL .=  "WHERE (".
-		"`DateS` = '". $_DateS. "' AND ".
+    "`DateS` = '". $_DateS. "' AND ".
-		"`DateE` = '". $_DateE. "' AND ".
+    "`DateE` = '". $_DateE. "' AND ".
-		"`Len` = '". $_GET["len"]. "' AND ".
+    "`Len` = '". $_GET["len"]. "' AND ".
-		"`RID` = '". $_GET["RID"]. "');";
+    "`RID` = '". $_GET["RID"]. "');";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	if( mysql_num_rows($Erg) == 0 )
+  if( mysql_num_rows($Erg) == 0 )
-		echo "\t<td>?</td>";
+    echo "\t<td>?</td>";
-	else	
+  else  
-	{
+  {
-		$SID = mysql_result($Erg, 0, "SID");
+    $SID = mysql_result($Erg, 0, "SID");
-		echo "\t<td>". $SID. "</td>";
+    echo "\t<td>". $SID. "</td>";
-	}
+  }
 
-	// erstellt für jeden Engeltypen die eintrage in 'ShiftEntry'
+  // erstellt für jeden Engeltypen die eintrage in 'ShiftEntry'
-	echo "\t<td>";
+  echo "\t<td>";
-	foreach ($EngelType As $TTemp)
+  foreach ($EngelType As $TTemp)
-	{
+  {
-		$Temp = "EngelType".$TTemp["TID"];
+    $Temp = "EngelType".$TTemp["TID"];
-		
+    
-		if( $_GET[$Temp] > 0 )
+    if( $_GET[$Temp] > 0 )
-		{
+    {
-			$i = 0;
+      $i = 0;
-			echo $_GET[$Temp]. " ".$TTemp["Name"]. "<br>\t";
+      echo $_GET[$Temp]. " ".$TTemp["Name"]. "<br />\t";
-			while( $i++ < $_GET[$Temp] )
+      while( $i++ < $_GET[$Temp] )
-			{
+      {
-				if( $_GET["OnlyShow"] == "OFF" )
+        if( $_GET["OnlyShow"] == "OFF" )
-				{
+        {
-					$SQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (";
+          $SQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (";
-					$SQL .= "'". $SID. "', ";
+          $SQL .= "'". $SID. "', ";
-					$SQL .= "'". $TTemp["TID"]. "');";
+          $SQL .= "'". $TTemp["TID"]. "');";
 
-					$Erg = mysql_query($SQL, $con);
+          $Erg = mysql_query($SQL, $con);
 
-					if( $DEBUG ) $SQLFail = "\n\t<br>[".$SQL. "]";
+          if( $debug ) $SQLFail = "\n\t<br />[".$SQL. "]";
 
-					if ($Erg == 1) echo "'pass' ";
+          if ($Erg == 1) echo "'pass' ";
-					else           echo "'fail' <u>". mysql_error($con). "</u>$SQLFail</td>\n";
+          else           echo "'fail' <u>". mysql_error($con). "</u>$SQLFail</td>\n";
 
-				}
+        }
-				else
+        else
-					echo "+";
+          echo "+";
-			}
+      }
-			echo "<br>";
+      echo "<br />";
-		} // IF $$TEMP
+    } // IF $$TEMP
-	} // FOREACH
+  } // FOREACH
-	echo "</td>";
+  echo "</td>";
-	
+  
-	echo "</tr>\n";
+  echo "</tr>\n";
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/sprache.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Sprache";
 $header = "Liste der existierenden Sprcheintr&auml;ge";
@@ -7,114 +7,114 @@ 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>";
+  echo "<a href=\"?ShowEntry=y\">". Get_Text("pub_sprache_ShowEntry"). "</a>";
-	// ausgabe Tabellenueberschift
+  // ausgabe Tabellenueberschift
-	$SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;";
+  $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;";
-	$erg_Sprachen = mysql_query($SQL_Sprachen, $con);
+  $erg_Sprachen = mysql_query($SQL_Sprachen, $con);
-	echo mysql_error($con);
+  echo mysql_error($con);
-	
+  
-	for( $i=0; $i<mysql_num_rows( $erg_Sprachen ); $i++ )
+  for( $i=0; $i<mysql_num_rows( $erg_Sprachen ); $i++ )
-		$Sprachen[mysql_result( $erg_Sprachen, $i, "Sprache" )] = $i;
+    $Sprachen[mysql_result( $erg_Sprachen, $i, "Sprache" )] = $i;
 
-	echo "\t<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n\t\t<tr>";
+  echo "\t<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n\t\t<tr>";
-	echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_TextID"). "</b></td>";
+  echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_TextID"). "</b></td>";
-	foreach( $Sprachen as $Name => $Value )
+  foreach( $Sprachen as $Name => $Value )
-		echo "<td class=\"contenttopic\"><b>". 
+    echo "<td class=\"contenttopic\"><b>". 
-			Get_Text("pub_sprache_Sprache"). " ". $Name.
+      Get_Text("pub_sprache_Sprache"). " ". $Name.
-			"</b></td>";
+      "</b></td>";
-	echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_Edit"). "</b></td>";
+  echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_Edit"). "</b></td>";
-	echo "\t\t</tr>";
+  echo "\t\t</tr>";
 
 
-	if( isset($_GET["ShowEntry"]))
+  if( isset($_GET["ShowEntry"]))
-	{
+  {
-	// ausgabe eintraege
+  // ausgabe eintraege
-	$SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;";
+  $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;";
-	$erg = mysql_query($SQL, $con);
+  $erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
+  echo mysql_error($con);
 
-	$TextID_Old = mysql_result( $erg, 0, "TextID" );
+  $TextID_Old = mysql_result( $erg, 0, "TextID" );
-	for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
+  for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
-	{
+  {
-		$TextID_New = mysql_result( $erg, $i, "TextID" );
+    $TextID_New = mysql_result( $erg, $i, "TextID" );
-		if( $TextID_Old != $TextID_New )
+    if( $TextID_Old != $TextID_New )
-		{
+    {
-			echo "<form action=\"sprache.php\">";
+      echo "<form action=\"sprache.php\">";
-			echo "<tr class=\"content\">\n";
+      echo "<tr class=\"content\">\n";
-			echo "\t\t<td>$TextID_Old ".
+      echo "\t\t<td>$TextID_Old ".
-			     "<input name=\"TextID\" type=\"hidden\" value=\"$TextID_Old\"> </td>\n";
+           "<input name=\"TextID\" type=\"hidden\" value=\"$TextID_Old\"> </td>\n";
-		
+    
-			foreach( $Sprachen as $Name => $Value )
+      foreach( $Sprachen as $Name => $Value )
-			{
+      {
-				$Value = html_entity_decode( $Value, ENT_QUOTES);
+        $Value = html_entity_decode( $Value, ENT_QUOTES);
-				echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Value</textarea></td>\n";
+        echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Value</textarea></td>\n";
-				$Sprachen[ $Name ] = "";
+        $Sprachen[ $Name ] = "";
-			}
+      }
-			
+      
-			echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
+      echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
-			echo "</tr>";
+      echo "</tr>";
-			echo "</form>\n";
+      echo "</form>\n";
-			$TextID_Old = $TextID_New;
+      $TextID_Old = $TextID_New;
-		}
+    }
-		$Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" );
+    $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" );
-	} /*FOR*/
+  } /*FOR*/
-	}
+  }
-	
+  
-	//fuer neu eintraege
+  //fuer neu eintraege
-	echo "<form action=\"sprache.php\">";
+  echo "<form action=\"sprache.php\">";
-	echo "<tr class=\"content\">\n";
+  echo "<tr class=\"content\">\n";
-	echo "\t\t<td><input name=\"TextID\" type=\"text\" size=\"40\" value=\"new\"> </td>\n";
+  echo "\t\t<td><input name=\"TextID\" type=\"text\" size=\"40\" value=\"new\"> </td>\n";
-		
+    
-	foreach( $Sprachen as $Name => $Value )
+  foreach( $Sprachen as $Name => $Value )
-		echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Name Text</textarea></td>\n";
+    echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Name Text</textarea></td>\n";
 
-	echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
+  echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
-	echo "</tr>";
+  echo "</tr>";
-	echo "</form>\n";
+  echo "</form>\n";
-	
+  
-	
+  
-	echo "</table>\n";
+  echo "</table>\n";
 } /*if( !isset( $TextID )  )*/
 else
 {
-	echo "edit: ". $_GET["TextID"]. "<br><br>";
+  echo "edit: ". $_GET["TextID"]. "<br /><br />";
-	foreach ($_GET as $k => $v) {
+  foreach ($_GET as $k => $v) {
-		if( $k != "TextID" ) 
+    if( $k != "TextID" ) 
-		{
+    {
-			$sql_test = "SELECT * FROM `Sprache` ".
+      $sql_test = "SELECT * FROM `Sprache` ".
-				"WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'";
+        "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'";
-			$erg_test = mysql_query($sql_test, $con);
+      $erg_test = mysql_query($sql_test, $con);
 
-			if( mysql_num_rows($erg_test)==0 )
+      if( mysql_num_rows($erg_test)==0 )
-			{
+      {
-				$sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ".
+        $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ".
-					"VALUES ('". $_GET["TextID"]. "', '$k', '$v')";
+          "VALUES ('". $_GET["TextID"]. "', '$k', '$v')";
-				  echo $sql_save."<br>";
+          echo $sql_save."<br />";
-		        	$Erg = mysql_query($sql_save, $con);
+              $Erg = mysql_query($sql_save, $con);
-			        if ($Erg == 1)
+              if ($Erg == 1)
-			                echo "\t $k Save: OK<br>\n";
+                      echo "\t $k Save: OK<br />\n";
-			        else
+              else
-		        	        echo "\t $k Save: KO<br>\n";
+                      echo "\t $k Save: KO<br />\n";
-			}
+      }
-			else if( mysql_result($erg_test, 0, "Text")!=$v )
+      else if( mysql_result($erg_test, 0, "Text")!=$v )
-			{
+      {
-				$sql_save = "UPDATE `Sprache` SET `Text`='$v' ".
+        $sql_save = "UPDATE `Sprache` SET `Text`='$v' ".
-					"WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' ";
+          "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' ";
-				  echo $sql_save."<br>";
+          echo $sql_save."<br />";
-		        	$Erg = mysql_query($sql_save, $con);
+              $Erg = mysql_query($sql_save, $con);
-			        if ($Erg == 1)
+              if ($Erg == 1)
-			                echo "\t $k Update: OK<br>\n";
+                      echo "\t $k Update: OK<br />\n";
-			        else
+              else
-		        	        echo "\t $k Update: KO<br>\n";
+                      echo "\t $k Update: KO<br />\n";
-			}
+      }
-			else
+      else
-				echo "\t $k no changes<br>\n";
+        echo "\t $k no changes<br />\n";
-		}
+    }
-	}
+  }
-	   
+     
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/tshirt.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "T-Shirt-Ausgabe";
 $header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
@@ -8,22 +8,22 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 If (IsSet($_GET["aktiv"])) {
 
-	$SQL="UPDATE `User` SET `Tshirt`='1' WHERE `UID`='". $_GET["aktiv"]. "' limit 1";
+  $SQL="UPDATE `User` SET `Tshirt`='1' WHERE `UID`='". $_GET["aktiv"]. "' limit 1";
-	$Erg = mysql_query($SQL, $con);
+  $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);
 
@@ -31,12 +31,12 @@ $rowcount = mysql_num_rows($Erg);
 ?>
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
         <tr class="contenttopic">
-	 <td>Nick</td>
+   <td>Nick</td>
-	 <td>Aktiv?</td>
+   <td>Aktiv?</td>
-	 <td>Gr&ouml;sse</td>
+   <td>Gr&ouml;sse</td>
-	 <td>T-Shirt ausgeben:</td>
+   <td>T-Shirt ausgeben:</td>
-	</td>
+  </td>
-<?PHP
+<?php
 for ($i=0; $i<$rowcount; $i++){
   echo "\t<tr class=\"content\">\n";
     $eUID=mysql_result($Erg, $i, "UID");
@@ -45,9 +45,9 @@ for ($i=0; $i<$rowcount; $i++){
     echo "\t\t<td>".mysql_result($Erg, $i, "Size")."</td>\n";
 
     if (mysql_result($Erg, $i, "Tshirt") =="1") {
-	echo "\t\t<td>bereits erhalten</td>";
+  echo "\t\t<td>bereits erhalten</td>";
     } else {
-	echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
+  echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
     }
  echo "\t</tr>\n";
 }

www-ssl/admin/user.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,131 +7,131 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["enterUID"]))
 {
-	// Userliste, keine UID uebergeben...
+  // 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";
+  if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick";
-	$SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ".
+  $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ".
-		"LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ".
+    "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ".
-		"LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
+    "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
-		"ORDER BY `". $_GET["OrderBy"]. "` ASC";
+    "ORDER BY `". $_GET["OrderBy"]. "` ASC";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
+  echo mysql_error($con);
 
-	// anzahl zeilen
+  // anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  $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"> 
+  ?><table width="100%" class="border" cellpadding="2" cellspacing="1"> 
-	<tr class="contenttopic">
+  <tr class="contenttopic">
-		<td>
+    <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>
-		<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>
+    <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>
-		<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>&Auml;nd.</td>
-		<td>Secure</td>
+    <td>Secure</td>
-	</tr>
+  </tr>
 
 
-	<?PHP
+  <?php
-	$Gekommen = 0;
+  $Gekommen = 0;
-	$Active = 0;
+  $Active = 0;
-	$Tshirt = 0;
+  $Tshirt = 0;
-	
+  
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
-		echo "<tr class=\"content\">\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, "Name")."</td>\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Vorname")."</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>".mysql_result($Erg, $n, "Alter")."</td>\n";
-		echo "\t<td>";
+    echo "\t<td>";
-			if( strlen( mysql_result($Erg, $n, "Telefon"))>0)
+      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)
+      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)
+      if( strlen( mysql_result($Erg, $n, "DECT"))>0)
-				echo "\n\t\tDECT: <a href=\"./dect.php?custum=". mysql_result($Erg, $n, "DECT"). "\">".
+        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)
+      if( strlen( mysql_result($Erg, $n, "email"))>0)
-				echo "\n\t\temail: <a href=\"mailto:".mysql_result($Erg, $n, "email")."\">".
+        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)
+      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)
+      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)
+      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)
+      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)
+      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 "</td>\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Size")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Size")."</td>\n";
-		$Gekommen += mysql_result($Erg, $n, "Gekommen");
+    $Gekommen += mysql_result($Erg, $n, "Gekommen");
-		echo "\t<td>".mysql_result($Erg, $n, "Gekommen")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Gekommen")."</td>\n";
-		$Active += mysql_result($Erg, $n, "Aktiv");
+    $Active += mysql_result($Erg, $n, "Aktiv");
-		echo "\t<td>".mysql_result($Erg, $n, "Aktiv")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Aktiv")."</td>\n";
-		$Tshirt += mysql_result($Erg, $n, "Tshirt");
+    $Tshirt += mysql_result($Erg, $n, "Tshirt");
-		echo "\t<td>".mysql_result($Erg, $n, "Tshirt")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Tshirt")."</td>\n";
-		echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
+    echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
-				"admin/userChangeNormal.php?enterUID=". 
+        "admin/userChangeNormal.php?enterUID=". 
-					mysql_result($Erg, $n, "UID")."&Type=Normal",
+          mysql_result($Erg, $n, "UID")."&Type=Normal",
-				"&Auml;nd.").
+        "&Auml;nd.").
-			"</td>\n";
+      "</td>\n";
-		echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
+    echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
-				"admin/userChangeSecure.php?enterUID=". 
+        "admin/userChangeSecure.php?enterUID=". 
-					mysql_result($Erg, $n, "UID")."&Type=Secure",
+          mysql_result($Erg, $n, "UID")."&Type=Secure",
-				"Secure").
+        "Secure").
-			"</td>\n";
+      "</td>\n";
-		echo "</tr>\n";
+    echo "</tr>\n";
-	}
+  }
-	echo "<tr>".
+  echo "<tr>".
-		"<td></td><td></td><td></td><td></td><td></td><td></td>".
+    "<td></td><td></td><td></td><td></td><td></td><td></td>".
-		"<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td></tr>\n";
+    "<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td></tr>\n";
-	echo "\t</table>\n";
+  echo "\t</table>\n";
-	// Ende Userliste
+  // Ende Userliste
 
-	echo "<h1>Statistics</h1>";
+  echo "<h1>Statistics</h1>";
-	funktion_db_element_list_2row( "Hometown",
+  funktion_db_element_list_2row( "Hometown",
-        	                        "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
+                                  "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
 
-	echo "<br>\n";
+  echo "<br />\n";
 
-	funktion_db_element_list_2row( "Engeltypen",
+  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",
+  funktion_db_element_list_2row( "Used Groups",
-		"SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ".
+    "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ".
-		"LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
+    "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
-		"WHERE (UserCVS.GroupID!='NULL') ".
+    "WHERE (UserCVS.GroupID!='NULL') ".
-		"GROUP BY `GroupName` ".
+    "GROUP BY `GroupName` ".
-		"");
+    "");
 }
 else
 {
-	echo "error";
+  echo "error";
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/userArrived.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Engel Arrived";
 $header = "Engel was arrived";
@@ -8,17 +8,17 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 If (IsSet($_GET["arrived"])) {
 
-	$SQL="UPDATE `User` SET `Gekommen`='1' WHERE `UID`='". $_GET["arrived"]. "' limit 1";
+  $SQL="UPDATE `User` SET `Gekommen`='1' WHERE `UID`='". $_GET["arrived"]. "' limit 1";
-	$Erg = db_query($SQL, "Set User as Gekommen");
+  $Erg = db_query($SQL, "Set User as Gekommen");
         if ($Erg == 1) {
-		echo "<h2>". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\"</h2>";
+    echo "<h2>". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\"</h2>";
         } else {
-		echo "<h1>". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"</h1>";
+    echo "<h1>". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"</h1>";
         }
 }
 
-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"; 
@@ -34,18 +34,18 @@ echo "\t\t<td>". Get_Text("pri_userArrived_TableTD_ArrivedSet"). "</td>\n";
 echo "\t</td>\n";
 
 for ($i=0; $i<$rowcount; $i++){
-	echo "\t<tr class=\"content\">\n";
+  echo "\t<tr class=\"content\">\n";
-	$eUID=mysql_result($Erg, $i, "UID");
+  $eUID=mysql_result($Erg, $i, "UID");
-	echo "\t\t<td>".UID2Nick($eUID)."</td>\n";
+  echo "\t\t<td>".UID2Nick($eUID)."</td>\n";
-	echo "\t\t<td>".mysql_result($Erg, $i, "Gekommen")."</td>\n";
+  echo "\t\t<td>".mysql_result($Erg, $i, "Gekommen")."</td>\n";
 
-	if (mysql_result($Erg, $i, "Gekommen") =="1") 
+  if (mysql_result($Erg, $i, "Gekommen") =="1") 
-	{
+  {
-		echo "\t\t<td>". Get_Text("pri_userArrived_TableEntry_Arrived"). "</td>";
+    echo "\t\t<td>". Get_Text("pri_userArrived_TableEntry_Arrived"). "</td>";
-	} else {
+  } else {
-		echo "\t\t<td><a href=\"./userArrived.php?arrived=$eUID\">". Get_Text("pri_userArrived_TableEntry_Set"). "</a></td>";
+    echo "\t\t<td><a href=\"./userArrived.php?arrived=$eUID\">". Get_Text("pri_userArrived_TableEntry_Set"). "</a></td>";
-	}
+  }
-	echo "\t</tr>\n";
+  echo "\t</tr>\n";
 }
 echo "</table>";
 

www-ssl/admin/userChangeNormal.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,128 +7,128 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (IsSet($_GET["enterUID"]))
 { 
-	// UserID wurde mit uebergeben --> Aendern...
+  // UserID wurde mit uebergeben --> Aendern...
 
-	echo "Hallo,<br>".
+  echo "Hallo,<br />".
-	 	"hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
+     "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
-		"wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
+    "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. ".
+    "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 ".
+    "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 "<form action=\"./userSaveNormal.php?action=change\" method=\"POST\">\n";
-	echo "<table border=\"0\">\n";
+  echo "<table border=\"0\">\n";
-	echo "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n";
+  echo "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n";
 
-	$SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'";
+  $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'";
-	$Erg = mysql_query($SQL, $con);
+  $Erg = mysql_query($SQL, $con);
-		
+    
-	if (mysql_num_rows($Erg) != 1) 
+  if (mysql_num_rows($Erg) != 1) 
-		echo "<tr><td>Sorry, der Engel (UID=". $_GET["enterUID"]. 
+    echo "<tr><td>Sorry, der Engel (UID=". $_GET["enterUID"]. 
-			") wurde in der Liste nicht gefunden.</td></tr>";
+      ") wurde in der Liste nicht gefunden.</td></tr>";
-	else
+  else
-	{
+  {
-		echo "<tr><td>\n";
+    echo "<tr><td>\n";
-		echo "<table>\n";
+    echo "<table>\n";
-		echo "  <tr><td>Nick</td><td>".
+    echo "  <tr><td>Nick</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eNick\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"".
-			mysql_result($Erg, 0, "Nick")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Nick")."\"></td></tr>\n";
-		echo "  <tr><td>lastLogIn</td><td>".
+    echo "  <tr><td>lastLogIn</td><td>".
-			"<input type=\"text\" size=\"20\" name=\"elastLogIn\" value=\"".
+      "<input type=\"text\" size=\"20\" name=\"elastLogIn\" value=\"".
-			mysql_result($Erg, 0, "lastLogIn"). "\" disabled></td></tr>\n";
+      mysql_result($Erg, 0, "lastLogIn"). "\" disabled></td></tr>\n";
-		echo "  <tr><td>Name</td><td>".
+    echo "  <tr><td>Name</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eName\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eName\" value=\"".
-			mysql_result($Erg, 0, "Name")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Name")."\"></td></tr>\n";
-		echo "  <tr><td>Vorname</td><td>".
+    echo "  <tr><td>Vorname</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"".
-			mysql_result($Erg, 0, "Vorname")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Vorname")."\"></td></tr>\n";
-		echo "  <tr><td>Alter</td><td>".
+    echo "  <tr><td>Alter</td><td>".
-			"<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"".
+      "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"".
-			mysql_result($Erg, 0, "Alter")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Alter")."\"></td></tr>\n";
-		echo "  <tr><td>Telefon</td><td>".
+    echo "  <tr><td>Telefon</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"".
-			mysql_result($Erg, 0, "Telefon")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Telefon")."\"></td></tr>\n";
-		echo "  <tr><td>Handy</td><td>".
+    echo "  <tr><td>Handy</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"".
-			mysql_result($Erg, 0, "Handy")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Handy")."\"></td></tr>\n";
-		echo "  <tr><td>DECT</td><td>".
+    echo "  <tr><td>DECT</td><td>".
-			"<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"".
+      "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"".
-			mysql_result($Erg, 0, "DECT")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "DECT")."\"></td></tr>\n";
-		echo "  <tr><td>email</td><td>".
+    echo "  <tr><td>email</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eemail\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"".
-			mysql_result($Erg, 0, "email")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "email")."\"></td></tr>\n";
-		echo "  <tr><td>ICQ</td><td>".
+    echo "  <tr><td>ICQ</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"".
-			mysql_result($Erg, 0, "ICQ")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "ICQ")."\"></td></tr>\n";
-		echo "  <tr><td>jabber</td><td>".
+    echo "  <tr><td>jabber</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"".
-			mysql_result($Erg, 0, "jabber")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "jabber")."\"></td></tr>\n";
-		echo "  <tr><td>Size</td><td>".
+    echo "  <tr><td>Size</td><td>".
-			"<input type=\"text\" size=\"5\" name=\"eSize\" value=\"".
+      "<input type=\"text\" size=\"5\" name=\"eSize\" value=\"".
-			mysql_result($Erg, 0, "Size")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Size")."\"></td></tr>\n";
-		echo "  <tr><td>Passwort</td><td>".
+    echo "  <tr><td>Passwort</td><td>".
-			"<a href=\"./userSaveNormal.php?action=newpw&eUID="
+      "<a href=\"./userSaveNormal.php?action=newpw&eUID="
-			.mysql_result($Erg, 0, "UID")."\">neues Kennwort setzen</a></td></tr>\n";
+      .mysql_result($Erg, 0, "UID")."\">neues Kennwort setzen</a></td></tr>\n";
  
-		// Gekommen? 
+    // Gekommen? 
-		echo "  <tr><td>Gekommen</td><td>\n";
+    echo "  <tr><td>Gekommen</td><td>\n";
-		echo "      <input type=\"radio\" name=\"eGekommen\" value=\"0\"";
+    echo "      <input type=\"radio\" name=\"eGekommen\" value=\"0\"";
-		if (mysql_result($Erg, 0, "Gekommen")=='0') 
+    if (mysql_result($Erg, 0, "Gekommen")=='0') 
-			echo " checked"; 
+      echo " checked"; 
-		echo ">No \n";
+    echo ">No \n";
-		echo "      <input type=\"radio\" name=\"eGekommen\" value=\"1\"";
+    echo "      <input type=\"radio\" name=\"eGekommen\" value=\"1\"";
-		if (mysql_result($Erg, 0, "Gekommen")=='1') 
+    if (mysql_result($Erg, 0, "Gekommen")=='1') 
-			echo " checked";
+      echo " checked";
-		echo ">Yes \n";
+    echo ">Yes \n";
-		echo "</td></tr>\n";
+    echo "</td></tr>\n";
 
-		// Aktiv?
+    // Aktiv?
-		echo "  <tr><td>Aktiv</td><td>\n";
+    echo "  <tr><td>Aktiv</td><td>\n";
-		echo "      <input type=\"radio\" name=\"eAktiv\" value=\"0\"";
+    echo "      <input type=\"radio\" name=\"eAktiv\" value=\"0\"";
-		if (mysql_result($Erg, 0, "Aktiv")=='0') 
+    if (mysql_result($Erg, 0, "Aktiv")=='0') 
-			echo " checked";
+      echo " checked";
-		echo ">No \n";
+    echo ">No \n";
-		echo "      <input type=\"radio\" name=\"eAktiv\" value=\"1\"";
+    echo "      <input type=\"radio\" name=\"eAktiv\" value=\"1\"";
-		if (mysql_result($Erg, 0, "Aktiv")=='1') 
+    if (mysql_result($Erg, 0, "Aktiv")=='1') 
-			echo " checked"; 
+      echo " checked"; 
-		echo ">Yes \n";
+    echo ">Yes \n";
-		echo "</td></tr>\n";
+    echo "</td></tr>\n";
 
-		// T-Shirt bekommen? 
+    // T-Shirt bekommen? 
-		echo "  <tr><td>T-Shirt</td><td>\n";
+    echo "  <tr><td>T-Shirt</td><td>\n";
-		echo "      <input type=\"radio\" name=\"eTshirt\" value=\"0\"";
+    echo "      <input type=\"radio\" name=\"eTshirt\" value=\"0\"";
-		if (mysql_result($Erg, 0, "Tshirt")=='0')
+    if (mysql_result($Erg, 0, "Tshirt")=='0')
-			echo " checked";
+      echo " checked";
-		echo ">No \n";
+    echo ">No \n";
-		echo "      <input type=\"radio\" name=\"eTshirt\" value=\"1\"";
+    echo "      <input type=\"radio\" name=\"eTshirt\" value=\"1\"";
-		if (mysql_result($Erg, 0, "Tshirt")=='1') 
+    if (mysql_result($Erg, 0, "Tshirt")=='1') 
-			echo " checked";
+      echo " checked";
-		echo ">Yes \n";
+    echo ">Yes \n";
-		echo "</td></tr>\n";
+    echo "</td></tr>\n";
 
-		echo "  <tr><td>Hometown</td><td>".
+    echo "  <tr><td>Hometown</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"".
+      "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"".
-			mysql_result($Erg, 0, "Hometown")."\"></td></tr>\n";
+      mysql_result($Erg, 0, "Hometown")."\"></td></tr>\n";
-		
+    
-		echo "</table>\n</td><td valign=\"top\">". displayavatar($_GET["enterUID"], FALSE). "</td></tr>";
+    echo "</table>\n</td><td valign=\"top\">". displayavatar($_GET["enterUID"], FALSE). "</td></tr>";
-	}
+  }
 
-	echo "</td></tr>\n";
+  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=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-	echo "<input type=\"submit\" value=\"sichern...\">\n";
+  echo "<input type=\"submit\" value=\"sichern...\">\n";
-	echo "</form>";
+  echo "</form>";
 
-	echo "<form action=\"./userSaveNormal.php?action=delete\" method=\"POST\">\n";
+  echo "<form action=\"./userSaveNormal.php?action=delete\" method=\"POST\">\n";
-	echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+  echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-	echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
+  echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
-	echo "</form>";
+  echo "</form>";
 
-	
+  
-	echo "<hr>";
+  echo "<hr>";
-	funktion_db_element_list_2row( 
+  funktion_db_element_list_2row( 
-		"Freeloader Shifts", 
+    "Freeloader Shifts", 
-		"SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); 
+    "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); 
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/userChangeSecure.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,103 +7,103 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (IsSet($_GET["enterUID"]))
 { 
-	// UserID wurde mit uebergeben --> Aendern...
+  // UserID wurde mit uebergeben --> Aendern...
 
-	echo "Hallo,<br>".
+  echo "Hallo,<br />".
-	 	"hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
+     "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
-		"wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
+    "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. ".
+    "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 ".
+    "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"]. "'";
+  $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'";
-	$Erg_CVS =  mysql_query($SQL_CVS, $con);
+  $Erg_CVS =  mysql_query($SQL_CVS, $con);
-		
+    
-	if( mysql_num_rows($Erg_CVS) != 1) 
+  if( mysql_num_rows($Erg_CVS) != 1) 
-		echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden.";
+    echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden.";
-	else
+  else
-	{
+  {
-		// Rename if is an group
+    // Rename if is an group
-		if( $_GET["enterUID"] < 0 ) {
+    if( $_GET["enterUID"] < 0 ) {
-			$SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'";
+      $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'";
-		        $ErgName = mysql_query($SQLname, $con);
+            $ErgName = mysql_query($SQLname, $con);
-		        echo mysql_error($con);
+            echo mysql_error($con);
 
-			echo "<form action=\"./userSaveSecure.php?action=changeGroupName\" method=\"POST\">\n";
+      echo "<form action=\"./userSaveSecure.php?action=changeGroupName\" method=\"POST\">\n";
-			echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+      echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-			echo "<input type=\"text\" name=\"GroupName\" value=\"". mysql_result($ErgName, 0, "Name"). "\">\n";
+      echo "<input type=\"text\" name=\"GroupName\" value=\"". mysql_result($ErgName, 0, "Name"). "\">\n";
-			echo "<input type=\"submit\" value=\"rename\">\n";
+      echo "<input type=\"submit\" value=\"rename\">\n";
-			echo "</form>";
+      echo "</form>";
-		}
+    }
 
-		echo "<form action=\"./userSaveSecure.php?action=change\" method=\"POST\">\n";
+    echo "<form action=\"./userSaveSecure.php?action=change\" method=\"POST\">\n";
-		echo "<table border=\"0\">\n";
+    echo "<table border=\"0\">\n";
-		echo "<input type=\"hidden\" name=\"Type\" value=\"Secure\">\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);
+    $CVS_Data = mysql_fetch_array($Erg_CVS);
-		$CVS_Data_i = 1;
+    $CVS_Data_i = 1;
-		foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
+    foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
-		{
+    {
-	  		$CVS_Data_i++;
+        $CVS_Data_i++;
-			//nur jeder zweiter sonst wird für jeden text noch die position (Zahl) ausgegeben
+      //nur jeder zweiter sonst wird für jeden text noch die position (Zahl) ausgegeben
-			if( $CVS_Data_i%2 && $CVS_Data_Name!="UID") 
+      if( $CVS_Data_i%2 && $CVS_Data_Name!="UID") 
-			{
+      {
-				if($CVS_Data_Name=="GroupID") {
+        if($CVS_Data_Name=="GroupID") {
-					if( $_GET["enterUID"] > 0 )
+          if( $_GET["enterUID"] > 0 )
-					{
+          {
-						echo "<tr><td><b>Group</b></td>\n".
+            echo "<tr><td><b>Group</b></td>\n".
-							"<td><select name=\"GroupID\">";
+              "<td><select name=\"GroupID\">";
 
-						$SQL_Group = "SELECT * FROM `UserGroups`";
+            $SQL_Group = "SELECT * FROM `UserGroups`";
-						$Erg_Group =  mysql_query($SQL_Group, $con);
+            $Erg_Group =  mysql_query($SQL_Group, $con);
-						for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++)
+            for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++)
-						{
+            {
-							$UID =  mysql_result($Erg_Group, $n, "UID");
+              $UID =  mysql_result($Erg_Group, $n, "UID");
-							echo "\t<option value=\"$UID\"";
+              echo "\t<option value=\"$UID\"";
-							if( $CVS_Data_Value == $UID)
+              if( $CVS_Data_Value == $UID)
-								echo " selected";
+                echo " selected";
-							echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
+              echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
-						}
+            }
-						echo "</select></td></tr>";
+            echo "</select></td></tr>";
-					}
+          }
-				} else {
+        } else {
-					echo "<tr><td>$CVS_Data_Name</td>\n<td>";
+          echo "<tr><td>$CVS_Data_Name</td>\n<td>";
-					echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"Y\" ";
+          echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"Y\" ";
-					if( $CVS_Data_Value == "Y" )	
+          if( $CVS_Data_Value == "Y" )  
-				   		echo " checked";
+               echo " checked";
-					echo ">allow \n";
+          echo ">allow \n";
-					echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"N\" ";
+          echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"N\" ";
-					if( $CVS_Data_Value == "N" )
+          if( $CVS_Data_Value == "N" )
-				    		echo " checked";
+                echo " checked";
-					echo ">denied \n";
+          echo ">denied \n";
-					if( $_GET["enterUID"] > 0 )
+          if( $_GET["enterUID"] > 0 )
-					{
+          {
-						echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"G\" ";
+            echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"G\" ";
-						if( $CVS_Data_Value == "G" )
+            if( $CVS_Data_Value == "G" )
-				    			echo " checked";
+                  echo " checked";
-						echo ">group-setting \n";
+            echo ">group-setting \n";
-						echo "</td></tr>";
+            echo "</td></tr>";
-				    	}
+              }
-				}
+        }
-			} //IF
+      } //IF
-		} //Foreach	    
+    } //Foreach      
-		echo "</td></tr>\n";
+    echo "</td></tr>\n";
-		
+    
-		// Ende Formular
+    // Ende Formular
-		echo "</td></tr>\n";
+    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=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-		echo "<input type=\"submit\" value=\"sichern...\">\n";
+    echo "<input type=\"submit\" value=\"sichern...\">\n";
-		echo "</form>";
+    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=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-		echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
+    echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
-		echo "</form>";
+    echo "</form>";
-	} 
+  } 
 }
 
 include ("../../../camp2011/includes/footer.php");

www-ssl/admin/userDefaultSetting.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Defalut User Setting";
 $header = "Defalut User Setting";
@@ -6,8 +6,8 @@ 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";
 echo "\t\t<th>Page</th>\n\t\t<th>Show</th>\n\t\t<th></th>\n";
@@ -15,55 +15,55 @@ echo "\t</tr>\n";
 
 if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"]))
 {
-	switch( $_GET["Send"])
+  switch( $_GET["Send"])
-	{
+  {
-		case "New":
+    case "New":
- 			$SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ".
+       $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ".
-				"CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL";
+        "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL";
-			$Erg = db_query( $SQL, "New user default setting");
+      $Erg = db_query( $SQL, "New user default setting");
-			if( $Erg == 1)
+      if( $Erg == 1)
-				echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
+        echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
-			else
+      else
-				echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
+        echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
-			break;
+      break;
-		case "Del":
+    case "Del":
-			echo "\t<tr class=\"content\">\n";
+      echo "\t<tr class=\"content\">\n";
-			echo "\t\t<form action=\"userDefaultSetting.php\">\n";
+      echo "\t\t<form action=\"userDefaultSetting.php\">\n";
-			echo "\t\t\t<td><input name=\"Field\" type=\"text\" value=\"". $_GET["Field"]. "\" readonly></td>\n";
+      echo "\t\t\t<td><input name=\"Field\" type=\"text\" value=\"". $_GET["Field"]. "\" readonly></td>\n";
-			echo "\t\t\t<td><input name=\"Default\" type=\"text\" value=\"". $_GET["Default"]. "\" readonly></td>\n";
+      echo "\t\t\t<td><input name=\"Default\" type=\"text\" value=\"". $_GET["Default"]. "\" readonly></td>\n";
-			echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Del sure\"></td>\n";
+      echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Del sure\"></td>\n";
-			echo "\t\t</form>\n";
+      echo "\t\t</form>\n";
-			echo "\t</tr>\n";
+      echo "\t</tr>\n";
-			break;
+      break;
-		case "Del sure":
+    case "Del sure":
-			$SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` ";
+      $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` ";
-			$Erg = db_query( $SQL, "del user default setting");
+      $Erg = db_query( $SQL, "del user default setting");
-			if( $Erg == 1)
+      if( $Erg == 1)
-				echo "<H2>Delete ".$_GET["Field"]. " succesfull</h2>\n";
+        echo "<H2>Delete ".$_GET["Field"]. " succesfull</h2>\n";
-			else
+      else
-				echo "<H2>Delete ".$_GET["Field"]. " error...</h2>\n".
+        echo "<H2>Delete ".$_GET["Field"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
-			break;
+      break;
-		case "SetForAllUser":
+    case "SetForAllUser":
-			$SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0";
+      $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0";
-			$Erg = db_query( $SQL, "Set new user default setting for all user");
+      $Erg = db_query( $SQL, "Set new user default setting for all user");
-			if( $Erg == 1)
+      if( $Erg == 1)
-				echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull</h2>\n";
+        echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull</h2>\n";
-			else
+      else
-				echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...</h2>\n".
+        echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
-		case "Save":
+    case "Save":
-			$SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ".
+      $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ".
-				"`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'";
+        "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'";
-			$Erg = db_query( $SQL, "Save user default setting");
+      $Erg = db_query( $SQL, "Save user default setting");
-			if( $Erg == 1)
+      if( $Erg == 1)
-				echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
+        echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
-			else
+      else
-				echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
+        echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
+          "[". mysql_error(). "]<br /><br />";
-			break;
+      break;
-	} //SWITCH
+  } //SWITCH
 } //IF(
 
 
@@ -79,11 +79,11 @@ $SQL_Group = "SELECT * FROM `UserGroups`";
 $Erg_Group =  mysql_query($SQL_Group, $con);
 for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++)
 {
-		$UID =  mysql_result($Erg_Group, $n, "UID");
+    $UID =  mysql_result($Erg_Group, $n, "UID");
-		echo "\t<option value=\"$UID\"";
+    echo "\t<option value=\"$UID\"";
-		if( mysql_result( $erg, 1, "Default") == $UID)
+    if( mysql_result( $erg, 1, "Default") == $UID)
-				echo " selected";
+        echo " selected";
-		echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
+    echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
 }
 echo "</select></td>\n";
 echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\">\n";
@@ -93,35 +93,35 @@ echo "\t</tr>\n";
 
 for( $i=2; $i<mysql_num_rows($erg); $i++)
 {
-	echo "\t<tr class=\"content\">\n";
+  echo "\t<tr class=\"content\">\n";
-	echo "\t\t<form action=\"userDefaultSetting.php\">\n";
+  echo "\t\t<form action=\"userDefaultSetting.php\">\n";
-	echo "\t\t\t<input name=\"Field\" type=\"hidden\" value=\"". mysql_result( $erg, $i, "Field"). "\">\n";
+  echo "\t\t\t<input name=\"Field\" type=\"hidden\" value=\"". mysql_result( $erg, $i, "Field"). "\">\n";
-	echo "\t\t\t<td>". mysql_result( $erg, $i, "Field"). "</td>\n";
+  echo "\t\t\t<td>". mysql_result( $erg, $i, "Field"). "</td>\n";
-	echo "\t\t\t<td>\n";
+  echo "\t\t\t<td>\n";
-	
+  
-	echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"Y\"";
+  echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"Y\"";
-	if( mysql_result( $erg, $i, "Default") == "Y")
+  if( mysql_result( $erg, $i, "Default") == "Y")
-			echo " checked";
+      echo " checked";
-	echo ">allow\n";
+  echo ">allow\n";
 
-	echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"N\"";
+  echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"N\"";
-	if( mysql_result( $erg, $i, "Default") == "N")
+  if( mysql_result( $erg, $i, "Default") == "N")
-		echo " checked";
+    echo " checked";
-	echo ">denied\n";
+  echo ">denied\n";
 
-	echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"G\"";
+  echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"G\"";
-	if( mysql_result( $erg, $i, "Default") == "G")
+  if( mysql_result( $erg, $i, "Default") == "G")
-		echo " checked";
+    echo " checked";
-	echo ">group-setting\n";
+  echo ">group-setting\n";
 
-	echo "\t\t\t</td>\n";
+  echo "\t\t\t</td>\n";
-	echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\">\n";
+  echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\">\n";
-	echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"Del\">\n";
+  echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"Del\">\n";
-	echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"SetForAllUser\"></td>\n";
+  echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"SetForAllUser\"></td>\n";
-	echo "\t\t</form>\n";
+  echo "\t\t</form>\n";
-	echo "\t</tr>\n";
+  echo "\t</tr>\n";
 }
-	
+  
 echo "\t<tr class=\"content\">\n";
 echo "\t\t<form action=\"userDefaultSetting.php\">\n";
 echo "\t\t\t<input name=\"New\" type=\"hidden\" value=\"New\">\n";

www-ssl/admin/userSaveNormal.php

@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Index";
@@ -9,120 +9,120 @@ include ("../../../camp2011/includes/funktion_db.php");
 
 if (IsSet($_GET["action"])) 
 {
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	echo "Gesendeter Befehl: ". $_GET["action"]. "<br>";
+  echo "Gesendeter Befehl: ". $_GET["action"]. "<br />";
 
-	switch ($_GET["action"]) 
+  switch ($_GET["action"]) 
-	{
+  {
-	case "change":
+  case "change":
-		if (IsSet($_POST["enterUID"]))
+    if (IsSet($_POST["enterUID"]))
-		{
+    {
-			if ($_POST["Type"] == "Normal")
+      if ($_POST["Type"] == "Normal")
-			{
+      {
-				$SQL = "UPDATE `User` SET ";
+        $SQL = "UPDATE `User` SET ";
-				$SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ".
+        $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ".
-					"`Vorname` = '". $_POST["eVorname"]. "', ".
+          "`Vorname` = '". $_POST["eVorname"]. "', ".
-					"`Telefon` = '". $_POST["eTelefon"]. "', ".
+          "`Telefon` = '". $_POST["eTelefon"]. "', ".
-					"`Handy` = '". $_POST["eHandy"]. "', ".
+          "`Handy` = '". $_POST["eHandy"]. "', ".
-					"`DECT` = '". $_POST["eDECT"]. "', ".
+          "`DECT` = '". $_POST["eDECT"]. "', ".
-					"`email` = '". $_POST["eemail"]. "', ".
+          "`email` = '". $_POST["eemail"]. "', ".
-					"`ICQ` = '". $_POST["eICQ"]. "', ".
+          "`ICQ` = '". $_POST["eICQ"]. "', ".
-					"`jabber` = '". $_POST["ejabber"]. "', ".
+          "`jabber` = '". $_POST["ejabber"]. "', ".
-					"`Size` = '". $_POST["eSize"]. "', ".
+          "`Size` = '". $_POST["eSize"]. "', ".
-					"`Gekommen`= '". $_POST["eGekommen"]. "', ".
+          "`Gekommen`= '". $_POST["eGekommen"]. "', ".
-					"`Aktiv`= '". $_POST["eAktiv"]. "', ".
+          "`Aktiv`= '". $_POST["eAktiv"]. "', ".
-					"`Tshirt` = '". $_POST["eTshirt"]. "', ".
+          "`Tshirt` = '". $_POST["eTshirt"]. "', ".
-					"`Hometown` = '". $_POST["Hometown"]. "' ".
+          "`Hometown` = '". $_POST["Hometown"]. "' ".
-					"WHERE `UID` = '". $_POST["enterUID"]. 
+          "WHERE `UID` = '". $_POST["enterUID"]. 
-					"' LIMIT 1;";
+          "' LIMIT 1;";
-				echo "User-";
+        echo "User-";
-				$Erg = db_query($SQL, "change user details");
+        $Erg = db_query($SQL, "change user details");
-				if ($Erg == 1) {
+        if ($Erg == 1) {
-					echo "&Auml;nderung wurde gesichert...\n";
+          echo "&Auml;nderung wurde gesichert...\n";
-				} else {
+        } else {
-					echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+          echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-				}
+        }
-			}
+      }
-			else
+      else
-				echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
+        echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
-		}
+    }
-		else
+    else
-			echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
+      echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
-		break;
+    break;
 
-	case "delete":
+  case "delete":
-		if (IsSet($_POST["enterUID"]))
+    if (IsSet($_POST["enterUID"]))
-		{
+    {
-			echo "delate User...";
+      echo "delate User...";
-			$SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL, "User delete");
+      $Erg = db_query($SQL, "User delete");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        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;";
+      $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL2, "User CVS delete");
+      $Erg = db_query($SQL2, "User CVS delete");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-			
+      
-			echo "<br>\ndelate UserEntry...";
+      echo "<br />\ndelate UserEntry...";
-			$SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
+      $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
-				  "WHERE `UID`='". $_POST["enterUID"]. "';";
+          "WHERE `UID`='". $_POST["enterUID"]. "';";
-			$Erg = db_query($SQL3, "delate UserEntry");
+      $Erg = db_query($SQL3, "delate UserEntry");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-		}
+    }
-		break;
+    break;
 
 
-	case "newpw":
+  case "newpw":
-		echo "Bitte neues Kennwort f&uuml;r <b>";
+    echo "Bitte neues Kennwort f&uuml;r <b>";
-		// Get Nick
+    // Get Nick
-		$USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'";
+    $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'";
-		$Erg = mysql_query($USQL, $con);
+    $Erg = mysql_query($USQL, $con);
-		echo mysql_result($Erg, 0, "Nick");
+    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 "<form action=\"./userSaveNormal.php?action=newpwsave\" method=\"POST\">\n";  
-		echo "<input type=\"Password\" name=\"ePasswort\">";
+    echo "<input type=\"Password\" name=\"ePasswort\">";
-		echo "<input type=\"Password\" name=\"ePasswort2\">";
+    echo "<input type=\"Password\" name=\"ePasswort2\">";
-		echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">";
+    echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">";
-	        echo "<input type=\"submit\" value=\"sichern...\">\n";
+          echo "<input type=\"submit\" value=\"sichern...\">\n";
-	        echo "</form>";
+          echo "</form>";
-		break;
+    break;
 
-	case "newpwsave":
+  case "newpwsave":
-		if ($_POST["ePasswort"] == $_POST["ePasswort2"]) 
+    if ($_POST["ePasswort"] == $_POST["ePasswort2"]) 
-		{	// beide Passwoerter passen... 
+    {  // beide Passwoerter passen... 
-			$_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]);
+      $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]);
-			$SQL =	"UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ".
+      $SQL =  "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ".
-				"WHERE `UID`='". $_POST["eUID"]. "'";
+        "WHERE `UID`='". $_POST["eUID"]. "'";
-			$Erg = db_query($SQL, "User new passwort");
+      $Erg = db_query($SQL, "User new passwort");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-		} 
+    } 
-		else 
+    else 
-			echo "Das Passwort wurde nicht &uuml;bereinstimmend eingegeben!";
+      echo "Das Passwort wurde nicht &uuml;bereinstimmend eingegeben!";
-		break;
+    break;
-	} // end switch
+  } // end switch
 
 // ende - Action ist gesetzt 
 } 
 else 
 {
-	// kein Action gesetzt -> abbruch
+  // 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";
@@ -9,168 +9,168 @@ include ("../../../camp2011/includes/funktion_db.php");
 
 if( !IsSet($_POST["enterUID"]) ) 
 {
-	$Right = "N";
+  $Right = "N";
 } elseif( $_POST["enterUID"] > 0 ) {
-	$Right = $_SESSION['CVS'][ "admin/user.php"];
+  $Right = $_SESSION['CVS'][ "admin/user.php"];
 } else {
-	$Right = $_SESSION['CVS'][ "admin/group.php"];
+  $Right = $_SESSION['CVS'][ "admin/group.php"];
 }
 
 if ( ($Right=="Y") && IsSet($_GET["action"])) 
 {
-	SetHeaderGo2Back();
+  SetHeaderGo2Back();
-	echo "Gesendeter Befehl: ". $_GET["action"]. "<br>";
+  echo "Gesendeter Befehl: ". $_GET["action"]. "<br />";
-	
+  
-	switch ($_GET["action"]) 
+  switch ($_GET["action"]) 
-	{
+  {
-	case "change":
+  case "change":
-		if (IsSet($_POST["enterUID"]))
+    if (IsSet($_POST["enterUID"]))
-		{
+    {
-			if ($_POST["Type"] == "Secure")
+      if ($_POST["Type"] == "Secure")
-			{
+      {
-				$SQL2 = "UPDATE `UserCVS` SET ";
+        $SQL2 = "UPDATE `UserCVS` SET ";
-			  	$SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'";
+          $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'";
-				$Erg_CVS =  mysql_query($SQL_CVS, $con);
+        $Erg_CVS =  mysql_query($SQL_CVS, $con);
-				$CVS_Data = mysql_fetch_array($Erg_CVS);
+        $CVS_Data = mysql_fetch_array($Erg_CVS);
-				$CVS_Data_i = 1;
+        $CVS_Data_i = 1;
-				foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
+        foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
-				{
+        {
-					if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") {
+          if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") {
-						if( $CVS_Data_Name == "GroupID")
+            if( $CVS_Data_Name == "GroupID")
-						{
+            {
-							if( $_POST["enterUID"] > 0 )
+              if( $_POST["enterUID"] > 0 )
-								$SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', ";
+                $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', ";
-							else
+              else
-								$SQL2.= "`$CVS_Data_Name` = NULL, ";
+                $SQL2.= "`$CVS_Data_Name` = NULL, ";
-						} else {
+            } else {
-							$SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', ";
+              $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', ";
-						}
+            }
-					}
+          }
-			    		$CVS_Data_i++;
+              $CVS_Data_i++;
-				}
+        }
-				$SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 );
+        $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 );
-				$SQL2.= "  WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+        $SQL2.= "  WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-				echo "<br>Secure-";
+        echo "<br />Secure-";
-				$Erg = db_query($SQL2, "change user CVS");
+        $Erg = db_query($SQL2, "change user CVS");
-				if ($Erg == 1) {
+        if ($Erg == 1) {
-					echo "&Auml;nderung wurde gesichert...\n";
+          echo "&Auml;nderung wurde gesichert...\n";
-				} else {
+        } else {
-					echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+          echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-				}
+        }
-			}
+      }
-			else
+      else
-				echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
+        echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
-		}
+    }
-		else
+    else
-			echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
+      echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
-		break;
+    break;
 
-	case "changeGroupName":
+  case "changeGroupName":
-		if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) )
+    if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) )
-		{
+    {
-			$SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;";
+      $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;";
-			$Erg = db_query($SQL, "Update Group Name");
+      $Erg = db_query($SQL, "Update Group Name");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-		}
+    }
-		else
+    else
-			echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
+      echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
-		break;
+    break;
 
-	case "delete":
+  case "delete":
-		if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) )
+    if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) )
-		{
+    {
-			echo "delate User...";
+      echo "delate User...";
-			$SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL, "User delete");
+      $Erg = db_query($SQL, "User delete");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        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;";
+      $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL2, "User CVS delete");
+      $Erg = db_query($SQL2, "User CVS delete");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-			
+      
-			echo "<br>\ndelate UserEntry...";
+      echo "<br />\ndelate UserEntry...";
-			$SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
+      $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
-				  "WHERE `UID`='". $_POST["enterUID"]. "';";
+          "WHERE `UID`='". $_POST["enterUID"]. "';";
-			$Erg = db_query($SQL3, "delate UserEntry");
+      $Erg = db_query($SQL3, "delate UserEntry");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-		} elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) {
+    } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) {
-			echo "delate Group...";
+      echo "delate Group...";
-			$SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL, "Group delete");
+      $Erg = db_query($SQL, "Group delete");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        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;";
+      $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL2, "User CVS delete");
+      $Erg = db_query($SQL2, "User CVS delete");
-			if ($Erg == 1) {
+      if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
+        echo "&Auml;nderung wurde gesichert...\n";
-			} else {
+      } else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
+      }
-			
+      
-		}
+    }
-		break;
+    break;
-	} // end switch
+  } // end switch
 
 // 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"]) 
+  switch ($_GET["new"]) 
-	{
+  {
-	case "newGroup":
+  case "newGroup":
-		echo "\tGenerate new Group ID...\n";
+    echo "\tGenerate new Group ID...\n";
-		$SQLid="SELECT MIN(`UID`) FROM `UserCVS`;";
+    $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;";
-		$Erg = mysql_query( $SQLid);
+    $Erg = mysql_query( $SQLid);
-		
+    
-		if( mysql_num_rows($Erg) == 1) {
+    if( mysql_num_rows($Erg) == 1) {
-			$NewId = mysql_result( $Erg, 0, 0)-1;
+      $NewId = mysql_result( $Erg, 0, 0)-1;
-			$SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );";
+      $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );";
-			$SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );";
+      $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");
+      $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry");
-			if ($ErgNew1 == 1) 
+      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");
+        $ErgNew2 = db_query($SQLnew2, "UserCVS Entry");
-				if ($ErgNew1 == 1) {
+        if ($ErgNew1 == 1) {
-					echo "\t<br>New group was created.\n";
+          echo "\t<br />New group was created.\n";
-				} else {
+        } else {
-					echo "Error on creation\n(". mysql_error($con). ")";
+          echo "Error on creation\n(". mysql_error($con). ")";
-				}
+        }
-			} else {
+      } else {
-				echo "Error on creation\n(". mysql_error($con). ")";
+        echo "Error on creation\n(". mysql_error($con). ")";
-			}
+      }
 
-		}
+    }
 
-		
+    
-		break;
+    break;
-	}
+  }
 } else {
-	// kein Action gesetzt -> abbruch
+  // 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";
+  $title = "Index";
-$header = "FAQ";
+  $header = "FAQ";
-include ("../../camp2011/includes/header.php");
+  include "../../camp2011/includes/header.php";
 
+  $SQL = "SELECT * FROM `FAQ`";
+  $Erg = mysql_query($SQL, $con);
 
-$SQL = "SELECT * FROM `FAQ`";
+  // anzahl Zeilen
-$Erg = mysql_query($SQL, $con);
+  $Zeilen  = mysql_num_rows($Erg);
 
-// anzahl zeilen
+  for ($n = 0; $n < $Zeilen; $n++) {
-$Zeilen  = mysql_num_rows($Erg);
+    if (mysql_result($Erg, $n, "Antwort") != "") {
-
+      echo "<dl>";
-for ($n = 0 ; $n < $Zeilen ; $n++) {
+      echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
-  if (mysql_result($Erg, $n, "Antwort")!="") {
+      echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
-    echo "<p class='question'>".mysql_result($Erg, $n, "Frage")."</p>";
+      echo "</dl>";
-    echo "<p class='answetion'>".mysql_result($Erg, $n, "Antwort")."</p>";
+    }
   }
-}
 
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-

www-ssl/index.php

@@ -1,19 +1,15 @@
 <?php
-$title = "Index";
+  $title = "Index";
-$header = "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 "<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";
+  $title = "Index";
-$header = "Lageplan";
+  $header = "Lageplan";
-include ("../../camp2011/includes/header.php");
+  include "../../camp2011/includes/header.php";
 
-echo "<p>". Get_Text("lageplan_text1"). "</p>";
+  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...
+  // Die Session zerstoeren...
-session_start();
+  session_start();
-session_destroy ();
+  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();
+  session_start();
-
-header("HTTP/1.1 302 Moved Temporarily");
-header("Location: ". $url. $ENGEL_ROOT);
 
+  header("HTTP/1.1 302 Moved Temporarily");
+  header("Location: " . $url . $ENGEL_ROOT);
 ?>

www-ssl/makeuser.php

@@ -1,214 +1,181 @@
-<?PHP
+<?php
-$title = "Anmeldung zum Chaos-Engel";
+  $title = "Anmeldung zum Chaos-Engel";
-$header = "";
+  $header = "";
-$success = "none"; 
+  $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";
-if( isset($_POST["send"]))
+  include "../../camp2011/includes/header.php";
-{
+  include "../../camp2011/includes/config_db.php";
-	$eNick = trim($_POST["Nick"]);
+  include "../../camp2011/includes/crypt.php";
-	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 ) 
-	{
-		$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 
-	{
-		$_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
-		unset($_POST["Passwort2"]);
 
-		$SQL = "INSERT INTO `User` (".
+  if(isset($_POST["send"])) {
-				"`Nick` , ".	"`Name` , ".
+    $eNick = trim($_POST["Nick"]);
-				"`Vorname`, ".	"`Alter` , ".
-				"`Telefon`, ".	"`DECT`, ".
-				"`Handy`, ".	"`email`, ".
-				"`ICQ`, ".	"`jabber`, ".
-				"`Size`, ".	"`Passwort`, ".
-				"`Art` , ".	"`kommentar`, ".
-				"`Hometown`,".  "`CreateDate` ) ".
-			"VALUES ( ".
-				"'". $_POST["Nick"]. "', ".		"'". $_POST["Name"]. "', ".
-				"'". $_POST["Vorname"]. "', ".		"'". $_POST["Alter"]. "', ".
-				"'". $_POST["Telefon"]. "', ".		"'". $_POST["DECT"]. "', ".
-				"'". $_POST["Handy"]. "', ".		"'". $_POST["email"]. "', ".
-				"'". $_POST["ICQ"]. "', ".		"'". $_POST["jabber"]. "', ".
-				"'". $_POST["Size"]. "', ".		"'". $_POST["Passwort"]. "', ".
-				"'". $_POST["Art"]. "', ".		"'". $_POST["kommentar"]. "', ".
-				"'". $_POST["Hometown"]. "',".		"NOW());";
-		$Erg = mysql_query($SQL, $con);
 
-		if ($Erg != 1)
+    if($_POST["Alter"] == "")
-		{
+      $_POST["Alter"] = 0;
-			echo Get_Text("makeuser_error_write1"). "<br>\n";
-			$error = mysql_error($con);
-		}
-		else
-		{
-			echo "<p class=\"important\">". Get_Text("makeuser_writeOK"). "\n";
 
-			$SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='". $_POST["Nick"]. "';";
+    // user vorhanden?
-			$Erg2 = mysql_query($SQL2, $con);
+    $SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'";
-			$Data = mysql_fetch_array($Erg2);
+    $Ergans = mysql_query($SQLans, $con);
 
-			$SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('". $Data["UID"]. "');";
+    if(strlen($_POST["Nick"]) < 2)
-			$Erg3 = mysql_query($SQL3, $con);
+      $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
-			if ($Erg3 != 1)
+    elseif(mysql_num_rows( $Ergans) > 0)
-			{
+      $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3");
-				echo "<h1>". Get_Text("makeuser_error_write2"). "<br>\n";
+    elseif(strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false)
-				$error = mysql_error($con);
+      $error = Get_Text("makeuser_error_mail");
-			}
+    elseif(!is_numeric($_POST["Alter"]))
-			else
+      $error = Get_Text("makeuser_error_Alter");
-			{
+    elseif($_POST["Passwort"] != $_POST["Passwort2"])
-				echo Get_Text("makeuser_writeOK2"). "<br>\n";
+      $error = Get_Text("makeuser_error_password1");
-				echo "<h1>". Get_Text("makeuser_writeOK3"). "</h1>\n";
+    elseif(strlen($_POST["Passwort"]) < 6)
-			}
+      $error = Get_Text("makeuser_error_password2");
-			echo Get_Text("makeuser_writeOK4"). "</p><p></p>\n<br><br>\n";
+    else {
-			$success="any";
+      $_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
-			
+      unset($_POST["Passwort2"]);
-			if ( isset($SubscribeMailinglist) )
-			{
-				if ( $_POST["subscribe-mailinglist"] == "")
-				{
-					$headers =	"From: ". $_POST["email"]. "\r\n" .
-							"X-Mailer: PHP/" . phpversion();
-					mail( $SubscribeMailinglist, "subject", "message", $headers);
-				}
-			}
 
-		}
+      $SQL = "INSERT INTO `User` (".
-	}
+             "`Nick` , ".  "`Name` , ".
-	if( isset($error) ){
+             "`Vorname`, ".  "`Alter` , ".
-                echo "<p class=\"warning\">\n$error\n</p>\n\n";
+             "`Telefon`, ".  "`DECT`, ".
-	}
+             "`Handy`, ".  "`email`, ".
-}
+             "`ICQ`, ".  "`jabber`, ".
-else
+             "`Size`, ".  "`Passwort`, ".
-{
+             "`Art` , ".  "`kommentar`, ".
-	//init vars
+             "`Hometown`,".  "`CreateDate` ) ".
-	$_POST["Nick"] = "";
+             "VALUES ( ".
-	$_POST["Name"] = "";
+             "'". $_POST["Nick"]. "', ".    "'". $_POST["Name"]. "', ".
-	$_POST["Vorname"] = "";
+             "'". $_POST["Vorname"]. "', ".    "'". $_POST["Alter"]. "', ".
-	$_POST["Alter"] = "";
+             "'". $_POST["Telefon"]. "', ".    "'". $_POST["DECT"]. "', ".
-	$_POST["Telefon"] = "";
+             "'". $_POST["Handy"]. "', ".    "'". $_POST["email"]. "', ".
-	$_POST["DECT"] = "";
+             "'". $_POST["ICQ"]. "', ".    "'". $_POST["jabber"]. "', ".
-	$_POST["Handy"] = "";
+             "'". $_POST["Size"]. "', ".    "'". $_POST["Passwort"]. "', ".
-	$_POST["email"] = "";
+             "'". $_POST["Art"]. "', ".    "'". $_POST["kommentar"]. "', ".
-	$_POST["subscribe-mailinglist"] = "";
+             "'". $_POST["Hometown"]. "',".    "NOW());";
-	$_POST["ICQ"] = "";
+      $Erg = mysql_query($SQL, $con);
-	$_POST["jabber"] = "";
-	$_POST["Size"] = "L";
-	$_POST["Art"] = "";
-	$_POST["kommentar"] = "";
-	$_POST["Hometown"] = "";
-}
 
-if( $success=="none" ){
+      if ($Erg != 1) {
-echo "<h1>".Get_Text("makeuser_text0")."</h1>". "<h2>". Get_Text("makeuser_text1"). "</h2>";
+        echo Get_Text("makeuser_error_write1") . "<br />\n";
-echo "\t<form action=\"\" method=\"post\">\n";
+        $error = mysql_error($con);
-echo "\t\t<table>\n";
+      } else {
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Nickname").
+        echo "<p class=\"important\">" . Get_Text("makeuser_writeOK") . "\n";
-	"*</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"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"". $_POST["Name"]. "\"></td></tr>\n";
-echo "\t\t\t<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_Alter"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></td></tr>\n";
-echo "\t\t\t<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_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 "\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 "\t\t\t<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"". $_POST["ICQ"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"". $_POST["jabber"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_T-Shirt"). 
-	" Gr&ouml;sse*</td><td align=\"left\">\n";
-echo "\t\t\t<select name=\"Size\">\n";
-echo "\t\t\t\t<option value=\"S\"";	if ($_POST["Size"]=="S") 	echo " selected";	echo ">S</option>\n";
-echo "\t\t\t\t<option value=\"M\"";	if ($_POST["Size"]=="M") 	echo " selected";	echo ">M</option>\n";
-echo "\t\t\t\t<option value=\"L\"";	if ($_POST["Size"]=="L") 	echo " selected";	echo ">L</option>\n";
-echo "\t\t\t\t<option value=\"XL\"";	if ($_POST["Size"]=="XL") 	echo " selected";	echo ">XL</option>\n";
-echo "\t\t\t\t<option value=\"2XL\"";	if ($_POST["Size"]=="2XL") 	echo " selected";	echo ">2XL</option>\n";
-echo "\t\t\t\t<option value=\"3XL\"";	if ($_POST["Size"]=="3XL") 	echo " selected";	echo ">3XL</option>\n";
-echo "\t\t\t\t<option value=\"4XL\"";	if ($_POST["Size"]=="4XL") 	echo " selected";	echo ">4XL</option>\n";
-echo "\t\t\t\t<option value=\"5XL\"";	if ($_POST["Size"]=="5XL") 	echo " selected";	echo ">5XL</option>\n";
-echo "\t\t\t\t<option value=\"S-G\"";	if ($_POST["Size"]=="S-G") 	echo " selected";	echo ">S 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 "\t\t\t\t<option value=\"L-G\"";	if ($_POST["Size"]=="L-G") 	echo " selected";	echo ">L Girl</option>\n";
-echo "\t\t\t\t<option value=\"XL-G\"";	if ($_POST["Size"]=="XL-G") 	echo " selected";	echo ">XL Girl</option>\n";
-echo "\t\t\t</select>\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++ )
-{
-	$Name = mysql_result($Erg, $t, "Name"). Get_Text("inc_schicht_engel");
-	echo "\t\t\t\t<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 "\t\t\t</tr>\n";
-echo "\t\t\t<tr>\n";
-echo "\t\t\t\t<td>". Get_Text("makeuser_text2"). "</td>\n";
-echo "\t\t\t<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
-echo "\t\t\t</tr>\n";
-echo "\t\t\t<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"). 
-	"*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Passwort2"). 
-	"*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
-echo "\t\t\t<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". 
-	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");
+        $SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "';";
+        $Erg2 = mysql_query($SQL2, $con);
+        $Data = mysql_fetch_array($Erg2);
+
+        $SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('" . $Data["UID"] . "');";
+        $Erg3 = mysql_query($SQL3, $con);
+
+        if ($Erg3 != 1) {
+          echo "<h1>". Get_Text("makeuser_error_write2"). "<br />\n";
+          $error = mysql_error($con);
+        } else {
+          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";
+        $success = "any";
+
+        if (isset($SubscribeMailinglist)) {
+          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";
+  } else {
+    // init vars
+    $_POST["Nick"] = "";
+    $_POST["Name"] = "";
+    $_POST["Vorname"] = "";
+    $_POST["Alter"] = "";
+    $_POST["Telefon"] = "";
+    $_POST["DECT"] = "";
+    $_POST["Handy"] = "";
+    $_POST["email"] = "";
+    $_POST["subscribe-mailinglist"] = "";
+    $_POST["ICQ"] = "";
+    $_POST["jabber"] = "";
+    $_POST["Size"] = "L";
+    $_POST["Art"] = "";
+    $_POST["kommentar"] = "";
+    $_POST["Hometown"] = "";
+  }
+
+  if($success == "none") {
+    echo "<h1>" . Get_Text("makeuser_text0") . "</h1>\n";
+    echo "<h2>" . Get_Text("makeuser_text1") . "</h2>\n";
+    echo "<form action=\"\" method=\"post\">\n";
+    echo "<table>\n";
+    echo "<tr><td>" . Get_Text("makeuser_Nickname") . "*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"" . $_POST["Nick"] . "\" /></td></tr>\n";
+    echo "<tr><td>" . Get_Text("makeuser_Nachname") . "</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 "<tr><td>". Get_Text("makeuser_Alter") . "</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></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 "<tr><td>". Get_Text("makeuser_DECT"). "</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"". $_POST["DECT"]. "\"></td><td>\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 "<tr><td>". Get_Text("makeuser_Handy"). "</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"". $_POST["Handy"]. "\"></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";
+
+    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 "<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 "<tr><td>". Get_Text("makeuser_T-Shirt"). " Gr&ouml;sse*</td><td align=\"left\">\n";
+    echo "<select name=\"Size\">\n";
+    echo "<option value=\"S\"";  if ($_POST["Size"]=="S")   echo " selected";  echo ">S</option>\n";
+    echo "<option value=\"M\"";  if ($_POST["Size"]=="M")   echo " selected";  echo ">M</option>\n";
+    echo "<option value=\"L\"";  if ($_POST["Size"]=="L")   echo " selected";  echo ">L</option>\n";
+    echo "<option value=\"XL\"";  if ($_POST["Size"]=="XL")   echo " selected";  echo ">XL</option>\n";
+    echo "<option value=\"2XL\"";  if ($_POST["Size"]=="2XL")   echo " selected";  echo ">2XL</option>\n";
+    echo "<option value=\"3XL\"";  if ($_POST["Size"]=="3XL")   echo " selected";  echo ">3XL</option>\n";
+    echo "<option value=\"4XL\"";  if ($_POST["Size"]=="4XL")   echo " selected";  echo ">4XL</option>\n";
+    echo "<option value=\"5XL\"";  if ($_POST["Size"]=="5XL")   echo " selected";  echo ">5XL</option>\n";
+    echo "<option value=\"S-G\"";  if ($_POST["Size"]=="S-G")   echo " selected";  echo ">S Girl</option>\n";
+    echo "<option value=\"M-G\"";  if ($_POST["Size"]=="M-G")   echo " selected";  echo ">M Girl</option>\n";
+    echo "<option value=\"L-G\"";  if ($_POST["Size"]=="L-G")   echo " selected";  echo ">L Girl</option>\n";
+    echo "<option value=\"XL-G\"";  if ($_POST["Size"]=="XL-G")   echo " selected";  echo ">XL Girl</option>\n";
+    echo "</select>\n";
+    echo "</td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Engelart"). "</td><td align=\"left\">\n";
+    echo "<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++) {
+      $Name = mysql_result($Erg, $t, "Name"). Get_Text("inc_schicht_engel");
+      echo "<option value=\"" . $Name . "\"";
+
+      if($_POST["Art"]==$Name)
+        echo " selected"; 
+
+      echo ">$Name</option>\n";
+    }
+
+    echo "</select>\n";
+    echo "</td>\n";
+    echo "</tr>\n";
+    echo "<tr>\n";
+    echo "<td>". Get_Text("makeuser_text2"). "</td>\n";
+    echo "<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
+    echo "</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 "<tr><td>". Get_Text("makeuser_Passwort"). "*</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 "<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". Get_Text("makeuser_Anmelden"). "\"/></td></tr>\n";
+    echo "</table>\n";
+    echo "</form>\n";
+    Print_Text("makeuser_text3");
+  }
+
+  include "../../camp2011/includes/footer.php";
 ?>
-

www-ssl/nonpublic/auth.php

@@ -1,66 +1,32 @@
-<?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'];
+  $User = $_POST['user'];
-$Pass = $_POST['pw'];
+  $Pass = $_POST['pw'];
-$SourceOuth = $_POST['so'];
+  $SourceOuth = $_POST['so'];
 
-/*
+  if(isset($CurrentExternAuthPass) && $SourceOuth == $CurrentExternAuthPass) {
-$User = $_GET['user'];
+    $sql = "SELECT * FROM `User` WHERE `Nick`='" . $User . "'";
-$Pass = $_GET['pw'];
+    $Erg = mysql_query($sql, $con);
-$SourceOuth = $_GET['so'];
-*/
 
-/*
+    if(mysql_num_rows($Erg) == 1) {
-$User = "admin";
+      if(mysql_result($Erg, 0, "Passwort") == $Pass) {
-$Pass = "21232f297a57a5a743894a0e4a801fc3"; // "admin";
+        $UID = mysql_result($Erg, 0, "UID");
-$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) 
-	{ // Check, ob User angemeldet wird...
-		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
-			$SQL = "SELECT * FROM `UserCVS` WHERE `UID`='". $UID. "'";
-			$Erg_CVS =  mysql_query($SQL, $con);
-			$CVS = mysql_fetch_array($Erg_CVS);
-			
-			$msg = array( 
-					'status' => 'success',
-					'rights' => $CVS
-					);
-			echo json_encode($msg);
-			
-		} 
-		else 
-		{
-			echo json_encode(array('status' => 'failed'));
-		}
-	} 
-	else 
-	{
-		echo json_encode(array('status' => 'failed'));
-	}
-} 
-else 
-{
-	echo json_encode(array('status' => 'failed'));
-}
 
+        // get CVS import Data
+        $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $UID . "'";
+        $Erg_CVS =  mysql_query($SQL, $con);
+        $CVS = mysql_fetch_array($Erg_CVS);
 
+        $msg = array('status' => 'success', 'rights' => $CVS);
+        echo json_encode($msg);
+      } else
+        echo json_encode(array('status' => 'failed'));
+    } else
+      echo json_encode(array('status' => 'failed'));
+  } else
+    echo json_encode(array('status' => 'failed'));
 ?>
-
-

www-ssl/nonpublic/einstellungen.php

@@ -1,360 +1,377 @@
-<?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/crypt.php";
-$title = "Himmel";
-$header = "Deine pers&ouml;nlichen Einstellungen";
-include ("../../../camp2011/includes/header.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);
-	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">
+  <input type="hidden" name="action" value="setUserData">
-	<table>
+  <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><select name="Sizeid">
+      <td><?php Print_Text("makeuser_T-Shirt"); ?></td>
-        	         	<option <?php if($_SESSION['Size'] == 'S') { echo "selected"; } ?> value="S">S</option>
+      <td><select name="Sizeid">
-                		<option <?php if($_SESSION['Size'] == 'M') { echo "selected"; } ?> value="M">M</option>
+        <option <?php if($_SESSION['Size'] == 'S') { echo "selected"; } ?> value="S">S</option>
-                        	<option <?php if($_SESSION['Size'] == 'L') { echo "selected"; } ?> value="L">L</option>
+        <option <?php if($_SESSION['Size'] == 'M') { echo "selected"; } ?> value="M">M</option>
-                        	<option <?php if($_SESSION['Size'] == 'XL') { echo "selected"; } ?> value="XL">XL</option>
+        <option <?php if($_SESSION['Size'] == 'L') { echo "selected"; } ?> value="L">L</option>
-                        	<option <?php if($_SESSION['Size'] == 'XXL') { echo "selected"; } ?> value="XXL">XXL</option>
+        <option <?php if($_SESSION['Size'] == 'XL') { echo "selected"; } ?> value="XL">XL</option>
-                        	<option <?php if($_SESSION['Size'] == 'XXXL') { echo "selected"; } ?> value="XXXL">XXXL</option>
+        <option <?php if($_SESSION['Size'] == 'XXL') { echo "selected"; } ?> value="XXL">XXL</option>
-	                </select></td></tr>
+        <option <?php if($_SESSION['Size'] == 'XXXL') { echo "selected"; } ?> value="XXXL">XXXL</option>
-<?PHP
+      </select></td>
+    </tr>
+<?php
 }
 ?>
-	</table>
+  </table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
+<br />
-
-
-<hr width=\"100%\">
-<?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(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>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
-</form>
-<br>
-
 
 <hr width="100%">
-<br>
+<?php Print_Text(14); ?>
-<?PHP Print_Text(18); ?>
 <form action="./einstellungen.php" method="post">
-        <input type="hidden" name="action" value="colour">
+  <input type="hidden" name="action" value="set">
-	<table>
+  <table>
-	   <tr><td><?PHP Print_Text(19); ?></td>
+    <tr><td><?php Print_Text(15); ?></td><td><input type="password" name="old" size="20"></td></tr>
-	   <td>
+    <tr><td><?php Print_Text(16); ?></td><td><input type="password" name="new1" size="20"></td></tr>
-		<select name="colourid">
+    <tr><td><?php Print_Text(17); ?></td><td><input type="password" name="new2" size="20"></td></tr>
-			<option <?php if($_SESSION['color'] == 1) { echo "selected"; } ?> value="1">Standard-Style</option>
+  </table>
-			<option <?php if($_SESSION['color'] == 2) { echo "selected"; } ?> value="2">Rot/Gelber Style</option>
+  <input type="submit" value="<?php Print_Text("save"); ?>">
-			<option <?php if($_SESSION['color'] == 3) { echo "selected"; } ?> value="3">Club-Mate Style</option>
-			<option <?php if($_SESSION['color'] == 5) { echo "selected"; } ?> value="5">Debian Style</option>
-			<option <?php if($_SESSION['color'] == 6) { echo "selected"; } ?> value="6">c-base Style</option>
-			<option <?php if($_SESSION['color'] == 7) { echo "selected"; } ?> value="7">Blau/Gelber Style </option>
-			<option <?php if($_SESSION['color'] == 8) { echo "selected"; } ?> value="8">Pastel Style</option>
-			<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>
-	   <tr><td>Menu</td>
-	   	<td><input type="radio" name="eMenu" value="L"<?PHP 
-			if ($_SESSION['Menu']=='L') echo " checked"; ?>>L
-		    <input type="radio" name="eMenu" value="R"<?PHP
-			if ($_SESSION['Menu']=='R') echo " checked"; ?>>R
-	   	</td></tr>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
 </form>
-<br>
+<br />
+
 <hr width="100%">
-<br>
+<br />
-<?PHP Print_Text(20); ?>
+<?php Print_Text(18); ?>
 <form action="./einstellungen.php" method="post">
-        <input type="hidden" name="action" value="sprache">
+  <input type="hidden" name="action" value="colour">
-	<table>
+  <table>
-	   <tr><td><?PHP Print_Text(21); ?></td>
+     <tr>
-	   <td>
+       <td><?php Print_Text(19); ?></td>
-		<select name="language">
+       <td>
-		   <option value="DE" <?php if($_SESSION['Sprache'] == 'DE') { echo "selected"; } ?>>Deutsch</option>
+         <select name="colourid">
-		   <option value="EN" <?php if($_SESSION['Sprache'] == 'EN') { echo "selected"; } ?>>English</option>
+           <option <?php if($_SESSION['color'] == 1) { echo "selected"; } ?> value="1">Standard-Style</option>
-<?PHP /*		   <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */?>
+           <option <?php if($_SESSION['color'] == 2) { echo "selected"; } ?> value="2">Rot/Gelber Style</option>
-		</select>
+           <option <?php if($_SESSION['color'] == 3) { echo "selected"; } ?> value="3">Club-Mate Style</option>
-	   </td></tr>
+           <option <?php if($_SESSION['color'] == 5) { echo "selected"; } ?> value="5">Debian Style</option>
-	</table>
+           <option <?php if($_SESSION['color'] == 6) { echo "selected"; } ?> value="6">c-base Style</option>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+           <option <?php if($_SESSION['color'] == 7) { echo "selected"; } ?> value="7">Blau/Gelber Style </option>
+           <option <?php if($_SESSION['color'] == 8) { echo "selected"; } ?> value="8">Pastel Style</option>
+           <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>
+     <tr>
+       <td>Menu</td>
+       <td><input type="radio" name="eMenu" value="L"<?php if($_SESSION['Menu'] == 'L') echo " checked"; ?>>L
+           <input type="radio" name="eMenu" value="R"<?php if($_SESSION['Menu'] == 'R') echo " checked"; ?>>R
+       </td>
+     </tr>
+  </table>
+  <input type="submit" value="<?php Print_Text("save"); ?>">
+</form>
+<br />
+<hr width="100%">
+<br />
+<?php Print_Text(20); ?>
+<form action="./einstellungen.php" method="post">
+  <input type="hidden" name="action" value="sprache" />
+  <table>
+  <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>  */ ?>
+      </select>
+    </td></tr>
+  </table>
+  <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 "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
+    echo "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
-		echo "\t<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
+    echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
-		echo "\t<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
+    echo "(max ". get_cfg_var("post_max_size"). "Byte)<br />\n";
-		echo "\t(max ". get_cfg_var("post_max_size"). "Byte)<br>\n";
+    echo "<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
-		echo "\t<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
+    echo "</form>\n";
-		echo "</form>\n";
-	}
-
-	switch( GetPicturShow( $_SESSION['UID']))
-	{
-		case 'Y':
-			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 "\t<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
-			echo "</form>\n";
-			break;
-		case 'N':
-			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 "\t<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
-			echo "</form>\n";
-			echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
-		case '':	
-			echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
-			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 "\t<table>\n";
-			echo "\t\t<tr>\n\t\t\t<td>". Get_Text(23). "<br></td>\n\t\t</tr>\n";
-			echo "\t\t<tr>\n";
-			echo "\t\t\t<td>\n";
-		    	echo "\t\t\t\t<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"; 
-			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 "\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 "\t\t\t</td>\n\t\t</tr>\n";
-			echo "\t</table>\n";
-			echo "\t<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"]). "' ".
-                " WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-		$Erg = mysql_query($usql, $con);
-		if ($Erg==1) {
-			Print_Text(28);
-		} else {
-			Print_Text(29);
-		}		
-	} else {
-		Print_Text(30);
-	}
-  } else {
-	Print_Text(31);
   }
-	break;
 
-case 'colour':
+  switch( GetPicturShow( $_SESSION['UID'])) {
+    case 'Y':
+      echo Get_Text('pub_einstellungen_PictureShow'). "<br />";
+      echo displayPictur($_SESSION['UID'], 0);
+      echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
+      echo "</form>\n";
+      break;
+    case 'N':
+      echo Get_Text('pub_einstellungen_PictureNoShow'). "<br />";
+      echo displayPictur($_SESSION['UID'], 0);
+      echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
+      echo "</form>\n";
+      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+    case '':  
+      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+      echo Get_Text(22). "<br />"; 
+      echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
+      echo "<table>\n";
+      echo "<tr>\n<td>". Get_Text(23). "<br /></td>\n</tr>\n";
+      echo "<tr>\n";
+      echo "<td>\n";
+      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"; 
 
-	$chsql="UPDATE `User` SET ".
+      for($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
-		"`color`= '". $_POST["colourid"]. "', ".
+        echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
-		"`Menu`= '". $_POST["eMenu"]. "' ".
+
-		"WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+      echo "</select>&nbsp;&nbsp;\n";
-	$Erg = mysql_query($chsql, $con);
+      echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
-	echo mysql_error($con);
+      echo "</td>\n</tr>\n";
-	$_SESSION['color']=$_POST["colourid"];
+      echo "</table>\n";
-	$_SESSION['Menu']=$_POST["eMenu"];
+      echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
-	if ($Erg==1) {
+      echo "</form>\n";
-		Print_Text(32);
+      break;
-	} else {
+  } //CASE
-		Print_Text(29);
+
-	}
+  } else {
-	break;
+    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"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+           $Erg = mysql_query($usql, $con);
+
+           if ($Erg==1) {
+             Print_Text(28);
+           } else {
+             Print_Text(29);
+           }
+         } else {
+           Print_Text(30);
+         }
+       } else {
+         Print_Text(31);
+       }
+    break;
+
+    case 'colour':
+
+  $chsql="UPDATE `User` SET ".
+    "`color`= '". $_POST["colourid"]. "', ".
+    "`Menu`= '". $_POST["eMenu"]. "' ".
+    "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $Erg = mysql_query($chsql, $con);
+  echo mysql_error($con);
+  $_SESSION['color']=$_POST["colourid"];
+  $_SESSION['Menu']=$_POST["eMenu"];
+  if ($Erg==1) {
+    Print_Text(32);
+  } else {
+    Print_Text(29);
+  }
+  break;
 
 case 'sprache':
 
-	$chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-	$Erg = mysql_query($chsql, $con);
+  $Erg = mysql_query($chsql, $con);
-	$_SESSION['Sprache']=$_POST["language"];
+  $_SESSION['Sprache']=$_POST["language"];
-	if ($Erg==1) {
+  if ($Erg==1) {
-		Print_Text(33);
+    Print_Text(33);
-	} else {
+  } else {
-		Print_Text(29);
+    Print_Text(29);
-	}
+  }
-	break;
+  break;
 
 case 'avatar':
-	$chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
         $Erg = mysql_query($chsql, $con);
-	$_SESSION['Avatar']=$_POST["eAvatar"];
+  $_SESSION['Avatar']=$_POST["eAvatar"];
-	if ($Erg==1)
+  if ($Erg==1)
-		Print_Text(34);
+    Print_Text(34);
         else
-		Print_Text(29);
+    Print_Text(29);
         break;
 
 case 'setUserData':
-	if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
+  if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-	{
+  {
-		$chsql= "UPDATE `User` SET ".
+    $chsql= "UPDATE `User` SET ".
-			"`Nick`='".     $_POST["eNick"].	"', `Name`='".   $_POST["eName"].  "', ".
+      "`Nick`='".     $_POST["eNick"].  "', `Name`='".   $_POST["eName"].  "', ".
-			"`Vorname`='".  $_POST["eVorname"].	"', `Alter`='".  $_POST["eAlter"]. "', ".
+      "`Vorname`='".  $_POST["eVorname"].  "', `Alter`='".  $_POST["eAlter"]. "', ".
-			"`Telefon`='".  $_POST["eTelefon"].	"', `Handy`='".  $_POST["eHandy"]. "', ".
+      "`Telefon`='".  $_POST["eTelefon"].  "', `Handy`='".  $_POST["eHandy"]. "', ".
-			"`DECT`='".     $_POST["eDECT"]. 	"', `email`='".  $_POST["eemail"]. "', ".
+      "`DECT`='".     $_POST["eDECT"].   "', `email`='".  $_POST["eemail"]. "', ".
-			"`ICQ`='".      $_POST["eICQ"].		"', `jabber`='". $_POST["ejabber"]."', ".
+      "`ICQ`='".      $_POST["eICQ"].    "', `jabber`='". $_POST["ejabber"]."', ".
-			"`Hometown`='". $_POST["Hometown"].	"', `Size`='".   $_POST["Sizeid"]. "' ".
+      "`Hometown`='". $_POST["Hometown"].  "', `Size`='".   $_POST["Sizeid"]. "' ".
-			"WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
+      "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-	}
+  }
-	else
+  else
-	{
+  {
-		$chsql= "UPDATE `User` SET ".
+    $chsql= "UPDATE `User` SET ".
-			"`Nick`='".     $_POST["eNick"].	"', `Name`='".   $_POST["eName"].  "', ".
+      "`Nick`='".     $_POST["eNick"].  "', `Name`='".   $_POST["eName"].  "', ".
-			"`Vorname`='".  $_POST["eVorname"].	"', `Alter`='".  $_POST["eAlter"]. "', ".
+      "`Vorname`='".  $_POST["eVorname"].  "', `Alter`='".  $_POST["eAlter"]. "', ".
-			"`Telefon`='".  $_POST["eTelefon"].	"', `Handy`='".  $_POST["eHandy"]. "', ".
+      "`Telefon`='".  $_POST["eTelefon"].  "', `Handy`='".  $_POST["eHandy"]. "', ".
-			"`DECT`='".     $_POST["eDECT"]. 	"', `email`='".  $_POST["eemail"]. "', ".
+      "`DECT`='".     $_POST["eDECT"].   "', `email`='".  $_POST["eemail"]. "', ".
-			"`ICQ`='".      $_POST["eICQ"].		"', `jabber`='". $_POST["ejabber"]."', ".
+      "`ICQ`='".      $_POST["eICQ"].    "', `jabber`='". $_POST["ejabber"]."', ".
-			"`Hometown`='". $_POST["Hometown"].	"' ".
+      "`Hometown`='". $_POST["Hometown"].  "' ".
-			"WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
+      "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-	}
+  }
         $Erg = mysql_query($chsql, $con);
 
-	if ($Erg==1) 
+  if ($Erg==1) 
-	{
+  {
-		$_SESSION['Nick'] = $_POST["eNick"];
+    $_SESSION['Nick'] = $_POST["eNick"];
-		$_SESSION['Name'] = $_POST["eName"];
+    $_SESSION['Name'] = $_POST["eName"];
-		$_SESSION['Vorname'] = $_POST["eVorname"];
+    $_SESSION['Vorname'] = $_POST["eVorname"];
-		$_SESSION['Alter'] = $_POST["eAlter"];
+    $_SESSION['Alter'] = $_POST["eAlter"];
-		$_SESSION['Telefon'] = $_POST["eTelefon"];
+    $_SESSION['Telefon'] = $_POST["eTelefon"];
-		$_SESSION['Handy'] = $_POST["eHandy"];
+    $_SESSION['Handy'] = $_POST["eHandy"];
-		$_SESSION['DECT'] = $_POST["eDECT"];
+    $_SESSION['DECT'] = $_POST["eDECT"];
-		$_SESSION['email'] = $_POST["eemail"];
+    $_SESSION['email'] = $_POST["eemail"];
-		$_SESSION['ICQ'] = $_POST["eICQ"];
+    $_SESSION['ICQ'] = $_POST["eICQ"];
-		$_SESSION['jabber'] = $_POST["ejabber"];
+    $_SESSION['jabber'] = $_POST["ejabber"];
-		$_SESSION['Hometown'] = $_POST["Hometown"];
+    $_SESSION['Hometown'] = $_POST["Hometown"];
-		if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
+    if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-		{
+    {
-			$_SESSION['Size']=$_POST["Sizeid"];		
+      $_SESSION['Size']=$_POST["Sizeid"];    
-		}
+    }
-		else if( $_SESSION['Size'] != $_POST["Sizeid"]) 
+    else if( $_SESSION['Size'] != $_POST["Sizeid"]) 
-		{
+    {
-			array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
+      array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
-		}
+    }
 
-	
+  
-		Print_Text("pub_einstellungen_UserDateSaved");
+    Print_Text("pub_einstellungen_UserDateSaved");
         } 
-	else
+  else
-	{
+  {
-		Print_Text(29);
+    Print_Text(29);
-		echo mysql_error( $con);
+    echo mysql_error( $con);
-	}
+  }
-	break;
+  break;
 
 case 'sendPicture':
-	if( $_FILES["file"]["size"] > 0)
+  if( $_FILES["file"]["size"] > 0)
-	{
+  {
-	  if( ($_FILES["file"]["type"] == "image/jpeg") || 
+    if( ($_FILES["file"]["type"] == "image/jpeg") || 
-	      ($_FILES["file"]["type"] == "image/png")  ||
+        ($_FILES["file"]["type"] == "image/png")  ||
-	      ($_FILES["file"]["type"] == "image/gif")  )
+        ($_FILES["file"]["type"] == "image/gif")  )
-	  {		
+    {    
-		$data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
+    $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
 
-		if( GetPicturShow( $_SESSION['UID']) == "")
+    if( GetPicturShow( $_SESSION['UID']) == "")
-			$SQL = "INSERT INTO `UserPicture` ".
+      $SQL = "INSERT INTO `UserPicture` ".
-				"( `UID`,`Bild`, `ContentType`, `show`) ".
+        "( `UID`,`Bild`, `ContentType`, `show`) ".
-				"VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
+        "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
-		else
+    else
-			$SQL = "UPDATE `UserPicture` SET ".
+      $SQL = "UPDATE `UserPicture` SET ".
-				"`Bild`='$data', ".
+        "`Bild`='$data', ".
-				"`ContentType`='". $_FILES["file"]["type"]. "', ".
+        "`ContentType`='". $_FILES["file"]["type"]. "', ".
-				"`show`='N' ".
+        "`show`='N' ".
-				"WHERE `UID`='". $_SESSION['UID']. "'";
+        "WHERE `UID`='". $_SESSION['UID']. "'";
-		
+    
-		$res = mysql_query( $SQL, $con);
+    $res = mysql_query( $SQL, $con);
-		if( $res)
+    if( $res)
-			Print_Text("pub_einstellungen_send_OK");
+      Print_Text("pub_einstellungen_send_OK");
-		else
+    else
-			Print_Text("pub_einstellungen_send_KO");
+      Print_Text("pub_einstellungen_send_KO");
-	
+  
-		echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)</h6>";
+    echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)</h6>";
-	  }
+    }
-	  else
+    else
-		Print_Text("pub_einstellungen_send_KO");	
+    Print_Text("pub_einstellungen_send_KO");  
-	}
+  }
-	else
+  else
-		Print_Text("pub_einstellungen_send_KO");	
+    Print_Text("pub_einstellungen_send_KO");  
-	break;
+  break;
 
 case 'delPicture':
-	$chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
         $Erg = mysql_query($chsql, $con);
-	if ($Erg==1)
+  if ($Erg==1)
-		Print_Text("pub_einstellungen_del_OK");
+    Print_Text("pub_einstellungen_del_OK");
         else
-		Print_Text("pub_einstellungen_del_KO");
+    Print_Text("pub_einstellungen_del_KO");
-	Break;
+  Break;
 }
 }
 include ("../../../camp2011/includes/footer.php");

www-ssl/nonpublic/engelbesprechung.php

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

www-ssl/nonpublic/faq.php

@@ -1,35 +1,32 @@
 <?php
-$title = "Himmel";
+  $title = "Himmel";
-$header = "FAQ / Fragen an die Erzengel";
+  $header = "FAQ / Fragen an die Erzengel";
-include ("../../../camp2011/includes/header.php");
+  include "../../../camp2011/includes/header.php";
 
-
+  // Erstaufruf, oder Frage bereits abgeschickt?
-// Erstaufruf, oder Frage bereits abgeschickt?
+  if(!isset($_POST["eUID"])) {
-if (!IsSet($_POST["eUID"])) 
+    Print_Text(35);
-{
-	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);
@@ -38,19 +35,19 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 
 if ($Zeilen==0){
-	Print_Text(41);
+  Print_Text(41);
 
 } else {
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
+  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 "<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);
 
@@ -58,14 +55,14 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 
 if ($Zeilen==0){
-	Print_Text(41);
+  Print_Text(41);
 } else {
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
+  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")).
+    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer")).
-	  	"@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n";
+      "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n";
-	  echo "\n<br>---<br>";
+    echo "\n<br />---<br />";
-	}
+  }
 }
 
 include ("../../../camp2011/includes/footer.php");