cleanup from old files

27 files changed, 0 insertions, 4499 deletions

diff --git a/includes_old/error_handler.php b/includes_old/error_handler.php
deleted file mode 100644
index 42e561fc..00000000
--- a/includes_old/error_handler.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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) {
-    global $error_messages, $con;
-
-    // SQL error genauer analysiert
-    $Temp = "";
-    foreach ($error_context as $k => $v)
-      if((strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0))
-        $Temp .= "Error Context: $k = $v\n";
-
-    if((strpos( "0$error_string", "MySQL") > 0))
-      $Temp .= "Error MySQL: ". mysql_error($con). "\n";
-
-    // Uebergeben des arrays
-    array_push($error_messages, "Error Number: " . $error_number . "\n".
-         "Error String: " . $error_string . "\n".
-         "Error File: " . $error_file . "\n".
-         "Error Line: " . $error_line . "\n".
-         (strlen($Temp)? "$Temp": ""));
-  }
-
-  // register error handler
-  set_error_handler("Error_Handler");
-
-  error_reporting(E_ALL);
-
-  if($debug) {
-    ini_set("display_errors", "On");
-    ini_set("display_startup_errors", "On");
-    ini_set("html_errors", "On");
-  }
-  
-  // send errors 
-  function send_errors() {
-    global $error_messages;
-
-    if(!$error_messages)
-      return;
-
-    $message = "";
-    foreach($error_messages as $value)
-      $message .= $value."\n";
-
-    $message .= "\n";
-
-    if(isset($_POST)) {
-      foreach ($_POST as $k => $v)
-          $message .= "_POST: $k = ". ( $k!="password"? $v : "???..."). "\n"; 
-
-      $message .= "\n";
-    }
-
-    if(isset($_GET)) {
-      foreach ($_GET as $k => $v)
-        $message .= "_GET: $k = $v\n";
-
-      $message .= "\n";
-    }
-
-    $message .= "\n\n";
-    
-    if( isset( $_SESSION))
-    {
-      foreach ($_SESSION as $k => $v )    
-        $message .= "_SESSION: $k = $v\n"; 
-      $message .= "\n";
-    }
-    
-    if( isset( $_SESSION['CVS']))
-    {
-      foreach ($_SESSION['CVS'] as $k => $v )    
-        if( strlen($k)>3 ) 
-          $message .= "_SESSION['CVS']: $k = $v\n"; 
-      $message .= "\n";
-    }
-
-    foreach ($_SERVER as $k => $v )    
-      if( strpos( "0$k", "SERVER_")==0)
-          $message .= "_SERVER: $k = $v\n"; 
-
-    send_message($message);
-
-    // display error messages on screen too for developers
-    if ($_SESSION['CVS']['admin/debug.php']=='Y') 
-    {
-      echo "<pre id='error'>\n".$message."</pre>";
-    }
-
-}
-
-  register_shutdown_function("send_errors");
-
-  // send jabber message and email
-  function send_message(&$message)
-  {
-    chdir(dirname(__FILE__));
-    require_once('../config/config_jabber.php');
-
-    if (isset($jabber_recipient) && count($jabber_recipient)) {
-      $jabber = new Jabber($server, $port, $username, $password, $resource);
-      if ($jabber->Connect() && $jabber->SendAuth()) {
-        foreach($jabber_recipient as $value)
-        {
-          $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL);
-        }
-        $jabber->Disconnect();
-      } else {
-        array_push($message, "Couldn't connect to Jabber Server.");
-      }
-    }
-
-    if (isset($mail_recipient) && count($mail_recipient)) {
-      foreach($mail_recipient as $to) {
-        mail($to, isset($mail_subject) ? $mail_subject : "Pentabarf Error", $message);
-      }
-    }
-  }
-
-?>
diff --git a/includes_old/funktion_SendMessenges.php b/includes_old/funktion_SendMessenges.php
deleted file mode 100644
index b6de67cc..00000000
--- a/includes_old/funktion_SendMessenges.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-  function SendData($Data) {
-    include "config_MessegeServer.php";
-    // Create a UDP socket
-    $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-
-    //send packed
-    socket_sendto($sock, $Data, 9999, 0x4, SERVER_ADDRESS, SERVER_PORT);
-  }
-
-  function SendMessageJabber($Adresse, $Nachricht) {
-    SendData( "#message $Adresse $Nachricht");
-  }
-?>
diff --git a/includes_old/funktion_cron.php b/includes_old/funktion_cron.php
deleted file mode 100644
index 3a0e984b..00000000
--- a/includes_old/funktion_cron.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-  function UID2DECT($UID) {
-    global $con;
-    $SQL = "SELECT DECT FROM `User` WHERE UID='$UID'";
-    $Erg = mysql_query($SQL, $con);
-
-    if(mysql_num_rows( $Erg) == 1)
-      return mysql_result($Erg, 0);
-    else
-      return "";
-  }
-
-  function RID2Room($RID) {
-    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) {
-    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) {
-    global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT, $Tempdir, $AsteriskOutputDir;
-  
-    // Parameter verarbeiten
-    $TimeH = substr( $Time, 11, 2);
-    $TimeM = substr( $Time, 14, 2);
-    $TimeM = substr( $Time, 14, 2) + $AnrufDelay;
-
-    if($TimeM < 0) {
-      $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 = "";
-        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);
-  }
-?>
diff --git a/includes_old/funktion_db.php b/includes_old/funktion_db.php
deleted file mode 100644
index ffd7d6a2..00000000
--- a/includes_old/funktion_db.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-  if( !function_exists("db_query")) {
-    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) {
-      $Gefunden = false;
-
-      $Diff  = "\n<table border=1>\n";
-      $Diff .= "<tr>\n<th>Feldname</th>\n<th>old Value</th>\n<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<td>$key</td>\n<td>$value</td>\n<td>" . $Data2[$key] . "</rd>\n</tr>";
-          }
-        } else
-          foreach($Data1 as $key => $value) {
-            $Gefunden = true;
-            $Diff .= "<tr>\n<td>$key</td>\n<td>$value</td>\n<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(
-}
-
-?>
diff --git a/includes_old/funktion_db_list.php b/includes_old/funktion_db_list.php
deleted file mode 100644
index 35bb7255..00000000
--- a/includes_old/funktion_db_list.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-
-// Gibt eine Tabelle generisch als HTML aus
-function funktion_db_list($Table_Name) {
-	global $con;
-
-	$html = "";
-
-	$SQL = "SELECT * FROM `" . $Table_Name . "`";
-	$Erg = mysql_query($SQL, $con);
-
-	// anzahl zeilen
-	$Zeilen = mysql_num_rows($Erg);
-
-	$Anzahl_Felder = mysql_num_fields($Erg);
-
-	$html .= "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">";
-	$html .= "<caption>DB: $Table_Name</caption>";
-
-	$html .= "<tr class=\"contenttopic\">";
-	for ($m = 0; $m < $Anzahl_Felder; $m++) {
-		$html .= "<th>" . mysql_field_name($Erg, $m) . "</th>";
-	}
-	$html .= "</tr>";
-
-	for ($n = 0; $n < $Zeilen; $n++) {
-		$html .= "<tr class=\"content\">";
-		for ($m = 0; $m < $Anzahl_Felder; $m++) {
-			$html .= "<td>" . mysql_result($Erg, $n, $m) . "</td>";
-		}
-		$html .= "</tr>";
-	}
-	$html .= "</table>";
-	return $html;
-}
-
-function funktion_db_element_list_2row($TopicName, $SQL) {
-	$html = "";
-	$html .= "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	$html .= "<caption>$TopicName</caption>";
-	#  $html .= "<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
-
-	$Erg = sql_query($SQL);
-
-	$html .= "<tr class=\"contenttopic\">";
-	for ($m = 0; $m < mysql_num_fields($Erg); $m++) {
-		$html .= "<th>" . mysql_field_name($Erg, $m) . "</th>";
-	}
-	$html .= "</tr>";
-
-	for ($n = 0; $n < mysql_num_rows($Erg); $n++) {
-		$html .= "<tr class=\"content\">";
-		for ($m = 0; $m < mysql_num_fields($Erg); $m++) {
-			$html .= "<td>" . mysql_result($Erg, $n, $m) . "</td>";
-		}
-		$html .= "</tr>";
-	}
-	$html .= "</table>\n";
-	return $html;
-}
-?>
diff --git a/includes_old/funktion_jabber.php b/includes_old/funktion_jabber.php
deleted file mode 100644
index 9c699d70..00000000
--- a/includes_old/funktion_jabber.php
+++ /dev/null
@@ -1,1853 +0,0 @@
-<?php
-
-/***************************************************************************
-
-  Class.Jabber.PHP v0.4.2
-  (c) 2004 Nathan "Fritzy" Fritz
-  http://cjphp.netflint.net *** fritzy@netflint.net
-
-  This is a bugfix version, specifically for those who can't get
-  0.4 to work on Jabberd2 servers.
-
-  last modified: 24.03.2004 13:01:53
-
- ***************************************************************************/
-
-/***************************************************************************
- *
-
- *
- ***************************************************************************/
-
-/*
-  Jabber::Connect()
-  Jabber::Disconnect()
-  Jabber::SendAuth()
-  Jabber::AccountRegistration($reg_email {string}, $reg_name {string})
-
-  Jabber::Listen()
-  Jabber::SendPacket($xml {string})
-
-  Jabber::RosterUpdate()
-  Jabber::RosterAddUser($jid {string}, $id {string}, $name {string})
-  Jabber::RosterRemoveUser($jid {string}, $id {string})
-  Jabber::RosterExistsJID($jid {string})
-
-  Jabber::Subscribe($jid {string})
-  Jabber::Unsubscribe($jid {string})
-
-  Jabber::CallHandler($message {array})
-  Jabber::CruiseControl([$seconds {number}])
-
-  Jabber::SubscriptionApproveRequest($to {string})
-  Jabber::SubscriptionDenyRequest($to {string})
-
-  Jabber::GetFirstFromQueue()
-  Jabber::GetFromQueueById($packet_type {string}, $id {string})
-
-  Jabber::SendMessage($to {string}, $id {number}, $type {string}, $content {array}[, $payload {array}])
-  Jabber::SendIq($to {string}, $type {string}, $id {string}, $xmlns {string}[, $payload {string}])
-  Jabber::SendPresence($type {string}[, $to {string}[, $status {string}[, $show {string}[, $priority {number}]]]])
-
-  Jabber::SendError($to {string}, $id {string}, $error_number {number}[, $error_message {string}])
-
-  Jabber::TransportRegistrationDetails($transport {string})
-  Jabber::TransportRegistration($transport {string}, $details {array})
-
-  Jabber::GetvCard($jid {string}[, $id {string}])  -- EXPERIMENTAL --
-
-  Jabber::GetInfoFromMessageFrom($packet {array})
-  Jabber::GetInfoFromMessageType($packet {array})
-  Jabber::GetInfoFromMessageId($packet {array})
-  Jabber::GetInfoFromMessageThread($packet {array})
-  Jabber::GetInfoFromMessageSubject($packet {array})
-  Jabber::GetInfoFromMessageBody($packet {array})
-  Jabber::GetInfoFromMessageError($packet {array})
-
-  Jabber::GetInfoFromIqFrom($packet {array})
-  Jabber::GetInfoFromIqType($packet {array})
-  Jabber::GetInfoFromIqId($packet {array})
-  Jabber::GetInfoFromIqKey($packet {array})
-  Jabber::GetInfoFromIqError($packet {array})
-
-  Jabber::GetInfoFromPresenceFrom($packet {array})
-  Jabber::GetInfoFromPresenceType($packet {array})
-  Jabber::GetInfoFromPresenceStatus($packet {array})
-  Jabber::GetInfoFromPresenceShow($packet {array})
-  Jabber::GetInfoFromPresencePriority($packet {array})
-
-  Jabber::AddToLog($string {string})
-  Jabber::PrintLog()
-
-  MakeXML::AddPacketDetails($string {string}[, $value {string/number}])
-  MakeXML::BuildPacket([$array {array}])
-*/
-
-
-
-class Jabber
-{
-  function Jabber($server, $port, $username, $password, $resource)
-  {
-
-    $this->server        = $server;
-    $this->port          = $port;
-
-    $this->username        = $username;
-    $this->password        = $password;
-    $this->resource        = $resource;
-
-    $this->enable_logging    = FALSE;
-    $this->log_array      = array();
-    $this->log_filename      = '';
-    $this->log_filehandler    = FALSE;
-
-    $this->packet_queue      = array();
-    $this->subscription_queue  = array();
-
-    $this->iq_sleep_timer    = 1;
-    $this->delay_disconnect    = 1;
-
-    $this->returned_keep_alive  = TRUE;
-    $this->txnid        = 0;
-
-    $this->iq_version_name    = "Class.Jabber.PHP -- http://cjphp.netflint.net -- by Nathan 'Fritzy' Fritz, fritz@netflint.net";
-    $this->iq_version_version  = "0.4";
-    $this->iq_version_os    = $_SERVER['SERVER_SOFTWARE'];
-
-    $this->connection_class    = "CJP_StandardConnector";
-
-    $this->error_codes      = array(400 => "Bad Request",
-                      401 => "Unauthorized",
-                      402 => "Payment Required",
-                      403 => "Forbidden",
-                      404 => "Not Found",
-                      405 => "Not Allowed",
-                      406 => "Not Acceptable",
-                      407 => "Registration Required",
-                      408 => "Request Timeout",
-                      409 => "Conflict",
-                      500 => "Internal Server Error",
-                      501 => "Not Implemented",
-                      502 => "Remove Server Error",
-                      503 => "Service Unavailable",
-                      504 => "Remove Server Timeout",
-                      510 => "Disconnected");
-  }
-
-
-
-  function Connect()
-  {
-    $this->_create_logfile();
-
-    $this->CONNECTOR = new $this->connection_class;
-
-    if ($this->CONNECTOR->OpenSocket($this->server, $this->port))
-    {
-      $this->SendPacket("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
-      $this->SendPacket("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>\n");
-
-      sleep(2);
-
-      if ($this->_check_connected())
-      {
-        $this->connected = TRUE;  // Nathan Fritz
-        return TRUE;
-      }
-      else
-      {
-        $this->AddToLog("ERROR: Connect() #1");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: Connect() #2");
-      return FALSE;
-    }
-  }
-
-
-
-  function Disconnect()
-  {
-    if (is_int($this->delay_disconnect))
-    {
-      sleep($this->delay_disconnect);
-    }
-
-    $this->SendPacket("</stream:stream>");
-    $this->CONNECTOR->CloseSocket();
-
-    $this->_close_logfile();
-    $this->PrintLog();
-  }
-
-
-
-  function SendAuth()
-  {
-    $this->auth_id  = "auth_" . md5(time() . $_SERVER['REMOTE_ADDR']);
-
-    $this->resource  = ($this->resource != NULL) ? $this->resource : ("Class.Jabber.PHP " . md5($this->auth_id));
-    $this->jid    = "{$this->username}@{$this->server}/{$this->resource}";
-
-    // request available authentication methods
-    $payload  = "<username>{$this->username}</username>";
-    $packet    = $this->SendIq(NULL, 'get', $this->auth_id, "jabber:iq:auth", $payload);
-
-    // was a result returned?
-    if ($this->GetInfoFromIqType($packet) == 'result' && $this->GetInfoFromIqId($packet) == $this->auth_id)
-    {
-      // yes, now check for auth method availability in descending order (best to worst)
-
-      if (!function_exists('mhash'))
-      {
-        $this->AddToLog("ATTENTION: SendAuth() - mhash() is not available; screw 0k and digest method, we need to go with plaintext auth");
-      }
-
-      // auth_0k
-      if (function_exists('mhash') && isset($packet['iq']['#']['query'][0]['#']['sequence'][0]["#"]) && isset($packet['iq']['#']['query'][0]['#']['token'][0]["#"]))
-      {
-        return $this->_sendauth_0k($packet['iq']['#']['query'][0]['#']['token'][0]["#"], $packet['iq']['#']['query'][0]['#']['sequence'][0]["#"]);
-      }
-      // digest
-      elseif (function_exists('mhash') && isset($packet['iq']['#']['query'][0]['#']['digest']))
-      {
-        return $this->_sendauth_digest();
-      }
-      // plain text
-      elseif ($packet['iq']['#']['query'][0]['#']['password'])
-      {
-        return $this->_sendauth_plaintext();
-      }
-      // dude, you're fucked
-      {
-        $this->AddToLog("ERROR: SendAuth() #2 - No auth method available!");
-        return FALSE;
-      }
-    }
-    else
-    {
-      // no result returned
-      $this->AddToLog("ERROR: SendAuth() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function AccountRegistration($reg_email = NULL, $reg_name = NULL)
-  {
-    $packet = $this->SendIq($this->server, 'get', 'reg_01', 'jabber:iq:register');
-
-    if ($packet)
-    {
-      $key = $this->GetInfoFromIqKey($packet);  // just in case a key was passed back from the server
-      unset($packet);
-
-      $payload = "<username>{$this->username}</username>
-            <password>{$this->password}</password>
-            <email>$reg_email</email>
-            <name>$reg_name</name>\n";
-
-      $payload .= ($key) ? "<key>$key</key>\n" : '';
-
-      $packet = $this->SendIq($this->server, 'set', "reg_01", "jabber:iq:register", $payload);
-
-      if ($this->GetInfoFromIqType($packet) == 'result')
-      {
-        if (isset($packet['iq']['#']['query'][0]['#']['registered'][0]['#']))
-        {
-          $return_code = 1;
-        }
-        else
-        {
-          $return_code = 2;
-        }
-
-        if ($this->resource)
-        {
-          $this->jid = "{$this->username}@{$this->server}/{$this->resource}";
-        }
-        else
-        {
-          $this->jid = "{$this->username}@{$this->server}";
-        }
-
-      }
-      elseif ($this->GetInfoFromIqType($packet) == 'error' && isset($packet['iq']['#']['error'][0]['#']))
-      {
-        // "conflict" error, i.e. already registered
-        if ($packet['iq']['#']['error'][0]['@']['code'] == '409')
-        {
-          $return_code = 1;
-        }
-        else
-        {
-          $return_code = "Error " . $packet['iq']['#']['error'][0]['@']['code'] . ": " . $packet['iq']['#']['error'][0]['#'];
-        }
-      }
-
-      return $return_code;
-
-    }
-    else
-    {
-      return 3;
-    }
-  }
-
-
-
-  function SendPacket($xml)
-  {
-    $xml = trim($xml);
-
-    if ($this->CONNECTOR->WriteToSocket($xml))
-    {
-      $this->AddToLog("SEND: $xml");
-      return TRUE;
-    }
-    else
-    {
-      $this->AddToLog('ERROR: SendPacket() #1');
-      return FALSE;
-    }
-  }
-
-
-
-  function Listen()
-  {
-    $incoming = "";
-
-    while ($line = $this->CONNECTOR->ReadFromSocket(4096))
-    {
-      $incoming .= $line;
-    }
-
-    $incoming = trim($incoming);
-
-    if ($incoming != "")
-    {
-      $this->AddToLog("RECV: $incoming");
-    }
-
-    if ($incoming != "")
-    {
-      $temp = $this->_split_incoming($incoming);
-
-      for ($a = 0; $a < count($temp); $a++)
-      {
-        $this->packet_queue[] = $this->xmlize($temp[$a]);
-      }
-    }
-
-    return TRUE;
-  }
-
-
-
-  function StripJID($jid = NULL)
-  {
-    preg_match("/(.*)\/(.*)/Ui", $jid, $temp);
-    return ($temp[1] != "") ? $temp[1] : $jid;
-  }
-
-
-
-  function SendMessage($to, $type = "normal", $id = NULL, $content = NULL, $payload = NULL)
-  {
-    if ($to && is_array($content))
-    {
-      if (!$id)
-      {
-        $id = $type . "_" . time();
-      }
-
-      $content = $this->_array_htmlspecialchars($content);
-
-      $xml = "<message to='$to' type='$type' id='$id'>\n";
-
-      if (isset($content['subject']))
-      {
-        $xml .= "<subject>" . $content['subject'] . "</subject>\n";
-      }
-
-      if (isset($content['thread']))
-      {
-        $xml .= "<thread>" . $content['thread'] . "</thread>\n";
-      }
-
-      $xml .= "<body>" . $content['body'] . "</body>\n";
-      $xml .= $payload;
-      $xml .= "</message>\n";
-
-
-      if ($this->SendPacket($xml))
-      {
-        return TRUE;
-      }
-      else
-      {
-        $this->AddToLog("ERROR: SendMessage() #1");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: SendMessage() #2");
-      return FALSE;
-    }
-  }
-
-
-
-  function SendPresence($type = NULL, $to = NULL, $status = NULL, $show = NULL, $priority = NULL)
-  {
-    $xml = "<presence";
-    $xml .= ($to) ? " to='$to'" : '';
-    $xml .= ($type) ? " type='$type'" : '';
-    $xml .= ($status || $show || $priority) ? ">\n" : " />\n";
-
-    $xml .= ($status) ? "  <status>$status</status>\n" : '';
-    $xml .= ($show) ? "  <show>$show</show>\n" : '';
-    $xml .= ($priority) ? "  <priority>$priority</priority>\n" : '';
-
-    $xml .= ($status || $show || $priority) ? "</presence>\n" : '';
-
-    if ($this->SendPacket($xml))
-    {
-      return TRUE;
-    }
-    else
-    {
-      $this->AddToLog("ERROR: SendPresence() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function SendError($to, $id = NULL, $error_number, $error_message = NULL)
-  {
-    $xml = "<iq type='error' to='$to'";
-    $xml .= ($id) ? " id='$id'" : '';
-    $xml .= ">\n";
-    $xml .= "  <error code='$error_number'>";
-    $xml .= ($error_message) ? $error_message : $this->error_codes[$error_number];
-    $xml .= "</error>\n";
-    $xml .= "</iq>";
-
-    $this->SendPacket($xml);
-  }
-
-
-
-  function RosterUpdate()
-  {
-    $roster_request_id = "roster_" . time();
-
-    $incoming_array = $this->SendIq(NULL, 'get', $roster_request_id, "jabber:iq:roster");
-
-    if (is_array($incoming_array))
-    {
-      if ($incoming_array['iq']['@']['type'] == 'result'
-        && $incoming_array['iq']['@']['id'] == $roster_request_id
-        && $incoming_array['iq']['#']['query']['0']['@']['xmlns'] == "jabber:iq:roster")
-      {
-        $number_of_contacts = count($incoming_array['iq']['#']['query'][0]['#']['item']);
-        $this->roster = array();
-
-        for ($a = 0; $a < $number_of_contacts; $a++)
-        {
-          $this->roster[$a] = array(  "jid"      => strtolower($incoming_array['iq']['#']['query'][0]['#']['item'][$a]['@']['jid']),
-                        "name"      => $incoming_array['iq']['#']['query'][0]['#']['item'][$a]['@']['name'],
-                        "subscription"  => $incoming_array['iq']['#']['query'][0]['#']['item'][$a]['@']['subscription'],
-                        "group"      => $incoming_array['iq']['#']['query'][0]['#']['item'][$a]['#']['group'][0]['#']
-                      );
-        }
-
-        return TRUE;
-      }
-      else
-      {
-        $this->AddToLog("ERROR: RosterUpdate() #1");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: RosterUpdate() #2");
-      return FALSE;
-    }
-  }
-
-
-
-  function RosterAddUser($jid = NULL, $id = NULL, $name = NULL)
-  {
-    $id = ($id) ? $id : "adduser_" . time();
-
-    if ($jid)
-    {
-      $payload = "    <item jid='$jid'";
-      $payload .= ($name) ? " name='" . htmlspecialchars($name) . "'" : '';
-      $payload .= "/>\n";
-
-      $packet = $this->SendIq(NULL, 'set', $id, "jabber:iq:roster", $payload);
-
-      if ($this->GetInfoFromIqType($packet) == 'result')
-      {
-        $this->RosterUpdate();
-        return TRUE;
-      }
-      else
-      {
-        $this->AddToLog("ERROR: RosterAddUser() #2");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: RosterAddUser() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function RosterRemoveUser($jid = NULL, $id = NULL)
-  {
-    $id = ($id) ? $id : 'deluser_' . time();
-
-    if ($jid && $id)
-    {
-      $packet = $this->SendIq(NULL, 'set', $id, "jabber:iq:roster", "<item jid='$jid' subscription='remove'/>");
-
-      if ($this->GetInfoFromIqType($packet) == 'result')
-      {
-        $this->RosterUpdate();
-        return TRUE;
-      }
-      else
-      {
-        $this->AddToLog("ERROR: RosterRemoveUser() #2");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: RosterRemoveUser() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function RosterExistsJID($jid = NULL)
-  {
-    if ($jid)
-    {
-      if ($this->roster)
-      {
-        for ($a = 0; $a < count($this->roster); $a++)
-        {
-          if ($this->roster[$a]['jid'] == strtolower($jid))
-          {
-            return $a;
-          }
-        }
-      }
-      else
-      {
-        $this->AddToLog("ERROR: RosterExistsJID() #2");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: RosterExistsJID() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function GetFirstFromQueue()
-  {
-    return array_shift($this->packet_queue);
-  }
-
-
-
-  function GetFromQueueById($packet_type, $id)
-  {
-    $found_message = FALSE;
-
-    foreach ($this->packet_queue as $key => $value)
-    {
-      if ($value[$packet_type]['@']['id'] == $id)
-      {
-        $found_message = $value;
-        unset($this->packet_queue[$key]);
-
-        break;
-      }
-    }
-
-    return (is_array($found_message)) ? $found_message : FALSE;
-  }
-
-
-
-  function CallHandler($packet = NULL)
-  {
-    $packet_type  = $this->_get_packet_type($packet);
-
-    if ($packet_type == "message")
-    {
-      $type    = $packet['message']['@']['type'];
-      $type    = ($type != "") ? $type : "normal";
-      $funcmeth  = "Handler_message_$type";
-    }
-    elseif ($packet_type == "iq")
-    {
-      $namespace  = $packet['iq']['#']['query'][0]['@']['xmlns'];
-      $namespace  = str_replace(":", "_", $namespace);
-      $funcmeth  = "Handler_iq_$namespace";
-    }
-    elseif ($packet_type == "presence")
-    {
-      $type    = $packet['presence']['@']['type'];
-      $type    = ($type != "") ? $type : "available";
-      $funcmeth  = "Handler_presence_$type";
-    }
-
-
-    if ($funcmeth != '')
-    {
-      if (function_exists($funcmeth))
-      {
-        call_user_func($funcmeth, $packet);
-      }
-      elseif (method_exists($this, $funcmeth))
-      {
-        call_user_func(array(&$this, $funcmeth), $packet);
-      }
-      else
-      {
-        $this->Handler_NOT_IMPLEMENTED($packet);
-        $this->AddToLog("ERROR: CallHandler() #1 - neither method nor function $funcmeth() available");
-      }
-    }
-  }
-
-
-
-  function CruiseControl($seconds = -1)
-  {
-    $count = 0;
-
-    while ($count != $seconds)
-    {
-      $this->Listen();
-
-      do {
-        $packet = $this->GetFirstFromQueue();
-
-        if ($packet) {
-          $this->CallHandler($packet);
-        }
-
-      } while (count($this->packet_queue) > 1);
-
-      $count += 0.25;
-      usleep(250000);
-
-      if ($this->last_ping_time + 180 < time())
-      {
-        // Modified by Nathan Fritz
-        if ($this->returned_keep_alive == FALSE)
-        {
-          $this->connected = FALSE;
-          $this->AddToLog('EVENT: Disconnected');
-        }
-        if ($this->returned_keep_alive == TRUE)
-        {
-          $this->connected = TRUE;
-        }
-
-        $this->returned_keep_alive = FALSE;
-        $this->keep_alive_id = 'keep_alive_' . time();
-        //$this->SendPacket("<iq id='{$this->keep_alive_id}'/>", 'CruiseControl');
-        $this->SendPacket("<iq type='get' from='" . $this->username . "@" . $this->server . "/" . $this->resource . "' to='" . $this->server . "' id='" . $this->keep_alive_id . "'><query xmlns='jabber:iq:time' /></iq>");
-        // **
-
-        $this->last_ping_time = time();
-      }
-    }
-
-    return TRUE;
-  }
-
-
-
-  function SubscriptionAcceptRequest($to = NULL)
-  {
-    return ($to) ? $this->SendPresence("subscribed", $to) : FALSE;
-  }
-
-
-
-  function SubscriptionDenyRequest($to = NULL)
-  {
-    return ($to) ? $this->SendPresence("unsubscribed", $to) : FALSE;
-  }
-
-
-
-  function Subscribe($to = NULL)
-  {
-    return ($to) ? $this->SendPresence("subscribe", $to) : FALSE;
-  }
-
-
-
-  function Unsubscribe($to = NULL)
-  {
-    return ($to) ? $this->SendPresence("unsubscribe", $to) : FALSE;
-  }
-
-
-
-  function SendIq($to = NULL, $type = 'get', $id = NULL, $xmlns = NULL, $payload = NULL, $from = NULL)
-  {
-    if (!preg_match("/^(get|set|result|error)$/", $type))
-    {
-      unset($type);
-
-      $this->AddToLog("ERROR: SendIq() #2 - type must be 'get', 'set', 'result' or 'error'");
-      return FALSE;
-    }
-    elseif ($id && $xmlns)
-    {
-      $xml = "<iq type='$type' id='$id'";
-      $xml .= ($to) ? " to='" . htmlspecialchars($to) . "'" : '';
-      $xml .= ($from) ? " from='$from'" : '';
-      $xml .= ">
-            <query xmlns='$xmlns'>
-              $payload
-            </query>
-          </iq>";
-
-      $this->SendPacket($xml);
-      sleep($this->iq_sleep_timer);
-      $this->Listen();
-
-      return (preg_match("/^(get|set)$/", $type)) ? $this->GetFromQueueById("iq", $id) : TRUE;
-    }
-    else
-    {
-      $this->AddToLog("ERROR: SendIq() #1 - to, id and xmlns are mandatory");
-      return FALSE;
-    }
-  }
-
-
-
-  // get the transport registration fields
-  // method written by Steve Blinch, http://www.blitzaffe.com
-  function TransportRegistrationDetails($transport)
-  {
-    $this->txnid++;
-    $packet = $this->SendIq($transport, 'get', "reg_{$this->txnid}", "jabber:iq:register", NULL, $this->jid);
-
-    if ($packet)
-    {
-      $res = array();
-
-      foreach ($packet['iq']['#']['query'][0]['#'] as $element => $data)
-      {
-        if ($element != 'instructions' && $element != 'key')
-        {
-          $res[] = $element;
-        }
-      }
-
-      return $res;
-    }
-    else
-    {
-      return 3;
-    }
-  }
-
-
-
-  // register with the transport
-  // method written by Steve Blinch, http://www.blitzaffe.com
-  function TransportRegistration($transport, $details)
-  {
-    $this->txnid++;
-    $packet = $this->SendIq($transport, 'get', "reg_{$this->txnid}", "jabber:iq:register", NULL, $this->jid);
-
-    if ($packet)
-    {
-      $key = $this->GetInfoFromIqKey($packet);  // just in case a key was passed back from the server
-      unset($packet);
-
-      $payload = ($key) ? "<key>$key</key>\n" : '';
-      foreach ($details as $element => $value)
-      {
-        $payload .= "<$element>$value</$element>\n";
-      }
-
-      $packet = $this->SendIq($transport, 'set', "reg_{$this->txnid}", "jabber:iq:register", $payload);
-
-      if ($this->GetInfoFromIqType($packet) == 'result')
-      {
-        if (isset($packet['iq']['#']['query'][0]['#']['registered'][0]['#']))
-        {
-          $return_code = 1;
-        }
-        else
-        {
-          $return_code = 2;
-        }
-      }
-      elseif ($this->GetInfoFromIqType($packet) == 'error')
-      {
-        if (isset($packet['iq']['#']['error'][0]['#']))
-        {
-          $return_code = "Error " . $packet['iq']['#']['error'][0]['@']['code'] . ": " . $packet['iq']['#']['error'][0]['#'];
-          $this->AddToLog('ERROR: TransportRegistration()');
-        }
-      }
-
-      return $return_code;
-    }
-    else
-    {
-      return 3;
-    }
-  }
-
-
-
-  function GetvCard($jid = NULL, $id = NULL)
-  {
-    if (!$id)
-    {
-      $id = "vCard_" . md5(time() . $_SERVER['REMOTE_ADDR']);
-    }
-
-    if ($jid)
-    {
-      $xml = "<iq type='get' to='$jid' id='$id'>
-            <vCard xmlns='vcard-temp'/>
-          </iq>";
-
-      $this->SendPacket($xml);
-      sleep($this->iq_sleep_timer);
-      $this->Listen();
-
-      return $this->GetFromQueueById("iq", $id);
-    }
-    else
-    {
-      $this->AddToLog("ERROR: GetvCard() #1 - to and id are mandatory");
-      return FALSE;
-    }
-  }
-
-
-
-  function PrintLog()
-  {
-    if ($this->enable_logging)
-    {
-      if ($this->log_filehandler)
-      {
-        echo "<h2>Logging enabled, logged events have been written to the file {$this->log_filename}.</h2>\n";
-      }
-      else
-      {
-        echo "<h2>Logging enabled, logged events below:</h2>\n";
-        echo "<pre>\n";
-        echo (count($this->log_array) > 0) ? implode("\n\n\n", $this->log_array) : "No logged events.";
-        echo "</pre>\n";
-      }
-    }
-  }
-
-
-
-  // ======================================================================
-  // private methods
-  // ======================================================================
-
-
-
-  function _sendauth_0k($zerok_token, $zerok_sequence)
-  {
-    // initial hash of password
-    $zerok_hash = mhash(MHASH_SHA1, $this->password);
-    $zerok_hash = bin2hex($zerok_hash);
-
-    // sequence 0: hash of hashed-password and token
-    $zerok_hash = mhash(MHASH_SHA1, $zerok_hash . $zerok_token);
-    $zerok_hash = bin2hex($zerok_hash);
-
-    // repeat as often as needed
-    for ($a = 0; $a < $zerok_sequence; $a++)
-    {
-      $zerok_hash = mhash(MHASH_SHA1, $zerok_hash);
-      $zerok_hash = bin2hex($zerok_hash);
-    }
-
-    $payload = "<username>{$this->username}</username>
-          <hash>$zerok_hash</hash>
-          <resource>{$this->resource}</resource>";
-
-    $packet = $this->SendIq(NULL, 'set', $this->auth_id, "jabber:iq:auth", $payload);
-
-    // was a result returned?
-    if ($this->GetInfoFromIqType($packet) == 'result' && $this->GetInfoFromIqId($packet) == $this->auth_id)
-    {
-      return TRUE;
-    }
-    else
-    {
-      $this->AddToLog("ERROR: _sendauth_0k() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function _sendauth_digest()
-  {
-    $payload = "<username>{$this->username}</username>
-          <resource>{$this->resource}</resource>
-          <digest>" . bin2hex(mhash(MHASH_SHA1, $this->stream_id . $this->password)) . "</digest>";
-
-    $packet = $this->SendIq(NULL, 'set', $this->auth_id, "jabber:iq:auth", $payload);
-
-    // was a result returned?
-    if ($this->GetInfoFromIqType($packet) == 'result' && $this->GetInfoFromIqId($packet) == $this->auth_id)
-    {
-      return TRUE;
-    }
-    else
-    {
-      $this->AddToLog("ERROR: _sendauth_digest() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function _sendauth_plaintext()
-  {
-    $payload = "<username>{$this->username}</username>
-          <password>{$this->password}</password>
-          <resource>{$this->resource}</resource>";
-
-    $packet = $this->SendIq(NULL, 'set', $this->auth_id, "jabber:iq:auth", $payload);
-
-    // was a result returned?
-    if ($this->GetInfoFromIqType($packet) == 'result' && $this->GetInfoFromIqId($packet) == $this->auth_id)
-    {
-      return TRUE;
-    }
-    else
-    {
-      $this->AddToLog("ERROR: _sendauth_plaintext() #1");
-      return FALSE;
-    }
-  }
-
-
-
-  function _listen_incoming()
-  {
-    $incoming = "";
-
-    while ($line = $this->CONNECTOR->ReadFromSocket(4096))
-    {
-      $incoming .= $line;
-    }
-
-    $incoming = trim($incoming);
-
-    if ($incoming != "")
-    {
-      $this->AddToLog("RECV: $incoming");
-    }
-
-    return $this->xmlize($incoming);
-  }
-
-
-
-  function _check_connected()
-  {
-    $incoming_array = $this->_listen_incoming();
-
-    if (is_array($incoming_array))
-    {
-      if ($incoming_array["stream:stream"]['@']['from'] == $this->server
-        && $incoming_array["stream:stream"]['@']['xmlns'] == "jabber:client"
-        && $incoming_array["stream:stream"]['@']["xmlns:stream"] == "http://etherx.jabber.org/streams")
-      {
-        $this->stream_id = $incoming_array["stream:stream"]['@']['id'];
-
-        return TRUE;
-      }
-      else
-      {
-        $this->AddToLog("ERROR: _check_connected() #1");
-        return FALSE;
-      }
-    }
-    else
-    {
-      $this->AddToLog("ERROR: _check_connected() #2");
-      return FALSE;
-    }
-  }
-
-
-
-  function _get_packet_type($packet = NULL)
-  {
-    if (is_array($packet))
-    {
-      reset($packet);
-      $packet_type = key($packet);
-    }
-
-    return ($packet_type) ? $packet_type : FALSE;
-  }
-
-
-
-  function _split_incoming($incoming)
-  {
-    $temp = preg_split("/<(message|iq|presence|stream)/", $incoming, -1, PREG_SPLIT_DELIM_CAPTURE);
-    $array = array();
-
-    for ($a = 1; $a < count($temp); $a = $a + 2)
-    {
-      $array[] = "<" . $temp[$a] . $temp[($a + 1)];
-    }
-
-    return $array;
-  }
-
-
-
-  function _create_logfile()
-  {
-    if ($this->log_filename != '' && $this->enable_logging)
-    {
-      $this->log_filehandler = fopen($this->log_filename, 'w');
-    }
-  }
-
-
-
-  function AddToLog($string)
-  {
-    if ($this->enable_logging)
-    {
-      if ($this->log_filehandler)
-      {
-        #fwrite($this->log_filehandler, $string . "\n\n");
-        print "$string \n\n";
-      }
-      else
-      {
-        $this->log_array[] = htmlspecialchars($string);
-      }
-    }
-  }
-
-
-
-  function _close_logfile()
-  {
-    if ($this->log_filehandler)
-    {
-      fclose($this->log_filehandler);
-    }
-  }
-
-
-
-  // _array_htmlspecialchars()
-  // applies htmlspecialchars() to all values in an array
-
-  function _array_htmlspecialchars($array)
-  {
-    if (is_array($array))
-    {
-      foreach ($array as $k => $v)
-      {
-        if (is_array($v))
-        {
-          $v = $this->_array_htmlspecialchars($v);
-        }
-        else
-        {
-          $v = htmlspecialchars($v);
-        }
-      }
-    }
-
-    return $array;
-  }
-
-
-
-  // ======================================================================
-  // <message/> parsers
-  // ======================================================================
-
-
-
-  function GetInfoFromMessageFrom($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['@']['from'] : FALSE;
-  }
-
-
-
-  function GetInfoFromMessageType($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['@']['type'] : FALSE;
-  }
-
-
-
-  function GetInfoFromMessageId($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['@']['id'] : FALSE;
-  }
-
-
-
-  function GetInfoFromMessageThread($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['#']['thread'][0]['#'] : FALSE;
-  }
-
-
-
-  function GetInfoFromMessageSubject($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['#']['subject'][0]['#'] : FALSE;
-  }
-
-
-
-  function GetInfoFromMessageBody($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['#']['body'][0]['#'] : FALSE;
-  }
-
-  function GetInfoFromMessageXMLNS($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['message']['#']['x'] : FALSE;
-  }
-
-
-
-  function GetInfoFromMessageError($packet = NULL)
-  {
-    $error = preg_replace("/^\/$/", "", ($packet['message']['#']['error'][0]['@']['code'] . "/" . $packet['message']['#']['error'][0]['#']));
-    return (is_array($packet)) ? $error : FALSE;
-  }
-
-
-
-  // ======================================================================
-  // <iq/> parsers
-  // ======================================================================
-
-
-
-  function GetInfoFromIqFrom($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['iq']['@']['from'] : FALSE;
-  }
-
-
-
-  function GetInfoFromIqType($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['iq']['@']['type'] : FALSE;
-  }
-
-
-
-  function GetInfoFromIqId($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['iq']['@']['id'] : FALSE;
-  }
-
-
-
-  function GetInfoFromIqKey($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['iq']['#']['query'][0]['#']['key'][0]['#'] : FALSE;
-  }
-
-
-
-  function GetInfoFromIqError($packet = NULL)
-  {
-    $error = preg_replace("/^\/$/", "", ($packet['iq']['#']['error'][0]['@']['code'] . "/" . $packet['iq']['#']['error'][0]['#']));
-    return (is_array($packet)) ? $error : FALSE;
-  }
-
-
-
-  // ======================================================================
-  // <presence/> parsers
-  // ======================================================================
-
-
-
-  function GetInfoFromPresenceFrom($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['presence']['@']['from'] : FALSE;
-  }
-
-
-
-  function GetInfoFromPresenceType($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['presence']['@']['type'] : FALSE;
-  }
-
-
-
-  function GetInfoFromPresenceStatus($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['presence']['#']['status'][0]['#'] : FALSE;
-  }
-
-
-
-  function GetInfoFromPresenceShow($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['presence']['#']['show'][0]['#'] : FALSE;
-  }
-
-
-
-  function GetInfoFromPresencePriority($packet = NULL)
-  {
-    return (is_array($packet)) ? $packet['presence']['#']['priority'][0]['#'] : FALSE;
-  }
-
-
-
-  // ======================================================================
-  // <message/> handlers
-  // ======================================================================
-
-
-
-  function Handler_message_normal($packet)
-  {
-    $from = $packet['message']['@']['from'];
-    $this->AddToLog("EVENT: Message (type normal) from $from");
-  }
-
-
-
-  function Handler_message_chat($packet)
-  {
-    $from = $packet['message']['@']['from'];
-    $this->AddToLog("EVENT: Message (type chat) from $from");
-  }
-
-
-
-  function Handler_message_groupchat($packet)
-  {
-    $from = $packet['message']['@']['from'];
-    $this->AddToLog("EVENT: Message (type groupchat) from $from");
-  }
-
-
-
-  function Handler_message_headline($packet)
-  {
-    $from = $packet['message']['@']['from'];
-    $this->AddToLog("EVENT: Message (type headline) from $from");
-  }
-
-
-
-  function Handler_message_error($packet)
-  {
-    $from = $packet['message']['@']['from'];
-    $this->AddToLog("EVENT: Message (type error) from $from");
-  }
-
-
-
-  // ======================================================================
-  // <iq/> handlers
-  // ======================================================================
-
-
-
-  // application version updates
-  function Handler_iq_jabber_iq_autoupdate($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:autoupdate from $from");
-  }
-
-
-
-  // interactive server component properties
-  function Handler_iq_jabber_iq_agent($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:agent from $from");
-  }
-
-
-
-  // method to query interactive server components
-  function Handler_iq_jabber_iq_agents($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:agents from $from");
-  }
-
-
-
-  // simple client authentication
-  function Handler_iq_jabber_iq_auth($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:auth from $from");
-  }
-
-
-
-  // out of band data
-  function Handler_iq_jabber_iq_oob($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:oob from $from");
-  }
-
-
-
-  // method to store private data on the server
-  function Handler_iq_jabber_iq_private($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:private from $from");
-  }
-
-
-
-  // method for interactive registration
-  function Handler_iq_jabber_iq_register($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:register from $from");
-  }
-
-
-
-  // client roster management
-  function Handler_iq_jabber_iq_roster($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:roster from $from");
-  }
-
-
-
-  // method for searching a user database
-  function Handler_iq_jabber_iq_search($packet)
-  {
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: jabber:iq:search from $from");
-  }
-
-
-
-  // method for requesting the current time
-  function Handler_iq_jabber_iq_time($packet)
-  {
-    if ($this->keep_alive_id == $this->GetInfoFromIqId($packet))
-    {
-      $this->returned_keep_alive = TRUE;
-      $this->connected = TRUE;
-      $this->AddToLog('EVENT: Keep-Alive returned, connection alive.');
-    }
-    $type  = $this->GetInfoFromIqType($packet);
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-    $id    = ($id != "") ? $id : "time_" . time();
-
-    if ($type == 'get')
-    {
-      $payload = "<utc>" . gmdate("Ydm\TH:i:s") . "</utc>
-            <tz>" . date("T") . "</tz>
-            <display>" . date("Y/d/m h:i:s A") . "</display>";
-
-      $this->SendIq($from, 'result', $id, "jabber:iq:time", $payload);
-    }
-
-    $this->AddToLog("EVENT: jabber:iq:time (type $type) from $from");
-  }
-
-
-
-  // method for requesting version
-  function Handler_iq_jabber_iq_version($packet)
-  {
-    $type  = $this->GetInfoFromIqType($packet);
-    $from  = $this->GetInfoFromIqFrom($packet);
-    $id    = $this->GetInfoFromIqId($packet);
-    $id    = ($id != "") ? $id : "version_" . time();
-
-    if ($type == 'get')
-    {
-      $payload = "<name>{$this->iq_version_name}</name>
-            <os>{$this->iq_version_os}</os>
-            <version>{$this->iq_version_version}</version>";
-
-      #$this->SendIq($from, 'result', $id, "jabber:iq:version", $payload);
-    }
-
-    $this->AddToLog("EVENT: jabber:iq:version (type $type) from $from -- DISABLED");
-  }
-
-
-
-  // keepalive method, added by Nathan Fritz
-  /*
-  function Handler_jabber_iq_time($packet)
-  {
-    if ($this->keep_alive_id == $this->GetInfoFromIqId($packet))
-    {
-      $this->returned_keep_alive = TRUE;
-      $this->connected = TRUE;
-      $this->AddToLog('EVENT: Keep-Alive returned, connection alive.');
-    }
-  }
-  */
-
-
-  // ======================================================================
-  // <presence/> handlers
-  // ======================================================================
-
-
-
-  function Handler_presence_available($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-
-    $show_status = $this->GetInfoFromPresenceStatus($packet) . " / " . $this->GetInfoFromPresenceShow($packet);
-    $show_status = ($show_status != " / ") ? " ($addendum)" : '';
-
-    $this->AddToLog("EVENT: Presence (type: available) - $from is available $show_status");
-  }
-
-
-
-  function Handler_presence_unavailable($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-
-    $show_status = $this->GetInfoFromPresenceStatus($packet) . " / " . $this->GetInfoFromPresenceShow($packet);
-    $show_status = ($show_status != " / ") ? " ($addendum)" : '';
-
-    $this->AddToLog("EVENT: Presence (type: unavailable) - $from is unavailable $show_status");
-  }
-
-
-
-  function Handler_presence_subscribe($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-    $this->SubscriptionAcceptRequest($from);
-    $this->RosterUpdate();
-
-    $this->log_array[] = "<b>Presence:</b> (type: subscribe) - Subscription request from $from, was added to \$this->subscription_queue, roster updated";
-  }
-
-
-
-  function Handler_presence_subscribed($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-    $this->RosterUpdate();
-
-    $this->AddToLog("EVENT: Presence (type: subscribed) - Subscription allowed by $from, roster updated");
-  }
-
-
-
-  function Handler_presence_unsubscribe($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-    $this->SendPresence("unsubscribed", $from);
-    $this->RosterUpdate();
-
-    $this->AddToLog("EVENT: Presence (type: unsubscribe) - Request to unsubscribe from $from, was automatically approved, roster updated");
-  }
-
-
-
-  function Handler_presence_unsubscribed($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-    $this->RosterUpdate();
-
-    $this->AddToLog("EVENT: Presence (type: unsubscribed) - Unsubscribed from $from's presence");
-  }
-
-
-
-  // Added By Nathan Fritz
-  function Handler_presence_error($packet)
-  {
-    $from = $this->GetInfoFromPresenceFrom($packet);
-    $this->AddToLog("EVENT: Presence (type: error) - Error in $from's presence");
-  }
-
-
-
-  // ======================================================================
-  // Generic handlers
-  // ======================================================================
-
-
-
-  // Generic handler for unsupported requests
-  function Handler_NOT_IMPLEMENTED($packet)
-  {
-    $packet_type  = $this->_get_packet_type($packet);
-    $from      = call_user_func(array(&$this, "GetInfoFrom" . ucfirst($packet_type) . "From"), $packet);
-    $id        = call_user_func(array(&$this, "GetInfoFrom" . ucfirst($packet_type) . "Id"), $packet);
-
-    $this->SendError($from, $id, 501);
-    $this->AddToLog("EVENT: Unrecognized <$packet_type/> from $from");
-  }
-
-
-
-  // ======================================================================
-  // Third party code
-  // m@d pr0ps to the coders ;)
-  // ======================================================================
-
-
-
-  // xmlize()
-  // (c) Hans Anderson / http://www.hansanderson.com/php/xml/
-
-  function xmlize($data)
-  {
-    $vals = $index = $array = array();
-    $parser = xml_parser_create('utf-8');
-    xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-    xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-    xml_parse_into_struct($parser, $data, $vals, $index);
-    xml_parser_free($parser);
-
-    $i = 0;
-
-    $tagname = $vals[$i]['tag'];
-    $array[$tagname]['@'] = $vals[$i]['attributes'];
-    $array[$tagname]['#'] = $this->_xml_depth($vals, $i);
-
-    return $array;
-  }
-
-
-
-  // _xml_depth()
-  // (c) Hans Anderson / http://www.hansanderson.com/php/xml/
-
-  function _xml_depth($vals, &$i)
-  {
-    $children = array();
-
-    if (isset($vals[$i]['value']))
-    {
-      array_push($children, trim($vals[$i]['value']));
-    }
-
-    while (++$i < count($vals))
-    {
-      switch ($vals[$i]['type'])
-      {
-        case 'cdata':
-          array_push($children, trim($vals[$i]['value']));
-           break;
-
-        case 'complete':
-          $tagname = $vals[$i]['tag'];
-          $size = isset($children[$tagname]) ? sizeof($children[$tagname]) : 0;
-          $children[$tagname][$size]['#'] = isset($vals[$i]['value']) ? trim($vals[$i]['value']) : "";
-          if (isset($vals[$i]['attributes']))
-          {
-            $children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-          }
-          break;
-
-        case 'open':
-          $tagname = $vals[$i]['tag'];
-          $size = isset($children[$tagname]) ? sizeof($children[$tagname]) : 0;
-          if ($vals[$i]['attributes'])
-          {
-            $children[$tagname][$size]['@'] = $vals[$i]['attributes'];
-            $children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
-          }
-          else
-          {
-            $children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
-          }
-          break;
-
-        case 'close':
-          return $children;
-          break;
-      }
-    }
-
-    return $children;
-  }
-
-
-
-  // TraverseXMLize()
-  // (c) acebone@f2s.com, a HUGE help!
-
-  function TraverseXMLize($array, $arrName = "array", $level = 0)
-  {
-    if ($level == 0)
-    {
-      echo "<pre>";
-    }
-
-    while (list($key, $val) = @each($array))
-    {
-      if (is_array($val))
-      {
-        $this->TraverseXMLize($val, $arrName . "[" . $key . "]", $level + 1);
-      }
-      else
-      {
-        echo '$' . $arrName . '[' . $key . '] = "' . $val . "\"\n";
-      }
-    }
-
-    if ($level == 0)
-    {
-      echo "</pre>";
-    }
-  }
-}
-
-
-
-class MakeXML extends Jabber
-{
-
-  function MakeXML()
-  {
-    $nodes = array();
-  }
-
-
-
-  function AddPacketDetails($string, $value = NULL)
-  {
-    if (preg_match("/\(([0-9]*)\)$/i", $string))
-    {
-      $string .= "/[\"#\"]";
-    }
-
-    $temp = @explode("/", $string);
-
-    for ($a = 0; $a < count($temp); $a++)
-    {
-      $temp[$a] = preg_replace("/^[@]{1}([a-z0-9_]*)$/i", "[\"@\"][\"\\1\"]", $temp[$a]);
-      $temp[$a] = preg_replace("/^([a-z0-9_]*)\(([0-9]*)\)$/i", "[\"\\1\"][\\2]", $temp[$a]);
-      $temp[$a] = preg_replace("/^([a-z0-9_]*)$/i", "[\"\\1\"]", $temp[$a]);
-    }
-
-    $node = implode("", $temp);
-
-    // Yeahyeahyeah, I know it's ugly... get over it. ;)
-    echo "\$this->nodes$node = \"" . htmlspecialchars($value) . "\";<br/>";
-    eval("\$this->nodes$node = \"" . htmlspecialchars($value) . "\";");
-  }
-
-
-
-  function BuildPacket($array = NULL)
-  {
-
-    if (!$array)
-    {
-      $array = $this->nodes;
-    }
-
-    if (is_array($array))
-    {
-      array_multisort($array, SORT_ASC, SORT_STRING);
-
-      foreach ($array as $key => $value)
-      {
-        if (is_array($value) && $key == "@")
-        {
-          foreach ($value as $subkey => $subvalue)
-          {
-            $subvalue = htmlspecialchars($subvalue);
-            $text .= " $subkey='$subvalue'";
-          }
-
-          $text .= ">\n";
-
-        }
-        elseif ($key == "#")
-        {
-          $text .= htmlspecialchars($value);
-        }
-        elseif (is_array($value))
-        {
-          for ($a = 0; $a < count($value); $a++)
-          {
-            $text .= "<$key";
-
-            if (!$this->_preg_grep_keys("/^@/", $value[$a]))
-            {
-              $text .= ">";
-            }
-
-            $text .= $this->BuildPacket($value[$a]);
-
-            $text .= "</$key>\n";
-          }
-        }
-        else
-        {
-          $value = htmlspecialchars($value);
-          $text .= "<$key>$value</$key>\n";
-        }
-      }
-
-      return $text;
-    }
-  }
-
-
-
-  function _preg_grep_keys($pattern, $array)
-  {
-    while (list($key, $val) = each($array))
-    {
-      if (preg_match($pattern, $key))
-      {
-        $newarray[$key] = $val;
-      }
-    }
-    return (is_array($newarray)) ? $newarray : FALSE;
-  }
-}
-
-
-
-class CJP_StandardConnector
-{
-  function OpenSocket($server, $port)
-  {
-    if ($this->active_socket = fsockopen($server, $port))
-    {
-      socket_set_blocking($this->active_socket, 0);
-      socket_set_timeout($this->active_socket, 31536000);
-
-      return TRUE;
-    }
-    else
-    {
-      return FALSE;
-    }
-  }
-
-
-
-  function CloseSocket()
-  {
-    return fclose($this->active_socket);
-  }
-
-
-
-  function WriteToSocket($data)
-  {
-    return fwrite($this->active_socket, $data);
-  }
-
-
-
-  function ReadFromSocket($chunksize)
-  {
-    set_magic_quotes_runtime(0);
-    $buffer = fread($this->active_socket, $chunksize);
-    set_magic_quotes_runtime(get_magic_quotes_gpc());
-
-    return $buffer;
-  }
-}
-
-
-
-?>
diff --git a/includes_old/funktion_modem.php b/includes_old/funktion_modem.php
deleted file mode 100644
index 8e93ebf4..00000000
--- a/includes_old/funktion_modem.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-  include "config_modem.php";
-
-  function DialNumber($Number) {
-    global $Dev, $ModemEnable;
-
-    if($ModemEnable) {
-      echo "Dial number: '<u>$Number</u>' was called<br />\n";
-
-      $fp = fopen( $ModemDev, "w");
-    sleep(1);
-    fwrite( $fp, "+++");
-    sleep(1);
-    fwrite( $fp, "ATZ\n");
-    sleep(1);
-    fwrite( $fp, "ATX1\n");
-    sleep(1);
-    fwrite( $fp, "ATD $Number \n");
-    sleep(8);
-    fclose($fp);
-    sleep(1);
-  }
-  else
-    echo "Modem is Disable, number: '<u>$Number</u>' was not called<br />\n";
-}
-
-
-function SetWackeup( $Number, $TimeH, $TimeM)
-{
-  global $WakeupNumber;
-  DialNumber( "$WakeupNumber$TimeH$TimeM$Number");
-}
-
-?>
diff --git a/includes_old/funktion_schichtplan_beamer.php b/includes_old/funktion_schichtplan_beamer.php
deleted file mode 100644
index 85c5ffe8..00000000
--- a/includes_old/funktion_schichtplan_beamer.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/*#######################################################
-#       Aufbau von Standart Feldern                     #
-#######################################################*/
-
-// erstellt ein Array der Reume
-  $sql = "SELECT `RID`, `Name` FROM `Room` ".
-    "WHERE `Show`='Y'". 
-    "ORDER BY `Number`, `Name`;";
-  
-  $Erg = mysql_query($sql, $con);
-  $rowcount = mysql_num_rows($Erg);
-
-  for ($i=0; $i<$rowcount; $i++)
-  {
-    $Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-    $Room[$i]["Name"] = 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`";
-  $Erg = mysql_query($sql, $con);
-  $rowcount = mysql_num_rows($Erg);
-  for ($i=0; $i<$rowcount; $i++)
-  {
-    $EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
-    $EngelType[$i]["Name"]  = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-
-    $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
-      mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-  }                        
-
-
-/*#######################################################
-#  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;
-  //form Config
-  global $debug;
-
-  $Out = "";
-
-  $Out.= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
-
-  $Out.= "<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
-    "<col width=\"45%\">\n".
-    "<col width=\"*\">\n".
-    "</colgroup>\n";
-
-  ///////////////////////////////////////////////////////////////////
-  // SQL abfrage für die benötigten schichten
-  ///////////////////////////////////////////////////////////////////
-  $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
-  $Erg = mysql_query($SQL, $con);
-  
-  $Anzahl = mysql_num_rows($Erg);
-  $Feld=-1;
-  for( $i = 0; $i < $Anzahl; $i++ )
-  {
-    
-    $Temp_TID = mysql_result($Erg, $i, "TID");
-    
-    // wenn sich der Type ändert wird zumnästen feld geweckselt
-    if( ($i==0) || ($Temp_TID_old != $Temp_TID) )
-    {
-      $Feld++;
-      $Temp[$Feld]["free"]=0;
-      $Temp[$Feld]["Engel"]=array();
-    }
-      
-    $Temp[$Feld]["TID"] = $Temp_TID;
-    $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
-    
-    // ist es eine zu vergeben schicht?
-    if( $Temp[$Feld]["UID"] == 0 )
-      $Temp[$Feld]["free"]++;
-    else
-      $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
-    
-    $Temp_TID_old = $Temp[$Feld]["TID"];
-  } // FOR
-  
-
-  ///////////////////////////////////////////////////////////////////
-  // Aus gabe der Schicht
-  ///////////////////////////////////////////////////////////////////
-  if( isset($Temp) && count($Temp) )
-    foreach( $Temp as $TempEntry => $TempValue )
-    {
-      $Out.= "<tr>\n";
-    
-    // ausgabe EngelType
-    $Out.= "<td>". $EngelTypeID[ $TempValue["TID"] ];
-    
-    // ausgabe Eingetragener Engel
-    if( count($TempValue["Engel"]) > 0  )
-    {
-      if( count($TempValue["Engel"]) == 1  )
-        $Out.= " ". trim(Get_Text("inc_schicht_ist")). ":";
-      else 
-        $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":";
-      $Out.= "</td>\n";
-      $Out.= "<td>";
-      
-      foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
-              $Out.= UID2Nick( $TempEngelID ). ", ";
-//              $Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", ";
-      $Out = substr( $Out, 0, strlen($Out)-2 );
-    }
-    else
-    {
-      $Out.= ":</td>\n";
-      $Out.= "<td>\n";
-    }
-      
-    
-    // ausgabe benötigter Engel
-    ////////////////////////////
-    if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y")
-                {
-      if ( $TempValue["free"] > 0)
-      {
-        if( count($TempValue["Engel"]) > 0)
-          $Out.= ", ";
-        $Out.= $TempValue["free"]. "x free ";
-      }
-    }
-    $Out.= "</td>\n";
-    $Out.= "</tr>\n";
-  
-  } // FOREACH
-
-  $Out.= "</table>\n";
-  
-  return $Out;
-} // function Ausgabe_Feld_Inhalt
-
-
-
-/*#######################################################
-#  gibt die engelschischten  für einen Ruam aus  #
-#######################################################*/
-function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) 
-{
-  global $con;
-  
-  $SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ".
-    "WHERE (  (`RID` = '$RID') AND ".
-      "((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ".
-      " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;";
-  
-  $ErgRoom = mysql_query($SQL, $con);
-  $Out= "<td>";
-  if( mysql_num_rows( $ErgRoom)>0 )
-    for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ )
-    {
-      $AnzahlEintraege++;
-      $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), 
-              mysql_result( $ErgRoom, $i-1, "Man"));
-      if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) )
-        $Out.= "<br />";
-//        $Out.= "<hr width=\"95%\" align=\"center\">\n";
-      
-    }
-  else
-    $Out.= "&nbsp;";
-  
-  $Out.= "</td>\n";
-  
-  return $Out;
-}
-
-?>
diff --git a/includes_old/header.php b/includes_old/header.php
deleted file mode 100644
index 9cd2e51d..00000000
--- a/includes_old/header.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-include "header_start.php";
-
-echo "<!DOCTYPE html>\n";
-?>
-<html>
-<head>
-
-<title><?php echo $title; ?> - Engelsystem</title>
-<meta charset="UTF-8" />
-<meta http-equiv="content-type" content="text/html;charset=utf-8" />
-<meta name="content-style-type" content="text/css" />
-<meta name="keywords" content="Engel, Himmelsverwaltung" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta http-equiv="expires" content="0" />
-<meta name="robots" content="index" />
-<meta name="revisit-after" content="1 days" />
-<script type="text/javascript" src="css/grossbild.js"></script>
-<link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
-<link rel="stylesheet" type="text/css" href="../css/base.css" />
-<link rel="stylesheet" type="text/css" href="../css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
-
-<?php
-if (isset ($reload)) {
-	if ($reload == "")
-		$reload = 3330;
-
-	echo "\n<meta http-equiv=\"refresh\" content=\"" . $reload . "; URL=./?reload=" . $reload . "\">\n";
-}
-
-if (isset ($Page["AutoReload"]))
-	echo "\n<meta http-equiv=\"refresh\" content=\"" . $Page["AutoReload"] .
-	"; URL=" . $url . $ENGEL_ROOT . $Page["Name"] . "\">\n";
-
-echo "</head>\n";
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////// B O D Y
-/////////////////////////////////////////////////////////////////////////////////////////////
-echo "<body class=\"background\">\n";
-
-echo '<header><a href="' . $url . $ENGEL_ROOT . '" id="logo"></a></header>';
-
-//ausgabe new message
-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'";
-		$erg = mysql_query($SQL, $con);
-		if (mysql_num_rows($erg) > 0)
-			echo "<br /><a href=\"" . $url . $ENGEL_ROOT .
-			"nonpublic/messages.php\">" . Get_Text("pub_messages_new1") .
-			" " . mysql_num_rows($erg) . " " .
-			Get_Text("pub_messages_new2") . "</a><br /><br />";
-	}
-}
-?>
-<div id="body">
-<div id="menu">
-<?php
-
-
-//ausgaeb Menu
-if (!isset ($_SESSION['Menu']))
-	$_SESSION['Menu'] = "L";
-if ($_SESSION['Menu'] == "L")
-	include ("menu.php");
-?>
-</div>
-<div id="content" class="container">
-<?php
-
-
-echo '<h1>' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . '</h1>';
-echo '<article class="content">';
-
-if (isset ($_SESSION['UID'])) {
-	if (isset ($_SESSION['oldurl']))
-		$BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
-	if (isset ($_SESSION['newurl']))
-		$_SESSION['oldurl'] = $_SESSION['newurl'];
-	$_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
-}
-
-function SetHeaderGo2Back() {
-	global $BACKUP_SESSION_OLDURL;
-	$_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
-}
-
-if ($Page["CVS"] != "Y") {
-	echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
-
-	if (isset ($_SESSION['oldurl']))
-		echo "<a href=\"" . $_SESSION["oldurl"] . "\">hier</a> gehts zur&uuml;ck...\n";
-	else
-		echo "<a href=\"" . $url . $ENGEL_ROOT . "\">hier</a> geht's zur&uuml;ck...\n";
-
-	exit ();
-}
-?>
-
-<!-- ende des header parts //-->
diff --git a/www-ssl_old/ShowUserPicture.php b/www-ssl_old/ShowUserPicture.php
deleted file mode 100644
index 5a222c07..00000000
--- a/www-ssl_old/ShowUserPicture.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-// Momentan keine Avatar-Funktionen
-die();
-
-require_once ('bootstrap.php');
-
-include "config/config.php";
-include "includes/error_handler.php";
-include "config/config_db.php";
-
-if (!isset ($_SESSION))
-	session_start();
-
-include "includes/secure.php";
-
-// Parameter check
-if (!isset ($_GET["UID"]))
-	$_GET["UID"] = "-1";
-
-$SQL = "SELECT * FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "'";
-$res = mysql_query($SQL, $con);
-
-if (mysql_num_rows($res) == 1) {
-	// genuegend rechte
-	if (!isset ($_SESSION['UID']) || $_SESSION['UID'] == -1) {
-		header("HTTP/1.0 403 Forbidden");
-		die("403 Forbidden");
-	}
-
-	// ist das bild sichtbar?
-	if ((mysql_result($res, 0, "show") == "N") AND ($_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
-	$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");
-}
-?>
diff --git a/www-ssl_old/admin/UserPicture.php b/www-ssl_old/admin/UserPicture.php
deleted file mode 100644
index 25f8b54b..00000000
--- a/www-ssl_old/admin/UserPicture.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "UserPicture";
-$header = "Verwaltung der User Picture";
-
-include ("includes/header.php");
-include ("includes/funktion_schichtplan_aray.php");
-
-if (IsSet ($_GET["action"])) {
-	UnSet ($SQL);
-
-	switch ($_GET["action"]) {
-		case 'FormUpload' :
-			echo "Hier kannst Du ein Foto hochladen f&ouml;r:";
-			echo "<form action=\"./UserPicture.php?action=sendPicture\" method=\"post\" enctype=\"multipart/form-data\">\n";
-			echo "\t<select name=\"UID\">\n";
-			$usql = "SELECT * FROM `User` ORDER BY `Nick`";
-			$uErg = mysql_query($usql, $con);
-			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</select>\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
-			echo "\t<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"" . get_cfg_var("post_max_size") . "\">\n";
-			echo "\t(max " . get_cfg_var("post_max_size") . "Byte)<br />\n";
-			echo "\t<input type=\"submit\" value=\"" . Get_Text("upload"), "\">\n";
-			echo "</form>\n";
-			break;
-		case 'sendPicture' :
-			if (($_FILES["file"]["size"] > 0) && (isset ($_POST["UID"]))) {
-				if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) {
-					$data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
-
-					if (GetPicturShow($_POST['UID']) == "")
-						$SQL = "INSERT INTO `UserPicture` " .
-						"( `UID`,`Bild`, `ContentType`, `show`) " .
-						"VALUES ('" . $_POST['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')";
-					else
-						$SQL = "UPDATE `UserPicture` SET " .
-						"`Bild`='$data', " .
-						"`ContentType`='" . $_FILES["file"]["type"] . "' " .
-						"WHERE `UID`='" . $_POST['UID'] . "'";
-
-					echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', " .
-					"MIME-Type: " . $_FILES["file"]["type"] . ", " .
-					$_FILES["file"]["size"] . " Byte " .
-					"for " . UID2Nick($_POST["UID"]);
-				} else
-					Print_Text("pub_einstellungen_send_KO");
-			} else
-				Print_Text("pub_einstellungen_send_KO");
-			break;
-
-		case 'SetN' :
-			if (IsSet ($_GET["UID"])) {
-				echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde gesperrt:<br />";
-				$SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='" . $_GET["UID"] . "'";
-			} else
-				echo "Fehlerhafter Aufruf";
-			break;
-		case 'SetY' :
-			if (IsSet ($_GET["UID"])) {
-				echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde Freigegeben:<br />";
-				$SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='" . $_GET["UID"] . "'";
-			} else
-				echo "Fehlerhafter Aufruf";
-			break;
-		case 'del' :
-			echo "Wollen Sie das Bild von '" . UID2Nick($_GET["UID"]) . "' wirklich l&ouml;schen? " .
-			"<a href=\"./UserPicture.php?action=delYes&UID=" . $_GET["UID"] . "\">Yes</a>";
-			break;
-		case 'delYes' :
-			if (IsSet ($_GET["UID"])) {
-				echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde gel&ouml;scht:<br />";
-				$SQL = "DELETE FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "' LIMIT 1";
-			} else
-				echo "Fehlerhafter Aufruf";
-			break;
-		default :
-			echo "Fehlerhafter Aufruf";
-
-	} //switch
-
-	// Update ???
-	if (IsSet ($SQL)) {
-		// hier muesste das SQL ausgefuehrt werden...
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg == 1)
-			echo "&Auml;nderung wurde gesichert...<br />";
-		else {
-			echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-			echo "<br /><br />" . mysql_error($con) . "<br />($SQL)<br />";
-		}
-	} // Ende Update                
-	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 "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-echo "<tr class=\"contenttopic\">\n";
-echo "\t<td>User</td>\n";
-echo "\t<td>Bild</td>\n";
-echo "\t<td>Status</td>\n";
-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");
-	echo "\t<tr class=\"content\">\n";
-
-	echo "\t\t<td>" . UID2Nick(mysql_result($Erg, $t, "UID")) . "</td>\n";
-	echo "\t\t<td>" . displayPictur($UIDs, 0) . "</td>\n";
-
-	if (GetPicturShow($UIDs) == "Y")
-		echo "\t\t<td><a href=\"./UserPicture.php?action=SetN&UID=$UIDs\">sperren</a></td>\n";
-	elseif (GetPicturShow($UIDs) == "N") echo "\t\t<td><a href=\"./UserPicture.php?action=SetY&UID=$UIDs\">freigeben</a></td>\n";
-	else
-		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</tr>\n";
-} // ende Auflistung Raeume
-echo "</table>";
-
-echo "<br /><a href=\"./UserPicture.php?action=FormUpload\">picture upload</a>\n";
-
-include ("includes/footer.php");
-?>
diff --git a/www-ssl_old/admin/aktiv.php b/www-ssl_old/admin/aktiv.php
deleted file mode 100644
index 8db62f98..00000000
--- a/www-ssl_old/admin/aktiv.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "akive Engel";
-$header = "Liste der aktiven Engel";
-include ("includes/header.php");
-include ("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_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 "</select>";
-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 "</form>\n";
-
-if (Isset ($_POST["ResetActive"])) {
-	$SQLreset = "UPDATE `User` SET `Aktiv`='0'";
-	$ErgReset = db_query($SQLreset, "Reset Active");
-	if ($ErgReset != 1)
-		echo "Fehler beim zuruecksetzen der Activ\n";
-	else
-		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 /><br />\n\n";
-
-//ausgabe tabelle
-echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-echo "<tr class=\"contenttopic\">\n";
-echo "\t<td>" . Get_Text("pub_aktive_Nick") . "</td>\n";
-echo "\t<td>" . Get_Text("pub_aktive_Anzahl") . "</td>\n";
-echo "\t<td>" . Get_Text("pub_aktive_Time") . "</td>\n";
-echo "\t<td>" . Get_Text("pub_aktive_Time") . " Weight</td>\n";
-echo "\t<td>Freeloader " . Get_Text("pub_aktive_Anzahl") . "</td>\n";
-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
-    (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
-    (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f
-    USING(UID)
-  ORDER BY lenReal DESC, nr DESC, UID";
-
-$Erg = mysql_query($SQL, $con);
-echo mysql_error($con);
-$rowcount = mysql_num_rows($Erg);
-
-$aktivecount = 0;
-for ($i = 0; $i < $rowcount; $i++) {
-	echo "\n\n\t<tr class=\"content\">\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, "len") . "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, "lenFree") . "h</td>\n";
-	echo "\t\t<td>" . mysql_result($Erg, $i, "lenReal") . "h</td>\n";
-
-	echo "\t\t<td>";
-	if (IsSet ($_POST["Anzahl"])) {
-		if ($_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal")) {
-			$aktivecount++;
-			if ($_POST["SendType"] == "Show..")
-				echo "show set";
-			else {
-				$SQL2 = "UPDATE `User` SET `Aktiv`='1' WHERE `UID`='" . mysql_result($Erg, $i, "UID") . "' LIMIT 1";
-				$Erg2 = db_query($SQL2, "update Active State");
-				if ($Erg2 != 1)
-					echo "Fehler beim speichern bei Engel " . UID2Nick(mysql_result($Erg, $i, "UID"));
-				else
-					echo "write set";
-			}
-		}
-	}
-	echo "</td>\n";
-	echo "\t</tr>\n";
-} // ende Auflistung aktive Engel 
-
-echo "</table>";
-
-echo "<br />Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br /><br />";
-
-include ("includes/footer.php");
-?>
-
diff --git a/www-ssl_old/admin/dect.php b/www-ssl_old/admin/dect.php
deleted file mode 100644
index 4e9f472a..00000000
--- a/www-ssl_old/admin/dect.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Engelsystem - DECT";
-$header = "DECT send call";
-include ("includes/header.php");
-
-include ("config/config_IAX.php");
-//include ("includes/funktion_modem.php");
-include ("includes/funktion_cron.php");
-
-if (!isset ($_GET["dial"]))
-	$_GET["dial"] = "";
-if (!isset ($_GET["custum"]))
-	$_GET["custum"] = "";
-
-if ($_GET["dial"] == "dial") {
-	if ($_GET["DECT"] == "")
-		$Number = $_GET["custum"];
-	else
-		$Number = $_GET["DECT"];
-
-	if (strlen($_GET["timeh"]) == 1)
-		$_GET["timeh"] = "0" . $_GET["timeh"];
-
-	if (strlen($_GET["timem"]) == 1)
-		$_GET["timem"] = "0" . $_GET["timem"];
-
-	//  SetWackeup( $Number, $_GET["timeh"], $_GET["timem"]);
-	DialNumberIAX($Number, $_GET["timeh"], $_GET["timem"], 0);
-
-	$_GET["custum"] = $Number;
-}
-
-echo "<form action=\"./dect.php\" method=\"GET\">\n";
-echo "<table>\n";
-
-echo "<tr><th>Number</th><th>h:m</th><th></th></tr>\n";
-
-echo "<tr><td>\n";
-// Listet alle Nicks auf
-echo "<select name=\"DECT\">\n";
-echo "\t<option value=\"\">costum</option>\n";
-
-$usql = "SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`";
-$uErg = mysql_query($usql, $con);
-$urowcount = mysql_num_rows($uErg);
-for ($k = 0; $k < $urowcount; $k++) {
-	echo "\t<option value=\"" . mysql_result($uErg, $k, "DECT") . "\">" .
-	mysql_result($uErg, $k, "Nick") .
-	" (" . mysql_result($uErg, $k, "DECT") . ")" .
-	"</option>\n";
-}
-echo "</select>\n";
-
-echo "<input type=\"text\" name=\"custum\" size=\"4\" maxlength=\"4\" value=\"" . $_GET["custum"] . "\">\n";
-echo "</td>\n";
-
-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 "<td><input type=\"submit\" name=\"dial\" value=\"dial\"></td>\n";
-echo "</tr>";
-echo "</table>\n";
-
-echo "</form>";
-
-include ("includes/footer.php");
-?>
-
diff --git a/www-ssl_old/admin/free.php b/www-ssl_old/admin/free.php
deleted file mode 100644
index b45fadcf..00000000
--- a/www-ssl_old/admin/free.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Erzengel";
-$header = "Freie Engel";
-include ("includes/header.php");
-include ("includes/funktion_db_list.php");
-
-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";
-
-#######################################################
-# Ermitteln freier Engel
-# 
-# auslesen aller Engel und dazugehoerige Schichten
-#######################################################
-
-// $SQL= "SELECT User.Nick, Schichtplan.*, Schichtbelegung. * FROM User LEFT JOIN Schichtplan ON User.UID=Schichtbelegung.UID, Schichtplan.SID LEFT JOIN Schichtbelegung.SID WHERE User.UID = Schichtbelegung.UID AND Schichtplan.SID = Schichtbelegung.SID AND Schichtplan.Date < now() and Schichtplan.EndDate > now() ORDER BY Nick";
-
-/* geht nicht ??? unter stabel !!
-$SQL= "SELECT User.Nick, Schichtplan.*, Schichtbelegung.* ".
-  "FROM Schichtplan, User LEFT OUTER ".
-  "JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ".
-  "WHERE Schichtplan.SID = Schichtbelegung.SID AND ".
-    "Schichtplan.Date < now() and ".
-    "Schichtplan.EndDate > now() ".
-  "ORDER BY Nick";
-  
-$SQL =  "SELECT Shifts.*, ShiftEntry.*, User.Nick ".
-  "FROM User ".
-  "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ".
-  "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );";    
-*/
-$SQL = "SELECT Shifts.*, ShiftEntry.* " .
-"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID " .
-"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
-
-//echo "<pre>$SQL</pre>"; 
-
-$Erg = mysql_query($SQL, $con);
-$Zeilen = mysql_num_rows($Erg);
-
-// for ($i = 1; $i < mysql_num_fields($Erg); $i++)
-//  echo "|".mysql_field_name($Erg, $i);
-
-echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-echo "\t<tr class=\"contenttopic\">\n";
-echo "\t\t<td>Nick</td>\n";
-echo "\t\t<td>Schicht</td>\n";
-echo "\t\t<td>Ort</td>\n";
-echo "\t\t<td>Von</td>\n";
-echo "\t\t<td>Bis</td>\n";
-echo "\t</tr>\n";
-
-$inuse = "";
-for ($i = 0; $i < $Zeilen; $i++) {
-	echo "<tr class=\"content\">\n";
-	echo "<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=" . mysql_result($Erg, $i, "UID") . "\">" .
-	UID2Nick(mysql_result($Erg, $i, "UID")) . "</td></a>\n";
-	echo "<td></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, "DateE") . "</td>\n";
-	echo "</tr>\n";
-
-	if ($inuse != "")
-		$inuse .= " OR ";
-	$inuse .= "(Nick = \"" . UID2Nick(mysql_result($Erg, $i, "UID")) . "\")";
-}
-if ($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 "<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";
-
-$SQL = "SELECT Nick, UID, DECT FROM User" . $inuse . ";";
-$Erg = mysql_query($SQL, $con);
-$Zeilen = mysql_num_rows($Erg);
-for ($i = 0; $i < $Zeilen; $i++) {
-	echo "\t<tr class=\"content\">\n";
-	echo "\t\t<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=" . mysql_result($Erg, $i, "UID") . "\">" .
-	mysql_result($Erg, $i, "Nick") . "</a></td>\n";
-	echo "\t\t<td>" . mysql_result($Erg, $i, "DECT") . "</td>\n";
-	echo "\n</tr>\n";
-}
-echo "</table>\n";
-
-include ("includes/footer.php");
-?>
-
diff --git a/www-ssl_old/admin/free_DECT.php b/www-ssl_old/admin/free_DECT.php
deleted file mode 100644
index 4b4e3085..00000000
--- a/www-ssl_old/admin/free_DECT.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-include ("config/config_db.php");
-include ("includes/funktion_db_list.php");
-include ("includes/funktion_user.php");
-
-#######################################################
-# Ermitteln freier Engel
-# 
-# auslesen aller Engel und dazugehoerige Schichten
-#######################################################
-
-$SQL = "SELECT Shifts.*, ShiftEntry.* " .
-"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID " .
-"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";
-
-$Erg = mysql_query($SQL, $con);
-$Zeilen = mysql_num_rows($Erg);
-
-$inuse = "";
-for ($i = 0; $i < $Zeilen; $i++) {
-	if ($inuse != "")
-		$inuse .= " OR ";
-	$inuse .= "(UID = \"" . mysql_result($Erg, $i, "UID") . "\")";
-}
-if ($inuse != "") {
-	$inuse = " WHERE (NOT (" . $inuse . ")) AND (DECT!='')";
-} else {
-	$inuse = " WHERE (DECT!='')";
-}
-
-//##########################################################################################################
-
-$SQL = "SELECT * FROM User" . $inuse . ";";
-$Erg = mysql_query($SQL, $con);
-$Zeilen = mysql_num_rows($Erg);
-for ($i = 0; $i < $Zeilen; $i++) {
-	// get DECT number
-	echo mysql_result($Erg, $i, "DECT") . "\t";
-
-	// get all user rights
-	$SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=" . mysql_result($Erg, $i, "UID") . ";";
-	$Erg_RIGHT = mysql_query($SQL_RIGHT, $con);
-	$UserRights = mysql_fetch_array($Erg_RIGHT);
-
-	foreach ($UserRights as $Var => $Value) {
-		if ((strpos($Var, ".php") === false) AND (strpos($Var, "/") === false) AND (strpos($Var, "UID") === false) AND (is_numeric($Var) === false)) {
-			echo "\"" . $Var . "\"=" . $Value . "\t";
-		}
-	}
-
-	// get shift types
-	$SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=" . mysql_result($Erg, $i, "UID") . " GROUP BY TID;";
-	$Erg_TYPES = mysql_query($SQL_TYPES, $con);
-	$Zeilen_Typen = mysql_num_rows($Erg_TYPES);
-	for ($j = 0; $j < $Zeilen_Typen; $j++) {
-		echo "\"TID_" . TID2Type(mysql_result($Erg_TYPES, $j, "TID")) . "\"=Y\t";
-	}
-
-	echo "\n";
-	//  echo "<br />";
-}
-?>
-
diff --git a/www-ssl_old/admin/schichtplan.1.php b/www-ssl_old/admin/schichtplan.1.php
deleted file mode 100644
index fe8c0384..00000000
--- a/www-ssl_old/admin/schichtplan.1.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h4>Schichtplan</h4>
-<ul class="content">
-<li><a href="./schichtplan.php">Ein-/Austragen</a></li>
-<li><a href="./schichtplan_druck.php">Druckversion</a></li>
-</ul>
\ No newline at end of file
diff --git a/www-ssl_old/admin/schichtplan.php b/www-ssl_old/admin/schichtplan.php
deleted file mode 100644
index 70ef5a6a..00000000
--- a/www-ssl_old/admin/schichtplan.php
+++ /dev/null
@@ -1,362 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Schichtplan";
-$header = "Neue Schichten erfassen";
-$submenus = 1;
-include ("includes/header.php");
-
-function executeSQL($SQL) {
-	global $debug, $con;
-
-	$Erg = mysql_query($SQL, $con);
-	if ($debug)
-		echo "DEBUG SQL: $SQL<br />\n";
-	if ($Erg == 1) {
-		echo "SQL war erfolgreich";
-	} else {
-		echo "SQL Fehler (" . mysql_error($con) . ")";
-	}
-}
-
-if (!IsSet ($_GET["action"])) {
-	echo "Hallo " . $_SESSION['Nick'] . ",<br />\n";
-	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 "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >\n";
-?>
-<table width="100%" class="border" cellpadding="2" cellspacing="1">
-  <tr class="contenttopic">
-    <td></td>
-    <td>Datum</td>
-    <td>Raum</td>
-    <td>Dauer</td>
-    <td>&Auml;ndern</td>
-  </tr>
-<?php
-
-
-	$sql = "SELECT `SID`, `DateS`, `RID`, `Len` FROM `Shifts` " .
-	"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\t<td><input type=\"checkbox\" name=\"SID" . mysql_result($Erg, $i, "SID") . "\" " .
-		"value=\"" . mysql_result($Erg, $i, "SID") . "\"></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") . "'";
-		$Erg2 = mysql_query($sql2, $con);
-		if (mysql_num_rows($Erg2) > 0)
-			echo "\t\t<td>" . mysql_result($Erg2, 0, "Name") . "</td>\n";
-		else
-			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><a href=\"./schichtplan.php?action=change&SID=" .
-		mysql_result($Erg, $i, "SID") . "\">####</a></td>\n";
-		echo "\t</tr>\n";
-	}
-	echo "</table>\n";
-
-	echo "<input type=\"hidden\" name=\"action\" value=\"deleteShifs\">\n";
-	echo "<input type=\"submit\" value=\"L&ouml;schen...\">\n";
-	echo "</form>\n";
-
-} else {
-
-	// aus sicherheitzgr�nden wegen sp�terer genuzung
-	UnSet ($chSQL);
-
-	switch ($_GET["action"]) {
-
-		case 'change' :
-			if (!IsSet ($_GET["SID"])) {
-				echo "Fehlerhafter Aufruf!\n";
-			} else {
-
-				$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "' )";
-				$Erg = mysql_query($sql, $con);
-
-				echo "Schicht ab&auml;ndern: <br />\n";
-
-				// 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") .
-				"\" type=\"text\" size=\"40\" name=\"eDate\"></td></tr>\n";
-				echo "  <tr><td>Raum</td><td>\n<select name=\"eRID\">\n";
-
-				$sql2 = "SELECT `RID`, `Name`, `FromPentabarf` FROM `Room`";
-				$Erg2 = mysql_query($sql2, $con);
-				$rowcount = mysql_num_rows($Erg2);
-				$FromPentabarf = "N";
-				for ($i = 0; $i < $rowcount; $i++) {
-					$RID = mysql_result($Erg2, $i, "RID");
-					echo "   <option value=\"" . $RID . "\"";
-					if ($RID == mysql_result($Erg, 0, "RID")) {
-						echo " selected";
-						$FromPentabarf = mysql_result($Erg2, $i, "FromPentabarf");
-					}
-					echo ">" . mysql_result($Erg2, $i, "Name") . "</option>\n";
-				}
-				echo "  </select>\n</td></tr>\n";
-
-				echo "  <tr><td>Dauer in h</td>" .
-				"<td><input value=\"" . mysql_result($Erg, 0, "Len") .
-				"\" type=\"text\" size=\"40\" name=\"eDauer\"></td></tr>\n";
-				echo "  <tr><td>Beschreibung</td>" .
-				"<td><input value=\"" . mysql_result($Erg, 0, "Man") .
-				"\" type=\"text\" size=\"40\" name=\"eName\"></td></tr>\n";
-				echo "  <tr><td>URL</td>" .
-				"<td><input value=\"" . mysql_result($Erg, 0, "URL") .
-				"\" type=\"text\" size=\"40\" name=\"eURL\"></td></tr>\n";
-				if ($FromPentabarf == "Y") {
-					echo "  <tr><td></td>" .
-					"<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
-				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 "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";
-
-				//Freie Engelschichten
-				$sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND `UID`='0'";
-				$Erg3 = mysql_query($sql3, $con);
-				$rowcount = mysql_num_rows($Erg3);
-
-				echo "Folgende Engelschichten sind noch nicht vergeben.\n";
-				echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:<br />\n";
-				for ($j = 0; $j < $rowcount; $j++) {
-					$TID = mysql_result($Erg3, $j, 0);
-					echo "<a href=\"./schichtplan.php?action=engelshiftdel&SID=" . $_GET["SID"] . "&TID=$TID\">" .
-					"freie " . TID2Type($TID) . Get_Text("inc_schicht_Engel") . "schicht loeschen</a><br />\n";
-				}
-				echo "<br /><hr>\n\n\n\n";
-
-				//Ausgabe eingetragener schischten
-				$sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND NOT `UID`='0'";
-				$Erg3 = mysql_query($sql3, $con);
-				$rowcount = mysql_num_rows($Erg3);
-
-				echo "Folgende Engel Sind fuer die Schicht eingetargen.\n";
-				echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:<br />\n";
-				echo "<table border=\"1\">\n" .
-				"<tr class=\"contenttopic\">" .
-				"<th>nick</th>" .
-				"<th>type</th>" .
-				"<th>normal</th>" .
-				"<th>freeloader :-(</th>" .
-				"</tr>";
-
-				for ($j = 0; $j < $rowcount; $j++) {
-					$userUID = mysql_result($Erg3, $j, "UID");
-					echo "\t<tr>\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><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</tr>\n";
-				} // FOR
-
-				echo "</table><br /><hr>\n\n\n\n";
-
-				//Nachtragen von Engeln
-				echo "Hat ein anderer Engel die Schicht &uuml;bernommen, trage ihn bitte ein:";
-				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=\"engeladd\">\n";
-
-				// Listet alle Nicks auf
-				echo "<select name=\"UIDs\">\n";
-				if ($FromPentabarf != "Y") {
-					echo "\t<option value=\"0\">--neu--</option>\n";
-				}
-
-				$usql = "SELECT * FROM `User` ORDER BY `Nick`";
-				$uErg = mysql_query($usql, $con);
-				$urowcount = mysql_num_rows($uErg);
-				for ($k = 0; $k < $urowcount; $k++) {
-					echo "\t<option value=\"" . mysql_result($uErg, $k, "UID") . "\">" .
-					mysql_result($uErg, $k, "Nick") .
-					"</option>\n";
-				}
-				echo "</select>\n";
-
-				echo " als \n";
-
-				// holt eine liste der ben�tigten Engel zu dieser Schischt
-				$sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` ";
-				$sql3 .= "WHERE (`SID`='" . $_GET["SID"] . "' AND `UID`='0') ";
-				$sql3 .= "GROUP BY `SID`, `TID`, `UID` ";
-				$Erg3 = mysql_query($sql3, $con);
-				$i = -1;
-				while (++ $i < mysql_num_rows($Erg3)) {
-					$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
-				echo "<select name=\"TID\">\n";
-				$SQL2 = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-				$Erg2 = mysql_query($SQL2, $con);
-				for ($l = 0; $l < mysql_num_rows($Erg2); $l++) {
-					$EngelTID = mysql_result($Erg2, $l, "TID");
-					echo "<option value=\"$EngelTID\">";
-					echo mysql_result($Erg2, $l, "Name") . Get_Text("inc_schicht_engel");
-					if (!isset ($EngelNeed[$EngelTID]))
-						echo " (0)";
-					else
-						echo " (" . $EngelNeed[$EngelTID] . ")";
-					echo "</option>\n";
-				}
-				echo "</select>\n";
-
-				echo "<input type=\"submit\" value=\"eintragen...\">\n";
-
-				echo "<br />\n<input value=\"1\" type=\"text\" size=\"5\" name=\"eAnzahlNew\"> Anzahl New\n";
-
-				echo "</form>";
-
-			} // IF ISSET(
-			break;
-
-		case 'engeladd' :
-			if ($_GET["UIDs"] > 0) {
-
-				$SQL = "SELECT * FROM `ShiftEntry` " .
-				"WHERE (`SID`='" . $_GET["SID"] . "' AND `TID`='" . $_GET["TID"] . "' AND `UID`='0')";
-				$ERG = mysql_query($SQL, $con);
-				if (mysql_num_rows($ERG) != 0) {
-					$chSQL = "UPDATE `ShiftEntry` SET " .
-					"`UID`='" . $_GET["UIDs"] . "', `Comment`='shift added by " . $_SESSION['Nick'] . "' " .
-					"WHERE (`SID`='" . $_GET["SID"] . "' AND " .
-					"`TID`='" . $_GET["TID"] . "' AND `UID`='0' ) LIMIT 1";
-				} else {
-					$chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (" .
-					"'" . $_GET["SID"] . "', '" . $_GET["TID"] . "', " .
-					"'" . $_GET["UIDs"] . "', 'shift added by " . $_SESSION['Nick'] . "')";
-				}
-				echo "Es wird folgende Schicht zus&auml;tzlich eingetragen:<br />\n";
-				echo "Engel: " . UID2Nick($_GET["UIDs"]) . "<br />\n";
-				echo "Bemerkung: Schicht eingetragen durch Erzengel " . $_SESSION['Nick'] . "<br />\n<br />\n";
-			} else {
-				echo "Es wird folgende Schicht wurde " . $_GET["eAnzahlNew"] . "x zus&auml;tzlich eingetragen:<br />\n";
-				for ($i = 0; $i < $_GET["eAnzahlNew"]; $i++) {
-					echo "$i. <br />\n";
-					$SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (";
-					$SQL .= "'" . $_GET["SID"] . "', '" . $_GET["TID"] . "', '0', NULL)";
-					$ERG = mysql_query($SQL, $con);
-					if ($debug)
-						echo "DEBUG SQL: $SQL<br />\n";
-					if ($ERG == 1) {
-						echo "&Auml;nderung wurde gesichert...<br />";
-					} else {
-						echo "Fehler beim speichern... bitte noch ein mal probieren :)<br />";
-						echo mysql_error($con);
-					}
-					echo "Es wird eine weitere Schicht eingetragen:<br /><br />\n";
-				}
-			}
-			break;
-
-		case 'engeldel' :
-			$chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='" . $_GET["SID"] .
-			"' AND `UID`='" . $_GET["UIDs"] . "') LIMIT 1";
-			if (isset ($_GET["freeloader"]) && $_GET["freeloader"] == 1) {
-				$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "' )";
-				$Erg = mysql_query($sql, $con);
-				if (mysql_num_rows($Erg) == 1) {
-					$UID = $_GET["UIDs"];
-					$Length = mysql_result($Erg, 0, "Len");
-					$Comment = "Start: " . mysql_result($Erg, 0, "DateS") . "; " .
-					"Beschreibung: " . mysql_result($Erg, 0, "Man") . "; " .
-					"Removed by " . $_SESSION['Nick'];
-					$ch2SQL = "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) " .
-					"VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');";
-				}
-			}
-			break;
-
-		case 'engelshiftdel' :
-			$chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND `TID`='" .
-			$_GET["TID"] . "' AND `UID`='0' LIMIT 1";
-			break;
-
-		case 'changesave' :
-			$query = mysql_query("SELECT DATE_ADD('" . $_GET["eDate"] . "', INTERVAL '+0 " . $_GET["eDauer"] . "' DAY_HOUR)", $con);
-			$enddate = mysql_fetch_row($query);
-
-			$chSQL = "UPDATE `Shifts` SET " .
-			"`DateS`='" . $_GET["eDate"] . "', " .
-			"`DateE`='" . $enddate[0] . "', " .
-			"`RID`='" . $_GET["eRID"] . "', " .
-			"`Len`='" . $_GET["eDauer"] . "', " .
-			"`Man`='" . $_GET["eName"] . "', " .
-			"`URL`='" . $_GET["eURL"] . "' " .
-			"WHERE `SID`='" . $_GET["SID"] . "'";
-			SetHeaderGo2Back();
-			break;
-
-		case 'delete' :
-			$chSQL = "DELETE FROM `Shifts` WHERE `SID`='" . $_GET["SID"] . "' LIMIT 1";
-			$ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "'";
-			SetHeaderGo2Back();
-			break;
-
-		case 'deleteShifs' :
-			foreach ($_GET as $k => $v)
-				if (strpos(" " . $k, "SID") == 1) {
-					echo "Shifts $v wird gel�scht...";
-					executeSQL("DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1");
-					echo "<br />\n";
-					echo "ShiftEntry $v wird gel�scht...";
-					executeSQL("DELETE FROM `ShiftEntry` WHERE `SID`='$v'");
-					echo "<br /><br />\n";
-				}
-			break;
-
-	} // end switch
-
-	if (IsSet ($chSQL)) {
-		//     echo $chSQL;
-		// hier muesste das SQL ausgefuehrt werden...
-		$Erg = mysql_query($chSQL, $con);
-		if ($debug)
-			echo "DEBUG SQL: $chSQL<br />\n";
-		if ($Erg == 1) {
-			echo "&Auml;nderung wurde gesichert...<br />";
-			if ($debug)
-				echo "DEBUG: ergebniss" . $Erg . "<br />\n";
-			if (IsSet ($ch2SQL)) {
-				$Erg = mysql_query($ch2SQL, $con);
-				if ($debug)
-					echo "DEBUG SQL: $ch2SQL<br />\n";
-				if ($debug)
-					echo "DEBUG: ergebniss" . $Erg . "<br />\n";
-			}
-		} else {
-			echo "Fehler beim speichern... bitte noch ein mal probieren :)<br />";
-			echo mysql_error($con);
-		}
-	} // Ende Update
-
-}
-
-include ("includes/footer.php");
-?>
diff --git a/www-ssl_old/admin/schichtplan_druck.1.php b/www-ssl_old/admin/schichtplan_druck.1.php
deleted file mode 100644
index 30761390..00000000
--- a/www-ssl_old/admin/schichtplan_druck.1.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h4 class="menu"> Schichtplan </h4>
-
-<li><a href="./schichtplan.php">Ein-/Austragen</a></li>
-<li><a href="./schichtplan_druck.php">Druckversion</a></li>
-
diff --git a/www-ssl_old/admin/schichtplan_druck.php b/www-ssl_old/admin/schichtplan_druck.php
deleted file mode 100644
index 3e856c5e..00000000
--- a/www-ssl_old/admin/schichtplan_druck.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Himmel";
-$header = "Schichtpl&auml;ne";
-$submenus = 1;
-
-if (!IsSet ($_GET["action"])) {
-	include ("includes/header.php");
-	include ("includes/funktionen.php");
-	include ("includes/funktion_schichtplan_aray.php");
-	include ("includes/funktion_schichtplan.php");
-
-	echo "Hallo " . $_SESSION['Nick'] . "<br />\n" .
-	"auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. W&auml;hle hierf&uuml;r ein Datum und den Raum:\n" .
-	"<br />\n";
-
-	foreach ($VeranstaltungsTage as $k => $v) {
-
-		$res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;", $con);
-		for ($i = 0; $i < mysql_num_rows($res); $i++) {
-			$Tag = $VeranstaltungsTage[$k];
-			$RID = mysql_result($res, $i, "RID");
-			$Rname = mysql_result($res, $i, "Name");
-			echo "\t<a href=\"./schichtplan_druck.php?action=1&Raum=$RID&ausdatum=$Tag\" target=\"_blank\">$Tag $Rname</a><br />\n";
-		}
-		echo "<br />\n";
-	}
-	echo "<br /><br />";
-
-	include ("includes/footer.php");
-} else //#################################################################
-	{
-	if (IsSet ($_GET["Raum"]) AND IsSet ($_GET["ausdatum"])) {
-		$Raum = $_GET["Raum"];
-		$ausdatum = $_GET["ausdatum"];
-
-		include ("config/config_db.php");
-		include ("config/config.php");
-		include ("includes/secure.php");
-		//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
-		$_SESSION['CVS']["admin/schichtplan.php"] = "N";
-		include ("includes/funktion_lang.php");
-		include ("includes/funktion_schichtplan.php");
-		include ("includes/funktion_schichtplan_aray.php");
-		include ("includes/funktion_user.php");
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Schichtplan</title>
-<meta name="keywords" content="Engel, Himmelsverwaltung">
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<meta http-equiv="expires" content="0">
-<meta name="robots" content="index">
-<meta name="revisit-after" content="1 days">
-<meta http-equiv="content-language" content="de">
-</head>
-<body>
-
-<h1>Schichtplan</h1>
-
-<table>
-  <tr>
-    <td width="250" align="left">
-      <span style="font-weight:bold;font-size:100%">Datum:</span> 
-      <span style="font-weight:bold;font-size:200%"><?php echo $ausdatum; ?></span>
-    </td>
-    <td width="350" align="right">
-      <span style="font-weight:bold;font-size:100%">Raum:</span>
-      <span style="font-weight:bold;font-size:200%"><?php echo $RoomID[$Raum]; ?> </span>
-    </td>
-  </tr>
-</table>
-
-<table border="2" width="650" class="border" cellpadding="2" cellspacing="1">
- 
-<!--Ausgabe Spalten �berschrift-->
-
-  <tr class="contenttopic">
-    <th bgcolor="#E0E0E0">Uhrzeit</th>
-    <th bgcolor="#E0E0E0">Schichtplanbelegung</th>
-  </tr>
-<?php
-
-
-		//Zeit Ausgeben
-		for ($i = 0; $i < 24; $i++)
-			for ($j = 0; $j < $GlobalZeileProStunde; $j++) {
-				$Spalten[$i * $GlobalZeileProStunde + $j] = "\t<tr class=\"content\">\n";
-				if ($j == 0) {
-					$Spalten[$i * $GlobalZeileProStunde + $j] .= "\t\t<td rowspan=\"$GlobalZeileProStunde\">";
-					if ($i < 10)
-						$Spalten[$i * $GlobalZeileProStunde + $j] .= "0";
-					$Spalten[$i * $GlobalZeileProStunde + $j] .= "$i:";
-					if ((($j * 60) / $GlobalZeileProStunde) < 10)
-						$Spalten[$i * $GlobalZeileProStunde + $j] .= "0";
-					$Spalten[$i * $GlobalZeileProStunde + $j] .= (($j * 60) / $GlobalZeileProStunde) . "</td>\n";
-
-				}
-			}
-
-		CreateRoomShifts($Raum);
-
-		// Ausgabe Zeilen
-		for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++)
-			echo $Spalten[$i];
-		// Ende
-		echo "</table>\n";
-
-		echo "Stand: " . gmdate("Y-m-d H:i") . "\n";
-		echo "</body>\n";
-		echo "</html>\n";
-
-	} //isset($Vars)
-} //isset($Action)
-?>
diff --git a/www-ssl_old/admin/shiftadd.php b/www-ssl_old/admin/shiftadd.php
deleted file mode 100644
index d6b1f8ff..00000000
--- a/www-ssl_old/admin/shiftadd.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Schicht Hinzufügen";
-$header = "Neue Schichten erfassen";
-
-include ("includes/header.php");
-
-$Time = time() + 3600 + 3600;
-
-echo "Hallo " . $_SESSION['Nick'] . ",<br />\n";
-
-// erstellt ein Array der Reume
-$sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`";
-$Erg = mysql_query($sql, $con);
-$rowcount = mysql_num_rows($Erg);
-
-for ($i = 0; $i < $rowcount; $i++) {
-	$Room[$i]["RID"] = mysql_result($Erg, $i, "RID");
-	$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-}
-
-// erstellt ein Aray der Engeltypen
-$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-$Erg = mysql_query($sql, $con);
-$rowcount = mysql_num_rows($Erg);
-
-for ($i = 0; $i < $rowcount; $i++) {
-	$EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID");
-	$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']['RID'] = "";
-	$_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time);
-	$_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time);
-	$_SESSION['shiftadd.php']['STime'] = "10";
-	$_SESSION['shiftadd.php']['MoreThenOne'] = "ON";
-	$_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time);
-	$_SESSION['shiftadd.php']['ETime'] = "12";
-	$_SESSION['shiftadd.php']['len'] = "2";
-	$_SESSION['shiftadd.php']['NachtON'] = "OFF";
-	$_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";
-if (!isset ($_GET["MoreThenOne"]))
-	$_GET["MoreThenOne"] = "OFF";
-if (isset ($_GET["SchichtName"])) {
-	foreach ($_GET as $k => $v) {
-		$_SESSION['shiftadd.php'][$k] = $v;
-	}
-}
-
-if (!IsSet ($_GET["action"]))
-	$_GET["action"] = "new";
-
-switch ($_GET["action"]) {
-	case 'new' :
-?>
-Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende der Schichten eintragen.
-&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']; ?>" >
-  <table>
-  <tr>
-    <td align="right">Name:</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
-
-
-		foreach ($Room As $RTemp) {
-			echo "\t<option value=\"" . $RTemp["RID"] . "\"";
-			if ($RTemp["RID"] == $_SESSION["shiftadd.php"]["RID"])
-				echo " SELECTED";
-			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>
-  </tr>
-  <tr>
-    <td align="right">Beginn:</td>
-    <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>
-  </tr>
-  <tr>
-    <td align="right">More then One</td>
-    <td><input type="checkbox" name="MoreThenOne" value="ON" <?php
-
-
-		if ($_SESSION["shiftadd.php"]["MoreThenOne"] == "ON")
-			echo " CHECKED";
-?>></td>
-  </tr>
-  <tr>
-    <td align="right">End:</td>
-    <td>Date<input type="text" name="EDatum" size="5" value="<?php echo $_SESSION["shiftadd.php"]["EDatum"]; ?>">
-        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>
-  </tr>
-  <tr>
-    <td align="right">Sonderschichten ein:</td>
-    <td><input type="checkbox" name="NachtON" value="ON" <?php
-
-
-		if ($_SESSION["shiftadd.php"]["NachtON"] == "ON")
-			echo " CHECKED";
-?>></td>
-  </tr>
-  <tr>
-    <td align="right">Sonder in h (Time;Time):</td>
-    <td><input type="text" name="len_night" size="50" value="<?php echo $_SESSION["shiftadd.php"]["len_night"]; ?>"></td>
-  </tr>
-  
-  <tr><td><u>Anzahl Engel je Type:</u></td></tr>
-<?php
-
-
-		foreach ($EngelType As $TTemp) {
-			echo "  <tr><td align=\"right\">" . $TTemp["Name"] . ":</td>\n";
-			echo "      <td><input type=\"text\" name=\"EngelType" . $TTemp["TID"] . "\" size=\"5\" value=\"";
-			if (isset ($_SESSION["shiftadd.php"]["EngelType" . $TTemp["TID"]]))
-				echo $_SESSION["shiftadd.php"]["EngelType" . $TTemp["TID"]];
-			else
-				echo "0";
-			echo "\"></td>\n";
-		}
-?>
-</table>
- <br />
-<input type="hidden" name="OnlyShow" value="ON">
-<input type="hidden" name="action" value="newsave">
-<input type="submit" value="zeig mal Gabriel!">
-</form>
-
-<?php
-
-
-		break; // Ende new
-
-	case 'newsave' :
-		if (isset ($_GET["SDatum"]) && ($_GET["len"] > 0)) {
-			$lenOrg = $_GET["len"];
-			if ($_GET["NachtON"] == "ON") {
-				$lenArrayDummy = explode("-", $_GET["len_night"]);
-				foreach ($lenArrayDummy as $Temp) {
-					if (isset ($Temp2))
-						$lenArray[intval($Temp2)] = intval($Temp) - intval($Temp2);
-					$Temp2 = $Temp;
-				} //foreach
-			} //IF( $NachtON == "ON" )
-
-			echo "<table border=\"1\">\n";
-			echo "<tr>\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\">len</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\">Entry 'Shifts'</td>\n";
-			echo "\t<td valign=\"top\" align=\"center\">SID</td>\n";
-			echo "\t<td valign=\"top\" align=\"center\">Entrys</td>\n";
-			echo "</tr>\n";
-
-			$DateEnd = $_GET["SDatum"];
-			$TimeEnd = intval($_GET["STime"]);
-			$len = 0;
-			do {
-				// define Start time
-				$Date = $DateEnd;
-				$Time = $TimeEnd;
-				$_DateS = $_GET["MonthJahr"] . "-" . $Date . " " . $Time . ":00:00";
-
-				// define End time
-				if ($_GET["NachtON"] == "ON") {
-					if (!isset ($lenArray[$Time]))
-						die("Zeit $Time h nicht definiert.");
-					$_GET["len"] = $lenArray[$Time];
-					if ($_GET["len"] < 1)
-						die("len <1");
-				}
-				$TimeEnd = $Time + $_GET["len"];
-
-				//Tages�berschreitung
-				while ($TimeEnd >= 24) {
-					$TimeEnd -= 24;
-					$DateEnd += 1;
-				}
-				//ist schischt zu lang dan verk�rzen
-				if ($DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"])) {
-					$_GET["len"] -= ($DateEnd - $_GET["EDatum"]) * 24;
-					$_GET["len"] -= ($TimeEnd - $_GET["ETime"]); // -(-) ->> +
-					$DateEnd = $_GET["EDatum"];
-					$TimeEnd = $_GET["ETime"];
-				}
-				$_DateE = $_GET["MonthJahr"] . "-" . $DateEnd . " " . $TimeEnd . ":00:00";
-
-				if ($_DateS != $_DateE)
-					CreateNewEntry();
-
-				if ($_GET["MoreThenOne"] != "ON")
-					break;
-				if ($DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]))
-					break;
-			}
-			while (true);
-			echo "</table>";
-
-			if ($_GET["OnlyShow"] == "ON") {
-				echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\">";
-				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=\"SDatum\" value=\"" . $_GET["SDatum"] . "\">";
-				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=\"EDatum\" value=\"" . $_GET["EDatum"] . "\">";
-				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=\"RID\" value=\"" . $_GET["RID"] . "\">";
-				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=\"OnlyShow\" value=\"OFF\">";
-				foreach ($EngelType As $TTemp) {
-					$Temp = "EngelType" . $TTemp["TID"];
-					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=\"submit\" value=\"mach mal Gabriel!\">";
-				echo "\n</form>";
-			} //if
-		} //IF
-		break;
-
-	case 'engeldel' :
-		break;
-
-} // end switch
-
-function CreateNewEntry() {
-	global $con, $_DateS, $_DateE, $EngelType, $debug;
-	foreach ($EngelType As $TTemp) {
-		$Temp = "EngelType" . $TTemp["TID"];
-		global $$Temp;
-	}
-
-	echo "<tr>\n";
-
-	echo "\t<td>$_DateS</td>\n";
-	echo "\t<td>$_DateE</td>\n";
-	echo "\t<td>" . $_GET["len"] . "</td>\n";
-	echo "\t<td>" . $_GET["RID"] . "</td>\n";
-	echo "\t<td>" . $_GET["SchichtName"] . "</td>\n";
-
-	// Ist eintarg schon vorhanden?  
-	$SQL = "SELECT `SID` FROM `Shifts` ";
-	$SQL .= "WHERE (" .
-	"`DateS` = '" . $_DateS . "' AND " .
-	"`DateE` = '" . $_DateE . "' AND " .
-	"`RID` = '" . $_GET["RID"] . "');";
-	$Erg = mysql_query($SQL, $con);
-
-	if (mysql_num_rows($Erg) != 0)
-		echo "\t<td>exists</td>";
-	elseif ($_GET["OnlyShow"] == "OFF") {
-		// erstellt Eintrag in Shifts f�r die algemeine schicht
-		$SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( ";
-		$SQL .= "'" . $_DateS . "', '" . $_DateE . "', ";
-		$SQL .= "'" . $_GET["len"] . "', '" . $_GET["RID"] . "', ";
-		$SQL .= "'" . $_GET["SchichtName"] . "');";
-		$Erg = db_query($SQL, "create shift");
-
-		$SQLFail = "\n\t<br />[" . $SQL . "]";
-
-		if ($Erg == 1)
-			echo "\t<td>pass</td>\n";
-		else
-			echo "\t<td>fail <br />\n<u>" . mysql_error($con) . "</u>$SQLFail</td>\n";
-
-	} else
-		echo "\t<td>only show</td>\n";
-
-	// sucht SID von eingetragennen schiten
-	$SQL = "SELECT SID FROM `Shifts` ";
-	$SQL .= "WHERE (" .
-	"`DateS` = '" . $_DateS . "' AND " .
-	"`DateE` = '" . $_DateE . "' AND " .
-	"`Len` = '" . $_GET["len"] . "' AND " .
-	"`RID` = '" . $_GET["RID"] . "');";
-	$Erg = mysql_query($SQL, $con);
-	if (mysql_num_rows($Erg) == 0)
-		echo "\t<td>?</td>";
-	else {
-		$SID = mysql_result($Erg, 0, "SID");
-		echo "\t<td>" . $SID . "</td>";
-	}
-
-	// erstellt f�r jeden Engeltypen die eintrage in 'ShiftEntry'
-	echo "\t<td>";
-	foreach ($EngelType As $TTemp) {
-		$Temp = "EngelType" . $TTemp["TID"];
-
-		if ($_GET[$Temp] > 0) {
-			$i = 0;
-			echo $_GET[$Temp] . " " . $TTemp["Name"] . "<br />\t";
-			while ($i++ < $_GET[$Temp]) {
-				if ($_GET["OnlyShow"] == "OFF") {
-					$SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (";
-					$SQL .= "'" . $SID . "', ";
-					$SQL .= "'" . $TTemp["TID"] . "');";
-
-					$Erg = mysql_query($SQL, $con);
-
-					if ($debug)
-						$SQLFail = "\n\t<br />[" . $SQL . "]";
-
-					if ($Erg == 1)
-						echo "'pass' ";
-					else
-						echo "'fail' <u>" . mysql_error($con) . "</u>$SQLFail</td>\n";
-
-				} else
-					echo "+";
-			}
-			echo "<br />";
-		} // IF $$TEMP
-	} // FOREACH
-	echo "</td>";
-
-	echo "</tr>\n";
-}
-
-include ("includes/footer.php");
-?>
diff --git a/www-ssl_old/admin/tshirt.php b/www-ssl_old/admin/tshirt.php
deleted file mode 100644
index 9a8e7010..00000000
--- a/www-ssl_old/admin/tshirt.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "T-Shirt-Ausgabe";
-$header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
-include ("includes/header.php");
-include ("includes/funktion_db_list.php");
-
-If (IsSet ($_GET["aktiv"])) {
-
-	$SQL = "UPDATE `User` SET `Tshirt`='1' WHERE `UID`='" . $_GET["aktiv"] . "' limit 1";
-	$Erg = mysql_query($SQL, $con);
-	if ($Erg == 1) {
-	} else {
-		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 />
-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
-
-
-$SQL = "SELECT * FROM `User` WHERE (`Aktiv`='1') ORDER BY `Nick` ASC";
-$Erg = mysql_query($SQL, $con);
-
-$rowcount = mysql_num_rows($Erg);
-?>
-<table width="100%" class="border" cellpadding="2" cellspacing="1">
-        <tr class="contenttopic">
-   <td>Nick</td>
-   <td>Aktiv?</td>
-   <td>Gr&ouml;sse</td>
-   <td>T-Shirt ausgeben:</td>
-  </td>
-<?php
-
-
-for ($i = 0; $i < $rowcount; $i++) {
-	echo "\t<tr class=\"content\">\n";
-	$eUID = mysql_result($Erg, $i, "UID");
-	echo "\t\t<td>" . UID2Nick($eUID) . "</td>\n";
-	echo "\t\t<td>" . mysql_result($Erg, $i, "Aktiv") . "</td>\n";
-	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>";
-	} else {
-		echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
-	}
-	echo "\t</tr>\n";
-}
-
-echo "</table>";
-
-include ("includes/footer.php");
-?>
-
diff --git a/www-ssl_old/admin/userArrived.php b/www-ssl_old/admin/userArrived.php
deleted file mode 100644
index 93857d2e..00000000
--- a/www-ssl_old/admin/userArrived.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Engel Arrived";
-$header = "Engel was arrived";
-include ("includes/header.php");
-include ("includes/funktion_db_list.php");
-
-If (IsSet ($_GET["arrived"])) {
-
-	$SQL = "UPDATE `User` SET `Gekommen`='1' WHERE `UID`='" . $_GET["arrived"] . "' limit 1";
-	$Erg = db_query($SQL, "Set User as Gekommen");
-	if ($Erg == 1) {
-		echo "<h2>" . Get_Text("pri_userArrived_WriteOK") . " \"" . UID2Nick($_GET["arrived"]) . "\"</h2>";
-	} else {
-		echo "<h1>" . Get_Text("pri_userArrived_WriteError") . " \"" . UID2Nick($_GET["arrived"]) . "\"</h1>";
-	}
-}
-
-echo Get_Text("pri_userArrived_Text1") . "<br />";
-echo Get_Text("pri_userArrived_Text2") . "<br /><br />";
-
-echo Get_Text("pri_userArrived_TableToppic");
-$SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC";
-$Erg = mysql_query($SQL, $con);
-
-$rowcount = mysql_num_rows($Erg);
-
-echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-echo "\t<tr class=\"contenttopic\">\n";
-echo "\t\t<td>" . Get_Text("pri_userArrived_TableTD_Nick") . "</td>\n";
-echo "\t\t<td>" . Get_Text("pri_userArrived_TableTD_ArrivedShow") . "</td>\n";
-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";
-	$eUID = mysql_result($Erg, $i, "UID");
-	echo "\t\t<td>" . UID2Nick($eUID) . "</td>\n";
-	echo "\t\t<td>" . mysql_result($Erg, $i, "Gekommen") . "</td>\n";
-
-	if (mysql_result($Erg, $i, "Gekommen") == "1") {
-		echo "\t\t<td>" . Get_Text("pri_userArrived_TableEntry_Arrived") . "</td>";
-	} else {
-		echo "\t\t<td><a href=\"./userArrived.php?arrived=$eUID\">" . Get_Text("pri_userArrived_TableEntry_Set") . "</a></td>";
-	}
-	echo "\t</tr>\n";
-}
-echo "</table>";
-
-include ("includes/footer.php");
-?>
-
diff --git a/www-ssl_old/nonpublic/myschichtplan_ical.php b/www-ssl_old/nonpublic/myschichtplan_ical.php
deleted file mode 100644
index ff74fef0..00000000
--- a/www-ssl_old/nonpublic/myschichtplan_ical.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-include ("includes/header_start.php");
-
-include ("includes/funktion_schichtplan_aray.php");
-
-$SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` " .
-"INNER JOIN `ShiftEntry` " .
-"ON `Shifts`.`SID`=`ShiftEntry`.`SID` " .
-"WHERE `ShiftEntry`.`UID`='" . $_SESSION['UID'] . "' " .
-"ORDER BY `DateS`";
-$erg = mysql_query($SQL, $con);
-
-//HEADER
-header("Content-Type: text/x-vCalendar");
-header("Content-Disposition: attachment; filename=\"Schichtplan.ics\"");
-
-//DATA
-echo "BEGIN:VCALENDAR\n";
-echo "PRODID:-//Engelsystem//DE-EN\n";
-echo "VERSION:2.0\n";
-echo "PRODID:" . md5('icalschichtplan:' . $_SESSION['UID']) . "\n";
-echo "METHOD:PUBLISH\n";
-echo "CALSCALE:GREGORIAN\n";
-echo "METHOD:PUBLISH\n";
-echo "X-WR-CALNAME;VALUE=TEXT:" . "Himmel - Schichtplan\n";
-
-for ($i = 0; $i < mysql_num_rows($erg); $i++) {
-	echo "BEGIN:VEVENT\n";
-	echo "UID:" . md5(mysql_result($erg, $i, "Man") . mysql_result($erg, $i, "DateS")) . "\n";
-	echo "METHOD:PUBLISH\n";
-	echo "DTSTART;TZID=Europe/Berlin:" . date('Ymd\THis', strtotime(mysql_result($erg, $i, "DateS"))) . "\n";
-	echo "DTEND;TZID=Europe/Berlin:" . date('Ymd\THis', strtotime(mysql_result($erg, $i, "DateE"))) . "\n";
-	echo "SUMMARY:" . str_replace(',', '\\,', mysql_result($erg, $i, "Man")) . "\n";
-	echo "CLASS:PUBLIC\n";
-	echo "STATUS:CONFIRMED\n";
-	echo "URL:" . $url . $ENGEL_ROOT . "nonpublic/myschichtplan.php\n";
-	echo "LOCATION:" . $RoomID[mysql_result($erg, $i, "RID")] . "\n";
-	echo "BEGIN:VALARM\n";
-	echo "TRIGGER;VALUE=DURATION:-PT5M\n";
-	echo "DESCRIPTION:" . str_replace(',', '\\,', mysql_result($erg, $i, "Man")) . "\n";
-	echo "ACTION:DISPLAY\n";
-	echo "END:VALARM\n";
-	echo "END:VEVENT\n";
-}
-echo "END:VCALENDAR\n";
-
-include ("includes/funktion_counter.php");
-?>
-
diff --git a/www-ssl_old/nonpublic/schichtplan.1.php b/www-ssl_old/nonpublic/schichtplan.1.php
deleted file mode 100644
index 9c99c6ca..00000000
--- a/www-ssl_old/nonpublic/schichtplan.1.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<h4>&nbsp;Tage </h4>
-
-<?PHP
-require_once ('../bootstrap.php');
-
-include ("includes/funktion_schichtplan_aray.php");
-
-function Printlink($Datum) {
-	GLOBAL $raum;
-	echo "\t<li><a href='./schichtplan.php?ausdatum=$Datum";
-	// ist ein raum gesetzt?
-	if (IsSet ($raum))
-		echo "&raum=$raum";
-	echo "'>$Datum</a></li>\n";
-} //function Printlink(
-
-if (isset ($VeranstaltungsTage))
-	foreach ($VeranstaltungsTage as $k => $v)
-		Printlink($v);
-?>
diff --git a/www-ssl_old/nonpublic/schichtplan.2.php b/www-ssl_old/nonpublic/schichtplan.2.php
deleted file mode 100644
index 92443e13..00000000
--- a/www-ssl_old/nonpublic/schichtplan.2.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<h4>&nbsp;Raum&uuml;bersicht</h4>
-<?php
-require_once ('../bootstrap.php');
-
-include ("includes/funktion_schichtplan_aray.php");
-
-if (isset ($Room))
-	foreach ($Room as $RoomEntry) {
-		if (isset ($ausdatum))
-			echo "\t<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=" . $RoomEntry["RID"] . "'>" .
-			$RoomEntry["Name"] . "</a></li>\n";
-		else
-			echo "\t<li><a href='./schichtplan.php?raum=" . $RoomEntry["RID"] . "'>" .
-			$RoomEntry["Name"] . "</a></li>\n";
-	}
-echo "<br />";
-if (isset ($ausdatum))
-	echo "<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=-1'>alle</a></li>";
-else
-	echo "<li><a href='./schichtplan.php?raum=-1'>alle</a></li>";
-?>
-
diff --git a/www-ssl_old/nonpublic/schichtplan.php b/www-ssl_old/nonpublic/schichtplan.php
deleted file mode 100644
index 2b9038a3..00000000
--- a/www-ssl_old/nonpublic/schichtplan.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Himmel";
-$header = "Schichtpl&auml;ne";
-$submenus = 2;
-
-if (isset ($_GET["ausdatum"]))
-	$ausdatum = $_GET["ausdatum"];
-if (isset ($_GET["raum"])) {
-	$raum = $_GET["raum"];
-
-	if ($raum == -1 && isset ($_GET["show"])) {
-		$raum = "";
-		foreach ($_GET as $k => $v) {
-			if (substr($k, 0, 5) == "raum_") {
-				$raum = $raum . ";" . $v;
-			}
-		}
-	}
-}
-
-<<<<<<< HEAD
-include ("../../includes/header.php");
-include ("../../includes/funktionen.php");
-include ("../../includes/funktion_schichtplan.php");
-include ("../../includes/funktion_schichtplan_array.php");
-?>
-=======
-include ("includes/header.php");
-include ("includes/funktionen.php");
-include ("includes/funktion_schichtplan.php");
-include ("includes/funktion_schichtplan_aray.php");
->>>>>>> spezial_includes_camp
-
-echo Get_Text("Hello") . $_SESSION['Nick'] . ",<br />" .
-Get_Text("pub_schicht_beschreibung") . "<br /><br />";
-
-function ShowSwitchDay() {
-	global $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum;
-
-	echo "\n\n<table border=\"0\" width=\"100%\"><tr>\n";
-
-	if (isset ($VeranstaltungsTage))
-		foreach ($VeranstaltungsTage as $k => $v)
-			if ($ausdatum == $v) {
-				if ($k > 0)
-					echo "\t\t\t<td align=\"left\">" .
-					"<a href='./schichtplan.php?ausdatum=" . $VeranstaltungsTage[$k -1] .
-					"&raum=$raum'>" . $VeranstaltungsTage[$k -1] . "</a></td>\n";
-				if ($k < $VeranstaltungsTageMax)
-					echo "\t\t\t<td align=\"right\">" .
-					"<a href='./schichtplan.php?ausdatum=" . $VeranstaltungsTage[$k +1] .
-					"&raum=$raum'>" . $VeranstaltungsTage[$k +1] . "</a></td>\n";
-			}
-	echo "\n\n</table>";
-}
-
-// wenn kein Datum gesetzt ist (die Seite zum ersten mal aufgerufen wird),
-// das Datum auf den ersten Tag setzen...
-if (!isset ($ausdatum)) {
-	$sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '" . gmdate("Y-m-d", time() + $gmdateOffset) . "%' ORDER BY `DateS`";
-	//  $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`";
-	$Erg = mysql_query($sql, $con);
-	if (mysql_num_rows($Erg) == 0) {
-		$sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1";
-		$Erg = mysql_query($sql, $con);
-	}
-	if (mysql_num_rows($Erg) > 0)
-		$ausdatum = substr(mysql_result($Erg, 0, "DateS"), 0, 10);
-	else
-		$ausdatum = gmdate("Y-m-d", time() + $gmdateOffset);
-
-}
-
-if (!isset ($raum)) {
-	// Ausgabe wenn kein Raum Ausgew�hlt:
-	echo Get_Text("pub_schicht_auswahl_raeume") . "<br /><br />\n";
-
-<<<<<<< HEAD
-
-if ( !isset($raum) )
-{
-	// Ausgabe wenn kein Raum Ausgew�hlt:
-	echo Get_Text("pub_schicht_auswahl_raeume"). "<br><br>\n";
-
-	if( isset($Room))
-	{
-=======
-	if (isset ($Room)) {
->>>>>>> spezial_includes_camp
-		echo "<form action=\"./schichtplan.php\" method=\"GET\">\n";
-		foreach ($Room as $RoomEntry) {
-			echo "\t<li><input type=\"checkbox\" name=\"raum_" . $RoomEntry["RID"] . "\" value=\"" . $RoomEntry["RID"] . " \">";
-			echo "<a href='./schichtplan.php?ausdatum=$ausdatum&raum=" . $RoomEntry["RID"] . "'>" . $RoomEntry["Name"] . "</a>";
-			echo "</input></li>\n";
-		}
-		echo "<input type=\"hidden\" name=\"ausdatum\" value=\"$ausdatum\">";
-		echo "<input type=\"hidden\" name=\"raum\" value=\"-1\">";
-		echo "<input type=\"submit\" name=\"show\" value=\"show\">\n";
-		echo "</form>\n";
-	}
-
-	echo "<br /><br />";
-	echo Get_Text("pub_schicht_alles_1") . "<a href='./schichtplan.php?ausdatum=$ausdatum&raum=-1'> <u>" .
-	Get_Text("pub_schicht_alles_2") . "</u> </a>" . Get_Text("pub_schicht_alles_3");
-	echo "\n<br /><br />\n\n";
-	echo "<hr>\n\n";
-	echo Get_Text("pub_schicht_EmptyShifts") . "\n";
-
-	// zeit die naesten freien schichten
-<<<<<<< HEAD
-	showEmptyShifts(); 
-} 
-else 
-{ 	// Wenn einraum Ausgew�hlt ist:
-	if( $raum == -1 ) 
-		echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>";
-	elseif( substr( $raum, 0, 1) == ";" )
-		echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>";
-	else 
-		echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. 
-		     Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "<br><br>";
-=======
-	showEmptyShifts();
-} else { // Wenn einraum Ausgew�hlt ist:
-	if ($raum == -1)
-		echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . ":<br /><br />";
-	elseif (substr($raum, 0, 1) == ";") echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . ":<br /><br />";
-	else
-		echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum .
-		Get_Text("pub_schicht_Anzeige_2") . $RoomID[$raum] . "<br /><br />";
->>>>>>> spezial_includes_camp
-
-	ShowSwitchDay();
-
-	echo "\n\n<table border=\"0\" width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "\t<tr class=\"contenttopic\">\n";
-	echo "\t\t<td>start</td>\n";
-
-	//Ausgabe Spalten �berschrift
-<<<<<<< HEAD
-	if( $raum == -1 )
-	{
-		if( isset($Room))
-		   foreach( $Room as $RoomEntry  )
-			if (SummRoomShifts($RoomEntry["RID"]) > 0)
-				echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n";
-=======
-	if ($raum == -1) {
-		if (isset ($Room))
-			foreach ($Room as $RoomEntry)
-				if (SummRoomShifts($RoomEntry["RID"]) > 0)
-					echo "\t\t<th>" . $RoomEntry["Name"] . "</th>\n";
->>>>>>> spezial_includes_camp
-	}
-	elseif (substr($raum, 0, 1) == ";") {
-		$words = preg_split("/;/", $raum);
-		foreach ($words as $word) {
-			if (strlen(trim($word)) > 0)
-				echo "\t\t<th>" . $RoomID[trim($word)] . "</th>\n";
-		}
-	} else
-		echo "\t\t<th>" . $RoomID[$raum] . "</th>\n";
-	echo "\t</tr>\n";
-
-	//Zeit Ausgeben
-	for ($i = 0; $i < 24; $i++)
-		for ($j = 0; $j < $GlobalZeileProStunde; $j++) {
-			$Spalten[$i * $GlobalZeileProStunde + $j] = "\t<tr class=\"content\">\n\t\t";
-
-			//Stunde:
-			$SpaltenTemp = "";
-			$SpaltenTemp .= ($i < 10) ? "0$i:" : "$i:";
-
-			//Minute
-			$TempMinuten = (($j * 60) / $GlobalZeileProStunde);
-			$SpaltenTemp .= ($TempMinuten < 10) ? "0$TempMinuten" : "$TempMinuten";
-
-			//aktuelle stunde markieren
-			if (($j == 0) && ($i == gmdate("H", time() + $gmdateOffset)) && (gmdate("Y-m-d", time() + $gmdateOffset) == $ausdatum))
-				$SpaltenTemp = "<h1>$SpaltenTemp</h1>";
-
-			$SpaltenTemp = "<td>$SpaltenTemp</td>\n";
-			$Spalten[$i * $GlobalZeileProStunde + $j] .= $SpaltenTemp;
-		}
-
-	if ($raum == -1) {
-		if (isset ($Room))
-			foreach ($Room as $RoomEntry)
-				if (SummRoomShifts($RoomEntry["RID"]) > 0)
-					CreateRoomShifts($RoomEntry["RID"]);
-	}
-	elseif (substr($raum, 0, 1) == ";") {
-		if (isset ($Room)) {
-			$words = preg_split("/;/", $raum);
-			foreach ($words as $word) {
-				if (strlen(trim($word)) > 0)
-					if (SummRoomShifts($word) > 0)
-						CreateRoomShifts($word);
-			}
-		}
-	} else
-		CreateRoomShifts($raum);
-
-	//Ausageb Zeilen
-	for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) {
-		echo $Spalten[$i] . "\t</tr>\n";
-	}
-
-	echo "</table>\n";
-
-	ShowSwitchDay();
-
-} //if (isset($raum))
-
-echo "<a href=\"" . $_SESSION["newurl"] . "&Icon=0\">@</a>";
-
-include ("includes/footer.php");
-?>
diff --git a/www-ssl_old/nonpublic/schichtplan_beamer.php b/www-ssl_old/nonpublic/schichtplan_beamer.php
deleted file mode 100644
index 269660e1..00000000
--- a/www-ssl_old/nonpublic/schichtplan_beamer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-include "includes/header_start.php";
-include "includes/funktionen.php";
-include "includes/funktion_schichtplan_beamer.php";
-
-$Time = time() + 3600 + 3600;
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Schichtpl&auml;ne f&uuml;r Beamer</title>
-<meta http-equiv="refresh" content="30; URL=<?php echo $url . $_SERVER['PHP_SELF']; ?>" />
-</head>
-
-<body>
-
-<?php
-
-
-echo "<table border=\"1\" width=\"100%\" height=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
-
-echo "<colgroup span=\"4\" valign=\"center\">
-  <col width=\"30\">
-  <col width=\"3*\">
-  <col width=\"3*\">
-  <col width=\"3*\">
-  </colgroup>\n";
-
-echo "<tr align=\"center\">\n" .
-"<td>" . gmdate("d.m.y", $Time) . "</td>\n" .
-"<td>" . gmdate("H", $Time -3600) . ":00</td>\n" .
-"<td>" . gmdate("H", $Time +0) . ":00</td>\n" .
-"<td>" . gmdate("H", $Time +3600) . ":00</td>\n" .
-"</tr>\n";
-
-foreach ($Room as $RoomEntry) {
-	// var-init
-	$AnzahlEintraege = 0;
-
-	$Out = ausgabe_Zeile($RoomEntry["RID"], $Time -3600, $AnzahlEintraege);
-	$Out .= ausgabe_Zeile($RoomEntry["RID"], $Time, $AnzahlEintraege);
-	$Out .= ausgabe_Zeile($RoomEntry["RID"], $Time +3600, $AnzahlEintraege);
-
-	if ($AnzahlEintraege == 0)
-		$Out = "";
-	else
-		$Out = "<tr>\n<td>_" . $RoomEntry["Name"] . "_</td>\n" . $Out . "</tr>\n";
-
-	echo $Out;
-}
-?>
-
-</table>
-
-</body>
-</html>