From 26b183befb40fb22be0dac2697ca474e25411b72 Mon Sep 17 00:00:00 2001
From: root <root@www.engelsystem.de>
Date: Wed, 10 Nov 2010 21:03:28 +0100
Subject: local changes for spezial includes

---
 www-ssl/nonpublic/myschichtplan.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'www-ssl/nonpublic/myschichtplan.php')

diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
index 5c7b304e..c4cbfba2 100755
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -2,10 +2,10 @@
 $title = "Himmel";
 $header = "Mein Schichtplan";
 
-include ("../../includes/header.php");
-include ("../../includes/funktionen.php");
-include ("../../includes/funktion_schichtplan.php");
-include ("../../includes/funktion_schichtplan_aray.php");
+include ("../../../27c3/includes/header.php");
+include ("../../../27c3/includes/funktionen.php");
+include ("../../../27c3/includes/funktion_schichtplan.php");
+include ("../../../27c3/includes/funktion_schichtplan_aray.php");
 
 
 If( !IsSet($_GET["action"]) ) 
@@ -181,5 +181,5 @@ else
 	SetHeaderGo2Back();	
     }
 }
-include ("../../includes/footer.php");
+include ("../../../27c3/includes/footer.php");
 ?>
-- 
cgit v1.2.3-54-g00ecf


From ce81776fbcf3c0fb89af20d431c1910cc11bb43d Mon Sep 17 00:00:00 2001
From: root <root@www.engelsystem.de>
Date: Thu, 26 May 2011 00:52:57 +0200
Subject: local changes for spezial includes camp-version

---
 www-ssl/ShowUserPicture.php              |  8 ++++----
 www-ssl/admin/EngelType.php              |  6 +++---
 www-ssl/admin/Recentchanges.php          |  4 ++--
 www-ssl/admin/UserPicture.php            |  6 +++---
 www-ssl/admin/aktiv.php                  |  6 +++---
 www-ssl/admin/dbUpdateFromXLS.php        | 10 +++++-----
 www-ssl/admin/debug.php                  |  6 +++---
 www-ssl/admin/dect.php                   | 10 +++++-----
 www-ssl/admin/dect_call.php              |  4 ++--
 www-ssl/admin/faq.php                    |  6 +++---
 www-ssl/admin/free.php                   |  6 +++---
 www-ssl/admin/free_DECT.php              |  6 +++---
 www-ssl/admin/group.php                  |  6 +++---
 www-ssl/admin/index.php                  |  6 +++---
 www-ssl/admin/news.php                   |  6 +++---
 www-ssl/admin/room.php                   |  6 +++---
 www-ssl/admin/schichtplan.php            |  4 ++--
 www-ssl/admin/schichtplan_druck.php      | 24 ++++++++++++------------
 www-ssl/admin/shiftadd.php               |  4 ++--
 www-ssl/admin/sprache.php                |  4 ++--
 www-ssl/admin/tshirt.php                 |  6 +++---
 www-ssl/admin/user.php                   |  6 +++---
 www-ssl/admin/userArrived.php            |  6 +++---
 www-ssl/admin/userChangeNormal.php       |  6 +++---
 www-ssl/admin/userChangeSecure.php       |  6 +++---
 www-ssl/admin/userDefaultSetting.php     |  6 +++---
 www-ssl/admin/userSaveNormal.php         | 10 +++++-----
 www-ssl/admin/userSaveSecure.php         | 10 +++++-----
 www-ssl/faq.php                          |  4 ++--
 www-ssl/index.php                        |  6 +++---
 www-ssl/lageplan.php                     |  4 ++--
 www-ssl/logout.php                       |  2 +-
 www-ssl/makeuser.php                     | 10 +++++-----
 www-ssl/nonpublic/auth.php               |  4 ++--
 www-ssl/nonpublic/einstellungen.php      |  6 +++---
 www-ssl/nonpublic/engelbesprechung.php   |  4 ++--
 www-ssl/nonpublic/faq.php                |  4 ++--
 www-ssl/nonpublic/index.php              | 12 ++++++------
 www-ssl/nonpublic/messages.php           |  4 ++--
 www-ssl/nonpublic/myschichtplan.php      | 10 +++++-----
 www-ssl/nonpublic/myschichtplan_ical.php |  6 +++---
 www-ssl/nonpublic/news.php               |  4 ++--
 www-ssl/nonpublic/news_comments.php      |  4 ++--
 www-ssl/nonpublic/schichtplan.1.php      |  2 +-
 www-ssl/nonpublic/schichtplan.2.php      |  2 +-
 www-ssl/nonpublic/schichtplan.php        | 10 +++++-----
 www-ssl/nonpublic/schichtplan_add.php    | 10 +++++-----
 www-ssl/nonpublic/schichtplan_beamer.php |  6 +++---
 www-ssl/nonpublic/waeckliste.php         |  4 ++--
 www-ssl/nonpublic/wecken.php             |  4 ++--
 50 files changed, 158 insertions(+), 158 deletions(-)

(limited to 'www-ssl/nonpublic/myschichtplan.php')

diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php
index 928c4ed8..793b5546 100644
--- a/www-ssl/ShowUserPicture.php
+++ b/www-ssl/ShowUserPicture.php
@@ -1,10 +1,10 @@
 <?PHP
 
-include ("../../27c3/includes/config.php");
-include ("../../27c3/includes/error_handler.php");
-include ("../../27c3/includes/config_db.php");
+include ("../../camp2011/includes/config.php");
+include ("../../camp2011/includes/error_handler.php");
+include ("../../camp2011/includes/config_db.php");
 if( !isset($_SESSION))	session_start();
-include ("../../27c3/includes/secure.php");
+include ("../../camp2011/includes/secure.php");
 
 
 // Parameter check
diff --git a/www-ssl/admin/EngelType.php b/www-ssl/admin/EngelType.php
index 7d7353cb..6d640ae4 100755
--- a/www-ssl/admin/EngelType.php
+++ b/www-ssl/admin/EngelType.php
@@ -1,8 +1,8 @@
 <?php
 $title = "R&auml;ume";
 $header = "Verwaltung der R&auml;ume";
-include ("../../../27c3/includes/header.php");
-include("../../../27c3/includes/funktion_db.php");
+include ("../../../camp2011/includes/header.php");
+include("../../../camp2011/includes/funktion_db.php");
 
 function runSQL( $SQL)
 {
@@ -187,5 +187,5 @@ case 'delete':
 }
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php
index 9c334c39..38c659dd 100755
--- a/www-ssl/admin/Recentchanges.php
+++ b/www-ssl/admin/Recentchanges.php
@@ -2,7 +2,7 @@
 
 $title = "ChangeLog";
 $header = "Datenbank-Auszug";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 $SQL = "SELECT * FROM `ChangeLog` ORDER BY `Time` DESC LIMIT 0,10000";
 $Erg = mysql_query($SQL, $con);
@@ -24,6 +24,6 @@ for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
 
 echo "</table>\n";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php
index 5beccc02..93e75bf1 100755
--- a/www-ssl/admin/UserPicture.php
+++ b/www-ssl/admin/UserPicture.php
@@ -1,8 +1,8 @@
 <?php
 $title = "UserPicture";
 $header = "Verwaltung der User Picture";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 
 if( IsSet($_GET["action"]) )
@@ -145,5 +145,5 @@ echo "</table>";
 
 echo "<br><a href=\"./UserPicture.php?action=FormUpload\">picture upload</a>\n";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php
index 3b294402..f5e8c9c3 100755
--- a/www-ssl/admin/aktiv.php
+++ b/www-ssl/admin/aktiv.php
@@ -2,8 +2,8 @@
 
 $title = "akive Engel";
 $header = "Liste der aktiven Engel";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "<form action=\"./aktiv.php\" method=\"post\">";
 echo Get_Text("pub_aktive_Text1")."<br>\n";
@@ -105,6 +105,6 @@ echo "</table>";
 
 echo "<br>Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br><br>";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
index f31c4729..37612d7f 100755
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -1,8 +1,8 @@
 <?PHP
 $title = "DB Update from XML";
 $header = "DB Update from XML";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_xml.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_xml.php");
 
 ///////////
 // DEBUG //
@@ -271,10 +271,10 @@ echo "<hr>\n";
 				           V e r s i o n
   ##############################################################################################*/
 if( $EnableRoomFunctions)
-	include("../../../27c3/includes/funktion_xml_room.php");
+	include("../../../camp2011/includes/funktion_xml_room.php");
 
 if( $EnableSchudleFunctions)
-	include("../../../27c3/includes/funktion_xml_schudle.php");
+	include("../../../camp2011/includes/funktion_xml_schudle.php");
 
 
 /*##############################################################################################
@@ -288,6 +288,6 @@ echo "</form>\n";
 
 } //if XMLopenOOK
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php
index 2acabb87..b01a8a6c 100755
--- a/www-ssl/admin/debug.php
+++ b/www-ssl/admin/debug.php
@@ -2,8 +2,8 @@
 
 $title = "Debug-Liste";
 $header = "Datenbank-Auszug";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "<h1>Web Counter</h1>";
 funktion_db_list("Counter");
@@ -64,6 +64,6 @@ funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)",
 
 
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php
index 2286a472..e6096d27 100755
--- a/www-ssl/admin/dect.php
+++ b/www-ssl/admin/dect.php
@@ -2,11 +2,11 @@
 
 $title = "Engelsystem - DECT";
 $header = "DECT send call";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
-include ("../../../27c3/includes/config_IAX.php");
-//include ("../../../27c3/includes/funktion_modem.php");
-include ("../../../27c3/includes/funktion_cron.php");
+include ("../../../camp2011/includes/config_IAX.php");
+//include ("../../../camp2011/includes/funktion_modem.php");
+include ("../../../camp2011/includes/funktion_cron.php");
 
 if( !isset($_GET["dial"])) $_GET["dial"] = "";
 if( !isset($_GET["custum"])) $_GET["custum"] = "";
@@ -65,6 +65,6 @@ if( $_GET["dial"]=="dial")
 	echo "</form>";
 
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php
index d21949db..c69efa17 100755
--- a/www-ssl/admin/dect_call.php
+++ b/www-ssl/admin/dect_call.php
@@ -1,7 +1,7 @@
 <?PHP
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php
index 66cc40f5..645c08cd 100755
--- a/www-ssl/admin/faq.php
+++ b/www-ssl/admin/faq.php
@@ -2,8 +2,8 @@
 $title = "Himmel";
 $header = "FAQ / Fragen an die Erzengel";
 $submenus = 1;
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db.php");
 
 //var init
 $quest_bearb=0;
@@ -279,5 +279,5 @@ else
 	echo "</ul>\n";
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php
index 9bf1d4e3..5ceaebb6 100755
--- a/www-ssl/admin/free.php
+++ b/www-ssl/admin/free.php
@@ -2,8 +2,8 @@
 
 $title = "Erzengel";
 $header = "Freie Engel";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 
 echo "Hallo ".$_SESSION['Nick'].",<br>\n";
@@ -99,6 +99,6 @@ for ($i=0; $i < $Zeilen; $i++)
 }
 echo "</table>\n";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php
index 99f24317..c28c78af 100755
--- a/www-ssl/admin/free_DECT.php
+++ b/www-ssl/admin/free_DECT.php
@@ -1,8 +1,8 @@
 <?PHP
 
-include ("../../../27c3/includes/config_db.php");
-include ("../../../27c3/includes/funktion_db_list.php");
-include ("../../../27c3/includes/funktion_user.php");
+include ("../../../camp2011/includes/config_db.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/funktion_user.php");
 
 
 #######################################################
diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php
index 05ebe0de..57945d0d 100755
--- a/www-ssl/admin/group.php
+++ b/www-ssl/admin/group.php
@@ -2,8 +2,8 @@
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["enterGID"]))
 {
@@ -43,7 +43,7 @@ if (!IsSet($_GET["enterGID"]))
 	// Ende Userliste
 } 
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
 
diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php
index 5599c200..b89bdb93 100755
--- a/www-ssl/admin/index.php
+++ b/www-ssl/admin/index.php
@@ -2,8 +2,8 @@
 
 $title = "Erzengel";
 $header = "Index";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "Hallo Erzengel ".$_SESSION['Nick'].",<br>\n";
 
@@ -14,6 +14,6 @@ du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen
 Bitte melde dich <a href="../logout.php">hier</a> nach getaner Arbeit immer ab, damit kein anderer hier &Auml;nderungen vornehmen kann.
 
 <?PHP
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php
index a49e8ac3..78f49ee2 100755
--- a/www-ssl/admin/news.php
+++ b/www-ssl/admin/news.php
@@ -2,8 +2,8 @@
 
 $title = "Newsverwaltung";
 $header = "Verwaltung der News";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 
 if (!IsSet($_GET["action"]))
@@ -117,6 +117,6 @@ else
 	}
 }// IF-ELSE
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php
index 9e3e0c3e..ebbe1e36 100755
--- a/www-ssl/admin/room.php
+++ b/www-ssl/admin/room.php
@@ -1,8 +1,8 @@
 <?php
 $title = "R&auml;ume";
 $header = "Verwaltung der R&auml;ume";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 $Sql = "SELECT * FROM `Room` ORDER BY `Number`, `Name`";
 $Erg = mysql_query($Sql, $con);
@@ -195,5 +195,5 @@ if (IsSet($SQL)){
 
 } //IF IsSet($action)
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php
index bbccc14a..ba2f8d66 100755
--- a/www-ssl/admin/schichtplan.php
+++ b/www-ssl/admin/schichtplan.php
@@ -2,7 +2,7 @@
 $title = "Schichtplan";
 $header = "Neue Schichten erfassen";
 $submenus = 1;
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 function executeSQL( $SQL)
 {
@@ -391,5 +391,5 @@ if (IsSet($chSQL)){
 }
 
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php
index 77965c82..23e65166 100755
--- a/www-ssl/admin/schichtplan_druck.php
+++ b/www-ssl/admin/schichtplan_druck.php
@@ -6,10 +6,10 @@ $submenus = 1;
 
 if (!IsSet($_GET["action"])) 
 {
-	include ("../../../27c3/includes/header.php");
-	include ("../../../27c3/includes/funktionen.php");
-	include ("../../../27c3/includes/funktion_schichtplan_aray.php");
-	include ("../../../27c3/includes/funktion_schichtplan.php");
+	include ("../../../camp2011/includes/header.php");
+	include ("../../../camp2011/includes/funktionen.php");
+	include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+	include ("../../../camp2011/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".
@@ -30,7 +30,7 @@ if (!IsSet($_GET["action"]))
 	}
 	echo "<br><br>";
 	
-	include ("../../../27c3/includes/footer.php");
+	include ("../../../camp2011/includes/footer.php");
 } 
 else 	//#################################################################
 {
@@ -39,15 +39,15 @@ else 	//#################################################################
    	$Raum = $_GET["Raum"];
 	$ausdatum = $_GET["ausdatum"];
 
-	include ("../../../27c3/includes/config_db.php");
-	include ("../../../27c3/includes/config.php");
-	include ("../../../27c3/includes/secure.php");
+	include ("../../../camp2011/includes/config_db.php");
+	include ("../../../camp2011/includes/config.php");
+	include ("../../../camp2011/includes/secure.php");
 	//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
 	$_SESSION['CVS'][ "admin/schichtplan.php" ] = "N";	
-	include ("../../../27c3/includes/funktion_lang.php");
-	include ("../../../27c3/includes/funktion_schichtplan.php");
-	include ("../../../27c3/includes/funktion_schichtplan_aray.php");
-	include ("../../../27c3/includes/funktion_user.php");
+	include ("../../../camp2011/includes/funktion_lang.php");
+	include ("../../../camp2011/includes/funktion_schichtplan.php");
+	include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+	include ("../../../camp2011/includes/funktion_user.php");
 	?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php
index 46fda7d0..7c64543f 100755
--- a/www-ssl/admin/shiftadd.php
+++ b/www-ssl/admin/shiftadd.php
@@ -2,7 +2,7 @@
 $title = "Schicht Hinzufügen";
 $header = "Neue Schichten erfassen";
 
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 $Time = time()+3600+3600;
 
@@ -354,5 +354,5 @@ function CreateNewEntry()
 	echo "</tr>\n";
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php
index 6edba89b..050b0736 100755
--- a/www-ssl/admin/sprache.php
+++ b/www-ssl/admin/sprache.php
@@ -2,7 +2,7 @@
 
 $title = "Sprache";
 $header = "Liste der existierenden Sprcheintr&auml;ge";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 
 if( !isset( $_GET["TextID"] )  )
@@ -117,6 +117,6 @@ else
 	   
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php
index 52b9fc70..df33494d 100755
--- a/www-ssl/admin/tshirt.php
+++ b/www-ssl/admin/tshirt.php
@@ -2,8 +2,8 @@
 
 $title = "T-Shirt-Ausgabe";
 $header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 
 If (IsSet($_GET["aktiv"])) {
@@ -54,6 +54,6 @@ for ($i=0; $i<$rowcount; $i++){
 
 echo "</table>";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php
index 3e8e98c9..b86c2382 100755
--- a/www-ssl/admin/user.php
+++ b/www-ssl/admin/user.php
@@ -2,8 +2,8 @@
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["enterUID"]))
 {
@@ -134,7 +134,7 @@ else
 	echo "error";
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
 
diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php
index 5e319b07..da68a5da 100755
--- a/www-ssl/admin/userArrived.php
+++ b/www-ssl/admin/userArrived.php
@@ -2,8 +2,8 @@
 
 $title = "Engel Arrived";
 $header = "Engel was arrived";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 
 If (IsSet($_GET["arrived"])) {
@@ -49,6 +49,6 @@ for ($i=0; $i<$rowcount; $i++){
 }
 echo "</table>";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php
index f95e044a..51c49944 100755
--- a/www-ssl/admin/userChangeNormal.php
+++ b/www-ssl/admin/userChangeNormal.php
@@ -2,8 +2,8 @@
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (IsSet($_GET["enterUID"]))
 { 
@@ -131,7 +131,7 @@ if (IsSet($_GET["enterUID"]))
 		"SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); 
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
 
diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php
index 1e3bd3db..c1799fb8 100755
--- a/www-ssl/admin/userChangeSecure.php
+++ b/www-ssl/admin/userChangeSecure.php
@@ -2,8 +2,8 @@
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (IsSet($_GET["enterUID"]))
 { 
@@ -106,7 +106,7 @@ if (IsSet($_GET["enterUID"]))
 	} 
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
 
diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php
index 25f82699..d3564400 100755
--- a/www-ssl/admin/userDefaultSetting.php
+++ b/www-ssl/admin/userDefaultSetting.php
@@ -2,8 +2,8 @@
 
 $title = "Defalut User Setting";
 $header = "Defalut User Setting";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "Hallo ".$_SESSION['Nick'].
 	",<br>\nhier hast du die M&ouml;glichkeit, die Defaulteinstellungen f&uuml;r neue User einzustellen:<br><br>\n";
@@ -139,6 +139,6 @@ echo "\t</tr>\n";
 
 echo "</table>\n";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php
index 72a864f4..4a7f7126 100755
--- a/www-ssl/admin/userSaveNormal.php
+++ b/www-ssl/admin/userSaveNormal.php
@@ -2,10 +2,10 @@
 
 $title = "User-Liste";
 $header = "Index";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
-include ("../../../27c3/includes/crypt.php");
-include ("../../../27c3/includes/funktion_db.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/crypt.php");
+include ("../../../camp2011/includes/funktion_db.php");
 
 if (IsSet($_GET["action"])) 
 {
@@ -125,6 +125,6 @@ else
 	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php
index 0041694e..277c7127 100755
--- a/www-ssl/admin/userSaveSecure.php
+++ b/www-ssl/admin/userSaveSecure.php
@@ -2,10 +2,10 @@
 
 $title = "User-Liste";
 $header = "Index";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_db_list.php");
-include ("../../../27c3/includes/crypt.php");
-include ("../../../27c3/includes/funktion_db.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_db_list.php");
+include ("../../../camp2011/includes/crypt.php");
+include ("../../../camp2011/includes/funktion_db.php");
 
 if( !IsSet($_POST["enterUID"]) ) 
 {
@@ -173,6 +173,6 @@ if ( ($Right=="Y") && IsSet($_GET["action"]))
 	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
index af52ef21..5bb6824e 100755
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -1,7 +1,7 @@
 <?php
 $title = "Index";
 $header = "FAQ";
-include ("../../27c3/includes/header.php");
+include ("../../camp2011/includes/header.php");
 
 
 $SQL = "SELECT * FROM `FAQ`";
@@ -17,6 +17,6 @@ for ($n = 0 ; $n < $Zeilen ; $n++) {
   }
 }
 
-include ("../../27c3/includes/footer.php");
+include ("../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 194f859c..56e7223b 100755
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,19 +1,19 @@
 <?php
 $title = "Index";
 $header = "Index";
-include ("../../27c3/includes/header.php");
+include ("../../camp2011/includes/header.php");
 
 echo Get_Text("index_text1")."<br><br>";
 echo Get_Text("index_text2")."<br>";
 echo Get_Text("index_text3")."<br>";
 
-include ("../../27c3/includes/login_eingabefeld.php");
+include ("../../camp2011/includes/login_eingabefeld.php");
 
 echo "<h6>".Get_Text("index_text4")."</h6>";
 
 //echo Get_Text("index_text5"). "<br>". $show_SSLCERT;
 
-include ("../../27c3/includes/footer.php");
+include ("../../camp2011/includes/footer.php");
 ?>
 
 
diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php
index 217887cd..617eafe3 100755
--- a/www-ssl/lageplan.php
+++ b/www-ssl/lageplan.php
@@ -1,11 +1,11 @@
 <?php
 $title = "Index";
 $header = "Lageplan";
-include ("../../27c3/includes/header.php");
+include ("../../camp2011/includes/header.php");
 
 echo "<p>". Get_Text("lageplan_text1"). "</p>";
 echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>.";
 
-include ("../../27c3/includes/footer.php");
+include ("../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index d6e56fcd..d413dfc7 100755
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,5 +1,5 @@
 <?php
-include ("../../27c3/includes/config.php");
+include ("../../camp2011/includes/config.php");
 
 // Die Session zerstoeren...
 session_start();
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index 0943e6f8..340d320c 100755
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -2,10 +2,10 @@
 $title = "Anmeldung zum Chaos-Engel";
 $header = "";
 $success = "none"; 
-include ("../../27c3/includes/config.php");
-include ("../../27c3/includes/header.php");
-include ("../../27c3/includes/config_db.php");
-include ("../../27c3/includes/crypt.php");
+include ("../../camp2011/includes/config.php");
+include ("../../camp2011/includes/header.php");
+include ("../../camp2011/includes/config_db.php");
+include ("../../camp2011/includes/crypt.php");
 
 		
 if( isset($_POST["send"]))
@@ -209,6 +209,6 @@ echo "\t</form>\n";
 Print_Text("makeuser_text3");
 }
 
-include ("../../27c3/includes/footer.php");
+include ("../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php
index 52c8b6f5..3356a81c 100755
--- a/www-ssl/nonpublic/auth.php
+++ b/www-ssl/nonpublic/auth.php
@@ -1,8 +1,8 @@
 <?PHP
 header('Content-Type: application/json');
 
-include ("../../../27c3/includes/config.php");
-include ("../../../27c3/includes/config_db.php");
+include ("../../../camp2011/includes/config.php");
+include ("../../../camp2011/includes/config_db.php");
 
 $User = $_POST['user'];
 $Pass = $_POST['pw'];
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 8cba1c30..5bbd63ce 100755
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -5,8 +5,8 @@
  */
 $title = "Himmel";
 $header = "Deine pers&ouml;nlichen Einstellungen";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/crypt.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/crypt.php");
 
 if (!IsSet($_POST["action"])) 
 {
@@ -357,5 +357,5 @@ case 'delPicture':
 	Break;
 }
 }
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php
index dd5097d9..ea5c6e3c 100755
--- a/www-ssl/nonpublic/engelbesprechung.php
+++ b/www-ssl/nonpublic/engelbesprechung.php
@@ -1,7 +1,7 @@
 <?php
 $title = "Himmel";
 $header = "Engelbesprechung";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 ?>
 
 <br>
@@ -33,5 +33,5 @@ for ($n = 0 ; $n < $Zeilen ; $n++)
 }
 	    
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php
index bde7540d..79044c2c 100755
--- a/www-ssl/nonpublic/faq.php
+++ b/www-ssl/nonpublic/faq.php
@@ -1,7 +1,7 @@
 <?php
 $title = "Himmel";
 $header = "FAQ / Fragen an die Erzengel";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 
 // Erstaufruf, oder Frage bereits abgeschickt?
@@ -68,5 +68,5 @@ if ($Zeilen==0){
 	}
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index 4ed00ee7..1072e2d6 100755
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -2,14 +2,14 @@
 $title = "Index";
 $header = "Index";
 
-include ("../../../27c3/includes/config_db.php");
-include ("../../../27c3/includes/crypt.php");
+include ("../../../camp2011/includes/config_db.php");
+include ("../../../camp2011/includes/crypt.php");
 
 session_start(); // alte Session - falls vorhanden - wiederherstellen...
 
 function LoginOK()
 {
-	include ("../../../27c3/includes/config.php");
+	include ("../../../camp2011/includes/config.php");
 	header("HTTP/1.1 302 Moved Temporarily");
 	header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php");
 }
@@ -73,11 +73,11 @@ else
 			$ErrorText = "pub_index_User_more_as_one";
 	} // Ende Check, ob User angemeldet wurde
 } 
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 if( isset($ErrorText))
 	echo "<h2>". Get_Text($ErrorText). "</h2><br>\n";
-include ("../../../27c3/includes/login_eingabefeld.php");
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/login_eingabefeld.php");
+include ("../../../camp2011/includes/footer.php");
 
 ?>
 
diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php
index fa0e9b5f..2ba852d4 100755
--- a/www-ssl/nonpublic/messages.php
+++ b/www-ssl/nonpublic/messages.php
@@ -2,7 +2,7 @@
 $title = "Himmel";
 $header = "";
 
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 If( !isset($_GET["action"]) ) 
 	$_GET["action"] = "start";
@@ -123,5 +123,5 @@ switch( $_GET["action"])
 		echo Get_Text("pub_messages_NoCommand");
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
index 28e2c13d..e11453c4 100755
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -2,10 +2,10 @@
 $title = "Himmel";
 $header = "Mein Schichtplan";
 
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktionen.php");
-include ("../../../27c3/includes/funktion_schichtplan.php");
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktionen.php");
+include ("../../../camp2011/includes/funktion_schichtplan.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 
 If( !IsSet($_GET["action"]) ) 
@@ -181,5 +181,5 @@ else
 	SetHeaderGo2Back();	
     }
 }
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php
index 80904d8e..bcb9eb6f 100755
--- a/www-ssl/nonpublic/myschichtplan_ical.php
+++ b/www-ssl/nonpublic/myschichtplan_ical.php
@@ -1,7 +1,7 @@
 <?php
-include ("../../../27c3/includes/header_start.php");
+include ("../../../camp2011/includes/header_start.php");
 
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ".
        "INNER JOIN `ShiftEntry` ".
@@ -46,7 +46,7 @@ for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
 }
 echo "END:VCALENDAR\n";
 
-include( "../../../27c3/includes/funktion_counter.php");
+include( "../../../camp2011/includes/funktion_counter.php");
 
 ?>
 
diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php
index 5329b2dc..b1513716 100755
--- a/www-ssl/nonpublic/news.php
+++ b/www-ssl/nonpublic/news.php
@@ -1,11 +1,11 @@
 <?php
 $title = "Himmel";
 $header = "News";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 
 echo "<a href=\"#Neu\">".Get_Text(3)."</a>";
 include ("news_output.php");
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
index 14b67d71..826733c1 100755
--- a/www-ssl/nonpublic/news_comments.php
+++ b/www-ssl/nonpublic/news_comments.php
@@ -1,7 +1,7 @@
 <?php
 $title = "Kommentare zu den News";
 $header = "Kommentar";
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 
 if( IsSet( $_GET["nid"])) 
@@ -85,5 +85,5 @@ else
   echo "Fehlerhafter Aufruf!";
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php
index 3014506d..490167a0 100755
--- a/www-ssl/nonpublic/schichtplan.1.php
+++ b/www-ssl/nonpublic/schichtplan.1.php
@@ -1,7 +1,7 @@
 <h4>&nbsp;Tage </h4>
 
 <?PHP
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 function Printlink( $Datum)
 {
diff --git a/www-ssl/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php
index 1b736639..59e58852 100755
--- a/www-ssl/nonpublic/schichtplan.2.php
+++ b/www-ssl/nonpublic/schichtplan.2.php
@@ -1,7 +1,7 @@
 <h4>&nbsp;Raum&uuml;bersicht</h4>
 <?php
 
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 if( isset ($Room))
     foreach( $Room as $RoomEntry  )
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php
index 37cca2a3..65907863 100755
--- a/www-ssl/nonpublic/schichtplan.php
+++ b/www-ssl/nonpublic/schichtplan.php
@@ -21,10 +21,10 @@ if( isset($_GET["raum"]))
 	}
 }
 
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktionen.php");
-include ("../../../27c3/includes/funktion_schichtplan.php");
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktionen.php");
+include ("../../../camp2011/includes/funktion_schichtplan.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 ?>
 
 <?PHP echo Get_Text("Hello").$_SESSION['Nick'].",<br>".
@@ -201,5 +201,5 @@ else
 
 echo "<a href=\"". $_SESSION["newurl"]. "&Icon=0\">@</a>";
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php
index 7d02afca..359425bf 100755
--- a/www-ssl/nonpublic/schichtplan_add.php
+++ b/www-ssl/nonpublic/schichtplan_add.php
@@ -1,10 +1,10 @@
 <?php
 $title = "Himmel";
 $header = "Schichtpl&auml;ne";
-include ("../../../27c3/includes/header.php");
-include ("../../../27c3/includes/funktion_schichtplan.php");
-include ("../../../27c3/includes/funktion_schichtplan_aray.php");
-include ("../../../27c3/includes/funktionen.php");
+include ("../../../camp2011/includes/header.php");
+include ("../../../camp2011/includes/funktion_schichtplan.php");
+include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+include ("../../../camp2011/includes/funktionen.php");
 
 if (isset($_POST["newtext"]) && isset($_POST["SID"]) && isset($_POST["TID"])) {
 	SetHeaderGo2Back();
@@ -122,5 +122,5 @@ elseif (isset($_GET["SID"]) && isset($_GET["TID"]))
 
 }
 
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php
index 95e75abf..cc2a48e7 100755
--- a/www-ssl/nonpublic/schichtplan_beamer.php
+++ b/www-ssl/nonpublic/schichtplan_beamer.php
@@ -1,8 +1,8 @@
 <?php
-include ("../../../27c3/includes/header_start.php");
+include ("../../../camp2011/includes/header_start.php");
 
-include ("../../../27c3/includes/funktionen.php");
-include ("../../../27c3/includes/funktion_schichtplan_beamer.php");
+include ("../../../camp2011/includes/funktionen.php");
+include ("../../../camp2011/includes/funktion_schichtplan_beamer.php");
 
 $Time = time()+3600+3600;
 //$Time = 1104241344;
diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php
index 354490b5..c14505ab 100755
--- a/www-ssl/nonpublic/waeckliste.php
+++ b/www-ssl/nonpublic/waeckliste.php
@@ -2,7 +2,7 @@
 $title = "Himmel";
 $header = "Weckdienst - Liste der zu weckenden Engel";
 
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 ?>
 
@@ -36,5 +36,5 @@ include ("../../../27c3/includes/header.php");
 ?>
 </table>
 <?PHP
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php
index 7e0551fe..67e32e28 100755
--- a/www-ssl/nonpublic/wecken.php
+++ b/www-ssl/nonpublic/wecken.php
@@ -2,7 +2,7 @@
 $title = "Himmel";
 $header = "Weckdienst";
 
-include ("../../../27c3/includes/header.php");
+include ("../../../camp2011/includes/header.php");
 
 if( isset($_POST["eintragen"]))
 	if( $_POST["eintragen"] == Get_Text("pub_wake_bouton") ) 
@@ -77,5 +77,5 @@ echo Get_Text("pub_wake_beschreibung2"); ?>
 <input type="submit" name="eintragen" value="<?PHP echo Get_Text("pub_wake_bouton"); ?>">
 </form>
 <?PHP
-include ("../../../27c3/includes/footer.php");
+include ("../../../camp2011/includes/footer.php");
 ?>
-- 
cgit v1.2.3-54-g00ecf


From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001
From: Moritz helios Rudert <helios@planetcyborg.de>
Date: Wed, 1 Jun 2011 12:13:39 +0200
Subject: fixes

---
 DB/ChangeLog.sql                                |   6 +-
 DB/Himmel.sql                                   |  44 +-
 DB/SDrohnen.sql                                 |   2 +-
 DB/Sprache.sql                                  |   2 +-
 DB/UserPicture.sql                              |   2 +-
 default-conf/var_www_includes/config.php        |   6 +-
 default-conf/var_www_includes/config_IAX.php    |   2 +-
 default-conf/var_www_includes/config_db.php     |   0
 default-conf/var_www_includes/config_jabber.php |   0
 default-conf/var_www_includes/config_modem.php  |  15 +-
 includes/UserCVS.php                            | 178 +++----
 includes/config_MessegeServer.php               |  11 +-
 includes/config_modem.php                       |  15 +-
 includes/crypt.php                              |  24 +-
 includes/error_handler.php                      |  84 ++-
 includes/footer.php                             |  70 +--
 includes/funktion_SendMessenges.php             |  32 +-
 includes/funktion_activeUser.php                | 114 ++---
 includes/funktion_counter.php                   |  36 +-
 includes/funktion_cron.php                      | 271 +++++-----
 includes/funktion_db.php                        | 288 +++++------
 includes/funktion_db_list.php                   | 100 ++--
 includes/funktion_faq.php                       |  16 +-
 includes/funktion_flag.php                      |  17 +-
 includes/funktion_jabber.php                    |   0
 includes/funktion_lang.php                      |  53 +-
 includes/funktion_menu.php                      |  75 ++-
 includes/funktion_modem.php                     |  49 +-
 includes/funktion_schichtplan.php               | 654 ++++++++++++------------
 includes/funktion_schichtplan_Tage.php          | 160 +++---
 includes/funktion_schichtplan_aray.php          |  48 +-
 includes/funktion_schichtplan_beamer.php        | 300 +++++------
 includes/funktion_user.php                      | 221 ++++----
 includes/funktion_xml.php                       | 228 ++++-----
 includes/funktion_xml_room.php                  | 130 +++--
 includes/funktion_xml_schudle.php               | 524 +++++++++----------
 includes/funktionen.php                         |  43 +-
 includes/header.php                             | 174 +++----
 includes/header_start.php                       |  88 ++--
 includes/login_eingabefeld.php                  |  33 +-
 includes/menu.php                               |  58 +--
 includes/secure.php                             |  54 +-
 services/cron_dect.php                          | 106 ++--
 services/dect_clear.php                         |  32 +-
 services/jabberserver.php                       | 188 +++----
 txt/LICENSE                                     |   0
 txt/README                                      |   4 +-
 www-ssl/ShowUserPicture.php                     | 105 ++--
 www-ssl/admin/EngelType.php                     | 290 +++++------
 www-ssl/admin/Recentchanges.php                 |  14 +-
 www-ssl/admin/UserPicture.php                   | 226 ++++----
 www-ssl/admin/aktiv.php                         | 106 ++--
 www-ssl/admin/dbUpdateFromXLS.php               | 406 +++++++--------
 www-ssl/admin/debug.php                         |  42 +-
 www-ssl/admin/dect.php                          |  86 ++--
 www-ssl/admin/dect_call.php                     |   2 +-
 www-ssl/admin/faq.1.php                         |   2 +-
 www-ssl/admin/faq.php                           | 362 ++++++-------
 www-ssl/admin/free.php                          |  68 +--
 www-ssl/admin/free_DECT.php                     |  68 +--
 www-ssl/admin/group.php                         |  70 +--
 www-ssl/admin/index.php                         |   8 +-
 www-ssl/admin/news.php                          | 188 +++----
 www-ssl/admin/room.php                          | 320 ++++++------
 www-ssl/admin/schichtplan.1.php                 |   0
 www-ssl/admin/schichtplan.php                   | 620 +++++++++++-----------
 www-ssl/admin/schichtplan_druck.1.php           |   0
 www-ssl/admin/schichtplan_druck.php             | 148 +++---
 www-ssl/admin/shiftadd.php                      | 518 +++++++++----------
 www-ssl/admin/sprache.php                       | 198 +++----
 www-ssl/admin/tshirt.php                        |  30 +-
 www-ssl/admin/user.php                          | 240 ++++-----
 www-ssl/admin/userArrived.php                   |  38 +-
 www-ssl/admin/userChangeNormal.php              | 226 ++++----
 www-ssl/admin/userChangeSecure.php              | 178 +++----
 www-ssl/admin/userDefaultSetting.php            | 164 +++---
 www-ssl/admin/userSaveNormal.php                | 210 ++++----
 www-ssl/admin/userSaveSecure.php                | 298 +++++------
 www-ssl/css/grossbild.js                        |   0
 www-ssl/css/style.css.old                       |   0
 www-ssl/css/style.css.old2                      |   0
 www-ssl/css/style1.css                          |   0
 www-ssl/css/style1.css.old                      |   0
 www-ssl/css/style2.css                          |   0
 www-ssl/css/style3.css                          |   0
 www-ssl/css/style4.css                          |   0
 www-ssl/css/style5.css                          |   0
 www-ssl/css/style6.css                          |   0
 www-ssl/css/style7.css                          |   0
 www-ssl/css/style8.css                          |   0
 www-ssl/css/style9.css                          |   0
 www-ssl/faq.php                                 |  30 +-
 www-ssl/index.php                               |  22 +-
 www-ssl/lageplan.php                            |  13 +-
 www-ssl/logout.php                              |  17 +-
 www-ssl/makeuser.php                            | 393 +++++++-------
 www-ssl/nonpublic/auth.php                      |  96 ++--
 www-ssl/nonpublic/einstellungen.php             | 637 ++++++++++++-----------
 www-ssl/nonpublic/engelbesprechung.php          |  46 +-
 www-ssl/nonpublic/faq.php                       |  59 +--
 www-ssl/nonpublic/index.php                     | 110 ++--
 www-ssl/nonpublic/messages.php                  | 245 +++++----
 www-ssl/nonpublic/myschichtplan.php             | 322 ++++++------
 www-ssl/nonpublic/myschichtplan_ical.php        |  32 +-
 www-ssl/nonpublic/news.php                      |  13 +-
 www-ssl/nonpublic/news_comments.php             |  70 ++-
 www-ssl/nonpublic/news_output.php               |  36 +-
 www-ssl/nonpublic/schichtplan.1.php             |  16 +-
 www-ssl/nonpublic/schichtplan.2.php             |  18 +-
 www-ssl/nonpublic/schichtplan.php               | 359 +++++++------
 www-ssl/nonpublic/schichtplan_add.php           | 231 ++++-----
 www-ssl/nonpublic/schichtplan_beamer.php        |  96 ++--
 www-ssl/nonpublic/waeckliste.php                |  50 +-
 www-ssl/nonpublic/wecken.php                    | 102 ++--
 www-ssl/pic/avatar/avatar1.gif                  | Bin
 www-ssl/pic/avatar/avatar10.gif                 | Bin
 www-ssl/pic/avatar/avatar100.gif                | Bin
 www-ssl/pic/avatar/avatar101.gif                | Bin
 www-ssl/pic/avatar/avatar102.gif                | Bin
 www-ssl/pic/avatar/avatar103.gif                | Bin
 www-ssl/pic/avatar/avatar104.gif                | Bin
 www-ssl/pic/avatar/avatar105.gif                | Bin
 www-ssl/pic/avatar/avatar106.gif                | Bin
 www-ssl/pic/avatar/avatar107.gif                | Bin
 www-ssl/pic/avatar/avatar108.gif                | Bin
 www-ssl/pic/avatar/avatar109.gif                | Bin
 www-ssl/pic/avatar/avatar11.gif                 | Bin
 www-ssl/pic/avatar/avatar110.gif                | Bin
 www-ssl/pic/avatar/avatar111.gif                | Bin
 www-ssl/pic/avatar/avatar112.gif                | Bin
 www-ssl/pic/avatar/avatar113.gif                | Bin
 www-ssl/pic/avatar/avatar114.gif                | Bin
 www-ssl/pic/avatar/avatar115.gif                | Bin
 www-ssl/pic/avatar/avatar116.gif                | Bin
 www-ssl/pic/avatar/avatar117.gif                | Bin
 www-ssl/pic/avatar/avatar118.gif                | Bin
 www-ssl/pic/avatar/avatar119.gif                | Bin
 www-ssl/pic/avatar/avatar12.gif                 | Bin
 www-ssl/pic/avatar/avatar120.gif                | Bin
 www-ssl/pic/avatar/avatar121.gif                | Bin
 www-ssl/pic/avatar/avatar122.gif                | Bin
 www-ssl/pic/avatar/avatar123.gif                | Bin
 www-ssl/pic/avatar/avatar124.gif                | Bin
 www-ssl/pic/avatar/avatar125.gif                | Bin
 www-ssl/pic/avatar/avatar126.gif                | Bin
 www-ssl/pic/avatar/avatar127.gif                | Bin
 www-ssl/pic/avatar/avatar128.gif                | Bin
 www-ssl/pic/avatar/avatar129.gif                | Bin
 www-ssl/pic/avatar/avatar13.gif                 | Bin
 www-ssl/pic/avatar/avatar130.gif                | Bin
 www-ssl/pic/avatar/avatar131.gif                | Bin
 www-ssl/pic/avatar/avatar132.gif                | Bin
 www-ssl/pic/avatar/avatar133.gif                | Bin
 www-ssl/pic/avatar/avatar134.gif                | Bin
 www-ssl/pic/avatar/avatar135.gif                | Bin
 www-ssl/pic/avatar/avatar136.gif                | Bin
 www-ssl/pic/avatar/avatar137.gif                | Bin
 www-ssl/pic/avatar/avatar138.gif                | Bin
 www-ssl/pic/avatar/avatar139.gif                | Bin
 www-ssl/pic/avatar/avatar14.gif                 | Bin
 www-ssl/pic/avatar/avatar140.gif                | Bin
 www-ssl/pic/avatar/avatar141.gif                | Bin
 www-ssl/pic/avatar/avatar142.gif                | Bin
 www-ssl/pic/avatar/avatar143.gif                | Bin
 www-ssl/pic/avatar/avatar144.gif                | Bin
 www-ssl/pic/avatar/avatar145.gif                | Bin
 www-ssl/pic/avatar/avatar146.gif                | Bin
 www-ssl/pic/avatar/avatar147.gif                | Bin
 www-ssl/pic/avatar/avatar148.gif                | Bin
 www-ssl/pic/avatar/avatar149.gif                | Bin
 www-ssl/pic/avatar/avatar15.gif                 | Bin
 www-ssl/pic/avatar/avatar150.gif                | Bin
 www-ssl/pic/avatar/avatar151.gif                | Bin
 www-ssl/pic/avatar/avatar152.gif                | Bin
 www-ssl/pic/avatar/avatar153.gif                | Bin
 www-ssl/pic/avatar/avatar154.gif                | Bin
 www-ssl/pic/avatar/avatar155.gif                | Bin
 www-ssl/pic/avatar/avatar156.gif                | Bin
 www-ssl/pic/avatar/avatar157.gif                | Bin
 www-ssl/pic/avatar/avatar158.gif                | Bin
 www-ssl/pic/avatar/avatar159.gif                | Bin
 www-ssl/pic/avatar/avatar16.gif                 | Bin
 www-ssl/pic/avatar/avatar160.gif                | Bin
 www-ssl/pic/avatar/avatar161.gif                | Bin
 www-ssl/pic/avatar/avatar162.gif                | Bin
 www-ssl/pic/avatar/avatar163.gif                | Bin
 www-ssl/pic/avatar/avatar164.gif                | Bin
 www-ssl/pic/avatar/avatar165.gif                | Bin
 www-ssl/pic/avatar/avatar166.gif                | Bin
 www-ssl/pic/avatar/avatar167.gif                | Bin
 www-ssl/pic/avatar/avatar168.gif                | Bin
 www-ssl/pic/avatar/avatar169.gif                | Bin
 www-ssl/pic/avatar/avatar17.gif                 | Bin
 www-ssl/pic/avatar/avatar170.gif                | Bin
 www-ssl/pic/avatar/avatar171.gif                | Bin
 www-ssl/pic/avatar/avatar172.gif                | Bin
 www-ssl/pic/avatar/avatar173.gif                | Bin
 www-ssl/pic/avatar/avatar174.gif                | Bin
 www-ssl/pic/avatar/avatar175.gif                | Bin
 www-ssl/pic/avatar/avatar176.gif                | Bin
 www-ssl/pic/avatar/avatar177.gif                | Bin
 www-ssl/pic/avatar/avatar178.gif                | Bin
 www-ssl/pic/avatar/avatar179.gif                | Bin
 www-ssl/pic/avatar/avatar18.gif                 | Bin
 www-ssl/pic/avatar/avatar180.gif                | Bin
 www-ssl/pic/avatar/avatar181.gif                | Bin
 www-ssl/pic/avatar/avatar182.gif                | Bin
 www-ssl/pic/avatar/avatar183.gif                | Bin
 www-ssl/pic/avatar/avatar184.gif                | Bin
 www-ssl/pic/avatar/avatar185.gif                | Bin
 www-ssl/pic/avatar/avatar186.gif                | Bin
 www-ssl/pic/avatar/avatar187.gif                | Bin
 www-ssl/pic/avatar/avatar188.gif                | Bin
 www-ssl/pic/avatar/avatar189.gif                | Bin
 www-ssl/pic/avatar/avatar19.gif                 | Bin
 www-ssl/pic/avatar/avatar190.gif                | Bin
 www-ssl/pic/avatar/avatar191.gif                | Bin
 www-ssl/pic/avatar/avatar192.gif                | Bin
 www-ssl/pic/avatar/avatar193.gif                | Bin
 www-ssl/pic/avatar/avatar194.gif                | Bin
 www-ssl/pic/avatar/avatar195.gif                | Bin
 www-ssl/pic/avatar/avatar196.gif                | Bin
 www-ssl/pic/avatar/avatar197.gif                | Bin
 www-ssl/pic/avatar/avatar198.gif                | Bin
 www-ssl/pic/avatar/avatar199.gif                | Bin
 www-ssl/pic/avatar/avatar2.gif                  | Bin
 www-ssl/pic/avatar/avatar20.gif                 | Bin
 www-ssl/pic/avatar/avatar200.gif                | Bin
 www-ssl/pic/avatar/avatar201.gif                | Bin
 www-ssl/pic/avatar/avatar202.gif                | Bin
 www-ssl/pic/avatar/avatar203.gif                | Bin
 www-ssl/pic/avatar/avatar204.gif                | Bin
 www-ssl/pic/avatar/avatar205.gif                | Bin
 www-ssl/pic/avatar/avatar206.gif                | Bin
 www-ssl/pic/avatar/avatar207.gif                | Bin
 www-ssl/pic/avatar/avatar208.gif                | Bin
 www-ssl/pic/avatar/avatar209.gif                | Bin
 www-ssl/pic/avatar/avatar21.gif                 | Bin
 www-ssl/pic/avatar/avatar210.gif                | Bin
 www-ssl/pic/avatar/avatar211.gif                | Bin
 www-ssl/pic/avatar/avatar212.gif                | Bin
 www-ssl/pic/avatar/avatar213.gif                | Bin
 www-ssl/pic/avatar/avatar214.gif                | Bin
 www-ssl/pic/avatar/avatar215.gif                | Bin
 www-ssl/pic/avatar/avatar216.gif                | Bin
 www-ssl/pic/avatar/avatar217.gif                | Bin
 www-ssl/pic/avatar/avatar218.gif                | Bin
 www-ssl/pic/avatar/avatar219.gif                | Bin
 www-ssl/pic/avatar/avatar22.gif                 | Bin
 www-ssl/pic/avatar/avatar220.gif                | Bin
 www-ssl/pic/avatar/avatar221.gif                | Bin
 www-ssl/pic/avatar/avatar222.gif                | Bin
 www-ssl/pic/avatar/avatar223.gif                | Bin
 www-ssl/pic/avatar/avatar224.gif                | Bin
 www-ssl/pic/avatar/avatar225.gif                | Bin
 www-ssl/pic/avatar/avatar226.gif                | Bin
 www-ssl/pic/avatar/avatar227.gif                | Bin
 www-ssl/pic/avatar/avatar228.gif                | Bin
 www-ssl/pic/avatar/avatar229.gif                | Bin
 www-ssl/pic/avatar/avatar23.gif                 | Bin
 www-ssl/pic/avatar/avatar230.gif                | Bin
 www-ssl/pic/avatar/avatar231.gif                | Bin
 www-ssl/pic/avatar/avatar232.gif                | Bin
 www-ssl/pic/avatar/avatar233.gif                | Bin
 www-ssl/pic/avatar/avatar234.gif                | Bin
 www-ssl/pic/avatar/avatar235.gif                | Bin
 www-ssl/pic/avatar/avatar236.gif                | Bin
 www-ssl/pic/avatar/avatar237.gif                | Bin
 www-ssl/pic/avatar/avatar238.gif                | Bin
 www-ssl/pic/avatar/avatar239.gif                | Bin
 www-ssl/pic/avatar/avatar24.gif                 | Bin
 www-ssl/pic/avatar/avatar240.gif                | Bin
 www-ssl/pic/avatar/avatar241.gif                | Bin
 www-ssl/pic/avatar/avatar242.gif                | Bin
 www-ssl/pic/avatar/avatar243.gif                | Bin
 www-ssl/pic/avatar/avatar244.gif                | Bin
 www-ssl/pic/avatar/avatar245.gif                | Bin
 www-ssl/pic/avatar/avatar246.gif                | Bin
 www-ssl/pic/avatar/avatar247.gif                | Bin
 www-ssl/pic/avatar/avatar248.gif                | Bin
 www-ssl/pic/avatar/avatar249.gif                | Bin
 www-ssl/pic/avatar/avatar25.gif                 | Bin
 www-ssl/pic/avatar/avatar250.gif                | Bin
 www-ssl/pic/avatar/avatar251.gif                | Bin
 www-ssl/pic/avatar/avatar252.gif                | Bin
 www-ssl/pic/avatar/avatar253.gif                | Bin
 www-ssl/pic/avatar/avatar254.gif                | Bin
 www-ssl/pic/avatar/avatar255.gif                | Bin
 www-ssl/pic/avatar/avatar256.gif                | Bin
 www-ssl/pic/avatar/avatar257.gif                | Bin
 www-ssl/pic/avatar/avatar258.gif                | Bin
 www-ssl/pic/avatar/avatar259.gif                | Bin
 www-ssl/pic/avatar/avatar26.gif                 | Bin
 www-ssl/pic/avatar/avatar260.gif                | Bin
 www-ssl/pic/avatar/avatar261.gif                | Bin
 www-ssl/pic/avatar/avatar262.gif                | Bin
 www-ssl/pic/avatar/avatar263.gif                | Bin
 www-ssl/pic/avatar/avatar264.gif                | Bin
 www-ssl/pic/avatar/avatar265.gif                | Bin
 www-ssl/pic/avatar/avatar266.gif                | Bin
 www-ssl/pic/avatar/avatar267.gif                | Bin
 www-ssl/pic/avatar/avatar268.gif                | Bin
 www-ssl/pic/avatar/avatar269.gif                | Bin
 www-ssl/pic/avatar/avatar27.gif                 | Bin
 www-ssl/pic/avatar/avatar270.gif                | Bin
 www-ssl/pic/avatar/avatar271.gif                | Bin
 www-ssl/pic/avatar/avatar272.gif                | Bin
 www-ssl/pic/avatar/avatar273.gif                | Bin
 www-ssl/pic/avatar/avatar274.gif                | Bin
 www-ssl/pic/avatar/avatar275.gif                | Bin
 www-ssl/pic/avatar/avatar276.gif                | Bin
 www-ssl/pic/avatar/avatar277.gif                | Bin
 www-ssl/pic/avatar/avatar278.gif                | Bin
 www-ssl/pic/avatar/avatar279.gif                | Bin
 www-ssl/pic/avatar/avatar28.gif                 | Bin
 www-ssl/pic/avatar/avatar280.gif                | Bin
 www-ssl/pic/avatar/avatar281.gif                | Bin
 www-ssl/pic/avatar/avatar282.gif                | Bin
 www-ssl/pic/avatar/avatar283.gif                | Bin
 www-ssl/pic/avatar/avatar284.gif                | Bin
 www-ssl/pic/avatar/avatar285.gif                | Bin
 www-ssl/pic/avatar/avatar286.gif                | Bin
 www-ssl/pic/avatar/avatar287.gif                | Bin
 www-ssl/pic/avatar/avatar288.gif                | Bin
 www-ssl/pic/avatar/avatar289.gif                | Bin
 www-ssl/pic/avatar/avatar29.gif                 | Bin
 www-ssl/pic/avatar/avatar290.gif                | Bin
 www-ssl/pic/avatar/avatar291.gif                | Bin
 www-ssl/pic/avatar/avatar292.gif                | Bin
 www-ssl/pic/avatar/avatar293.gif                | Bin
 www-ssl/pic/avatar/avatar294.gif                | Bin
 www-ssl/pic/avatar/avatar295.gif                | Bin
 www-ssl/pic/avatar/avatar296.gif                | Bin
 www-ssl/pic/avatar/avatar297.gif                | Bin
 www-ssl/pic/avatar/avatar298.gif                | Bin
 www-ssl/pic/avatar/avatar299.gif                | Bin
 www-ssl/pic/avatar/avatar3.gif                  | Bin
 www-ssl/pic/avatar/avatar30.gif                 | Bin
 www-ssl/pic/avatar/avatar300.gif                | Bin
 www-ssl/pic/avatar/avatar301.gif                | Bin
 www-ssl/pic/avatar/avatar302.gif                | Bin
 www-ssl/pic/avatar/avatar303.gif                | Bin
 www-ssl/pic/avatar/avatar304.gif                | Bin
 www-ssl/pic/avatar/avatar305.gif                | Bin
 www-ssl/pic/avatar/avatar306.gif                | Bin
 www-ssl/pic/avatar/avatar307.gif                | Bin
 www-ssl/pic/avatar/avatar308.gif                | Bin
 www-ssl/pic/avatar/avatar309.gif                | Bin
 www-ssl/pic/avatar/avatar31.gif                 | Bin
 www-ssl/pic/avatar/avatar310.gif                | Bin
 www-ssl/pic/avatar/avatar311.gif                | Bin
 www-ssl/pic/avatar/avatar312.gif                | Bin
 www-ssl/pic/avatar/avatar313.gif                | Bin
 www-ssl/pic/avatar/avatar314.gif                | Bin
 www-ssl/pic/avatar/avatar315.gif                | Bin
 www-ssl/pic/avatar/avatar316.gif                | Bin
 www-ssl/pic/avatar/avatar317.gif                | Bin
 www-ssl/pic/avatar/avatar318.gif                | Bin
 www-ssl/pic/avatar/avatar319.gif                | Bin
 www-ssl/pic/avatar/avatar32.gif                 | Bin
 www-ssl/pic/avatar/avatar320.gif                | Bin
 www-ssl/pic/avatar/avatar321.gif                | Bin
 www-ssl/pic/avatar/avatar322.gif                | Bin
 www-ssl/pic/avatar/avatar323.gif                | Bin
 www-ssl/pic/avatar/avatar324.gif                | Bin
 www-ssl/pic/avatar/avatar325.gif                | Bin
 www-ssl/pic/avatar/avatar326.gif                | Bin
 www-ssl/pic/avatar/avatar327.gif                | Bin
 www-ssl/pic/avatar/avatar328.gif                | Bin
 www-ssl/pic/avatar/avatar329.gif                | Bin
 www-ssl/pic/avatar/avatar33.gif                 | Bin
 www-ssl/pic/avatar/avatar330.gif                | Bin
 www-ssl/pic/avatar/avatar331.gif                | Bin
 www-ssl/pic/avatar/avatar332.gif                | Bin
 www-ssl/pic/avatar/avatar333.gif                | Bin
 www-ssl/pic/avatar/avatar334.gif                | Bin
 www-ssl/pic/avatar/avatar335.gif                | Bin
 www-ssl/pic/avatar/avatar336.gif                | Bin
 www-ssl/pic/avatar/avatar337.gif                | Bin
 www-ssl/pic/avatar/avatar338.gif                | Bin
 www-ssl/pic/avatar/avatar339.gif                | Bin
 www-ssl/pic/avatar/avatar34.gif                 | Bin
 www-ssl/pic/avatar/avatar340.gif                | Bin
 www-ssl/pic/avatar/avatar341.gif                | Bin
 www-ssl/pic/avatar/avatar342.gif                | Bin
 www-ssl/pic/avatar/avatar343.gif                | Bin
 www-ssl/pic/avatar/avatar344.gif                | Bin
 www-ssl/pic/avatar/avatar345.gif                | Bin
 www-ssl/pic/avatar/avatar346.gif                | Bin
 www-ssl/pic/avatar/avatar347.gif                | Bin
 www-ssl/pic/avatar/avatar348.gif                | Bin
 www-ssl/pic/avatar/avatar349.gif                | Bin
 www-ssl/pic/avatar/avatar35.gif                 | Bin
 www-ssl/pic/avatar/avatar350.gif                | Bin
 www-ssl/pic/avatar/avatar351.gif                | Bin
 www-ssl/pic/avatar/avatar352.gif                | Bin
 www-ssl/pic/avatar/avatar353.gif                | Bin
 www-ssl/pic/avatar/avatar354.gif                | Bin
 www-ssl/pic/avatar/avatar355.gif                | Bin
 www-ssl/pic/avatar/avatar356.gif                | Bin
 www-ssl/pic/avatar/avatar357.gif                | Bin
 www-ssl/pic/avatar/avatar358.gif                | Bin
 www-ssl/pic/avatar/avatar359.gif                | Bin
 www-ssl/pic/avatar/avatar36.gif                 | Bin
 www-ssl/pic/avatar/avatar360.gif                | Bin
 www-ssl/pic/avatar/avatar361.gif                | Bin
 www-ssl/pic/avatar/avatar362.gif                | Bin
 www-ssl/pic/avatar/avatar363.gif                | Bin
 www-ssl/pic/avatar/avatar364.gif                | Bin
 www-ssl/pic/avatar/avatar365.gif                | Bin
 www-ssl/pic/avatar/avatar366.gif                | Bin
 www-ssl/pic/avatar/avatar367.gif                | Bin
 www-ssl/pic/avatar/avatar368.gif                | Bin
 www-ssl/pic/avatar/avatar369.gif                | Bin
 www-ssl/pic/avatar/avatar37.gif                 | Bin
 www-ssl/pic/avatar/avatar370.gif                | Bin
 www-ssl/pic/avatar/avatar371.gif                | Bin
 www-ssl/pic/avatar/avatar372.gif                | Bin
 www-ssl/pic/avatar/avatar373.gif                | Bin
 www-ssl/pic/avatar/avatar374.gif                | Bin
 www-ssl/pic/avatar/avatar375.gif                | Bin
 www-ssl/pic/avatar/avatar376.gif                | Bin
 www-ssl/pic/avatar/avatar377.gif                | Bin
 www-ssl/pic/avatar/avatar378.gif                | Bin
 www-ssl/pic/avatar/avatar379.gif                | Bin
 www-ssl/pic/avatar/avatar38.gif                 | Bin
 www-ssl/pic/avatar/avatar380.gif                | Bin
 www-ssl/pic/avatar/avatar381.gif                | Bin
 www-ssl/pic/avatar/avatar382.gif                | Bin
 www-ssl/pic/avatar/avatar383.gif                | Bin
 www-ssl/pic/avatar/avatar384.gif                | Bin
 www-ssl/pic/avatar/avatar385.gif                | Bin
 www-ssl/pic/avatar/avatar386.gif                | Bin
 www-ssl/pic/avatar/avatar387.gif                | Bin
 www-ssl/pic/avatar/avatar388.gif                | Bin
 www-ssl/pic/avatar/avatar389.gif                | Bin
 www-ssl/pic/avatar/avatar39.gif                 | Bin
 www-ssl/pic/avatar/avatar390.gif                | Bin
 www-ssl/pic/avatar/avatar391.gif                | Bin
 www-ssl/pic/avatar/avatar392.gif                | Bin
 www-ssl/pic/avatar/avatar393.gif                | Bin
 www-ssl/pic/avatar/avatar394.gif                | Bin
 www-ssl/pic/avatar/avatar395.gif                | Bin
 www-ssl/pic/avatar/avatar396.gif                | Bin
 www-ssl/pic/avatar/avatar397.gif                | Bin
 www-ssl/pic/avatar/avatar398.gif                | Bin
 www-ssl/pic/avatar/avatar399.gif                | Bin
 www-ssl/pic/avatar/avatar4.gif                  | Bin
 www-ssl/pic/avatar/avatar40.gif                 | Bin
 www-ssl/pic/avatar/avatar400.gif                | Bin
 www-ssl/pic/avatar/avatar401.gif                | Bin
 www-ssl/pic/avatar/avatar402.gif                | Bin
 www-ssl/pic/avatar/avatar403.gif                | Bin
 www-ssl/pic/avatar/avatar404.gif                | Bin
 www-ssl/pic/avatar/avatar405.gif                | Bin
 www-ssl/pic/avatar/avatar406.gif                | Bin
 www-ssl/pic/avatar/avatar407.gif                | Bin
 www-ssl/pic/avatar/avatar408.gif                | Bin
 www-ssl/pic/avatar/avatar409.gif                | Bin
 www-ssl/pic/avatar/avatar41.gif                 | Bin
 www-ssl/pic/avatar/avatar410.gif                | Bin
 www-ssl/pic/avatar/avatar411.gif                | Bin
 www-ssl/pic/avatar/avatar412.gif                | Bin
 www-ssl/pic/avatar/avatar413.gif                | Bin
 www-ssl/pic/avatar/avatar414.gif                | Bin
 www-ssl/pic/avatar/avatar415.gif                | Bin
 www-ssl/pic/avatar/avatar416.gif                | Bin
 www-ssl/pic/avatar/avatar417.gif                | Bin
 www-ssl/pic/avatar/avatar418.gif                | Bin
 www-ssl/pic/avatar/avatar419.gif                | Bin
 www-ssl/pic/avatar/avatar42.gif                 | Bin
 www-ssl/pic/avatar/avatar420.gif                | Bin
 www-ssl/pic/avatar/avatar421.gif                | Bin
 www-ssl/pic/avatar/avatar422.gif                | Bin
 www-ssl/pic/avatar/avatar423.gif                | Bin
 www-ssl/pic/avatar/avatar424.gif                | Bin
 www-ssl/pic/avatar/avatar425.gif                | Bin
 www-ssl/pic/avatar/avatar426.gif                | Bin
 www-ssl/pic/avatar/avatar427.gif                | Bin
 www-ssl/pic/avatar/avatar428.gif                | Bin
 www-ssl/pic/avatar/avatar429.gif                | Bin
 www-ssl/pic/avatar/avatar43.gif                 | Bin
 www-ssl/pic/avatar/avatar430.gif                | Bin
 www-ssl/pic/avatar/avatar431.gif                | Bin
 www-ssl/pic/avatar/avatar432.gif                | Bin
 www-ssl/pic/avatar/avatar433.gif                | Bin
 www-ssl/pic/avatar/avatar434.gif                | Bin
 www-ssl/pic/avatar/avatar435.gif                | Bin
 www-ssl/pic/avatar/avatar436.gif                | Bin
 www-ssl/pic/avatar/avatar437.gif                | Bin
 www-ssl/pic/avatar/avatar438.gif                | Bin
 www-ssl/pic/avatar/avatar439.gif                | Bin
 www-ssl/pic/avatar/avatar44.gif                 | Bin
 www-ssl/pic/avatar/avatar440.gif                | Bin
 www-ssl/pic/avatar/avatar441.gif                | Bin
 www-ssl/pic/avatar/avatar442.gif                | Bin
 www-ssl/pic/avatar/avatar443.gif                | Bin
 www-ssl/pic/avatar/avatar444.gif                | Bin
 www-ssl/pic/avatar/avatar445.gif                | Bin
 www-ssl/pic/avatar/avatar446.gif                | Bin
 www-ssl/pic/avatar/avatar447.gif                | Bin
 www-ssl/pic/avatar/avatar448.gif                | Bin
 www-ssl/pic/avatar/avatar449.gif                | Bin
 www-ssl/pic/avatar/avatar45.gif                 | Bin
 www-ssl/pic/avatar/avatar450.gif                | Bin
 www-ssl/pic/avatar/avatar451.gif                | Bin
 www-ssl/pic/avatar/avatar452.gif                | Bin
 www-ssl/pic/avatar/avatar453.gif                | Bin
 www-ssl/pic/avatar/avatar454.gif                | Bin
 www-ssl/pic/avatar/avatar455.gif                | Bin
 www-ssl/pic/avatar/avatar456.gif                | Bin
 www-ssl/pic/avatar/avatar457.gif                | Bin
 www-ssl/pic/avatar/avatar458.gif                | Bin
 www-ssl/pic/avatar/avatar459.gif                | Bin
 www-ssl/pic/avatar/avatar46.gif                 | Bin
 www-ssl/pic/avatar/avatar460.gif                | Bin
 www-ssl/pic/avatar/avatar461.gif                | Bin
 www-ssl/pic/avatar/avatar462.gif                | Bin
 www-ssl/pic/avatar/avatar463.gif                | Bin
 www-ssl/pic/avatar/avatar464.gif                | Bin
 www-ssl/pic/avatar/avatar465.gif                | Bin
 www-ssl/pic/avatar/avatar466.gif                | Bin
 www-ssl/pic/avatar/avatar467.gif                | Bin
 www-ssl/pic/avatar/avatar468.gif                | Bin
 www-ssl/pic/avatar/avatar469.gif                | Bin
 www-ssl/pic/avatar/avatar47.gif                 | Bin
 www-ssl/pic/avatar/avatar470.gif                | Bin
 www-ssl/pic/avatar/avatar471.gif                | Bin
 www-ssl/pic/avatar/avatar472.gif                | Bin
 www-ssl/pic/avatar/avatar473.gif                | Bin
 www-ssl/pic/avatar/avatar474.gif                | Bin
 www-ssl/pic/avatar/avatar475.gif                | Bin
 www-ssl/pic/avatar/avatar476.gif                | Bin
 www-ssl/pic/avatar/avatar477.gif                | Bin
 www-ssl/pic/avatar/avatar478.gif                | Bin
 www-ssl/pic/avatar/avatar479.gif                | Bin
 www-ssl/pic/avatar/avatar48.gif                 | Bin
 www-ssl/pic/avatar/avatar480.gif                | Bin
 www-ssl/pic/avatar/avatar481.gif                | Bin
 www-ssl/pic/avatar/avatar482.gif                | Bin
 www-ssl/pic/avatar/avatar483.gif                | Bin
 www-ssl/pic/avatar/avatar484.gif                | Bin
 www-ssl/pic/avatar/avatar485.gif                | Bin
 www-ssl/pic/avatar/avatar486.gif                | Bin
 www-ssl/pic/avatar/avatar487.gif                | Bin
 www-ssl/pic/avatar/avatar488.gif                | Bin
 www-ssl/pic/avatar/avatar489.gif                | Bin
 www-ssl/pic/avatar/avatar49.gif                 | Bin
 www-ssl/pic/avatar/avatar490.gif                | Bin
 www-ssl/pic/avatar/avatar491.gif                | Bin
 www-ssl/pic/avatar/avatar492.gif                | Bin
 www-ssl/pic/avatar/avatar493.gif                | Bin
 www-ssl/pic/avatar/avatar494.gif                | Bin
 www-ssl/pic/avatar/avatar495.gif                | Bin
 www-ssl/pic/avatar/avatar496.gif                | Bin
 www-ssl/pic/avatar/avatar497.gif                | Bin
 www-ssl/pic/avatar/avatar498.gif                | Bin
 www-ssl/pic/avatar/avatar499.gif                | Bin
 www-ssl/pic/avatar/avatar5.gif                  | Bin
 www-ssl/pic/avatar/avatar50.gif                 | Bin
 www-ssl/pic/avatar/avatar51.gif                 | Bin
 www-ssl/pic/avatar/avatar52.gif                 | Bin
 www-ssl/pic/avatar/avatar53.gif                 | Bin
 www-ssl/pic/avatar/avatar54.gif                 | Bin
 www-ssl/pic/avatar/avatar55.gif                 | Bin
 www-ssl/pic/avatar/avatar56.gif                 | Bin
 www-ssl/pic/avatar/avatar57.gif                 | Bin
 www-ssl/pic/avatar/avatar58.gif                 | Bin
 www-ssl/pic/avatar/avatar59.gif                 | Bin
 www-ssl/pic/avatar/avatar6.gif                  | Bin
 www-ssl/pic/avatar/avatar60.gif                 | Bin
 www-ssl/pic/avatar/avatar61.gif                 | Bin
 www-ssl/pic/avatar/avatar62.gif                 | Bin
 www-ssl/pic/avatar/avatar63.gif                 | Bin
 www-ssl/pic/avatar/avatar64.gif                 | Bin
 www-ssl/pic/avatar/avatar65.gif                 | Bin
 www-ssl/pic/avatar/avatar66.gif                 | Bin
 www-ssl/pic/avatar/avatar67.gif                 | Bin
 www-ssl/pic/avatar/avatar68.gif                 | Bin
 www-ssl/pic/avatar/avatar69.gif                 | Bin
 www-ssl/pic/avatar/avatar7.gif                  | Bin
 www-ssl/pic/avatar/avatar70.gif                 | Bin
 www-ssl/pic/avatar/avatar71.gif                 | Bin
 www-ssl/pic/avatar/avatar72.gif                 | Bin
 www-ssl/pic/avatar/avatar73.gif                 | Bin
 www-ssl/pic/avatar/avatar74.gif                 | Bin
 www-ssl/pic/avatar/avatar75.gif                 | Bin
 www-ssl/pic/avatar/avatar76.gif                 | Bin
 www-ssl/pic/avatar/avatar77.gif                 | Bin
 www-ssl/pic/avatar/avatar78.gif                 | Bin
 www-ssl/pic/avatar/avatar79.gif                 | Bin
 www-ssl/pic/avatar/avatar8.gif                  | Bin
 www-ssl/pic/avatar/avatar80.gif                 | Bin
 www-ssl/pic/avatar/avatar81.gif                 | Bin
 www-ssl/pic/avatar/avatar82.gif                 | Bin
 www-ssl/pic/avatar/avatar83.gif                 | Bin
 www-ssl/pic/avatar/avatar84.gif                 | Bin
 www-ssl/pic/avatar/avatar85.gif                 | Bin
 www-ssl/pic/avatar/avatar86.gif                 | Bin
 www-ssl/pic/avatar/avatar87.gif                 | Bin
 www-ssl/pic/avatar/avatar88.gif                 | Bin
 www-ssl/pic/avatar/avatar89.gif                 | Bin
 www-ssl/pic/avatar/avatar9.gif                  | Bin
 www-ssl/pic/avatar/avatar90.gif                 | Bin
 www-ssl/pic/avatar/avatar91.gif                 | Bin
 www-ssl/pic/avatar/avatar92.gif                 | Bin
 www-ssl/pic/avatar/avatar93.gif                 | Bin
 www-ssl/pic/avatar/avatar94.gif                 | Bin
 www-ssl/pic/avatar/avatar95.gif                 | Bin
 www-ssl/pic/avatar/avatar96.gif                 | Bin
 www-ssl/pic/avatar/avatar97.gif                 | Bin
 www-ssl/pic/avatar/avatar98.gif                 | Bin
 www-ssl/pic/avatar/avatar99.gif                 | Bin
 www-ssl/pic/external.png                        | Bin
 www-ssl/pic/flag/de.gif                         | Bin
 www-ssl/pic/flag/en.gif                         | Bin
 www-ssl/pic/himmel.png                          | Bin
 www-ssl/pic/himmel_w.png                        | Bin
 www-ssl/pic/smiles/aerger2.gif                  | Bin
 www-ssl/pic/smiles/alien.gif                    | Bin
 www-ssl/pic/smiles/blush.gif                    | Bin
 www-ssl/pic/smiles/boggle.gif                   | Bin
 www-ssl/pic/smiles/bounce.gif                   | Bin
 www-ssl/pic/smiles/bun.gif                      | Bin
 www-ssl/pic/smiles/candycane.gif                | Bin
 www-ssl/pic/smiles/cheesy.gif                   | Bin
 www-ssl/pic/smiles/dead.gif                     | Bin
 www-ssl/pic/smiles/depressed.gif                | Bin
 www-ssl/pic/smiles/ginger.gif                   | Bin
 www-ssl/pic/smiles/hirsch1.gif                  | Bin
 www-ssl/pic/smiles/huh.gif                      | Bin
 www-ssl/pic/smiles/icon_arrow.gif               | Bin
 www-ssl/pic/smiles/icon_biggrin.gif             | Bin
 www-ssl/pic/smiles/icon_confused.gif            | Bin
 www-ssl/pic/smiles/icon_cool.gif                | Bin
 www-ssl/pic/smiles/icon_cry.gif                 | Bin
 www-ssl/pic/smiles/icon_eek.gif                 | Bin
 www-ssl/pic/smiles/icon_evil.gif                | Bin
 www-ssl/pic/smiles/icon_exclaim.gif             | Bin
 www-ssl/pic/smiles/icon_frown.gif               | Bin
 www-ssl/pic/smiles/icon_idea.gif                | Bin
 www-ssl/pic/smiles/icon_lol.gif                 | Bin
 www-ssl/pic/smiles/icon_mad.gif                 | Bin
 www-ssl/pic/smiles/icon_mrgreen.gif             | Bin
 www-ssl/pic/smiles/icon_neutral.gif             | Bin
 www-ssl/pic/smiles/icon_question.gif            | Bin
 www-ssl/pic/smiles/icon_razz.gif                | Bin
 www-ssl/pic/smiles/icon_redface.gif             | Bin
 www-ssl/pic/smiles/icon_rolleyes.gif            | Bin
 www-ssl/pic/smiles/icon_sad.gif                 | Bin
 www-ssl/pic/smiles/icon_smile.gif               | Bin
 www-ssl/pic/smiles/icon_surprised.gif           | Bin
 www-ssl/pic/smiles/icon_twisted.gif             | Bin
 www-ssl/pic/smiles/icon_wind.gif                | Bin
 www-ssl/pic/smiles/koenig1.gif                  | Bin
 www-ssl/pic/smiles/laser1.gif                   | Bin
 www-ssl/pic/smiles/love1.gif                    | Bin
 www-ssl/pic/smiles/moo.gif                      | Bin
 www-ssl/pic/smiles/nuts.gif                     | Bin
 www-ssl/pic/smiles/robin.gif                    | Bin
 www-ssl/pic/smiles/sheep.gif                    | Bin
 www-ssl/pic/smiles/sick.gif                     | Bin
 www-ssl/pic/smiles/sleep.gif                    | Bin
 www-ssl/pic/smiles/soppy.gif                    | Bin
 www-ssl/pic/smiles/stress.gif                   | Bin
 www-ssl/pic/smiles/sweet.gif                    | Bin
 www-ssl/pic/smiles/tired.gif                    | Bin
 www-ssl/pic/smiles/urgh.gif                     | Bin
 www-ssl/pic/smiles/winken1.gif                  | Bin
 www-ssl/pic/smiles/worm.gif                     | Bin
 www-ssl/pic/smiles/worry.gif                    | Bin
 www/404.php                                     |   4 +-
 www/index.php                                   |   5 +-
 673 files changed, 6235 insertions(+), 6575 deletions(-)
 mode change 100755 => 100644 DB/ChangeLog.sql
 mode change 100755 => 100644 DB/Himmel.sql
 mode change 100755 => 100644 DB/SDrohnen.sql
 mode change 100755 => 100644 DB/Sprache.sql
 mode change 100755 => 100644 default-conf/var_www_includes/config.php
 mode change 100755 => 100644 default-conf/var_www_includes/config_db.php
 mode change 100755 => 100644 default-conf/var_www_includes/config_jabber.php
 mode change 100755 => 100644 includes/UserCVS.php
 mode change 100755 => 100644 includes/crypt.php
 mode change 100755 => 100644 includes/error_handler.php
 mode change 100755 => 100644 includes/footer.php
 mode change 100755 => 100644 includes/funktion_activeUser.php
 mode change 100755 => 100644 includes/funktion_cron.php
 mode change 100755 => 100644 includes/funktion_db_list.php
 mode change 100755 => 100644 includes/funktion_faq.php
 mode change 100755 => 100644 includes/funktion_jabber.php
 mode change 100755 => 100644 includes/funktion_lang.php
 mode change 100755 => 100644 includes/funktion_menu.php
 mode change 100755 => 100644 includes/funktion_modem.php
 mode change 100755 => 100644 includes/funktion_schichtplan.php
 mode change 100755 => 100644 includes/funktion_schichtplan_Tage.php
 mode change 100755 => 100644 includes/funktion_schichtplan_aray.php
 mode change 100755 => 100644 includes/funktion_schichtplan_beamer.php
 mode change 100755 => 100644 includes/funktion_user.php
 mode change 100755 => 100644 includes/funktion_xml.php
 mode change 100755 => 100644 includes/funktion_xml_room.php
 mode change 100755 => 100644 includes/funktion_xml_schudle.php
 mode change 100755 => 100644 includes/funktionen.php
 mode change 100755 => 100644 includes/header.php
 mode change 100755 => 100644 includes/header_start.php
 mode change 100755 => 100644 includes/login_eingabefeld.php
 mode change 100755 => 100644 includes/menu.php
 mode change 100755 => 100644 includes/secure.php
 mode change 100755 => 100644 txt/LICENSE
 mode change 100755 => 100644 www-ssl/admin/EngelType.php
 mode change 100755 => 100644 www-ssl/admin/Recentchanges.php
 mode change 100755 => 100644 www-ssl/admin/UserPicture.php
 mode change 100755 => 100644 www-ssl/admin/aktiv.php
 mode change 100755 => 100644 www-ssl/admin/dbUpdateFromXLS.php
 mode change 100755 => 100644 www-ssl/admin/debug.php
 mode change 100755 => 100644 www-ssl/admin/dect.php
 mode change 100755 => 100644 www-ssl/admin/dect_call.php
 mode change 100755 => 100644 www-ssl/admin/faq.1.php
 mode change 100755 => 100644 www-ssl/admin/faq.php
 mode change 100755 => 100644 www-ssl/admin/free.php
 mode change 100755 => 100644 www-ssl/admin/free_DECT.php
 mode change 100755 => 100644 www-ssl/admin/group.php
 mode change 100755 => 100644 www-ssl/admin/index.php
 mode change 100755 => 100644 www-ssl/admin/news.php
 mode change 100755 => 100644 www-ssl/admin/room.php
 mode change 100755 => 100644 www-ssl/admin/schichtplan.1.php
 mode change 100755 => 100644 www-ssl/admin/schichtplan.php
 mode change 100755 => 100644 www-ssl/admin/schichtplan_druck.1.php
 mode change 100755 => 100644 www-ssl/admin/schichtplan_druck.php
 mode change 100755 => 100644 www-ssl/admin/shiftadd.php
 mode change 100755 => 100644 www-ssl/admin/sprache.php
 mode change 100755 => 100644 www-ssl/admin/tshirt.php
 mode change 100755 => 100644 www-ssl/admin/user.php
 mode change 100755 => 100644 www-ssl/admin/userArrived.php
 mode change 100755 => 100644 www-ssl/admin/userChangeNormal.php
 mode change 100755 => 100644 www-ssl/admin/userChangeSecure.php
 mode change 100755 => 100644 www-ssl/admin/userDefaultSetting.php
 mode change 100755 => 100644 www-ssl/admin/userSaveNormal.php
 mode change 100755 => 100644 www-ssl/admin/userSaveSecure.php
 mode change 100755 => 100644 www-ssl/css/grossbild.js
 mode change 100755 => 100644 www-ssl/css/style.css.old
 mode change 100755 => 100644 www-ssl/css/style.css.old2
 mode change 100755 => 100644 www-ssl/css/style1.css
 mode change 100755 => 100644 www-ssl/css/style1.css.old
 mode change 100755 => 100644 www-ssl/css/style2.css
 mode change 100755 => 100644 www-ssl/css/style3.css
 mode change 100755 => 100644 www-ssl/css/style4.css
 mode change 100755 => 100644 www-ssl/css/style5.css
 mode change 100755 => 100644 www-ssl/css/style6.css
 mode change 100755 => 100644 www-ssl/css/style7.css
 mode change 100755 => 100644 www-ssl/css/style8.css
 mode change 100755 => 100644 www-ssl/css/style9.css
 mode change 100755 => 100644 www-ssl/faq.php
 mode change 100755 => 100644 www-ssl/index.php
 mode change 100755 => 100644 www-ssl/lageplan.php
 mode change 100755 => 100644 www-ssl/logout.php
 mode change 100755 => 100644 www-ssl/makeuser.php
 mode change 100755 => 100644 www-ssl/nonpublic/auth.php
 mode change 100755 => 100644 www-ssl/nonpublic/einstellungen.php
 mode change 100755 => 100644 www-ssl/nonpublic/engelbesprechung.php
 mode change 100755 => 100644 www-ssl/nonpublic/faq.php
 mode change 100755 => 100644 www-ssl/nonpublic/index.php
 mode change 100755 => 100644 www-ssl/nonpublic/messages.php
 mode change 100755 => 100644 www-ssl/nonpublic/myschichtplan.php
 mode change 100755 => 100644 www-ssl/nonpublic/myschichtplan_ical.php
 mode change 100755 => 100644 www-ssl/nonpublic/news.php
 mode change 100755 => 100644 www-ssl/nonpublic/news_comments.php
 mode change 100755 => 100644 www-ssl/nonpublic/news_output.php
 mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.1.php
 mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.2.php
 mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.php
 mode change 100755 => 100644 www-ssl/nonpublic/schichtplan_add.php
 mode change 100755 => 100644 www-ssl/nonpublic/schichtplan_beamer.php
 mode change 100755 => 100644 www-ssl/nonpublic/waeckliste.php
 mode change 100755 => 100644 www-ssl/nonpublic/wecken.php
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar1.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar10.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar100.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar101.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar102.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar103.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar104.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar105.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar106.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar107.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar108.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar109.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar11.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar110.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar111.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar112.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar113.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar114.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar115.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar116.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar117.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar118.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar119.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar12.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar120.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar121.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar122.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar123.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar124.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar125.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar126.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar127.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar128.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar129.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar13.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar130.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar131.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar132.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar133.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar134.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar135.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar136.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar137.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar138.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar139.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar14.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar140.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar141.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar142.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar143.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar144.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar145.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar146.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar147.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar148.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar149.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar15.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar150.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar151.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar152.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar153.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar154.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar155.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar156.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar157.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar158.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar159.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar16.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar160.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar161.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar162.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar163.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar164.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar165.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar166.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar167.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar168.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar169.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar17.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar170.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar171.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar172.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar173.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar174.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar175.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar176.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar177.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar178.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar179.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar18.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar180.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar181.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar182.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar183.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar184.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar185.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar186.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar187.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar188.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar189.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar19.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar190.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar191.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar192.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar193.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar194.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar195.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar196.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar197.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar198.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar199.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar2.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar20.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar200.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar201.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar202.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar203.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar204.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar205.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar206.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar207.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar208.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar209.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar21.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar210.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar211.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar212.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar213.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar214.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar215.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar216.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar217.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar218.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar219.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar22.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar220.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar221.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar222.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar223.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar224.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar225.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar226.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar227.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar228.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar229.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar23.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar230.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar231.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar232.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar233.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar234.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar235.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar236.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar237.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar238.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar239.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar24.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar240.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar241.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar242.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar243.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar244.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar245.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar246.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar247.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar248.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar249.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar25.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar250.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar251.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar252.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar253.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar254.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar255.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar256.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar257.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar258.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar259.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar26.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar260.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar261.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar262.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar263.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar264.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar265.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar266.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar267.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar268.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar269.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar27.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar270.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar271.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar272.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar273.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar274.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar275.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar276.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar277.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar278.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar279.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar28.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar280.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar281.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar282.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar283.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar284.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar285.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar286.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar287.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar288.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar289.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar29.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar290.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar291.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar292.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar293.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar294.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar295.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar296.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar297.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar298.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar299.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar3.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar30.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar300.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar301.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar302.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar303.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar304.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar305.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar306.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar307.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar308.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar309.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar31.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar310.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar311.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar312.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar313.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar314.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar315.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar316.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar317.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar318.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar319.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar32.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar320.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar321.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar322.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar323.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar324.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar325.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar326.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar327.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar328.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar329.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar33.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar330.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar331.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar332.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar333.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar334.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar335.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar336.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar337.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar338.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar339.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar34.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar340.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar341.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar342.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar343.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar344.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar345.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar346.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar347.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar348.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar349.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar35.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar350.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar351.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar352.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar353.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar354.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar355.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar356.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar357.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar358.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar359.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar36.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar360.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar361.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar362.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar363.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar364.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar365.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar366.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar367.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar368.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar369.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar37.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar370.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar371.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar372.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar373.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar374.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar375.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar376.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar377.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar378.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar379.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar38.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar380.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar381.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar382.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar383.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar384.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar385.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar386.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar387.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar388.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar389.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar39.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar390.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar391.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar392.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar393.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar394.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar395.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar396.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar397.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar398.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar399.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar4.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar40.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar400.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar401.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar402.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar403.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar404.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar405.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar406.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar407.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar408.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar409.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar41.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar410.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar411.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar412.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar413.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar414.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar415.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar416.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar417.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar418.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar419.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar42.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar420.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar421.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar422.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar423.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar424.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar425.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar426.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar427.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar428.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar429.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar43.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar430.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar431.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar432.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar433.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar434.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar435.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar436.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar437.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar438.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar439.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar44.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar440.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar441.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar442.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar443.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar444.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar445.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar446.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar447.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar448.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar449.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar45.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar450.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar451.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar452.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar453.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar454.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar455.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar456.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar457.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar458.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar459.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar46.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar460.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar461.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar462.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar463.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar464.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar465.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar466.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar467.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar468.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar469.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar47.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar470.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar471.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar472.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar473.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar474.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar475.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar476.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar477.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar478.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar479.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar48.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar480.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar481.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar482.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar483.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar484.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar485.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar486.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar487.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar488.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar489.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar49.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar490.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar491.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar492.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar493.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar494.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar495.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar496.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar497.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar498.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar499.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar5.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar50.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar51.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar52.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar53.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar54.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar55.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar56.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar57.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar58.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar59.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar6.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar60.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar61.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar62.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar63.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar64.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar65.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar66.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar67.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar68.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar69.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar7.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar70.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar71.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar72.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar73.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar74.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar75.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar76.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar77.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar78.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar79.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar8.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar80.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar81.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar82.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar83.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar84.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar85.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar86.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar87.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar88.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar89.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar9.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar90.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar91.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar92.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar93.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar94.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar95.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar96.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar97.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar98.gif
 mode change 100755 => 100644 www-ssl/pic/avatar/avatar99.gif
 mode change 100755 => 100644 www-ssl/pic/external.png
 mode change 100755 => 100644 www-ssl/pic/flag/de.gif
 mode change 100755 => 100644 www-ssl/pic/flag/en.gif
 mode change 100755 => 100644 www-ssl/pic/himmel.png
 mode change 100755 => 100644 www-ssl/pic/himmel_w.png
 mode change 100755 => 100644 www-ssl/pic/smiles/aerger2.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/alien.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/blush.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/boggle.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/bounce.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/bun.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/candycane.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/cheesy.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/dead.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/depressed.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/ginger.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/hirsch1.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/huh.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_arrow.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_biggrin.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_confused.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_cool.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_cry.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_eek.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_evil.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_exclaim.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_frown.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_idea.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_lol.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_mad.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_mrgreen.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_neutral.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_question.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_razz.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_redface.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_rolleyes.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_sad.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_smile.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_surprised.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_twisted.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/icon_wind.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/koenig1.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/laser1.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/love1.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/moo.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/nuts.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/robin.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/sheep.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/sick.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/sleep.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/soppy.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/stress.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/sweet.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/tired.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/urgh.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/winken1.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/worm.gif
 mode change 100755 => 100644 www-ssl/pic/smiles/worry.gif

(limited to 'www-ssl/nonpublic/myschichtplan.php')

diff --git a/DB/ChangeLog.sql b/DB/ChangeLog.sql
old mode 100755
new mode 100644
index 383c897a..bfb41cb5
--- a/DB/ChangeLog.sql
+++ b/DB/ChangeLog.sql
@@ -18,8 +18,8 @@
 
 DROP TABLE IF EXISTS `ChangeLog`;
 CREATE TABLE IF NOT EXISTS `ChangeLog` (
-  `Time` timestamp(14) NOT NULL,
-  `UID` int(11) NOT NULL default '0',
+  `Time` timestamp NOT NULL,
+  `UID` int(11) NOT NULL default 0,
   `Commend` text NOT NULL,
   `SQLCommad` text NOT NULL
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
diff --git a/DB/Himmel.sql b/DB/Himmel.sql
old mode 100755
new mode 100644
index e8edbc80..e513441c
--- a/DB/Himmel.sql
+++ b/DB/Himmel.sql
@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `EngelType` (
   `Man` text,
   PRIMARY KEY  (`TID`),
   UNIQUE KEY `Name` (`Name`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -43,23 +43,23 @@ CREATE TABLE IF NOT EXISTS `FAQ` (
   `Frage` text NOT NULL,
   `Antwort` text NOT NULL,
   PRIMARY KEY  (`FID`)
-) TYPE=MyISAM AUTO_INCREMENT=24 ;
+) ENGINE=MyISAM AUTO_INCREMENT=24 ;
 
 --
 -- Daten für Tabelle `FAQ`
 --
 
-INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?<br>\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.<br>\r\nNo, every angel has to pay full price.'),
-(2, 'Was bekomme ich f&uuml;r meine Mitarbeit?<br>\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung <br>\r\nEvery working angel gets a free shirt after the event. '),
-(3, 'Wie lange muss ich als Engel arbeiten?<br>\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es h&auml;ngt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen. <br>\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '),
-(6, 'Ich bin erst XX Jahre alt. Kann ich &uuml;berhaupt helfen?<br>\r\nI''m only XX years old. Can I help anyway?', 'Wir k&ouml;nnen jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen. <br>\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'),
-(8, 'Wer sind eigentlich die Erzengel?<br>\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty<br> \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'),
-(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?<br>\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!<br>\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'),
-(10, 'Wie gehe ich mit den Besuchern um? <br>\r\nHow do I treat visitors?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)  <br>\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
-(11, 'Wann sind die Engelbesprechungen? <br>\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.<br>\r\nThe information on the Angel Briefings will be in the news section of this system.'),
-(12, 'Was muss ich noch bedenken?<br>\r\nAnything else I should know?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br>\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
-(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden? <br>\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.<br>\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'),
-(20, 'Wer muss alles Eintritt zahlen?<br>\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...<br>\r\nEveryone who is at older than 12 years old.');
+INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?<br />\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.<br />\r\nNo, every angel has to pay full price.'),
+(2, 'Was bekomme ich f&uuml;r meine Mitarbeit?<br />\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung <br />\r\nEvery working angel gets a free shirt after the event. '),
+(3, 'Wie lange muss ich als Engel arbeiten?<br />\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es h&auml;ngt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen. <br />\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '),
+(6, 'Ich bin erst XX Jahre alt. Kann ich &uuml;berhaupt helfen?<br />\r\nI''m only XX years old. Can I help anyway?', 'Wir k&ouml;nnen jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen. <br />\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'),
+(8, 'Wer sind eigentlich die Erzengel?<br />\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty<br /> \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'),
+(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?<br />\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!<br />\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'),
+(10, 'Wie gehe ich mit den Besuchern um? <br />\r\nHow do I treat visitors?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)  <br />\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
+(11, 'Wann sind die Engelbesprechungen? <br />\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.<br />\r\nThe information on the Angel Briefings will be in the news section of this system.'),
+(12, 'Was muss ich noch bedenken?<br />\r\nAnything else I should know?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br />\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
+(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden? <br />\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.<br />\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'),
+(20, 'Wer muss alles Eintritt zahlen?<br />\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...<br />\r\nEveryone who is at older than 12 years old.');
 
 -- --------------------------------------------------------
 
@@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS `News` (
   `UID` int(11) NOT NULL default '0',
   `Treffen` tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (`ID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `Questions` (
   `AID` int(11) NOT NULL default '0',
   `Answer` text NOT NULL,
   PRIMARY KEY  (`QID`)
-) TYPE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ;
+) ENGINE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ;
 
 -- --------------------------------------------------------
 
@@ -118,7 +118,7 @@ CREATE TABLE IF NOT EXISTS `Room` (
   `show` char(1) NOT NULL default 'Y',
   `Number` int(11) default NULL,
   PRIMARY KEY  (`RID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 
 -- --------------------------------------------------------
@@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` (
   `TID` int(11) NOT NULL default '0',
   `UID` int(11) NOT NULL default '0',
   `Comment` text
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 
 -- --------------------------------------------------------
@@ -161,7 +161,7 @@ CREATE TABLE IF NOT EXISTS `Shifts` (
   `URL` text,
   `PSID` text,
   PRIMARY KEY  (`SID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -180,7 +180,7 @@ CREATE TABLE IF NOT EXISTS `Wecken` (
   `Ort` text NOT NULL,
   `Bemerkung` text NOT NULL,
   PRIMARY KEY  (`ID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 
 -- --------------------------------------------------------
@@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `news_comments` (
   `UID` int(11) NOT NULL default '0',
   PRIMARY KEY  (`ID`),
   KEY `Refid` (`Refid`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 --
 -- Tabellenstruktur für Tabelle `Counter`
@@ -212,7 +212,7 @@ CREATE TABLE IF NOT EXISTS `Counter` (
   `URL` varchar(255) NOT NULL default '',
    `Anz` bigint(20) NOT NULL default '0',
    PRIMARY KEY  (`URL`)
-) TYPE=MyISAM COMMENT='Counter der Seiten';
+) ENGINE=MyISAM COMMENT='Counter der Seiten';
 
 --
 -- Tabellenstruktur für Tabelle `ShiftFreeloader`
@@ -225,5 +225,5 @@ CREATE TABLE IF NOT EXISTS `ShiftFreeloader` (
   `Length` int(11) NOT NULL,
   `Comment` text NOT NULL,
   PRIMARY KEY  (`ID`)
-) TYPE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
diff --git a/DB/SDrohnen.sql b/DB/SDrohnen.sql
old mode 100755
new mode 100644
index 8cb4fc42..a2c93fab
--- a/DB/SDrohnen.sql
+++ b/DB/SDrohnen.sql
@@ -22,7 +22,7 @@ CREATE TABLE `Sprache` (
   `Sprache` char(2) NOT NULL default 'DE',
   `Text` text NOT NULL,
   KEY `TextID` (`TextID`,`Sprache`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 --
 -- Daten fuer Tabelle `Sprache`
diff --git a/DB/Sprache.sql b/DB/Sprache.sql
old mode 100755
new mode 100644
index 76597b71..52434198
--- a/DB/Sprache.sql
+++ b/DB/Sprache.sql
@@ -22,7 +22,7 @@ CREATE TABLE `Sprache` (
   `Sprache` char(2) NOT NULL default 'DE',
   `Text` text NOT NULL,
   KEY `TextID` (`TextID`,`Sprache`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 --
 -- Daten für Tabelle `Sprache`
diff --git a/DB/UserPicture.sql b/DB/UserPicture.sql
index 6dfbe523..095684b3 100644
--- a/DB/UserPicture.sql
+++ b/DB/UserPicture.sql
@@ -22,7 +22,7 @@ CREATE TABLE `UserPicture` (
   `ContentType` varchar(20) NOT NULL default '',
   `show` char(1) NOT NULL default 'N',
   PRIMARY KEY  (`UID`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 -- 
 -- Daten für Tabelle `UserPicture`
diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php
old mode 100755
new mode 100644
index 574d9947..4c8237f1
--- a/default-conf/var_www_includes/config.php
+++ b/default-conf/var_www_includes/config.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 // Adresse des Webservers
 $url = "https://SEDENGELURL";
 
@@ -27,11 +27,11 @@ $arch_angels="fnord";
 $gmdateOffset=3600;
 
 // für Developen 1, sonst = 0
-$DEBUG = 0;
+$debug = 0;
 
 // SSL Cert-KEY
 $show_SSLCERT = "MD5:<br>MD5SED<br>\n".
-		"SHA1:<br>SHA1SED";
+    "SHA1:<br>SHA1SED";
 
 //globale const. fuer schischtplan
 $GlobalZeileProStunde = 4;
diff --git a/default-conf/var_www_includes/config_IAX.php b/default-conf/var_www_includes/config_IAX.php
index e7eca465..87c3d8ea 100644
--- a/default-conf/var_www_includes/config_IAX.php
+++ b/default-conf/var_www_includes/config_IAX.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $IAXenable = TRUE;
 
diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php
old mode 100755
new mode 100644
diff --git a/default-conf/var_www_includes/config_jabber.php b/default-conf/var_www_includes/config_jabber.php
old mode 100755
new mode 100644
diff --git a/default-conf/var_www_includes/config_modem.php b/default-conf/var_www_includes/config_modem.php
index 0625936d..e6542fc4 100644
--- a/default-conf/var_www_includes/config_modem.php
+++ b/default-conf/var_www_includes/config_modem.php
@@ -1,11 +1,10 @@
-<?PHP
+<?php
+  // ist ein modem angeschlossen
+  $ModemEnable = false;
 
-//ist ein modem angeschlossen
-$ModemEnable = false;
+  // COM port
+  $ModemDev ="/dev/ttyS0";
 
-// COM port
-$ModemDev="/dev/ttyS0";
-
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
-$WackupNumber="**3";
+  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
+  $WakeupNumber="**3";
 ?>
diff --git a/includes/UserCVS.php b/includes/UserCVS.php
old mode 100755
new mode 100644
index ad7e1d66..7798ee66
--- a/includes/UserCVS.php
+++ b/includes/UserCVS.php
@@ -1,103 +1,79 @@
 <?php
-
-
-if( !isset($_SESSION['UID'])) 
-	$_SESSION['UID'] = -1;
-
-// CVS import Data
-$SQL_CVS = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['UID'];
-$Erg_CVS =  mysql_query($SQL_CVS, $con);
-$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
-
-
-// Group import Data, if nesseary
-if( isset( $_SESSION['CVS'][ "GroupID" ]))
-{
-	$SQL_GRP = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['CVS'][ "GroupID" ];
-	$Erg_GRP =  mysql_query($SQL_GRP, $con);
-	$_SESSION['CVS_Group'] = mysql_fetch_array($Erg_GRP);
-	
-	foreach( $_SESSION['CVS'] as $k => $v)
-	{
-		if($v=="G") // Right == Group 
-			$_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k];
-	}
-}
-
-//pagename ermitteln
-$Page["Name"] = substr( $_SERVER['PHP_SELF'], strlen($ENGEL_ROOT) );
-
-//recht f?r diese seite auslesen
-if( isset( $_SESSION['CVS'][ $Page["Name"] ]))
-	$Page["CVS"] = $_SESSION['CVS'][ $Page["Name"] ];
-else
-{
-	echo "SYSTEM ERROR: now right for ". $Page["Name"]. "exist";
-	die;
-}
-
-if( $DEBUG ) 
-{
-//	foreach( $_SESSION as $k => $v)
-//		echo "$k = $v<br>\n";
-	echo "<pre>\$_SESSION:\n";
-		print_r($_SESSION);
-	echo "</pre>";
-
-	if( strlen($Page["CVS"]) == 0 )
-		echo "<h1><u> CVS ERROR, on page '". $Page["Name"]. "'</u></h1>";
-	else
-		echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'<br>";
-	
-}
-
-function funktion_isLinkAllowed( $PageName)
-{
-        global $_SESSION;
-
-	// separate page parameter
-	$ParameterPos = strpos( $PageName, ".php?");
-	if( $ParameterPos === FALSE)
-	{
-		$pName = $PageName;
-	}
-	else
-	{
-		$pName = substr( $PageName, 0, $ParameterPos + 4);
-	}
-	
-	// check rights
-	if( (isset( $_SESSION['CVS'][ $pName ]) === TRUE) &&
-	    ($_SESSION['CVS'][ $pName ] == "Y") )
-	{
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText)
-{
-        global $url, $ENGEL_ROOT;
-
-	if( funktion_isLinkAllowed( $PageName) === TRUE)
-	{
-		return "<a href=\"". $url. $ENGEL_ROOT. $PageName. "\">". $LinkText. "</a>";
-	}
-	
-	return $LinkText;
-}
-
-function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText)
-{
-        global $url, $ENGEL_ROOT;
-
-	if( funktion_isLinkAllowed( $PageName) === TRUE)
-	{
-		return "<a href=\"". $url. $ENGEL_ROOT. $PageName. "\">". $LinkText. "</a>";
-	}
-
-	return "";
-}
-
+  if(!isset($_SESSION['UID']))
+    $_SESSION['UID'] = -1;
+
+  // CVS import Data
+  $SQL_CVS = "SELECT * FROM `UserCVS` WHERE UID=" . $_SESSION['UID'];
+  $Erg_CVS =  mysql_query($SQL_CVS, $con);
+  $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
+
+  // Group import Data, if nesseary
+  if(isset($_SESSION['CVS']["GroupID"])) {
+    $SQL_GRP = "SELECT * FROM `UserCVS` WHERE UID=" . $_SESSION['CVS'][ "GroupID" ];
+    $Erg_GRP =  mysql_query($SQL_GRP, $con);
+    $_SESSION['CVS_Group'] = mysql_fetch_array($Erg_GRP);
+  
+    foreach($_SESSION['CVS'] as $k => $v) {
+      if($v == "G")
+        $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k];
+    }
+  }
+
+  // pagename ermitteln
+  $Page["Name"] = basename($_SERVER['PHP_SELF']);
+
+  //recht fuer diese seite auslesen
+  if(isset($_SESSION['CVS'][$Page["Name"]]))
+    $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]];
+  else {
+    echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists.";
+    die;
+  }
+
+  if($debug) {
+    echo "<pre>\$_SESSION:\n";
+    print_r($_SESSION);
+    echo "</pre>";
+
+    if( strlen($Page["CVS"]) == 0 )
+      echo "<h1><u> CVS ERROR, on page '". $Page["Name"]. "'</u></h1>";
+    else
+      echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'<br />";
+  }
+
+  function funktion_isLinkAllowed($PageName) {
+    global $_SESSION;
+
+    // separate page parameter
+    $ParameterPos = strpos($PageName, ".php?");
+
+    if($ParameterPos === false)
+      $pName = $PageName;
+    else
+      $pName = substr($PageName, 0, $ParameterPos + 4);
+  
+    // check rights
+    if((isset( $_SESSION['CVS'][ $pName ]) === true) && $_SESSION['CVS'][ $pName ] == "Y")
+      return true;
+
+    return false;
+  }
+
+  function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) {
+    global $url, $ENGEL_ROOT;
+
+    if(funktion_isLinkAllowed( $PageName) === true)
+      return "<a href=\"" . $url. $ENGEL_ROOT . $PageName . "\">" . $LinkText . "</a>";
+  
+    return $LinkText;
+  }
+
+  function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) {
+    global $url, $ENGEL_ROOT;
+
+    if(funktion_isLinkAllowed( $PageName) === true)
+      return "<a href=\"" . $url . $ENGEL_ROOT . $PageName . "\">" . $LinkText . "</a>";
+
+    return "";
+  }
 ?>
diff --git a/includes/config_MessegeServer.php b/includes/config_MessegeServer.php
index 3454ae0c..ce7c7c3a 100644
--- a/includes/config_MessegeServer.php
+++ b/includes/config_MessegeServer.php
@@ -1,8 +1,7 @@
-<?
-// Set the ip and port we will listen on
-define( SERVER_ADDRESS, "127.0.0.1" );
-define( SERVER_PORT, 9000 );
-
-define( DEBUG, TRUE);
+<?php
+  // Set the ip and port we will listen on
+  define(SERVER_ADDRESS, "127.0.0.1");
+  define(SERVER_PORT, 9000);
 
+  define(DEBUG, true);
 ?>
diff --git a/includes/config_modem.php b/includes/config_modem.php
index 0625936d..2de37cb7 100644
--- a/includes/config_modem.php
+++ b/includes/config_modem.php
@@ -1,11 +1,10 @@
-<?PHP
+<?php
+  // ist ein modem angeschlossen
+  $ModemEnable = false;
 
-//ist ein modem angeschlossen
-$ModemEnable = false;
+  // COM port
+  $ModemDev = "/dev/ttyS0";
 
-// COM port
-$ModemDev="/dev/ttyS0";
-
-// vorwahl, bei tnovis telefonanlage für das programmieren von weckrufen
-$WackupNumber="**3";
+  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
+  $WakeupNumber = "**3";
 ?>
diff --git a/includes/crypt.php b/includes/crypt.php
old mode 100755
new mode 100644
index 9707e719..d511e4f4
--- a/includes/crypt.php
+++ b/includes/crypt.php
@@ -1,18 +1,12 @@
 <?php
-
-
-function PassCrypt($passwort) {
-include "config.php";
-
-switch ($crypt_system) {
-  case "crypt":
-          return "{crypt}".crypt($passwort, "77");
-  case "md5":
-          return md5($passwort);
+  function PassCrypt($passwort) {
+    include "config.php";
+
+    switch ($crypt_system) {
+      case "crypt":
+        return "{crypt}" . crypt($passwort, "77");
+      case "md5":
+        return md5($passwort);
+    }
   }
-
-}
-													      
-
-
 ?>
diff --git a/includes/error_handler.php b/includes/error_handler.php
old mode 100755
new mode 100644
index 10f27d58..5a58076b
--- a/includes/error_handler.php
+++ b/includes/error_handler.php
@@ -1,88 +1,86 @@
 <?php
-
-  require_once("funktion_jabber.php");
+  require_once "funktion_jabber.php";
 
   // global array for collected error_messages
   $error_messages = array();
 
   // general error handler collecting all messages in an array
-  function Error_Handler($error_number, $error_string, $error_file, $error_line, $error_context)
-  {
+  function Error_Handler($error_number, $error_string, $error_file, $error_line, $error_context) {
     global $error_messages, $con;
 
-    //SQL error genauer analysiert
+    // SQL error genauer analysiert
     $Temp = "";
-    foreach ($error_context as $k => $v )
-        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";
-   
-    //übergeben 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": "")
-				 );
+    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");
 
-  ini_set( "error_reporting", E_ALL);
-  if( $DEBUG)
-  {
-	  ini_set( "display_errors", "On");
-	  ini_set( "display_startup_errors", "On");
-	  ini_set( "html_errors", "On");
+  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()
-  {
+  function send_errors() {
     global $error_messages;
 
-    if (!$error_messages) return;
-    
+    if(!$error_messages)
+      return;
+
     $message = "";
     foreach($error_messages as $value)
       $message .= $value."\n";
+
     $message .= "\n";
-    
-    if( isset( $_POST))
-    {
-      foreach ($_POST as $k => $v ) 	 
+
+    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"; 
+
+    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 ) 	 
+      foreach ($_SESSION as $k => $v )    
         $message .= "_SESSION: $k = $v\n"; 
       $message .= "\n";
     }
     
     if( isset( $_SESSION['CVS']))
     {
-      foreach ($_SESSION['CVS'] as $k => $v ) 	 
+      foreach ($_SESSION['CVS'] as $k => $v )    
         if( strlen($k)>3 ) 
           $message .= "_SESSION['CVS']: $k = $v\n"; 
       $message .= "\n";
     }
-    
-    foreach ($_SERVER as $k => $v ) 	 
+
+    foreach ($_SERVER as $k => $v )    
       if( strpos( "0$k", "SERVER_")==0)
           $message .= "_SERVER: $k = $v\n"; 
 
diff --git a/includes/footer.php b/includes/footer.php
old mode 100755
new mode 100644
index f65e8a7e..8f736c4d
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,57 +1,39 @@
-<?PHP
-
-?>
-
-
-
 <!-- anfang des footers //-->
-
-
-
-
-		<br>
-			<p align="center">
-				<?PHP If (IsSet($_SESSION['oldurl']))
-					echo "<a href=\"". $_SESSION["oldurl"]. "\">".Get_Text("back")."</a>&nbsp;";
-				?>
-				<a href="#top"><?PHP echo Get_Text("top"); ?></a>
-			</p>
-		</td>
-	</tr>
+    <br />
+      <p align="center">
+        <?php if(IsSet($_SESSION['oldurl']))
+          echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
+        ?>
+        <a href="#top"><?php echo Get_Text("top"); ?></a>
+      </p>
+    </td>
+  </tr>
 </table>
-        </td>
-
-
-
+</td>
 
 <!-- anfang des menue parts //-->
-<?PHP
-if( $_SESSION['Menu'] =="R")            include("menu.php");
+<?php
+if($_SESSION['Menu'] == "R")
+  include("menu.php");
 ?>
-		</td> 
-
-
 
 <!-- ende des menue parts //-->
 
-
-
-	</tr>
-	<tr>
-		<td colspan="2">
-			<h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
-			<?PHP 
-				include( "funktion_counter.php"); 
-				include( "funktion_flag.php"); 
-			?></h5>
-        	</td>
-	</tr>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
+      <?php
+        include("funktion_counter.php"); 
+        include("funktion_flag.php"); 
+      ?></h5>
+  </td>
+  </tr>
 </table>
 
 <!-- </div> -->
 <?php mysql_close($con); ?>
-</div>
-
+<!-- </div> -->
 
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/includes/funktion_SendMessenges.php b/includes/funktion_SendMessenges.php
index d71e4804..b6de67cc 100644
--- a/includes/funktion_SendMessenges.php
+++ b/includes/funktion_SendMessenges.php
@@ -1,18 +1,14 @@
-<?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");	 
-}
-
-?>
+<?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/funktion_activeUser.php b/includes/funktion_activeUser.php
old mode 100755
new mode 100644
index d19895a8..e214a1f9
--- a/includes/funktion_activeUser.php
+++ b/includes/funktion_activeUser.php
@@ -1,59 +1,57 @@
-<?PHP
-
-// Functionen gibt es nicht auf ellen rechern
-if( !function_exists("bcdiv"))
-{
-	function bcdiv( $param1, $param2)
-	{
-		return floor( $param1 / $param2);
-	}
-}
-
-if( !function_exists("bcmod"))
-{
-	function bcmod( $param1, $param2)
-	{
-		return $param1 - ( $param2 * bcdiv( $param1, $param2));
-	}
-}
-
-
-echo "<h4 class=\"menu\">Engel online</h4>";
-
-$SQL = "SELECT UID, Nick, lastLogIn ".
-	"FROM User ".
-	"WHERE (`lastLogIn` > '". gmdate("YmdHis", time()-(60*60)). "' AND NOT (UID=". $_SESSION['UID']. ")) ".
-	"ORDER BY lastLogIn DESC;";
-
-$Erg = mysql_query( $SQL, $con);
-	
-
-$Tist =	(gmdate("d", time()) * 60 * 60 * 24) +	// Tag
-	(gmdate("H", time()) * 60 * 60) +	// Stunde
-	(gmdate("i", time()) * 60) +		// Minute
-	(gmdate("s", time()) ); 		// Sekunde
-
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
-{
-	echo "\t\t\t<li>";
-	if( $_SESSION['UID']>0 )
-		echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
-	// Schow Admin Page
-	echo funktion_isLinkAllowed_addLink_OrLinkText(
-		"admin/userChangeNormal.php?enterUID=". mysql_result( $Erg, $i, "UID"). "&Type=Normal",
-		mysql_result( $Erg, $i, "Nick"));
-
-	$Tlog =	(substr( mysql_result( $Erg, $i, "lastLogIn"),  8, 2) * 60 * 60 * 24) +	// Tag
-		(substr( mysql_result( $Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) +	// Stunde
-		(substr( mysql_result( $Erg, $i, "lastLogIn"), 14, 2) * 60) +		// Minute
-		(substr( mysql_result( $Erg, $i, "lastLogIn"), 17, 2) );		// Sekunde
-	
- 	$Tlog = $Tist-$Tlog;
-	echo " ". bcdiv( $Tlog, 60). ":";
-	if( strlen(bcmod( $Tlog, 60))==1)
-		echo "0";
-	echo bcmod( $Tlog, 60);
-	echo "</li>\n";
-}
-
+<?php
+  // Funktionen gibt es nicht auf allen Rechnern
+  if(!function_exists("bcdiv")) {
+    function bcdiv( $param1, $param2) {
+      return floor( $param1 / $param2);
+    }
+  }
+
+  if(!function_exists("bcmod")) {
+    function bcmod( $param1, $param2) {
+      return $param1 - ( $param2 * bcdiv( $param1, $param2));
+    }
+  }
+
+  echo "<h4 class=\"menu\">Engel online</h4>";
+
+  $SQL = "SELECT UID, Nick, lastLogIn " . 
+         "FROM User " . 
+         "WHERE (`lastLogIn` > '" . gmdate("YmdHis", time() - (60 * 60)) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " . 
+         "ORDER BY lastLogIn DESC;";
+
+  $Erg = mysql_query($SQL, $con);
+  
+  $Tist = (gmdate("d", time()) * 60 * 60 * 24) +  // Tag
+          (gmdate("H", time()) * 60 * 60) +       // Stunde
+          (gmdate("i", time()) * 60) +            // Minute
+          (gmdate("s", time()) );                 // Sekunde
+
+  echo "<ul>";
+
+  for($i = 0; $i < mysql_num_rows($Erg); $i++) {
+    echo "<li>";
+
+    if($_SESSION['UID'] > 0)
+      echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
+
+    // Show Admin Page
+    echo funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=" . mysql_result($Erg, $i, "UID") . "&Type=Normal", mysql_result($Erg, $i, "Nick"));
+
+    $Tlog =  (substr(mysql_result($Erg, $i, "lastLogIn"),  8, 2) * 60 * 60 * 24) +  // Tag
+             (substr(mysql_result($Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) +       // Stunde
+             (substr(mysql_result($Erg, $i, "lastLogIn"), 14, 2) * 60) +            // Minute
+             (substr(mysql_result($Erg, $i, "lastLogIn"), 17, 2) );                 // Sekunde
+  
+    $Tlog = $Tist - $Tlog;
+
+    echo " " . bcdiv($Tlog, 60) . ":";
+
+    if(strlen(bcmod($Tlog, 60)) == 1)
+      echo "0";
+
+    echo bcmod($Tlog, 60);
+    echo "</li>\n";
+  }
+  
+  echo "</ul>";
 ?>
diff --git a/includes/funktion_counter.php b/includes/funktion_counter.php
index 70b104d4..39d65a1f 100644
--- a/includes/funktion_counter.php
+++ b/includes/funktion_counter.php
@@ -1,24 +1,14 @@
-<?PHP
-
-$SQL = "SELECT `Anz` FROM `Counter` WHERE `URL`=\"". $Page["Name"]. "\"";
-$Erg = mysql_query($SQL, $con);
-
-echo mysql_error($con);
-
-if(mysql_num_rows($Erg)==0)
-{
-//	echo "Counter: 1";
-	$SQL = "INSERT INTO `Counter` ( `URL` , `Anz` ) ".
-		"VALUES ('". $Page["Name"]. "', '1');";
-	$Erg = mysql_query($SQL, $con);
-}
-elseif(mysql_num_rows($Erg)==1)
-{
-//	echo "Counter: ". (mysql_result($Erg, 0, 0)+1);
-	$SQL = "UPDATE `Counter` SET `Anz` = '". (mysql_result($Erg, 0, 0) +1). "' ".
-		"WHERE `URL` = '". $Page["Name"]. "' LIMIT 1 ;";
-	$Erg = mysql_query($SQL, $con);
-}
-
-
+<?php
+  $SQL = "SELECT `Anz` FROM `Counter` WHERE `URL`=\"" . $Page["Name"] . "\"";
+  $Erg = mysql_query($SQL, $con);
+
+  echo mysql_error($con);
+
+  if(mysql_num_rows($Erg) == 0) {
+    $SQL = "INSERT INTO `Counter` ( `URL` , `Anz` ) VALUES ('" . $Page["Name"] . "', '1');";
+    $Erg = mysql_query($SQL, $con);
+  } elseif(mysql_num_rows($Erg) == 1) {
+    $SQL = "UPDATE `Counter` SET `Anz` = '" . (mysql_result($Erg, 0, 0) +1) . "' WHERE `URL` = '" . $Page["Name"] . "' LIMIT 1 ;";
+    $Erg = mysql_query($SQL, $con);
+  }
 ?>
diff --git a/includes/funktion_cron.php b/includes/funktion_cron.php
old mode 100755
new mode 100644
index 17ac5a76..3a0e984b
--- a/includes/funktion_cron.php
+++ b/includes/funktion_cron.php
@@ -1,144 +1,131 @@
-<?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");  //Ziel nummer
-				fputs( $file, "Callerid: Engelserver\n");
-	//			fputs( $file, "Callerid: $IAXcontent\n");
- 	//				fputs( $file, "Context: $DECTnumber@$IAXserver\n");
-				fputs( $file, "Extension: s\n");
-				fputs( $file, "MaxRetries: 1\n");
-				fputs( $file, "RetryTime: 10\n");
-				fputs( $file, "SetVar: msg=$Message\n");
-//				fputs( $file, "SetVar: TimeH=$TimeH\n");
-//				fputs( $file, "SetVar: TimeM=$TimeM\n");
-//				fputs( $file, "SetVar: DECTnumber=$DECTnumber\n");
-//				fputs( $file, "SetVar: Room=".  RID2Room( $RID). "\n");
-//				fputs( $file, "SetVar: Engeltype=". TID2Engeltype( $TID). "\n");
-				fclose($file);
-				system( "chmod 777 ". $CallFile);
-				system( "mv ". $CallFile. " ". $AsteriskOutputDir);
-				
-			}
-			else
-				echo "error: $CallFile not created";
-		}
-	}
-	else
-		if($DebugDECT) echo "IAX is disable\n";
-}
-
-function DialNumberModem( $DECTnumber, $Time)
-{
-	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);
-}
-
-return 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/funktion_db.php b/includes/funktion_db.php
index cbfb198f..160a9c59 100644
--- a/includes/funktion_db.php
+++ b/includes/funktion_db.php
@@ -1,149 +1,145 @@
-<?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\t<th>Feldname</th>\n\t<th>old Value</th>\n\t<th>new Value</th>\n";
-		$Diff .= "</tr>\n";
-		foreach($Daten1 as $DataKey => $Data1)
-		{
-			if( isset( $Daten2[$DataKey]))
-			{
-				$Data2 = $Daten2[$DataKey];
-				foreach($Data1 as $key => $value)
-					if( $value != $Data2[$key])
-					{
-						$Gefunden=TRUE;
-						$Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td>".$Data2[$key]."</rd>\n</tr>";
-					}
-			}
-			else
-				foreach($Data1 as $key => $value)
-				{
-					$Gefunden=TRUE;
-					$Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td></rd>\n</tr>";
-				}
-		}
-		$Diff .= "</table>\n";
-		
-		if( $Gefunden)
-			return $Diff;
-		else
-			return "\nno changes Fount\n";
-	}
-	
-	function db_query( $SQL, $comment)
-	{
-		global $con, $Page;	
-		$Diff = "";
-		
-		//commed anlyse udn daten sicherung
-		if( strpos( "#$SQL", "UPDATE") > 0)
-		{
-			//Tabellen name ermitteln
-			$Table_Start = strpos( $SQL, "`");
-			$Table_End   = strpos( $SQL, "`", $Table_Start+1);
-			$Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1));
-			
-			//SecureTest
-			if( $Table_Start == 0 || $Table_End == 0) die("<h1>funktion_db ERROR SQL: '$SQL' nicht OK</h1>");
-	
-			//WHERE ermitteln
-			$Where_Start = strpos( $SQL, "WHERE");
-			$Where = substr( $SQL, $Where_Start);
-			if( $Where_Start == 0)	$Where = ";"; 
-		
-			if( strlen( $Where) < 2) 	
-			{
-				$Diff = "can't show, too mutch data (no filter was set)";
-				$querry_erg = mysql_query($SQL, $con);
-			}
-			else
-			{
-				$Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
-					$querry_erg = mysql_query($SQL, $con);
-				$Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
-				$Diff  = db_querry_diffDaten($Daten1, $Daten2);
-			}
-		}
-		elseif( strpos( "#$SQL", "DELETE") > 0)
-		{
-			$TableWhere = substr( $SQL, 6);
-			$Diff .= Ausgabe_Daten( "SELECT * $TableWhere");
-
-			//execute command
-			$querry_erg = mysql_query($SQL, $con);
-		}
-		elseif( strpos( "#$SQL", "INSERT") > 0)
-		{
-			//execute command
-			$querry_erg = mysql_query($SQL, $con);
-		}
-		else
-		{
-			//execute command
-			$querry_erg = mysql_query($SQL, $con);
-		}
-
-		$SQLCommand = "SQL:<br>". htmlentities( $SQL, ENT_QUOTES);
-		if( strlen($Diff) > 0)
-			$SQLCommand .= "<br><br>Diff:<br>$Diff";
-
-		$Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES);
-		//LOG commands in DB
-		$SQL_SEC =	"INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ".
-				" VALUES ( '". $_SESSION['UID']. "', ".
-					  "'". mysql_escape_string( $SQLCommand). "', ".
-					  "'". mysql_escape_string( $Commend). "' );";
-		$erg = mysql_query($SQL_SEC, $con);
-		echo mysql_error($con);
-		return $querry_erg;
-	}//function db_query(
+<?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\t<th>Feldname</th>\n\t<th>old Value</th>\n\t<th>new Value</th>\n";
+      $Diff .= "</tr>\n";
+
+      foreach($Daten1 as $DataKey => $Data1) {
+        if(isset( $Daten2[$DataKey])) {
+          $Data2 = $Daten2[$DataKey];
+
+          foreach($Data1 as $key => $value)
+            if( $value != $Data2[$key]) {
+            $Gefunden = true;
+            $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td>" . $Data2[$key] . "</rd>\n</tr>";
+          }
+        } else
+          foreach($Data1 as $key => $value) {
+            $Gefunden = true;
+            $Diff .= "<tr>\n\t<td>$key</td>\n\t<td>$value</td>\n\t<td></rd>\n</tr>";
+          }
+      }
+
+      $Diff .= "</table>\n";
+
+      if($Gefunden)
+        return $Diff;
+      else
+        return "\nno changes Fount\n";
+    }
+
+    function db_query( $SQL, $comment) {
+      global $con, $Page;  
+      $Diff = "";
+
+      // commed anlyse udn daten sicherung
+      if(strpos("#$SQL", "UPDATE") > 0) {
+        // Tabellen name ermitteln
+        $Table_Start = strpos( $SQL, "`");
+        $Table_End = strpos( $SQL, "`", $Table_Start+1);
+        $Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1));
+      
+      //SecureTest
+      if( $Table_Start == 0 || $Table_End == 0) die("<h1>funktion_db ERROR SQL: '$SQL' nicht OK</h1>");
+  
+      //WHERE ermitteln
+      $Where_Start = strpos( $SQL, "WHERE");
+      $Where = substr( $SQL, $Where_Start);
+      if( $Where_Start == 0)  $Where = ";"; 
+    
+      if( strlen( $Where) < 2)   
+      {
+        $Diff = "can't show, too mutch data (no filter was set)";
+        $querry_erg = mysql_query($SQL, $con);
+      }
+      else
+      {
+        $Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
+          $querry_erg = mysql_query($SQL, $con);
+        $Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where");
+        $Diff  = db_querry_diffDaten($Daten1, $Daten2);
+      }
+    }
+    elseif( strpos( "#$SQL", "DELETE") > 0)
+    {
+      $TableWhere = substr( $SQL, 6);
+      $Diff .= Ausgabe_Daten( "SELECT * $TableWhere");
+
+      //execute command
+      $querry_erg = mysql_query($SQL, $con);
+    }
+    elseif( strpos( "#$SQL", "INSERT") > 0)
+    {
+      //execute command
+      $querry_erg = mysql_query($SQL, $con);
+    }
+    else
+    {
+      //execute command
+      $querry_erg = mysql_query($SQL, $con);
+    }
+
+    $SQLCommand = "SQL:<br />". htmlentities( $SQL, ENT_QUOTES);
+    if( strlen($Diff) > 0)
+      $SQLCommand .= "<br /><br />Diff:<br />$Diff";
+
+    $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES);
+    //LOG commands in DB
+    $SQL_SEC =  "INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ".
+        " VALUES ( '". $_SESSION['UID']. "', ".
+            "'". mysql_escape_string( $SQLCommand). "', ".
+            "'". mysql_escape_string( $Commend). "' );";
+    $erg = mysql_query($SQL_SEC, $con);
+    echo mysql_error($con);
+    return $querry_erg;
+  }//function db_query(
 }
 
 ?>
diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php
old mode 100755
new mode 100644
index 9393e97e..1131ffd3
--- a/includes/funktion_db_list.php
+++ b/includes/funktion_db_list.php
@@ -1,67 +1,65 @@
-<?PHP
+<?php
+  function funktion_db_list($Table_Name) {
+    global $con;
 
-function funktion_db_list($Table_Name) 
-{
-	global $con;
-
-	$SQL = "SELECT * FROM `".$Table_Name."`";
-	$Erg = mysql_query($SQL, $con);
+    $SQL = "SELECT * FROM `".$Table_Name."`";
+    $Erg = mysql_query($SQL, $con);
 
-	// anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  // anzahl zeilen
+  $Zeilen  = mysql_num_rows($Erg);
 
-	$Anzahl_Felder = mysql_num_fields($Erg);
+  $Anzahl_Felder = mysql_num_fields($Erg);
 
-	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">";
-	echo "<caption>DB: $Table_Name</caption>";
+  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">";
+  echo "<caption>DB: $Table_Name</caption>";
 
-	echo "<tr class=\"contenttopic\">";
-	for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
-	{
-		echo "<th>". mysql_field_name($Erg, $m). "</th>";
-	}
-	echo "</tr>";
+  echo "<tr class=\"contenttopic\">";
+  for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
+  {
+    echo "<th>". mysql_field_name($Erg, $m). "</th>";
+  }
+  echo "</tr>";
 
-	for ($n = 0 ; $n < $Zeilen ; $n++)
-	{
-		echo "<tr class=\"content\">";
-		for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
-		{
-			echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-		}
-		echo "</tr>";
-	}
-	echo "</table>";
+  for ($n = 0 ; $n < $Zeilen ; $n++)
+  {
+    echo "<tr class=\"content\">";
+    for ($m = 0 ; $m < $Anzahl_Felder ; $m++)
+    {
+      echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+    }
+    echo "</tr>";
+  }
+  echo "</table>";
 }
 
 function funktion_db_element_list_2row( $TopicName, $SQL) 
 {
-	global $con;
+  global $con;
 
-	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<caption>$TopicName</caption>";
-#	echo "\t<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
+  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  echo "<caption>$TopicName</caption>";
+#  echo "\t<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
 
-	$Erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
-	
-	echo "<tr class=\"contenttopic\">";
-	for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
-	{
-		echo "<th>". mysql_field_name($Erg, $m). "</th>";
-	}
-	echo "</tr>";
+  $Erg = mysql_query($SQL, $con);
+  echo mysql_error($con);
+  
+  echo "<tr class=\"contenttopic\">";
+  for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
+  {
+    echo "<th>". mysql_field_name($Erg, $m). "</th>";
+  }
+  echo "</tr>";
 
-	for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
-	{
-		echo "<tr class=\"content\">";
-		for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
-		{
-			echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
-		}
-		echo "</tr>";
-	}
-	echo "</table>\n";
+  for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
+  {
+    echo "<tr class=\"content\">";
+    for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
+    {
+      echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+    }
+    echo "</tr>";
+  }
+  echo "</table>\n";
 }
 
 ?>
diff --git a/includes/funktion_faq.php b/includes/funktion_faq.php
old mode 100755
new mode 100644
index 641ea38d..e9f09e7c
--- a/includes/funktion_faq.php
+++ b/includes/funktion_faq.php
@@ -1,12 +1,10 @@
-<?PHP
+<?php
+  function noAnswer() {
+    global $con;
 
-function noAnswer() {
-  global $con;
-
-  $SQL = "SELECT UID FROM Questions WHERE `AID`='0'";
-  $Res=mysql_query($SQL, $con);
-
-  return mysql_num_rows($Res);
-}
+    $SQL = "SELECT UID FROM Questions WHERE `AID`='0'";
+    $Res = mysql_query($SQL, $con);
 
+    return mysql_num_rows($Res);
+  }
 ?>
diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index 56d8a993..b6a02242 100644
--- a/includes/funktion_flag.php
+++ b/includes/funktion_flag.php
@@ -1,12 +1,9 @@
-<?PHP
-echo "<br>";
-
-if( strpos( $_SERVER["REQUEST_URI"], "?") >0)
-	$URL = $_SERVER["REQUEST_URI"]. "&SetLanguage=";
-else
-	$URL = $_SERVER["REQUEST_URI"]. "?SetLanguage=";
-
-echo "<a href=\"". $URL. "DE\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/de.gif\" alt=\"DE\"></a> ";
-echo "<a href=\"". $URL. "EN\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/en.gif\" alt=\"EN\"></a> ";
+<?php
+   if(strpos($_SERVER["REQUEST_URI"], "?") > 0)
+    $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
+  else
+    $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
 
+  echo "<a href=\"" . $URL . "DE\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/de.gif\" alt=\"DE\" /></a> ";
+  echo "<a href=\"" . $URL . "EN\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/en.gif\" alt=\"EN\" /></a> ";
 ?>
diff --git a/includes/funktion_jabber.php b/includes/funktion_jabber.php
old mode 100755
new mode 100644
diff --git a/includes/funktion_lang.php b/includes/funktion_lang.php
old mode 100755
new mode 100644
index d5d3e144..e04dd8eb
--- a/includes/funktion_lang.php
+++ b/includes/funktion_lang.php
@@ -1,35 +1,28 @@
-<?PHP
+<?php
+  function Get_Text ($TextID, $NoError = false) {
+    global $con, $error_messages, $debug;
 
+    if( !isset($_SESSION['Sprache'])) 
+      $_SESSION['Sprache'] = "EN";
+    if( $_SESSION['Sprache']=="") 
+      $_SESSION['Sprache']="EN";
+    if( isset($_GET["SetLanguage"]))
+      $_SESSION['Sprache']= $_GET["SetLanguage"];
 
-function Get_Text ($TextID, $NoError=FALSE)
-{
-	GLOBAL $con, $error_messages, $DEBUG;
-	
-	if( !isset($_SESSION['Sprache'])) 
-		$_SESSION['Sprache'] = "EN";
-	if( $_SESSION['Sprache']=="") 
-		$_SESSION['Sprache']="EN";
-	if( isset($_GET["SetLanguage"]))
-		$_SESSION['Sprache']= $_GET["SetLanguage"];
+    $SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='".$_SESSION['Sprache']."'";
+    @$Erg = mysql_query($SQL, $con);
 
-	$SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='".$_SESSION['Sprache']."'";
-	@$Erg = mysql_query($SQL, $con);
-	
-	if( mysql_num_rows( $Erg) == 1)
-		return (@mysql_result($Erg, 0, "Text"));
-	elseif( $NoError && !$DEBUG)
-		return "";
-	else
-	{
-        	array_push($error_messages, "Get_Text, '$TextID' found ". mysql_num_rows( $Erg). "x in Sprache Database Table for Language (".$_SESSION['Sprache'].")\n");
-		return "Error Data, '$TextID' found ". mysql_num_rows( $Erg). "x";
-	}
-	
-}
-
-function Print_Text ($TextID, $NoError=FALSE)
-{
-	echo Get_Text ($TextID, $NoError);
-}
+    if( mysql_num_rows( $Erg) == 1)
+      return (@mysql_result($Erg, 0, "Text"));
+    elseif( $NoError && !$debug)
+      return "";
+    else {
+      array_push($error_messages, "Get_Text, '$TextID' found ". mysql_num_rows( $Erg). "x in Sprache Database Table for Language (".$_SESSION['Sprache'].")\n");
+      return "Error Data, '$TextID' found ". mysql_num_rows( $Erg). "x";
+    }
+  }
 
+  function Print_Text($TextID, $NoError = false) {
+    echo Get_Text($TextID, $NoError);
+  }
 ?>
diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php
old mode 100755
new mode 100644
index 87196ede..c751c764
--- a/includes/funktion_menu.php
+++ b/includes/funktion_menu.php
@@ -1,44 +1,41 @@
-<?PHP
+<?php
+  function ShowMenu( $MenuName) {
+    global $MenueTableStart, $MenueTableEnd, $_SESSION, $debug, $url, $ENGEL_ROOT;
+    $Gefunden = false;
 
-function ShowMenu( $MenuName)
-{
-	global $MenueTableStart, $MenueTableEnd, $_SESSION, $DEBUG, $url, $ENGEL_ROOT;
-	$Gefunden=FALSE;
+    // Ueberschift
+    $Text = "<h4 class=\"menu\">". Get_Text("$MenuName/"). "</h4><ul>";
 
-	//Überschift
-	$Text = "<h4 class=\"menu\">". Get_Text("$MenuName/"). "</h4>";
-	
-	//einträge
-	foreach( $_SESSION['CVS'] as $Key => $Entry )
-		if( strpos( $Key, ".php") > 0)
-			if( (strpos( "00$Key", "0$MenuName") > 0) ||
-			    ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) )
-			{
-				$TempName = Get_Text($Key, TRUE);
-				if(( TRUE||$DEBUG) && (strlen($TempName)==0) )
-					$TempName = "not found: \"$Key\"";
-				
-				if( $Entry == "Y")
-				{
-					//zum absichtlkichen ausblenden von einträgen
-					if( strlen($TempName)>1)
-					{
-						//sonderfälle:
-						if( $Key=="admin/faq.php")
-							$TempName .= " (". noAnswer(). ")";
-						//ausgabe
-						$Text .= "\t\t\t<li><a href=\"". $url. $ENGEL_ROOT. $Key. "\">$TempName</a></li>\n";
-						$Gefunden = TRUE;
-					}
-				}
-				elseif( $DEBUG ) 
-				{
-					$Gefunden = TRUE;
-					$Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
-				}
-			}
-	if( $Gefunden)
-		echo $MenueTableStart.$Text.$MenueTableEnd;
+    // Eintraege
+    foreach($_SESSION['CVS'] as $Key => $Entry)
+      if( strpos( $Key, ".php") > 0)
+        if( (strpos( "00$Key", "0$MenuName") > 0) ||
+          ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) ) {
+          $TempName = Get_Text($Key, true);
+
+          if(( true||$debug) && (strlen($TempName)==0) )
+            $TempName = "not found: \"$Key\"";
+
+          if( $Entry == "Y") {
+            //zum absichtlkichen ausblenden von einträgen
+            if( strlen($TempName)>1) {
+              //sonderfälle:
+
+              if( $Key=="admin/faq.php")
+                $TempName .= " (". noAnswer(). ")";
+            //ausgabe
+            $Text .= "\t\t\t<li><a href=\"". $url. $ENGEL_ROOT. $Key. "\">$TempName</a></li>\n";
+            $Gefunden = true;
+          }
+        }
+        elseif( $debug ) 
+        {
+          $Gefunden = true;
+          $Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
+        }
+      }
+  if( $Gefunden)
+    echo $MenueTableStart.$Text.$MenueTableEnd;
 }//function ShowMenue
 
 ?>
diff --git a/includes/funktion_modem.php b/includes/funktion_modem.php
old mode 100755
new mode 100644
index 3a74e0f8..8e93ebf4
--- a/includes/funktion_modem.php
+++ b/includes/funktion_modem.php
@@ -1,35 +1,34 @@
-<?PHP
-include "config_modem.php";
+<?php
+  include "config_modem.php";
 
-function DialNumber( $Number )
-{
-	global $Dev, $ModemEnable;
+  function DialNumber($Number) {
+    global $Dev, $ModemEnable;
+
+    if($ModemEnable) {
+      echo "Dial number: '<u>$Number</u>' was called<br />\n";
 
-	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";
+      $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 $WackupNumber;
-	DialNumber( "$WackupNumber$TimeH$TimeM$Number");
+  global $WakeupNumber;
+  DialNumber( "$WakeupNumber$TimeH$TimeM$Number");
 }
 
 ?>
diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php
old mode 100755
new mode 100644
index 0b5b9910..afa79144
--- a/includes/funktion_schichtplan.php
+++ b/includes/funktion_schichtplan.php
@@ -2,181 +2,181 @@
 
 
 /*#######################################################
-#	gibt die engelschischten aus			#
+#  gibt die engelschischten aus      #
 #######################################################*/
 function ausgabe_Feld_Inhalt( $SID, $Man ) 
 {
 // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung,
 // die eingetragenden und und offenden Schichteintäge zurück
-	global $EngelType, $EngelTypeID, $TID2Name, $con, $DEBUG, $gmdateOffset;
+  global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset;
 
-	$Spalten = "";
+  $Spalten = "";
 
-	if( !isset($_GET["Icon"]))
-		$_GET["Icon"]=1;
+  if( !isset($_GET["Icon"]))
+    $_GET["Icon"]=1;
 
-	///////////////////////////////////////////////////////////////////
-	// Schow Admin Page
-	///////////////////////////////////////////////////////////////////
-	$Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
-		"admin/schichtplan.php?action=change&SID=$SID",
-		"edit<br>\n\t\t");
+  ///////////////////////////////////////////////////////////////////
+  // Schow Admin Page
+  ///////////////////////////////////////////////////////////////////
+  $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
+    "admin/schichtplan.php?action=change&SID=$SID",
+    "edit<br />\n\t\t");
 
-	///////////////////////////////////////////////////////////////////
-  	// Ausgabe des Schischtnamens
-	///////////////////////////////////////////////////////////////////
-	$SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
-	$Erg = mysql_query($SQL, $con);
-	if( mysql_result($Erg, 0, 0) != "")
-		$Spalten.="<a href=\"". mysql_result($Erg, 0, 0). "\" target=\"_black\"><u>$Man:</u></a><br>";
-	else
-  		$Spalten.="<u>".$Man.":</u><br>";
+  ///////////////////////////////////////////////////////////////////
+    // Ausgabe des Schischtnamens
+  ///////////////////////////////////////////////////////////////////
+  $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
+  $Erg = mysql_query($SQL, $con);
+  if( mysql_result($Erg, 0, 0) != "")
+    $Spalten.="<a href=\"". mysql_result($Erg, 0, 0). "\" target=\"_black\"><u>$Man:</u></a><br />";
+  else
+      $Spalten.="<u>".$Man.":</u><br />";
 
 
-	///////////////////////////////////////////////////////////////////
-	// 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=0;
-	$Temp_TID_old=-1;
-	for( $i = 0; $i < $Anzahl; $i++ )
-	{
-		if( isset($Temp[$Feld]["TID"]))
-			$Temp_TID_old = $Temp[$Feld]["TID"];
-		if( isset($Temp[$Feld]["UID"]))
-			$Temp_UID_old = $Temp[$Feld]["UID"];
-		
-		$Temp_TID = mysql_result($Erg, $i, "TID");
-		
-		// wenn sich der Type ändert wird zumnästen feld geweckselt
-		if( $Temp_TID_old != $Temp_TID )
-			$Feld++;
-			
-		$Temp[$Feld]["TID"] = $Temp_TID;
-		$Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
-		
-		// sonderfall ersten durchlauf
-		if( $i == 0 )
-		{
-			$Temp_TID_old = $Temp[$Feld]["TID"];
-			$Temp_UID_old = $Temp[$Feld]["UID"];
-		}
-		
-		// ist es eine zu vergeben schicht?
-		if( $Temp[$Feld]["UID"] == 0 )
-		{
-			if( isset($Temp[$Feld]["free"]))
-				$Temp[$Feld]["free"]++;
-			else
-				$Temp[$Feld]["free"]=1;
-		}
-		else
-			$Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
-	} // FOR
-	
+  ///////////////////////////////////////////////////////////////////
+  // 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=0;
+  $Temp_TID_old=-1;
+  for( $i = 0; $i < $Anzahl; $i++ )
+  {
+    if( isset($Temp[$Feld]["TID"]))
+      $Temp_TID_old = $Temp[$Feld]["TID"];
+    if( isset($Temp[$Feld]["UID"]))
+      $Temp_UID_old = $Temp[$Feld]["UID"];
+    
+    $Temp_TID = mysql_result($Erg, $i, "TID");
+    
+    // wenn sich der Type ändert wird zumnästen feld geweckselt
+    if( $Temp_TID_old != $Temp_TID )
+      $Feld++;
+      
+    $Temp[$Feld]["TID"] = $Temp_TID;
+    $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
+    
+    // sonderfall ersten durchlauf
+    if( $i == 0 )
+    {
+      $Temp_TID_old = $Temp[$Feld]["TID"];
+      $Temp_UID_old = $Temp[$Feld]["UID"];
+    }
+    
+    // ist es eine zu vergeben schicht?
+    if( $Temp[$Feld]["UID"] == 0 )
+    {
+      if( isset($Temp[$Feld]["free"]))
+        $Temp[$Feld]["free"]++;
+      else
+        $Temp[$Feld]["free"]=1;
+    }
+    else
+      $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
+  } // FOR
+  
 
-	///////////////////////////////////////////////////////////////////
-	// Aus gabe der Schicht
-	///////////////////////////////////////////////////////////////////
-	if( isset($Temp))
-	  if( count($Temp) )
-	    foreach( $Temp as $TempEntry => $TempValue )
-	    {
-		if( !isset($TempValue["free"]))
-			$TempValue["free"] = 0;
-		
-		// ausgabe EngelType
-		$Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " ";
-		
-		// ausgabe Eingetragener Engel
-		if( isset($TempValue["Engel"]))
-		  if( count($TempValue["Engel"]) > 0  )
-		  {
-			if( count($TempValue["Engel"]) == 1  )
-				$Spalten.= Get_Text("inc_schicht_ist"). ":<br>\n\t\t";
-			else 
-				$Spalten.= Get_Text("inc_schicht_sind"). ":<br>\n\t\t";
-			
-			foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
-			{
-				if( funktion_isLinkAllowed( "admin/user.php") === TRUE)
-				{
-					// add color, wenn Engel "Gekommen"
-	      				$TempText= 
-						((UIDgekommen( $TempEngelID ) == "1")
-							? "<span style=\"color: blue;\">"
-							: "<span style=\"color: red;\">").
-						UID2Nick( $TempEngelID). "</span>";
-				}
-				else
-				{
-					$TempText = UID2Nick( $TempEngelID );
-				}
-				
-				// add link to user
-				$TempText= funktion_isLinkAllowed_addLink_OrLinkText(
-					"admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal",
-					$TempText);
-				
-				$Spalten.= "&nbsp;&nbsp;". $TempText.
-						( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
-						"<br>\n\t\t";
+  ///////////////////////////////////////////////////////////////////
+  // Aus gabe der Schicht
+  ///////////////////////////////////////////////////////////////////
+  if( isset($Temp))
+    if( count($Temp) )
+      foreach( $Temp as $TempEntry => $TempValue )
+      {
+    if( !isset($TempValue["free"]))
+      $TempValue["free"] = 0;
+    
+    // ausgabe EngelType
+    $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " ";
+    
+    // ausgabe Eingetragener Engel
+    if( isset($TempValue["Engel"]))
+      if( count($TempValue["Engel"]) > 0  )
+      {
+      if( count($TempValue["Engel"]) == 1  )
+        $Spalten.= Get_Text("inc_schicht_ist"). ":<br />\n\t\t";
+      else 
+        $Spalten.= Get_Text("inc_schicht_sind"). ":<br />\n\t\t";
+      
+      foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
+      {
+        if( funktion_isLinkAllowed( "admin/user.php") === TRUE)
+        {
+          // add color, wenn Engel "Gekommen"
+                $TempText= 
+            ((UIDgekommen( $TempEngelID ) == "1")
+              ? "<span style=\"color: blue;\">"
+              : "<span style=\"color: red;\">").
+            UID2Nick( $TempEngelID). "</span>";
+        }
+        else
+        {
+          $TempText = UID2Nick( $TempEngelID );
+        }
+        
+        // add link to user
+        $TempText= funktion_isLinkAllowed_addLink_OrLinkText(
+          "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal",
+          $TempText);
+        
+        $Spalten.= "&nbsp;&nbsp;". $TempText.
+            ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
+            "<br />\n\t\t";
 
 
-			}
-			$Spalten = substr( $Spalten, 0, strlen($Spalten)-7 );
-		  }
-		
-		// ausgabe benötigter Engel
-		////////////////////////////
-		//in vergangenheit
-		$SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". 
-			gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')";
-		$Ergtime = mysql_query($SQLtime, $con);
-		if( mysql_num_rows( $Ergtime) > 0)
-		{
-			//wenn keien rechte definiert sind 
-		   	if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ]))
-		   	 	$_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y";
+      }
+      $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 );
+      }
+    
+    // ausgabe benötigter Engel
+    ////////////////////////////
+    //in vergangenheit
+    $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". 
+      gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')";
+    $Ergtime = mysql_query($SQLtime, $con);
+    if( mysql_num_rows( $Ergtime) > 0)
+    {
+      //wenn keien rechte definiert sind 
+         if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ]))
+            $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y";
 
-			if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
-				if( $TempValue["free"] > 0 )
-				{
-					$Spalten.= "<br>\n\t\t&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
-						   $TempValue["TID"]."\">";
-					$Spalten.= $TempValue["free"];
-					if( $TempValue["free"] != 1 )
-						$Spalten.= Get_Text("inc_schicht_weitere").
-    							" ".Get_Text("inc_schicht_Engel").
-    							Get_Text("inc_schicht_wird");
-					else
-						$Spalten.= Get_Text("inc_schicht_weiterer").
-    							   " ".Get_Text("inc_schicht_Engel").
-							   Get_Text("inc_schicht_werden");
-					$Spalten.= Get_Text("inc_schicht_noch_gesucht");
-					$Spalten.= "</a>";
-			     }   
-		}
-		else
-		{
-			if( isset($TempValue["free"]))
-				if( $TempValue["free"] > 0 )
-					$Spalten.= "<br>\n\t\t&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
-							$TempValue["free"]. "</a></h3>";
-		}
-		$Spalten.= "<br>\n\t\t";
-	
-	} // FOREACH
-	return $Spalten;
+      if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
+        if( $TempValue["free"] > 0 )
+        {
+          $Spalten.= "<br />\n\t\t&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
+               $TempValue["TID"]."\">";
+          $Spalten.= $TempValue["free"];
+          if( $TempValue["free"] != 1 )
+            $Spalten.= Get_Text("inc_schicht_weitere").
+                  " ".Get_Text("inc_schicht_Engel").
+                  Get_Text("inc_schicht_wird");
+          else
+            $Spalten.= Get_Text("inc_schicht_weiterer").
+                     " ".Get_Text("inc_schicht_Engel").
+                 Get_Text("inc_schicht_werden");
+          $Spalten.= Get_Text("inc_schicht_noch_gesucht");
+          $Spalten.= "</a>";
+           }   
+    }
+    else
+    {
+      if( isset($TempValue["free"]))
+        if( $TempValue["free"] > 0 )
+          $Spalten.= "<br />\n\t\t&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
+              $TempValue["free"]. "</a></h3>";
+    }
+    $Spalten.= "<br />\n\t\t";
+  
+  } // FOREACH
+  return $Spalten;
 } // function Ausgabe_Feld_Inhalt
 
 
 
 /*#######################################################
-#	gibt die engelschischten Druckergerecht aus	#
+#  gibt die engelschischten Druckergerecht aus  #
 #######################################################*/
 function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) 
 {
@@ -190,200 +190,200 @@ function Ausgabe_Feld_Inhalt_Druck($RID, $Man )
 
 
 /*#######################################################
-#	Ausgabe der Raum Spalten			#
+#  Ausgabe der Raum Spalten      #
 #######################################################*/
 function CreateRoomShifts( $raum )
 {
-	global $Spalten, $ausdatum, $con, $DEBUG, $GlobalZeileProStunde, $error_messages;
-	
-	/////////////////////////////////////////////////////////////
-	// beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus
-	/////////////////////////////////////////////////////////////
-	$SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
-		     "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ".
-		     	"(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
-	$ErgSonder = mysql_query($SQLSonder, $con);
-	if( (mysql_num_rows( $ErgSonder) > 1) )
-	{
-		if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
-		{
-			echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-			for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
-			{
-				echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-					mysql_result($ErgSonder, $i, "SID"). "\">".
-					mysql_result($ErgSonder, $i, "DateS"). 
-					" '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
-					"</a><br>\n\t\t";
-			}
-		}
-	}
-	elseif( (mysql_num_rows( $ErgSonder) == 1) )
-	{
-		$Spalten[0].=	"\t\t<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
-				"\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
-	        		Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
-						     mysql_result($ErgSonder, 0, "Man") ).
-				"\t\t\t<h3>&darr;&darr;&darr;</h3>".
-	       			"\n\t\t</td>\n";
-		return;
-	}
-	
-	$ZeitZeiger = 0;
+  global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages;
+  
+  /////////////////////////////////////////////////////////////
+  // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus
+  /////////////////////////////////////////////////////////////
+  $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
+         "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ".
+           "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
+  $ErgSonder = mysql_query($SQLSonder, $con);
+  if( (mysql_num_rows( $ErgSonder) > 1) )
+  {
+    if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
+    {
+      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
+      for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
+      {
+        echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
+          mysql_result($ErgSonder, $i, "SID"). "\">".
+          mysql_result($ErgSonder, $i, "DateS"). 
+          " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
+          "</a><br />\n\t\t";
+      }
+    }
+  }
+  elseif( (mysql_num_rows( $ErgSonder) == 1) )
+  {
+    $Spalten[0].=  "\t\t<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
+        "\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
+              Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
+                 mysql_result($ErgSonder, 0, "Man") ).
+        "\t\t\t<h3>&darr;&darr;&darr;</h3>".
+               "\n\t\t</td>\n";
+    return;
+  }
+  
+  $ZeitZeiger = 0;
 
-	/////////////////////////////////////////////////////////////
-	// beginnt die erste schicht vor dem heutigen tag?
-	/////////////////////////////////////////////////////////////
-	$SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
-		     "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ".
-		     	"(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
-	$ErgSonder = mysql_query($SQLSonder, $con);
-	if( (mysql_num_rows( $ErgSonder) > 1) )
-	{
-		if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
-		{
-			echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-			for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
-			{
-				echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-					mysql_result($ErgSonder, $i, "SID"). "\">".
-					mysql_result($ErgSonder, $i, "DateS"). 
-					" '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
-					"</a><br>\n\t\t";
-			}
-		}
-	}
-	elseif( (mysql_num_rows( $ErgSonder) == 1) )
-	{
-		$ZeitZeiger =	substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+
-				(substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60);
-		$Spalten[0].=	"\t\t<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
-				"\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
-	        		Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
-						     mysql_result($ErgSonder, 0, "Man") ).
-	       			"\n\t\t</td>\n";
-	}
-		     
-	/////////////////////////////////////////////////////////////
-	// gibt die schichten für den tag aus
-	/////////////////////////////////////////////////////////////
-	$SQL =	"SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
-		"WHERE ((`RID` = '$raum') and ".
-		"(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ".
-		"(`DateS` like '$ausdatum%')) ORDER BY `DateS`;";
-      	$Erg = mysql_query($SQL, $con);
-	for( $i = 0; $i < mysql_num_rows($Erg); ++$i )
-	{	
-		$ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+
-			  (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60);
-		$len = mysql_result($Erg, $i, "Len");
+  /////////////////////////////////////////////////////////////
+  // beginnt die erste schicht vor dem heutigen tag?
+  /////////////////////////////////////////////////////////////
+  $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
+         "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ".
+           "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
+  $ErgSonder = mysql_query($SQLSonder, $con);
+  if( (mysql_num_rows( $ErgSonder) > 1) )
+  {
+    if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
+    {
+      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
+      for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
+      {
+        echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
+          mysql_result($ErgSonder, $i, "SID"). "\">".
+          mysql_result($ErgSonder, $i, "DateS"). 
+          " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
+          "</a><br />\n\t\t";
+      }
+    }
+  }
+  elseif( (mysql_num_rows( $ErgSonder) == 1) )
+  {
+    $ZeitZeiger =  substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+
+        (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60);
+    $Spalten[0].=  "\t\t<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
+        "\t\t\t<h3>&uarr;&uarr;&uarr;</h3>".
+              Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
+                 mysql_result($ErgSonder, 0, "Man") ).
+               "\n\t\t</td>\n";
+  }
+         
+  /////////////////////////////////////////////////////////////
+  // gibt die schichten für den tag aus
+  /////////////////////////////////////////////////////////////
+  $SQL =  "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
+    "WHERE ((`RID` = '$raum') and ".
+    "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ".
+    "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;";
+        $Erg = mysql_query($SQL, $con);
+  for( $i = 0; $i < mysql_num_rows($Erg); ++$i )
+  {  
+    $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+
+        (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60);
+    $len = mysql_result($Erg, $i, "Len");
 
-		if( $len <= 0)
-			array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len");
-		
-		if( $ZeitZeiger < $ZeitPos  )
-		{
-	       		$Spalten[$ZeitZeiger * $GlobalZeileProStunde].=	
-				"\t\t<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
+    if( $len <= 0)
+      array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len");
+    
+    if( $ZeitZeiger < $ZeitPos  )
+    {
+             $Spalten[$ZeitZeiger * $GlobalZeileProStunde].=  
+        "\t\t<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
 
-			$ZeitZeiger += $ZeitPos - $ZeitZeiger;
-		}
-		if($ZeitZeiger == $ZeitPos )
-		{
-			//sonderfall wenn die schicht über dei 24 stunden hinaus geht
-			// (eintrag abkürzen, pfeiel ausgeben)
-	       		$Spalten[$ZeitZeiger * $GlobalZeileProStunde].= 
-					"\t\t<td valign=\"top\" rowspan=\"". 
-					( ( ($len+$ZeitZeiger)? $len : 24-$len+$ZeitZeiger) * $GlobalZeileProStunde). 
-					"\">\n".
-					"\t\t\t".
-	        			Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), 
-							     mysql_result($Erg, $i, "Man") ).
-					(( ($ZeitZeiger+$len) > 24)? "\t\t\t<h3>&darr;&darr;&darr;</h3>" : "").
-	       				"\n\t\t</td>\n";
-			$ZeitZeiger += $len;
-		}
-		else
-		{
-			echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-			echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-				mysql_result($Erg, $i, "SID"). "\">".
-				mysql_result($Erg, $i, "DateS"). 
-				" '". mysql_result($Erg, $i, "Man"). "' ".
-				" (".  mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)</a><br><br>";
-		}
-	}
-	if( $ZeitZeiger < 24 )
-       		$Spalten[($ZeitZeiger * $GlobalZeileProStunde)].=	
-					"\t\t<td valign=\"top\" rowspan=\"". 
-					((24 - $ZeitZeiger) * $GlobalZeileProStunde ). 
-					"\">&nbsp;</td>\n";
+      $ZeitZeiger += $ZeitPos - $ZeitZeiger;
+    }
+    if($ZeitZeiger == $ZeitPos )
+    {
+      //sonderfall wenn die schicht über dei 24 stunden hinaus geht
+      // (eintrag abkürzen, pfeiel ausgeben)
+             $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= 
+          "\t\t<td valign=\"top\" rowspan=\"". 
+          ( ( ($len+$ZeitZeiger)? $len : 24-$len+$ZeitZeiger) * $GlobalZeileProStunde). 
+          "\">\n".
+          "\t\t\t".
+                Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), 
+                   mysql_result($Erg, $i, "Man") ).
+          (( ($ZeitZeiger+$len) > 24)? "\t\t\t<h3>&darr;&darr;&darr;</h3>" : "").
+                 "\n\t\t</td>\n";
+      $ZeitZeiger += $len;
+    }
+    else
+    {
+      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
+      echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
+        mysql_result($Erg, $i, "SID"). "\">".
+        mysql_result($Erg, $i, "DateS"). 
+        " '". mysql_result($Erg, $i, "Man"). "' ".
+        " (".  mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)</a><br /><br />";
+    }
+  }
+  if( $ZeitZeiger < 24 )
+           $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].=  
+          "\t\t<td valign=\"top\" rowspan=\"". 
+          ((24 - $ZeitZeiger) * $GlobalZeileProStunde ). 
+          "\">&nbsp;</td>\n";
 } // function CreateRoomShifts
 
 
 /*#######################################################
-#	Ausgabe der freien schichten			#
+#  Ausgabe der freien schichten      #
 #######################################################*/
 function showEmptyShifts( )
 {
-	global $con, $DEBUG, $RoomID, $gmdateOffset;
+  global $con, $debug, $RoomID, $gmdateOffset;
 
-	echo "<table border=\"1\">\n";
-	echo "<tr>\n";
-	echo "\t<th>". Get_Text("inc_schicht_date"). "</th>\n";
-	echo "\t<th>". Get_Text("inc_schicht_time"). "</th>\n";
-	echo "\t<th>". Get_Text("inc_schicht_room"). "</th>\n";
-	echo "\t<th>". Get_Text("inc_schicht_commend"). "</th>\n";
-	echo "</tr>\n";
-	
-	$sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ".
-		"WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ".
-		"ORDER BY `DateS`, `RID`;";
-	$Erg = mysql_query($sql, $con);
+  echo "<table border=\"1\">\n";
+  echo "<tr>\n";
+  echo "\t<th>". Get_Text("inc_schicht_date"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_time"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_room"). "</th>\n";
+  echo "\t<th>". Get_Text("inc_schicht_commend"). "</th>\n";
+  echo "</tr>\n";
+  
+  $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ".
+    "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ".
+    "ORDER BY `DateS`, `RID`;";
+  $Erg = mysql_query($sql, $con);
 
-	$angezeigt = 0;
-	for ($i=0; ($i<mysql_num_rows($Erg)) && ($angezeigt< 15); $i++)
-	  if( isset($RoomID[mysql_result( $Erg, $i, "RID")]))
-	   if( $RoomID[mysql_result( $Erg, $i, "RID")]!="" )
-	   {
- 		$Sql2 = "SELECT `UID` FROM `ShiftEntry` ".
-			"WHERE `SID`=". mysql_result( $Erg, $i, "SID"). " AND ".
-				"`UID`='0';";
-		$Erg2 = mysql_query($Sql2, $con);
-		
-		if( mysql_num_rows($Erg2)>0)
-		{
-			$angezeigt++;
-			echo "<tr>\n";
-			echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
-			echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
-			echo "\t<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
-			echo "\t<td>". 
-				ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")).
-				"</td>\n";
-			echo "</tr>\n";
-		}
-	   }
-	
-	echo "</table>\n";
-	
+  $angezeigt = 0;
+  for ($i=0; ($i<mysql_num_rows($Erg)) && ($angezeigt< 15); $i++)
+    if( isset($RoomID[mysql_result( $Erg, $i, "RID")]))
+     if( $RoomID[mysql_result( $Erg, $i, "RID")]!="" )
+     {
+     $Sql2 = "SELECT `UID` FROM `ShiftEntry` ".
+      "WHERE `SID`=". mysql_result( $Erg, $i, "SID"). " AND ".
+        "`UID`='0';";
+    $Erg2 = mysql_query($Sql2, $con);
+    
+    if( mysql_num_rows($Erg2)>0)
+    {
+      $angezeigt++;
+      echo "<tr>\n";
+      echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
+      echo "\t<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
+      echo "\t<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
+      echo "\t<td>". 
+        ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")).
+        "</td>\n";
+      echo "</tr>\n";
+    }
+     }
+  
+  echo "</table>\n";
+  
 } //function showEmptyShifts
 
-	
+  
 /*#######################################################
-#	Gibt die anzahl der Schichten im Raum zurück	#
+#  Gibt die anzahl der Schichten im Raum zurück  #
 #######################################################*/
 function SummRoomShifts( $raum )
 {
-	global $ausdatum, $con, $DEBUG, $GlobalZeileProStunde;
-	
-	$SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
-		     "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ".
-		     	"(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;";
+  global $ausdatum, $con, $debug, $GlobalZeileProStunde;
+  
+  $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
+         "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ".
+           "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;";
 
-      	$ErgSonder = mysql_query($SQLSonder, $con);
-	
-	return mysql_num_rows($ErgSonder);
+        $ErgSonder = mysql_query($SQLSonder, $con);
+  
+  return mysql_num_rows($ErgSonder);
 }
 
 ?>
diff --git a/includes/funktion_schichtplan_Tage.php b/includes/funktion_schichtplan_Tage.php
old mode 100755
new mode 100644
index 5ac92e7e..2c21a992
--- a/includes/funktion_schichtplan_Tage.php
+++ b/includes/funktion_schichtplan_Tage.php
@@ -1,87 +1,101 @@
-<?PHP
+<?php
+  if(!function_exists("DatumUm1TagErhoehen")) {
+    function DatumUm1TagErhoehen( $Datum) {
+      $Jahr = substr($Datum, 0, 4);
+      $Monat = substr($Datum, 5, 2);
+      $Tag = substr($Datum, 8, 2);
 
-if( !function_exists("DatumUm1TagErhoehen"))
-{
-    function DatumUm1TagErhoehen( $Datum)
-    {
-	$Jahr  = substr( $Datum, 0, 4);
-	$Monat = substr( $Datum, 5, 2);
-	$Tag   = substr( $Datum, 8, 2);
+      $Tag++;
 
-	$Tag++;
-	
-	switch( $Monat)
-	{
-		case 1:		$Mmax=31;	break;
-		case 2:		$Mmax=28;       break;
-		case 3:		$Mmax=31;       break;
-		case 4:		$Mmax=30;       break;
-		case 5:		$Mmax=31;       break;
-		case 6:		$Mmax=30;       break;
-		case 7:		$Mmax=31;       break;
-		case 8:		$Mmax=31;       break;
-		case 9:		$Mmax=30;       break;
-		case 10:	$Mmax=31;       break;
-		case 11:	$Mmax=30;       break;
-		case 12:	$Mmax=31;       break;
-	}
+      switch( $Monat) {
+        case 1:
+          $Mmax = 31;
+          break;
+        case 2:
+          $Mmax = 28;
+          break;
+        case 3:
+          $Mmax = 31;
+          break;
+        case 4:
+          $Mmax = 30;
+          break;
+        case 5:
+          $Mmax = 31;
+          break;
+        case 6:
+          $Mmax = 30;
+          break;
+        case 7:
+          $Mmax = 31;
+          break;
+        case 8:
+          $Mmax = 31;
+          break;
+        case 9:
+          $Mmax = 30;
+          break;
+        case 10:
+          $Mmax = 31;
+          break;
+        case 11:
+          $Mmax = 30;
+          break;
+        case 12:
+          $Mmax = 31;
+          break;
+      }
 
-	if( $Tag > $Mmax)
-	{
-		$Tag = 1;
-		$Monat++;
-	}
+      if($Tag > $Mmax) {
+        $Tag = 1;
+        $Monat++;
+      }
 
-	if( $Monat > 12 ) 
-	{
-		$Monat = 1;
-		$Jahr++;
-	}
+      if($Monat > 12) {
+        $Monat = 1;
+        $Jahr++;
+      }
 
-	$Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag;
-	$Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat;
+      $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag;
+      $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat;
 
-	return ("$Jahr-$Monat-$Tag");
-    } //function DatumUm1Tagerhoehen(
-}
+      return ("$Jahr-$Monat-$Tag");
+    }
+  }
 
-//suchen den ersten eintrags
-$SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1";
-$Erg = mysql_query($SQL, $con);
+  // suchen den ersten eintrags
+  $SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1";
+  $Erg = mysql_query($SQL, $con);
 
-$Pos=0;
+  $Pos = 0;
 
-if( mysql_num_rows($Erg)>0)
-{
-    do
-    {
-	//Startdatum einlesen und link ausgeben
-	$DateS = substr(mysql_result($Erg, 0 , 0), 0,10);
-	$VeranstaltungsTage[$Pos++] = $DateS;
-	
-	//auslesen den endes und eventuelle weitere tage ausgeben
-	$SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` ".
-		"WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))";
-	$Erg2 = mysql_query($SQL2, $con);
-	$DateE = substr(mysql_result($Erg2, 0 , 0), 0,10);
+  if(mysql_num_rows($Erg) > 0) {
+    do {
+      // Startdatum einlesen und link ausgeben
+      $DateS = substr(mysql_result($Erg, 0 , 0), 0,10);
+      $VeranstaltungsTage[$Pos++] = $DateS;
+  
+      // auslesen den endes und eventuelle weitere tage ausgeben
+      $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))";
+      $Erg2 = mysql_query($SQL2, $con);
+      $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10);
 
-	if( strlen($DateE) == 0)
-		$DateE = $DateS;
-	else
-		while( $DateS != $DateE)
-		{
-			$DateS = DatumUm1TagErhoehen( $DateS);
-			$VeranstaltungsTage[$Pos++] = $DateS;
-		}
+      if(strlen($DateE) == 0)
+        $DateE = $DateS;
+      else
+        while( $DateS != $DateE) {
+          $DateS = DatumUm1TagErhoehen( $DateS);
+          $VeranstaltungsTage[$Pos++] = $DateS;
+        }
 
-	//suchen den nästen eintrag
-	$SQL = "SELECT `DateS` FROM `Shifts` ".
-		"WHERE (`DateS` > '$DateE 23:59:59' ) ".
-		"ORDER BY `DateS` ".
-		"LIMIT 1";
-	$Erg = mysql_query($SQL, $con);
+        // suchen den naesten eintrag
+        $SQL = "SELECT `DateS` FROM `Shifts` ".
+               "WHERE (`DateS` > '$DateE 23:59:59' ) ".
+               "ORDER BY `DateS` ".
+               "LIMIT 1";
+        $Erg = mysql_query($SQL, $con);
     } while( mysql_fetch_row($Erg) > 0);
-}
-$VeranstaltungsTageMax = $Pos-1;
+  }
 
+  $VeranstaltungsTageMax = $Pos - 1;
 ?>
diff --git a/includes/funktion_schichtplan_aray.php b/includes/funktion_schichtplan_aray.php
old mode 100755
new mode 100644
index 2f7f4b36..f9b04bd6
--- a/includes/funktion_schichtplan_aray.php
+++ b/includes/funktion_schichtplan_aray.php
@@ -5,34 +5,34 @@
 #######################################################*/
 
 // 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);
+  $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");
-	}
+  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");
+  $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");
-		$TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
-	}												
+    $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
+      mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+    $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
+  }                        
 
 include ("funktion_schichtplan_Tage.php");
 ?>
diff --git a/includes/funktion_schichtplan_beamer.php b/includes/funktion_schichtplan_beamer.php
old mode 100755
new mode 100644
index ab935e0d..177b6cb3
--- a/includes/funktion_schichtplan_beamer.php
+++ b/includes/funktion_schichtplan_beamer.php
@@ -5,176 +5,176 @@
 #######################################################*/
 
 // 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");
-	}
+  $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");
+  $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");
-	}												
+    $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
+      mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
+  }                        
 
 
 /*#######################################################
-#	gibt die engelschischten aus			#
+#  gibt die engelschischten aus      #
 #######################################################*/
 function ausgabe_Feld_Inhalt( $SID, $Man ) 
 {
 // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung,
 // die eingetragenden und und offenden Schichteintäge zurück
-	global $EngelType, $EngelTypeID, $con;
-	//form Config
-	global $DEBUG;
-
-	$Out = "";
-
-	$Out.= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
-
-	$Out.= "\t\t\t<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
-		"\t\t\t\t<col width=\"45%\">\n".
-		"\t\t\t\t<col width=\"*\">\n".
-		"\t\t\t\t</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.= "\t\t\t<tr>\n";
-		
-		// ausgabe EngelType
-		$Out.= "\t\t\t\t<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.= "\t\t\t\t<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.= "\t\t\t\t<td>\n";
-		}
-	  	
-		
-		// ausgabe benötigter Engel
-		////////////////////////////
-		if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y")
+  global $EngelType, $EngelTypeID, $con;
+  //form Config
+  global $debug;
+
+  $Out = "";
+
+  $Out.= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
+
+  $Out.= "\t\t\t<colgroup span=\"2\"  align=\"left\" valign=\"center\">\n".
+    "\t\t\t\t<col width=\"45%\">\n".
+    "\t\t\t\t<col width=\"*\">\n".
+    "\t\t\t\t</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.= "\t\t\t<tr>\n";
+    
+    // ausgabe EngelType
+    $Out.= "\t\t\t\t<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.= "\t\t\t\t<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.= "\t\t\t\t<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.= "\t\t\t</tr>\n";
-	
-	} // FOREACH
-
-	$Out.= "\t\t\t</table>\n\t";
-	
-	return $Out;
+      if ( $TempValue["free"] > 0)
+      {
+        if( count($TempValue["Engel"]) > 0)
+          $Out.= ", ";
+        $Out.= $TempValue["free"]. "x free ";
+      }
+    }
+    $Out.= "</td>\n";
+    $Out.= "\t\t\t</tr>\n";
+  
+  } // FOREACH
+
+  $Out.= "\t\t\t</table>\n\t";
+  
+  return $Out;
 } // function Ausgabe_Feld_Inhalt
 
 
 
 /*#######################################################
-#	gibt die engelschischten  für einen Ruam aus	#
+#  gibt die engelschischten  für einen Ruam aus  #
 #######################################################*/
 function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) 
 {
-	global $con;
-	
-	$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= "\t<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\t\t\t\t";
-			
-		}
-	else
-		$Out.= "&nbsp;";
-	
-	$Out.= "</td>\n";
-	
-	return $Out;
+  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= "\t<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\t\t\t\t";
+      
+    }
+  else
+    $Out.= "&nbsp;";
+  
+  $Out.= "</td>\n";
+  
+  return $Out;
 }
 
 ?>
diff --git a/includes/funktion_user.php b/includes/funktion_user.php
old mode 100755
new mode 100644
index 0cdf8144..c015cb5a
--- a/includes/funktion_user.php
+++ b/includes/funktion_user.php
@@ -1,132 +1,111 @@
 <?php
+  function UID2Nick($UID) {
+    global $con;
+
+    if($UID > 0)
+      $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'";
+    else
+      $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'";
+
+    $Erg = mysql_query($SQL, $con);
+
+    if(mysql_num_rows($Erg)) {
+      if($UID > 0)
+        return mysql_result($Erg, 0);
+      else
+        return "Group-".mysql_result($Erg, 0);
+    } else {
+      if($UID == -1)
+        return "logout User";
+      else
+        return "UserID $UID not found";
+    }
+  }
 
-function UID2Nick($UID) 
-{
-  global $con;
+  function TID2Type($TID) {
+    global $con;
+  
+    $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
+    $Erg = mysql_query($SQL, $con);
 
-  if( $UID>0) {
-	$SQL = "SELECT Nick FROM `User` WHERE UID='$UID'";
-  } else {
-	$SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'";
+    if(mysql_num_rows($Erg))
+      return mysql_result($Erg, 0);
+    else
+      return "";
   }
-  $Erg = mysql_query($SQL, $con);
-
-  //echo $UID."#";
-  if( mysql_num_rows($Erg)) {
-	if( $UID>0 ) {
-		return mysql_result($Erg, 0);
-	} else {
-		return "Group-".mysql_result($Erg, 0);
-	}
-  } else {
-  	if( $UID == -1)
-		return "logout User";
-	else
-	  	return "UserID $UID not found";
+
+  function ReplaceSmilies($neueckig) {
+    global $url, $ENGEL_ROOT;
+
+    $neueckig = str_replace(";o))",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_redface.gif\">", $neueckig);
+    $neueckig = str_replace(":-))",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_redface.gif\">", $neueckig);
+    $neueckig = str_replace(";o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_wind.gif\">", $neueckig);
+    $neueckig = str_replace(":)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_smile.gif\">", $neueckig);
+    $neueckig = str_replace(":-)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_smile.gif\">", $neueckig);
+    $neueckig = str_replace(":(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_sad.gif\">", $neueckig);
+    $neueckig = str_replace(":-(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_sad.gif\">", $neueckig);
+    $neueckig = str_replace(":o(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_sad.gif\">", $neueckig);
+    $neueckig = str_replace(":o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_lol.gif\">", $neueckig);
+    $neueckig = str_replace(";o(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_cry.gif\">", $neueckig);
+    $neueckig = str_replace(";(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_cry.gif\">", $neueckig);
+    $neueckig = str_replace(";-(",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_cry.gif\">", $neueckig);
+    $neueckig = str_replace("8)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_rolleyes.gif\">", $neueckig);
+    $neueckig = str_replace("8o)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_rolleyes.gif\">", $neueckig);
+    $neueckig = str_replace(":P",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_evil.gif\">", $neueckig);
+    $neueckig = str_replace(":-P",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_evil.gif\">", $neueckig);
+    $neueckig = str_replace(":oP",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_evil.gif\">", $neueckig);
+    $neueckig = str_replace(";P",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_mad.gif\">", $neueckig);
+    $neueckig = str_replace(";oP",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_mad.gif\">", $neueckig);
+    $neueckig = str_replace("?)",  "<img src=\"" . $url . $ENGEL_ROOT . "pic/smiles/icon_question.gif\">", $neueckig);
+
+    return $neueckig;
   }
-}
 
+  function GetPicturShow($UID) {
+    global $con;
 
-function TID2Type($TID) 
-{
-  global $con;
-  
-  $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'";
-  $Erg = mysql_query($SQL, $con);
-
-  if( mysql_num_rows($Erg))
-  	return mysql_result($Erg, 0);
-  else
-  	return "";
-}
-
-
-function ReplaceSmilies($eckig) 
-{
-	global $url, $ENGEL_ROOT;
-
-	$neueckig = $eckig;
-	$neueckig = str_replace(";o))",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_redface.gif\">",$neueckig);
-	$neueckig = str_replace(":-))",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_redface.gif\">",$neueckig);
-	$neueckig = str_replace(";o)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_wind.gif\">",$neueckig);
-	$neueckig = str_replace(":)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_smile.gif\">",$neueckig);
-        $neueckig = str_replace(":-)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_smile.gif\">",$neueckig);
-	$neueckig = str_replace(":(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_sad.gif\">",$neueckig);
-        $neueckig = str_replace(":-(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_sad.gif\">",$neueckig);
-	$neueckig = str_replace(":o(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_sad.gif\">",$neueckig);
-	$neueckig = str_replace(":o)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_lol.gif\">",$neueckig);
-	$neueckig = str_replace(";o(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_cry.gif\">",$neueckig);
-	$neueckig = str_replace(";(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_cry.gif\">",$neueckig);
-        $neueckig = str_replace(";-(",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_cry.gif\">",$neueckig);
-        $neueckig = str_replace("8)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_rolleyes.gif\">",$neueckig);
-	$neueckig = str_replace("8o)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_rolleyes.gif\">",$neueckig);
-	$neueckig = str_replace(":P",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_evil.gif\">",$neueckig);
-	$neueckig = str_replace(":-P",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_evil.gif\">",$neueckig);
-	$neueckig = str_replace(":oP",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_evil.gif\">",$neueckig);
-	$neueckig = str_replace(";P",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_mad.gif\">",$neueckig);
-	$neueckig = str_replace(";oP",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_mad.gif\">",$neueckig);
-	$neueckig = str_replace("?)",	"<img src=\"". $url. $ENGEL_ROOT. "pic/smiles/icon_question.gif\">",$neueckig);
-	return $neueckig;
-}
-
-
-function GetPicturShow($UID)
-{
-	global $con;
-
-	$SQL= "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'";
-	$res = mysql_query( $SQL, $con);
-	if( mysql_num_rows($res) == 1)
-		return mysql_result( $res, 0, 0);
-	else
-		return "";
-}
-
-
-/* Parameter: 
-	<UserID>
-	[<Höhe des Bildes (wenn die höhe kleiner 1 ist wird die höhe nicht begrenzt)>] */
-function displayPictur($UID, $height="30") 
-{
-	global $url, $ENGEL_ROOT;
-	if( $height > 0)
-		return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" height=\"$height\" alt=\"picture of USER$UID\" class=\"photo\">");
-	else
-		return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" alt=\"picture of USER$UID\">");
-}
-
-
-/* Parameter: 
-	<UserID>
-	[<Höhe des Bildes (wenn die höhe kleiner 1 ist wird die höhe nicht begrenzt)>] */
-function displayavatar( $UID, $height="30") 
-{
-	global $con, $url, $ENGEL_ROOT;
-
-	if( GetPicturShow($UID) == 'Y')
-		return "&nbsp;". displayPictur(  $UID, $height);
+    $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'";
+    $res = mysql_query( $SQL, $con);
+
+    if(mysql_num_rows($res) == 1)
+      return mysql_result($res, 0, 0);
+    else
+      return "";
+  }
+
+  function displayPictur($UID, $height = "30") {
+    global $url, $ENGEL_ROOT;
+
+    if($height > 0)
+      return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" height=\"$height\" alt=\"picture of USER$UID\" class=\"photo\">");
+    else
+      return( "<img src=\"". $url. $ENGEL_ROOT. "ShowUserPicture.php?UID=$UID\" alt=\"picture of USER$UID\">");
+  }
+
+  function displayavatar($UID, $height="30") {
+    global $con, $url, $ENGEL_ROOT;
+
+    if( GetPicturShow($UID) == 'Y')
+      return "&nbsp;". displayPictur(  $UID, $height);
         
-	// show avator
-	$asql = "select * from User where UID = $UID";
-	$aerg = mysql_query ($asql, $con);
-	if( mysql_num_rows($aerg) )
-		if( mysql_result($aerg, 0, "Avatar") > 0)
-          		return ("&nbsp;<img src=\"". $url. $ENGEL_ROOT. "pic/avatar/avatar". mysql_result($aerg, 0, "Avatar"). ".gif\">");
-
-}
-
-function UIDgekommen($UID) 
-{
-  global $con;
-  
-  $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'";
-  $Erg = mysql_query($SQL, $con);
+    // show avator
+    $asql = "select * from User where UID = $UID";
+    $aerg = mysql_query ($asql, $con);
 
-  //echo $UID."#";
-  if( mysql_num_rows($Erg))
-	return mysql_result($Erg, 0);
-  else
-  	return "0";
-}
+    if(mysql_num_rows($aerg))
+      if(mysql_result($aerg, 0, "Avatar") > 0)
+        return ("&nbsp;<img src=\"". $url. $ENGEL_ROOT. "pic/avatar/avatar". mysql_result($aerg, 0, "Avatar"). ".gif\">");
+  }
+
+  function UIDgekommen($UID) {
+    global $con;
+  
+    $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'";
+    $Erg = mysql_query($SQL, $con);
 
+    if(mysql_num_rows($Erg))
+      return mysql_result($Erg, 0);
+    else
+      return "0";
+  }
 ?>
diff --git a/includes/funktion_xml.php b/includes/funktion_xml.php
old mode 100755
new mode 100644
index 8e911a4f..60eb26fa
--- a/includes/funktion_xml.php
+++ b/includes/funktion_xml.php
@@ -1,13 +1,10 @@
-<?PHP
-
-
-class element
-{
-	var $name = '';
-	var $attributes = array();
-	var $data = '';
-	var $depth = 0;
-	var $sub = array();
+<?php
+class element {
+  var $name = '';
+  var $attributes = array();
+  var $data = '';
+  var $depth = 0;
+  var $sub = array();
 }
 
 $XMLDEBUG = 0;
@@ -16,147 +13,142 @@ $XMLmain = new element;
 $XMLpos = array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 //$XMLpos = array( 0, 0, 0, 0, 0, 0);
    
-function convertValues( $Data)
-{
-	global $XMLDEBUG;
-	if( $XMLDEBUG)
-	{
-		$Data = htmlspecialchars($Data);
-		$Data = mysql_escape_string($Data);
-		$Data = htmlentities($Data);
-	}
-	$Data = utf8_decode($Data);
-	return $Data;
-}
+function convertValues( $Data) {
+  global $XMLDEBUG;
 
+  if($XMLDEBUG) {
+    $Data = htmlspecialchars($Data);
+    $Data = mysql_escape_string($Data);
+    $Data = htmlentities($Data);
+  }
 
-function dataXMLmain( $Data, &$Objekt, $Tiefe )
-{
-	global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
-	
-	if( $XMLDEBUG)	
-	  echo "?$Tiefe$depth";
-	if( ($depth-1)==$Tiefe)
-	{	
-//		$Objekt->sub[ $XMLpos[$Tiefe] ]->data .= convertValues($Data);
-		$Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES);
-		 
-		if( $XMLDEBUG)
-		  echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???<br>";
-	}
-	else
-		dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
+  $Data = utf8_decode($Data);
+  return $Data;
 }
 
-function startXMLmain( $Data, &$Objekt, $Tiefe )
-{
-	global $XMLpos, $depth, $XMLDEBUG;
-
-	if( $XMLDEBUG)
-	 if($Tiefe==1) 
-	 { print_r(array_values ($XMLpos)); echo "--".$Data->name;
-	   echo " #$Tiefe/$depth#";
-	 }
-	
-	if( $depth==$Tiefe)
-	{
-		$Objekt->sub[ $XMLpos[$Tiefe] ] = $Data;
-		if( $XMLDEBUG)
-		  echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#<br>";
-	}
-	else
-		startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
+function dataXMLmain($Data, &$Objekt, $Tiefe) {
+  global $XMLmain, $XMLpos, $depth, $XMLDEBUG;
+  
+  if($XMLDEBUG)
+    echo "?$Tiefe$depth";
+
+  if(($depth-1) == $Tiefe) {
+    $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES);
+     
+    if($XMLDEBUG)
+      echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???<br />";
+  } else
+    dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
+}
+
+function startXMLmain( $Data, &$Objekt, $Tiefe ) {
+  global $XMLpos, $depth, $XMLDEBUG;
+
+  if( $XMLDEBUG)
+   if($Tiefe==1) 
+   { print_r(array_values ($XMLpos)); echo "--".$Data->name;
+     echo " #$Tiefe/$depth#";
+   }
+  
+  if( $depth==$Tiefe)
+  {
+    $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data;
+    if( $XMLDEBUG)
+      echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#<br />";
+  }
+  else
+    startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1);
 }
 
 function start_element_handler($parser, $name, $attribs)
 {
-	global $depth, $XMLmain, $XMLpos;
+  global $depth, $XMLmain, $XMLpos;
 
-	$Data = new element;
-	$Data->name = $name;
-	while(list($key, $value) = each($attribs))
-		$Data->attributes[$key] = convertValues($value);
-	$Data->depth = $depth;
- 	$XMLpos[$depth]++;
+  $Data = new element;
+  $Data->name = $name;
+  while(list($key, $value) = each($attribs))
+    $Data->attributes[$key] = convertValues($value);
+  $Data->depth = $depth;
+   $XMLpos[$depth]++;
 
-	if( $depth==0)
-		$XMLmain= $Data;
-	else
-		startXMLmain( $Data, $XMLmain, 1);
+  if( $depth==0)
+    $XMLmain= $Data;
+  else
+    startXMLmain( $Data, $XMLmain, 1);
 
-	$depth++;
+  $depth++;
 }
 
 function end_element_handler($parser, $name)
 {
-	global $depth, $XMLpos;
-	$XMLpos[$depth]=0;
-	$depth--;
+  global $depth, $XMLpos;
+  $XMLpos[$depth]=0;
+  $depth--;
 }
 
 function character_data_handler($parser, $data)
 {
-	global $XMLmain;
-	if( strlen(trim($data)) )
-		dataXMLmain( $data, $XMLmain, 1);
+  global $XMLmain;
+  if( strlen(trim($data)) )
+    dataXMLmain( $data, $XMLmain, 1);
 }
 
 /*#######################################################################################*/
 function readXMLfile( $file ) 
 {
-	global $XMLDEBUG;
-	
-	//$xml_parser = xml_parser_create_ns();
-	$xml_parser = xml_parser_create("UTF-8");
-	xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
-	xml_set_character_data_handler($xml_parser, "character_data_handler");
-	
-	if (file_exists($file)) 
-	{
-		if (!($fp = fopen($file, "r")))
-		{
-			echo(" <h1>could not open XML file \"$file\"</h1>");
-			return -1;
-		}
-	}
-	else
-	{
-		echo(" <h1>XML file \"$file\" not exist</h1>");
-		return -1;
-	}
-
-	if( $XMLDEBUG)	echo "<pre>";
-	while ($data = fread($fp, 4096)) 
-	{
-		if (!xml_parse($xml_parser, $data, feof($fp))) 
-		{
-			die(sprintf("XML error: %s at line %d",
-				    xml_error_string(xml_get_error_code($xml_parser)),
-				    xml_get_current_line_number($xml_parser)));
-		}
-	}
-	if( $XMLDEBUG)	echo "</pre>";
-	xml_parser_free($xml_parser);
-	return 0;
+  global $XMLDEBUG;
+  
+  //$xml_parser = xml_parser_create_ns();
+  $xml_parser = xml_parser_create("UTF-8");
+  xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler");
+  xml_set_character_data_handler($xml_parser, "character_data_handler");
+  
+  if (file_exists($file)) 
+  {
+    if (!($fp = fopen($file, "r")))
+    {
+      echo(" <h1>could not open XML file \"$file\"</h1>");
+      return -1;
+    }
+  }
+  else
+  {
+    echo(" <h1>XML file \"$file\" not exist</h1>");
+    return -1;
+  }
+
+  if( $XMLDEBUG)  echo "<pre>";
+  while ($data = fread($fp, 4096)) 
+  {
+    if (!xml_parse($xml_parser, $data, feof($fp))) 
+    {
+      die(sprintf("XML error: %s at line %d",
+            xml_error_string(xml_get_error_code($xml_parser)),
+            xml_get_current_line_number($xml_parser)));
+    }
+  }
+  if( $XMLDEBUG)  echo "</pre>";
+  xml_parser_free($xml_parser);
+  return 0;
 }
 
 /*#######################################################################################*/
 function getXMLsubPease( $Sourse, $Name ) 
 {
-	foreach($Sourse->sub as $key => $value) {
-		if ($value->name == $Name) {
-			return $value; 
-		}
-	}
-
-	echo "<h1>Fehler: getXMLsubPease( $Sourse, $Name ) not found</h1>";
-//		die;  
+  foreach($Sourse->sub as $key => $value) {
+    if ($value->name == $Name) {
+      return $value; 
+    }
+  }
+
+  echo "<h1>Fehler: getXMLsubPease( $Sourse, $Name ) not found</h1>";
+//    die;  
 }
 
 /*#######################################################################################*/
 function getXMLsubData( $Sourse, $Name ) 
 {
-	$XML = getXMLsubPease( $Sourse, $Name);
-	return $XML->data;
+  $XML = getXMLsubPease( $Sourse, $Name);
+  return $XML->data;
 }
 ?>
diff --git a/includes/funktion_xml_room.php b/includes/funktion_xml_room.php
old mode 100755
new mode 100644
index a8f626d1..cb91af6f
--- a/includes/funktion_xml_room.php
+++ b/includes/funktion_xml_room.php
@@ -1,69 +1,61 @@
-<?PHP
-
-
-/*##############################################################################################
-				           R o o m
-  ##############################################################################################*/
-echo "\n\n<br>\n<h1>Rooms:</h1>\n";
-
-function saveRoomData()
-{
-	global $con;
-	if( isset($_GET["NameXML"]))
-	{
-		$SQL= "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ".
-			"VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');";
-		$Erg = mysql_query($SQL, $con);
-		if( $Erg )
-			echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich<br>";
-		else
-			echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war <u>nicht</u> erfogreich.(".
-				mysql_error($con). ")<br>[$SQL]<br>";
-	}
-	else 
-		echo "Fehler in den Parametern!<br>";
-} /*function saveRoomData*/
-
-if( isset($_GET["RoomUpdate"]))
-	saveRoomData();
-
-//INIT Status counter
-$DS_KO = 0;
-
-//Ausgabe
-echo "<table border=\"0\">\n";
-echo "<tr><th>Name</th><th>state</th></tr>\n";
-if( $EnableSchudle)
-foreach($XMLmain->sub as $EventKey => $Event)
-{
-        if( $Event->name == "VEVENT")
-	{
-		$NameXML = getXMLsubData( $Event, "LOCATION");
-		if( !isset( $RoomName[$NameXML]))
-		{
-			$RoomName[$NameXML] = "";
-
-			if( isset($_GET["UpdateALL"]))
-			{
-				$_GET["NameXML"] = $NameXML;
-				saveRoomData();
-				CreateRoomArrays();
-			}
-			else
-			{
-				echo "<form action=\"dbUpdateFromXLS.php\">\n";
-				echo "\t<tr>\n";
-				echo "\t<td><input name=\"NameXML\" type=\"text\" value=\"$NameXML\" readonly></td>\n";
-				echo "\t<td><input type=\"submit\" name=\"RoomUpdate\" value=\"update\"></td>\n";
-				$DS_KO++;
-				echo "\t</tr>\n";
-				echo "</form>\n";
-				echo "<br>";
-			}
-		}
-	}
-}
-echo "<tr><td colspan=\"6\">status: $DS_KO nicht vorhanden.</td></tr>\n";
-echo "</table>\n";
-
-?>
+<?php
+  echo "<h1>Rooms:</h1>\n";
+
+  function saveRoomData() {
+    global $con;
+
+    if(isset($_GET["NameXML"])) {
+      $SQL = "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ".
+        "VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');";
+      $Erg = mysql_query($SQL, $con);
+
+      if($Erg)
+        echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich<br />";
+      else
+        echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war <u>nicht</u> erfogreich.(".
+
+      mysql_error($con). ")<br />[$SQL]<br />";
+    } else 
+      echo "Fehler in den Parametern!<br />";
+  }
+
+  if(isset($_GET["RoomUpdate"]))
+    saveRoomData();
+
+  // INIT Status counter
+  $DS_KO = 0;
+
+  // Ausgabe
+  echo "<table border=\"0\">\n";
+  echo "<tr><th>Name</th><th>state</th></tr>\n";
+
+  if($EnableSchudle) {
+    foreach($XMLmain->sub as $EventKey => $Event) {
+      if( $Event->name == "VEVENT") {
+        $NameXML = getXMLsubData( $Event, "LOCATION");
+
+        if( !isset( $RoomName[$NameXML])) {
+          $RoomName[$NameXML] = "";
+
+          if(isset($_GET["UpdateALL"])) {
+            $_GET["NameXML"] = $NameXML;
+            saveRoomData();
+            CreateRoomArrays();
+          } else {
+            echo "<form action=\"dbUpdateFromXLS.php\">\n";
+            echo "\t<tr>\n";
+            echo "\t<td><input name=\"NameXML\" type=\"text\" value=\"$NameXML\" readonly></td>\n";
+            echo "\t<td><input type=\"submit\" name=\"RoomUpdate\" value=\"update\"></td>\n";
+            $DS_KO++;
+            echo "\t</tr>\n";
+            echo "</form>\n";
+            echo "<br />";
+          }
+        }
+      }
+    }
+  }
+
+  echo "<tr><td colspan=\"6\">status: $DS_KO nicht vorhanden.</td></tr>\n";
+  echo "</table>\n";
+?>
diff --git a/includes/funktion_xml_schudle.php b/includes/funktion_xml_schudle.php
old mode 100755
new mode 100644
index 4ef0a42f..41efce04
--- a/includes/funktion_xml_schudle.php
+++ b/includes/funktion_xml_schudle.php
@@ -1,178 +1,178 @@
-<?PHP
+<?php
 
 /*##############################################################################################
-				        s c h e d u l e 
+                s c h e d u l e 
   ##############################################################################################*/
 echo "\n\n<h1>Schedule:</h1>\n";
 
 
 function SaveSchedule()
 {
-	global  $RoomID, $RoomName;
-	global $con;
+  global  $RoomID, $RoomName;
+  global $con;
 
-	if( isset($_GET["PSIDXML"]) && 
-	    isset($_GET["DateXML"]) &&
-	    isset($_GET["RIDXML"]) &&
-	    isset($_GET["LenXML"]) &&
-	    isset($_GET["ManXML"]) &&
-	    isset($_GET["URLXML"])  )
-	{
-		//erzeuge von `DateE`
-		$TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60);
-		$TimeEnd  = ($_GET["LenXML"] + $TimeStart) * 60;
-		$TimeM = $TimeEnd % 60;
-		$TimeH = ($TimeEnd - $TimeM)/60;
-		if( $TimeH>=24 )
-		{
-			$TimeH -= 24;
-			$DateEnd = substr($_GET["DateXML"], 0, 8). 
-				   (substr($_GET["DateXML"], 8, 2)+1). " ";
-		}
-		else
-			$DateEnd = substr($_GET["DateXML"], 0, 11);
-		$DateEnd .= "$TimeH:$TimeM:00";
-		
-		//Namen ermitteln
-		$_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]];
-		
-		//Update OR insert ?
-		$SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
-		$Erg1 =  mysql_query($SQL1, $con);
-		
-		if( mysql_num_rows($Erg1)==0)
-		{
-			echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'";
-			$SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ".
-				"VALUES ('". $_GET["PSIDXML"]. "', ".
-					"'". $_GET["DateXML"]. "', ".
-					"'". $DateEnd. "', ".
-					"'". $_GET["LenXML"]. "', ".
-					"'". $_GET["RIDXML"]. "', ".
-					"'". mysql_escape_string($_GET["ManXML"]). "', ".
-					"'". $_GET["URLXML"]. "'".
-					");";
-		}
-		else
-		{
-			echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". 
-				mysql_result( $Erg1, 0, "SID"). ")";
-			$SQL= "UPDATE `Shifts` SET ".
-				"`DateS` = '". $_GET["DateXML"]. "', ".
-				"`DateE` = '". $DateEnd. "', ".
-				"`Len` = '". $_GET["LenXML"]. "', ".
-				"`RID` = '". $_GET["RIDXML"]. "', ".
-				"`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ".
-				"`URL`= '". $_GET["URLXML"]. "' ".
-				"WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;";
-		}
-		$Erg = mysql_query($SQL, $con);
-		if( $Erg )
-		{
-			echo ", war erfogreich<br>\n";
+  if( isset($_GET["PSIDXML"]) && 
+      isset($_GET["DateXML"]) &&
+      isset($_GET["RIDXML"]) &&
+      isset($_GET["LenXML"]) &&
+      isset($_GET["ManXML"]) &&
+      isset($_GET["URLXML"])  )
+  {
+    //erzeuge von `DateE`
+    $TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60);
+    $TimeEnd  = ($_GET["LenXML"] + $TimeStart) * 60;
+    $TimeM = $TimeEnd % 60;
+    $TimeH = ($TimeEnd - $TimeM)/60;
+    if( $TimeH>=24 )
+    {
+      $TimeH -= 24;
+      $DateEnd = substr($_GET["DateXML"], 0, 8). 
+           (substr($_GET["DateXML"], 8, 2)+1). " ";
+    }
+    else
+      $DateEnd = substr($_GET["DateXML"], 0, 11);
+    $DateEnd .= "$TimeH:$TimeM:00";
+    
+    //Namen ermitteln
+    $_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]];
+    
+    //Update OR insert ?
+    $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
+    $Erg1 =  mysql_query($SQL1, $con);
+    
+    if( mysql_num_rows($Erg1)==0)
+    {
+      echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'";
+      $SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ".
+        "VALUES ('". $_GET["PSIDXML"]. "', ".
+          "'". $_GET["DateXML"]. "', ".
+          "'". $DateEnd. "', ".
+          "'". $_GET["LenXML"]. "', ".
+          "'". $_GET["RIDXML"]. "', ".
+          "'". mysql_escape_string($_GET["ManXML"]). "', ".
+          "'". $_GET["URLXML"]. "'".
+          ");";
+    }
+    else
+    {
+      echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". 
+        mysql_result( $Erg1, 0, "SID"). ")";
+      $SQL= "UPDATE `Shifts` SET ".
+        "`DateS` = '". $_GET["DateXML"]. "', ".
+        "`DateE` = '". $DateEnd. "', ".
+        "`Len` = '". $_GET["LenXML"]. "', ".
+        "`RID` = '". $_GET["RIDXML"]. "', ".
+        "`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ".
+        "`URL`= '". $_GET["URLXML"]. "' ".
+        "WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;";
+    }
+    $Erg = mysql_query($SQL, $con);
+    if( $Erg )
+    {
+      echo ", war erfogreich<br />\n";
 
-			//SID auslesen
-			$SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
-			$Erg1 =  mysql_query($SQL1, $con);
-			$newSID = mysql_result($Erg1, 0, 0);
+      //SID auslesen
+      $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';";
+      $Erg1 =  mysql_query($SQL1, $con);
+      $newSID = mysql_result($Erg1, 0, 0);
 
-			// erstellt ein Array der Reume
-		        $sql2 =	"SELECT * FROM `Room` ".
-				"WHERE `RID`='".$_GET["RIDXML"]. "' ".
-	        		"ORDER BY `Number`, `Name`;";
-			$Erg2 = mysql_query( $sql2, $con);
-			for( $j=0; $j<mysql_num_fields( $Erg2); $j++)
-			{
-				if( substr( mysql_field_name($Erg2, $j), 0, 12)=="DEFAULT_EID_" )
-				{
-					// extract db values
-					$EngelNeeded = mysql_result($Erg2, 0, $j);
-					$EngelTypeID = substr( mysql_field_name($Erg2, $j), 12);
+      // erstellt ein Array der Reume
+            $sql2 =  "SELECT * FROM `Room` ".
+        "WHERE `RID`='".$_GET["RIDXML"]. "' ".
+              "ORDER BY `Number`, `Name`;";
+      $Erg2 = mysql_query( $sql2, $con);
+      for( $j=0; $j<mysql_num_fields( $Erg2); $j++)
+      {
+        if( substr( mysql_field_name($Erg2, $j), 0, 12)=="DEFAULT_EID_" )
+        {
+          // extract db values
+          $EngelNeeded = mysql_result($Erg2, 0, $j);
+          $EngelTypeID = substr( mysql_field_name($Erg2, $j), 12);
 
 
-					// chech exist shifts
-		        		$sqlShifts =	"SELECT * FROM `ShiftEntry` ".
-							"WHERE   `SID`='". $newSID. "' AND ".
-								"`TID` = '". $EngelTypeID. "';";
-					$ErgShifts = mysql_query( $sqlShifts, $con);
-					$EngelNeeded_Exist = mysql_num_rows( $ErgShifts);
-					
-					// check for not empty shifts
-		        		$sqlShiftsNotEmpty =	"SELECT * FROM `ShiftEntry` ".
-								"WHERE   `SID`='". $newSID. "' AND ".
-									"`TID` = '". $EngelTypeID. "' AND ".
-									"`UID` != 0 ;";
-					$ErgShiftsNotEmpty = mysql_query( $sqlShiftsNotEmpty, $con);
-					$EngelNeeded_NotEmpty = mysql_num_rows( $ErgShiftsNotEmpty);
-					
-					// Angel create/delte?
-					if( $EngelNeeded > $EngelNeeded_Exist)
-					{
-						echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ".
-							($EngelNeeded-$EngelNeeded_Exist). "x<br>\n------>\n";
-						for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ )
-						{
-							$SQL3  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (".
-								 "'". $newSID. "', ".
-								 "'". $EngelTypeID. "');";
-							$Erg3 = mysql_query($SQL3, $con);
-							if ($Erg3 == 1) 
-								echo "pass ";
-							else
-								echo "fail <u>". mysql_error($con). 
-									"</u>($SQL3)<br>\n";
-						}
-						echo "<br>\n";
-					}
-					else if ($EngelNeeded < $EngelNeeded_Exist)
-					{
-						if( $EngelNeeded > $EngelNeeded_NotEmpty)
-						{
-							$EngelMin = $EngelNeeded;
-						}
-						else
-						{
-							$EngelMin = $EngelNeeded_NotEmpty;
-							echo "---> WARING ". $EngelNeeded_NotEmpty. 
-								" shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t";
-						}
+          // chech exist shifts
+                $sqlShifts =  "SELECT * FROM `ShiftEntry` ".
+              "WHERE   `SID`='". $newSID. "' AND ".
+                "`TID` = '". $EngelTypeID. "';";
+          $ErgShifts = mysql_query( $sqlShifts, $con);
+          $EngelNeeded_Exist = mysql_num_rows( $ErgShifts);
+          
+          // check for not empty shifts
+                $sqlShiftsNotEmpty =  "SELECT * FROM `ShiftEntry` ".
+                "WHERE   `SID`='". $newSID. "' AND ".
+                  "`TID` = '". $EngelTypeID. "' AND ".
+                  "`UID` != 0 ;";
+          $ErgShiftsNotEmpty = mysql_query( $sqlShiftsNotEmpty, $con);
+          $EngelNeeded_NotEmpty = mysql_num_rows( $ErgShiftsNotEmpty);
+          
+          // Angel create/delte?
+          if( $EngelNeeded > $EngelNeeded_Exist)
+          {
+            echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ".
+              ($EngelNeeded-$EngelNeeded_Exist). "x<br />\n------>\n";
+            for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ )
+            {
+              $SQL3  = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (".
+                 "'". $newSID. "', ".
+                 "'". $EngelTypeID. "');";
+              $Erg3 = mysql_query($SQL3, $con);
+              if ($Erg3 == 1) 
+                echo "pass ";
+              else
+                echo "fail <u>". mysql_error($con). 
+                  "</u>($SQL3)<br />\n";
+            }
+            echo "<br />\n";
+          }
+          else if ($EngelNeeded < $EngelNeeded_Exist)
+          {
+            if( $EngelNeeded > $EngelNeeded_NotEmpty)
+            {
+              $EngelMin = $EngelNeeded;
+            }
+            else
+            {
+              $EngelMin = $EngelNeeded_NotEmpty;
+              echo "---> WARING ". $EngelNeeded_NotEmpty. 
+                " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t";
+            }
 
-						echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ".  
-								($EngelNeeded_Exist-$EngelMin)."x<br>\n------>\n";
-						for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ )
-						{
-							$SQL3  = "DELETE FROM `ShiftEntry` ".
-								 "WHERE  `SID` = ". $newSID. " AND ".
-								 	"`TID` = ". $EngelTypeID. " AND ".
-									"`UID` = 0 ".
-									"LIMIT 1;";
-							$Erg3 = mysql_query($SQL3, $con);
-							if ($Erg3 == 1) 
-								echo "pass ";
-							else
-								echo "fail <u>". mysql_error($con). 
-									"</u>($SQL3)<br>\n";
-						}
-						echo "<br>\n";
-					}
-					else
-					{
-//						echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "<br>\n";
-					}
-				}
-			}
+            echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ".  
+                ($EngelNeeded_Exist-$EngelMin)."x<br />\n------>\n";
+            for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ )
+            {
+              $SQL3  = "DELETE FROM `ShiftEntry` ".
+                 "WHERE  `SID` = ". $newSID. " AND ".
+                   "`TID` = ". $EngelTypeID. " AND ".
+                  "`UID` = 0 ".
+                  "LIMIT 1;";
+              $Erg3 = mysql_query($SQL3, $con);
+              if ($Erg3 == 1) 
+                echo "pass ";
+              else
+                echo "fail <u>". mysql_error($con). 
+                  "</u>($SQL3)<br />\n";
+            }
+            echo "<br />\n";
+          }
+          else
+          {
+//            echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "<br />\n";
+          }
+        }
+      }
 
-		}
-		else
-			echo ", war <u>nicht</u> erfogreich.(". 
-				mysql_error($con). ")<br>[$SQL]<br>\n";
-	}
-	else 
-		echo "Fehler in den Parametern!<br>";
+    }
+    else
+      echo ", war <u>nicht</u> erfogreich.(". 
+        mysql_error($con). ")<br />[$SQL]<br />\n";
+  }
+  else 
+    echo "Fehler in den Parametern!<br />";
 } /*SaveSchedule*/
 
 if( isset($_GET["ScheduleUpdate"]))
-	SaveSchedule();
+  SaveSchedule();
 
 //INIT Status counter
 $DS_OK = 0;
@@ -182,127 +182,127 @@ $Where = "";
 //ausgabe
 echo "<table border=\"0\">\n";
 echo "<tr><th>PSID</th><th>Date</th>".
-	"<th>Room</th><th>Len</th><th>Name</th><th>state</th></tr>\n";
+  "<th>Room</th><th>Len</th><th>Name</th><th>state</th></tr>\n";
 echo "<tr align=\"center\"><td>XML - DB</td><td>XML - DB</td>".
-	"<td>XML - DB</td><td>XML - DB</td><td>XML - DB</td><td></td></tr>\n";
+  "<td>XML - DB</td><td>XML - DB</td><td>XML - DB</td><td></td></tr>\n";
 
 if( $EnableSchudle)
 foreach($XMLmain->sub as $EventKey => $Event)
 {
-	if( $Event->name == "VEVENT")
-	{
-		echo "<form action=\"dbUpdateFromXLS.php\">\n";
-		echo "\t<tr>\n";
-	
-		$PSIDXML  = getXMLsubData( $Event, "UID"); 
-		$DateXML = 
-			substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-".
-			substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-".
-			substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ".
-			   substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":".
-			   substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00";
-		$LenXML  = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60);
-		$RIDXML  = getXMLsubData( $Event, "LOCATION");
-		$ManXML  = getXMLsubData( $Event, "SUMMARY");
-		$URLXML  = getXMLsubData( $Event, "URL");
-	
-		if( isset($_GET["UpdateALL"]))
-		{
-			$_GET["PSIDXML"]  = $PSIDXML;
-			$_GET["DateXML"] = $DateXML;
-			$_GET["LenXML"]  = $LenXML;
-			$_GET["RIDXML"]  = $RIDXML;
-			$_GET["ManXML"]  = $ManXML;
-			$_GET["URLXML"]  = $URLXML;
-			SaveSchedule();
-		}
-			
-		$SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'";
-		$Erg = mysql_query($SQL, $con);
-		if(mysql_num_rows($Erg)>0)
-		{
-			$SIDDB  = mysql_result($Erg, 0, "SID");
-			$PSIDDB  = mysql_result($Erg, 0, "PSID");
-			$TimeDB = mysql_result($Erg, 0, "DateS");
-			$LenDB  = mysql_result($Erg, 0, "Len");
-			if( isset($RoomID[mysql_result($Erg, 0, "RID")]))
-				$RIDDB  = $RoomID[mysql_result($Erg, 0, "RID")];
-			else
-				$RIDDB  = "RID". mysql_result($Erg, 0, "RID");
-			
-			$ManDB  = mysql_result($Erg, 0, "Man");
-			$URLDB  = mysql_result($Erg, 0, "URL");
-		}
-		else
-			$SIDDB = $PSIDDB  = $TimeDB = $LenDB  = $RIDDB  = $ManDB =  $URLDB = "";
+  if( $Event->name == "VEVENT")
+  {
+    echo "<form action=\"dbUpdateFromXLS.php\">\n";
+    echo "\t<tr>\n";
+  
+    $PSIDXML  = getXMLsubData( $Event, "UID"); 
+    $DateXML = 
+      substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-".
+      substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-".
+      substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ".
+         substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":".
+         substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00";
+    $LenXML  = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60);
+    $RIDXML  = getXMLsubData( $Event, "LOCATION");
+    $ManXML  = getXMLsubData( $Event, "SUMMARY");
+    $URLXML  = getXMLsubData( $Event, "URL");
+  
+    if( isset($_GET["UpdateALL"]))
+    {
+      $_GET["PSIDXML"]  = $PSIDXML;
+      $_GET["DateXML"] = $DateXML;
+      $_GET["LenXML"]  = $LenXML;
+      $_GET["RIDXML"]  = $RIDXML;
+      $_GET["ManXML"]  = $ManXML;
+      $_GET["URLXML"]  = $URLXML;
+      SaveSchedule();
+    }
+      
+    $SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'";
+    $Erg = mysql_query($SQL, $con);
+    if(mysql_num_rows($Erg)>0)
+    {
+      $SIDDB  = mysql_result($Erg, 0, "SID");
+      $PSIDDB  = mysql_result($Erg, 0, "PSID");
+      $TimeDB = mysql_result($Erg, 0, "DateS");
+      $LenDB  = mysql_result($Erg, 0, "Len");
+      if( isset($RoomID[mysql_result($Erg, 0, "RID")]))
+        $RIDDB  = $RoomID[mysql_result($Erg, 0, "RID")];
+      else
+        $RIDDB  = "RID". mysql_result($Erg, 0, "RID");
+      
+      $ManDB  = mysql_result($Erg, 0, "Man");
+      $URLDB  = mysql_result($Erg, 0, "URL");
+    }
+    else
+      $SIDDB = $PSIDDB  = $TimeDB = $LenDB  = $RIDDB  = $ManDB =  $URLDB = "";
 
-		echo "\t<td><input name=\"PSIDXML\" type=\"text\" value=\"$PSIDXML\" size=\"2\" eadonly></td>\n";
-		echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"$DateXML\" size=\"17\" readonly>\n\t\t".
-		   "<input name=\"DateDB\" type=\"text\" value=\"$TimeDB\" size=\"17\" readonly></td>\n";
-		echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"$RIDXML\" size=\"15\" readonly>\n\t\t".
-		   "<input name=\"RIDDB\" type=\"text\" value=\"$RIDDB\" size=\"15\" readonly></td>\n";
-		echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"$LenXML\" size=\"1\"readonly>\n\t\t".
-		   "<input name=\"LenDB\" type=\"text\" value=\"$LenDB\" size=\"1\"readonly></td>\n";
-		echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"$ManXML\" size=\"40\"readonly>\n\t\t".
-		   "<input name=\"ManDB\" type=\"text\" value=\"$ManDB\" size=\"40\"readonly></td>\n";
-		echo "\t<td><input name=\"URLXML\" type=\"hidden\" value=\"$URLXML\"></td>\n";
-		echo "\t<td><input name=\"URLDB\" type=\"hidden\" value=\"$URLDB\"></td>\n";
-		if( !(	$PSIDXML==$PSIDDB && 
-			$DateXML==$TimeDB && 
-			$RIDXML==$RIDDB && 
-			$LenXML==$LenDB &&
-			$ManXML==$ManDB &&
-			$URLXML==$URLDB) )
-		{
-			echo "\t<td><input type=\"submit\" name=\"ScheduleUpdate\" value=\"update\"></td>\n";
-			$DS_KO++;
-		}
-		else
-		{
-			echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "</td>\n";
-			$DS_OK++;
-		}
-		echo "\t</tr>\n";
-		echo "</form>\n";
-		$Where.= " OR `PSID`='$PSIDXML'";
-	}
+    echo "\t<td><input name=\"PSIDXML\" type=\"text\" value=\"$PSIDXML\" size=\"2\" eadonly></td>\n";
+    echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"$DateXML\" size=\"17\" readonly>\n\t\t".
+       "<input name=\"DateDB\" type=\"text\" value=\"$TimeDB\" size=\"17\" readonly></td>\n";
+    echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"$RIDXML\" size=\"15\" readonly>\n\t\t".
+       "<input name=\"RIDDB\" type=\"text\" value=\"$RIDDB\" size=\"15\" readonly></td>\n";
+    echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"$LenXML\" size=\"1\"readonly>\n\t\t".
+       "<input name=\"LenDB\" type=\"text\" value=\"$LenDB\" size=\"1\"readonly></td>\n";
+    echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"$ManXML\" size=\"40\"readonly>\n\t\t".
+       "<input name=\"ManDB\" type=\"text\" value=\"$ManDB\" size=\"40\"readonly></td>\n";
+    echo "\t<td><input name=\"URLXML\" type=\"hidden\" value=\"$URLXML\"></td>\n";
+    echo "\t<td><input name=\"URLDB\" type=\"hidden\" value=\"$URLDB\"></td>\n";
+    if( !(  $PSIDXML==$PSIDDB && 
+      $DateXML==$TimeDB && 
+      $RIDXML==$RIDDB && 
+      $LenXML==$LenDB &&
+      $ManXML==$ManDB &&
+      $URLXML==$URLDB) )
+    {
+      echo "\t<td><input type=\"submit\" name=\"ScheduleUpdate\" value=\"update\"></td>\n";
+      $DS_KO++;
+    }
+    else
+    {
+      echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "</td>\n";
+      $DS_OK++;
+    }
+    echo "\t</tr>\n";
+    echo "</form>\n";
+    $Where.= " OR `PSID`='$PSIDXML'";
+  }
 }
 echo "<tr><td colspan=\"6\">status: $DS_KO/$DS_OK nicht Aktuel.</td></tr>\n";
 
 
 //Anzeige von nicht im XML File vorkommende entraege
 if( $Where =="")
-	$SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';";
+  $SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';";
 else
-	$SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';";
-	
+  $SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';";
+  
 $Erg2 = mysql_query($SQL2, $con);
 echo mysql_error($con);
 if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB )
-	for( $i=0; $i<mysql_num_rows( $Erg2); $i++)
-	{
-		echo "\t<tr>\n";
-		$SID  = mysql_result($Erg2, $i, "SID");
-		$Time = mysql_result($Erg2, $i, "DateS");
-		$Len  = mysql_result($Erg2, $i, "Len");
-		if( isset($RoomID[ mysql_result($Erg2, $i, "RID")]))
-			$RID  = $RoomID[ mysql_result($Erg2, $i, "RID")];
-		else
-			$RID  = "RID.". mysql_result($Erg2, $i, "RID");
-		$Man  = mysql_result($Erg2, $i, "Man");
-		echo "\t<td><input name=\"SIDXML\" type=\"text\" value=\"$SID\" size=\"2\" eadonly></td>\n";
-		echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"\" size=\"17\" readonly>\n\t\t".
-			   "<input name=\"DateDB\" type=\"text\" value=\"$Time\" size=\"17\" readonly></td>\n";
-		echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"\" size=\"15\" readonly>\n\t\t".
-			   "<input name=\"RIDDB\" type=\"text\" value=\"$RID\" size=\"15\" readonly></td>\n";
-		echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"\" size=\"1\"readonly>\n\t\t".
-			   "<input name=\"LenDB\" type=\"text\" value=\"$Len\" size=\"1\"readonly></td>\n";
-		echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"\" size=\"40\"readonly>\n\t\t".
-			   "<input name=\"ManDB\" type=\"text\" value=\"$Man\" size=\"40\"readonly></td>\n";
-		echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). 
-				"</td>\n";
-		echo "\t<tr>\n";
-	}
+  for( $i=0; $i<mysql_num_rows( $Erg2); $i++)
+  {
+    echo "\t<tr>\n";
+    $SID  = mysql_result($Erg2, $i, "SID");
+    $Time = mysql_result($Erg2, $i, "DateS");
+    $Len  = mysql_result($Erg2, $i, "Len");
+    if( isset($RoomID[ mysql_result($Erg2, $i, "RID")]))
+      $RID  = $RoomID[ mysql_result($Erg2, $i, "RID")];
+    else
+      $RID  = "RID.". mysql_result($Erg2, $i, "RID");
+    $Man  = mysql_result($Erg2, $i, "Man");
+    echo "\t<td><input name=\"SIDXML\" type=\"text\" value=\"$SID\" size=\"2\" eadonly></td>\n";
+    echo "\t<td><input name=\"DateXML\" type=\"text\" value=\"\" size=\"17\" readonly>\n\t\t".
+         "<input name=\"DateDB\" type=\"text\" value=\"$Time\" size=\"17\" readonly></td>\n";
+    echo "\t<td><input name=\"RIDXML\" type=\"text\" value=\"\" size=\"15\" readonly>\n\t\t".
+         "<input name=\"RIDDB\" type=\"text\" value=\"$RID\" size=\"15\" readonly></td>\n";
+    echo "\t<td><input name=\"LenXML\" type=\"text\" value=\"\" size=\"1\"readonly>\n\t\t".
+         "<input name=\"LenDB\" type=\"text\" value=\"$Len\" size=\"1\"readonly></td>\n";
+    echo "\t<td><input name=\"ManXML\" type=\"text\" value=\"\" size=\"40\"readonly>\n\t\t".
+         "<input name=\"ManDB\" type=\"text\" value=\"$Man\" size=\"40\"readonly></td>\n";
+    echo "\t<td>". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). 
+        "</td>\n";
+    echo "\t<tr>\n";
+  }
 echo "</table>";
 
 
diff --git a/includes/funktionen.php b/includes/funktionen.php
old mode 100755
new mode 100644
index d841e6ec..fb63b708
--- a/includes/funktionen.php
+++ b/includes/funktionen.php
@@ -1,26 +1,23 @@
 <?php
+  /* Schichtverplanung im Adminbereich */
+  function Dsubstr($DateString, $re) {
+    if ($re == 1)
+      return substr($DateString, 0, 2);
+    elseif ($re == 2)
+      return substr($DateString, 3, 2);
+    else
+      return substr($DateString, 6, 4);
+  }
 
-/* Schichtverplanung im Adminbereich */
-function Dsubstr($DateString,$re) {
-  if ($re==1)
-    return substr($DateString, 0, 2);
-  elseif ($re==2)
-    return substr($DateString, 3, 2);
-  else
-    return substr($DateString, 6, 4);
-}
-
-/* Schichtverplanung im Engelbereich */
-
-function engeldate($edate,$m) {
-	if ($m==t)
-    return substr($edate, 8, 2);
-  elseif ($m==m)
-    return substr($edate, 5, 2);
-  elseif ($m==u)
-    return substr($edate, 11, 5);
-  else
-    return substr($edate, 0, 4);
-}
-
+  /* Schichtverplanung im Engelbereich */
+  function engeldate($edate, $m) {
+    if ($m == t)
+      return substr($edate, 8, 2);
+    elseif ($m == m)
+      return substr($edate, 5, 2);
+    elseif ($m == u)
+      return substr($edate, 11, 5);
+    else
+      return substr($edate, 0, 4);
+  }
 ?>
diff --git a/includes/header.php b/includes/header.php
old mode 100755
new mode 100644
index e5d97a0c..3b6a4c23
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,61 +1,57 @@
-<?PHP 
-include ("header_start.php");
+<?php
+include "header_start.php";
 
 echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
 ?>
-<HTML>
-<HEAD>
-<?PHP
-
-echo "<TITLE>--- $title ---</TITLE>\n";
-?>
-<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">
-<script type="text/javascript" src="<?PHP echo $url. $ENGEL_ROOT; ?>/css/grossbild.js"></script>
-<link rel=stylesheet type="text/css" href="<?PHP echo $url. $ENGEL_ROOT; ?>css/style<?PHP
-	if (!IsSet($_SESSION['color'])) 
-		echo "6"; 
-	else 
-		echo $_SESSION['color'];
-	?>.css">
-<?PHP
-if (isset($reload)) 
-{
-	if ($reload=="") 
-	{
-		$reload=3330;
-	}	
-	echo "\n<meta http-equiv=\"refresh\" content=\"".$reload.
-	"; URL=./?reload=".$reload."\">\n";
+<html xmlns="http://www.w3.org/1999/xhtml"> 
+<head>
+
+<title><?php echo $title; ?></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" />
+<script type="text/javascript" src="<?php echo $url . $ENGEL_ROOT; ?>/css/grossbild.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo $url . $ENGEL_ROOT; ?>css/style<?php
+
+  if(!isset($_SESSION['color'])) 
+    echo "6";
+  else
+    echo $_SESSION['color'];
+  ?>.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";
-}
+if(isset($Page["AutoReload"])) 
+  echo "\n<meta http-equiv=\"refresh\" content=\"". $Page["AutoReload"].
+    "; URL=". $url. $ENGEL_ROOT. $Page["Name"]."\">\n";
 
-echo "</HEAD>\n";
+echo "</head>\n";
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////// B O D Y
 /////////////////////////////////////////////////////////////////////////////////////////////
-echo "<BODY>\n";
+echo "<body>\n";
 
-echo "<div name=\"topic\" align=\"center\">\n\n";
+echo "<div align=\"center\">\n\n";
 
 if( isset($_SESSION['color']) && ($_SESSION['color']==6) )
 {
-	echo 	"\t<a name=\"#top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel_w.png\" alt=\"Unser Himmel\"></a>\n";
+  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel_w.png\" alt=\"Unser Himmel\" /></a>\n";
 }
 else
 {
-	echo 	"\t<a name=\"#top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel.png\" alt=\"Unser Himmel\"></a>\n";
+  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel.png\" alt=\"Unser Himmel\" /></a>\n";
 }
 echo "</div>\n\n";
 
@@ -65,73 +61,65 @@ if( isset($_SESSION['CVS']["nonpublic/messages.php"]))
 {
     if( $_SESSION['CVS']["nonpublic/messages.php"] == "Y")
     {
-	$SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'";
-	$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>";
+  $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 />";
     }
 }
 ?>
 <table width="95%" align="center" border="0" cellpadding="7" cellspacing="0">
-	<tr>
-<?PHP
+  <tr>
+<?php
 //ausgaeb Menu
-if( !isset($_SESSION['Menu']))		$_SESSION['Menu'] = "L";
-if( $_SESSION['Menu'] =="L")		include("menu.php");
+if( !isset($_SESSION['Menu']))    $_SESSION['Menu'] = "L";
+if( $_SESSION['Menu'] =="L")    include("menu.php");
 ?>
 
-		<td valign="top" align="center">
+    <td valign="top" align="center">
 <table border="0" width="100%" align="center" class="border" cellpadding="5" cellspacing="1">
-	<tr class="contenttopic">
-		<td>
-<?PHP
-		echo "\t<a name=\"#$header\" class=\"contenttopic\">";
-		if( strlen( $header) == 0 )
-			echo "\n\t<b>". Get_Text($Page["Name"]). "</b></a>\n";
-		else
-			echo "\n\t<b>$header</b></a>\n";
+  <tr class="contenttopic">
+    <td>
+<?php
+    echo "<a name=\"" . $header . "\" class=\"contenttopic\">";
+    if( strlen( $header) == 0 )
+      echo "\n<b>". Get_Text($Page["Name"]). "</b></a>\n";
+    else
+      echo "\n<b>$header</b></a>\n";
 
 ?>
-		</td>
-	</tr>
-	<tr class="content">
-	 	<td>
-<br>
+    </td>
+  </tr>
+  <tr class="content">
+     <td>
+<br />
 <?php 
-echo "\n\n\n";
- 
-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(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"];
 }
 
-
-if ( $Page["CVS"] != "Y" ) 
-{
-        echo "Du besitzt kein Rechte für diesen Bereich.<br>\n";
-        If (IsSet($_SESSION['oldurl'])) 
-		echo "<a href=\"". $_SESSION["oldurl"]. "\">".Get_Text("back")."</a> geht's zur&uuml;ck...\n";
-	else
-		echo "<a href=\"". $url. $ENGEL_ROOT. "\">".Get_Text("back")."</a> geht's zur&uuml;ck...\n";
-        exit ();
+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";
 
-<!-- ende des header parts //-->
-
+  if(isset($_SESSION['oldurl']))
+    echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+  else
+    echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
 
+  exit ();
+}
+?>
 
+<!-- ende des header parts //-->
diff --git a/includes/header_start.php b/includes/header_start.php
old mode 100755
new mode 100644
index 997fa94e..97b98fc3
--- a/includes/header_start.php
+++ b/includes/header_start.php
@@ -1,50 +1,40 @@
-<?PHP 
-ini_set( "session.gc_maxlifetime", "65535");
-
-include ("config.php");
-include ("error_handler.php");
-include ("config_db.php");
-include ("funktion_lang.php");
-include ("funktion_faq.php"); //für noAnswer() im menu
-include ("funktion_menu.php");
-include ("funktion_user.php");
-
-
-if( isset($SystemDisableMessage) && ( strlen($SystemDisableMessage)>0) )
-{
-	echo "<HTML>\n".
-		"<BODY>\n". $SystemDisableMessage. "\n<BODY>\n".
-		"</HTML>";
-	die();
-}
-
-if( !isset($_SESSION)) 
-{
-	session_start(); 
-}
-include ("secure.php");
-
-if( !isset($_SESSION['IP'])) 
-{
-	$_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
-}
-
-if (IsSet($_SESSION['UID']) and ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR']))
-{
-	session_destroy ();
-	header("Location: $url". $ENGEL_ROOT );
-}
-
-include ("UserCVS.php");
-
-
-//UPdate LASTlogin
-if( isset($_SESSION['UID']))
-{
-	$SQLlastLogIn = "UPDATE `User` SET ".
-			"`lastLogIn` = '". gmdate("Y-m-j H:i:s", time()). "'".
-			" WHERE `UID` = '". $_SESSION['UID']. "' LIMIT 1;";
-	mysql_query ($SQLlastLogIn, $con);
-}								  
-
+<?php
+  ini_set("session.gc_maxlifetime", "65535");
+
+  include "config.php";
+  include "error_handler.php";
+  include "config_db.php";
+  include "funktion_lang.php";
+  include "funktion_faq.php"; // fuer noAnswer() im menu
+  include "funktion_menu.php";
+  include "funktion_user.php";
+
+  if(isset($SystemDisableMessage) && (strlen($SystemDisableMessage) > 0)) {
+    echo "<html><head><title>" . $SystemDisableMessage . "</title></head>";
+    echo "<body>" . $SystemDisableMessage . "</body></html>\n";
+    die();
+  }
+
+  if(!isset($_SESSION))
+    session_start();
+
+  include "secure.php";
+
+  if(!isset($_SESSION['IP']))
+    $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
+
+  if(isset($_SESSION['UID']) && ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR'])) {
+    session_destroy ();
+    header("Location: " . $url . $ENGEL_ROOT);
+  }
+
+  include "UserCVS.php";
+
+  // update LASTlogin
+  if(isset($_SESSION['UID'])) {
+    $SQLlastLogIn = "UPDATE `User` SET " .
+      "`lastLogIn` = '" . gmdate("Y-m-j H:i:s", time()) . "'" . 
+      " WHERE `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;";
+    mysql_query ($SQLlastLogIn, $con);
+  }
 ?>
diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php
old mode 100755
new mode 100644
index bed1a2fd..e68639cf
--- a/includes/login_eingabefeld.php
+++ b/includes/login_eingabefeld.php
@@ -1,18 +1,17 @@
-<?PHP
-include ("config.php");
-
-echo "<form action=\"". $url. $ENGEL_ROOT. "nonpublic/index.php\" method=\"post\">";
-echo "<table>\n".
-	"\t<tr>".
-	"\t\t<td align=\"right\">". Get_Text("index_lang_nick"). "</td>".
-	"\t\t<td><input type=\"text\" name=\"user\" size=\"23\"></td>".
-	"\t</tr>".
-	"\t<tr>".
-	"\t\t<td align=\"right\">". Get_Text("index_lang_pass"). "</td>".
-	"\t\t<td><input type=\"password\" name=\"password\" size=\"23\"></td>".
-	"\t</tr>".
-	"</table>".
-	"<br><input type=\"submit\" value=\"". Get_Text("index_lang_send"). "\">";
-echo "</form>";
-
+<?php
+  include "config.php";
+?>
 
+<form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post">
+<table>
+  <tr>
+  <td align="right"><?php echo Get_Text("index_lang_nick"); ?></td>
+  <td><input type="text" name="user" size="23" /></td>
+  </tr>
+  <tr>
+  <td align="right"><?php echo Get_Text("index_lang_pass"); ?></td>
+  <td><input type="password" name="password" size="23"></td>
+  </tr>
+  </table>
+  <br /><input type="submit" value="<?php echo Get_Text("index_lang_send"); ?>">
+</form>
diff --git a/includes/menu.php b/includes/menu.php
old mode 100755
new mode 100644
index 6133b856..799e6c75
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -1,30 +1,30 @@
 
 <!-- anfang des menue parts //-->
-	<td width="160"  valign="top">
-<?PHP
+  <td width="160"  valign="top">
+<?php
 $MenueTableStart="
 <table align=\"center\" class=\"border\" cellpadding=\"3\" cellspacing=\"1\">
-	<tr> 
-		<td width=\"160\" class=\"menu\">
+  <tr> 
+    <td width=\"160\" class=\"menu\">
 ";
-$MenueTableEnd="
-				<br>
-		</td>
-	</tr>
-</table><br>
+$MenueTableEnd="</ul>
+        <br />
+    </td>
+  </tr>
+</table><br />
 ";
 
 ShowMenu("");
 ShowMenu("nonpublic");
 ShowMenu("admin");
 
-if( !isset($submenus))
-	$submenus = 0;
+if(!isset($submenus))
+  $submenus = 0;
 
-if ($submenus >= 1 ) {
-  $inc_name=$_SERVER['PHP_SELF'];
-  $filenamepos=strrpos($inc_name, '/');
-  $filenamepos+=1;
+if ($submenus >= 1) {
+  $inc_name = $_SERVER['PHP_SELF'];
+  $filenamepos = strrpos($inc_name, '/');
+  $filenamepos += 1;
   $filename = substr ($inc_name, $filenamepos );
   $filepost = substr ($filename, 0, -4);
   $filepre = substr ($filename, -4 );
@@ -33,15 +33,15 @@ if ($submenus >= 1 ) {
   for ($index_nummer=1; $index_nummer <= $submenus; $index_nummer++) {
 ?>
 <table align="center" class="border" cellpadding="3" cellspacing="1">
-	<tr>
-		<td width="160" class="menu"> 
-		<?php include ("./".$filepost.".".$index_nummer.$filepre); ?>
-		</td>
-	</tr>
+  <tr>
+    <td width="160" class="menu"> 
+    <?php include ("./".$filepost.".".$index_nummer.$filepre); ?>
+    </td>
+  </tr>
 </table>
 
-<br>
-<?PHP
+<br />
+<?php
     }
 }
 
@@ -49,15 +49,15 @@ if( isset($_SESSION['UID']))
 {
 ?>
 <table align="center" class="border" cellpadding="3" cellspacing="1">
-	<tr>
-		<td width="160" class="menu">
-		<?php include("funktion_activeUser.php"); ?>
-		</td>
-	</tr>
+  <tr>
+    <td width="160" class="menu">
+    <?php include("funktion_activeUser.php"); ?>
+    </td>
+  </tr>
 </table>
-<?PHP
+<?php
 }
 ?>
-		</td> 
+    </td> 
 
 <!-- ende des menue parts //-->
diff --git a/includes/secure.php b/includes/secure.php
old mode 100755
new mode 100644
index d6b5c512..1d1a9e46
--- a/includes/secure.php
+++ b/includes/secure.php
@@ -1,41 +1,25 @@
 <?php
-//soll dein funktion entahlten die alle übergebenen parameter überprüft
-//'`'" 
+  if($debug)
+    echo "secure.php START<br />\n";
 
-if( $DEBUG)
-	echo "secure.php START<br>\n";
+  foreach ($_GET as $k => $v) {
+    $v = htmlentities($v, ENT_QUOTES);
+    preg_replace('/([\'"`\'])/', '', $v);
+    $_GET[$k] = $v;
 
-foreach ($_GET as $k => $v) 
-{	
-//  	$v = htmlspecialchars($v, ENT_QUOTES);
-//	$v = mysql_escape_string($v);
-	$v = htmlentities($v, ENT_QUOTES);
-	if (preg_match('/([\'"`\'])/', $v, $match)) 
-	{
-		print "sorry get has illegal char '$match[1]'";
-		exit;
-	}
-	$_GET[$k] = $v;
-
-	if( $DEBUG)
-		echo "GET $k=\"$v\"<br>";
-}
+    if($debug)
+      echo "GET $k=\"$v\"<br />";
+  }
+  
+  foreach ($_POST as $k => $v) {
+    $v = htmlentities($v, ENT_QUOTES);
+    preg_replace('/([\'"`\'])/', '', $v);
+    $_POST[$k] = $v;
   
-foreach ($_POST as $k => $v) 
-{
-//  	$v = htmlspecialchars($v, ENT_QUOTES);
-//	$v = mysql_escape_string($v);
-	$v = htmlentities($v, ENT_QUOTES);
-	if (preg_match('/([\'"`\'])/', $v, $match)) {
-		print "sorry post has illegal char '$match[1]'";
-		exit;
-	}
-	$_POST[$k] = $v;
-	
-	if( $DEBUG)
-		echo "POST $k=\"$v\"<br>";
-}
-if( $DEBUG)
-	echo "secure.php END<br>\n";
+    if($debug)
+      echo "POST $k=\"$v\"<br />";
+  }
 
+  if($debug)
+    echo "secure.php END<br />\n";
 ?>
diff --git a/services/cron_dect.php b/services/cron_dect.php
index b5e338c6..57d12e0f 100755
--- a/services/cron_dect.php
+++ b/services/cron_dect.php
@@ -1,61 +1,51 @@
-<?PHP
-
-include ("../includes/config.php");
-include ("../includes/config_IAX.php");
-include ("../includes/config_db.php");
-include ("../includes/error_handler.php");
-include ("../includes/funktion_modem.php");
-include ("../includes/funktion_cron.php");
-
-
-//ausfuerungs Ruetmuss (in s)
-$StartTimeBeforEvent = (60/4)*60; 
-$AnrufDelay = -5;
-$DebugDECT = FALSE;
-#$DebugDECT = TRUE;
-
-//Timeout erhöhen;
-set_time_limit(50000); 
-
-//SQL zusammensetzen
-$SQL =  "SELECT Shifts.DateS, Shifts.RID, ShiftEntry.UID, ShiftEntry.TID ".
-	"FROM `Shifts` INNER JOIN `ShiftEntry` ON `Shifts`.`SID` = `ShiftEntry`.`SID` ";
-if( $DebugDECT)
-	$SQL .= "WHERE (Shifts.DateS>'2007-07-09 09:45:00' AND ".
-		"Shifts.DateS<='2007-07-09 11:00:00');";
-else
-	$SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ".
-		"(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );";
-
-$Erg = mysql_query($SQL, $con);
-echo mysql_error($con);
-
-$Z=0;
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
-{  
-   if( mysql_result($Erg, $i, "UID")>0)
-   {
-	$DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID"));
-	if( $DECTnumber!="")
-	{
-		echo "dial $DECTnumber\n";
-		DialNumberIAX( $DECTnumber,
-		               mysql_result($Erg, $i, "DateS"),
-		               mysql_result($Erg, $i, "RID"),
-			       mysql_result($Erg, $i, "TID"));
-		DialNumberModem( $DECTnumber,
-		                 mysql_result($Erg, $i, "DateS"));
-		if( $Z++>10)
-		{
-			$Z=0;
-			sleep(30);
-		}
-	}
+<?php
+  include "../includes/config.php";
+  include "../includes/config_IAX.php";
+  include "../includes/config_db.php";
+  include "../includes/error_handler.php";
+  include "../includes/funktion_modem.php";
+  include "../includes/funktion_cron.php";
+
+  // ausfuerungs Ruetmuss (in s)
+  $StartTimeBeforEvent = (60 / 4) * 60;
+  $AnrufDelay = -5;
+  $DebugDECT = false;
+
+  // Timeout erhoehen
+  set_time_limit(50000);
+
+  // SQL zusammensetzen
+  $SQL = "SELECT Shifts.DateS, Shifts.RID, ShiftEntry.UID, ShiftEntry.TID ".
+         "FROM `Shifts` INNER JOIN `ShiftEntry` ON `Shifts`.`SID` = `ShiftEntry`.`SID` ";
+
+  if($DebugDECT)
+    $SQL .= "WHERE (Shifts.DateS>'2007-07-09 09:45:00' AND ".
+            "Shifts.DateS<='2007-07-09 11:00:00');";
+  else
+    $SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ".
+    "(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );";
+
+  $Erg = mysql_query($SQL, $con);
+  echo mysql_error($con);
+
+  $Z = 0;
+
+  for($i = 0; $i < mysql_num_rows($Erg); $i++) {
+    if(mysql_result($Erg, $i, "UID") > 0) {
+      $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID"));
+
+      if($DECTnumber != "") {
+        echo "dial $DECTnumber\n";
+        DialNumberIAX( $DECTnumber, mysql_result($Erg, $i, "DateS"), mysql_result($Erg, $i, "RID"), mysql_result($Erg, $i, "TID"));
+        DialNumberModem( $DECTnumber, mysql_result($Erg, $i, "DateS"));
+
+        if($Z++ > 10) {
+          $Z = 0;
+          sleep(30);
+        }
+      }
+    }
   }
-}
-
-return 0;
-
 
+  return 0;
 ?>
-
diff --git a/services/dect_clear.php b/services/dect_clear.php
index 713cce36..b49b1e40 100755
--- a/services/dect_clear.php
+++ b/services/dect_clear.php
@@ -1,25 +1,19 @@
-<?PHP
-// löscht alle eintrag in der telefonanlage, indem jede nummer einzähln gelöscht wir (#10<NUMBER>)
+<?php
+  include "../includes/db.php";
+  include "../includes/config.php";
+  include "../includes/funktion_modem.php";
 
-include ("../includes/db.php");
-include ("../includes/config.php");
-include ("../includes/funktion_modem.php");
+  $SQL = "SELECT DECT FROM `User`;";
+  $Erg = mysql_query($SQL, $con);
 
+  echo mysql_error($con);
 
-$SQL =  "SELECT DECT FROM `User`;";
+  for($i=0; $i < mysql_num_rows($Erg); $i++) {
+    $Number = "#10" . mysql_result($Erg, $i, "DECT");
 
-$Erg = mysql_query($SQL, $con);
-
-echo mysql_error($con);
-
-for( $i=0; $i<mysql_num_rows($Erg); $i++)
-{ 
- 	$Number = "#10". mysql_result($Erg, $i, "DECT");
-	if( strlen($Number)==7)
-		DialNumber(  $Number);
-}
-
-return 0;
+    if(strlen($Number) == 7)
+      DialNumber($Number);
+  }
 
+  return 0;
 ?>
-
diff --git a/services/jabberserver.php b/services/jabberserver.php
index 8a80b35c..94ef3a8b 100755
--- a/services/jabberserver.php
+++ b/services/jabberserver.php
@@ -1,113 +1,75 @@
-<?php
-
-/****************************************************************************************************/
-//					INCLUDE
-/****************************************************************************************************/
-require_once('../includes/config_jabber.php');
-require_once("../includes/funktion_jabber.php");
-include("../includes/config_MessegeServer.php");
-
-// Set time limit to indefinite execution
-set_time_limit( 0 );
-
-/****************************************************************************************************/
-//					show MODE
-/****************************************************************************************************/
-if( DEBUG)
-	echo "DEBUG mode is enable\n\tjabber is disable\n\n";
-
-/****************************************************************************************************/
-//					INIT jabber
-/****************************************************************************************************/
-if( !DEBUG)
-{
-	echo "INIT jabber\n";
-	$jabber = new Jabber($server, $port, $username, $password, $resource);
-	if ( !($jabber->Connect() && $jabber->SendAuth())) 
-		die("Couldn't connect to Jabber Server.");
-}
-
-
-/****************************************************************************************************/
-//					INIT socked
-/****************************************************************************************************/
-echo "INIT socked\n";
-	//http://de3.php.net/manual/de/function.socket-listen.php
-// Create a UDP socket
-$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked ('.socket_strerror(socket_last_error()). ')');
-// Bind the socket to an address/port
-socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address ('.socket_strerror(socket_last_error()). ')');
-// Setzt Nonbock Mode
-socket_set_nonblock($sock);
-
-
-/****************************************************************************************************/
-//					Loop continuos
-/****************************************************************************************************/
-$RUNNING = TRUE;
-while( $RUNNING )
-{
-	if( @socket_recvfrom($sock, $data, 65535, 0, $ip, $port))
-	{
-		//daten empfangen
-		$data = substr($data,0, strlen($data)-1); //ENTER entfernen
-		echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n";
-		PackedAnalyser( $data);
-	}
-
-	usleep(100000); // 100ms delay keeps the doctor away
-} // end while
-	
-//disconnect jabber	
-if( !DEBUG)
-	$jabber->Disconnect();
-
-// Close the master sockets
-socket_close($sock); 
-	
-/****************************************************************************************************/
-/****************************************** MAIN END ************************************************/
-/****************************************************************************************************/
-
-
-/****************************************************************************************************/
-//***** function PackedAnalyser
-/****************************************************************************************************/
-function PackedAnalyser( $data )
-{
-	GLOBAL $jabber, $RUNNING;
-	// init array
-	$matches = array();
-
-	//#message
-	if( preg_match( "/^#(message) ([^ ]+) (.+)/i", $data, $matches ) )
-	{
-		if( $matches[2]=="" || $matches[3]=="")
-		{
-			// Wrong syntax
-			echo "\t\t\t\t#messaage parameter fail\n";
-		}
-		else
-		{
-			// Whisper
-			if( !DEBUG)
-				$jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL);
-			else	
-				echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n";
-		}
-	}
-	elseif( preg_match( "/^#quit/i", $data, $matches ) )
-	{
-		if( DEBUG)
-		{
-			echo "\t\t\t\tSystem Shutdown\n\n";
-			$RUNNING = FALSE;
-		}
-	}
-	else
-	{
-		echo "\t\t\t\tcommand not found\n\n";
-	}
-}
-
-?>
+<?php
+  require_once "../includes/config_jabber.php";
+  require_once "../includes/funktion_jabber.php";
+  include "../includes/config_MessegeServer.php";
+
+  // Set time limit to indefinite execution
+  set_time_limit(0);
+
+  if(DEBUG)
+    echo "DEBUG mode is enable\n\tjabber is disable\n\n";
+
+  if(!DEBUG) {
+    echo "INIT jabber\n";
+    $jabber = new Jabber($server, $port, $username, $password, $resource);
+
+    if(!($jabber->Connect() && $jabber->SendAuth())) 
+      die("Couldn't connect to Jabber Server.");
+  }
+
+  echo "INIT socked\n";
+
+  // Create a UDP socket
+  $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked (' . socket_strerror(socket_last_error()) . ')');
+
+  // Bind the socket to an address/port
+  socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address (' . socket_strerror(socket_last_error()) . ')');
+
+  // Setzt Nonbock Mode
+  socket_set_nonblock($sock);
+
+  $RUNNING = true;
+
+  while($RUNNING) {
+    if(@socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) {
+      // daten empfangen
+      $data = substr($data, 0, strlen($data)-1); //ENTER entfernen
+      echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n";
+      PackedAnalyser( $data);
+    }
+
+    usleep(100000); // 100ms delay keeps the doctor away
+  } // end while
+  
+  // disconnect jabber  
+  if(!DEBUG)
+    $jabber->Disconnect();
+
+  // Close the master sockets
+  socket_close($sock); 
+  
+  function PackedAnalyser($data) {
+    global $jabber, $RUNNING;
+    // init array
+    $matches = array();
+
+    //#message
+    if(preg_match("/^#(message) ([^ ]+) (.+)/i", $data, $matches)) {
+      if($matches[2]=="" || $matches[3]=="")
+        echo "\t\t\t\t#messaage parameter fail\n";
+      else {
+        // Whisper
+        if(!DEBUG)
+          $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL);
+        else  
+          echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n";
+      }
+    } elseif(preg_match("/^#quit/i", $data, $matches)) {
+      if(DEBUG) {
+        echo "\t\t\t\tSystem Shutdown\n\n";
+        $RUNNING = false;
+      }
+    } else
+      echo "\t\t\t\tcommand not found\n\n";
+  }
+?>
diff --git a/txt/LICENSE b/txt/LICENSE
old mode 100755
new mode 100644
diff --git a/txt/README b/txt/README
index d516369a..4d8ca9bb 100644
--- a/txt/README
+++ b/txt/README
@@ -3,9 +3,9 @@ DIRS:
 ./DB
 	Standart DB File
 ./www
-	daten für http verbindung
+	daten fuer http verbindung
 ./www-ssl
-	daten für https verbindung
+	daten fuer https verbindung
 
 Anfordeungen:
 -------------
diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php
index 793b5546..b6e95897 100644
--- a/www-ssl/ShowUserPicture.php
+++ b/www-ssl/ShowUserPicture.php
@@ -1,58 +1,51 @@
-<?PHP
-
-include ("../../camp2011/includes/config.php");
-include ("../../camp2011/includes/error_handler.php");
-include ("../../camp2011/includes/config_db.php");
-if( !isset($_SESSION))	session_start();
-include ("../../camp2011/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)
-{
-	//genügend 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");
-}
+<?php
+  include "../../camp2011/includes/config.php";
+  include "../../camp2011/includes/error_handler.php";
+  include "../../camp2011/includes/config_db.php";
 
+  if(!isset($_SESSION))
+    session_start();
+
+  include "../../camp2011/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/admin/EngelType.php b/www-ssl/admin/EngelType.php
old mode 100755
new mode 100644
index 6d640ae4..1aec80dc
--- a/www-ssl/admin/EngelType.php
+++ b/www-ssl/admin/EngelType.php
@@ -6,42 +6,42 @@ include("../../../camp2011/includes/funktion_db.php");
 
 function runSQL( $SQL)
 {
-	global $con;
-	// hier muesste das SQL ausgefuehrt werden...
-	$Erg = mysql_query($SQL, $con);
-	if ($Erg) 
-	{
-		echo "&Auml;nderung wurde gesichert...<br>";
-		echo "[$SQL]<br>"; 
-		return 1;
-	} 
-	else 
-	{
-		echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-		echo "<br><br>".mysql_error( $con ). "<br>";
-		echo "[$SQL]<br>"; 
-		return 0;
-	}
+  global $con;
+  // hier muesste das SQL ausgefuehrt werden...
+  $Erg = mysql_query($SQL, $con);
+  if ($Erg) 
+  {
+    echo "&Auml;nderung wurde gesichert...<br />";
+    echo "[$SQL]<br />"; 
+    return 1;
+  } 
+  else 
+  {
+    echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+    echo "<br /><br />".mysql_error( $con ). "<br />";
+    echo "[$SQL]<br />"; 
+    return 0;
+  }
 }
 
 function runSQL_log( $SQL, $commed)
 {
-	global $con;
-	// hier muesste das SQL ausgefuehrt werden...
-	$Erg = db_query($SQL, $commed);
-	if ($Erg) 
-	{
-		echo "&Auml;nderung wurde gesichert...<br>";
-		echo "[$SQL]<br>"; 
-		return 1;
-	} 
-	else 
-	{
-		echo "Fehler beim speichern... bitte noch ein mal probieren :)";
-		echo "<br><br>".mysql_error( $con ). "<br>";
-		echo "[$SQL]<br>"; 
-		return 0;
-	}
+  global $con;
+  // hier muesste das SQL ausgefuehrt werden...
+  $Erg = db_query($SQL, $commed);
+  if ($Erg) 
+  {
+    echo "&Auml;nderung wurde gesichert...<br />";
+    echo "[$SQL]<br />"; 
+    return 1;
+  } 
+  else 
+  {
+    echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+    echo "<br /><br />".mysql_error( $con ). "<br />";
+    echo "[$SQL]<br />"; 
+    return 0;
+  }
 }
 
 
@@ -51,33 +51,33 @@ $Erg = mysql_query($Sql, $con);
 
 if( !IsSet($_GET["action"]) )
 {
-	echo "Hallo ".$_SESSION['Nick'].
-		",<br>\nhier hast du die M&ouml;glichkeit, neue Engeltypen f&uuml;r die Schichtpl&auml;ne einzutragen ".
-		"oder vorhandene abzu&auml;ndern:<br><br>\n";
-
-	echo "<a href=\"./EngelType.php?action=new\">- Neuen EngelType eintragen</a><br>\n";
-	
-	echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<tr class=\"contenttopic\">\n";
-
-	for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
-	{
-		echo "\t<td>". mysql_field_name($Erg, $i). "</td>";
-	}
-	echo "\t<td>&Auml;ndern</td>";
-	echo "</tr>";
-
-	for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-	{	
-		echo "\t<tr class=\"content\">\n";
-		for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
-		{
-  			echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
-		}
-		echo "\t\t<td><a href=\"./EngelType.php?action=change&TID=".mysql_result($Erg, $t, "TID")."\">###</a></td>\n";
-		echo "\t</tr>\n";
-	} // ende Auflistung Raeume
-	echo "</table>";
+  echo "Hallo ".$_SESSION['Nick'].
+    ",<br />\nhier hast du die M&ouml;glichkeit, neue Engeltypen f&uuml;r die Schichtpl&auml;ne einzutragen ".
+    "oder vorhandene abzu&auml;ndern:<br /><br />\n";
+
+  echo "<a href=\"./EngelType.php?action=new\">- Neuen EngelType eintragen</a><br />\n";
+  
+  echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  echo "<tr class=\"contenttopic\">\n";
+
+  for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
+  {
+    echo "\t<td>". mysql_field_name($Erg, $i). "</td>";
+  }
+  echo "\t<td>&Auml;ndern</td>";
+  echo "</tr>";
+
+  for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
+  {  
+    echo "\t<tr class=\"content\">\n";
+    for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
+    {
+        echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
+    }
+    echo "\t\t<td><a href=\"./EngelType.php?action=change&TID=".mysql_result($Erg, $t, "TID")."\">###</a></td>\n";
+    echo "\t</tr>\n";
+  } // ende Auflistung Raeume
+  echo "</table>";
 } 
 else 
 {
@@ -85,105 +85,105 @@ else
 switch ($_GET["action"]) {
 
 case 'new':
-	echo "Neuen EngelType einrichten: <br>";
-	echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
-	echo "<table>\n";
-	
-	for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
-	{
-	    echo "<td>".mysql_field_name($Erg, $Uj)."</td>".
-	         "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\"></td></tr>\n";
-				                 }
-	echo "</table>\n";
-	echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
-	echo "<input type=\"submit\" value=\"sichern...\">\n";
-	echo "</form>";
-	break;
+  echo "Neuen EngelType einrichten: <br />";
+  echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
+  echo "<table>\n";
+  
+  for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
+  {
+      echo "<td>".mysql_field_name($Erg, $Uj)."</td>".
+           "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\"></td></tr>\n";
+                         }
+  echo "</table>\n";
+  echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
+  echo "<input type=\"submit\" value=\"sichern...\">\n";
+  echo "</form>";
+  break;
 
 case 'newsave':
-	$vars = $_GET;
-	$count = count($vars) - 1;
-	$vars = array_splice($vars, 0, $count);
-	$Keys="";
-	$Values="";
-	foreach($vars as $key => $value){
-		$Keys   .= ", `$key`";
-		$Values .= ", '$value'";
-	}
-	
-	if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", 
-			"save new EngelType") )
-	{
-		SetHeaderGo2Back();
-		
-		$SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'";
-		$ERG = mysql_query($SQL2, $con);
-	
-		if( mysql_num_rows($ERG) == 1)
-			runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). 
-				     "` INT DEFAULT '0' NOT NULL;",
-				    "add new EngelType in Romm Table");
-	}
-	break;
+  $vars = $_GET;
+  $count = count($vars) - 1;
+  $vars = array_splice($vars, 0, $count);
+  $Keys="";
+  $Values="";
+  foreach($vars as $key => $value){
+    $Keys   .= ", `$key`";
+    $Values .= ", '$value'";
+  }
+  
+  if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", 
+      "save new EngelType") )
+  {
+    SetHeaderGo2Back();
+    
+    $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'";
+    $ERG = mysql_query($SQL2, $con);
+  
+    if( mysql_num_rows($ERG) == 1)
+      runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). 
+             "` INT DEFAULT '0' NOT NULL;",
+            "add new EngelType in Romm Table");
+  }
+  break;
 
 case 'change':
-	if (! IsSet($_GET["TID"])) 
-		echo "Fehlerhafter Aufruf!"; 
-	else
-	{
-		echo "Raum ab&auml;ndern:\n";
-		echo "Hier kannst du eintragen, den EngelType &auml;ndern.";
-		echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
-		echo "<table>\n";
-	
-		$SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'";
-		$ERG = mysql_query($SQL2, $con);
+  if (! IsSet($_GET["TID"])) 
+    echo "Fehlerhafter Aufruf!"; 
+  else
+  {
+    echo "Raum ab&auml;ndern:\n";
+    echo "Hier kannst du eintragen, den EngelType &auml;ndern.";
+    echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
+    echo "<table>\n";
+  
+    $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'";
+    $ERG = mysql_query($SQL2, $con);
         
-	        for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
-			echo "<tr><td>". mysql_field_name($ERG, $Uj). "</td>".
-		     		"<td><input type=\"text\" size=\"40\" name=\"e". mysql_field_name($ERG, $Uj). "\" ".
-		     		"value=\"". mysql_result($ERG, 0, $Uj). "\"></td></tr>\n";
-
-		echo "</table>\n";
-		echo "<input type=\"hidden\" name=\"eTID\" value=\"". $_GET["TID"]. "\">\n";
-		echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
-		echo "<input type=\"submit\" value=\"sichern...\">\n";
-		echo "</form>";
-	        echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
-	        echo "<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n";
-	        echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
-	        echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
-	        echo "</form>";
-	}
-	break;
-	
+          for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
+      echo "<tr><td>". mysql_field_name($ERG, $Uj). "</td>".
+             "<td><input type=\"text\" size=\"40\" name=\"e". mysql_field_name($ERG, $Uj). "\" ".
+             "value=\"". mysql_result($ERG, 0, $Uj). "\"></td></tr>\n";
+
+    echo "</table>\n";
+    echo "<input type=\"hidden\" name=\"eTID\" value=\"". $_GET["TID"]. "\">\n";
+    echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
+    echo "<input type=\"submit\" value=\"sichern...\">\n";
+    echo "</form>";
+          echo "<form action=\"./EngelType.php\" method=\"GET\">\n";
+          echo "<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n";
+          echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
+          echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
+          echo "</form>";
+  }
+  break;
+  
 case 'changesave':
         $vars = $_GET;
         $count = count($vars) - 2;
         $vars = array_splice($vars, 0, $count);
-	$keys="";
-	$sql="";
+  $keys="";
+  $sql="";
         foreach($vars as $key => $value)
-	{
-  	      $keys = substr( $key, 1);
-	      $sql .= ", `". $keys. "`='". $value. "'";
+  {
+          $keys = substr( $key, 1);
+        $sql .= ", `". $keys. "`='". $value. "'";
         }
-	runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", 
-		    "Save Change EngelType");
-	SetHeaderGo2Back();
-	break;
+  runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", 
+        "Save Change EngelType");
+  SetHeaderGo2Back();
+  break;
 
 case 'delete':
-	if (IsSet($_GET["TID"])) 
-	{
-		if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType"))
-			runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", 
-					"delete EngelType in Room Table");
-	}
-	else
-		echo "Fehlerhafter Aufruf";
-	SetHeaderGo2Back();
-	break;
+  if (IsSet($_GET["TID"])) 
+  {
+    if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType"))
+      runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", 
+          "delete EngelType in Room Table");
+  }
+  else
+    echo "Fehlerhafter Aufruf";
+  SetHeaderGo2Back();
+  break;
 }
 }
 
diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php
old mode 100755
new mode 100644
index 38c659dd..6bb8f59d
--- a/www-ssl/admin/Recentchanges.php
+++ b/www-ssl/admin/Recentchanges.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "ChangeLog";
 $header = "Datenbank-Auszug";
@@ -14,12 +14,12 @@ echo "<tr>\n\t<th>Time</th>\n\t<th>User</th>\n\t<th>Commend</th>\n\t<th>SQL Comm
 
 for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
 {
-	echo "<tr>\n";
-	echo "\t<td>". mysql_result( $Erg, $n, "Time"). "</td>\n";
-	echo "\t<td>". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "</td>\n";
-	echo "\t<td>". mysql_result( $Erg, $n, "Commend"). "</td>\n";
-	echo "\t<td>". mysql_result( $Erg, $n, "SQLCommad"). "</td>\n";
-	echo "</tr>\n";
+  echo "<tr>\n";
+  echo "\t<td>". mysql_result( $Erg, $n, "Time"). "</td>\n";
+  echo "\t<td>". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "</td>\n";
+  echo "\t<td>". mysql_result( $Erg, $n, "Commend"). "</td>\n";
+  echo "\t<td>". mysql_result( $Erg, $n, "SQLCommad"). "</td>\n";
+  echo "</tr>\n";
 }
 
 echo "</table>\n";
diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php
old mode 100755
new mode 100644
index 93e75bf1..00716329
--- a/www-ssl/admin/UserPicture.php
+++ b/www-ssl/admin/UserPicture.php
@@ -7,114 +7,114 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
 
 if( IsSet($_GET["action"]) )
 {
-	UnSet($SQL);
+  UnSet($SQL);
 
-	switch ($_GET["action"]) 
-	{
-		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"])));
+  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']. "'";
+          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;
+                        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
+    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";
+  // 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 "Hallo ". $_SESSION['Nick']. ",<br />\nhier hast du die M&ouml;glichkeit, die Bilder der Engel freizugeben:<br /><br />\n";
 
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
 echo "<tr class=\"contenttopic\">\n";
@@ -125,25 +125,25 @@ echo "\t<td>L&ouml;schen</td>\n";
 echo "</tr>";
 
 for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-{	
-	$UIDs = mysql_result($Erg, $t, "UID");
-	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";
+{  
+  $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";
+echo "<br /><a href=\"./UserPicture.php?action=FormUpload\">picture upload</a>\n";
 
 include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php
old mode 100755
new mode 100644
index f5e8c9c3..68199cfa
--- a/www-ssl/admin/aktiv.php
+++ b/www-ssl/admin/aktiv.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "akive Engel";
 $header = "Liste der aktiven Engel";
@@ -6,38 +6,38 @@ include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "<form action=\"./aktiv.php\" method=\"post\">";
-echo Get_Text("pub_aktive_Text1")."<br>\n";
-echo Get_Text("pub_aktive_Text2")."<br><br>\n";
-	
+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 "\t<option value=\"$i\">$i</option>\n";
 echo "</select>";
-echo Get_Text("pub_aktive_Text32")."<br><br>\n";
+echo Get_Text("pub_aktive_Text32")."<br /><br />\n";
 echo "<input type=\"submit\" name=\"SendType\" value=\"Show..\">\n";
 echo "<input type=\"submit\" name=\"SendType\" value=\"Write..\">\n";
 echo "</form>\n";
 
 echo "<form action=\"./aktiv.php\" method=\"post\">\n";
-	echo "\t<br><input type=\"submit\" name=\"ResetActive\" value=\"reset Active setting\">\n";
+  echo "\t<br /><input type=\"submit\" name=\"ResetActive\" value=\"reset Active setting\">\n";
 echo "</form>\n";
 
 if( Isset($_POST["ResetActive"]) )
 {
-	$SQLreset = "UPDATE `User` SET `Aktiv`='0'";
-	$ErgReset = db_query($SQLreset, "Reset Active");
-	if ($ErgReset != 1)
-		echo "Fehler beim zuruecksetzen der Activ\n";
-	else
-		echo "Active wurde erfolgreich zurueckgesetzt\n";
+  $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 />\n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":";
 
-echo "<br><br>\n\n";
+echo "<br /><br />\n\n";
 
 //ausgabe tabelle
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
@@ -51,15 +51,15 @@ echo "\t<td>Freeloader ". Get_Text("pub_aktive_Time"). "</td>\n";
 echo "\t<td>". Get_Text("pub_aktive_Time"). " result</td>\n";
 echo "\t<td>". Get_Text("pub_aktive_Active"). "</td>\n";
 echo "</tr>\n";
-	
+  
 $SQL = "
 SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal
-	FROM
-		(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";
+  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);
@@ -68,42 +68,42 @@ $rowcount = mysql_num_rows($Erg);
 $aktivecount=0;
 for ($i=0; $i<$rowcount; $i++)
 {
-	echo "\n\n\t<tr class=\"content\">\n";
-	echo "\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 "\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";
+  
+  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>";
+echo "<br />Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br /><br />";
 
 include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
old mode 100755
new mode 100644
index 37612d7f..9a329355
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 $title = "DB Update from XML";
 $header = "DB Update from XML";
 include ("../../../camp2011/includes/header.php");
@@ -16,213 +16,213 @@ $EnableSchudleDB = 1;
 
 
 /*##############################################################################################
-				erstellt Arrays der Reume
+        erstellt Arrays der Reume
   ##############################################################################################*/
 function CreateRoomArrays()
 {
-	global $Room, $RoomID, $RoomName, $con;
+  global $Room, $RoomID, $RoomName, $con;
 
-	$sql =	"SELECT `RID`, `Name` FROM `Room` ".
-		"WHERE `Show`='Y'".
-		"ORDER BY `Number`, `Name`;";
-	$Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $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");
-		$RoomName[ mysql_result($Erg, $i, "Name") ] = mysql_result($Erg, $i, "RID");
-	}
+  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");
+    $RoomName[ mysql_result($Erg, $i, "Name") ] = mysql_result($Erg, $i, "RID");
+  }
 }
 CreateRoomArrays();
 
 /*##############################################################################################
-				           F I L E
+                   F I L E
   ##############################################################################################*/
-echo "\n\n<br>\n<h1>XML File:</h1>\n";
+echo "\n\n<br />\n<h1>XML File:</h1>\n";
 if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"]))
 {
-	echo "Update XCAL-File from Pentabarf..";
-	if($PentabarfGetWith=="fsockopen")
-	{
+  echo "Update XCAL-File from Pentabarf..";
+  if($PentabarfGetWith=="fsockopen")
+  {
 
-	//backup error messeges and delate
-	$Backuperror_messages = $error_messages;
-		$fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
-//	$error_messages = $Backuperror_messages;
-	
-	if( !$fp)
-	{
-	   echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
-	   	"[$errstr ($errno)]</h2>";
-	}
-	else
-	{
-		if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-		{
-			$head =	'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
-				'Host: '. $PentabarfXMLhost. "\r\n".
-				'User-Agent: Engelsystem'. "\r\n".
-				'Authorization: Basic '.
-				base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n".
-				"\r\n";
-			fputs( $fp, $head);
-			$Zeilen = -1;
-			while (!feof($fp))
-			{	
-				$Temp= fgets($fp,1024);
-				
-				// ende des headers
-				if( $Temp== "f20\r\n" )
-				{
-					$Zeilen = 0;
-					$Temp="";
-				}
-				
-				//file ende?
-				if( $Temp=="0\r\n")
-					break;
+  //backup error messeges and delate
+  $Backuperror_messages = $error_messages;
+    $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30);
+//  $error_messages = $Backuperror_messages;
+  
+  if( !$fp)
+  {
+     echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!".
+       "[$errstr ($errno)]</h2>";
+  }
+  else
+  {
+    if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+    {
+      $head =  'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n".
+        'Host: '. $PentabarfXMLhost. "\r\n".
+        'User-Agent: Engelsystem'. "\r\n".
+        'Authorization: Basic '.
+        base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n".
+        "\r\n";
+      fputs( $fp, $head);
+      $Zeilen = -1;
+      while (!feof($fp))
+      {  
+        $Temp= fgets($fp,1024);
+        
+        // ende des headers
+        if( $Temp== "f20\r\n" )
+        {
+          $Zeilen = 0;
+          $Temp="";
+        }
+        
+        //file ende?
+        if( $Temp=="0\r\n")
+          break;
 
-				if( ($Zeilen>-1) && ($Temp!="ffb\r\n") )
-				{
-					//steuerzeichen ausfiltern
-					if( strpos( "#$Temp", "\r\n") > 0)
-						$Temp = substr($Temp, 0, strlen($Temp)-2);
-					if( strpos( "#$Temp", "1005") > 0)
-						$Temp = "";
-					if( strpos( "#$Temp", "783") > 0)
-						$Temp = "";
-					//schreiben in file
-					fputs( $fileOut, $Temp);
-					$Zeilen++;
-				}
-			}
-			fclose( $fileOut);
-			
-			echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
-		}
-		else
-			echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-		fclose($fp);
-	}
-	}
-	elseif($PentabarfGetWith=="fopen")
-	{
-		//user uns password in url einbauen
-		$FileNameIn =	"https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
-				$PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
+        if( ($Zeilen>-1) && ($Temp!="ffb\r\n") )
+        {
+          //steuerzeichen ausfiltern
+          if( strpos( "#$Temp", "\r\n") > 0)
+            $Temp = substr($Temp, 0, strlen($Temp)-2);
+          if( strpos( "#$Temp", "1005") > 0)
+            $Temp = "";
+          if( strpos( "#$Temp", "783") > 0)
+            $Temp = "";
+          //schreiben in file
+          fputs( $fileOut, $Temp);
+          $Zeilen++;
+        }
+      }
+      fclose( $fileOut);
+      
+      echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+    }
+    else
+      echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+    fclose($fp);
+  }
+  }
+  elseif($PentabarfGetWith=="fopen")
+  {
+    //user uns password in url einbauen
+    $FileNameIn =  "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
+        $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
 
 
-		if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
-		{
-			if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-			{
-				$Zeilen = 0;
-				while (!feof($fileIn)) 
-				{	
-					$Zeilen++;
-					fputs( $fileOut, fgets( $fileIn));	
-				}
-				fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
-			}
-			else
-				echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-			fclose( $fileIn);
-		}
-		else
-			echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
-	}
-	elseif( $PentabarfGetWith=="wget")
-	{
-		$Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
-			" --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
-			" --no-check-certificate";
-		echo system( $Command, $Status);
-		if( $Status==0)
-			echo "OK.<br>";
-		else
-			echo "fail ($Status)($Command).<br>";
-	}
-	elseif( $PentabarfGetWith=="lynx")
-	{
-		$Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
-		echo system( $Command, $Status);
-		if( $Status==0)
-			echo "OK.<br>";
-		else
-			echo "fail ($Status)($Command).<br>";
-	}
-	elseif($PentabarfGetWith=="fopen")
-	{
-		//user uns password in url einbauen
-		$FileNameIn =	"https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
-				$PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
+    if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
+    {
+      if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+      {
+        $Zeilen = 0;
+        while (!feof($fileIn)) 
+        {  
+          $Zeilen++;
+          fputs( $fileOut, fgets( $fileIn));  
+        }
+        fclose( $fileOut);
+        echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+      }
+      else
+        echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+      fclose( $fileIn);
+    }
+    else
+      echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
+  }
+  elseif( $PentabarfGetWith=="wget")
+  {
+    $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
+      " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
+      " --no-check-certificate";
+    echo system( $Command, $Status);
+    if( $Status==0)
+      echo "OK.<br />";
+    else
+      echo "fail ($Status)($Command).<br />";
+  }
+  elseif( $PentabarfGetWith=="lynx")
+  {
+    $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
+    echo system( $Command, $Status);
+    if( $Status==0)
+      echo "OK.<br />";
+    else
+      echo "fail ($Status)($Command).<br />";
+  }
+  elseif($PentabarfGetWith=="fopen")
+  {
+    //user uns password in url einbauen
+    $FileNameIn =  "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
+        $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
 
 
-		if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
-		{
-			if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-			{
-				$Zeilen = 0;
-				while (!feof($fileIn)) 
-				{	
-					$Zeilen++;
-					fputs( $fileOut, fgets( $fileIn));	
-				}
-				fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
-			}
-			else
-				echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-			fclose( $fileIn);
-		}
-		else
-			echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
-	}
-	elseif( $PentabarfGetWith=="wget")
-	{
-		$Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
-			" --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
-			" --no-check-certificate";
-		echo system( $Command, $Status);
-		if( $Status==0)
-			echo "OK.<br>";
-		else
-			echo "fail ($Status)($Command).<br>";
-	}
-	elseif( $PentabarfGetWith=="lynx")
-	{
-		$Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
-			"https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
-		echo system( $Command, $Status);
-		if( $Status==0)
-			echo "OK.<br>";
-		else
-			echo "fail ($Status)($Command).<br>";
-	}
-	else
-		echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
+    if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
+    {
+      if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
+      {
+        $Zeilen = 0;
+        while (!feof($fileIn)) 
+        {  
+          $Zeilen++;
+          fputs( $fileOut, fgets( $fileIn));  
+        }
+        fclose( $fileOut);
+        echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+      }
+      else
+        echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+      fclose( $fileIn);
+    }
+    else
+      echo "<h2>fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!</h2>";
+  }
+  elseif( $PentabarfGetWith=="wget")
+  {
+    $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ".
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"].
+      " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML".
+      " --no-check-certificate";
+    echo system( $Command, $Status);
+    if( $Status==0)
+      echo "OK.<br />";
+    else
+      echo "fail ($Status)($Command).<br />";
+  }
+  elseif( $PentabarfGetWith=="lynx")
+  {
+    $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ".
+      "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML";
+    echo system( $Command, $Status);
+    if( $Status==0)
+      echo "OK.<br />";
+    else
+      echo "fail ($Status)($Command).<br />";
+  }
+  else
+    echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
 }
 else
 {
-	echo "<form action=\"dbUpdateFromXLS.php\" method=\"post\">\n";
-	echo "<table border=\"0\">\n";
-	echo "\t<tr><td>XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath</td>".
-		"<td><input name=\"PentabarfURL\" type=\"text\" size=\"4\" maxlength=\"5\" ".
-		"value=\"$PentabarfXMLEventID\"></td></tr>\n";
-	echo "\t<tr><td>Username:</td>".
-		"<td><input name=\"PentabarfUser\" type=\"text\" size=\"30\" maxlength=\"30\"></td></tr>\n";
-	echo "\t<tr><td>Password:</td>".
-		"<td><input name=\"password\" type=\"password\" size=\"30\" maxlength=\"30\"></td></tr>\n";
-	echo "\t<tr><td></td><td><input type=\"submit\" name=\"FileUpload\" value=\"upload\"></td></tr>\n";
-	echo "</table>\n";
-	echo "</form>\n";
+  echo "<form action=\"dbUpdateFromXLS.php\" method=\"post\">\n";
+  echo "<table border=\"0\">\n";
+  echo "\t<tr><td>XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath</td>".
+    "<td><input name=\"PentabarfURL\" type=\"text\" size=\"4\" maxlength=\"5\" ".
+    "value=\"$PentabarfXMLEventID\"></td></tr>\n";
+  echo "\t<tr><td>Username:</td>".
+    "<td><input name=\"PentabarfUser\" type=\"text\" size=\"30\" maxlength=\"30\"></td></tr>\n";
+  echo "\t<tr><td>Password:</td>".
+    "<td><input name=\"password\" type=\"password\" size=\"30\" maxlength=\"30\"></td></tr>\n";
+  echo "\t<tr><td></td><td><input type=\"submit\" name=\"FileUpload\" value=\"upload\"></td></tr>\n";
+  echo "</table>\n";
+  echo "</form>\n";
 }
 
 
@@ -235,52 +235,52 @@ $XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR");
 
 if( $ShowDataStrukture)
 {
-	echo "<pre><br>";
-	echo $XMLmain->name;
-	echo "<br>";
-	print_r(array_values ($XMLmain->sub));
-	echo "</pre>";
+  echo "<pre><br />";
+  echo $XMLmain->name;
+  echo "<br />";
+  print_r(array_values ($XMLmain->sub));
+  echo "</pre>";
 }
 
 /*
-echo "<br>";
+echo "<br />";
 $Feld=7;
-echo "$Feld#". $XMLmain->sub[$Feld]->name. "<br>";
+echo "$Feld#". $XMLmain->sub[$Feld]->name. "<br />";
 echo "$Feld#". $XMLmain->sub[$Feld]->sub;
 //print_r(array_values ($XMLmain->sub[$Feld]->sub));
 while(list($key, $value) = each($XMLmain->sub[$Feld]->sub))
-	echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n";
+  echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n";
 echo "</pre>";
 */
 
 
 /*##############################################################################################
-				           V e r s i o n
+                   V e r s i o n
   ##############################################################################################*/
 
 echo "<hr>\n";
 $XMLrelease = getXMLsubPease( $XMLmain, "X-WR-CALDESC");
-echo "release: ". $XMLrelease->data. "<br>\n";
+echo "release: ". $XMLrelease->data. "<br />\n";
 //$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE");
-//echo "release date: ". $XMLreleaseDate->data. "<br>\n";
+//echo "release date: ". $XMLreleaseDate->data. "<br />\n";
 echo "<hr>\n";
 
 
 
 /*##############################################################################################
-				           V e r s i o n
+                   V e r s i o n
   ##############################################################################################*/
 if( $EnableRoomFunctions)
-	include("../../../camp2011/includes/funktion_xml_room.php");
+  include("../../../camp2011/includes/funktion_xml_room.php");
 
 if( $EnableSchudleFunctions)
-	include("../../../camp2011/includes/funktion_xml_schudle.php");
+  include("../../../camp2011/includes/funktion_xml_schudle.php");
 
 
 /*##############################################################################################
-				         U P D A T E  A L L 
+                 U P D A T E  A L L 
   ##############################################################################################*/
-echo "\n\n<br>\n<h1>Update ALL:</h1>\n";
+echo "\n\n<br />\n<h1>Update ALL:</h1>\n";
 
 echo "<form action=\"dbUpdateFromXLS.php\">\n";
 echo "\t<input type=\"submit\" name=\"UpdateALL\" value=\"now\">\n";
diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php
old mode 100755
new mode 100644
index b01a8a6c..b2c6357f
--- a/www-ssl/admin/debug.php
+++ b/www-ssl/admin/debug.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Debug-Liste";
 $header = "Datenbank-Auszug";
@@ -9,22 +9,22 @@ echo "<h1>Web Counter</h1>";
 funktion_db_list("Counter");
 
 /*
-echo "<h1>Raeume</h1> <br>";
+echo "<h1>Raeume</h1> <br />";
 funktion_db_list("Raeume");
 
-echo "<h1>Schichtbelegung</h1> <br>";
+echo "<h1>Schichtbelegung</h1> <br />";
 funktion_db_list("Schichtbelegung");
 
-echo "<h1>Schichtplan</h1> <br>Hier findest du alle bisher eingetragenen Schichten:";
+echo "<h1>Schichtplan</h1> <br />Hier findest du alle bisher eingetragenen Schichten:";
 funktion_db_list("Schichtplan");
 
-echo "<h1>User</h1> <br>";
+echo "<h1>User</h1> <br />";
 funktion_db_list("User");
 
-echo "<h1>News</h1> <br>";
+echo "<h1>News</h1> <br />";
 funktion_db_list("News");
 
-echo "<h1>FAQ</h1> <br>";
+echo "<h1>FAQ</h1> <br />";
 funktion_db_list("FAQ");
 
 echo "Deaktiviert";
@@ -32,34 +32,34 @@ echo "Deaktiviert";
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Tshirt-Size aller engel",
-				"SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); 
-echo "<br>\n";
+        "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); 
+echo "<br />\n";
 funktion_db_element_list_2row( "Tshirt ausgegeben",
-				"SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); 
-echo "<br>\n";
+        "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); 
+echo "<br />\n";
 funktion_db_element_list_2row( "Tshirt nicht  ausgegeben (Gekommen=1)", 
-				"SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`");
+        "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`");
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Hometown", 
-				"SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
-echo "<br>\n";
+        "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
+echo "<br />\n";
 funktion_db_element_list_2row( "Engeltypen", 
-					"SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
+          "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Gesamte Arbeit",
-					"SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)");
-echo "<br>\n";
+          "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)");
+echo "<br />\n";
 funktion_db_element_list_2row( "Geleisteter Arbeit",
-					"SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)");
+          "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)");
 
 echo "<hr>\n";
 funktion_db_element_list_2row( "Gesamte Arbeit (Ohne Raum aufabau (RID=7)",
-					"SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)");
-echo "<br>\n";
+          "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)");
+echo "<br />\n";
 funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)",
-					"SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)");
+          "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)");
 
 
 
diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php
old mode 100755
new mode 100644
index e6096d27..76409cc6
--- a/www-ssl/admin/dect.php
+++ b/www-ssl/admin/dect.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Engelsystem - DECT";
 $header = "DECT send call";
@@ -13,56 +13,56 @@ if( !isset($_GET["custum"])) $_GET["custum"] = "";
 
 if( $_GET["dial"]=="dial")
 {
-	if( $_GET["DECT"]=="")
-		$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);
+  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;
+  $_GET["custum"] = $Number;
 }
 
 
-	echo "<form action=\"./dect.php\" method=\"GET\">\n";
-	echo "<table>\n";
+  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><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";
+  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";
+  $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>";
+  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 ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php
old mode 100755
new mode 100644
index c69efa17..58c7cfe1
--- a/www-ssl/admin/dect_call.php
+++ b/www-ssl/admin/dect_call.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 include ("../../../camp2011/includes/header.php");
 
 
diff --git a/www-ssl/admin/faq.1.php b/www-ssl/admin/faq.1.php
old mode 100755
new mode 100644
index 0951fcb6..04dda6aa
--- a/www-ssl/admin/faq.1.php
+++ b/www-ssl/admin/faq.1.php
@@ -1,6 +1,6 @@
 <h4 class="menu"> Anfragen und FAQ </h4>
 
 <li><a href="faq.php?quest=all">Alle Anfragen</a></li>
-<li><a href="faq.php?quest=open">Offene Anfragen (<?PHP echo noAnswer(); ?>)</a></li>
+<li><a href="faq.php?quest=open">Offene Anfragen (<?php echo noAnswer(); ?>)</a></li>
 <li><a href="faq.php?quest=faq">FAQ-Liste editiern</a></li>
 
diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php
old mode 100755
new mode 100644
index 645c08cd..217e9188
--- a/www-ssl/admin/faq.php
+++ b/www-ssl/admin/faq.php
@@ -22,119 +22,119 @@ switch ($_GET["quest"])
 // *---------------------------------------------------------------------------
 
 case "all":
-	$SQL="SELECT * FROM `Questions` ORDER BY QID DESC";
+  $SQL="SELECT * FROM `Questions` ORDER BY QID DESC";
 ?>
-	Alle Anfragen:<br>
+  Alle Anfragen:<br />
         <table  width="100%" class="border" cellpadding="2" cellspacing="1">
                 <tr class="contenttopic">
-			<th>Frage</th>
-			<th>Anfragender</th>
+      <th>Frage</th>
+      <th>Anfragender</th>
                         <th>Beantwortet?</th>
                         <th>Antwort</th>
                         <th>Antwort von</th>
-			<th>change</th>
+      <th>change</th>
                 </tr>
 
-<?PHP
+<?php
 
         $Erg = mysql_query($SQL, $con);
         // anzahl zeilen
         $Zeilen  = mysql_num_rows($Erg);
         for ($n = 0 ; $n < $Zeilen ; $n++) {
-		echo "<tr class=\"content\">\n";
-		echo "<td>".mysql_result($Erg, $n, "Question")."</td>\n";
-		echo "<td>".UID2Nick(mysql_result($Erg, $n, "UID"))."</td>\n";
-		echo "<td>";
-		if (mysql_result($Erg, $n, "AID")>0) 
-		{ 
-			echo "Ja</td>\n";
-			echo "<td>".mysql_result($Erg, $n, "Answer")."</td>\n";
-			echo "<td>".UID2Nick(mysql_result($Erg, $n, "AID"))."</td>\n";
-		} 
-		else 
-		{
-			echo "Nein</td>\n";
-			echo "<td>&nbsp;</td>\n";
-			echo "<td>&nbsp;</td>\n";
-		}
-		echo "<td><a href=\"faq.php?quest=edit&QID=".mysql_result($Erg, $n, "QID")."\">xxx</a></td>";
-		echo "</tr>\n";
-	}
-	echo "</table>\n";
-	break;
-	
+    echo "<tr class=\"content\">\n";
+    echo "<td>".mysql_result($Erg, $n, "Question")."</td>\n";
+    echo "<td>".UID2Nick(mysql_result($Erg, $n, "UID"))."</td>\n";
+    echo "<td>";
+    if (mysql_result($Erg, $n, "AID")>0) 
+    { 
+      echo "Ja</td>\n";
+      echo "<td>".mysql_result($Erg, $n, "Answer")."</td>\n";
+      echo "<td>".UID2Nick(mysql_result($Erg, $n, "AID"))."</td>\n";
+    } 
+    else 
+    {
+      echo "Nein</td>\n";
+      echo "<td>&nbsp;</td>\n";
+      echo "<td>&nbsp;</td>\n";
+    }
+    echo "<td><a href=\"faq.php?quest=edit&QID=".mysql_result($Erg, $n, "QID")."\">xxx</a></td>";
+    echo "</tr>\n";
+  }
+  echo "</table>\n";
+  break;
+  
 case "open":
-	$SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC";
-	$quest_bearb=1; // Fragenliste anzeigen
-	echo "\t\tOffene Anfragen:<br>\n";
-	break;
-	
+  $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC";
+  $quest_bearb=1; // Fragenliste anzeigen
+  echo "\t\tOffene Anfragen:<br />\n";
+  break;
+  
 case "edit":
-	if (!IsSet($_GET["QID"]))
-		echo "\t\tFehlerhafter Aufruf...<br>Bitte die Bearbeitung nochmals beginnen :)\n";
-	else 
-	{
-		$SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
-		$Erg = mysql_query($SQL, $con);
-		echo "\t\t<form action=\"./faq.php\" method=\"GET\">\n";
-		echo "\t\tAnfrage von <b>". UID2NICK(mysql_result($Erg, 0, "UID")). "</b>:<br>\n";
-		echo "\t\t<textarea name=\"Question\" rows=\"3\" cols=\"80\">".
-			mysql_result($Erg, 0, "Question"). "</textarea>\n";
-		echo "<br><br>Antwort der Erzengel:<br>\n";
-		if (mysql_result($Erg, 0, "Answer")=="") 
-			echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">".
-				"Bitte hier die Antwort eintragen...</textarea><br>\n";
-		else 
-			echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">". 
-				mysql_result($Erg, 0, "Answer"). "</textarea>\n<br>\n";
-		echo "\t\t<input type=\"hidden\" name=\"QID\" value=\"". $_GET["QID"]. "\">\n";
-		echo "\t\t<input type=\"hidden\" name=\"quest\" value=\"save\">\n";
-		echo "\t\t<input type=\"submit\" value=\"Sichern...\">\n";
-		echo "\t</form>\n";
-		if (mysql_result($Erg, 0, "AID")<>"0") 
-		{
-			echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag &uuml;bernehmen.<br>\n";
-			echo "<a href=\"./faq.php?quest=transfer&QID=". $_GET["QID"]. "\">Als FAQ-Eintrag sichern...</a>\n";
-		}
-	} // Abfrage der QID
-	break;
+  if (!IsSet($_GET["QID"]))
+    echo "\t\tFehlerhafter Aufruf...<br />Bitte die Bearbeitung nochmals beginnen :)\n";
+  else 
+  {
+    $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
+    $Erg = mysql_query($SQL, $con);
+    echo "\t\t<form action=\"./faq.php\" method=\"GET\">\n";
+    echo "\t\tAnfrage von <b>". UID2NICK(mysql_result($Erg, 0, "UID")). "</b>:<br />\n";
+    echo "\t\t<textarea name=\"Question\" rows=\"3\" cols=\"80\">".
+      mysql_result($Erg, 0, "Question"). "</textarea>\n";
+    echo "<br /><br />Antwort der Erzengel:<br />\n";
+    if (mysql_result($Erg, 0, "Answer")=="") 
+      echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">".
+        "Bitte hier die Antwort eintragen...</textarea><br />\n";
+    else 
+      echo "\t\t<textarea name=\"Answer\" rows=\"5\" cols=\"80\">". 
+        mysql_result($Erg, 0, "Answer"). "</textarea>\n<br />\n";
+    echo "\t\t<input type=\"hidden\" name=\"QID\" value=\"". $_GET["QID"]. "\">\n";
+    echo "\t\t<input type=\"hidden\" name=\"quest\" value=\"save\">\n";
+    echo "\t\t<input type=\"submit\" value=\"Sichern...\">\n";
+    echo "\t</form>\n";
+    if (mysql_result($Erg, 0, "AID")<>"0") 
+    {
+      echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag &uuml;bernehmen.<br />\n";
+      echo "<a href=\"./faq.php?quest=transfer&QID=". $_GET["QID"]. "\">Als FAQ-Eintrag sichern...</a>\n";
+    }
+  } // Abfrage der QID
+  break;
 
 case "save":
-	if (!IsSet($_GET["QID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...";
+  if (!IsSet($_GET["QID"]))
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...";
         else
-	{
-		$SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. 
-	  		 "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ".
-			 "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1";
-        	$Erg = db_query($SQL, "save Question");
-		if ($Erg == 1) 
-		{
-			echo "\tDer Eintrag wurde ge&auml;ndert<br>\n";
-			SetHeaderGo2Back();
-          	} 
-		else 
-			echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+  {
+    $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. 
+         "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ".
+       "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1";
+          $Erg = db_query($SQL, "save Question");
+    if ($Erg == 1) 
+    {
+      echo "\tDer Eintrag wurde ge&auml;ndert<br />\n";
+      SetHeaderGo2Back();
+            } 
+    else 
+      echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         }
-	break;
+  break;
 
 case "transfer":
-	if (!IsSet($_GET["QID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
-	else
-	{
-		$SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
-		$Erg = mysql_query($SQL1, $con);
-		$SQL2="INSERT INTO `FAQ` Values ('', '".
-			mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')";
-		$Erg = db_query($SQL2, "trasfert to request to the FAQ");
-		if ($Erg == 1) 
-			echo "\tDer Eintrag wurde &uuml;bertragen.<br>\n";
-	        else
-			echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
-	}
-	
-	break;
+  if (!IsSet($_GET["QID"]))
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
+  else
+  {
+    $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'";
+    $Erg = mysql_query($SQL1, $con);
+    $SQL2="INSERT INTO `FAQ` Values ('', '".
+      mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')";
+    $Erg = db_query($SQL2, "trasfert to request to the FAQ");
+    if ($Erg == 1) 
+      echo "\tDer Eintrag wurde &uuml;bertragen.<br />\n";
+          else
+      echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+  }
+  
+  break;
 
 // *---------------------------------------------------------------------------
 // * FAQ - Bearbeitung
@@ -143,105 +143,105 @@ case "transfer":
 // * geaendert oder geloscht werden...
 // *---------------------------------------------------------------------------
 case "faq":
-	$quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren...
-	echo "\tFAQ-Liste:<br>";
-	echo "<a href=\"./faq.php?quest=faqnew\">Neuen Eintrag</a>";
-	
-	$SQL = "SELECT * FROM `FAQ`";
-	$Erg = mysql_query($SQL, $con);
+  $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren...
+  echo "\tFAQ-Liste:<br />";
+  echo "<a href=\"./faq.php?quest=faqnew\">Neuen Eintrag</a>";
+  
+  $SQL = "SELECT * FROM `FAQ`";
+  $Erg = mysql_query($SQL, $con);
 
-	// anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  // anzahl zeilen
+  $Zeilen  = mysql_num_rows($Erg);
 
-	for ($n = 0 ; $n < $Zeilen ; $n++)
-		if (mysql_result($Erg, $n, "Antwort")!="")
-		{
-			echo "\t<p class=\"question\">".  mysql_result($Erg, $n, "Frage").  "</p>\n";
-			echo "\t<p class=\"answetion\">". mysql_result($Erg, $n, "Antwort")."</p>\n";
-			echo "\t<a href=\"./faq.php?quest=faqedit&FAQID=". mysql_result($Erg, $n, "FID"). 
-				"\">Bearbeiten</a>\n<br>---<br>\n";
-		}
-	break;
+  for ($n = 0 ; $n < $Zeilen ; $n++)
+    if (mysql_result($Erg, $n, "Antwort")!="")
+    {
+      echo "\t<p class=\"question\">".  mysql_result($Erg, $n, "Frage").  "</p>\n";
+      echo "\t<p class=\"answetion\">". mysql_result($Erg, $n, "Antwort")."</p>\n";
+      echo "\t<a href=\"./faq.php?quest=faqedit&FAQID=". mysql_result($Erg, $n, "FID"). 
+        "\">Bearbeiten</a>\n<br />---<br />\n";
+    }
+  break;
 
 case "faqedit":
        if (!IsSet($_GET["FAQID"]))
-		echo "\tFehlerhafter Aufruf...<br>Bitte die Bearbeitung nochmals beginnen :)\n";
-	else
-	{
-		$SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'";
-		$Erg = mysql_query($SQL, $con);
+    echo "\tFehlerhafter Aufruf...<br />Bitte die Bearbeitung nochmals beginnen :)\n";
+  else
+  {
+    $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'";
+    $Erg = mysql_query($SQL, $con);
 
-		// anzahl zeilen
-		$Zeilen  = mysql_num_rows($Erg);
+    // anzahl zeilen
+    $Zeilen  = mysql_num_rows($Erg);
 ?>
-	<form action="./faq.php" method="GET">
-		Frage:<br>
-	<textarea name="Frage" rows="3" cols="80"><?php echo mysql_result($Erg, 0, "Frage"); ?></textarea>
-	<br><br>
-	Antwort:<br>
-	<textarea name="Antwort" rows="5" cols="80"><?php echo mysql_result($Erg, 0, "Antwort"); ?></textarea><br>
-	<input type="hidden" name="FAQID" value="<?PHP echo $_GET["FAQID"]; ?>">
-	<input type="hidden" name="quest" value="faqsave">
-	<input type="submit" value="Sichern...">
-	</form>
-	<form action="./faq.php">	
-        <input type="hidden" name="FAQID" value="<?PHP echo $_GET["FAQID"]; ?>">
+  <form action="./faq.php" method="GET">
+    Frage:<br />
+  <textarea name="Frage" rows="3" cols="80"><?php echo mysql_result($Erg, 0, "Frage"); ?></textarea>
+  <br /><br />
+  Antwort:<br />
+  <textarea name="Antwort" rows="5" cols="80"><?php echo mysql_result($Erg, 0, "Antwort"); ?></textarea><br />
+  <input type="hidden" name="FAQID" value="<?php echo $_GET["FAQID"]; ?>">
+  <input type="hidden" name="quest" value="faqsave">
+  <input type="submit" value="Sichern...">
+  </form>
+  <form action="./faq.php">  
+        <input type="hidden" name="FAQID" value="<?php echo $_GET["FAQID"]; ?>">
         <input type="hidden" name="quest" value="faqdelete">
         <input type="submit" value="L&ouml;schen...">
-	</form>
+  </form>
 <?php 
-	}
-	break;
+  }
+  break;
 
 case "faqdelete";
-	if (!IsSet($_GET["FAQID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
-	else 
-	{
-		$SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
-		$Erg = db_query($SQL, "delate faq item");
-		if ($Erg == 1) 
-			echo "\tDer Eintrag wurde gel&ouml;scht<br>\n";
-		else
-			echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gel&ouml;scht gewesen?\n";
-	}
-	break;
+  if (!IsSet($_GET["FAQID"]))
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
+  else 
+  {
+    $SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
+    $Erg = db_query($SQL, "delate faq item");
+    if ($Erg == 1) 
+      echo "\tDer Eintrag wurde gel&ouml;scht<br />\n";
+    else
+      echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gel&ouml;scht gewesen?\n";
+  }
+  break;
 
 case "faqsave";
         if (!IsSet($_GET["FAQID"]))
-		echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
+    echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n";
         else 
-	{
-        	$SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. 
-	  	 	"' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
-		$Erg = db_query($SQL, $con);
-		if ($Erg == 1) 
-			echo "\tDer Eintrag wurde ge&auml;ndert<br>\n";
-          	else
-			echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+  {
+          $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. 
+         "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1";
+    $Erg = db_query($SQL, $con);
+    if ($Erg == 1) 
+      echo "\tDer Eintrag wurde ge&auml;ndert<br />\n";
+            else
+      echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         }
-	break;
+  break;
 
 case "faqnew":
 ?>
-	<form action="./faq.php" method="GET">
-        Frage:<br>
-        <textarea name="Frage" rows="3" cols="80">Frage...</textarea><br><br>
-        Antwort:<br>
-	<textarea name="Antwort" rows="5" cols="80">Antwort</textarea><br>
+  <form action="./faq.php" method="GET">
+        Frage:<br />
+        <textarea name="Frage" rows="3" cols="80">Frage...</textarea><br /><br />
+        Antwort:<br />
+  <textarea name="Antwort" rows="5" cols="80">Antwort</textarea><br />
         <input type="hidden" name="quest" value="faqnewsave">
         <input type="submit" value="Sichern...">
         </form>
 <?php
-	break;
+  break;
 
 case "faqnewsave";
         $SQL = "INSERT INTO `FAQ` VALUES ('', '". $_GET["Frage"]. "', '". $_GET["Antwort"]. "')";
         $Erg = db_query($SQL, "Save new FAQ entry");
         if ($Erg == 1)
-		echo "\tDer Eintrag wurde erfasst.<br>\n";
+    echo "\tDer Eintrag wurde erfasst.<br />\n";
         else
-		echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
+    echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
         break;
 
 } //switch ($_GET["quest"])
@@ -251,32 +251,32 @@ case "faqnewsave";
 // Fragenliste anzeigen???
 if ($quest_bearb==1) 
 {
-	$Erg = mysql_query($SQL, $con);
-	// anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
+  $Erg = mysql_query($SQL, $con);
+  // anzahl zeilen
+  $Zeilen  = mysql_num_rows($Erg);
 
-	if ($Zeilen==0)
-		echo "\tkeine vorhanden...\n";
-	else
-		for ($n = 0 ; $n < $Zeilen ; $n++) 
-		{
-			echo "\t<p>". nl2br(mysql_result($Erg, $n, "Question"))."\n</p><br>\n";
-			echo "\t<a href=\"./faq.php?quest=edit&QID=". mysql_result($Erg, $n, "QID"). "\">Bearbeiten</a>\n";
-			echo "<br>---<br>\n";
-		}
-	
+  if ($Zeilen==0)
+    echo "\tkeine vorhanden...\n";
+  else
+    for ($n = 0 ; $n < $Zeilen ; $n++) 
+    {
+      echo "\t<p>". nl2br(mysql_result($Erg, $n, "Question"))."\n</p><br />\n";
+      echo "\t<a href=\"./faq.php?quest=edit&QID=". mysql_result($Erg, $n, "QID"). "\">Bearbeiten</a>\n";
+      echo "<br />---<br />\n";
+    }
+  
 }
 
 } //if (IsSet($_GET["quest"]))
 else 
 {
-	echo "Bitte w&auml;hle aus, ob du:\n";
-	echo "<ul>\n";
-	echo "\t<li><a href=\"./faq.php?quest=all\">Alle Anfragen anzeigen/bearbeiten m&ouml;chtest</a></li>\n";
-	echo "\t<li><a href=\"./faq.php?quest=open\">Alle offenen Anfragen anzeigen/bearbeiten m&ouml;chtest (". 
-		noAnswer(). ")</a></li>\n";
-	echo "\t<li><a href=\"./faq.php?quest=faq\">Die FAQ's anzeigen/bearbeiten</a></li>\n";
-	echo "</ul>\n";
+  echo "Bitte w&auml;hle aus, ob du:\n";
+  echo "<ul>\n";
+  echo "\t<li><a href=\"./faq.php?quest=all\">Alle Anfragen anzeigen/bearbeiten m&ouml;chtest</a></li>\n";
+  echo "\t<li><a href=\"./faq.php?quest=open\">Alle offenen Anfragen anzeigen/bearbeiten m&ouml;chtest (". 
+    noAnswer(). ")</a></li>\n";
+  echo "\t<li><a href=\"./faq.php?quest=faq\">Die FAQ's anzeigen/bearbeiten</a></li>\n";
+  echo "</ul>\n";
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php
old mode 100755
new mode 100644
index 5ceaebb6..577ef7be
--- a/www-ssl/admin/free.php
+++ b/www-ssl/admin/free.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Erzengel";
 $header = "Freie Engel";
@@ -6,9 +6,9 @@ include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
 
-echo "Hallo ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo ".$_SESSION['Nick'].",<br />\n";
 
-echo "<br><br>\n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:<br><br>\n";
+echo "<br /><br />\n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:<br /><br />\n";
 
 
 #######################################################
@@ -21,21 +21,21 @@ echo "<br><br>\n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht
 
 /* geht nicht ??? unter stabel !!
 $SQL= "SELECT User.Nick, Schichtplan.*, Schichtbelegung.* ".
-	"FROM Schichtplan, User LEFT OUTER ".
-	"JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ".
-	"WHERE Schichtplan.SID = Schichtbelegung.SID AND ".
-		"Schichtplan.Date < now() and ".
-		"Schichtplan.EndDate > now() ".
-	"ORDER BY Nick";
-	
+  "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() );";		
+  "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);";		
+  "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
 
@@ -62,27 +62,27 @@ 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")). "\")";
+  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.")";
+  $inuse=" WHERE NOT (".$inuse.")";
 echo "</table>\n";
 
 
 //##########################################################################################################
 
-echo "<br><br>\n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:<br><br>\n";
+echo "<br /><br />\n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:<br /><br />\n";
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\"\>\n";
 echo "\t<tr class=\"contenttopic\">\n\t\t<td>Nick</td>\n\t\t<td>DECT</td>\n\t</tr>\n";
 
@@ -91,11 +91,11 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 for ($i=0; $i < $Zeilen; $i++)
 {
-	echo "\t<tr class=\"content\">\n";
-	echo "\t\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 "\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";
 
diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php
old mode 100755
new mode 100644
index c28c78af..83a4123f
--- a/www-ssl/admin/free_DECT.php
+++ b/www-ssl/admin/free_DECT.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 include ("../../../camp2011/includes/config_db.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
@@ -12,8 +12,8 @@ include ("../../../camp2011/includes/funktion_user.php");
 #######################################################
 
 $SQL =  "SELECT Shifts.*, ShiftEntry.* ".
-	"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ".
-	"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";		
+  "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);
@@ -21,17 +21,17 @@ $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.= " OR ";
+  $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")";
 }
 if ($inuse!="") 
 {
-	$inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')";
+  $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')";
 }
 else
 {
-	$inuse=" WHERE (DECT!='')";
+  $inuse=" WHERE (DECT!='')";
 }
 
 
@@ -42,36 +42,36 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 for ($i=0; $i < $Zeilen; $i++)
 {
-	// get DECT number
-	echo mysql_result($Erg, $i, "DECT"). "\t";
+  // 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);
+  // 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";
-		}
-	}
+  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";	
-	}
+  // 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>";
+  echo "\n";
+//  echo "<br />";
 }
 
 ?>
diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php
old mode 100755
new mode 100644
index 57945d0d..f42fea97
--- a/www-ssl/admin/group.php
+++ b/www-ssl/admin/group.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,40 +7,40 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["enterGID"]))
 {
-	// Userliste, keine UID uebergeben...
-
-	$SQL = "SELECT * FROM `UserGroups` ORDER BY `Name` ASC";
-	$Erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
-
-	// anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
-
-	echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<tr class=\"contenttopic\">\n";
-	echo "\t<td>Groupname</td>\n";
-	echo "\t<td>Link</td>\n";
-	echo "</tr>\n";
-
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
-		echo "<tr class=\"content\">\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
-		
-		echo "<td><a href=\"./userChangeSecure.php?enterUID=".
-			mysql_result($Erg, $n, "UID")."&Type=Secure\">change</a></td>\n";
-		echo "</tr>\n";
-	}
-	
-	// new form
-	echo "<tr class=\"content\">\n";
-	echo "\t<form action=\"userSaveSecure.php?new=newGroup\"  method=\"POST\">\n";
-	echo "\t\t<td><input name=\"GroupName\" type=\"text\" value=\"--new group--\"></td>\n";
-	echo "\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\"></td>\n";
-	echo "\t</form>\n";
-	echo "</tr>\n";
-
-	echo "\t</table>\n";
-	// Ende Userliste
+  // Userliste, keine UID uebergeben...
+
+  $SQL = "SELECT * FROM `UserGroups` ORDER BY `Name` ASC";
+  $Erg = mysql_query($SQL, $con);
+  echo mysql_error($con);
+
+  // anzahl zeilen
+  $Zeilen  = mysql_num_rows($Erg);
+
+  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  echo "<tr class=\"contenttopic\">\n";
+  echo "\t<td>Groupname</td>\n";
+  echo "\t<td>Link</td>\n";
+  echo "</tr>\n";
+
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
+    echo "<tr class=\"content\">\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
+    
+    echo "<td><a href=\"./userChangeSecure.php?enterUID=".
+      mysql_result($Erg, $n, "UID")."&Type=Secure\">change</a></td>\n";
+    echo "</tr>\n";
+  }
+  
+  // new form
+  echo "<tr class=\"content\">\n";
+  echo "\t<form action=\"userSaveSecure.php?new=newGroup\"  method=\"POST\">\n";
+  echo "\t\t<td><input name=\"GroupName\" type=\"text\" value=\"--new group--\"></td>\n";
+  echo "\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\"></td>\n";
+  echo "\t</form>\n";
+  echo "</tr>\n";
+
+  echo "\t</table>\n";
+  // Ende Userliste
 } 
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php
old mode 100755
new mode 100644
index b89bdb93..e7be285c
--- a/www-ssl/admin/index.php
+++ b/www-ssl/admin/index.php
@@ -1,19 +1,19 @@
-<?PHP
+<?php
 
 $title = "Erzengel";
 $header = "Index";
 include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
-echo "Hallo Erzengel ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo Erzengel ".$_SESSION['Nick'].",<br />\n";
 
 ?>
 
-du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.<br><br>
+du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.<br /><br />
 
 Bitte melde dich <a href="../logout.php">hier</a> nach getaner Arbeit immer ab, damit kein anderer hier &Auml;nderungen vornehmen kann.
 
-<?PHP
+<?php
 include ("../../../camp2011/includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php
old mode 100755
new mode 100644
index 78f49ee2..f25eab93
--- a/www-ssl/admin/news.php
+++ b/www-ssl/admin/news.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Newsverwaltung";
 $header = "Verwaltung der News";
@@ -8,14 +8,14 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["action"]))
 {
-	$SQL = "SELECT * FROM `News` ORDER BY `Datum` DESC";
-	$Erg = mysql_query($SQL, $con);
+  $SQL = "SELECT * FROM `News` ORDER BY `Datum` DESC";
+  $Erg = mysql_query($SQL, $con);
 
-	$rowcount = mysql_num_rows($Erg);
-	?>
-Hallo <?PHP echo $_SESSION['Nick'] ?>, <br>
+  $rowcount = mysql_num_rows($Erg);
+  ?>
+Hallo <?php echo $_SESSION['Nick'] ?>, <br />
 hier kannst du die News s&auml;ubern... falls jemand auf die Idee kommt, 
-hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br><br>
+hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br /><br />
 
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
         <tr class="contenttopic">
@@ -24,97 +24,97 @@ hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)<br>
          <td>Text</td>
          <td>Erfasser</td>
          <td>Engeltreff</td>
-	 <td>&Auml;nd.</td>
-	</tr>
-<?PHP			  
-
-	for ($i=0; $i < $rowcount; $i++) 
-	{
-		echo "\t<tr class=\"content\">\n";
-		echo "\t <td>".mysql_result($Erg, $i, "Datum")."</td>";
-		echo "\t <td>".mysql_result($Erg, $i, "Betreff")."</td>";
-		echo "\t <td>".mysql_result($Erg, $i, "Text")."</td>";
-		echo "\t <td>".UID2Nick(mysql_result($Erg, $i, "UID"))."</td>";
-		echo "\t <td>".mysql_result($Erg, $i, "Treffen")."</td>";
-		echo "\t <td><a href=\"./news.php?action=change&date=".mysql_result($Erg, $i, "Datum")."\">XXX</a></td>";
-		echo "\t</tr>\n";
-	}
-	echo "</table>";
+   <td>&Auml;nd.</td>
+  </tr>
+<?php        
+
+  for ($i=0; $i < $rowcount; $i++) 
+  {
+    echo "\t<tr class=\"content\">\n";
+    echo "\t <td>".mysql_result($Erg, $i, "Datum")."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Betreff")."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Text")."</td>";
+    echo "\t <td>".UID2Nick(mysql_result($Erg, $i, "UID"))."</td>";
+    echo "\t <td>".mysql_result($Erg, $i, "Treffen")."</td>";
+    echo "\t <td><a href=\"./news.php?action=change&date=".mysql_result($Erg, $i, "Datum")."\">XXX</a></td>";
+    echo "\t</tr>\n";
+  }
+  echo "</table>";
 } 
 else 
 {
 
-	unSet($chsql);
-
-	switch ($_GET["action"]) 
-	{
-	case 'change':
-		if (isset($_GET["date"]))
-		{
-			$SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')";
-			$Erg = mysql_query($SQL, $con);
-
-			if( mysql_num_rows( $Erg)>0)
-			{
-				echo "<form action=\"./news.php\" method=\"GET\">\n";
-
-				echo "<table>\n";
-				echo "  <tr><td>Datum</td><td><input type=\"text\" size=\"40\" name=\"date\" value=\"".
-					mysql_result($Erg, 0, "Datum")."\" disabled></td></tr>\n";
-				echo "  <tr><td>Betreff</td><td><input type=\"text\" size=\"40\" name=\"eBetreff\" value=\"".
-					mysql_result($Erg, 0, "Betreff")."\"></td></tr>\n";
-				echo "  <tr><td>Text</td><td><textarea rows=\"10\" cols=\"80\" name=\"eText\">".
-					mysql_result($Erg, 0, "Text")."</textarea></td></tr>\n";
-				echo "  <tr><td>Engel</td><td><input type=\"text\" size=\"40\" name=\"eUser\" value=\"".
-					UID2Nick(mysql_result($Erg, 0, "UID"))."\" disabled></td></tr>\n";
-				echo "  <tr><td>Treffen</td><td><input type=\"text\" size=\"40\" name=\"eTreffen\" value=\"".
-					mysql_result($Erg, 0, "Treffen")."\"></td></tr>\n";
-				echo "</table>";
-
-			        echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
-				echo "<input type=\"hidden\" name=\"action\" value=\"change_save\">\n";
-				echo "<input type=\"submit\" value=\"Abschicken...\">\n";
-				echo "</form>";
-
-				echo "<form action=\"./news.php?action=delete\" method=\"POST\">\n";
-				echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
-				echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
-				echo "</form>";
-			}
-			else
-				echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden";
-		}
-		else
-			echo "Fehler: \"date\" nicht übergeben";
-		break;
-
-	case 'change_save':
-		if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) )
-			$chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. 
-				"', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1";
-		else
-			echo "Fehler: nicht genügend parameter übergeben";
-		break;
-
-	case 'delete':
-		if (isset($_POST["date"]))
-		        $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1";
-		else
-			echo "Fehler: \"date\" nicht übergeben";
-		break;
-	} //SWITCH
-
-	if (IsSet($chsql)) 
-	{
-		// SQL-Statement ausführen...
-		$Erg = mysql_query($chsql, $con);
-		If ($Erg == 1)
-			echo "&Auml;nderung erfolgreich gesichert...";
-		else 
-			echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)<br><br>\n".
-				mysql_error($con). "<br><br>\n[$chsql]";
-		SetHeaderGo2Back();
-	}
+  unSet($chsql);
+
+  switch ($_GET["action"]) 
+  {
+  case 'change':
+    if (isset($_GET["date"]))
+    {
+      $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')";
+      $Erg = mysql_query($SQL, $con);
+
+      if( mysql_num_rows( $Erg)>0)
+      {
+        echo "<form action=\"./news.php\" method=\"GET\">\n";
+
+        echo "<table>\n";
+        echo "  <tr><td>Datum</td><td><input type=\"text\" size=\"40\" name=\"date\" value=\"".
+          mysql_result($Erg, 0, "Datum")."\" disabled></td></tr>\n";
+        echo "  <tr><td>Betreff</td><td><input type=\"text\" size=\"40\" name=\"eBetreff\" value=\"".
+          mysql_result($Erg, 0, "Betreff")."\"></td></tr>\n";
+        echo "  <tr><td>Text</td><td><textarea rows=\"10\" cols=\"80\" name=\"eText\">".
+          mysql_result($Erg, 0, "Text")."</textarea></td></tr>\n";
+        echo "  <tr><td>Engel</td><td><input type=\"text\" size=\"40\" name=\"eUser\" value=\"".
+          UID2Nick(mysql_result($Erg, 0, "UID"))."\" disabled></td></tr>\n";
+        echo "  <tr><td>Treffen</td><td><input type=\"text\" size=\"40\" name=\"eTreffen\" value=\"".
+          mysql_result($Erg, 0, "Treffen")."\"></td></tr>\n";
+        echo "</table>";
+
+              echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
+        echo "<input type=\"hidden\" name=\"action\" value=\"change_save\">\n";
+        echo "<input type=\"submit\" value=\"Abschicken...\">\n";
+        echo "</form>";
+
+        echo "<form action=\"./news.php?action=delete\" method=\"POST\">\n";
+        echo "<input type=\"hidden\" name=\"date\" value=\"". $_GET["date"]. "\">\n";
+        echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
+        echo "</form>";
+      }
+      else
+        echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden";
+    }
+    else
+      echo "Fehler: \"date\" nicht übergeben";
+    break;
+
+  case 'change_save':
+    if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) )
+      $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. 
+        "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1";
+    else
+      echo "Fehler: nicht genügend parameter übergeben";
+    break;
+
+  case 'delete':
+    if (isset($_POST["date"]))
+            $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1";
+    else
+      echo "Fehler: \"date\" nicht übergeben";
+    break;
+  } //SWITCH
+
+  if (IsSet($chsql)) 
+  {
+    // SQL-Statement ausführen...
+    $Erg = mysql_query($chsql, $con);
+    If ($Erg == 1)
+      echo "&Auml;nderung erfolgreich gesichert...";
+    else 
+      echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)<br /><br />\n".
+        mysql_error($con). "<br /><br />\n[$chsql]";
+    SetHeaderGo2Back();
+  }
 }// IF-ELSE
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php
old mode 100755
new mode 100644
index ebbe1e36..09006675
--- a/www-ssl/admin/room.php
+++ b/www-ssl/admin/room.php
@@ -9,36 +9,36 @@ $Erg = mysql_query($Sql, $con);
 
 if( !IsSet($_GET["action"]) )
 {
-	echo "Hallo ".$_SESSION['Nick'].
-		",<br>\nhier hast du die M&ouml;glichkeit, neue R&auml;ume f&uuml;r die Schichtpl&auml;ne einzutragen ".
-		"oder vorhandene abzu&auml;ndern:<br><br>\n";
-
-	echo "<a href=\"./room.php?action=new\">- Neuen Raum/Ort eintragen</a><br>\n";
-	
-	echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-	echo "<tr class=\"contenttopic\">\n";
-
-	for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
-	{
-		if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_")
-			echo "\t<td> Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "</td>";
-		else
-			echo "\t<td>". mysql_field_name($Erg, $i)."</td>";
-	}
-	echo "\t<td>&Auml;ndern</td>";
-	echo "</tr>";
-
-	for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-	{	
-		echo "\t<tr class=\"content\">\n";
-		for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
-		{
-  			echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
-		}
-		echo "\t\t<td><a href=\"./room.php?action=change&RID=".mysql_result($Erg, $t, "RID")."\">###</a></td>\n";
-		echo "\t</tr>\n";
-	} // ende Auflistung Raeume
-	echo "</table>";
+  echo "Hallo ".$_SESSION['Nick'].
+    ",<br />\nhier hast du die M&ouml;glichkeit, neue R&auml;ume f&uuml;r die Schichtpl&auml;ne einzutragen ".
+    "oder vorhandene abzu&auml;ndern:<br /><br />\n";
+
+  echo "<a href=\"./room.php?action=new\">- Neuen Raum/Ort eintragen</a><br />\n";
+  
+  echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  echo "<tr class=\"contenttopic\">\n";
+
+  for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
+  {
+    if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_")
+      echo "\t<td> Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "</td>";
+    else
+      echo "\t<td>". mysql_field_name($Erg, $i)."</td>";
+  }
+  echo "\t<td>&Auml;ndern</td>";
+  echo "</tr>";
+
+  for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
+  {  
+    echo "\t<tr class=\"content\">\n";
+    for ($j = 1; $j < mysql_num_fields($Erg); $j++) 
+    {
+        echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
+    }
+    echo "\t\t<td><a href=\"./room.php?action=change&RID=".mysql_result($Erg, $t, "RID")."\">###</a></td>\n";
+    echo "\t</tr>\n";
+  } // ende Auflistung Raeume
+  echo "</table>";
 } 
 else 
 {
@@ -48,132 +48,132 @@ UnSet($SQL);
 switch ($_GET["action"]) {
 
 case 'new':
-	echo "Neuen Raum einrichten: <br>";
-	echo "<form action=\"./room.php\" method=\"GET\">\n";
-	echo "<table>\n";
-	
-	for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
-	{
-		if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") )
-		{
-			echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
-			     "<td>".
-			     "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"Y\">Yes".
-			     "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"N\">No".
-			     "</td></tr>\n";
-		}
-		else
-		{
-			//sonderfall fuer Default Engel 
-			if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_")
-				$FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)];
-			else
-				$FeldName = mysql_field_name($Erg, $Uj);
-		
-			echo "<td>$FeldName</td>".
-		        	"<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\">";
-			echo "</td></tr>\n";
-		}
-	}
-	echo "</table>\n";
-	echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
-	echo "<input type=\"submit\" value=\"sichern...\">\n";
-	echo "</form>";
-	break;
+  echo "Neuen Raum einrichten: <br />";
+  echo "<form action=\"./room.php\" method=\"GET\">\n";
+  echo "<table>\n";
+  
+  for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
+  {
+    if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") )
+    {
+      echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
+           "<td>".
+           "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"Y\">Yes".
+           "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"N\">No".
+           "</td></tr>\n";
+    }
+    else
+    {
+      //sonderfall fuer Default Engel 
+      if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_")
+        $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)];
+      else
+        $FeldName = mysql_field_name($Erg, $Uj);
+    
+      echo "<td>$FeldName</td>".
+              "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\">";
+      echo "</td></tr>\n";
+    }
+  }
+  echo "</table>\n";
+  echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
+  echo "<input type=\"submit\" value=\"sichern...\">\n";
+  echo "</form>";
+  break;
 
 case 'newsave':
-	$vars = $_GET;
-	$count = count($vars) - 1;
-	$vars = array_splice($vars, 0, $count);
-	$Keys = "";
-	$Values = "";
-	foreach($vars as $key => $value)
-	{
-		$Keys   .= ", `$key`";
-		$Values .= ", '$value'";
-	}
-	$SQL  = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")";
-	SetHeaderGo2Back();
-	break;
+  $vars = $_GET;
+  $count = count($vars) - 1;
+  $vars = array_splice($vars, 0, $count);
+  $Keys = "";
+  $Values = "";
+  foreach($vars as $key => $value)
+  {
+    $Keys   .= ", `$key`";
+    $Values .= ", '$value'";
+  }
+  $SQL  = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")";
+  SetHeaderGo2Back();
+  break;
 
 case 'change':
-	if (! IsSet($_GET["RID"])) 
-		echo "Fehlerhafter Aufruf!"; 
-	else
-	{
-		$SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";
-		$ERG = mysql_query($SQL2, $con);
-		
-		if( mysql_num_rows( $ERG)>0)
-		{
-			echo "Raum ab&auml;ndern:\n";
-			echo "Hier kannst du eintragen, welche und wieviele Engel f&uuml;r den Raum zur Verf?gung stehen m&uuml;ssen.";	
-			echo "<form action=\"./room.php\" method=\"GET\">\n";
-			echo "<table>\n";
-		
-			for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
-			{
-				if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") )
-				{
-					echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
-					     "<td>".
-					     "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
-					     	"\" value=\"Y\"". (mysql_result($ERG, 0, $Uj)=='Y'? " checked":""). ">Yes".
-					     "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
-					     	"\" value=\"N\"". (mysql_result($ERG, 0, $Uj)=='N'? " checked":""). ">No".
-					     "</td></tr>\n";
-				}
-				else
-				{
-					if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_")
-						//sonderfall fuer Default Engel 
-						$FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)];
-					else
-						$FeldName = mysql_field_name($ERG, $Uj);
-					echo "<tr><td>$FeldName</td>".
-					     "<td><input type=\"text\" size=\"40\" name=\"e".mysql_field_name($ERG, $Uj)."\" ".
-					     "value=\"".mysql_result($ERG, 0, $Uj)."\">".
-					     "</td></tr>\n";
-				}
-			}
-			echo "</table>\n";
-			echo "<input type=\"hidden\" name=\"eRID\" value=\"". $_GET["RID"]. "\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
-			echo "<input type=\"submit\" value=\"sichern...\">\n";
-			echo "</form>";
-			echo "<form action=\"./room.php\" method=\"GET\">\n";
-			echo "<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
-			echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
-			echo "</form>";
-		}
-		else
-			echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden";
-	}
-	break;
-	
+  if (! IsSet($_GET["RID"])) 
+    echo "Fehlerhafter Aufruf!"; 
+  else
+  {
+    $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";
+    $ERG = mysql_query($SQL2, $con);
+    
+    if( mysql_num_rows( $ERG)>0)
+    {
+      echo "Raum ab&auml;ndern:\n";
+      echo "Hier kannst du eintragen, welche und wieviele Engel f&uuml;r den Raum zur Verf?gung stehen m&uuml;ssen.";  
+      echo "<form action=\"./room.php\" method=\"GET\">\n";
+      echo "<table>\n";
+    
+      for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
+      {
+        if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") )
+        {
+          echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
+               "<td>".
+               "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
+                 "\" value=\"Y\"". (mysql_result($ERG, 0, $Uj)=='Y'? " checked":""). ">Yes".
+               "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj). 
+                 "\" value=\"N\"". (mysql_result($ERG, 0, $Uj)=='N'? " checked":""). ">No".
+               "</td></tr>\n";
+        }
+        else
+        {
+          if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_")
+            //sonderfall fuer Default Engel 
+            $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)];
+          else
+            $FeldName = mysql_field_name($ERG, $Uj);
+          echo "<tr><td>$FeldName</td>".
+               "<td><input type=\"text\" size=\"40\" name=\"e".mysql_field_name($ERG, $Uj)."\" ".
+               "value=\"".mysql_result($ERG, 0, $Uj)."\">".
+               "</td></tr>\n";
+        }
+      }
+      echo "</table>\n";
+      echo "<input type=\"hidden\" name=\"eRID\" value=\"". $_GET["RID"]. "\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
+      echo "<input type=\"submit\" value=\"sichern...\">\n";
+      echo "</form>";
+      echo "<form action=\"./room.php\" method=\"GET\">\n";
+      echo "<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
+      echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
+      echo "</form>";
+    }
+    else
+      echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden";
+  }
+  break;
+  
 case 'changesave':
-	$sql="";
-		$vars = $_GET;
-		$count = count($vars) - 2;
-		$vars = array_splice($vars, 0, $count);
-		foreach($vars as $key => $value)
-		{
-	 		$keys = substr($key,1);
-			$sql .= ", `".$keys."`='".$value."' ";
-		}
-	$SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'";
-	SetHeaderGo2Back();
-	break;
+  $sql="";
+    $vars = $_GET;
+    $count = count($vars) - 2;
+    $vars = array_splice($vars, 0, $count);
+    foreach($vars as $key => $value)
+    {
+       $keys = substr($key,1);
+      $sql .= ", `".$keys."`='".$value."' ";
+    }
+  $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'";
+  SetHeaderGo2Back();
+  break;
 
 case 'delete':
-	if (IsSet($_GET["RID"])) {
-		$SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";		
-	} else {
-		echo "Fehlerhafter Aufruf";
-	}
-	SetHeaderGo2Back();
-	break;
+  if (IsSet($_GET["RID"])) {
+    $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";    
+  } else {
+    echo "Fehlerhafter Aufruf";
+  }
+  SetHeaderGo2Back();
+  break;
 
 } //switch
 
@@ -181,17 +181,17 @@ case 'delete':
 // Update ???
 
 if (IsSet($SQL)){ 
-//	echo $SQL; 
-	// hier muesste das SQL ausgefuehrt werden...
-	$Erg = db_query($SQL, "exec SQL");
-	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 $SQL; 
+  // hier muesste das SQL ausgefuehrt werden...
+  $Erg = db_query($SQL, "exec SQL");
+  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                
 
 } //IF IsSet($action)
 
diff --git a/www-ssl/admin/schichtplan.1.php b/www-ssl/admin/schichtplan.1.php
old mode 100755
new mode 100644
diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php
old mode 100755
new mode 100644
index ba2f8d66..af3cd7d4
--- a/www-ssl/admin/schichtplan.php
+++ b/www-ssl/admin/schichtplan.php
@@ -6,59 +6,59 @@ include ("../../../camp2011/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).")" ;
-	}
+  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 "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
+  <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` ";
+  "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";
+  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";
+  $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";
 
@@ -75,317 +75,317 @@ 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);
+  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";
+        echo "Schicht ab&auml;ndern: <br />\n";
 
-	// Anzeige Allgemeiner schaischt daten
+  // Anzeige Allgemeiner schaischt daten
         echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
         echo "<table>\n";
         echo "  <tr><td>Schichtbeginn</td>".
-		"<td><input value=\"". mysql_result($Erg, 0, "DateS"). 
-		"\" 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`";
+    "<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";
-	}
+  $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";
+  // 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 "<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";
+  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
+  //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";
+  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";
+  //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);
+  
+  // 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";
+  {
+    $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>";
+  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;
+  } // 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;
+  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;
+  $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;
+  $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;
-	
+  $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;
+  $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;
+  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);
-	}
+  // 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
 
 }
diff --git a/www-ssl/admin/schichtplan_druck.1.php b/www-ssl/admin/schichtplan_druck.1.php
old mode 100755
new mode 100644
diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php
old mode 100755
new mode 100644
index 23e65166..ef097043
--- a/www-ssl/admin/schichtplan_druck.php
+++ b/www-ssl/admin/schichtplan_druck.php
@@ -6,49 +6,49 @@ $submenus = 1;
 
 if (!IsSet($_GET["action"])) 
 {
-	include ("../../../camp2011/includes/header.php");
-	include ("../../../camp2011/includes/funktionen.php");
-	include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-	include ("../../../camp2011/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 ("../../../camp2011/includes/footer.php");
+  include ("../../../camp2011/includes/header.php");
+  include ("../../../camp2011/includes/funktionen.php");
+  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+  include ("../../../camp2011/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 ("../../../camp2011/includes/footer.php");
 } 
-else 	//#################################################################
+else   //#################################################################
 {
    if (IsSet($_GET["Raum"]) AND IsSet($_GET["ausdatum"])) 
-	{
-   	$Raum = $_GET["Raum"];
-	$ausdatum = $_GET["ausdatum"];
-
-	include ("../../../camp2011/includes/config_db.php");
-	include ("../../../camp2011/includes/config.php");
-	include ("../../../camp2011/includes/secure.php");
-	//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
-	$_SESSION['CVS'][ "admin/schichtplan.php" ] = "N";	
-	include ("../../../camp2011/includes/funktion_lang.php");
-	include ("../../../camp2011/includes/funktion_schichtplan.php");
-	include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-	include ("../../../camp2011/includes/funktion_user.php");
-	?>
+  {
+     $Raum = $_GET["Raum"];
+  $ausdatum = $_GET["ausdatum"];
+
+  include ("../../../camp2011/includes/config_db.php");
+  include ("../../../camp2011/includes/config.php");
+  include ("../../../camp2011/includes/secure.php");
+  //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
+  $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N";  
+  include ("../../../camp2011/includes/funktion_lang.php");
+  include ("../../../camp2011/includes/funktion_schichtplan.php");
+  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+  include ("../../../camp2011/includes/funktion_user.php");
+  ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -67,55 +67,55 @@ else 	//#################################################################
 <h1>Schichtplan</h1>
 
 <table>
-	<tr>
-		<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>
+  <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
+  <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";
-			
-		}
-	}
+  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];
+  for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i];
 // Ende
 echo "</table>\n";
 
diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php
old mode 100755
new mode 100644
index 7c64543f..34c248fa
--- a/www-ssl/admin/shiftadd.php
+++ b/www-ssl/admin/shiftadd.php
@@ -6,61 +6,61 @@ include ("../../../camp2011/includes/header.php");
 
 $Time = time()+3600+3600;
 
-echo "Hallo ".$_SESSION['Nick'].",<br>\n";
+echo "Hallo ".$_SESSION['Nick'].",<br />\n";
 
 // erstellt ein Array der Reume
-	$sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`";
-	$Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
+  $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");
-	}
+  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);
+  $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");
-	}
+  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";
+  $_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";
+  $_GET["NachtON"] = "OFF";
 if( !isset($_GET["MoreThenOne"]))
-	$_GET["MoreThenOne"] = "OFF";
+  $_GET["MoreThenOne"] = "OFF";
 if( isset( $_GET["SchichtName"]))
 {
-	foreach ($_GET as $k => $v)
-	{
-		$_SESSION['shiftadd.php'][$k] = $v;
-	}
+  foreach ($_GET as $k => $v)
+  {
+    $_SESSION['shiftadd.php'][$k] = $v;
+  }
 }
 
 
 if (!IsSet($_GET["action"])) 
-	$_GET["action"] = "new";
+  $_GET["action"] = "new";
 
 switch( $_GET["action"])
 {
@@ -70,187 +70,187 @@ Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende d
 &Uuml;ber die L&auml;nge der Schichten errechnet sich dadurch die Anzahl dieser. Dadurch k&ouml;nnen gleich
 mehrere Schichten auf einmal erfasst werden:
 
-<form action="<?PHP echo $_SERVER['SCRIPT_NAME']; ?>" >
+<form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" >
   <table>
   <tr>
     <td align="right">Name:</td>
-    <td><input type="text" name="SchichtName" size="50" value="<?PHP echo $_SESSION["shiftadd.php"]["SchichtName"]; ?>"></td>
+    <td><input type="text" name="SchichtName" size="50" value="<?php echo $_SESSION["shiftadd.php"]["SchichtName"]; ?>"></td>
   </tr>
   <tr>
     <td align="right">Ort:</td>
     <td><select name="RID">
-<?PHP
-	foreach ($Room As $RTemp)
-	{
-		echo "\t<option value=\"". $RTemp["RID"]. "\"";
-		if( $RTemp["RID"] == $_SESSION["shiftadd.php"]["RID"])
-			echo " SELECTED";
-		echo ">". $RTemp["Name"]. "</option>\n";
-	}
-	?>
+<?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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <td><input type="checkbox" name="NachtON" value="ON" <?php 
+      if($_SESSION["shiftadd.php"]["NachtON"]=="ON")
+    echo " CHECKED";
+  ?>></td>
   </tr>
   <tr>
     <td align="right">Sonder in h (Time;Time):</td>
-    <td><input type="text" name="len_night" size="50" value="<?PHP echo $_SESSION["shiftadd.php"]["len_night"]; ?>"></td>
+    <td><input type="text" name="len_night" size="50" value="<?php echo $_SESSION["shiftadd.php"]["len_night"]; ?>"></td>
   </tr>
   
   <tr><td><u>Anzahl Engel je Type:</u></td></tr>
-<?PHP
-	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";
-	}
+<?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>
+ <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
+<?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"]);
+  $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( 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;
+  break;
 
 } // end switch
 
@@ -258,100 +258,100 @@ case 'engeldel':
 
 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";
+  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 ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php
old mode 100755
new mode 100644
index 050b0736..ebf1db32
--- a/www-ssl/admin/sprache.php
+++ b/www-ssl/admin/sprache.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Sprache";
 $header = "Liste der existierenden Sprcheintr&auml;ge";
@@ -7,114 +7,114 @@ include ("../../../camp2011/includes/header.php");
 
 if( !isset( $_GET["TextID"] )  )
 {
-	echo Get_Text("Hello").$_SESSION['Nick'].", <br>\n";
-	echo Get_Text("pub_sprache_text1")."<br><br>\n";
+  echo Get_Text("Hello").$_SESSION['Nick'].", <br />\n";
+  echo Get_Text("pub_sprache_text1")."<br /><br />\n";
 
-	echo "<a href=\"?ShowEntry=y\">". Get_Text("pub_sprache_ShowEntry"). "</a>";
-	// ausgabe Tabellenueberschift
-	$SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;";
-	$erg_Sprachen = mysql_query($SQL_Sprachen, $con);
-	echo mysql_error($con);
-	
-	for( $i=0; $i<mysql_num_rows( $erg_Sprachen ); $i++ )
-		$Sprachen[mysql_result( $erg_Sprachen, $i, "Sprache" )] = $i;
+  echo "<a href=\"?ShowEntry=y\">". Get_Text("pub_sprache_ShowEntry"). "</a>";
+  // ausgabe Tabellenueberschift
+  $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;";
+  $erg_Sprachen = mysql_query($SQL_Sprachen, $con);
+  echo mysql_error($con);
+  
+  for( $i=0; $i<mysql_num_rows( $erg_Sprachen ); $i++ )
+    $Sprachen[mysql_result( $erg_Sprachen, $i, "Sprache" )] = $i;
 
-	echo "\t<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n\t\t<tr>";
-	echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_TextID"). "</b></td>";
-	foreach( $Sprachen as $Name => $Value )
-		echo "<td class=\"contenttopic\"><b>". 
-			Get_Text("pub_sprache_Sprache"). " ". $Name.
-			"</b></td>";
-	echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_Edit"). "</b></td>";
-	echo "\t\t</tr>";
+  echo "\t<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n\t\t<tr>";
+  echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_TextID"). "</b></td>";
+  foreach( $Sprachen as $Name => $Value )
+    echo "<td class=\"contenttopic\"><b>". 
+      Get_Text("pub_sprache_Sprache"). " ". $Name.
+      "</b></td>";
+  echo "\t\t<td class=\"contenttopic\"><b>". Get_Text("pub_sprache_Edit"). "</b></td>";
+  echo "\t\t</tr>";
 
 
-	if( isset($_GET["ShowEntry"]))
-	{
-	// ausgabe eintraege
-	$SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;";
-	$erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
+  if( isset($_GET["ShowEntry"]))
+  {
+  // ausgabe eintraege
+  $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;";
+  $erg = mysql_query($SQL, $con);
+  echo mysql_error($con);
 
-	$TextID_Old = mysql_result( $erg, 0, "TextID" );
-	for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
-	{
-		$TextID_New = mysql_result( $erg, $i, "TextID" );
-		if( $TextID_Old != $TextID_New )
-		{
-			echo "<form action=\"sprache.php\">";
-			echo "<tr class=\"content\">\n";
-			echo "\t\t<td>$TextID_Old ".
-			     "<input name=\"TextID\" type=\"hidden\" value=\"$TextID_Old\"> </td>\n";
-		
-			foreach( $Sprachen as $Name => $Value )
-			{
-				$Value = html_entity_decode( $Value, ENT_QUOTES);
-				echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Value</textarea></td>\n";
-				$Sprachen[ $Name ] = "";
-			}
-			
-			echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
-			echo "</tr>";
-			echo "</form>\n";
-			$TextID_Old = $TextID_New;
-		}
-		$Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" );
-	} /*FOR*/
-	}
-	
-	//fuer neu eintraege
-	echo "<form action=\"sprache.php\">";
-	echo "<tr class=\"content\">\n";
-	echo "\t\t<td><input name=\"TextID\" type=\"text\" size=\"40\" value=\"new\"> </td>\n";
-		
-	foreach( $Sprachen as $Name => $Value )
-		echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Name Text</textarea></td>\n";
+  $TextID_Old = mysql_result( $erg, 0, "TextID" );
+  for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
+  {
+    $TextID_New = mysql_result( $erg, $i, "TextID" );
+    if( $TextID_Old != $TextID_New )
+    {
+      echo "<form action=\"sprache.php\">";
+      echo "<tr class=\"content\">\n";
+      echo "\t\t<td>$TextID_Old ".
+           "<input name=\"TextID\" type=\"hidden\" value=\"$TextID_Old\"> </td>\n";
+    
+      foreach( $Sprachen as $Name => $Value )
+      {
+        $Value = html_entity_decode( $Value, ENT_QUOTES);
+        echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Value</textarea></td>\n";
+        $Sprachen[ $Name ] = "";
+      }
+      
+      echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
+      echo "</tr>";
+      echo "</form>\n";
+      $TextID_Old = $TextID_New;
+    }
+    $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" );
+  } /*FOR*/
+  }
+  
+  //fuer neu eintraege
+  echo "<form action=\"sprache.php\">";
+  echo "<tr class=\"content\">\n";
+  echo "\t\t<td><input name=\"TextID\" type=\"text\" size=\"40\" value=\"new\"> </td>\n";
+    
+  foreach( $Sprachen as $Name => $Value )
+    echo "\t\t<td><textarea name=\"$Name\" cols=\"22\" rows=\"8\">$Name Text</textarea></td>\n";
 
-	echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
-	echo "</tr>";
-	echo "</form>\n";
-	
-	
-	echo "</table>\n";
+  echo "\t\t<td><input type=\"submit\" value=\"Save\"></td>\n";
+  echo "</tr>";
+  echo "</form>\n";
+  
+  
+  echo "</table>\n";
 } /*if( !isset( $TextID )  )*/
 else
 {
-	echo "edit: ". $_GET["TextID"]. "<br><br>";
-	foreach ($_GET as $k => $v) {
-		if( $k != "TextID" ) 
-		{
-			$sql_test = "SELECT * FROM `Sprache` ".
-				"WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'";
-			$erg_test = mysql_query($sql_test, $con);
+  echo "edit: ". $_GET["TextID"]. "<br /><br />";
+  foreach ($_GET as $k => $v) {
+    if( $k != "TextID" ) 
+    {
+      $sql_test = "SELECT * FROM `Sprache` ".
+        "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'";
+      $erg_test = mysql_query($sql_test, $con);
 
-			if( mysql_num_rows($erg_test)==0 )
-			{
-				$sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ".
-					"VALUES ('". $_GET["TextID"]. "', '$k', '$v')";
-				  echo $sql_save."<br>";
-		        	$Erg = mysql_query($sql_save, $con);
-			        if ($Erg == 1)
-			                echo "\t $k Save: OK<br>\n";
-			        else
-		        	        echo "\t $k Save: KO<br>\n";
-			}
-			else if( mysql_result($erg_test, 0, "Text")!=$v )
-			{
-				$sql_save = "UPDATE `Sprache` SET `Text`='$v' ".
-					"WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' ";
-				  echo $sql_save."<br>";
-		        	$Erg = mysql_query($sql_save, $con);
-			        if ($Erg == 1)
-			                echo "\t $k Update: OK<br>\n";
-			        else
-		        	        echo "\t $k Update: KO<br>\n";
-			}
-			else
-				echo "\t $k no changes<br>\n";
-		}
-	}
-	   
+      if( mysql_num_rows($erg_test)==0 )
+      {
+        $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ".
+          "VALUES ('". $_GET["TextID"]. "', '$k', '$v')";
+          echo $sql_save."<br />";
+              $Erg = mysql_query($sql_save, $con);
+              if ($Erg == 1)
+                      echo "\t $k Save: OK<br />\n";
+              else
+                      echo "\t $k Save: KO<br />\n";
+      }
+      else if( mysql_result($erg_test, 0, "Text")!=$v )
+      {
+        $sql_save = "UPDATE `Sprache` SET `Text`='$v' ".
+          "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' ";
+          echo $sql_save."<br />";
+              $Erg = mysql_query($sql_save, $con);
+              if ($Erg == 1)
+                      echo "\t $k Update: OK<br />\n";
+              else
+                      echo "\t $k Update: KO<br />\n";
+      }
+      else
+        echo "\t $k no changes<br />\n";
+    }
+  }
+     
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php
old mode 100755
new mode 100644
index df33494d..6fc3551e
--- a/www-ssl/admin/tshirt.php
+++ b/www-ssl/admin/tshirt.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "T-Shirt-Ausgabe";
 $header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
@@ -8,22 +8,22 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 If (IsSet($_GET["aktiv"])) {
 
-	$SQL="UPDATE `User` SET `Tshirt`='1' WHERE `UID`='". $_GET["aktiv"]. "' limit 1";
-	$Erg = mysql_query($SQL, $con);
+  $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>";
+           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>
+&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
+<?php
 $SQL = "SELECT * FROM `User` WHERE (`Aktiv`='1') ORDER BY `Nick` ASC"; 
 $Erg = mysql_query($SQL, $con);
 
@@ -31,12 +31,12 @@ $rowcount = mysql_num_rows($Erg);
 ?>
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
         <tr class="contenttopic">
-	 <td>Nick</td>
-	 <td>Aktiv?</td>
-	 <td>Gr&ouml;sse</td>
-	 <td>T-Shirt ausgeben:</td>
-	</td>
-<?PHP
+   <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");
@@ -45,9 +45,9 @@ for ($i=0; $i<$rowcount; $i++){
     echo "\t\t<td>".mysql_result($Erg, $i, "Size")."</td>\n";
 
     if (mysql_result($Erg, $i, "Tshirt") =="1") {
-	echo "\t\t<td>bereits erhalten</td>";
+  echo "\t\t<td>bereits erhalten</td>";
     } else {
-	echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
+  echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
     }
  echo "\t</tr>\n";
 }
diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php
old mode 100755
new mode 100644
index b86c2382..7d7c3a62
--- a/www-ssl/admin/user.php
+++ b/www-ssl/admin/user.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,131 +7,131 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (!IsSet($_GET["enterUID"]))
 {
-	// Userliste, keine UID uebergeben...
-
-	echo "<a href=\"../makeuser.php\">Neuen Engel eintragen</a><br><br>\n";
-	
-	if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick";
-	$SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ".
-		"LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ".
-		"LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
-		"ORDER BY `". $_GET["OrderBy"]. "` ASC";
-	$Erg = mysql_query($SQL, $con);
-	echo mysql_error($con);
-
-	// anzahl zeilen
-	$Zeilen  = mysql_num_rows($Erg);
-
-	echo "Anzahl Engel: $Zeilen<br><br>\n";
-
-	?><table width="100%" class="border" cellpadding="2" cellspacing="1"> 
-	<tr class="contenttopic">
-		<td>
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Nick">Nick</a> |
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=CreateDate">CreateDate</a>
-		</td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Name">Name</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Vorname">Vorname</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Alter">Alter</a></td>
-		<td>
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=email">@</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=DECT">DECT</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Hometown">Hometown</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=lastLogIn">lastLogIn</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Art">Type</a> | 
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=ICQ">ICQ</a> |
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=jabber">jabber</a> |
-			<a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Group">Group</a> 
-		</td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Size">Gr&ouml;&szlig;e</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Gekommen">G</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Aktiv">A</a></td>
-		<td><a href="<?PHP echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Tshirt">T</a></td>
-		<td>&Auml;nd.</td>
-		<td>Secure</td>
-	</tr>
-
-
-	<?PHP
-	$Gekommen = 0;
-	$Active = 0;
-	$Tshirt = 0;
-	
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
-		echo "<tr class=\"content\">\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Nick"). "<br>(Create: ". mysql_result($Erg, $n, "CreateDate"). ")</td>\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Vorname")."</td>\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Alter")."</td>\n";
-		echo "\t<td>";
-			if( strlen( mysql_result($Erg, $n, "Telefon"))>0)
-				echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "<br>";
-			if( strlen( mysql_result($Erg, $n, "Handy"))>0)
-				echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "<br>";
-			if( strlen( mysql_result($Erg, $n, "DECT"))>0)
-				echo "\n\t\tDECT: <a href=\"./dect.php?custum=". mysql_result($Erg, $n, "DECT"). "\">".
-					mysql_result($Erg, $n, "DECT"). "</a><br>";
-			if( strlen( mysql_result($Erg, $n, "email"))>0)
-				echo "\n\t\temail: <a href=\"mailto:".mysql_result($Erg, $n, "email")."\">".
-					mysql_result($Erg, $n, "email")."</a><br>";
-			if( strlen( mysql_result($Erg, $n, "Hometown"))>0)
-				echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "<br>";
-			if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0)
-				echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "<br>";
-			if( strlen( mysql_result($Erg, $n, "Art"))>0)
-				echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "<br>";
-			if( strlen( mysql_result($Erg, $n, "ICQ"))>0)
-				echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "<br>";
-			if( strlen( mysql_result($Erg, $n, "jabber"))>0)
-				echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "<br>";
-			echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "<br>";
-			echo "</td>\n";
-		echo "\t<td>".mysql_result($Erg, $n, "Size")."</td>\n";
-		$Gekommen += mysql_result($Erg, $n, "Gekommen");
-		echo "\t<td>".mysql_result($Erg, $n, "Gekommen")."</td>\n";
-		$Active += mysql_result($Erg, $n, "Aktiv");
-		echo "\t<td>".mysql_result($Erg, $n, "Aktiv")."</td>\n";
-		$Tshirt += mysql_result($Erg, $n, "Tshirt");
-		echo "\t<td>".mysql_result($Erg, $n, "Tshirt")."</td>\n";
-		echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
-				"admin/userChangeNormal.php?enterUID=". 
-					mysql_result($Erg, $n, "UID")."&Type=Normal",
-				"&Auml;nd.").
-			"</td>\n";
-		echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
-				"admin/userChangeSecure.php?enterUID=". 
-					mysql_result($Erg, $n, "UID")."&Type=Secure",
-				"Secure").
-			"</td>\n";
-		echo "</tr>\n";
-	}
-	echo "<tr>".
-		"<td></td><td></td><td></td><td></td><td></td><td></td>".
-		"<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td></tr>\n";
-	echo "\t</table>\n";
-	// Ende Userliste
-
-	echo "<h1>Statistics</h1>";
-	funktion_db_element_list_2row( "Hometown",
-        	                        "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
-
-	echo "<br>\n";
-
-	funktion_db_element_list_2row( "Engeltypen",
+  // Userliste, keine UID uebergeben...
+
+  echo "<a href=\"../makeuser.php\">Neuen Engel eintragen</a><br /><br />\n";
+  
+  if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick";
+  $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ".
+    "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ".
+    "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
+    "ORDER BY `". $_GET["OrderBy"]. "` ASC";
+  $Erg = mysql_query($SQL, $con);
+  echo mysql_error($con);
+
+  // anzahl zeilen
+  $Zeilen  = mysql_num_rows($Erg);
+
+  echo "Anzahl Engel: $Zeilen<br /><br />\n";
+
+  ?><table width="100%" class="border" cellpadding="2" cellspacing="1"> 
+  <tr class="contenttopic">
+    <td>
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Nick">Nick</a> |
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=CreateDate">CreateDate</a>
+    </td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Name">Name</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Vorname">Vorname</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Alter">Alter</a></td>
+    <td>
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=email">@</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=DECT">DECT</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Hometown">Hometown</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=lastLogIn">lastLogIn</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Art">Type</a> | 
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=ICQ">ICQ</a> |
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=jabber">jabber</a> |
+      <a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Group">Group</a> 
+    </td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Size">Gr&ouml;&szlig;e</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Gekommen">G</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Aktiv">A</a></td>
+    <td><a href="<?php echo $_SERVER["PHP_SELF"]; ?>?OrderBy=Tshirt">T</a></td>
+    <td>&Auml;nd.</td>
+    <td>Secure</td>
+  </tr>
+
+
+  <?php
+  $Gekommen = 0;
+  $Active = 0;
+  $Tshirt = 0;
+  
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
+    echo "<tr class=\"content\">\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Nick"). "<br />(Create: ". mysql_result($Erg, $n, "CreateDate"). ")</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Name")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Vorname")."</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Alter")."</td>\n";
+    echo "\t<td>";
+      if( strlen( mysql_result($Erg, $n, "Telefon"))>0)
+        echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "<br />";
+      if( strlen( mysql_result($Erg, $n, "Handy"))>0)
+        echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "<br />";
+      if( strlen( mysql_result($Erg, $n, "DECT"))>0)
+        echo "\n\t\tDECT: <a href=\"./dect.php?custum=". mysql_result($Erg, $n, "DECT"). "\">".
+          mysql_result($Erg, $n, "DECT"). "</a><br />";
+      if( strlen( mysql_result($Erg, $n, "email"))>0)
+        echo "\n\t\temail: <a href=\"mailto:".mysql_result($Erg, $n, "email")."\">".
+          mysql_result($Erg, $n, "email")."</a><br />";
+      if( strlen( mysql_result($Erg, $n, "Hometown"))>0)
+        echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "<br />";
+      if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0)
+        echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "<br />";
+      if( strlen( mysql_result($Erg, $n, "Art"))>0)
+        echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "<br />";
+      if( strlen( mysql_result($Erg, $n, "ICQ"))>0)
+        echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "<br />";
+      if( strlen( mysql_result($Erg, $n, "jabber"))>0)
+        echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "<br />";
+      echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "<br />";
+      echo "</td>\n";
+    echo "\t<td>".mysql_result($Erg, $n, "Size")."</td>\n";
+    $Gekommen += mysql_result($Erg, $n, "Gekommen");
+    echo "\t<td>".mysql_result($Erg, $n, "Gekommen")."</td>\n";
+    $Active += mysql_result($Erg, $n, "Aktiv");
+    echo "\t<td>".mysql_result($Erg, $n, "Aktiv")."</td>\n";
+    $Tshirt += mysql_result($Erg, $n, "Tshirt");
+    echo "\t<td>".mysql_result($Erg, $n, "Tshirt")."</td>\n";
+    echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
+        "admin/userChangeNormal.php?enterUID=". 
+          mysql_result($Erg, $n, "UID")."&Type=Normal",
+        "&Auml;nd.").
+      "</td>\n";
+    echo "\t<td>". funktion_isLinkAllowed_addLink_OrEmpty( 
+        "admin/userChangeSecure.php?enterUID=". 
+          mysql_result($Erg, $n, "UID")."&Type=Secure",
+        "Secure").
+      "</td>\n";
+    echo "</tr>\n";
+  }
+  echo "<tr>".
+    "<td></td><td></td><td></td><td></td><td></td><td></td>".
+    "<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td></tr>\n";
+  echo "\t</table>\n";
+  // Ende Userliste
+
+  echo "<h1>Statistics</h1>";
+  funktion_db_element_list_2row( "Hometown",
+                                  "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
+
+  echo "<br />\n";
+
+  funktion_db_element_list_2row( "Engeltypen",
                                         "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
 
-	echo "<br>\n";
+  echo "<br />\n";
 
-	funktion_db_element_list_2row( "Used Groups",
-		"SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ".
-		"LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
-		"WHERE (UserCVS.GroupID!='NULL') ".
-		"GROUP BY `GroupName` ".
-		"");
+  funktion_db_element_list_2row( "Used Groups",
+    "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ".
+    "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ".
+    "WHERE (UserCVS.GroupID!='NULL') ".
+    "GROUP BY `GroupName` ".
+    "");
 }
 else
 {
-	echo "error";
+  echo "error";
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php
old mode 100755
new mode 100644
index da68a5da..a8fdb71e
--- a/www-ssl/admin/userArrived.php
+++ b/www-ssl/admin/userArrived.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Engel Arrived";
 $header = "Engel was arrived";
@@ -8,17 +8,17 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 If (IsSet($_GET["arrived"])) {
 
-	$SQL="UPDATE `User` SET `Gekommen`='1' WHERE `UID`='". $_GET["arrived"]. "' limit 1";
-	$Erg = db_query($SQL, "Set User as Gekommen");
+  $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>";
+    echo "<h2>". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\"</h2>";
         } else {
-		echo "<h1>". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"</h1>";
+    echo "<h1>". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"</h1>";
         }
 }
 
-echo Get_Text("pri_userArrived_Text1"). "<br>";
-echo Get_Text("pri_userArrived_Text2"). "<br><br>";
+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"; 
@@ -34,18 +34,18 @@ echo "\t\t<td>". Get_Text("pri_userArrived_TableTD_ArrivedSet"). "</td>\n";
 echo "\t</td>\n";
 
 for ($i=0; $i<$rowcount; $i++){
-	echo "\t<tr class=\"content\">\n";
-	$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 "\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>";
 
diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php
old mode 100755
new mode 100644
index 51c49944..6785a030
--- a/www-ssl/admin/userChangeNormal.php
+++ b/www-ssl/admin/userChangeNormal.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,128 +7,128 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (IsSet($_GET["enterUID"]))
 { 
-	// UserID wurde mit uebergeben --> Aendern...
+  // UserID wurde mit uebergeben --> Aendern...
 
-	echo "Hallo,<br>".
-	 	"hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
-		"wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
-		"dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ".
-		"Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel ".
-		"bereits sein T-Shirt erhalten hat.<br><br>\n";
+  echo "Hallo,<br />".
+     "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
+    "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
+    "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ".
+    "Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel ".
+    "bereits sein T-Shirt erhalten hat.<br /><br />\n";
 
-	echo "<form action=\"./userSaveNormal.php?action=change\" method=\"POST\">\n";
-	echo "<table border=\"0\">\n";
-	echo "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n";
+  echo "<form action=\"./userSaveNormal.php?action=change\" method=\"POST\">\n";
+  echo "<table border=\"0\">\n";
+  echo "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n";
 
-	$SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'";
-	$Erg = mysql_query($SQL, $con);
-		
-	if (mysql_num_rows($Erg) != 1) 
-		echo "<tr><td>Sorry, der Engel (UID=". $_GET["enterUID"]. 
-			") wurde in der Liste nicht gefunden.</td></tr>";
-	else
-	{
-		echo "<tr><td>\n";
-		echo "<table>\n";
-		echo "  <tr><td>Nick</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eNick\" value=\"".
-			mysql_result($Erg, 0, "Nick")."\"></td></tr>\n";
-		echo "  <tr><td>lastLogIn</td><td>".
-			"<input type=\"text\" size=\"20\" name=\"elastLogIn\" value=\"".
-			mysql_result($Erg, 0, "lastLogIn"). "\" disabled></td></tr>\n";
-		echo "  <tr><td>Name</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eName\" value=\"".
-			mysql_result($Erg, 0, "Name")."\"></td></tr>\n";
-		echo "  <tr><td>Vorname</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"".
-			mysql_result($Erg, 0, "Vorname")."\"></td></tr>\n";
-		echo "  <tr><td>Alter</td><td>".
-			"<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"".
-			mysql_result($Erg, 0, "Alter")."\"></td></tr>\n";
-		echo "  <tr><td>Telefon</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"".
-			mysql_result($Erg, 0, "Telefon")."\"></td></tr>\n";
-		echo "  <tr><td>Handy</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"".
-			mysql_result($Erg, 0, "Handy")."\"></td></tr>\n";
-		echo "  <tr><td>DECT</td><td>".
-			"<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"".
-			mysql_result($Erg, 0, "DECT")."\"></td></tr>\n";
-		echo "  <tr><td>email</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eemail\" value=\"".
-			mysql_result($Erg, 0, "email")."\"></td></tr>\n";
-		echo "  <tr><td>ICQ</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"".
-			mysql_result($Erg, 0, "ICQ")."\"></td></tr>\n";
-		echo "  <tr><td>jabber</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"".
-			mysql_result($Erg, 0, "jabber")."\"></td></tr>\n";
-		echo "  <tr><td>Size</td><td>".
-			"<input type=\"text\" size=\"5\" name=\"eSize\" value=\"".
-			mysql_result($Erg, 0, "Size")."\"></td></tr>\n";
-		echo "  <tr><td>Passwort</td><td>".
-			"<a href=\"./userSaveNormal.php?action=newpw&eUID="
-			.mysql_result($Erg, 0, "UID")."\">neues Kennwort setzen</a></td></tr>\n";
+  $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'";
+  $Erg = mysql_query($SQL, $con);
+    
+  if (mysql_num_rows($Erg) != 1) 
+    echo "<tr><td>Sorry, der Engel (UID=". $_GET["enterUID"]. 
+      ") wurde in der Liste nicht gefunden.</td></tr>";
+  else
+  {
+    echo "<tr><td>\n";
+    echo "<table>\n";
+    echo "  <tr><td>Nick</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"".
+      mysql_result($Erg, 0, "Nick")."\"></td></tr>\n";
+    echo "  <tr><td>lastLogIn</td><td>".
+      "<input type=\"text\" size=\"20\" name=\"elastLogIn\" value=\"".
+      mysql_result($Erg, 0, "lastLogIn"). "\" disabled></td></tr>\n";
+    echo "  <tr><td>Name</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eName\" value=\"".
+      mysql_result($Erg, 0, "Name")."\"></td></tr>\n";
+    echo "  <tr><td>Vorname</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"".
+      mysql_result($Erg, 0, "Vorname")."\"></td></tr>\n";
+    echo "  <tr><td>Alter</td><td>".
+      "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"".
+      mysql_result($Erg, 0, "Alter")."\"></td></tr>\n";
+    echo "  <tr><td>Telefon</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"".
+      mysql_result($Erg, 0, "Telefon")."\"></td></tr>\n";
+    echo "  <tr><td>Handy</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"".
+      mysql_result($Erg, 0, "Handy")."\"></td></tr>\n";
+    echo "  <tr><td>DECT</td><td>".
+      "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"".
+      mysql_result($Erg, 0, "DECT")."\"></td></tr>\n";
+    echo "  <tr><td>email</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"".
+      mysql_result($Erg, 0, "email")."\"></td></tr>\n";
+    echo "  <tr><td>ICQ</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"".
+      mysql_result($Erg, 0, "ICQ")."\"></td></tr>\n";
+    echo "  <tr><td>jabber</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"".
+      mysql_result($Erg, 0, "jabber")."\"></td></tr>\n";
+    echo "  <tr><td>Size</td><td>".
+      "<input type=\"text\" size=\"5\" name=\"eSize\" value=\"".
+      mysql_result($Erg, 0, "Size")."\"></td></tr>\n";
+    echo "  <tr><td>Passwort</td><td>".
+      "<a href=\"./userSaveNormal.php?action=newpw&eUID="
+      .mysql_result($Erg, 0, "UID")."\">neues Kennwort setzen</a></td></tr>\n";
  
-		// Gekommen? 
-		echo "  <tr><td>Gekommen</td><td>\n";
-		echo "      <input type=\"radio\" name=\"eGekommen\" value=\"0\"";
-		if (mysql_result($Erg, 0, "Gekommen")=='0') 
-			echo " checked"; 
-		echo ">No \n";
-		echo "      <input type=\"radio\" name=\"eGekommen\" value=\"1\"";
-		if (mysql_result($Erg, 0, "Gekommen")=='1') 
-			echo " checked";
-		echo ">Yes \n";
-		echo "</td></tr>\n";
+    // Gekommen? 
+    echo "  <tr><td>Gekommen</td><td>\n";
+    echo "      <input type=\"radio\" name=\"eGekommen\" value=\"0\"";
+    if (mysql_result($Erg, 0, "Gekommen")=='0') 
+      echo " checked"; 
+    echo ">No \n";
+    echo "      <input type=\"radio\" name=\"eGekommen\" value=\"1\"";
+    if (mysql_result($Erg, 0, "Gekommen")=='1') 
+      echo " checked";
+    echo ">Yes \n";
+    echo "</td></tr>\n";
 
-		// Aktiv?
-		echo "  <tr><td>Aktiv</td><td>\n";
-		echo "      <input type=\"radio\" name=\"eAktiv\" value=\"0\"";
-		if (mysql_result($Erg, 0, "Aktiv")=='0') 
-			echo " checked";
-		echo ">No \n";
-		echo "      <input type=\"radio\" name=\"eAktiv\" value=\"1\"";
-		if (mysql_result($Erg, 0, "Aktiv")=='1') 
-			echo " checked"; 
-		echo ">Yes \n";
-		echo "</td></tr>\n";
+    // Aktiv?
+    echo "  <tr><td>Aktiv</td><td>\n";
+    echo "      <input type=\"radio\" name=\"eAktiv\" value=\"0\"";
+    if (mysql_result($Erg, 0, "Aktiv")=='0') 
+      echo " checked";
+    echo ">No \n";
+    echo "      <input type=\"radio\" name=\"eAktiv\" value=\"1\"";
+    if (mysql_result($Erg, 0, "Aktiv")=='1') 
+      echo " checked"; 
+    echo ">Yes \n";
+    echo "</td></tr>\n";
 
-		// T-Shirt bekommen? 
-		echo "  <tr><td>T-Shirt</td><td>\n";
-		echo "      <input type=\"radio\" name=\"eTshirt\" value=\"0\"";
-		if (mysql_result($Erg, 0, "Tshirt")=='0')
-			echo " checked";
-		echo ">No \n";
-		echo "      <input type=\"radio\" name=\"eTshirt\" value=\"1\"";
-		if (mysql_result($Erg, 0, "Tshirt")=='1') 
-			echo " checked";
-		echo ">Yes \n";
-		echo "</td></tr>\n";
+    // T-Shirt bekommen? 
+    echo "  <tr><td>T-Shirt</td><td>\n";
+    echo "      <input type=\"radio\" name=\"eTshirt\" value=\"0\"";
+    if (mysql_result($Erg, 0, "Tshirt")=='0')
+      echo " checked";
+    echo ">No \n";
+    echo "      <input type=\"radio\" name=\"eTshirt\" value=\"1\"";
+    if (mysql_result($Erg, 0, "Tshirt")=='1') 
+      echo " checked";
+    echo ">Yes \n";
+    echo "</td></tr>\n";
 
-		echo "  <tr><td>Hometown</td><td>".
-			"<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"".
-			mysql_result($Erg, 0, "Hometown")."\"></td></tr>\n";
-		
-		echo "</table>\n</td><td valign=\"top\">". displayavatar($_GET["enterUID"], FALSE). "</td></tr>";
-	}
+    echo "  <tr><td>Hometown</td><td>".
+      "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"".
+      mysql_result($Erg, 0, "Hometown")."\"></td></tr>\n";
+    
+    echo "</table>\n</td><td valign=\"top\">". displayavatar($_GET["enterUID"], FALSE). "</td></tr>";
+  }
 
-	echo "</td></tr>\n";
-	echo "</table>\n<br>\n";
-	echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-	echo "<input type=\"submit\" value=\"sichern...\">\n";
-	echo "</form>";
+  echo "</td></tr>\n";
+  echo "</table>\n<br />\n";
+  echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+  echo "<input type=\"submit\" value=\"sichern...\">\n";
+  echo "</form>";
 
-	echo "<form action=\"./userSaveNormal.php?action=delete\" method=\"POST\">\n";
-	echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-	echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
-	echo "</form>";
+  echo "<form action=\"./userSaveNormal.php?action=delete\" method=\"POST\">\n";
+  echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+  echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
+  echo "</form>";
 
-	
-	echo "<hr>";
-	funktion_db_element_list_2row( 
-		"Freeloader Shifts", 
-		"SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); 
+  
+  echo "<hr>";
+  funktion_db_element_list_2row( 
+    "Freeloader Shifts", 
+    "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); 
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php
old mode 100755
new mode 100644
index c1799fb8..2eb84b85
--- a/www-ssl/admin/userChangeSecure.php
+++ b/www-ssl/admin/userChangeSecure.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Editieren der Engelliste";
@@ -7,103 +7,103 @@ include ("../../../camp2011/includes/funktion_db_list.php");
 
 if (IsSet($_GET["enterUID"]))
 { 
-	// UserID wurde mit uebergeben --> Aendern...
+  // UserID wurde mit uebergeben --> Aendern...
 
-	echo "Hallo,<br>".
-	 	"hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
-		"wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
-		"dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ".
-		"Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel ".
-		"bereits sein T-Shirt erhalten hat.<br><br>\n";
+  echo "Hallo,<br />".
+     "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' ".
+    "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ".
+    "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ".
+    "Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel ".
+    "bereits sein T-Shirt erhalten hat.<br /><br />\n";
 
 
-	$SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'";
-	$Erg_CVS =  mysql_query($SQL_CVS, $con);
-		
-	if( mysql_num_rows($Erg_CVS) != 1) 
-		echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden.";
-	else
-	{
-		// Rename if is an group
-		if( $_GET["enterUID"] < 0 ) {
-			$SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'";
-		        $ErgName = mysql_query($SQLname, $con);
-		        echo mysql_error($con);
+  $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'";
+  $Erg_CVS =  mysql_query($SQL_CVS, $con);
+    
+  if( mysql_num_rows($Erg_CVS) != 1) 
+    echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden.";
+  else
+  {
+    // Rename if is an group
+    if( $_GET["enterUID"] < 0 ) {
+      $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'";
+            $ErgName = mysql_query($SQLname, $con);
+            echo mysql_error($con);
 
-			echo "<form action=\"./userSaveSecure.php?action=changeGroupName\" method=\"POST\">\n";
-			echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-			echo "<input type=\"text\" name=\"GroupName\" value=\"". mysql_result($ErgName, 0, "Name"). "\">\n";
-			echo "<input type=\"submit\" value=\"rename\">\n";
-			echo "</form>";
-		}
+      echo "<form action=\"./userSaveSecure.php?action=changeGroupName\" method=\"POST\">\n";
+      echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+      echo "<input type=\"text\" name=\"GroupName\" value=\"". mysql_result($ErgName, 0, "Name"). "\">\n";
+      echo "<input type=\"submit\" value=\"rename\">\n";
+      echo "</form>";
+    }
 
-		echo "<form action=\"./userSaveSecure.php?action=change\" method=\"POST\">\n";
-		echo "<table border=\"0\">\n";
-		echo "<input type=\"hidden\" name=\"Type\" value=\"Secure\">\n";
-		echo "  <tr><td><br><u>Rights of \"". UID2Nick($_GET["enterUID"]). "\":</u></td></tr>\n";
+    echo "<form action=\"./userSaveSecure.php?action=change\" method=\"POST\">\n";
+    echo "<table border=\"0\">\n";
+    echo "<input type=\"hidden\" name=\"Type\" value=\"Secure\">\n";
+    echo "  <tr><td><br /><u>Rights of \"". UID2Nick($_GET["enterUID"]). "\":</u></td></tr>\n";
 
 
-		$CVS_Data = mysql_fetch_array($Erg_CVS);
-		$CVS_Data_i = 1;
-		foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
-		{
-	  		$CVS_Data_i++;
-			//nur jeder zweiter sonst wird für jeden text noch die position (Zahl) ausgegeben
-			if( $CVS_Data_i%2 && $CVS_Data_Name!="UID") 
-			{
-				if($CVS_Data_Name=="GroupID") {
-					if( $_GET["enterUID"] > 0 )
-					{
-						echo "<tr><td><b>Group</b></td>\n".
-							"<td><select name=\"GroupID\">";
+    $CVS_Data = mysql_fetch_array($Erg_CVS);
+    $CVS_Data_i = 1;
+    foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
+    {
+        $CVS_Data_i++;
+      //nur jeder zweiter sonst wird für jeden text noch die position (Zahl) ausgegeben
+      if( $CVS_Data_i%2 && $CVS_Data_Name!="UID") 
+      {
+        if($CVS_Data_Name=="GroupID") {
+          if( $_GET["enterUID"] > 0 )
+          {
+            echo "<tr><td><b>Group</b></td>\n".
+              "<td><select name=\"GroupID\">";
 
-						$SQL_Group = "SELECT * FROM `UserGroups`";
-						$Erg_Group =  mysql_query($SQL_Group, $con);
-						for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++)
-						{
-							$UID =  mysql_result($Erg_Group, $n, "UID");
-							echo "\t<option value=\"$UID\"";
-							if( $CVS_Data_Value == $UID)
-								echo " selected";
-							echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
-						}
-						echo "</select></td></tr>";
-					}
-				} else {
-					echo "<tr><td>$CVS_Data_Name</td>\n<td>";
-					echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"Y\" ";
-					if( $CVS_Data_Value == "Y" )	
-				   		echo " checked";
-					echo ">allow \n";
-					echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"N\" ";
-					if( $CVS_Data_Value == "N" )
-				    		echo " checked";
-					echo ">denied \n";
-					if( $_GET["enterUID"] > 0 )
-					{
-						echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"G\" ";
-						if( $CVS_Data_Value == "G" )
-				    			echo " checked";
-						echo ">group-setting \n";
-						echo "</td></tr>";
-				    	}
-				}
-			} //IF
-		} //Foreach	    
-		echo "</td></tr>\n";
-		
-		// Ende Formular
-		echo "</td></tr>\n";
-		echo "</table>\n<br>\n";
-		echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-		echo "<input type=\"submit\" value=\"sichern...\">\n";
-		echo "</form>";
+            $SQL_Group = "SELECT * FROM `UserGroups`";
+            $Erg_Group =  mysql_query($SQL_Group, $con);
+            for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++)
+            {
+              $UID =  mysql_result($Erg_Group, $n, "UID");
+              echo "\t<option value=\"$UID\"";
+              if( $CVS_Data_Value == $UID)
+                echo " selected";
+              echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
+            }
+            echo "</select></td></tr>";
+          }
+        } else {
+          echo "<tr><td>$CVS_Data_Name</td>\n<td>";
+          echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"Y\" ";
+          if( $CVS_Data_Value == "Y" )  
+               echo " checked";
+          echo ">allow \n";
+          echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"N\" ";
+          if( $CVS_Data_Value == "N" )
+                echo " checked";
+          echo ">denied \n";
+          if( $_GET["enterUID"] > 0 )
+          {
+            echo "<input type=\"radio\" name=\"".($CVS_Data_i-1)."\" value=\"G\" ";
+            if( $CVS_Data_Value == "G" )
+                  echo " checked";
+            echo ">group-setting \n";
+            echo "</td></tr>";
+              }
+        }
+      } //IF
+    } //Foreach      
+    echo "</td></tr>\n";
+    
+    // Ende Formular
+    echo "</td></tr>\n";
+    echo "</table>\n<br />\n";
+    echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+    echo "<input type=\"submit\" value=\"sichern...\">\n";
+    echo "</form>";
 
-		echo "<br><form action=\"./userSaveSecure.php?action=delete\" method=\"POST\">\n";
-		echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-		echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
-		echo "</form>";
-	} 
+    echo "<br /><form action=\"./userSaveSecure.php?action=delete\" method=\"POST\">\n";
+    echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+    echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
+    echo "</form>";
+  } 
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php
old mode 100755
new mode 100644
index d3564400..d4a230de
--- a/www-ssl/admin/userDefaultSetting.php
+++ b/www-ssl/admin/userDefaultSetting.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "Defalut User Setting";
 $header = "Defalut User Setting";
@@ -6,8 +6,8 @@ include ("../../../camp2011/includes/header.php");
 include ("../../../camp2011/includes/funktion_db_list.php");
 
 echo "Hallo ".$_SESSION['Nick'].
-	",<br>\nhier hast du die M&ouml;glichkeit, die Defaulteinstellungen f&uuml;r neue User einzustellen:<br><br>\n";
-				
+  ",<br />\nhier hast du die M&ouml;glichkeit, die Defaulteinstellungen f&uuml;r neue User einzustellen:<br /><br />\n";
+        
 echo "<table border=\"0\" class=\"border\">\n";
 echo "\t<tr class=\"contenttopic\">\n";
 echo "\t\t<th>Page</th>\n\t\t<th>Show</th>\n\t\t<th></th>\n";
@@ -15,55 +15,55 @@ echo "\t</tr>\n";
 
 if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"]))
 {
-	switch( $_GET["Send"])
-	{
-		case "New":
- 			$SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ".
-				"CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL";
-			$Erg = db_query( $SQL, "New user default setting");
-			if( $Erg == 1)
-				echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
-			else
-				echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
-			break;
-		case "Del":
-			echo "\t<tr class=\"content\">\n";
-			echo "\t\t<form action=\"userDefaultSetting.php\">\n";
-			echo "\t\t\t<td><input name=\"Field\" type=\"text\" value=\"". $_GET["Field"]. "\" readonly></td>\n";
-			echo "\t\t\t<td><input name=\"Default\" type=\"text\" value=\"". $_GET["Default"]. "\" readonly></td>\n";
-			echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Del sure\"></td>\n";
-			echo "\t\t</form>\n";
-			echo "\t</tr>\n";
-			break;
-		case "Del sure":
-			$SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` ";
-			$Erg = db_query( $SQL, "del user default setting");
-			if( $Erg == 1)
-				echo "<H2>Delete ".$_GET["Field"]. " succesfull</h2>\n";
-			else
-				echo "<H2>Delete ".$_GET["Field"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
-			break;
-		case "SetForAllUser":
-			$SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0";
-			$Erg = db_query( $SQL, "Set new user default setting for all user");
-			if( $Erg == 1)
-				echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull</h2>\n";
-			else
-				echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
-		case "Save":
-			$SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ".
-				"`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'";
-			$Erg = db_query( $SQL, "Save user default setting");
-			if( $Erg == 1)
-				echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
-			else
-				echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
-					"[". mysql_error(). "]<br><br>";
-			break;
-	} //SWITCH
+  switch( $_GET["Send"])
+  {
+    case "New":
+       $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ".
+        "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL";
+      $Erg = db_query( $SQL, "New user default setting");
+      if( $Erg == 1)
+        echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
+      else
+        echo "<H2>Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
+          "[". mysql_error(). "]<br /><br />";
+      break;
+    case "Del":
+      echo "\t<tr class=\"content\">\n";
+      echo "\t\t<form action=\"userDefaultSetting.php\">\n";
+      echo "\t\t\t<td><input name=\"Field\" type=\"text\" value=\"". $_GET["Field"]. "\" readonly></td>\n";
+      echo "\t\t\t<td><input name=\"Default\" type=\"text\" value=\"". $_GET["Default"]. "\" readonly></td>\n";
+      echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Del sure\"></td>\n";
+      echo "\t\t</form>\n";
+      echo "\t</tr>\n";
+      break;
+    case "Del sure":
+      $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` ";
+      $Erg = db_query( $SQL, "del user default setting");
+      if( $Erg == 1)
+        echo "<H2>Delete ".$_GET["Field"]. " succesfull</h2>\n";
+      else
+        echo "<H2>Delete ".$_GET["Field"]. " error...</h2>\n".
+          "[". mysql_error(). "]<br /><br />";
+      break;
+    case "SetForAllUser":
+      $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0";
+      $Erg = db_query( $SQL, "Set new user default setting for all user");
+      if( $Erg == 1)
+        echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull</h2>\n";
+      else
+        echo "<H2>UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...</h2>\n".
+          "[". mysql_error(). "]<br /><br />";
+    case "Save":
+      $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ".
+        "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'";
+      $Erg = db_query( $SQL, "Save user default setting");
+      if( $Erg == 1)
+        echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull</h2>\n";
+      else
+        echo "<H2>Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...</h2>\n".
+          "[". mysql_error(). "]<br /><br />";
+      break;
+  } //SWITCH
 } //IF(
 
 
@@ -79,11 +79,11 @@ $SQL_Group = "SELECT * FROM `UserGroups`";
 $Erg_Group =  mysql_query($SQL_Group, $con);
 for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++)
 {
-		$UID =  mysql_result($Erg_Group, $n, "UID");
-		echo "\t<option value=\"$UID\"";
-		if( mysql_result( $erg, 1, "Default") == $UID)
-				echo " selected";
-		echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
+    $UID =  mysql_result($Erg_Group, $n, "UID");
+    echo "\t<option value=\"$UID\"";
+    if( mysql_result( $erg, 1, "Default") == $UID)
+        echo " selected";
+    echo ">". mysql_result($Erg_Group, $n, "Name"). "</option>\n";
 }
 echo "</select></td>\n";
 echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\">\n";
@@ -93,35 +93,35 @@ echo "\t</tr>\n";
 
 for( $i=2; $i<mysql_num_rows($erg); $i++)
 {
-	echo "\t<tr class=\"content\">\n";
-	echo "\t\t<form action=\"userDefaultSetting.php\">\n";
-	echo "\t\t\t<input name=\"Field\" type=\"hidden\" value=\"". mysql_result( $erg, $i, "Field"). "\">\n";
-	echo "\t\t\t<td>". mysql_result( $erg, $i, "Field"). "</td>\n";
-	echo "\t\t\t<td>\n";
-	
-	echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"Y\"";
-	if( mysql_result( $erg, $i, "Default") == "Y")
-			echo " checked";
-	echo ">allow\n";
+  echo "\t<tr class=\"content\">\n";
+  echo "\t\t<form action=\"userDefaultSetting.php\">\n";
+  echo "\t\t\t<input name=\"Field\" type=\"hidden\" value=\"". mysql_result( $erg, $i, "Field"). "\">\n";
+  echo "\t\t\t<td>". mysql_result( $erg, $i, "Field"). "</td>\n";
+  echo "\t\t\t<td>\n";
+  
+  echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"Y\"";
+  if( mysql_result( $erg, $i, "Default") == "Y")
+      echo " checked";
+  echo ">allow\n";
 
-	echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"N\"";
-	if( mysql_result( $erg, $i, "Default") == "N")
-		echo " checked";
-	echo ">denied\n";
+  echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"N\"";
+  if( mysql_result( $erg, $i, "Default") == "N")
+    echo " checked";
+  echo ">denied\n";
 
-	echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"G\"";
-	if( mysql_result( $erg, $i, "Default") == "G")
-		echo " checked";
-	echo ">group-setting\n";
+  echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"G\"";
+  if( mysql_result( $erg, $i, "Default") == "G")
+    echo " checked";
+  echo ">group-setting\n";
 
-	echo "\t\t\t</td>\n";
-	echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\">\n";
-	echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"Del\">\n";
-	echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"SetForAllUser\"></td>\n";
-	echo "\t\t</form>\n";
-	echo "\t</tr>\n";
+  echo "\t\t\t</td>\n";
+  echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"Save\">\n";
+  echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"Del\">\n";
+  echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"SetForAllUser\"></td>\n";
+  echo "\t\t</form>\n";
+  echo "\t</tr>\n";
 }
-	
+  
 echo "\t<tr class=\"content\">\n";
 echo "\t\t<form action=\"userDefaultSetting.php\">\n";
 echo "\t\t\t<input name=\"New\" type=\"hidden\" value=\"New\">\n";
diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php
old mode 100755
new mode 100644
index 4a7f7126..b1b42f96
--- a/www-ssl/admin/userSaveNormal.php
+++ b/www-ssl/admin/userSaveNormal.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Index";
@@ -9,120 +9,120 @@ include ("../../../camp2011/includes/funktion_db.php");
 
 if (IsSet($_GET["action"])) 
 {
-	SetHeaderGo2Back();
-	echo "Gesendeter Befehl: ". $_GET["action"]. "<br>";
+  SetHeaderGo2Back();
+  echo "Gesendeter Befehl: ". $_GET["action"]. "<br />";
 
-	switch ($_GET["action"]) 
-	{
-	case "change":
-		if (IsSet($_POST["enterUID"]))
-		{
-			if ($_POST["Type"] == "Normal")
-			{
-				$SQL = "UPDATE `User` SET ";
-				$SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ".
-					"`Vorname` = '". $_POST["eVorname"]. "', ".
-					"`Telefon` = '". $_POST["eTelefon"]. "', ".
-					"`Handy` = '". $_POST["eHandy"]. "', ".
-					"`DECT` = '". $_POST["eDECT"]. "', ".
-					"`email` = '". $_POST["eemail"]. "', ".
-					"`ICQ` = '". $_POST["eICQ"]. "', ".
-					"`jabber` = '". $_POST["ejabber"]. "', ".
-					"`Size` = '". $_POST["eSize"]. "', ".
-					"`Gekommen`= '". $_POST["eGekommen"]. "', ".
-					"`Aktiv`= '". $_POST["eAktiv"]. "', ".
-					"`Tshirt` = '". $_POST["eTshirt"]. "', ".
-					"`Hometown` = '". $_POST["Hometown"]. "' ".
-					"WHERE `UID` = '". $_POST["enterUID"]. 
-					"' LIMIT 1;";
-				echo "User-";
-				$Erg = db_query($SQL, "change user details");
-				if ($Erg == 1) {
-					echo "&Auml;nderung wurde gesichert...\n";
-				} else {
-					echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-				}
-			}
-			else
-				echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
-		}
-		else
-			echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
-		break;
+  switch ($_GET["action"]) 
+  {
+  case "change":
+    if (IsSet($_POST["enterUID"]))
+    {
+      if ($_POST["Type"] == "Normal")
+      {
+        $SQL = "UPDATE `User` SET ";
+        $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ".
+          "`Vorname` = '". $_POST["eVorname"]. "', ".
+          "`Telefon` = '". $_POST["eTelefon"]. "', ".
+          "`Handy` = '". $_POST["eHandy"]. "', ".
+          "`DECT` = '". $_POST["eDECT"]. "', ".
+          "`email` = '". $_POST["eemail"]. "', ".
+          "`ICQ` = '". $_POST["eICQ"]. "', ".
+          "`jabber` = '". $_POST["ejabber"]. "', ".
+          "`Size` = '". $_POST["eSize"]. "', ".
+          "`Gekommen`= '". $_POST["eGekommen"]. "', ".
+          "`Aktiv`= '". $_POST["eAktiv"]. "', ".
+          "`Tshirt` = '". $_POST["eTshirt"]. "', ".
+          "`Hometown` = '". $_POST["Hometown"]. "' ".
+          "WHERE `UID` = '". $_POST["enterUID"]. 
+          "' LIMIT 1;";
+        echo "User-";
+        $Erg = db_query($SQL, "change user details");
+        if ($Erg == 1) {
+          echo "&Auml;nderung wurde gesichert...\n";
+        } else {
+          echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        }
+      }
+      else
+        echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
+    }
+    else
+      echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
+    break;
 
-	case "delete":
-		if (IsSet($_POST["enterUID"]))
-		{
-			echo "delate User...";
-			$SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL, "User delete");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-			
-			echo "<br>\ndelate UserCVS...";
-			$SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL2, "User CVS delete");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-			
-			echo "<br>\ndelate UserEntry...";
-			$SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
-				  "WHERE `UID`='". $_POST["enterUID"]. "';";
-			$Erg = db_query($SQL3, "delate UserEntry");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-		}
-		break;
+  case "delete":
+    if (IsSet($_POST["enterUID"]))
+    {
+      echo "delate User...";
+      $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $Erg = db_query($SQL, "User delete");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+      
+      echo "<br />\ndelate UserCVS...";
+      $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $Erg = db_query($SQL2, "User CVS delete");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+      
+      echo "<br />\ndelate UserEntry...";
+      $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
+          "WHERE `UID`='". $_POST["enterUID"]. "';";
+      $Erg = db_query($SQL3, "delate UserEntry");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+    }
+    break;
 
 
-	case "newpw":
-		echo "Bitte neues Kennwort f&uuml;r <b>";
-		// Get Nick
-		$USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'";
-		$Erg = mysql_query($USQL, $con);
-		echo mysql_result($Erg, 0, "Nick");
-		echo "</b> eingeben:<br>";
-		echo "<form action=\"./userSaveNormal.php?action=newpwsave\" method=\"POST\">\n";	
-		echo "<input type=\"Password\" name=\"ePasswort\">";
-		echo "<input type=\"Password\" name=\"ePasswort2\">";
-		echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">";
-	        echo "<input type=\"submit\" value=\"sichern...\">\n";
-	        echo "</form>";
-		break;
+  case "newpw":
+    echo "Bitte neues Kennwort f&uuml;r <b>";
+    // Get Nick
+    $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'";
+    $Erg = mysql_query($USQL, $con);
+    echo mysql_result($Erg, 0, "Nick");
+    echo "</b> eingeben:<br />";
+    echo "<form action=\"./userSaveNormal.php?action=newpwsave\" method=\"POST\">\n";  
+    echo "<input type=\"Password\" name=\"ePasswort\">";
+    echo "<input type=\"Password\" name=\"ePasswort2\">";
+    echo "<input type=\"hidden\" name=\"eUID\" value=\"". $_GET["eUID"]. "\">";
+          echo "<input type=\"submit\" value=\"sichern...\">\n";
+          echo "</form>";
+    break;
 
-	case "newpwsave":
-		if ($_POST["ePasswort"] == $_POST["ePasswort2"]) 
-		{	// beide Passwoerter passen... 
-			$_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]);
-			$SQL =	"UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ".
-				"WHERE `UID`='". $_POST["eUID"]. "'";
-			$Erg = db_query($SQL, "User new passwort");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-		} 
-		else 
-			echo "Das Passwort wurde nicht &uuml;bereinstimmend eingegeben!";
-		break;
-	} // end switch
+  case "newpwsave":
+    if ($_POST["ePasswort"] == $_POST["ePasswort2"]) 
+    {  // beide Passwoerter passen... 
+      $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]);
+      $SQL =  "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ".
+        "WHERE `UID`='". $_POST["eUID"]. "'";
+      $Erg = db_query($SQL, "User new passwort");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+    } 
+    else 
+      echo "Das Passwort wurde nicht &uuml;bereinstimmend eingegeben!";
+    break;
+  } // end switch
 
 // ende - Action ist gesetzt 
 } 
 else 
 {
-	// kein Action gesetzt -> abbruch
-	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
+  // kein Action gesetzt -> abbruch
+  echo "Unzul&auml;ssiger Aufruf.<br />Bitte neu editieren...";
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php
old mode 100755
new mode 100644
index 277c7127..e9ad6135
--- a/www-ssl/admin/userSaveSecure.php
+++ b/www-ssl/admin/userSaveSecure.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 $title = "User-Liste";
 $header = "Index";
@@ -9,168 +9,168 @@ include ("../../../camp2011/includes/funktion_db.php");
 
 if( !IsSet($_POST["enterUID"]) ) 
 {
-	$Right = "N";
+  $Right = "N";
 } elseif( $_POST["enterUID"] > 0 ) {
-	$Right = $_SESSION['CVS'][ "admin/user.php"];
+  $Right = $_SESSION['CVS'][ "admin/user.php"];
 } else {
-	$Right = $_SESSION['CVS'][ "admin/group.php"];
+  $Right = $_SESSION['CVS'][ "admin/group.php"];
 }
 
 if ( ($Right=="Y") && IsSet($_GET["action"])) 
 {
-	SetHeaderGo2Back();
-	echo "Gesendeter Befehl: ". $_GET["action"]. "<br>";
-	
-	switch ($_GET["action"]) 
-	{
-	case "change":
-		if (IsSet($_POST["enterUID"]))
-		{
-			if ($_POST["Type"] == "Secure")
-			{
-				$SQL2 = "UPDATE `UserCVS` SET ";
-			  	$SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'";
-				$Erg_CVS =  mysql_query($SQL_CVS, $con);
-				$CVS_Data = mysql_fetch_array($Erg_CVS);
-				$CVS_Data_i = 1;
-				foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
-				{
-					if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") {
-						if( $CVS_Data_Name == "GroupID")
-						{
-							if( $_POST["enterUID"] > 0 )
-								$SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', ";
-							else
-								$SQL2.= "`$CVS_Data_Name` = NULL, ";
-						} else {
-							$SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', ";
-						}
-					}
-			    		$CVS_Data_i++;
-				}
-				$SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 );
-				$SQL2.= "  WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-				echo "<br>Secure-";
-				$Erg = db_query($SQL2, "change user CVS");
-				if ($Erg == 1) {
-					echo "&Auml;nderung wurde gesichert...\n";
-				} else {
-					echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-				}
-			}
-			else
-				echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
-		}
-		else
-			echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
-		break;
+  SetHeaderGo2Back();
+  echo "Gesendeter Befehl: ". $_GET["action"]. "<br />";
+  
+  switch ($_GET["action"]) 
+  {
+  case "change":
+    if (IsSet($_POST["enterUID"]))
+    {
+      if ($_POST["Type"] == "Secure")
+      {
+        $SQL2 = "UPDATE `UserCVS` SET ";
+          $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'";
+        $Erg_CVS =  mysql_query($SQL_CVS, $con);
+        $CVS_Data = mysql_fetch_array($Erg_CVS);
+        $CVS_Data_i = 1;
+        foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) 
+        {
+          if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") {
+            if( $CVS_Data_Name == "GroupID")
+            {
+              if( $_POST["enterUID"] > 0 )
+                $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', ";
+              else
+                $SQL2.= "`$CVS_Data_Name` = NULL, ";
+            } else {
+              $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', ";
+            }
+          }
+              $CVS_Data_i++;
+        }
+        $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 );
+        $SQL2.= "  WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+        echo "<br />Secure-";
+        $Erg = db_query($SQL2, "change user CVS");
+        if ($Erg == 1) {
+          echo "&Auml;nderung wurde gesichert...\n";
+        } else {
+          echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+        }
+      }
+      else
+        echo "<h1>Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n</h1>\n";
+    }
+    else
+      echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
+    break;
 
-	case "changeGroupName":
-		if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) )
-		{
-			$SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;";
-			$Erg = db_query($SQL, "Update Group Name");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-		}
-		else
-			echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
-		break;
+  case "changeGroupName":
+    if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) )
+    {
+      $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;";
+      $Erg = db_query($SQL, "Update Group Name");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+    }
+    else
+      echo "<h1>Fehler: UserID (enterUID) wurde nicht per POST übergeben</h1>\n";
+    break;
 
-	case "delete":
-		if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) )
-		{
-			echo "delate User...";
-			$SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL, "User delete");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-			
-			echo "<br>\ndelate UserCVS...";
-			$SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL2, "User CVS delete");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-			
-			echo "<br>\ndelate UserEntry...";
-			$SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
-				  "WHERE `UID`='". $_POST["enterUID"]. "';";
-			$Erg = db_query($SQL3, "delate UserEntry");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-		} elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) {
-			echo "delate Group...";
-			$SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL, "Group delete");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-			
-			echo "<br>\ndelate UserCVS...";
-			$SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
-			$Erg = db_query($SQL2, "User CVS delete");
-			if ($Erg == 1) {
-				echo "&Auml;nderung wurde gesichert...\n";
-			} else {
-				echo "Fehler beim speichern...\n(". mysql_error($con). ")";
-			}
-			
-		}
-		break;
-	} // end switch
+  case "delete":
+    if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) )
+    {
+      echo "delate User...";
+      $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $Erg = db_query($SQL, "User delete");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+      
+      echo "<br />\ndelate UserCVS...";
+      $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $Erg = db_query($SQL2, "User CVS delete");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+      
+      echo "<br />\ndelate UserEntry...";
+      $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ".
+          "WHERE `UID`='". $_POST["enterUID"]. "';";
+      $Erg = db_query($SQL3, "delate UserEntry");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+    } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) {
+      echo "delate Group...";
+      $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $Erg = db_query($SQL, "Group delete");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+      
+      echo "<br />\ndelate UserCVS...";
+      $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;";
+      $Erg = db_query($SQL2, "User CVS delete");
+      if ($Erg == 1) {
+        echo "&Auml;nderung wurde gesichert...\n";
+      } else {
+        echo "Fehler beim speichern...\n(". mysql_error($con). ")";
+      }
+      
+    }
+    break;
+  } // end switch
 
 // ende - Action ist gesetzt 
 } elseif ( IsSet($_GET["new"]) &&  ($_SESSION['CVS']["admin/group.php"]=="Y") ) {
-	echo "Gesendeter Befehl: ". $_GET["new"]. "<br>";
-	
-	switch ($_GET["new"]) 
-	{
-	case "newGroup":
-		echo "\tGenerate new Group ID...\n";
-		$SQLid="SELECT MIN(`UID`) FROM `UserCVS`;";
-		$Erg = mysql_query( $SQLid);
-		
-		if( mysql_num_rows($Erg) == 1) {
-			$NewId = mysql_result( $Erg, 0, 0)-1;
-			$SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );";
-			$SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );";
-			echo "\t<br>Generate new UserGroup ...\n";
-			$ErgNew1 = db_query($SQLnew1, "create UserGroups Entry");
-			if ($ErgNew1 == 1) 
-			{
-				echo "\t<br>Generate new User rights...\n";
-				$ErgNew2 = db_query($SQLnew2, "UserCVS Entry");
-				if ($ErgNew1 == 1) {
-					echo "\t<br>New group was created.\n";
-				} else {
-					echo "Error on creation\n(". mysql_error($con). ")";
-				}
-			} else {
-				echo "Error on creation\n(". mysql_error($con). ")";
-			}
+  echo "Gesendeter Befehl: ". $_GET["new"]. "<br />";
+  
+  switch ($_GET["new"]) 
+  {
+  case "newGroup":
+    echo "\tGenerate new Group ID...\n";
+    $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;";
+    $Erg = mysql_query( $SQLid);
+    
+    if( mysql_num_rows($Erg) == 1) {
+      $NewId = mysql_result( $Erg, 0, 0)-1;
+      $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );";
+      $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );";
+      echo "\t<br />Generate new UserGroup ...\n";
+      $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry");
+      if ($ErgNew1 == 1) 
+      {
+        echo "\t<br />Generate new User rights...\n";
+        $ErgNew2 = db_query($SQLnew2, "UserCVS Entry");
+        if ($ErgNew1 == 1) {
+          echo "\t<br />New group was created.\n";
+        } else {
+          echo "Error on creation\n(". mysql_error($con). ")";
+        }
+      } else {
+        echo "Error on creation\n(". mysql_error($con). ")";
+      }
 
-		}
+    }
 
-		
-		break;
-	}
+    
+    break;
+  }
 } else {
-	// kein Action gesetzt -> abbruch
-	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
+  // kein Action gesetzt -> abbruch
+  echo "Unzul&auml;ssiger Aufruf.<br />Bitte neu editieren...";
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/css/grossbild.js b/www-ssl/css/grossbild.js
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style.css.old b/www-ssl/css/style.css.old
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style.css.old2 b/www-ssl/css/style.css.old2
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style1.css.old b/www-ssl/css/style1.css.old
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style2.css b/www-ssl/css/style2.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style3.css b/www-ssl/css/style3.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style4.css b/www-ssl/css/style4.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style5.css b/www-ssl/css/style5.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style7.css b/www-ssl/css/style7.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style8.css b/www-ssl/css/style8.css
old mode 100755
new mode 100644
diff --git a/www-ssl/css/style9.css b/www-ssl/css/style9.css
old mode 100755
new mode 100644
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
old mode 100755
new mode 100644
index 5bb6824e..26c261da
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -1,22 +1,22 @@
 <?php
-$title = "Index";
-$header = "FAQ";
-include ("../../camp2011/includes/header.php");
+  $title = "Index";
+  $header = "FAQ";
+  include "../../camp2011/includes/header.php";
 
+  $SQL = "SELECT * FROM `FAQ`";
+  $Erg = mysql_query($SQL, $con);
 
-$SQL = "SELECT * FROM `FAQ`";
-$Erg = mysql_query($SQL, $con);
+  // anzahl Zeilen
+  $Zeilen  = mysql_num_rows($Erg);
 
-// anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
-
-for ($n = 0 ; $n < $Zeilen ; $n++) {
-  if (mysql_result($Erg, $n, "Antwort")!="") {
-    echo "<p class='question'>".mysql_result($Erg, $n, "Frage")."</p>";
-    echo "<p class='answetion'>".mysql_result($Erg, $n, "Antwort")."</p>";
+  for ($n = 0; $n < $Zeilen; $n++) {
+    if (mysql_result($Erg, $n, "Antwort") != "") {
+      echo "<dl>";
+      echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
+      echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
+      echo "</dl>";
+    }
   }
-}
 
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-
diff --git a/www-ssl/index.php b/www-ssl/index.php
old mode 100755
new mode 100644
index 56e7223b..e61db41a
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,19 +1,15 @@
 <?php
-$title = "Index";
-$header = "Index";
-include ("../../camp2011/includes/header.php");
+  $title = "Index";
+  $header = "Index";
+  include "../../camp2011/includes/header.php";
 
-echo Get_Text("index_text1")."<br><br>";
-echo Get_Text("index_text2")."<br>";
-echo Get_Text("index_text3")."<br>";
+  echo "<p>" . Get_Text("index_text1") . "</p>\n";
+  echo "<p>" . Get_Text("index_text2") . "</p>\n";
+  echo "<p>" . Get_Text("index_text3") . "</p>\n";
 
-include ("../../camp2011/includes/login_eingabefeld.php");
+  include "../../camp2011/includes/login_eingabefeld.php";
 
-echo "<h6>".Get_Text("index_text4")."</h6>";
+  echo "<h6>" . Get_Text("index_text4") . "</h6>";
 
-//echo Get_Text("index_text5"). "<br>". $show_SSLCERT;
-
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-
-
diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php
old mode 100755
new mode 100644
index 617eafe3..ca6ee4b0
--- a/www-ssl/lageplan.php
+++ b/www-ssl/lageplan.php
@@ -1,11 +1,10 @@
 <?php
-$title = "Index";
-$header = "Lageplan";
-include ("../../camp2011/includes/header.php");
+  $title = "Index";
+  $header = "Lageplan";
+  include "../../camp2011/includes/header.php";
 
-echo "<p>". Get_Text("lageplan_text1"). "</p>";
-echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>.";
+  echo "<p>" . Get_Text("lageplan_text1") . "</p>";
+  echo "<p><img src=\"./pic/lageplan/lageplan.jpg\" alt=\"\" />";
 
-include ("../../camp2011/includes/footer.php");
+  include "../../camp2011/includes/footer.php";
 ?>
-
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
old mode 100755
new mode 100644
index d413dfc7..c137f48c
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,13 +1,12 @@
 <?php
-include ("../../camp2011/includes/config.php");
+  include "../../camp2011/includes/config.php";
 
-// Die Session zerstoeren...
-session_start();
-session_destroy ();
-// und eine neue erstellen, damit kein Erzengelmenü angezeigt wird (falls sich ein Erzengel abmeldet...)
-session_start();
-
-header("HTTP/1.1 302 Moved Temporarily");
-header("Location: ". $url. $ENGEL_ROOT);
+  // Die Session zerstoeren...
+  session_start();
+  session_destroy ();
+  // und eine neue erstellen, damit kein Erzengelmenue angezeigt wird (falls sich ein Erzengel abmeldet...)
+  session_start();
 
+  header("HTTP/1.1 302 Moved Temporarily");
+  header("Location: " . $url . $ENGEL_ROOT);
 ?>
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
old mode 100755
new mode 100644
index 340d320c..ae205a62
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -1,214 +1,181 @@
-<?PHP
-$title = "Anmeldung zum Chaos-Engel";
-$header = "";
-$success = "none"; 
-include ("../../camp2011/includes/config.php");
-include ("../../camp2011/includes/header.php");
-include ("../../camp2011/includes/config_db.php");
-include ("../../camp2011/includes/crypt.php");
-
-		
-if( isset($_POST["send"]))
-{
-	$eNick = trim($_POST["Nick"]);
-	if( $_POST["Alter"]=="")	$_POST["Alter"] = 0;
-	
-	//user vorhanden?
-	$SQLans = "SELECT UID FROM `User` WHERE `Nick`='". $_POST["Nick"]. "'";
-	$Ergans = mysql_query($SQLans, $con);
-	
-	if( strlen($_POST["Nick"]) < 2 ) 
-	{
-		$error= Get_Text("makeuser_error_nick1"). $_POST["Nick"]. Get_Text("makeuser_error_nick2");
-	} 
-	elseif( mysql_num_rows( $Ergans) > 0)
-	{
-		$error= Get_Text("makeuser_error_nick1"). $_POST["Nick"]. Get_Text("makeuser_error_nick3");
-	}
-	elseif( strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && 
-		strstr($_POST["email"], ".") == FALSE ) 
-	{
-		$error= Get_Text("makeuser_error_mail");
-	} 
-	elseif( !is_numeric($_POST["Alter"])) 
-	{
-		$error= Get_Text("makeuser_error_Alter");
-	}
-	elseif( $_POST["Passwort"] != $_POST["Passwort2"] ) 
-	{
-		$error= Get_Text("makeuser_error_password1");
-	} 
-	elseif( strlen($_POST["Passwort"]) < 6 ) 
-	{
-		$error= Get_Text("makeuser_error_password2");
-	} 
-	else 
-	{
-		$_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
-		unset($_POST["Passwort2"]);
-
-		$SQL = "INSERT INTO `User` (".
-				"`Nick` , ".	"`Name` , ".
-				"`Vorname`, ".	"`Alter` , ".
-				"`Telefon`, ".	"`DECT`, ".
-				"`Handy`, ".	"`email`, ".
-				"`ICQ`, ".	"`jabber`, ".
-				"`Size`, ".	"`Passwort`, ".
-				"`Art` , ".	"`kommentar`, ".
-				"`Hometown`,".  "`CreateDate` ) ".
-			"VALUES ( ".
-				"'". $_POST["Nick"]. "', ".		"'". $_POST["Name"]. "', ".
-				"'". $_POST["Vorname"]. "', ".		"'". $_POST["Alter"]. "', ".
-				"'". $_POST["Telefon"]. "', ".		"'". $_POST["DECT"]. "', ".
-				"'". $_POST["Handy"]. "', ".		"'". $_POST["email"]. "', ".
-				"'". $_POST["ICQ"]. "', ".		"'". $_POST["jabber"]. "', ".
-				"'". $_POST["Size"]. "', ".		"'". $_POST["Passwort"]. "', ".
-				"'". $_POST["Art"]. "', ".		"'". $_POST["kommentar"]. "', ".
-				"'". $_POST["Hometown"]. "',".		"NOW());";
-		$Erg = mysql_query($SQL, $con);
-
-		if ($Erg != 1)
-		{
-			echo Get_Text("makeuser_error_write1"). "<br>\n";
-			$error = mysql_error($con);
-		}
-		else
-		{
-			echo "<p class=\"important\">". Get_Text("makeuser_writeOK"). "\n";
-
-			$SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='". $_POST["Nick"]. "';";
-			$Erg2 = mysql_query($SQL2, $con);
-			$Data = mysql_fetch_array($Erg2);
-
-			$SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('". $Data["UID"]. "');";
-			$Erg3 = mysql_query($SQL3, $con);
-			if ($Erg3 != 1)
-			{
-				echo "<h1>". Get_Text("makeuser_error_write2"). "<br>\n";
-				$error = mysql_error($con);
-			}
-			else
-			{
-				echo Get_Text("makeuser_writeOK2"). "<br>\n";
-				echo "<h1>". Get_Text("makeuser_writeOK3"). "</h1>\n";
-			}
-			echo Get_Text("makeuser_writeOK4"). "</p><p></p>\n<br><br>\n";
-			$success="any";
-			
-			if ( isset($SubscribeMailinglist) )
-			{
-				if ( $_POST["subscribe-mailinglist"] == "")
-				{
-					$headers =	"From: ". $_POST["email"]. "\r\n" .
-							"X-Mailer: PHP/" . phpversion();
-					mail( $SubscribeMailinglist, "subject", "message", $headers);
-				}
-			}
-
-		}
-	}
-	if( isset($error) ){
-                echo "<p class=\"warning\">\n$error\n</p>\n\n";
-	}
-}
-else
-{
-	//init vars
-	$_POST["Nick"] = "";
-	$_POST["Name"] = "";
-	$_POST["Vorname"] = "";
-	$_POST["Alter"] = "";
-	$_POST["Telefon"] = "";
-	$_POST["DECT"] = "";
-	$_POST["Handy"] = "";
-	$_POST["email"] = "";
-	$_POST["subscribe-mailinglist"] = "";
-	$_POST["ICQ"] = "";
-	$_POST["jabber"] = "";
-	$_POST["Size"] = "L";
-	$_POST["Art"] = "";
-	$_POST["kommentar"] = "";
-	$_POST["Hometown"] = "";
-}
-
-if( $success=="none" ){
-echo "<h1>".Get_Text("makeuser_text0")."</h1>". "<h2>". Get_Text("makeuser_text1"). "</h2>";
-echo "\t<form action=\"\" method=\"post\">\n";
-echo "\t\t<table>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Nickname").
-	"*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"". $_POST["Nick"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Nachname"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"". $_POST["Name"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Vorname"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"". $_POST["Vorname"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Alter"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Telefon"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"". $_POST["Telefon"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_DECT"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"". $_POST["DECT"]. "\"></td><td>\n";
-echo "\t\t\t<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Handy"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"". $_POST["Handy"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_E-Mail"). 
-	"*</td><td><input type=\"text\" size=\"40\" name=\"email\" value=\"". $_POST["email"]. "\"></td></tr>\n";
-if ( isset($SubscribeMailinglist) )
-{
-	echo "\t\t\t<tr><td>". Get_Text("makeuser_subscribe-mailinglist"). 
-		"</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"". $_POST["subscribe-mailinglist"]. "\">($SubscribeMailinglist)</td></tr>\n";
-}
-echo "\t\t\t<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"". $_POST["ICQ"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"". $_POST["jabber"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_T-Shirt"). 
-	" Gr&ouml;sse*</td><td align=\"left\">\n";
-echo "\t\t\t<select name=\"Size\">\n";
-echo "\t\t\t\t<option value=\"S\"";	if ($_POST["Size"]=="S") 	echo " selected";	echo ">S</option>\n";
-echo "\t\t\t\t<option value=\"M\"";	if ($_POST["Size"]=="M") 	echo " selected";	echo ">M</option>\n";
-echo "\t\t\t\t<option value=\"L\"";	if ($_POST["Size"]=="L") 	echo " selected";	echo ">L</option>\n";
-echo "\t\t\t\t<option value=\"XL\"";	if ($_POST["Size"]=="XL") 	echo " selected";	echo ">XL</option>\n";
-echo "\t\t\t\t<option value=\"2XL\"";	if ($_POST["Size"]=="2XL") 	echo " selected";	echo ">2XL</option>\n";
-echo "\t\t\t\t<option value=\"3XL\"";	if ($_POST["Size"]=="3XL") 	echo " selected";	echo ">3XL</option>\n";
-echo "\t\t\t\t<option value=\"4XL\"";	if ($_POST["Size"]=="4XL") 	echo " selected";	echo ">4XL</option>\n";
-echo "\t\t\t\t<option value=\"5XL\"";	if ($_POST["Size"]=="5XL") 	echo " selected";	echo ">5XL</option>\n";
-echo "\t\t\t\t<option value=\"S-G\"";	if ($_POST["Size"]=="S-G") 	echo " selected";	echo ">S Girl</option>\n";
-echo "\t\t\t\t<option value=\"M-G\"";	if ($_POST["Size"]=="M-G") 	echo " selected";	echo ">M Girl</option>\n";
-echo "\t\t\t\t<option value=\"L-G\"";	if ($_POST["Size"]=="L-G") 	echo " selected";	echo ">L Girl</option>\n";
-echo "\t\t\t\t<option value=\"XL-G\"";	if ($_POST["Size"]=="XL-G") 	echo " selected";	echo ">XL Girl</option>\n";
-echo "\t\t\t</select>\n";
-echo "\t\t\t</td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Engelart"). 
-	"</td><td align=\"left\">\n";
-echo "\t\t\t<select name=\"Art\">\n";
-$Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`";
-$Erg = mysql_query($Sql, $con);
-for( $t = 0; $t < mysql_num_rows($Erg); $t++ )
-{
-	$Name = mysql_result($Erg, $t, "Name"). Get_Text("inc_schicht_engel");
-	echo "\t\t\t\t<option value=\"$Name\"";
-	if ($_POST["Art"]==$Name)
-		echo " selected"; 
-	echo ">$Name</option>\n";
-}
-echo "\t\t\t</select>\n";
-echo "\t\t\t</td>\n";
-echo "\t\t\t</tr>\n";
-echo "\t\t\t<tr>\n";
-echo "\t\t\t\t<td>". Get_Text("makeuser_text2"). "</td>\n";
-echo "\t\t\t<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
-echo "\t\t\t</tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Hometown"). 
-	"</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"". $_POST["Hometown"]. "\"></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Passwort"). 
-	"*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
-echo "\t\t\t<tr><td>". Get_Text("makeuser_Passwort2"). 
-	"*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
-echo "\t\t\t<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". 
-	Get_Text("makeuser_Anmelden"). "\"/></td></tr>\n";
-echo "\t\t</table>\n";
-echo "\t</form>\n";
-Print_Text("makeuser_text3");
-}
-
-include ("../../camp2011/includes/footer.php");
-?>
+<?php
+  $title = "Anmeldung zum Chaos-Engel";
+  $header = "";
+  $success = "none";
+
+  include "../../camp2011/includes/config.php";
+  include "../../camp2011/includes/header.php";
+  include "../../camp2011/includes/config_db.php";
+  include "../../camp2011/includes/crypt.php";
+
+  if(isset($_POST["send"])) {
+    $eNick = trim($_POST["Nick"]);
+
+    if($_POST["Alter"] == "")
+      $_POST["Alter"] = 0;
+
+    // user vorhanden?
+    $SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'";
+    $Ergans = mysql_query($SQLans, $con);
+
+    if(strlen($_POST["Nick"]) < 2)
+      $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
+    elseif(mysql_num_rows( $Ergans) > 0)
+      $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3");
+    elseif(strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false)
+      $error = Get_Text("makeuser_error_mail");
+    elseif(!is_numeric($_POST["Alter"]))
+      $error = Get_Text("makeuser_error_Alter");
+    elseif($_POST["Passwort"] != $_POST["Passwort2"])
+      $error = Get_Text("makeuser_error_password1");
+    elseif(strlen($_POST["Passwort"]) < 6)
+      $error = Get_Text("makeuser_error_password2");
+    else {
+      $_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
+      unset($_POST["Passwort2"]);
+
+      $SQL = "INSERT INTO `User` (".
+             "`Nick` , ".  "`Name` , ".
+             "`Vorname`, ".  "`Alter` , ".
+             "`Telefon`, ".  "`DECT`, ".
+             "`Handy`, ".  "`email`, ".
+             "`ICQ`, ".  "`jabber`, ".
+             "`Size`, ".  "`Passwort`, ".
+             "`Art` , ".  "`kommentar`, ".
+             "`Hometown`,".  "`CreateDate` ) ".
+             "VALUES ( ".
+             "'". $_POST["Nick"]. "', ".    "'". $_POST["Name"]. "', ".
+             "'". $_POST["Vorname"]. "', ".    "'". $_POST["Alter"]. "', ".
+             "'". $_POST["Telefon"]. "', ".    "'". $_POST["DECT"]. "', ".
+             "'". $_POST["Handy"]. "', ".    "'". $_POST["email"]. "', ".
+             "'". $_POST["ICQ"]. "', ".    "'". $_POST["jabber"]. "', ".
+             "'". $_POST["Size"]. "', ".    "'". $_POST["Passwort"]. "', ".
+             "'". $_POST["Art"]. "', ".    "'". $_POST["kommentar"]. "', ".
+             "'". $_POST["Hometown"]. "',".    "NOW());";
+      $Erg = mysql_query($SQL, $con);
+
+      if ($Erg != 1) {
+        echo Get_Text("makeuser_error_write1") . "<br />\n";
+        $error = mysql_error($con);
+      } else {
+        echo "<p class=\"important\">" . Get_Text("makeuser_writeOK") . "\n";
+
+        $SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "';";
+        $Erg2 = mysql_query($SQL2, $con);
+        $Data = mysql_fetch_array($Erg2);
+
+        $SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('" . $Data["UID"] . "');";
+        $Erg3 = mysql_query($SQL3, $con);
+
+        if ($Erg3 != 1) {
+          echo "<h1>". Get_Text("makeuser_error_write2"). "<br />\n";
+          $error = mysql_error($con);
+        } else {
+          echo Get_Text("makeuser_writeOK2") . "<br />\n";
+          echo "<h1>" . Get_Text("makeuser_writeOK3") . "</h1>\n";
+        }
+
+        echo Get_Text("makeuser_writeOK4") . "</p><p></p>\n<br /><br />\n";
+        $success = "any";
 
+        if (isset($SubscribeMailinglist)) {
+          if ($_POST["subscribe-mailinglist"] == "") {
+            $headers = "From: " . $_POST["email"] . "\r\n" .
+                       "X-Mailer: PHP/" . phpversion();
+            mail($SubscribeMailinglist, "subject", "message", $headers);
+          }
+        }
+      }
+    }
+
+    if(isset($error))
+      echo "<p class=\"warning\">\n" . $error . "\n</p>\n\n";
+  } else {
+    // init vars
+    $_POST["Nick"] = "";
+    $_POST["Name"] = "";
+    $_POST["Vorname"] = "";
+    $_POST["Alter"] = "";
+    $_POST["Telefon"] = "";
+    $_POST["DECT"] = "";
+    $_POST["Handy"] = "";
+    $_POST["email"] = "";
+    $_POST["subscribe-mailinglist"] = "";
+    $_POST["ICQ"] = "";
+    $_POST["jabber"] = "";
+    $_POST["Size"] = "L";
+    $_POST["Art"] = "";
+    $_POST["kommentar"] = "";
+    $_POST["Hometown"] = "";
+  }
+
+  if($success == "none") {
+    echo "<h1>" . Get_Text("makeuser_text0") . "</h1>\n";
+    echo "<h2>" . Get_Text("makeuser_text1") . "</h2>\n";
+    echo "<form action=\"\" method=\"post\">\n";
+    echo "<table>\n";
+    echo "<tr><td>" . Get_Text("makeuser_Nickname") . "*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"" . $_POST["Nick"] . "\" /></td></tr>\n";
+    echo "<tr><td>" . Get_Text("makeuser_Nachname") . "</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"" . $_POST["Name"] . "\" /></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Vorname") . "</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"" . $_POST["Vorname"] . "\" /></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Alter") . "</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Telefon"). "</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"". $_POST["Telefon"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_DECT"). "</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"". $_POST["DECT"]. "\"></td><td>\n";
+    echo "<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Handy"). "</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"". $_POST["Handy"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_E-Mail"). "*</td><td><input type=\"text\" size=\"40\" name=\"email\" value=\"". $_POST["email"]. "\"></td></tr>\n";
+
+    if(isset($SubscribeMailinglist))
+      echo "<tr><td>". Get_Text("makeuser_subscribe-mailinglist"). "</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"". $_POST["subscribe-mailinglist"]. "\">($SubscribeMailinglist)</td></tr>\n";
+
+    echo "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"". $_POST["ICQ"]. "\"></td></tr>\n";
+    echo "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"". $_POST["jabber"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_T-Shirt"). " Gr&ouml;sse*</td><td align=\"left\">\n";
+    echo "<select name=\"Size\">\n";
+    echo "<option value=\"S\"";  if ($_POST["Size"]=="S")   echo " selected";  echo ">S</option>\n";
+    echo "<option value=\"M\"";  if ($_POST["Size"]=="M")   echo " selected";  echo ">M</option>\n";
+    echo "<option value=\"L\"";  if ($_POST["Size"]=="L")   echo " selected";  echo ">L</option>\n";
+    echo "<option value=\"XL\"";  if ($_POST["Size"]=="XL")   echo " selected";  echo ">XL</option>\n";
+    echo "<option value=\"2XL\"";  if ($_POST["Size"]=="2XL")   echo " selected";  echo ">2XL</option>\n";
+    echo "<option value=\"3XL\"";  if ($_POST["Size"]=="3XL")   echo " selected";  echo ">3XL</option>\n";
+    echo "<option value=\"4XL\"";  if ($_POST["Size"]=="4XL")   echo " selected";  echo ">4XL</option>\n";
+    echo "<option value=\"5XL\"";  if ($_POST["Size"]=="5XL")   echo " selected";  echo ">5XL</option>\n";
+    echo "<option value=\"S-G\"";  if ($_POST["Size"]=="S-G")   echo " selected";  echo ">S Girl</option>\n";
+    echo "<option value=\"M-G\"";  if ($_POST["Size"]=="M-G")   echo " selected";  echo ">M Girl</option>\n";
+    echo "<option value=\"L-G\"";  if ($_POST["Size"]=="L-G")   echo " selected";  echo ">L Girl</option>\n";
+    echo "<option value=\"XL-G\"";  if ($_POST["Size"]=="XL-G")   echo " selected";  echo ">XL Girl</option>\n";
+    echo "</select>\n";
+    echo "</td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Engelart"). "</td><td align=\"left\">\n";
+    echo "<select name=\"Art\">\n";
+
+    $Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`";
+    $Erg = mysql_query($Sql, $con);
+
+    for($t = 0; $t < mysql_num_rows($Erg); $t++) {
+      $Name = mysql_result($Erg, $t, "Name"). Get_Text("inc_schicht_engel");
+      echo "<option value=\"" . $Name . "\"";
+
+      if($_POST["Art"]==$Name)
+        echo " selected"; 
+
+      echo ">$Name</option>\n";
+    }
+
+    echo "</select>\n";
+    echo "</td>\n";
+    echo "</tr>\n";
+    echo "<tr>\n";
+    echo "<td>". Get_Text("makeuser_text2"). "</td>\n";
+    echo "<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
+    echo "</tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Hometown"). "</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"". $_POST["Hometown"]. "\"></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Passwort"). "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
+    echo "<tr><td>". Get_Text("makeuser_Passwort2"). "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
+    echo "<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". Get_Text("makeuser_Anmelden"). "\"/></td></tr>\n";
+    echo "</table>\n";
+    echo "</form>\n";
+    Print_Text("makeuser_text3");
+  }
+
+  include "../../camp2011/includes/footer.php";
+?>
diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php
old mode 100755
new mode 100644
index 3356a81c..2bd6f86f
--- a/www-ssl/nonpublic/auth.php
+++ b/www-ssl/nonpublic/auth.php
@@ -1,66 +1,32 @@
-<?PHP
-header('Content-Type: application/json');
-
-include ("../../../camp2011/includes/config.php");
-include ("../../../camp2011/includes/config_db.php");
-
-$User = $_POST['user'];
-$Pass = $_POST['pw'];
-$SourceOuth = $_POST['so'];
-
-/*
-$User = $_GET['user'];
-$Pass = $_GET['pw'];
-$SourceOuth = $_GET['so'];
-*/
-
-/*
-$User = "admin";
-$Pass = "21232f297a57a5a743894a0e4a801fc3"; // "admin";
-$SourceOuth = 23;
-*/
-
-if ( 	isset($CurrentExternAuthPass) &&  
-	($SourceOuth == $CurrentExternAuthPass) )
-{ // User ist noch nicht angemeldet 
-	$sql = "SELECT * FROM `User` WHERE `Nick`='". $User. "'";
-	$Erg = mysql_query( $sql, $con);
-
-	if ( mysql_num_rows( $Erg)  == 1) 
-	{ // Check, ob User angemeldet wird...
-		if (mysql_result( $Erg, 0, "Passwort") == $Pass)
-		{ // Passwort ok...
-			// Session wird eingeleitet und Session-Variablen gesetzt..
-			$UID = mysql_result( $Erg, 0, "UID");
-
-			// get CVS import Data
-			$SQL = "SELECT * FROM `UserCVS` WHERE `UID`='". $UID. "'";
-			$Erg_CVS =  mysql_query($SQL, $con);
-			$CVS = mysql_fetch_array($Erg_CVS);
-			
-			$msg = array( 
-					'status' => 'success',
-					'rights' => $CVS
-					);
-			echo json_encode($msg);
-			
-		} 
-		else 
-		{
-			echo json_encode(array('status' => 'failed'));
-		}
-	} 
-	else 
-	{
-		echo json_encode(array('status' => 'failed'));
-	}
-} 
-else 
-{
-	echo json_encode(array('status' => 'failed'));
-}
-
-
+<?php
+  header("Content-Type: application/json");
+
+  include "../../../camp2011/includes/config.php";
+  include "../../../camp2011/includes/config_db.php";
+
+  $User = $_POST['user'];
+  $Pass = $_POST['pw'];
+  $SourceOuth = $_POST['so'];
+
+  if(isset($CurrentExternAuthPass) && $SourceOuth == $CurrentExternAuthPass) {
+    $sql = "SELECT * FROM `User` WHERE `Nick`='" . $User . "'";
+    $Erg = mysql_query($sql, $con);
+
+    if(mysql_num_rows($Erg) == 1) {
+      if(mysql_result($Erg, 0, "Passwort") == $Pass) {
+        $UID = mysql_result($Erg, 0, "UID");
+
+        // get CVS import Data
+        $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $UID . "'";
+        $Erg_CVS =  mysql_query($SQL, $con);
+        $CVS = mysql_fetch_array($Erg_CVS);
+
+        $msg = array('status' => 'success', 'rights' => $CVS);
+        echo json_encode($msg);
+      } else
+        echo json_encode(array('status' => 'failed'));
+    } else
+      echo json_encode(array('status' => 'failed'));
+  } else
+    echo json_encode(array('status' => 'failed'));
 ?>
-
-
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
old mode 100755
new mode 100644
index 5bbd63ce..6ddb093a
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -1,360 +1,377 @@
-<?PHP
-/* Todo: -add if-construct with configvar for user-shirt-settings 
- *      
- *
- */
-$title = "Himmel";
-$header = "Deine pers&ouml;nlichen Einstellungen";
-include ("../../../camp2011/includes/header.php");
-include ("../../../camp2011/includes/crypt.php");
-
-if (!IsSet($_POST["action"])) 
-{
-	echo Get_Text("Hallo").$_SESSION['Nick'].",<br>\n\n";
-	Print_Text(13);
+<?php
+  $title = "Himmel";
+  $header = "Deine pers&ouml;nlichen Einstellungen";
+  include "../../../camp2011/includes/header.php";
+  include "../../../camp2011/includes/crypt.php";
+
+  if(!isset($_POST["action"])) {
+    echo Get_Text("Hallo").$_SESSION['Nick'].",<br />\n\n";
+    Print_Text(13);
 ?>
-<hr width=\"100%\">
-<?PHP Print_Text("pub_einstellungen_Text_UserData");?>
+<hr width="100%">
+<?php Print_Text("pub_einstellungen_Text_UserData"); ?>
 <form action="./einstellungen.php" method="post">
-	<input type="hidden" name="action" value="setUserData">
-	<table>
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Nick"); ?></td>
-	  		<td><input type="text" name="eNick" size="23" value="<?PHP echo $_SESSION["Nick"]; ?>"></td></tr>
+  <input type="hidden" name="action" value="setUserData">
+  <table>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Nick"); ?></td>
+      <td><input type="text" name="eNick" size="23" value="<?php echo $_SESSION["Nick"]; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Name"); ?></td>
-	  		<td><input type="text" name="eName" size="23" value="<?PHP echo $_SESSION['Name']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Name"); ?></td>
+      <td><input type="text" name="eName" size="23" value="<?php echo $_SESSION['Name']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Vorname"); ?></td>
-	  		<td><input type="text" name="eVorname" size="23" value="<?PHP echo $_SESSION['Vorname']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Vorname"); ?></td>
+      <td><input type="text" name="eVorname" size="23" value="<?php echo $_SESSION['Vorname']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Alter"); ?></td>
-	  		<td><input type="text" name="eAlter" size="3" value="<?PHP echo $_SESSION['Alter']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Alter"); ?></td>
+      <td><input type="text" name="eAlter" size="3" value="<?php echo $_SESSION['Alter']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Telefon"); ?></td>
-	  		<td><input type="text" name="eTelefon" size="40" value="<?PHP echo $_SESSION['Telefon']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Telefon"); ?></td>
+      <td><input type="text" name="eTelefon" size="40" value="<?php echo $_SESSION['Telefon']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Handy"); ?></td>
-	  		<td><input type="text" name="eHandy" size="40" value="<?PHP echo $_SESSION['Handy']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Handy"); ?></td>
+      <td><input type="text" name="eHandy" size="40" value="<?php echo $_SESSION['Handy']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_DECT"); ?></td>
-	  		<td><input type="text" name="eDECT" size="4" value="<?PHP echo $_SESSION['DECT']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_DECT"); ?></td>
+      <td><input type="text" name="eDECT" size="4" value="<?php echo $_SESSION['DECT']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_email"); ?></td>
-	  		<td><input type="text" name="eemail" size="40" value="<?PHP echo $_SESSION['email']; ?>"></td></tr>
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_email"); ?></td>
+      <td><input type="text" name="eemail" size="40" value="<?php echo $_SESSION['email']; ?>"></td>
+    </tr>
 
-		<tr>	<td>ICQ</td>
-	  		<td><input type="text" name="eICQ" size="40" value="<?PHP echo $_SESSION['ICQ']; ?>"></td></tr>
+    <tr>
+      <td>ICQ</td>
+      <td><input type="text" name="eICQ" size="40" value="<?php echo $_SESSION['ICQ']; ?>"></td>
+    </tr>
 
-		<tr>	<td>jabber</td>
-	  		<td><input type="text" name="ejabber" size="40" value="<?PHP echo $_SESSION['jabber']; ?>"></td></tr>
+    <tr>
+      <td>jabber</td>
+      <td><input type="text" name="ejabber" size="40" value="<?php echo $_SESSION['jabber']; ?>"></td>
+    </tr>
 
-		<tr>	<td><?PHP Print_Text("pub_einstellungen_Hometown"); ?></td>
-	  		<td><input type="text" name="Hometown" size="40" value="<?PHP echo $_SESSION['Hometown']; ?>"></td></tr>
-<?PHP
-if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-{
+    <tr>
+      <td><?php Print_Text("pub_einstellungen_Hometown"); ?></td>
+      <td><input type="text" name="Hometown" size="40" value="<?php echo $_SESSION['Hometown']; ?>"></td>
+    </tr>
+
+<?php
+if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
 ?>
-                <tr>    <td><?PHP Print_Text("makeuser_T-Shirt"); ?></td>
-			<td><select name="Sizeid">
-        	         	<option <?php if($_SESSION['Size'] == 'S') { echo "selected"; } ?> value="S">S</option>
-                		<option <?php if($_SESSION['Size'] == 'M') { echo "selected"; } ?> value="M">M</option>
-                        	<option <?php if($_SESSION['Size'] == 'L') { echo "selected"; } ?> value="L">L</option>
-                        	<option <?php if($_SESSION['Size'] == 'XL') { echo "selected"; } ?> value="XL">XL</option>
-                        	<option <?php if($_SESSION['Size'] == 'XXL') { echo "selected"; } ?> value="XXL">XXL</option>
-                        	<option <?php if($_SESSION['Size'] == 'XXXL') { echo "selected"; } ?> value="XXXL">XXXL</option>
-	                </select></td></tr>
-<?PHP
+    <tr>
+      <td><?php Print_Text("makeuser_T-Shirt"); ?></td>
+      <td><select name="Sizeid">
+        <option <?php if($_SESSION['Size'] == 'S') { echo "selected"; } ?> value="S">S</option>
+        <option <?php if($_SESSION['Size'] == 'M') { echo "selected"; } ?> value="M">M</option>
+        <option <?php if($_SESSION['Size'] == 'L') { echo "selected"; } ?> value="L">L</option>
+        <option <?php if($_SESSION['Size'] == 'XL') { echo "selected"; } ?> value="XL">XL</option>
+        <option <?php if($_SESSION['Size'] == 'XXL') { echo "selected"; } ?> value="XXL">XXL</option>
+        <option <?php if($_SESSION['Size'] == 'XXXL') { echo "selected"; } ?> value="XXXL">XXXL</option>
+      </select></td>
+    </tr>
+<?php
 }
 ?>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  </table>
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
-
+<br />
 
-<hr width=\"100%\">
-<?PHP Print_Text(14);?>
+<hr width="100%">
+<?php Print_Text(14); ?>
 <form action="./einstellungen.php" method="post">
-	<input type="hidden" name="action" value="set">
-	<table>
-	  <tr><td><?PHP Print_Text(15); ?></td><td><input type="password" name="old" size="20"></td></tr>
-	  <tr><td><?PHP Print_Text(16); ?></td><td><input type="password" name="new1" size="20"></td></tr>
-	  <tr><td><?PHP Print_Text(17); ?></td><td><input type="password" name="new2" size="20"></td></tr>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="hidden" name="action" value="set">
+  <table>
+    <tr><td><?php Print_Text(15); ?></td><td><input type="password" name="old" size="20"></td></tr>
+    <tr><td><?php Print_Text(16); ?></td><td><input type="password" name="new1" size="20"></td></tr>
+    <tr><td><?php Print_Text(17); ?></td><td><input type="password" name="new2" size="20"></td></tr>
+  </table>
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
-
+<br />
 
 <hr width="100%">
-<br>
-<?PHP Print_Text(18); ?>
+<br />
+<?php Print_Text(18); ?>
 <form action="./einstellungen.php" method="post">
-        <input type="hidden" name="action" value="colour">
-	<table>
-	   <tr><td><?PHP Print_Text(19); ?></td>
-	   <td>
-		<select name="colourid">
-			<option <?php if($_SESSION['color'] == 1) { echo "selected"; } ?> value="1">Standard-Style</option>
-			<option <?php if($_SESSION['color'] == 2) { echo "selected"; } ?> value="2">Rot/Gelber Style</option>
-			<option <?php if($_SESSION['color'] == 3) { echo "selected"; } ?> value="3">Club-Mate Style</option>
-			<option <?php if($_SESSION['color'] == 5) { echo "selected"; } ?> value="5">Debian Style</option>
-			<option <?php if($_SESSION['color'] == 6) { echo "selected"; } ?> value="6">c-base Style</option>
-			<option <?php if($_SESSION['color'] == 7) { echo "selected"; } ?> value="7">Blau/Gelber Style </option>
-			<option <?php if($_SESSION['color'] == 8) { echo "selected"; } ?> value="8">Pastel Style</option>
-			<option <?php if($_SESSION['color'] == 4) { echo "selected"; } ?> value="4">Test Style</option>
-			<option <?php if($_SESSION['color'] == 9) { echo "selected"; } ?> value="9">Test Style 21c3 </option>
-		</select>
-	   </td></tr>
-	   <tr><td>Menu</td>
-	   	<td><input type="radio" name="eMenu" value="L"<?PHP 
-			if ($_SESSION['Menu']=='L') echo " checked"; ?>>L
-		    <input type="radio" name="eMenu" value="R"<?PHP
-			if ($_SESSION['Menu']=='R') echo " checked"; ?>>R
-	   	</td></tr>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="hidden" name="action" value="colour">
+  <table>
+     <tr>
+       <td><?php Print_Text(19); ?></td>
+       <td>
+         <select name="colourid">
+           <option <?php if($_SESSION['color'] == 1) { echo "selected"; } ?> value="1">Standard-Style</option>
+           <option <?php if($_SESSION['color'] == 2) { echo "selected"; } ?> value="2">Rot/Gelber Style</option>
+           <option <?php if($_SESSION['color'] == 3) { echo "selected"; } ?> value="3">Club-Mate Style</option>
+           <option <?php if($_SESSION['color'] == 5) { echo "selected"; } ?> value="5">Debian Style</option>
+           <option <?php if($_SESSION['color'] == 6) { echo "selected"; } ?> value="6">c-base Style</option>
+           <option <?php if($_SESSION['color'] == 7) { echo "selected"; } ?> value="7">Blau/Gelber Style </option>
+           <option <?php if($_SESSION['color'] == 8) { echo "selected"; } ?> value="8">Pastel Style</option>
+           <option <?php if($_SESSION['color'] == 4) { echo "selected"; } ?> value="4">Test Style</option>
+           <option <?php if($_SESSION['color'] == 9) { echo "selected"; } ?> value="9">Test Style 21c3 </option>
+         </select>
+       </td>
+     </tr>
+     <tr>
+       <td>Menu</td>
+       <td><input type="radio" name="eMenu" value="L"<?php if($_SESSION['Menu'] == 'L') echo " checked"; ?>>L
+           <input type="radio" name="eMenu" value="R"<?php if($_SESSION['Menu'] == 'R') echo " checked"; ?>>R
+       </td>
+     </tr>
+  </table>
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<br>
+<br />
 <hr width="100%">
-<br>
-<?PHP Print_Text(20); ?>
+<br />
+<?php Print_Text(20); ?>
 <form action="./einstellungen.php" method="post">
-        <input type="hidden" name="action" value="sprache">
-	<table>
-	   <tr><td><?PHP Print_Text(21); ?></td>
-	   <td>
-		<select name="language">
-		   <option value="DE" <?php if($_SESSION['Sprache'] == 'DE') { echo "selected"; } ?>>Deutsch</option>
-		   <option value="EN" <?php if($_SESSION['Sprache'] == 'EN') { echo "selected"; } ?>>English</option>
-<?PHP /*		   <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */?>
-		</select>
-	   </td></tr>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="hidden" name="action" value="sprache" />
+  <table>
+  <tr>
+    <td><?php Print_Text(21); ?></td>
+    <td>
+      <select name="language">
+        <option value="DE" <?php if($_SESSION['Sprache'] == 'DE') { echo "selected"; } ?>>Deutsch</option>
+        <option value="EN" <?php if($_SESSION['Sprache'] == 'EN') { echo "selected"; } ?>>English</option>
+<?php /*       <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */ ?>
+      </select>
+    </td></tr>
+  </table>
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<?PHP 
-
-	
-	if( get_cfg_var("file_uploads"))
-	{
-		echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
-		echo Get_Text('pub_einstellungen_PictureUpload')."<br>";
-		echo "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
-		echo "\t<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
-		echo "\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";
-	}
-
-	switch( GetPicturShow( $_SESSION['UID']))
-	{
-		case 'Y':
-			echo Get_Text('pub_einstellungen_PictureShow'). "<br>";
-			echo displayPictur($_SESSION['UID'], 0);
-			echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-			echo "\t<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
-			echo "</form>\n";
-			break;
-		case 'N':
-			echo Get_Text('pub_einstellungen_PictureNoShow'). "<br>";
-			echo displayPictur($_SESSION['UID'], 0);
-			echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-			echo "\t<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
-			echo "</form>\n";
-			echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
-		case '':	
-			echo "<br>\n<hr width=\"100%\">\n<br>\n\n";
-			echo Get_Text(22). "<br>"; 
-			echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "\t<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
-			echo "\t<table>\n";
-			echo "\t\t<tr>\n\t\t\t<td>". Get_Text(23). "<br></td>\n\t\t</tr>\n";
-			echo "\t\t<tr>\n";
-			echo "\t\t\t<td>\n";
-		    	echo "\t\t\t\t<select name=\"eAvatar\" onChange=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\"".
-		    		"onKeyup=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
-			for ($i=1; file_exists("". "../pic/avatar/avatar$i.gif"); $i++ )
-		    		echo "\t\t\t\t\t<option value=\"$i\"". ($_SESSION['Avatar'] == $i ? " selected":""). ">avatar$i</option>\n";
-		    	echo "\t\t\t\t</select>&nbsp;&nbsp;\n";
-			echo "\t\t\t\t<img src=\"". $url. $ENGEL_ROOT. "pic/avatar/avatar". $_SESSION['Avatar']. ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
-			echo "\t\t\t</td>\n\t\t</tr>\n";
-			echo "\t</table>\n";
-			echo "\t<input type=\"submit\" value=\"". Get_Text("save"),"\">\n";
-			echo "</form>\n";
-			break;
-	} //CASE
-
-} else {
-
-switch ($_POST["action"]) {
-
-case 'set':
-  if ($_POST["new1"]==$_POST["new2"]){
-	Print_Text(25); 
-	$sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'";
-	$Erg = mysql_query($sql, $con);
-	if (PassCrypt($_POST["old"])==mysql_result($Erg, 0, "Passwort")) {
-		Print_Text(26);
-		Print_Text(27);
-		$usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' ".
-                " WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-		$Erg = mysql_query($usql, $con);
-		if ($Erg==1) {
-			Print_Text(28);
-		} else {
-			Print_Text(29);
-		}		
-	} else {
-		Print_Text(30);
-	}
+
+<?php
+  if(get_cfg_var("file_uploads")) {
+    echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+    echo Get_Text('pub_einstellungen_PictureUpload') . "<br />";
+    echo "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
+    echo "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
+    echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
+    echo "(max ". get_cfg_var("post_max_size"). "Byte)<br />\n";
+    echo "<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
+    echo "</form>\n";
+  }
+
+  switch( GetPicturShow( $_SESSION['UID'])) {
+    case 'Y':
+      echo Get_Text('pub_einstellungen_PictureShow'). "<br />";
+      echo displayPictur($_SESSION['UID'], 0);
+      echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
+      echo "</form>\n";
+      break;
+    case 'N':
+      echo Get_Text('pub_einstellungen_PictureNoShow'). "<br />";
+      echo displayPictur($_SESSION['UID'], 0);
+      echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
+      echo "</form>\n";
+      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+    case '':  
+      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+      echo Get_Text(22). "<br />"; 
+      echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
+      echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
+      echo "<table>\n";
+      echo "<tr>\n<td>". Get_Text(23). "<br /></td>\n</tr>\n";
+      echo "<tr>\n";
+      echo "<td>\n";
+      echo "<select name=\"eAvatar\" onChange=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\" onKeyup=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
+
+      for($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
+        echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
+
+      echo "</select>&nbsp;&nbsp;\n";
+      echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
+      echo "</td>\n</tr>\n";
+      echo "</table>\n";
+      echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
+      echo "</form>\n";
+      break;
+  } //CASE
+
   } else {
-	Print_Text(31);
+    switch ($_POST["action"]) {
+      case 'set':
+        if($_POST["new1"] == $_POST["new2"]) {
+          Print_Text(25); 
+          $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'";
+          $Erg = mysql_query($sql, $con);
+
+          if(PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) {
+            Print_Text(26);
+            Print_Text(27);
+            $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+           $Erg = mysql_query($usql, $con);
+
+           if ($Erg==1) {
+             Print_Text(28);
+           } else {
+             Print_Text(29);
+           }
+         } else {
+           Print_Text(30);
+         }
+       } else {
+         Print_Text(31);
+       }
+    break;
+
+    case 'colour':
+
+  $chsql="UPDATE `User` SET ".
+    "`color`= '". $_POST["colourid"]. "', ".
+    "`Menu`= '". $_POST["eMenu"]. "' ".
+    "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $Erg = mysql_query($chsql, $con);
+  echo mysql_error($con);
+  $_SESSION['color']=$_POST["colourid"];
+  $_SESSION['Menu']=$_POST["eMenu"];
+  if ($Erg==1) {
+    Print_Text(32);
+  } else {
+    Print_Text(29);
   }
-	break;
-
-case 'colour':
-
-	$chsql="UPDATE `User` SET ".
-		"`color`= '". $_POST["colourid"]. "', ".
-		"`Menu`= '". $_POST["eMenu"]. "' ".
-		"WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-	$Erg = mysql_query($chsql, $con);
-	echo mysql_error($con);
-	$_SESSION['color']=$_POST["colourid"];
-	$_SESSION['Menu']=$_POST["eMenu"];
-	if ($Erg==1) {
-		Print_Text(32);
-	} else {
-		Print_Text(29);
-	}
-	break;
+  break;
 
 case 'sprache':
 
-	$chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-	$Erg = mysql_query($chsql, $con);
-	$_SESSION['Sprache']=$_POST["language"];
-	if ($Erg==1) {
-		Print_Text(33);
-	} else {
-		Print_Text(29);
-	}
-	break;
+  $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $Erg = mysql_query($chsql, $con);
+  $_SESSION['Sprache']=$_POST["language"];
+  if ($Erg==1) {
+    Print_Text(33);
+  } else {
+    Print_Text(29);
+  }
+  break;
 
 case 'avatar':
-	$chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
         $Erg = mysql_query($chsql, $con);
-	$_SESSION['Avatar']=$_POST["eAvatar"];
-	if ($Erg==1)
-		Print_Text(34);
+  $_SESSION['Avatar']=$_POST["eAvatar"];
+  if ($Erg==1)
+    Print_Text(34);
         else
-		Print_Text(29);
+    Print_Text(29);
         break;
 
 case 'setUserData':
-	if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-	{
-		$chsql= "UPDATE `User` SET ".
-			"`Nick`='".     $_POST["eNick"].	"', `Name`='".   $_POST["eName"].  "', ".
-			"`Vorname`='".  $_POST["eVorname"].	"', `Alter`='".  $_POST["eAlter"]. "', ".
-			"`Telefon`='".  $_POST["eTelefon"].	"', `Handy`='".  $_POST["eHandy"]. "', ".
-			"`DECT`='".     $_POST["eDECT"]. 	"', `email`='".  $_POST["eemail"]. "', ".
-			"`ICQ`='".      $_POST["eICQ"].		"', `jabber`='". $_POST["ejabber"]."', ".
-			"`Hometown`='". $_POST["Hometown"].	"', `Size`='".   $_POST["Sizeid"]. "' ".
-			"WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-	}
-	else
-	{
-		$chsql= "UPDATE `User` SET ".
-			"`Nick`='".     $_POST["eNick"].	"', `Name`='".   $_POST["eName"].  "', ".
-			"`Vorname`='".  $_POST["eVorname"].	"', `Alter`='".  $_POST["eAlter"]. "', ".
-			"`Telefon`='".  $_POST["eTelefon"].	"', `Handy`='".  $_POST["eHandy"]. "', ".
-			"`DECT`='".     $_POST["eDECT"]. 	"', `email`='".  $_POST["eemail"]. "', ".
-			"`ICQ`='".      $_POST["eICQ"].		"', `jabber`='". $_POST["ejabber"]."', ".
-			"`Hometown`='". $_POST["Hometown"].	"' ".
-			"WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-	}
+  if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
+  {
+    $chsql= "UPDATE `User` SET ".
+      "`Nick`='".     $_POST["eNick"].  "', `Name`='".   $_POST["eName"].  "', ".
+      "`Vorname`='".  $_POST["eVorname"].  "', `Alter`='".  $_POST["eAlter"]. "', ".
+      "`Telefon`='".  $_POST["eTelefon"].  "', `Handy`='".  $_POST["eHandy"]. "', ".
+      "`DECT`='".     $_POST["eDECT"].   "', `email`='".  $_POST["eemail"]. "', ".
+      "`ICQ`='".      $_POST["eICQ"].    "', `jabber`='". $_POST["ejabber"]."', ".
+      "`Hometown`='". $_POST["Hometown"].  "', `Size`='".   $_POST["Sizeid"]. "' ".
+      "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
+  }
+  else
+  {
+    $chsql= "UPDATE `User` SET ".
+      "`Nick`='".     $_POST["eNick"].  "', `Name`='".   $_POST["eName"].  "', ".
+      "`Vorname`='".  $_POST["eVorname"].  "', `Alter`='".  $_POST["eAlter"]. "', ".
+      "`Telefon`='".  $_POST["eTelefon"].  "', `Handy`='".  $_POST["eHandy"]. "', ".
+      "`DECT`='".     $_POST["eDECT"].   "', `email`='".  $_POST["eemail"]. "', ".
+      "`ICQ`='".      $_POST["eICQ"].    "', `jabber`='". $_POST["ejabber"]."', ".
+      "`Hometown`='". $_POST["Hometown"].  "' ".
+      "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
+  }
         $Erg = mysql_query($chsql, $con);
 
-	if ($Erg==1) 
-	{
-		$_SESSION['Nick'] = $_POST["eNick"];
-		$_SESSION['Name'] = $_POST["eName"];
-		$_SESSION['Vorname'] = $_POST["eVorname"];
-		$_SESSION['Alter'] = $_POST["eAlter"];
-		$_SESSION['Telefon'] = $_POST["eTelefon"];
-		$_SESSION['Handy'] = $_POST["eHandy"];
-		$_SESSION['DECT'] = $_POST["eDECT"];
-		$_SESSION['email'] = $_POST["eemail"];
-		$_SESSION['ICQ'] = $_POST["eICQ"];
-		$_SESSION['jabber'] = $_POST["ejabber"];
-		$_SESSION['Hometown'] = $_POST["Hometown"];
-		if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-		{
-			$_SESSION['Size']=$_POST["Sizeid"];		
-		}
-		else if( $_SESSION['Size'] != $_POST["Sizeid"]) 
-		{
-			array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
-		}
-
-	
-		Print_Text("pub_einstellungen_UserDateSaved");
+  if ($Erg==1) 
+  {
+    $_SESSION['Nick'] = $_POST["eNick"];
+    $_SESSION['Name'] = $_POST["eName"];
+    $_SESSION['Vorname'] = $_POST["eVorname"];
+    $_SESSION['Alter'] = $_POST["eAlter"];
+    $_SESSION['Telefon'] = $_POST["eTelefon"];
+    $_SESSION['Handy'] = $_POST["eHandy"];
+    $_SESSION['DECT'] = $_POST["eDECT"];
+    $_SESSION['email'] = $_POST["eemail"];
+    $_SESSION['ICQ'] = $_POST["eICQ"];
+    $_SESSION['jabber'] = $_POST["ejabber"];
+    $_SESSION['Hometown'] = $_POST["Hometown"];
+    if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
+    {
+      $_SESSION['Size']=$_POST["Sizeid"];    
+    }
+    else if( $_SESSION['Size'] != $_POST["Sizeid"]) 
+    {
+      array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
+    }
+
+  
+    Print_Text("pub_einstellungen_UserDateSaved");
         } 
-	else
-	{
-		Print_Text(29);
-		echo mysql_error( $con);
-	}
-	break;
+  else
+  {
+    Print_Text(29);
+    echo mysql_error( $con);
+  }
+  break;
 
 case 'sendPicture':
-	if( $_FILES["file"]["size"] > 0)
-	{
-	  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( $_SESSION['UID']) == "")
-			$SQL = "INSERT INTO `UserPicture` ".
-				"( `UID`,`Bild`, `ContentType`, `show`) ".
-				"VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
-		else
-			$SQL = "UPDATE `UserPicture` SET ".
-				"`Bild`='$data', ".
-				"`ContentType`='". $_FILES["file"]["type"]. "', ".
-				"`show`='N' ".
-				"WHERE `UID`='". $_SESSION['UID']. "'";
-		
-		$res = mysql_query( $SQL, $con);
-		if( $res)
-			Print_Text("pub_einstellungen_send_OK");
-		else
-			Print_Text("pub_einstellungen_send_KO");
-	
-		echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)</h6>";
-	  }
-	  else
-		Print_Text("pub_einstellungen_send_KO");	
-	}
-	else
-		Print_Text("pub_einstellungen_send_KO");	
-	break;
+  if( $_FILES["file"]["size"] > 0)
+  {
+    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( $_SESSION['UID']) == "")
+      $SQL = "INSERT INTO `UserPicture` ".
+        "( `UID`,`Bild`, `ContentType`, `show`) ".
+        "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
+    else
+      $SQL = "UPDATE `UserPicture` SET ".
+        "`Bild`='$data', ".
+        "`ContentType`='". $_FILES["file"]["type"]. "', ".
+        "`show`='N' ".
+        "WHERE `UID`='". $_SESSION['UID']. "'";
+    
+    $res = mysql_query( $SQL, $con);
+    if( $res)
+      Print_Text("pub_einstellungen_send_OK");
+    else
+      Print_Text("pub_einstellungen_send_KO");
+  
+    echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)</h6>";
+    }
+    else
+    Print_Text("pub_einstellungen_send_KO");  
+  }
+  else
+    Print_Text("pub_einstellungen_send_KO");  
+  break;
 
 case 'delPicture':
-	$chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
+  $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
         $Erg = mysql_query($chsql, $con);
-	if ($Erg==1)
-		Print_Text("pub_einstellungen_del_OK");
+  if ($Erg==1)
+    Print_Text("pub_einstellungen_del_OK");
         else
-		Print_Text("pub_einstellungen_del_KO");
-	Break;
+    Print_Text("pub_einstellungen_del_KO");
+  Break;
 }
 }
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php
old mode 100755
new mode 100644
index ea5c6e3c..0f2892b7
--- a/www-ssl/nonpublic/engelbesprechung.php
+++ b/www-ssl/nonpublic/engelbesprechung.php
@@ -1,37 +1,27 @@
 <?php
-$title = "Himmel";
-$header = "Engelbesprechung";
-include ("../../../camp2011/includes/header.php");
-?>
-
-<br>
-
-<?php
+  $title = "Himmel";
+  $header = "Engelbesprechung";
+  include "../../../camp2011/includes/header.php";
 
-$SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC";
-$Erg = mysql_query($SQL, $con);
+  $SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC";
+  $Erg = mysql_query($SQL, $con);
 
-// anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
+  // anzahl zeilen
+  $Zeilen  = mysql_num_rows($Erg);
 
-for ($n = 0 ; $n < $Zeilen ; $n++) 
-{
-  if (mysql_result($Erg, $n, "Treffen")=="1") 
-  {
-    echo "<p class='question'><u>".mysql_result($Erg, $n, "Betreff")."</u>";
-   
-    // Schow Admin Page
-    if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" )
-	echo " <a href=\"./../admin/news.php?action=change&date=". mysql_result($Erg, $n, "Datum"). "\">[edit]</a>";
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
+    if (mysql_result($Erg, $n, "Treffen") == "1") {
+      echo "<p class='question'><u>" . mysql_result($Erg, $n, "Betreff") . "</u>";
 
-    echo "<br>&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
-    echo UID2Nick(mysql_result($Erg, $n, "UID"))."</font></p>\n";
+      // Show Admin Page
+      if($_SESSION['CVS']["admin/news.php"] == "Y")
+        echo " <a href=\"./../admin/news.php?action=change&date=". mysql_result($Erg, $n, "Datum"). "\">[edit]</a>";
 
-		
-   echo "<p class='answetion'>".nl2br(mysql_result($Erg, $n, "Text"))."</p>\n";
+      echo "<br />&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
+      echo UID2Nick(mysql_result($Erg, $n, "UID"))."</font></p>\n";
+      echo "<p class='answetion'>".nl2br(mysql_result($Erg, $n, "Text"))."</p>\n";
+    }
   }
-}
-	    
 
-include ("../../../camp2011/includes/footer.php");
+  include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php
old mode 100755
new mode 100644
index 79044c2c..7f768282
--- a/www-ssl/nonpublic/faq.php
+++ b/www-ssl/nonpublic/faq.php
@@ -1,35 +1,32 @@
 <?php
-$title = "Himmel";
-$header = "FAQ / Fragen an die Erzengel";
-include ("../../../camp2011/includes/header.php");
+  $title = "Himmel";
+  $header = "FAQ / Fragen an die Erzengel";
+  include "../../../camp2011/includes/header.php";
 
-
-// Erstaufruf, oder Frage bereits abgeschickt?
-if (!IsSet($_POST["eUID"])) 
-{
-	Print_Text(35);
+  // Erstaufruf, oder Frage bereits abgeschickt?
+  if(!isset($_POST["eUID"])) {
+    Print_Text(35);
 ?>
-<br><br>
+<br /><br />
 <form action="./faq.php" method="POST">
-  <input type="hidden" name="eUID" value="<?PHP echo $_SESSION['UID'] ?>">
-  <textarea name="frage"  cols="40" rows="10"><?PHP Print_Text(36); ?></textarea><br><br>
-  <input type="submit" value="<?PHP Print_Text("save"); ?>">
+  <input type="hidden" name="eUID" value="<?php echo $_SESSION['UID']; ?>">
+  <textarea name="frage"  cols="40" rows="10"><?php Print_Text(36); ?></textarea><br /><br />
+  <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
-<?PHP
-
+<?php
 } else {
 // Auswertung d. Formular-Daten:
 
-echo "<b>".Get_Text(37)."</b><br><br>\n".nl2br($_POST["frage"])."<br><br>\n".Get_Text(38)."<br>\n";
+echo "<b>".Get_Text(37)."</b><br /><br />\n".nl2br($_POST["frage"])."<br /><br />\n".Get_Text(38)."<br />\n";
 
 $SQL = "INSERT INTO `Questions` VALUES ('', '".$_SESSION['UID']."', '". $_POST["frage"]. "', '', '')";
 $Erg = mysql_query($SQL, $con);
 
 }
 // Bisherige Anfragen:
-echo "<br>\n<b>".Get_Text(39)."</b><br>\n";
+echo "<br />\n<b>".Get_Text(39)."</b><br />\n";
 echo "<hr width=\"99%\">\n";
-echo "<br><b>".Get_Text(40)."</b><br>\n";
+echo "<br /><b>".Get_Text(40)."</b><br />\n";
 
 $SQL = "SELECT * FROM `Questions` WHERE `UID` = ". $_SESSION['UID']. " AND `AID`='0' ORDER BY 'QID' DESC";
 $Erg = mysql_query($SQL, $con);
@@ -38,19 +35,19 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 
 if ($Zeilen==0){
-	Print_Text(41);
+  Print_Text(41);
 
 } else {
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
-	  echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br>\n";
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
+    echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br />\n";
 // Es gibt ja noch keine Antwort:
-//	  echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer"))."</p>\n";
-	  echo "\n<br>---<br>";
-	}
+//    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer"))."</p>\n";
+    echo "\n<br />---<br />";
+  }
 }
 
 echo "<hr width=\"99%\">\n";
-echo "<br><b>".Get_Text(42)."</b><br>\n";
+echo "<br /><b>".Get_Text(42)."</b><br />\n";
 $SQL = "SELECT * FROM `Questions` WHERE `UID`='".$_SESSION['UID']."' and `AID`<>'0' ORDER BY 'QID' DESC";
 $Erg = mysql_query($SQL, $con);
 
@@ -58,14 +55,14 @@ $Erg = mysql_query($SQL, $con);
 $Zeilen  = mysql_num_rows($Erg);
 
 if ($Zeilen==0){
-	Print_Text(41);
+  Print_Text(41);
 } else {
-	for ($n = 0 ; $n < $Zeilen ; $n++) {
-	  echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br>\n";
-	  echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer")).
-	  	"@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n";
-	  echo "\n<br>---<br>";
-	}
+  for ($n = 0 ; $n < $Zeilen ; $n++) {
+    echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br />\n";
+    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer")).
+      "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n";
+    echo "\n<br />---<br />";
+  }
 }
 
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
old mode 100755
new mode 100644
index 1072e2d6..a4b2e975
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -9,73 +9,73 @@ session_start(); // alte Session - falls vorhanden - wiederherstellen...
 
 function LoginOK()
 {
-	include ("../../../camp2011/includes/config.php");
-	header("HTTP/1.1 302 Moved Temporarily");
-	header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php");
+  include ("../../../camp2011/includes/config.php");
+  header("HTTP/1.1 302 Moved Temporarily");
+  header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php");
 }
 
 if ( !IsSet($_POST["user"]))
 { // User ist bereits angemeldet... normaler Inhalt...
-	LoginOK();
+  LoginOK();
 } 
 else
 { // User ist noch nicht angemeldet 
-	$sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'";
-	$userstring = mysql_query($sql, $con);
+  $sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'";
+  $userstring = mysql_query($sql, $con);
 
-	// anzahl zeilen
-	$user_anz  = mysql_num_rows($userstring);
+  // anzahl zeilen
+  $user_anz  = mysql_num_rows($userstring);
 
-	if ($user_anz == 1) { // Check, ob User angemeldet wird...
-		if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok...
-			// Session wird eingeleitet und Session-Variablen gesetzt..
-			//  session_start();
-			session_name("Himmel");
-			$_SESSION['UID'] = mysql_result($userstring, 0, "UID");
-			$_SESSION['Nick'] = mysql_result($userstring, 0, "Nick");
-			$_SESSION['Name'] = mysql_result($userstring, 0, "Name");
-			$_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname");
-			$_SESSION['Alter'] = mysql_result($userstring, 0, "Alter");
-			$_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon");
-			$_SESSION['Handy'] = mysql_result($userstring, 0, "Handy");
-			$_SESSION['DECT'] = mysql_result($userstring, 0, "DECT");
-			$_SESSION['email'] = mysql_result($userstring, 0, "email");
-			$_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ");
-			$_SESSION['jabber'] = mysql_result($userstring, 0, "jabber");
-			$_SESSION['Size'] = mysql_result($userstring, 0, "Size");
-			$_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen");
-			$_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv");
-			$_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt");
-			$_SESSION['Menu'] = mysql_result($userstring, 0, "Menu");
-			$_SESSION['color'] = mysql_result($userstring, 0, "color");
-			$_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar");
-			$_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache");
-			$_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown");
-			$_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
-		
-			// CVS import Data
-			$SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'";
-			$Erg_CVS =  mysql_query($SQL, $con);
-			$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
-			
-			LoginOK();
-		} 
-		else 
-		{ // Passwort nicht ok...
-			$ErrorText = "pub_index_pass_no_ok";
-		} // Ende Passwort-Check
-	} 
-	else 
-	{ // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
-		if ($user_anz == 0) 
-	  		$ErrorText = "pub_index_User_unset";
-		else 
-			$ErrorText = "pub_index_User_more_as_one";
-	} // Ende Check, ob User angemeldet wurde
+  if ($user_anz == 1) { // Check, ob User angemeldet wird...
+    if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok...
+      // Session wird eingeleitet und Session-Variablen gesetzt..
+      //  session_start();
+      session_name("Himmel");
+      $_SESSION['UID'] = mysql_result($userstring, 0, "UID");
+      $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick");
+      $_SESSION['Name'] = mysql_result($userstring, 0, "Name");
+      $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname");
+      $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter");
+      $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon");
+      $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy");
+      $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT");
+      $_SESSION['email'] = mysql_result($userstring, 0, "email");
+      $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ");
+      $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber");
+      $_SESSION['Size'] = mysql_result($userstring, 0, "Size");
+      $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen");
+      $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv");
+      $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt");
+      $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu");
+      $_SESSION['color'] = mysql_result($userstring, 0, "color");
+      $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar");
+      $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache");
+      $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown");
+      $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
+    
+      // CVS import Data
+      $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'";
+      $Erg_CVS =  mysql_query($SQL, $con);
+      $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
+      
+      LoginOK();
+    } 
+    else 
+    { // Passwort nicht ok...
+      $ErrorText = "pub_index_pass_no_ok";
+    } // Ende Passwort-Check
+  } 
+  else 
+  { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
+    if ($user_anz == 0) 
+        $ErrorText = "pub_index_User_unset";
+    else 
+      $ErrorText = "pub_index_User_more_as_one";
+  } // Ende Check, ob User angemeldet wurde
 } 
 include ("../../../camp2011/includes/header.php");
 if( isset($ErrorText))
-	echo "<h2>". Get_Text($ErrorText). "</h2><br>\n";
+  echo "<h2>". Get_Text($ErrorText). "</h2><br />\n";
 include ("../../../camp2011/includes/login_eingabefeld.php");
 include ("../../../camp2011/includes/footer.php");
 
diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php
old mode 100755
new mode 100644
index 2ba852d4..c85bf669
--- a/www-ssl/nonpublic/messages.php
+++ b/www-ssl/nonpublic/messages.php
@@ -1,127 +1,122 @@
 <?php
-$title = "Himmel";
-$header = "";
-
-include ("../../../camp2011/includes/header.php");
-
-If( !isset($_GET["action"]) ) 
-	$_GET["action"] = "start";
-
-switch( $_GET["action"])
-{
-	case "start":
-		echo Get_Text("Hello"). $_SESSION['Nick']. ", <br>\n";
-		echo Get_Text("pub_messages_text1"). "<br><br>\n";
-	
-		//#####################
-		//show exist Messages
-		//#####################
-		$SQL = "SELECT * FROM `Messages` WHERE `SUID`='". $_SESSION["UID"]. "' OR `RUID`='". $_SESSION["UID"]. "'";
-		$erg = mysql_query($SQL, $con);
-	
-		echo "<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-		echo "<tr>\n";
-		echo "\t<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Datum"). "</b></td>\n";
-		echo "\t<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Von"). "</b></td>\n";
-		echo "\t<td class=\"contenttopic\"><b>". Get_Text("pub_messages_An"). "</b></td>\n";
-		echo "\t<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Text"). "</b></td>\n";
-		echo "\t<td class=\"contenttopic\"></td>\n";
-		echo "</tr>\n";
-		
-		for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
-		{
-			echo "<tr class=\"content\">\n";
-			echo "\t<td>". mysql_result( $erg, $i, "Datum" ). "</td>\n";
-			echo "\t<td>". UID2Nick( mysql_result( $erg, $i, "SUID" )). "</td>\n";
-			echo "\t<td>". UID2Nick( mysql_result( $erg, $i, "RUID" )). "</td>\n";
-			echo "\t<td>". mysql_result( $erg, $i, "Text" ). "</td>\n";
-			echo "\t<td>"; 
-					
-			if( mysql_result( $erg, $i, "RUID")==$_SESSION["UID"])
-			{
-				echo "<a href=\"?action=DelMsg&Datum=". mysql_result( $erg, $i, "Datum" ). 
-					"\">". Get_Text("pub_messages_DelMsg"). "</a>";
-				if( mysql_result( $erg, $i, "isRead")=="N")
-					echo "<br><br><a href=\"?action=MarkRead&Datum=". mysql_result( $erg, $i, "Datum" ). 
-						"\">". Get_Text("pub_messages_MarkRead"). "</a>";
-			}
-			else
-			{
-				if( mysql_result( $erg, $i, "isRead")=="N")
-					echo Get_Text("pub_messages_NotRead");
-			}
-			
-			echo "</td>\n";
-			echo "</tr>\n";
-		}
-		
-		//#####################
-		//send Messeges
-		//#####################
-		echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "?action=SendMsg\" method=\"POST\" >";
-		echo "<tr class=\"content\">\n";
-		echo "\t<td></td>\n";
-		echo "\t<td></td>\n";
-		// Listet alle Nicks auf
-		echo "\t<td><select name=\"RUID\">\n";
-			$usql="SELECT * FROM `User` WHERE (`UID`!='". $_SESSION["UID"] ."') ORDER BY `Nick`";
-			$uErg = mysql_query($usql, $con);
-			$urowcount = mysql_num_rows($uErg);
-			for ($k=0; $k<$urowcount; $k++)
-			{
-				echo "\t\t\t<option value=\"".mysql_result($uErg, $k, "UID")."\">".
-					mysql_result($uErg, $k, "Nick"). "</option>\n";
-			}
-		echo "</select></td>\n";
-		echo "\t<td><textarea name=\"Text\"  cols=\"30\" rows=\"10\"></textarea></td>\n";
-		echo "\t<td><input type=\"submit\" value=\"". Get_Text("save"). "\"></td>\n";
-		echo "</tr>\n";
-		echo "</form>";
-		
-		echo "</table>\n";
-		break;
-		
-	case "SendMsg":
-		echo Get_Text("pub_messages_Send1"). "...<br>\n";
-		
-		$SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (".
-			"'". gmdate("Y-m-j H:i:s", time()). "', ".
-			"'". $_SESSION["UID"]. "', ".
-			"'". $_POST["RUID"]."', ".
-			"'". $_POST["Text"]. "');";
-		
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg == 1) 
-			echo Get_Text("pub_messages_Send_OK"). "\n";
-		else 
-			echo Get_Text("pub_messages_Send_Error"). "...\n(". mysql_error($con). ")";
-		break;
-	
-	case "MarkRead":
-		$SQL = "UPDATE `Messages` SET `isRead` = 'Y' ".
-			"WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ".
-			"LIMIT 1 ;";
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg == 1) 
-			echo Get_Text("pub_messages_MarkRead_OK"). "\n";
-		else 
-			echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")";
-		break;
-	
-	case "DelMsg":
-		$SQL = "DELETE FROM `Messages` ".
-			"WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ".
-			"LIMIT 1;";
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg == 1) 
-			echo Get_Text("pub_messages_DelMsg_OK"). "\n";
-		else 
-			echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")";
-		break;
-		
-	default:
-		echo Get_Text("pub_messages_NoCommand");
-}
-
-include ("../../../camp2011/includes/footer.php");
+  $title = "Himmel";
+  $header = "";
+
+  include "../../../camp2011/includes/header.php";
+
+  if(!isset($_GET["action"]))
+    $_GET["action"] = "start";
+
+  switch( $_GET["action"]) {
+    case "start":
+      echo Get_Text("Hello"). $_SESSION['Nick']. ", <br />\n";
+      echo Get_Text("pub_messages_text1"). "<br /><br />\n";
+
+      //show exist Messages
+      $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'";
+      $erg = mysql_query($SQL, $con);
+
+      echo "<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+      echo "<tr>\n";
+      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Datum"). "</b></td>\n";
+      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Von"). "</b></td>\n";
+      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_An"). "</b></td>\n";
+      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Text"). "</b></td>\n";
+      echo "<td class=\"contenttopic\"></td>\n";
+      echo "</tr>\n";
+
+      for($i = 0; $i < mysql_num_rows($erg); $i++) {
+        echo "<tr class=\"content\">\n";
+        echo "<td>" . mysql_result($erg, $i, "Datum") . "</td>\n";
+        echo "<td>" . UID2Nick(mysql_result($erg, $i, "SUID")) . "</td>\n";
+        echo "<td>" . UID2Nick(mysql_result($erg, $i, "RUID")) . "</td>\n";
+        echo "<td>" . mysql_result($erg, $i, "Text") . "</td>\n";
+        echo "<td>"; 
+
+        if(mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) {
+          echo "<a href=\"?action=DelMsg&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_DelMsg") . "</a>";
+
+          if(mysql_result($erg, $i, "isRead") == "N")
+            echo "<a href=\"?action=MarkRead&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_MarkRead") . "</a>";
+        } else {
+          if(mysql_result($erg, $i, "isRead") == "N")
+            echo Get_Text("pub_messages_NotRead");
+        }
+
+        echo "</td>\n";
+        echo "</tr>\n";
+    }
+
+      // send Messeges
+      echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "?action=SendMsg\" method=\"POST\">";
+      echo "<tr class=\"content\">\n";
+      echo "<td></td>\n";
+      echo "<td></td>\n";
+
+      // Listet alle Nicks auf
+      echo "<td><select name=\"RUID\">\n";
+
+      $usql="SELECT * FROM `User` WHERE (`UID`!='". $_SESSION["UID"] ."') ORDER BY `Nick`";
+      $uErg = mysql_query($usql, $con);
+      $urowcount = mysql_num_rows($uErg);
+
+      for ($k = 0; $k < $urowcount; $k++) {
+        echo "<option value=\"" . mysql_result($uErg, $k, "UID") . "\">" . mysql_result($uErg, $k, "Nick") . "</option>\n";
+      }
+
+      echo "</select></td>\n";
+      echo "<td><textarea name=\"Text\"  cols=\"30\" rows=\"10\"></textarea></td>\n";
+      echo "<td><input type=\"submit\" value=\"" . Get_Text("save") . "\"></td>\n";
+      echo "</tr>\n";
+      echo "</form>";
+
+      echo "</table>\n";
+      break;
+
+    case "SendMsg":
+      echo Get_Text("pub_messages_Send1") . "...<br />\n";
+
+    $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (".
+           "'" . gmdate("Y-m-j H:i:s", time()) . "', ".
+           "'" . $_SESSION["UID"]. "', ".
+           "'" . $_POST["RUID"]."', ".
+           "'" . $_POST["Text"]. "');";
+
+    $Erg = mysql_query($SQL, $con);
+
+    if($Erg == 1) 
+      echo Get_Text("pub_messages_Send_OK") . "\n";
+    else 
+      echo Get_Text("pub_messages_Send_Error") . "...\n(". mysql_error($con). ")";
+    break;
+
+    case "MarkRead":
+      $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ".
+             "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ".
+             "LIMIT 1 ;";
+      $Erg = mysql_query($SQL, $con);
+
+      if ($Erg == 1) 
+        echo Get_Text("pub_messages_MarkRead_OK"). "\n";
+      else 
+        echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")";
+    break;
+
+    case "DelMsg":
+      $SQL = "DELETE FROM `Messages` ".
+             "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ".
+             "LIMIT 1;";
+      $Erg = mysql_query($SQL, $con);
+
+      if ($Erg == 1) 
+        echo Get_Text("pub_messages_DelMsg_OK"). "\n";
+      else 
+        echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")";
+    break;
+
+    default:
+      echo Get_Text("pub_messages_NoCommand");
+  }
+
+  include "../../../camp2011/includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
old mode 100755
new mode 100644
index e11453c4..6bbabbb6
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -1,118 +1,116 @@
 <?php
-$title = "Himmel";
-$header = "Mein Schichtplan";
-
-include ("../../../camp2011/includes/header.php");
-include ("../../../camp2011/includes/funktionen.php");
-include ("../../../camp2011/includes/funktion_schichtplan.php");
-include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-
-
-If( !IsSet($_GET["action"]) ) 
-{
+  $title = "Himmel";
+  $header = "Mein Schichtplan";
+
+  include ("../../../camp2011/includes/header.php");
+  include ("../../../camp2011/includes/funktionen.php");
+  include ("../../../camp2011/includes/funktion_schichtplan.php");
+  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+
+  if(!isset($_GET["action"])) {
+    echo Get_Text("Hello").$_SESSION['Nick'].", <br />\n";
+    echo Get_Text("pub_mywake_beschreibung1")."<br />\n";
+    echo Get_Text("pub_mywake_beschreibung2")."<br /><br />\n";
+    echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN).
+       Get_Text("pub_mywake_beschreibung4")."<br /><br />\n";
+
+    $USER_ID = $_SESSION['UID'];
+
+    if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" ) {
+      if( !isset( $_GET["UIDs"]) )
+        $_GET["UIDs"] = $_SESSION['UID'];
+      else
+        $USER_ID = $_GET["UIDs"];
+
+      echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
+
+      echo "Liste von <select name=\"UIDs\">\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 "<option value=\"".mysql_result($uErg, $k, "UID")."\" ".
+        ( ($_GET["UIDs"]==mysql_result($uErg, $k, "UID")) ? " selected":""). ">".
+        mysql_result($uErg, $k, "Nick").
+        "</option>\n";
+    }
 
-	echo Get_Text("Hello").$_SESSION['Nick'].", <br>\n";
-	echo Get_Text("pub_mywake_beschreibung1")."<br>\n";
-	echo Get_Text("pub_mywake_beschreibung2")."<br><br>\n";
-	echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN).
-	     Get_Text("pub_mywake_beschreibung4")."<br><br>\n";
-
-	$USER_ID = $_SESSION['UID'];
-	if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" )
-	{
-		if( !isset( $_GET["UIDs"]) )
-			$_GET["UIDs"] = $_SESSION['UID'];
-		else
-			$USER_ID = $_GET["UIDs"];
-		
-		echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
-
-		echo "Liste von <select name=\"UIDs\">\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")."\" ".
-				( ($_GET["UIDs"]==mysql_result($uErg, $k, "UID")) ? " selected":""). ">".
-				mysql_result($uErg, $k, "Nick").
-				"</option>\n";
-		}
-		echo "</select> anzeigen.\n";
-		echo mysql_error($con);
-		
-		echo "<input type=\"submit\" value=\"zeigen\">\n";
-
-		echo "</form>";
-
-	}
-	
-	$SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ".
-	       "INNER JOIN `ShiftEntry` ".
-	       "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ".
-	       "WHERE `ShiftEntry`.`UID`='$USER_ID' ".
-	       "ORDER BY `DateS`";
-	$erg = mysql_query($SQL, $con);
-
-	?>
-	<table border="0" class="border" cellpadding="2" cellspacing="1">
-		<tr>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Datum");?></b></td>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Uhrzeit");?></b></td>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Len");?></b></td>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Name");?></b></td>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Ort");?></b></td>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Bemerkung");?></b></td>
-			<td class="contenttopic"><b><?PHP echo Get_Text("pub_mywake_Austragen");?></b></td>
-		</tr>
-	<?PHP
-
-	for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
-	{
-		echo "<tr class=\"content\">";
-
-		echo "<td>". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "</td>\n";
-		echo "<td>". substr(mysql_result( $erg, $i, "DateS" ), 11). "</td>\n";
-		echo "<td>". mysql_result( $erg, $i, "Len" ). " h</td>\n";
-		echo "<td>". mysql_result( $erg, $i, "Man" ). "</td>\n";
-		echo "<td>". $RoomID[mysql_result( $erg, $i, "RID" )]. "<br>\n".
-		     "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")".
-		     "</td>\n";
-		echo "<td><pre style=\"font-family:Fixedsys,Courier; padding:12x;\">\n". 
-		     mysql_result( $erg, $i, "Comment" ). 
-		     "\n</pre>\n";
-		echo "<br><a href=\"./myschichtplan.php?action=edit&SID=\n".
-		     mysql_result( $erg, $i, "SID" )."\"># vi #</a></td>\n";
-	
-		// bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten 
-		//// selber noch austragen zu koennen...
-		$schichtdate = mysql_result( $erg, $i, "DateS" );
-		ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res );
-		$info["year"]  = $res[1];
-		$info["month"] = $res[2];
-		$info["day"]   = $res[3];
-		$info["hour"]  = $res[4];
-		$info["min"]   = $res[5];
-		$info["sec"]   = $res[6];
-		$schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"]));
-		$lastAustragen = $LETZTES_AUSTRAGEN*3600;
-		$nowdate = time();
-		// wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
-		// noch möglich sein
-		if( $schichtdatum > ($lastAustragen + $nowdate) ) 
-			echo "<td> <a href=\"./myschichtplan.php?action=austragen&SID=".
-		             mysql_result( $erg, $i, "SID" )."\">".
-		             Get_Text("pub_mywake_austragen")."</a></td>\n";
-		else 
-			echo "<td>". Get_Text("pub_mywake_austragen_n_c"). "</td>\n";
-	
-		echo "</tr>\n";
-	}
+    echo "</select> anzeigen.\n";
+    echo mysql_error($con);
+    
+    echo "<input type=\"submit\" value=\"zeigen\">\n";
+
+    echo "</form>";
+  }
+  
+  $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ".
+         "INNER JOIN `ShiftEntry` ".
+         "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ".
+         "WHERE `ShiftEntry`.`UID`='$USER_ID' ".
+         "ORDER BY `DateS`";
+  $erg = mysql_query($SQL, $con);
+
+  ?>
+  <table border="0" class="border" cellpadding="2" cellspacing="1">
+    <tr>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Datum");?></b></td>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Uhrzeit");?></b></td>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Len");?></b></td>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Name");?></b></td>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Ort");?></b></td>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Bemerkung");?></b></td>
+      <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Austragen");?></b></td>
+    </tr>
+  <?php
+
+  for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
+  {
+    echo "<tr class=\"content\">";
+
+    echo "<td>". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "</td>\n";
+    echo "<td>". substr(mysql_result( $erg, $i, "DateS" ), 11). "</td>\n";
+    echo "<td>". mysql_result( $erg, $i, "Len" ). " h</td>\n";
+    echo "<td>". mysql_result( $erg, $i, "Man" ). "</td>\n";
+    echo "<td>". $RoomID[mysql_result( $erg, $i, "RID" )]. "<br />\n".
+         "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")".
+         "</td>\n";
+    echo "<td><pre style=\"font-family:Fixedsys,Courier; padding:12x;\">\n". 
+         mysql_result( $erg, $i, "Comment" ). 
+         "\n</pre>\n";
+    echo "<br /><a href=\"./myschichtplan.php?action=edit&SID=\n".
+         mysql_result( $erg, $i, "SID" )."\"># vi #</a></td>\n";
+  
+    // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten 
+    //// selber noch austragen zu koennen...
+    $schichtdate = mysql_result( $erg, $i, "DateS" );
+    ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res );
+    $info["year"]  = $res[1];
+    $info["month"] = $res[2];
+    $info["day"]   = $res[3];
+    $info["hour"]  = $res[4];
+    $info["min"]   = $res[5];
+    $info["sec"]   = $res[6];
+    $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"]));
+    $lastAustragen = $LETZTES_AUSTRAGEN*3600;
+    $nowdate = time();
+    // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
+    // noch möglich sein
+    if( $schichtdatum > ($lastAustragen + $nowdate) ) 
+      echo "<td> <a href=\"./myschichtplan.php?action=austragen&SID=".
+                 mysql_result( $erg, $i, "SID" )."\">".
+                 Get_Text("pub_mywake_austragen")."</a></td>\n";
+    else 
+      echo "<td>". Get_Text("pub_mywake_austragen_n_c"). "</td>\n";
+  
+    echo "</tr>\n";
+  }
 echo "</table>\n\n";
 
 if( $_SESSION['CVS'][ "nonpublic/myschichtplan_ical.php" ] == "Y" )
 {
-	echo "<br><a href=\"./myschichtplan_ical.php\">". Get_Text("pub_myschichtplan_ical"). "</a>\n";
+  echo "<br /><a href=\"./myschichtplan_ical.php\">". Get_Text("pub_myschichtplan_ical"). "</a>\n";
 }
 
 } 
@@ -120,65 +118,65 @@ else
 {
     If( $_GET["action"] == "austragen" ) 
     {
-	echo Get_Text("pub_mywake_delate1")."<br>\n";
-
-	$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')";
-	$Erg = mysql_query($sql, $con);
-
-	$schichtdate = mysql_result( $Erg, 0, "DateS" );
-	ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res );
-	$info["year"]  = $res[1];
-	$info["month"] = $res[2];
-	$info["day"]   = $res[3];
-	$info["hour"]  = $res[4];
-	$info["min"]   = $res[5];
-	$info["sec"]   = $res[6];
-	$schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"]));
-	$lastAustragen = $LETZTES_AUSTRAGEN*3600;
-	$nowdate = time();
-	// wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
-	// noch möglich sein
-	if( $schichtdatum > ($lastAustragen + $nowdate) ) 
-	{
-		$sql2 = "UPDATE `ShiftEntry` ".
-			"SET `UID` = '0', `Comment` = NULL ".
-		        "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;";
-		$Erg2 = mysql_query($sql2, $con);
-		if ($Erg2 == 1)
-	   		echo Get_Text("pub_mywake_add_ok"). "\n";
-		else
-			echo Get_Text("pub_mywake_add_ko"). "\n";
-	}
-	else 
-		echo Get_Text("pub_mywake_after"). "\n";
+  echo Get_Text("pub_mywake_delate1")."<br />\n";
+
+  $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')";
+  $Erg = mysql_query($sql, $con);
+
+  $schichtdate = mysql_result( $Erg, 0, "DateS" );
+  ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res );
+  $info["year"]  = $res[1];
+  $info["month"] = $res[2];
+  $info["day"]   = $res[3];
+  $info["hour"]  = $res[4];
+  $info["min"]   = $res[5];
+  $info["sec"]   = $res[6];
+  $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"]));
+  $lastAustragen = $LETZTES_AUSTRAGEN*3600;
+  $nowdate = time();
+  // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
+  // noch möglich sein
+  if( $schichtdatum > ($lastAustragen + $nowdate) ) 
+  {
+    $sql2 = "UPDATE `ShiftEntry` ".
+      "SET `UID` = '0', `Comment` = NULL ".
+            "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;";
+    $Erg2 = mysql_query($sql2, $con);
+    if ($Erg2 == 1)
+         echo Get_Text("pub_mywake_add_ok"). "\n";
+    else
+      echo Get_Text("pub_mywake_add_ko"). "\n";
+  }
+  else 
+    echo Get_Text("pub_mywake_after"). "\n";
     }
     elseif( $_GET["action"] == "edit" ) 
     {
-    	echo Get_Text("pub_myshift_Edit_Text1"). "\n";
-	
-	$sql = "SELECT * FROM `ShiftEntry` WHERE ";
-	$sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')";
-	$Erg = mysql_query($sql, $con);
-
-	echo "<form action=\"./myschichtplan.php\" method=\"GET\">\n";
-	echo "<textarea name='newtext' cols='50' rows='10'>". mysql_result( $Erg, 0, "Comment" ). "</textarea><br><br>\n";
-	echo "<input type=\"submit\" value=\"save\">\n";
-	echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
-	echo "<input type=\"hidden\" name=\"action\" value=\"editSave\">\n";
-	echo "</form>";
+      echo Get_Text("pub_myshift_Edit_Text1"). "\n";
+  
+  $sql = "SELECT * FROM `ShiftEntry` WHERE ";
+  $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')";
+  $Erg = mysql_query($sql, $con);
+
+  echo "<form action=\"./myschichtplan.php\" method=\"GET\">\n";
+  echo "<textarea name='newtext' cols='50' rows='10'>". mysql_result( $Erg, 0, "Comment" ). "</textarea><br /><br />\n";
+  echo "<input type=\"submit\" value=\"save\">\n";
+  echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
+  echo "<input type=\"hidden\" name=\"action\" value=\"editSave\">\n";
+  echo "</form>";
     }
     elseif( $_GET["action"] == "editSave" ) 
     {
-    	echo Get_Text("pub_myshift_EditSave_Text1"). "<br>\n";
-	$sql = "UPDATE `ShiftEntry` ".
-	       "SET `Comment` = '". $_GET["newtext"]. "' ".
-	       "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-	$Erg = mysql_query($sql, $con);
-	if ($Erg == 1)
-		echo "\t ...". Get_Text("pub_myshift_EditSave_OK"). "\n";
-	else
-		echo "\t ...". Get_Text("pub_myshift_EditSave_KO"). "\n";
-	SetHeaderGo2Back();	
+      echo Get_Text("pub_myshift_EditSave_Text1"). "<br />\n";
+  $sql = "UPDATE `ShiftEntry` ".
+         "SET `Comment` = '". $_GET["newtext"]. "' ".
+         "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;";
+  $Erg = mysql_query($sql, $con);
+  if ($Erg == 1)
+    echo " ...". Get_Text("pub_myshift_EditSave_OK"). "\n";
+  else
+    echo " ...". Get_Text("pub_myshift_EditSave_KO"). "\n";
+  SetHeaderGo2Back();  
     }
 }
 include ("../../../camp2011/includes/footer.php");
diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php
old mode 100755
new mode 100644
index bcb9eb6f..928f0c86
--- a/www-ssl/nonpublic/myschichtplan_ical.php
+++ b/www-ssl/nonpublic/myschichtplan_ical.php
@@ -27,22 +27,22 @@ 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 "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";
 
diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php
old mode 100755
new mode 100644
index b1513716..7cc9a193
--- a/www-ssl/nonpublic/news.php
+++ b/www-ssl/nonpublic/news.php
@@ -1,11 +1,10 @@
 <?php
-$title = "Himmel";
-$header = "News";
-include ("../../../camp2011/includes/header.php");
+  $title = "Himmel";
+  $header = "News";
+  include "../../../camp2011/includes/header.php";
 
+  echo "<a href=\"#Neu\">" . Get_Text(3) . "</a>";
+  include "news_output.php";
 
-echo "<a href=\"#Neu\">".Get_Text(3)."</a>";
-include ("news_output.php");
-
-include ("../../../camp2011/includes/footer.php");
+  include "../../../camp2011/includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
old mode 100755
new mode 100644
index 826733c1..b90d5a82
--- a/www-ssl/nonpublic/news_comments.php
+++ b/www-ssl/nonpublic/news_comments.php
@@ -3,54 +3,50 @@ $title = "Kommentare zu den News";
 $header = "Kommentar";
 include ("../../../camp2011/includes/header.php");
 
+if(isset($_GET["nid"])) {
+  if(isset( $_GET["text"])) {
+    $ch_sql = "INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ".
+              "VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')";
+    $Erg = mysql_query($ch_sql, $con);
 
-if( IsSet( $_GET["nid"])) 
-{
-
-
-if( IsSet( $_GET["text"]))
-{
-	$ch_sql="INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ".
-			"VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')";
-	$Erg = mysql_query($ch_sql, $con);
-	if ($Erg == 1)
-	{
-		echo "Eintrag wurde gespeichert<br><br>"; 
-		SetHeaderGo2Back();
-	}
-}
+    if ($Erg == 1) {
+      echo "Eintrag wurde gespeichert<br /><br />"; 
+      SetHeaderGo2Back();
+    }
+  }
 
-$SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'";
-$Erg = mysql_query($SQL, $con);
-echo mysql_error( $con);
-// anzahl zeilen
-$news_rows  = mysql_num_rows($Erg);
+  $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'";
+  $Erg = mysql_query($SQL, $con);
+  echo mysql_error( $con);
 
+  // anzahl zeilen
+  $news_rows  = mysql_num_rows($Erg);
 ?>
+
 <table border="0" width="100%" class="border" cellpadding="2" cellspacing="1">
-	<tr class="contenttopic">
-		<th width=100 align="left">Datum</th>
-		<th align="left">Nick</th>
-	</tr>
-	<tr class="contenttopic">
-		<th align="left" colspan=2>Kommentar</th>
-	</tr>
+  <tr class="contenttopic">
+    <th width=100 align="left">Datum</th>
+    <th align="left">Nick</th>
+  </tr>
+  <tr class="contenttopic">
+    <th align="left" colspan=2>Kommentar</th>
+  </tr>
 
-<?PHP
+<?php
 for ($n = 0 ; $n < $news_rows ; $n++) {
   echo "\t<tr class=\"content\">";
   echo "\t\t<td width=100>";
-  	echo mysql_result($Erg, $n, "Datum");
+    echo mysql_result($Erg, $n, "Datum");
   echo "\t\t</td>";
   echo "\t\t<td>";
-  	echo UID2Nick(mysql_result($Erg, $n, "UID"));
-  	// avatar anzeigen?
-  	echo DisplayAvatar (mysql_result($Erg, $n, "UID"));
+    echo UID2Nick(mysql_result($Erg, $n, "UID"));
+    // avatar anzeigen?
+    echo DisplayAvatar (mysql_result($Erg, $n, "UID"));
   echo "\t\t</td>";
   echo "</tr>";
   echo "\t<tr class=\"content\">";
   echo "\t\t<td colspan=\"2\">";
-  	echo nl2br(mysql_result($Erg, $n, "Text"))."\n";
+    echo nl2br(mysql_result($Erg, $n, "Text"))."\n";
   echo "\t\t</td>";
   echo "</tr>";
 }
@@ -59,24 +55,24 @@ echo "</table>";
 
 ?>
 
-<br>
+<br />
 <hr>
 <h4>Neuer Kommentar:</h4>
 <a name="Neu">&nbsp;</a>
 
 <form action="./news_comments.php" method="GET">
-<input type="hidden" name="nid" value="<?PHP echo $_GET["nid"]; ?>">
+<input type="hidden" name="nid" value="<?php echo $_GET["nid"]; ?>">
 <table>
  <tr>
   <td align="right" valign="top">Text:</td>
   <td><textarea name="text" cols="50" rows="10"></textarea></td>
  </tr>
 </table>
-<br>
+<br />
 <input type="submit" value="sichern...">
 </form>
 
-<?PHP
+<?php
 
 
 } 
diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php
old mode 100755
new mode 100644
index e1afc067..77bbad87
--- a/www-ssl/nonpublic/news_output.php
+++ b/www-ssl/nonpublic/news_output.php
@@ -3,20 +3,20 @@
 if( isset( $_POST["text"]) && isset( $_POST["betreff"]) && IsSet( $_POST["date"]) ) 
 {
   if( !isset( $_POST["treffen"])) 
-  	$_POST["treffen"] = 0;
+    $_POST["treffen"] = 0;
   $SQL = "INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) ".
-			"VALUES ('". $_POST["date"]. "', '". $_POST["betreff"]. "', '". $_POST["text"]. "', '".$_SESSION['UID'].
-			"', '". $_POST["treffen"]. "');";
+      "VALUES ('". $_POST["date"]. "', '". $_POST["betreff"]. "', '". $_POST["text"]. "', '".$_SESSION['UID'].
+      "', '". $_POST["treffen"]. "');";
   $Erg = mysql_query($SQL, $con);
   if ($Erg == 1)
-  	Print_Text(4);
+    Print_Text(4);
 }
 
 if( !IsSet( $_GET["news_begin"]))
-	$_GET["news_begin"]=0;
-	
+  $_GET["news_begin"]=0;
+  
 if( !IsSet( $_GET["DISPLAY_NEWS"]))
-	$_GET["DISPLAY_NEWS"] = 5;
+  $_GET["DISPLAY_NEWS"] = 5;
    
 $SQL = "SELECT * FROM `News` ORDER BY `ID` DESC LIMIT ". intval($_GET["news_begin"]). ", ". intval($_GET["DISPLAY_NEWS"]);
 $Erg = mysql_query($SQL, $con);
@@ -28,17 +28,17 @@ for ($n = 0 ; $n < $news_rows ; $n++)
 {
 
   if (mysql_result($Erg, $n, "Treffen") == 0) 
-  	echo "<p class='question'>";
+    echo "<p class='question'>";
   else 
-	echo "<p class='engeltreffen'>";
+  echo "<p class='engeltreffen'>";
   
   echo "<u>". ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) ."</u>\n";
 
   // Schow Admin Page
   if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" )
-	echo " <a href=\"./../admin/news.php?action=change&date=". mysql_result($Erg, $n, "Datum"). "\">[edit]</a><br>\n\t\t";
+  echo " <a href=\"./../admin/news.php?action=change&date=". mysql_result($Erg, $n, "Datum"). "\">[edit]</a><br />\n\t\t";
 
-  echo "<br>&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
+  echo "<br />&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
   echo UID2Nick(mysql_result($Erg, $n, "UID"))."</font>";
   // avatar anzeigen?
   echo DisplayAvatar (mysql_result($Erg, $n, "UID"));
@@ -59,17 +59,17 @@ $dis_rows =  round (($rows / $DISPLAY_NEWS)+0.5);
 Print_Text(5);
 
 for ($i=1; $i <= $dis_rows; $i++) {
-	if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) {
-		echo "<a href=\"./news.php?news_begin=".(($i*$DISPLAY_NEWS) - $DISPLAY_NEWS - 1)."\">$i</a>&nbsp; ";
-	} else {
-		echo "$i&nbsp; ";
-	}
+  if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) {
+    echo "<a href=\"./news.php?news_begin=".(($i*$DISPLAY_NEWS) - $DISPLAY_NEWS - 1)."\">$i</a>&nbsp; ";
+  } else {
+    echo "$i&nbsp; ";
+  }
 }
 echo "</div>";
 
 ?>
 
-<br>
+<br />
 <hr>
 <h4><?PHP Print_Text(6); ?></h4>
 <a name="Neu">&nbsp;</a>
@@ -101,6 +101,6 @@ if ($_SESSION['CVS']["nonpublic/newsAddMeting"] == "Y") {
 }
 ?>
 </table>
-<br>
+<br />
 <input type="submit" value="<?PHP Print_Text("save"); ?>">
 </form>
diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php
old mode 100755
new mode 100644
index 490167a0..1ed4d32f
--- a/www-ssl/nonpublic/schichtplan.1.php
+++ b/www-ssl/nonpublic/schichtplan.1.php
@@ -5,17 +5,17 @@ include ("../../../camp2011/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";
+  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);
+  foreach( $VeranstaltungsTage as $k => $v)
+    Printlink( $v);
 
 
 ?>
diff --git a/www-ssl/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php
old mode 100755
new mode 100644
index 59e58852..d0193178
--- a/www-ssl/nonpublic/schichtplan.2.php
+++ b/www-ssl/nonpublic/schichtplan.2.php
@@ -6,17 +6,17 @@ include ("../../../camp2011/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";
+  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>";
+echo "<br />";
 if(isset($ausdatum))
-	echo "<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=-1'>alle</a></li>";
+  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>";
+  echo "<li><a href='./schichtplan.php?raum=-1'>alle</a></li>";
 ?>
 
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php
old mode 100755
new mode 100644
index 65907863..e8f8f02a
--- a/www-ssl/nonpublic/schichtplan.php
+++ b/www-ssl/nonpublic/schichtplan.php
@@ -1,73 +1,68 @@
 <?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;
-			}
-		}
-	}
-}
-
-include ("../../../camp2011/includes/header.php");
-include ("../../../camp2011/includes/funktionen.php");
-include ("../../../camp2011/includes/funktion_schichtplan.php");
-include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-?>
-
-<?PHP 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>";
+  $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;
+        }
+      }
+    }
+  }
+
+  include ("../../../camp2011/includes/header.php");
+  include ("../../../camp2011/includes/funktionen.php");
+  include ("../../../camp2011/includes/funktion_schichtplan.php");
+  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+
+  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);
+  $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);
 
 }
 
@@ -75,127 +70,127 @@ if( !isset($ausdatum) )
 
 if ( !isset($raum) )
 {
-	// Ausgabe wenn kein Raum Ausgewählt:
-	echo Get_Text("pub_schicht_auswahl_raeume"). "<br><br>\n";
-
-	if( isset($Room))
-	{
-		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
-	showEmptyShifts(); 
+  // Ausgabe wenn kein Raum Ausgewählt:
+  echo Get_Text("pub_schicht_auswahl_raeume"). "<br /><br />\n";
+
+  if( isset($Room))
+  {
+    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
+  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>";
-
-	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
-	if( $raum == -1 )
-	{
-		if( isset($Room))
-		   foreach( $Room as $RoomEntry  )
-			if (SummRoomShifts($RoomEntry["RID"]) > 0)
-				echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n";
-	}
-	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();
+{   // 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 />";
+
+  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
+  if( $raum == -1 )
+  {
+    if( isset($Room))
+       foreach( $Room as $RoomEntry  )
+      if (SummRoomShifts($RoomEntry["RID"]) > 0)
+        echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n";
+  }
+  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))
 
diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php
old mode 100755
new mode 100644
index 359425bf..621cd97e
--- a/www-ssl/nonpublic/schichtplan_add.php
+++ b/www-ssl/nonpublic/schichtplan_add.php
@@ -1,126 +1,111 @@
 <?php
-$title = "Himmel";
-$header = "Schichtpl&auml;ne";
-include ("../../../camp2011/includes/header.php");
-include ("../../../camp2011/includes/funktion_schichtplan.php");
-include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-include ("../../../camp2011/includes/funktionen.php");
-
-if (isset($_POST["newtext"]) && isset($_POST["SID"]) && isset($_POST["TID"])) {
-	SetHeaderGo2Back();
+  $title = "Himmel";
+  $header = "Schichtpl&auml;ne";
+  include "../../../camp2011/includes/header.php";
+  include "../../../camp2011/includes/funktion_schichtplan.php";
+  include "../../../camp2011/includes/funktion_schichtplan_aray.php";
+  include "../../../camp2011/includes/funktionen.php";
+
+  if(isset($_POST["newtext"]) && isset($_POST["SID"]) && isset($_POST["TID"])) {
+    SetHeaderGo2Back();
  
-	// datum der einzutragenden schicht heraussuhen...
-	$ShiftSQL = "SELECT `DateS`, `DateE` FROM `Shifts` WHERE `SID`='". $_POST["SID"]. ".'";
-	$ShiftErg = mysql_query ($ShiftSQL, $con);
-	$beginSchicht = mysql_result($ShiftErg, 0, "DateS");
-	$endSchicht   = mysql_result($ShiftErg, 0, "DateE");
-
-	//wenn keien rechte definiert sind
-	if( !isset($_SESSION['CVS'][ $TID2Name[$_POST["TID"]] ]))
-		$_SESSION['CVS'][ $TID2Name[$_POST["TID"]] ] = "Y";
-
-	if( $_SESSION['CVS'][ $TID2Name[$_POST["TID"]] ] == "Y")
-	{
-	// Ueberpruefung, ob der Engel bereits für eine Schicht zu dieser Zeit eingetragen ist
-	$SSQL="SELECT * FROM `Shifts`".
-		" INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`".
-		" WHERE ((".
-			" ((`Shifts`.`DateS` >= '$beginSchicht') and ".
-			"  (`Shifts`.`DateS` < '$endSchicht'))".
-			" OR ".
-			" ((`Shifts`.`DateE` > '$beginSchicht') and ".
-			"  (`Shifts`.`DateE` <= '$endSchicht')) ".
-			") and ".
-			"(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));";
-	$bErg = mysql_query($SSQL, $con);
-
-	if( mysql_num_rows($bErg) != 0 )
-		echo Get_Text("pub_schichtplan_add_AllreadyinShift");
-	else
-	{
-		//ermitteln der noch gesuchten
-		$SQL3 = "SELECT * FROM `ShiftEntry`".
-			" WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));";
-		$Erg3 = mysql_query($SQL3, $con);
-
-		if( mysql_num_rows($Erg3) <= 0 ) 
-	 		echo Get_Text("pub_schichtplan_add_ToManyYousers");
-		else
-		{
-			//write shift
-			$SQL = "UPDATE `ShiftEntry` SET ".
-				"`UID` = '". $_SESSION['UID']. "', ".
-				"`Comment` = '". $_POST["newtext"]. "' ".
-				"WHERE ( (`SID` = '". $_POST["SID"]. "') and ".
-					"(`TID` = '". $_POST["TID"]. "') and ".
-					"(`UID` = '0')) LIMIT 1;";
-			$Erg = mysql_query($SQL, $con);
-
-			if ($Erg != 1)
-				echo Get_Text("pub_schichtplan_add_Error");
-			else
-				echo Get_Text("pub_schichtplan_add_WriteOK");
-			
-		}//TO Many USERS
-	}//Allready in Shift
-	}
-	else
-	{
-		echo "<h1>:-(</h1>";
-		array_push($error_messages, "Hack atteck\n");
-	}
-}
-elseif (isset($_GET["SID"]) && isset($_GET["TID"])) 
-{
-	//wenn keien rechte definiert sind
-	if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ]))
-		$_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y";
-	
-
-
-	if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y")
-	{
-
-		echo Get_Text("pub_schichtplan_add_Text1"). "<br><br>\n\n".
-			"<form action=\"./schichtplan_add.php\" method=\"post\">\n".
-			"<table border=\"0\">\n";
-	
-		$SQL = "SELECT * FROM `Shifts` WHERE ";
-		$SQL .="(`SID` = '". $_GET["SID"]. "')";
-		$Erg = mysql_query($SQL, $con);
-  
-		echo "<tr><td>". Get_Text("pub_schichtplan_add_Date"). ":</td> <td>".
-			mysql_result($Erg, 0, "DateS"). "</td></tr>\n";
-
-		echo "<tr><td>". Get_Text("pub_schichtplan_add_Place"). ":</td> <td>".
-		       $RoomID[ mysql_result($Erg, 0, "RID") ]. "</td></tr>\n";
-       
-		echo "<tr><td>". Get_Text("pub_schichtplan_add_Job"). ":</td> <td>".
-		       $EngelTypeID[$_GET["TID"]]. "</td></tr>\n";
-       
-		echo "<tr><td>". Get_Text("pub_schichtplan_add_Len"). ":</td> <td>".
-		       mysql_result($Erg, 0, "Len"). "h</td></tr>\n";
-       
-		echo "<tr><td>". Get_Text("pub_schichtplan_add_TextFor"). ":</td> <td>".
-		       mysql_result($Erg, 0, "Man"). "</td></tr>\n";
-       
-		echo "<tr><td valign='top'>". Get_Text("pub_schichtplan_add_Comment"). ":</td>\n <td>".
-			"<textarea name='newtext' cols='50' rows='10'></textarea> </td></tr>\n";
-
-		echo "<tr><td>&nbsp;</td>\n".
-			"<td><input type=\"submit\" value=\"". Get_Text("pub_schichtplan_add_submit"). "\"> </td></tr>\n".
-			"</table>\n".
-			"<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n".
-			"<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n".
-			"</form>";
-	}
-	else
-	{
-		echo "<h1>:-(</h1>";
-		array_push($error_messages, "Hack atteck\n");
-	}
-
-}
-
-include ("../../../camp2011/includes/footer.php");
+    // datum der einzutragenden Schicht heraussuhen...
+    $ShiftSQL = "SELECT `DateS`, `DateE` FROM `Shifts` WHERE `SID`='" . $_POST["SID"] . ".'";
+    $ShiftErg = mysql_query ($ShiftSQL, $con);
+    $beginSchicht = mysql_result($ShiftErg, 0, "DateS");
+    $endSchicht   = mysql_result($ShiftErg, 0, "DateE");
+
+    // wenn keien rechte definiert sind
+    if(!isset($_SESSION['CVS'][$TID2Name[$_POST["TID"]]]))
+      $_SESSION['CVS'][$TID2Name[$_POST["TID"]]] = "Y";
+
+    if($_SESSION['CVS'][$TID2Name[$_POST["TID"]]] == "Y") {
+      // Ueberpruefung, ob der Engel bereits fuer eine Schicht zu dieser Zeit eingetragen ist
+      $SSQL = "SELECT * FROM `Shifts`".
+              " INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`".
+              " WHERE ((".
+              " ((`Shifts`.`DateS` >= '$beginSchicht') and ".
+              "  (`Shifts`.`DateS` < '$endSchicht'))".
+              " OR ".
+              " ((`Shifts`.`DateE` > '$beginSchicht') and ".
+              "  (`Shifts`.`DateE` <= '$endSchicht')) ".
+              ") and ".
+              "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));";
+      $bErg = mysql_query($SSQL, $con);
+
+      if(mysql_num_rows($bErg) != 0)
+        echo Get_Text("pub_schichtplan_add_AllreadyinShift");
+      else {
+        // ermitteln der noch gesuchten
+        $SQL3 = "SELECT * FROM `ShiftEntry`".
+                " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));";
+        $Erg3 = mysql_query($SQL3, $con);
+
+        if(mysql_num_rows($Erg3) <= 0)
+          echo Get_Text("pub_schichtplan_add_ToManyYousers");
+        else {
+          //write shift
+          $SQL = "UPDATE `ShiftEntry` SET ".
+                 "`UID` = '". $_SESSION['UID']. "', ".
+                 "`Comment` = '". $_POST["newtext"]. "' ".
+                 "WHERE ( (`SID` = '". $_POST["SID"]. "') and ".
+                 "(`TID` = '". $_POST["TID"]. "') and ".
+                 "(`UID` = '0')) LIMIT 1;";
+          $Erg = mysql_query($SQL, $con);
+
+          if($Erg != 1)
+            echo Get_Text("pub_schichtplan_add_Error");
+          else
+            echo Get_Text("pub_schichtplan_add_WriteOK");
+        }
+      }
+    } else {
+      echo "<h1>:-(</h1>";
+      array_push($error_messages, "Hack atteck\n");
+    }
+  } elseif (isset($_GET["SID"]) && isset($_GET["TID"])) {
+    //wenn keine Rechte definiert sind
+    if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ]))
+      $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y";
+
+    if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") {
+      echo Get_Text("pub_schichtplan_add_Text1"). "<br /><br />\n\n".
+        "<form action=\"./schichtplan_add.php\" method=\"post\">\n".
+        "<table border=\"0\">\n";
+
+      $SQL = "SELECT * FROM `Shifts` WHERE ";
+      $SQL .="(`SID` = '". $_GET["SID"]. "')";
+      $Erg = mysql_query($SQL, $con);
+
+      echo "<tr><td>". Get_Text("pub_schichtplan_add_Date"). ":</td> <td>".
+        mysql_result($Erg, 0, "DateS"). "</td></tr>\n";
+
+      echo "<tr><td>". Get_Text("pub_schichtplan_add_Place"). ":</td> <td>".
+        $RoomID[ mysql_result($Erg, 0, "RID") ]. "</td></tr>\n";
+
+      echo "<tr><td>". Get_Text("pub_schichtplan_add_Job"). ":</td> <td>".
+        $EngelTypeID[$_GET["TID"]]. "</td></tr>\n";
+
+      echo "<tr><td>". Get_Text("pub_schichtplan_add_Len"). ":</td> <td>".
+        mysql_result($Erg, 0, "Len"). "h</td></tr>\n";
+
+      echo "<tr><td>". Get_Text("pub_schichtplan_add_TextFor"). ":</td> <td>".
+        mysql_result($Erg, 0, "Man"). "</td></tr>\n";
+
+      echo "<tr><td valign='top'>". Get_Text("pub_schichtplan_add_Comment"). ":</td>\n <td>".
+        "<textarea name='newtext' cols='50' rows='10'></textarea> </td></tr>\n";
+
+      echo "<tr><td>&nbsp;</td>\n".
+        "<td><input type=\"submit\" value=\"". Get_Text("pub_schichtplan_add_submit"). "\"> </td></tr>\n".
+        "</table>\n".
+        "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n".
+        "<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n".
+        "</form>";
+    } else {
+      echo "<h1>:-(</h1>";
+      array_push($error_messages, "Hack atteck\n");
+    }
+  }
+
+  include "../../../camp2011/includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php
old mode 100755
new mode 100644
index cc2a48e7..2e4e78c2
--- a/www-ssl/nonpublic/schichtplan_beamer.php
+++ b/www-ssl/nonpublic/schichtplan_beamer.php
@@ -1,61 +1,55 @@
 <?php
-include ("../../../camp2011/includes/header_start.php");
+  include "../../../camp2011/includes/header_start.php";
+  include "../../../camp2011/includes/funktionen.php";
+  include "../../../camp2011/includes/funktion_schichtplan_beamer.php";
 
-include ("../../../camp2011/includes/funktionen.php");
-include ("../../../camp2011/includes/funktion_schichtplan_beamer.php");
-
-$Time = time()+3600+3600;
-//$Time = 1104241344;
+  $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>
-<!--<link rel=stylesheet type="text/css" href="/css/style1.css">-->
-<meta http-equiv="refresh" content="30; URL=<?PHP echo $url. $_SERVER['PHP_SELF']?>">
-</HEAD>
-<BODY>
-<?PHP
+<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>
 
-echo "<table border=\"1\" width=\"100%\" height=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
+<?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".
-//	"\t<td>&nbsp;</td>\n".
-	"\t<td>". gmdate("d.m.y", $Time). "</td>\n".
-	"\t<td>". gmdate("H", $Time-3600). ":00</td>\n".
-	"\t<td>". gmdate("H", $Time+0).    ":00</td>\n".
-	"\t<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);
-	
-
-	//entfernt leere zeilen
-	if( $AnzahlEintraege==0 )
-		$Out = "";
-	else
-		$Out = "<tr>\n\t<td>_". $RoomEntry["Name"]. "_</td>\n". $Out . "</tr>\n";
-	
-	echo $Out;
+  <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;
 }
+?>
 
-echo "</table>\n";
+</table>
 
-?>
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php
old mode 100755
new mode 100644
index c14505ab..bb9a0668
--- a/www-ssl/nonpublic/waeckliste.php
+++ b/www-ssl/nonpublic/waeckliste.php
@@ -1,40 +1,38 @@
 <?php
-$title = "Himmel";
-$header = "Weckdienst - Liste der zu weckenden Engel";
-
-include ("../../../camp2011/includes/header.php");
+  $title = "Himmel";
+  $header = "Weckdienst - Liste der zu weckenden Engel";
 
+  include "../../../camp2011/includes/header.php";
 ?>
 
-<?PHP echo Get_Text("Hello"). $_SESSION['Nick'].",<br>\n".
-     	   Get_Text("pub_waeckliste_Text1")?>
-<br><br>
+<p><?php echo Get_Text("Hello") . $_SESSION['Nick'] . ",<br />\n" . Get_Text("pub_waeckliste_Text1"); ?></p>
 <table border="0" width="100%" class="border" cellpadding="2" cellspacing="1">
-        <tr class="contenttopic">
-		<th align="left"><?PHP echo Get_Text("pub_waeckliste_Nick");?></th>
-		<th align="left"><?PHP echo Get_Text("pub_waeckliste_Datum");?></th>
-                <th align="left"><?PHP echo Get_Text("pub_waeckliste_Ort");?></th>
-		<th align="left"><?PHP echo Get_Text("pub_waeckliste_Comment");?></th>
-        </tr>
-						
-<?PHP
+  <tr class="contenttopic">
+    <th align="left"><?php echo Get_Text("pub_waeckliste_Nick");?></th>
+    <th align="left"><?php echo Get_Text("pub_waeckliste_Datum");?></th>
+    <th align="left"><?php echo Get_Text("pub_waeckliste_Ort");?></th>
+    <th align="left"><?php echo Get_Text("pub_waeckliste_Comment");?></th>
+  </tr>
+
+<?php
   $sql = "SELECT * FROM `Wecken` ORDER BY `Date` ASC";
   $Erg = mysql_query($sql, $con);
   $count = mysql_num_rows($Erg);
 
-  for ($i=0; $i < $count; $i++) {
-  $row=mysql_fetch_row($Erg);
+  for ($i = 0; $i < $count; $i++) {
+    $row = mysql_fetch_row($Erg);
 ?>
-	<tr class="content">
-		<td align="left"><?PHP echo UID2Nick(mysql_result($Erg, $i, "UID")); ?> </td>
-		<td align="left"><?PHP echo mysql_result($Erg, $i, "Date"); ?> </td>
-		<td align="left"><?PHP echo mysql_result($Erg, $i, "Ort"); ?> </td>
-		<td align="left"><?PHP echo mysql_result($Erg, $i, "Bemerkung"); ?> </td>
-	</tr>
-<?PHP
+  <tr class="content">
+    <td align="left"><?php echo UID2Nick(mysql_result($Erg, $i, "UID")); ?> </td>
+    <td align="left"><?php echo mysql_result($Erg, $i, "Date"); ?> </td>
+    <td align="left"><?php echo mysql_result($Erg, $i, "Ort"); ?> </td>
+    <td align="left"><?php echo mysql_result($Erg, $i, "Bemerkung"); ?> </td>
+  </tr>
+<?php
   }
 ?>
 </table>
-<?PHP
-include ("../../../camp2011/includes/footer.php");
+
+<?php
+  include "../../../camp2011/includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php
old mode 100755
new mode 100644
index 67e32e28..164a4bb0
--- a/www-ssl/nonpublic/wecken.php
+++ b/www-ssl/nonpublic/wecken.php
@@ -1,81 +1,81 @@
 <?php
-$title = "Himmel";
-$header = "Weckdienst";
+  $title = "Himmel";
+  $header = "Weckdienst";
 
-include ("../../../camp2011/includes/header.php");
+  include "../../../camp2011/includes/header.php";
 
-if( isset($_POST["eintragen"]))
-	if( $_POST["eintragen"] == Get_Text("pub_wake_bouton") ) 
-	{
-		$SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) ".
-			"VALUES ('". $_SESSION['UID']. "', '". $_POST["Date"]. "', '". $_POST["Ort"]. "', ".
-					"'". $_POST["Bemerkung"]. "')";
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg == 1) 
-			Print_Text(4);
-	}
-if( isset($_GET["eintragen"]))
-	if ($_GET["eintragen"] == "loeschen") 
-	{
-		$SQL = "DELETE FROM `Wecken` WHERE `UID`='". $_SESSION['UID']. "' AND `ID`='". $_GET["weckID"]."' LIMIT 1";
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg == 1)
-			Print_Text(4); 
-	}
+  if(isset($_POST["eintragen"])) {
+    if($_POST["eintragen"] == Get_Text("pub_wake_bouton")) {
+      $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) ".
+             "VALUES ('". $_SESSION['UID']. "', '". $_POST["Date"]. "', '". $_POST["Ort"]. "', ".
+             "'". $_POST["Bemerkung"]. "')";
+      $Erg = mysql_query($SQL, $con);
 
-echo Get_Text("Hello").$_SESSION['Nick'].",<br>".Get_Text("pub_wake_beschreibung"). "<br><br>\n\n";
+      if($Erg == 1) 
+        Print_Text(4);
+    }
+  }
+
+  if(isset($_GET["eintragen"])) {
+    if ($_GET["eintragen"] == "loeschen") {
+      $SQL = "DELETE FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' AND `ID`='" . $_GET["weckID"] . "' LIMIT 1";
+      $Erg = mysql_query($SQL, $con);
+      if ($Erg == 1)
+        Print_Text(4); 
+    }
+  }
 
+  echo "<p>" . Get_Text("Hello") . $_SESSION['Nick'] . ",<br />" . Get_Text("pub_wake_beschreibung") . "</p>\n\n";
+  echo Get_Text("pub_wake_beschreibung2");
+?>
 
-echo Get_Text("pub_wake_beschreibung2"); ?>
-<br><br>
 <table border="0" width="100%" class="border" cellpadding="2" cellspacing="1">
-        <tr class="contenttopic">
-                <th align="left"><?PHP echo Get_Text("pub_wake_Datum"); ?></th>
-                <th align="left"><?PHP echo Get_Text("pub_wake_Ort"); ?></th>
-		<th align="left"><?PHP echo Get_Text("pub_wake_Bemerkung"); ?></th>
-		<th align="left"><?PHP echo Get_Text("pub_wake_change"); ?></th>
+  <tr class="contenttopic">
+    <th align="left"><?php echo Get_Text("pub_wake_Datum"); ?></th>
+    <th align="left"><?php echo Get_Text("pub_wake_Ort"); ?></th>
+    <th align="left"><?php echo Get_Text("pub_wake_Bemerkung"); ?></th>
+    <th align="left"><?php echo Get_Text("pub_wake_change"); ?></th>
         </tr>
-						
-<?PHP
-  $sql = "SELECT * FROM `Wecken` WHERE `UID`='". $_SESSION['UID']. "' ORDER BY `Date` ASC";
+
+<?php
+  $sql = "SELECT * FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' ORDER BY `Date` ASC";
   $Erg = mysql_query($sql, $con);
   $count = mysql_num_rows($Erg);
 
   for ($i=0; $i < $count; $i++) {
-  $row=mysql_fetch_row($Erg);
+    $row = mysql_fetch_row($Erg);
 ?>
-	<tr class="content">
-		<td align="left"><?PHP echo mysql_result($Erg, $i, "Date"); ?> </td>
-		<td align="left"><?PHP echo mysql_result($Erg, $i, "Ort"); ?> </td>
-		<td align="left"><?PHP echo mysql_result($Erg, $i, "Bemerkung"); ?> </td>
-		<td align="left"><a href="./wecken.php?eintragen=loeschen&weckID=<?PHP
-			echo mysql_result($Erg, $i, "ID")."\">".Get_Text("pub_wake_del"); ?></a></td>
-	</tr>
-<?PHP
+  <tr class="content">
+    <td align="left"><?php echo mysql_result($Erg, $i, "Date"); ?> </td>
+    <td align="left"><?php echo mysql_result($Erg, $i, "Ort"); ?> </td>
+    <td align="left"><?php echo mysql_result($Erg, $i, "Bemerkung"); ?> </td>
+    <td align="left"><a href="./wecken.php?eintragen=loeschen&weckID=<?php echo mysql_result($Erg, $i, "ID") . "\">" . Get_Text("pub_wake_del"); ?></a></td>
+  </tr>
+<?php
   }
 ?>
 </table>
-<br><br>
+<br /><br />
 
-<?PHP echo Get_Text("pub_wake_Text2"); ?><br><br>
+<?php echo Get_Text("pub_wake_Text2"); ?><br /><br />
 
 <form action="wecken.php" method="post">
 <table>
  <tr>
- 	<td align="right"><?PHP echo Get_Text("pub_wake_Datum"); ?>:</td>
- 	<td align="left"><input type="text" name="Date" value="2003-08-05 08:00:00"></td>
+   <td align="right"><?php echo Get_Text("pub_wake_Datum"); ?>:</td>
+   <td align="left"><input type="text" name="Date" value="2003-08-05 08:00:00"></td>
  </tr>
  <tr>
- 	<td align="right"><?PHP echo Get_Text("pub_wake_Ort"); ?></td>
-	<td align="left"><input type="text" name="Ort" value="Tent 23"></td>
+   <td align="right"><?php echo Get_Text("pub_wake_Ort"); ?></td>
+  <td align="left"><input type="text" name="Ort" value="Tent 23"></td>
  </tr>
  <tr>
- 	<td align="right"><?PHP echo Get_Text("pub_wake_Bemerkung"); ?></td>
-	<td align="left"><textarea name="Bemerkung" rows="5" cols="40">knock knock leo, follow the white rabbit to the blue tent</textarea></td>
+   <td align="right"><?php echo Get_Text("pub_wake_Bemerkung"); ?></td>
+  <td align="left"><textarea name="Bemerkung" rows="5" cols="40">knock knock leo, follow the white rabbit to the blue tent</textarea></td>
  </tr>
 </table>
-<input type="submit" name="eintragen" value="<?PHP echo Get_Text("pub_wake_bouton"); ?>">
+<input type="submit" name="eintragen" value="<?php echo Get_Text("pub_wake_bouton"); ?>" />
 </form>
-<?PHP
+<?php
 include ("../../../camp2011/includes/footer.php");
 ?>
diff --git a/www-ssl/pic/avatar/avatar1.gif b/www-ssl/pic/avatar/avatar1.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar10.gif b/www-ssl/pic/avatar/avatar10.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar100.gif b/www-ssl/pic/avatar/avatar100.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar101.gif b/www-ssl/pic/avatar/avatar101.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar102.gif b/www-ssl/pic/avatar/avatar102.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar103.gif b/www-ssl/pic/avatar/avatar103.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar104.gif b/www-ssl/pic/avatar/avatar104.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar105.gif b/www-ssl/pic/avatar/avatar105.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar106.gif b/www-ssl/pic/avatar/avatar106.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar107.gif b/www-ssl/pic/avatar/avatar107.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar108.gif b/www-ssl/pic/avatar/avatar108.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar109.gif b/www-ssl/pic/avatar/avatar109.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar11.gif b/www-ssl/pic/avatar/avatar11.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar110.gif b/www-ssl/pic/avatar/avatar110.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar111.gif b/www-ssl/pic/avatar/avatar111.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar112.gif b/www-ssl/pic/avatar/avatar112.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar113.gif b/www-ssl/pic/avatar/avatar113.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar114.gif b/www-ssl/pic/avatar/avatar114.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar115.gif b/www-ssl/pic/avatar/avatar115.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar116.gif b/www-ssl/pic/avatar/avatar116.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar117.gif b/www-ssl/pic/avatar/avatar117.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar118.gif b/www-ssl/pic/avatar/avatar118.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar119.gif b/www-ssl/pic/avatar/avatar119.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar12.gif b/www-ssl/pic/avatar/avatar12.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar120.gif b/www-ssl/pic/avatar/avatar120.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar121.gif b/www-ssl/pic/avatar/avatar121.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar122.gif b/www-ssl/pic/avatar/avatar122.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar123.gif b/www-ssl/pic/avatar/avatar123.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar124.gif b/www-ssl/pic/avatar/avatar124.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar125.gif b/www-ssl/pic/avatar/avatar125.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar126.gif b/www-ssl/pic/avatar/avatar126.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar127.gif b/www-ssl/pic/avatar/avatar127.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar128.gif b/www-ssl/pic/avatar/avatar128.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar129.gif b/www-ssl/pic/avatar/avatar129.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar13.gif b/www-ssl/pic/avatar/avatar13.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar130.gif b/www-ssl/pic/avatar/avatar130.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar131.gif b/www-ssl/pic/avatar/avatar131.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar132.gif b/www-ssl/pic/avatar/avatar132.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar133.gif b/www-ssl/pic/avatar/avatar133.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar134.gif b/www-ssl/pic/avatar/avatar134.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar135.gif b/www-ssl/pic/avatar/avatar135.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar136.gif b/www-ssl/pic/avatar/avatar136.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar137.gif b/www-ssl/pic/avatar/avatar137.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar138.gif b/www-ssl/pic/avatar/avatar138.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar139.gif b/www-ssl/pic/avatar/avatar139.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar14.gif b/www-ssl/pic/avatar/avatar14.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar140.gif b/www-ssl/pic/avatar/avatar140.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar141.gif b/www-ssl/pic/avatar/avatar141.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar142.gif b/www-ssl/pic/avatar/avatar142.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar143.gif b/www-ssl/pic/avatar/avatar143.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar144.gif b/www-ssl/pic/avatar/avatar144.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar145.gif b/www-ssl/pic/avatar/avatar145.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar146.gif b/www-ssl/pic/avatar/avatar146.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar147.gif b/www-ssl/pic/avatar/avatar147.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar148.gif b/www-ssl/pic/avatar/avatar148.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar149.gif b/www-ssl/pic/avatar/avatar149.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar15.gif b/www-ssl/pic/avatar/avatar15.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar150.gif b/www-ssl/pic/avatar/avatar150.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar151.gif b/www-ssl/pic/avatar/avatar151.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar152.gif b/www-ssl/pic/avatar/avatar152.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar153.gif b/www-ssl/pic/avatar/avatar153.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar154.gif b/www-ssl/pic/avatar/avatar154.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar155.gif b/www-ssl/pic/avatar/avatar155.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar156.gif b/www-ssl/pic/avatar/avatar156.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar157.gif b/www-ssl/pic/avatar/avatar157.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar158.gif b/www-ssl/pic/avatar/avatar158.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar159.gif b/www-ssl/pic/avatar/avatar159.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar16.gif b/www-ssl/pic/avatar/avatar16.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar160.gif b/www-ssl/pic/avatar/avatar160.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar161.gif b/www-ssl/pic/avatar/avatar161.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar162.gif b/www-ssl/pic/avatar/avatar162.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar163.gif b/www-ssl/pic/avatar/avatar163.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar164.gif b/www-ssl/pic/avatar/avatar164.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar165.gif b/www-ssl/pic/avatar/avatar165.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar166.gif b/www-ssl/pic/avatar/avatar166.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar167.gif b/www-ssl/pic/avatar/avatar167.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar168.gif b/www-ssl/pic/avatar/avatar168.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar169.gif b/www-ssl/pic/avatar/avatar169.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar17.gif b/www-ssl/pic/avatar/avatar17.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar170.gif b/www-ssl/pic/avatar/avatar170.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar171.gif b/www-ssl/pic/avatar/avatar171.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar172.gif b/www-ssl/pic/avatar/avatar172.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar173.gif b/www-ssl/pic/avatar/avatar173.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar174.gif b/www-ssl/pic/avatar/avatar174.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar175.gif b/www-ssl/pic/avatar/avatar175.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar176.gif b/www-ssl/pic/avatar/avatar176.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar177.gif b/www-ssl/pic/avatar/avatar177.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar178.gif b/www-ssl/pic/avatar/avatar178.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar179.gif b/www-ssl/pic/avatar/avatar179.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar18.gif b/www-ssl/pic/avatar/avatar18.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar180.gif b/www-ssl/pic/avatar/avatar180.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar181.gif b/www-ssl/pic/avatar/avatar181.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar182.gif b/www-ssl/pic/avatar/avatar182.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar183.gif b/www-ssl/pic/avatar/avatar183.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar184.gif b/www-ssl/pic/avatar/avatar184.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar185.gif b/www-ssl/pic/avatar/avatar185.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar186.gif b/www-ssl/pic/avatar/avatar186.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar187.gif b/www-ssl/pic/avatar/avatar187.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar188.gif b/www-ssl/pic/avatar/avatar188.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar189.gif b/www-ssl/pic/avatar/avatar189.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar19.gif b/www-ssl/pic/avatar/avatar19.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar190.gif b/www-ssl/pic/avatar/avatar190.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar191.gif b/www-ssl/pic/avatar/avatar191.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar192.gif b/www-ssl/pic/avatar/avatar192.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar193.gif b/www-ssl/pic/avatar/avatar193.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar194.gif b/www-ssl/pic/avatar/avatar194.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar195.gif b/www-ssl/pic/avatar/avatar195.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar196.gif b/www-ssl/pic/avatar/avatar196.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar197.gif b/www-ssl/pic/avatar/avatar197.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar198.gif b/www-ssl/pic/avatar/avatar198.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar199.gif b/www-ssl/pic/avatar/avatar199.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar2.gif b/www-ssl/pic/avatar/avatar2.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar20.gif b/www-ssl/pic/avatar/avatar20.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar200.gif b/www-ssl/pic/avatar/avatar200.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar201.gif b/www-ssl/pic/avatar/avatar201.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar202.gif b/www-ssl/pic/avatar/avatar202.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar203.gif b/www-ssl/pic/avatar/avatar203.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar204.gif b/www-ssl/pic/avatar/avatar204.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar205.gif b/www-ssl/pic/avatar/avatar205.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar206.gif b/www-ssl/pic/avatar/avatar206.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar207.gif b/www-ssl/pic/avatar/avatar207.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar208.gif b/www-ssl/pic/avatar/avatar208.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar209.gif b/www-ssl/pic/avatar/avatar209.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar21.gif b/www-ssl/pic/avatar/avatar21.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar210.gif b/www-ssl/pic/avatar/avatar210.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar211.gif b/www-ssl/pic/avatar/avatar211.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar212.gif b/www-ssl/pic/avatar/avatar212.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar213.gif b/www-ssl/pic/avatar/avatar213.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar214.gif b/www-ssl/pic/avatar/avatar214.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar215.gif b/www-ssl/pic/avatar/avatar215.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar216.gif b/www-ssl/pic/avatar/avatar216.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar217.gif b/www-ssl/pic/avatar/avatar217.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar218.gif b/www-ssl/pic/avatar/avatar218.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar219.gif b/www-ssl/pic/avatar/avatar219.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar22.gif b/www-ssl/pic/avatar/avatar22.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar220.gif b/www-ssl/pic/avatar/avatar220.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar221.gif b/www-ssl/pic/avatar/avatar221.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar222.gif b/www-ssl/pic/avatar/avatar222.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar223.gif b/www-ssl/pic/avatar/avatar223.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar224.gif b/www-ssl/pic/avatar/avatar224.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar225.gif b/www-ssl/pic/avatar/avatar225.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar226.gif b/www-ssl/pic/avatar/avatar226.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar227.gif b/www-ssl/pic/avatar/avatar227.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar228.gif b/www-ssl/pic/avatar/avatar228.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar229.gif b/www-ssl/pic/avatar/avatar229.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar23.gif b/www-ssl/pic/avatar/avatar23.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar230.gif b/www-ssl/pic/avatar/avatar230.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar231.gif b/www-ssl/pic/avatar/avatar231.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar232.gif b/www-ssl/pic/avatar/avatar232.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar233.gif b/www-ssl/pic/avatar/avatar233.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar234.gif b/www-ssl/pic/avatar/avatar234.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar235.gif b/www-ssl/pic/avatar/avatar235.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar236.gif b/www-ssl/pic/avatar/avatar236.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar237.gif b/www-ssl/pic/avatar/avatar237.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar238.gif b/www-ssl/pic/avatar/avatar238.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar239.gif b/www-ssl/pic/avatar/avatar239.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar24.gif b/www-ssl/pic/avatar/avatar24.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar240.gif b/www-ssl/pic/avatar/avatar240.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar241.gif b/www-ssl/pic/avatar/avatar241.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar242.gif b/www-ssl/pic/avatar/avatar242.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar243.gif b/www-ssl/pic/avatar/avatar243.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar244.gif b/www-ssl/pic/avatar/avatar244.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar245.gif b/www-ssl/pic/avatar/avatar245.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar246.gif b/www-ssl/pic/avatar/avatar246.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar247.gif b/www-ssl/pic/avatar/avatar247.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar248.gif b/www-ssl/pic/avatar/avatar248.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar249.gif b/www-ssl/pic/avatar/avatar249.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar25.gif b/www-ssl/pic/avatar/avatar25.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar250.gif b/www-ssl/pic/avatar/avatar250.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar251.gif b/www-ssl/pic/avatar/avatar251.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar252.gif b/www-ssl/pic/avatar/avatar252.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar253.gif b/www-ssl/pic/avatar/avatar253.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar254.gif b/www-ssl/pic/avatar/avatar254.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar255.gif b/www-ssl/pic/avatar/avatar255.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar256.gif b/www-ssl/pic/avatar/avatar256.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar257.gif b/www-ssl/pic/avatar/avatar257.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar258.gif b/www-ssl/pic/avatar/avatar258.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar259.gif b/www-ssl/pic/avatar/avatar259.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar26.gif b/www-ssl/pic/avatar/avatar26.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar260.gif b/www-ssl/pic/avatar/avatar260.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar261.gif b/www-ssl/pic/avatar/avatar261.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar262.gif b/www-ssl/pic/avatar/avatar262.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar263.gif b/www-ssl/pic/avatar/avatar263.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar264.gif b/www-ssl/pic/avatar/avatar264.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar265.gif b/www-ssl/pic/avatar/avatar265.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar266.gif b/www-ssl/pic/avatar/avatar266.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar267.gif b/www-ssl/pic/avatar/avatar267.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar268.gif b/www-ssl/pic/avatar/avatar268.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar269.gif b/www-ssl/pic/avatar/avatar269.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar27.gif b/www-ssl/pic/avatar/avatar27.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar270.gif b/www-ssl/pic/avatar/avatar270.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar271.gif b/www-ssl/pic/avatar/avatar271.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar272.gif b/www-ssl/pic/avatar/avatar272.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar273.gif b/www-ssl/pic/avatar/avatar273.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar274.gif b/www-ssl/pic/avatar/avatar274.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar275.gif b/www-ssl/pic/avatar/avatar275.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar276.gif b/www-ssl/pic/avatar/avatar276.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar277.gif b/www-ssl/pic/avatar/avatar277.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar278.gif b/www-ssl/pic/avatar/avatar278.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar279.gif b/www-ssl/pic/avatar/avatar279.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar28.gif b/www-ssl/pic/avatar/avatar28.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar280.gif b/www-ssl/pic/avatar/avatar280.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar281.gif b/www-ssl/pic/avatar/avatar281.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar282.gif b/www-ssl/pic/avatar/avatar282.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar283.gif b/www-ssl/pic/avatar/avatar283.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar284.gif b/www-ssl/pic/avatar/avatar284.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar285.gif b/www-ssl/pic/avatar/avatar285.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar286.gif b/www-ssl/pic/avatar/avatar286.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar287.gif b/www-ssl/pic/avatar/avatar287.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar288.gif b/www-ssl/pic/avatar/avatar288.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar289.gif b/www-ssl/pic/avatar/avatar289.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar29.gif b/www-ssl/pic/avatar/avatar29.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar290.gif b/www-ssl/pic/avatar/avatar290.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar291.gif b/www-ssl/pic/avatar/avatar291.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar292.gif b/www-ssl/pic/avatar/avatar292.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar293.gif b/www-ssl/pic/avatar/avatar293.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar294.gif b/www-ssl/pic/avatar/avatar294.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar295.gif b/www-ssl/pic/avatar/avatar295.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar296.gif b/www-ssl/pic/avatar/avatar296.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar297.gif b/www-ssl/pic/avatar/avatar297.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar298.gif b/www-ssl/pic/avatar/avatar298.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar299.gif b/www-ssl/pic/avatar/avatar299.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar3.gif b/www-ssl/pic/avatar/avatar3.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar30.gif b/www-ssl/pic/avatar/avatar30.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar300.gif b/www-ssl/pic/avatar/avatar300.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar301.gif b/www-ssl/pic/avatar/avatar301.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar302.gif b/www-ssl/pic/avatar/avatar302.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar303.gif b/www-ssl/pic/avatar/avatar303.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar304.gif b/www-ssl/pic/avatar/avatar304.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar305.gif b/www-ssl/pic/avatar/avatar305.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar306.gif b/www-ssl/pic/avatar/avatar306.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar307.gif b/www-ssl/pic/avatar/avatar307.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar308.gif b/www-ssl/pic/avatar/avatar308.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar309.gif b/www-ssl/pic/avatar/avatar309.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar31.gif b/www-ssl/pic/avatar/avatar31.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar310.gif b/www-ssl/pic/avatar/avatar310.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar311.gif b/www-ssl/pic/avatar/avatar311.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar312.gif b/www-ssl/pic/avatar/avatar312.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar313.gif b/www-ssl/pic/avatar/avatar313.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar314.gif b/www-ssl/pic/avatar/avatar314.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar315.gif b/www-ssl/pic/avatar/avatar315.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar316.gif b/www-ssl/pic/avatar/avatar316.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar317.gif b/www-ssl/pic/avatar/avatar317.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar318.gif b/www-ssl/pic/avatar/avatar318.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar319.gif b/www-ssl/pic/avatar/avatar319.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar32.gif b/www-ssl/pic/avatar/avatar32.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar320.gif b/www-ssl/pic/avatar/avatar320.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar321.gif b/www-ssl/pic/avatar/avatar321.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar322.gif b/www-ssl/pic/avatar/avatar322.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar323.gif b/www-ssl/pic/avatar/avatar323.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar324.gif b/www-ssl/pic/avatar/avatar324.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar325.gif b/www-ssl/pic/avatar/avatar325.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar326.gif b/www-ssl/pic/avatar/avatar326.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar327.gif b/www-ssl/pic/avatar/avatar327.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar328.gif b/www-ssl/pic/avatar/avatar328.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar329.gif b/www-ssl/pic/avatar/avatar329.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar33.gif b/www-ssl/pic/avatar/avatar33.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar330.gif b/www-ssl/pic/avatar/avatar330.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar331.gif b/www-ssl/pic/avatar/avatar331.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar332.gif b/www-ssl/pic/avatar/avatar332.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar333.gif b/www-ssl/pic/avatar/avatar333.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar334.gif b/www-ssl/pic/avatar/avatar334.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar335.gif b/www-ssl/pic/avatar/avatar335.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar336.gif b/www-ssl/pic/avatar/avatar336.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar337.gif b/www-ssl/pic/avatar/avatar337.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar338.gif b/www-ssl/pic/avatar/avatar338.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar339.gif b/www-ssl/pic/avatar/avatar339.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar34.gif b/www-ssl/pic/avatar/avatar34.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar340.gif b/www-ssl/pic/avatar/avatar340.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar341.gif b/www-ssl/pic/avatar/avatar341.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar342.gif b/www-ssl/pic/avatar/avatar342.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar343.gif b/www-ssl/pic/avatar/avatar343.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar344.gif b/www-ssl/pic/avatar/avatar344.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar345.gif b/www-ssl/pic/avatar/avatar345.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar346.gif b/www-ssl/pic/avatar/avatar346.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar347.gif b/www-ssl/pic/avatar/avatar347.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar348.gif b/www-ssl/pic/avatar/avatar348.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar349.gif b/www-ssl/pic/avatar/avatar349.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar35.gif b/www-ssl/pic/avatar/avatar35.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar350.gif b/www-ssl/pic/avatar/avatar350.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar351.gif b/www-ssl/pic/avatar/avatar351.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar352.gif b/www-ssl/pic/avatar/avatar352.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar353.gif b/www-ssl/pic/avatar/avatar353.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar354.gif b/www-ssl/pic/avatar/avatar354.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar355.gif b/www-ssl/pic/avatar/avatar355.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar356.gif b/www-ssl/pic/avatar/avatar356.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar357.gif b/www-ssl/pic/avatar/avatar357.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar358.gif b/www-ssl/pic/avatar/avatar358.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar359.gif b/www-ssl/pic/avatar/avatar359.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar36.gif b/www-ssl/pic/avatar/avatar36.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar360.gif b/www-ssl/pic/avatar/avatar360.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar361.gif b/www-ssl/pic/avatar/avatar361.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar362.gif b/www-ssl/pic/avatar/avatar362.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar363.gif b/www-ssl/pic/avatar/avatar363.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar364.gif b/www-ssl/pic/avatar/avatar364.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar365.gif b/www-ssl/pic/avatar/avatar365.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar366.gif b/www-ssl/pic/avatar/avatar366.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar367.gif b/www-ssl/pic/avatar/avatar367.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar368.gif b/www-ssl/pic/avatar/avatar368.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar369.gif b/www-ssl/pic/avatar/avatar369.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar37.gif b/www-ssl/pic/avatar/avatar37.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar370.gif b/www-ssl/pic/avatar/avatar370.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar371.gif b/www-ssl/pic/avatar/avatar371.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar372.gif b/www-ssl/pic/avatar/avatar372.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar373.gif b/www-ssl/pic/avatar/avatar373.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar374.gif b/www-ssl/pic/avatar/avatar374.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar375.gif b/www-ssl/pic/avatar/avatar375.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar376.gif b/www-ssl/pic/avatar/avatar376.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar377.gif b/www-ssl/pic/avatar/avatar377.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar378.gif b/www-ssl/pic/avatar/avatar378.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar379.gif b/www-ssl/pic/avatar/avatar379.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar38.gif b/www-ssl/pic/avatar/avatar38.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar380.gif b/www-ssl/pic/avatar/avatar380.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar381.gif b/www-ssl/pic/avatar/avatar381.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar382.gif b/www-ssl/pic/avatar/avatar382.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar383.gif b/www-ssl/pic/avatar/avatar383.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar384.gif b/www-ssl/pic/avatar/avatar384.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar385.gif b/www-ssl/pic/avatar/avatar385.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar386.gif b/www-ssl/pic/avatar/avatar386.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar387.gif b/www-ssl/pic/avatar/avatar387.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar388.gif b/www-ssl/pic/avatar/avatar388.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar389.gif b/www-ssl/pic/avatar/avatar389.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar39.gif b/www-ssl/pic/avatar/avatar39.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar390.gif b/www-ssl/pic/avatar/avatar390.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar391.gif b/www-ssl/pic/avatar/avatar391.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar392.gif b/www-ssl/pic/avatar/avatar392.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar393.gif b/www-ssl/pic/avatar/avatar393.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar394.gif b/www-ssl/pic/avatar/avatar394.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar395.gif b/www-ssl/pic/avatar/avatar395.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar396.gif b/www-ssl/pic/avatar/avatar396.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar397.gif b/www-ssl/pic/avatar/avatar397.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar398.gif b/www-ssl/pic/avatar/avatar398.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar399.gif b/www-ssl/pic/avatar/avatar399.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar4.gif b/www-ssl/pic/avatar/avatar4.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar40.gif b/www-ssl/pic/avatar/avatar40.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar400.gif b/www-ssl/pic/avatar/avatar400.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar401.gif b/www-ssl/pic/avatar/avatar401.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar402.gif b/www-ssl/pic/avatar/avatar402.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar403.gif b/www-ssl/pic/avatar/avatar403.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar404.gif b/www-ssl/pic/avatar/avatar404.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar405.gif b/www-ssl/pic/avatar/avatar405.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar406.gif b/www-ssl/pic/avatar/avatar406.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar407.gif b/www-ssl/pic/avatar/avatar407.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar408.gif b/www-ssl/pic/avatar/avatar408.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar409.gif b/www-ssl/pic/avatar/avatar409.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar41.gif b/www-ssl/pic/avatar/avatar41.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar410.gif b/www-ssl/pic/avatar/avatar410.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar411.gif b/www-ssl/pic/avatar/avatar411.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar412.gif b/www-ssl/pic/avatar/avatar412.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar413.gif b/www-ssl/pic/avatar/avatar413.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar414.gif b/www-ssl/pic/avatar/avatar414.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar415.gif b/www-ssl/pic/avatar/avatar415.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar416.gif b/www-ssl/pic/avatar/avatar416.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar417.gif b/www-ssl/pic/avatar/avatar417.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar418.gif b/www-ssl/pic/avatar/avatar418.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar419.gif b/www-ssl/pic/avatar/avatar419.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar42.gif b/www-ssl/pic/avatar/avatar42.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar420.gif b/www-ssl/pic/avatar/avatar420.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar421.gif b/www-ssl/pic/avatar/avatar421.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar422.gif b/www-ssl/pic/avatar/avatar422.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar423.gif b/www-ssl/pic/avatar/avatar423.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar424.gif b/www-ssl/pic/avatar/avatar424.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar425.gif b/www-ssl/pic/avatar/avatar425.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar426.gif b/www-ssl/pic/avatar/avatar426.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar427.gif b/www-ssl/pic/avatar/avatar427.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar428.gif b/www-ssl/pic/avatar/avatar428.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar429.gif b/www-ssl/pic/avatar/avatar429.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar43.gif b/www-ssl/pic/avatar/avatar43.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar430.gif b/www-ssl/pic/avatar/avatar430.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar431.gif b/www-ssl/pic/avatar/avatar431.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar432.gif b/www-ssl/pic/avatar/avatar432.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar433.gif b/www-ssl/pic/avatar/avatar433.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar434.gif b/www-ssl/pic/avatar/avatar434.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar435.gif b/www-ssl/pic/avatar/avatar435.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar436.gif b/www-ssl/pic/avatar/avatar436.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar437.gif b/www-ssl/pic/avatar/avatar437.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar438.gif b/www-ssl/pic/avatar/avatar438.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar439.gif b/www-ssl/pic/avatar/avatar439.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar44.gif b/www-ssl/pic/avatar/avatar44.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar440.gif b/www-ssl/pic/avatar/avatar440.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar441.gif b/www-ssl/pic/avatar/avatar441.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar442.gif b/www-ssl/pic/avatar/avatar442.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar443.gif b/www-ssl/pic/avatar/avatar443.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar444.gif b/www-ssl/pic/avatar/avatar444.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar445.gif b/www-ssl/pic/avatar/avatar445.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar446.gif b/www-ssl/pic/avatar/avatar446.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar447.gif b/www-ssl/pic/avatar/avatar447.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar448.gif b/www-ssl/pic/avatar/avatar448.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar449.gif b/www-ssl/pic/avatar/avatar449.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar45.gif b/www-ssl/pic/avatar/avatar45.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar450.gif b/www-ssl/pic/avatar/avatar450.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar451.gif b/www-ssl/pic/avatar/avatar451.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar452.gif b/www-ssl/pic/avatar/avatar452.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar453.gif b/www-ssl/pic/avatar/avatar453.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar454.gif b/www-ssl/pic/avatar/avatar454.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar455.gif b/www-ssl/pic/avatar/avatar455.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar456.gif b/www-ssl/pic/avatar/avatar456.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar457.gif b/www-ssl/pic/avatar/avatar457.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar458.gif b/www-ssl/pic/avatar/avatar458.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar459.gif b/www-ssl/pic/avatar/avatar459.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar46.gif b/www-ssl/pic/avatar/avatar46.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar460.gif b/www-ssl/pic/avatar/avatar460.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar461.gif b/www-ssl/pic/avatar/avatar461.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar462.gif b/www-ssl/pic/avatar/avatar462.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar463.gif b/www-ssl/pic/avatar/avatar463.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar464.gif b/www-ssl/pic/avatar/avatar464.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar465.gif b/www-ssl/pic/avatar/avatar465.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar466.gif b/www-ssl/pic/avatar/avatar466.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar467.gif b/www-ssl/pic/avatar/avatar467.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar468.gif b/www-ssl/pic/avatar/avatar468.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar469.gif b/www-ssl/pic/avatar/avatar469.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar47.gif b/www-ssl/pic/avatar/avatar47.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar470.gif b/www-ssl/pic/avatar/avatar470.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar471.gif b/www-ssl/pic/avatar/avatar471.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar472.gif b/www-ssl/pic/avatar/avatar472.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar473.gif b/www-ssl/pic/avatar/avatar473.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar474.gif b/www-ssl/pic/avatar/avatar474.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar475.gif b/www-ssl/pic/avatar/avatar475.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar476.gif b/www-ssl/pic/avatar/avatar476.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar477.gif b/www-ssl/pic/avatar/avatar477.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar478.gif b/www-ssl/pic/avatar/avatar478.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar479.gif b/www-ssl/pic/avatar/avatar479.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar48.gif b/www-ssl/pic/avatar/avatar48.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar480.gif b/www-ssl/pic/avatar/avatar480.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar481.gif b/www-ssl/pic/avatar/avatar481.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar482.gif b/www-ssl/pic/avatar/avatar482.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar483.gif b/www-ssl/pic/avatar/avatar483.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar484.gif b/www-ssl/pic/avatar/avatar484.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar485.gif b/www-ssl/pic/avatar/avatar485.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar486.gif b/www-ssl/pic/avatar/avatar486.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar487.gif b/www-ssl/pic/avatar/avatar487.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar488.gif b/www-ssl/pic/avatar/avatar488.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar489.gif b/www-ssl/pic/avatar/avatar489.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar49.gif b/www-ssl/pic/avatar/avatar49.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar490.gif b/www-ssl/pic/avatar/avatar490.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar491.gif b/www-ssl/pic/avatar/avatar491.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar492.gif b/www-ssl/pic/avatar/avatar492.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar493.gif b/www-ssl/pic/avatar/avatar493.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar494.gif b/www-ssl/pic/avatar/avatar494.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar495.gif b/www-ssl/pic/avatar/avatar495.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar496.gif b/www-ssl/pic/avatar/avatar496.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar497.gif b/www-ssl/pic/avatar/avatar497.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar498.gif b/www-ssl/pic/avatar/avatar498.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar499.gif b/www-ssl/pic/avatar/avatar499.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar5.gif b/www-ssl/pic/avatar/avatar5.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar50.gif b/www-ssl/pic/avatar/avatar50.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar51.gif b/www-ssl/pic/avatar/avatar51.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar52.gif b/www-ssl/pic/avatar/avatar52.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar53.gif b/www-ssl/pic/avatar/avatar53.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar54.gif b/www-ssl/pic/avatar/avatar54.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar55.gif b/www-ssl/pic/avatar/avatar55.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar56.gif b/www-ssl/pic/avatar/avatar56.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar57.gif b/www-ssl/pic/avatar/avatar57.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar58.gif b/www-ssl/pic/avatar/avatar58.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar59.gif b/www-ssl/pic/avatar/avatar59.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar6.gif b/www-ssl/pic/avatar/avatar6.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar60.gif b/www-ssl/pic/avatar/avatar60.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar61.gif b/www-ssl/pic/avatar/avatar61.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar62.gif b/www-ssl/pic/avatar/avatar62.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar63.gif b/www-ssl/pic/avatar/avatar63.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar64.gif b/www-ssl/pic/avatar/avatar64.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar65.gif b/www-ssl/pic/avatar/avatar65.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar66.gif b/www-ssl/pic/avatar/avatar66.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar67.gif b/www-ssl/pic/avatar/avatar67.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar68.gif b/www-ssl/pic/avatar/avatar68.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar69.gif b/www-ssl/pic/avatar/avatar69.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar7.gif b/www-ssl/pic/avatar/avatar7.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar70.gif b/www-ssl/pic/avatar/avatar70.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar71.gif b/www-ssl/pic/avatar/avatar71.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar72.gif b/www-ssl/pic/avatar/avatar72.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar73.gif b/www-ssl/pic/avatar/avatar73.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar74.gif b/www-ssl/pic/avatar/avatar74.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar75.gif b/www-ssl/pic/avatar/avatar75.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar76.gif b/www-ssl/pic/avatar/avatar76.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar77.gif b/www-ssl/pic/avatar/avatar77.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar78.gif b/www-ssl/pic/avatar/avatar78.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar79.gif b/www-ssl/pic/avatar/avatar79.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar8.gif b/www-ssl/pic/avatar/avatar8.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar80.gif b/www-ssl/pic/avatar/avatar80.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar81.gif b/www-ssl/pic/avatar/avatar81.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar82.gif b/www-ssl/pic/avatar/avatar82.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar83.gif b/www-ssl/pic/avatar/avatar83.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar84.gif b/www-ssl/pic/avatar/avatar84.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar85.gif b/www-ssl/pic/avatar/avatar85.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar86.gif b/www-ssl/pic/avatar/avatar86.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar87.gif b/www-ssl/pic/avatar/avatar87.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar88.gif b/www-ssl/pic/avatar/avatar88.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar89.gif b/www-ssl/pic/avatar/avatar89.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar9.gif b/www-ssl/pic/avatar/avatar9.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar90.gif b/www-ssl/pic/avatar/avatar90.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar91.gif b/www-ssl/pic/avatar/avatar91.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar92.gif b/www-ssl/pic/avatar/avatar92.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar93.gif b/www-ssl/pic/avatar/avatar93.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar94.gif b/www-ssl/pic/avatar/avatar94.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar95.gif b/www-ssl/pic/avatar/avatar95.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar96.gif b/www-ssl/pic/avatar/avatar96.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar97.gif b/www-ssl/pic/avatar/avatar97.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar98.gif b/www-ssl/pic/avatar/avatar98.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/avatar/avatar99.gif b/www-ssl/pic/avatar/avatar99.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/external.png b/www-ssl/pic/external.png
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/himmel.png b/www-ssl/pic/himmel.png
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/himmel_w.png b/www-ssl/pic/himmel_w.png
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/aerger2.gif b/www-ssl/pic/smiles/aerger2.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/alien.gif b/www-ssl/pic/smiles/alien.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/blush.gif b/www-ssl/pic/smiles/blush.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/boggle.gif b/www-ssl/pic/smiles/boggle.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/bounce.gif b/www-ssl/pic/smiles/bounce.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/bun.gif b/www-ssl/pic/smiles/bun.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/candycane.gif b/www-ssl/pic/smiles/candycane.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/cheesy.gif b/www-ssl/pic/smiles/cheesy.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/dead.gif b/www-ssl/pic/smiles/dead.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/depressed.gif b/www-ssl/pic/smiles/depressed.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/ginger.gif b/www-ssl/pic/smiles/ginger.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/hirsch1.gif b/www-ssl/pic/smiles/hirsch1.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/huh.gif b/www-ssl/pic/smiles/huh.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_arrow.gif b/www-ssl/pic/smiles/icon_arrow.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_biggrin.gif b/www-ssl/pic/smiles/icon_biggrin.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_confused.gif b/www-ssl/pic/smiles/icon_confused.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_cool.gif b/www-ssl/pic/smiles/icon_cool.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_cry.gif b/www-ssl/pic/smiles/icon_cry.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_eek.gif b/www-ssl/pic/smiles/icon_eek.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_evil.gif b/www-ssl/pic/smiles/icon_evil.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_exclaim.gif b/www-ssl/pic/smiles/icon_exclaim.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_frown.gif b/www-ssl/pic/smiles/icon_frown.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_idea.gif b/www-ssl/pic/smiles/icon_idea.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_lol.gif b/www-ssl/pic/smiles/icon_lol.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_mad.gif b/www-ssl/pic/smiles/icon_mad.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_mrgreen.gif b/www-ssl/pic/smiles/icon_mrgreen.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_neutral.gif b/www-ssl/pic/smiles/icon_neutral.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_question.gif b/www-ssl/pic/smiles/icon_question.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_razz.gif b/www-ssl/pic/smiles/icon_razz.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_redface.gif b/www-ssl/pic/smiles/icon_redface.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_rolleyes.gif b/www-ssl/pic/smiles/icon_rolleyes.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_sad.gif b/www-ssl/pic/smiles/icon_sad.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_smile.gif b/www-ssl/pic/smiles/icon_smile.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_surprised.gif b/www-ssl/pic/smiles/icon_surprised.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_twisted.gif b/www-ssl/pic/smiles/icon_twisted.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/icon_wind.gif b/www-ssl/pic/smiles/icon_wind.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/koenig1.gif b/www-ssl/pic/smiles/koenig1.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/laser1.gif b/www-ssl/pic/smiles/laser1.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/love1.gif b/www-ssl/pic/smiles/love1.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/moo.gif b/www-ssl/pic/smiles/moo.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/nuts.gif b/www-ssl/pic/smiles/nuts.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/robin.gif b/www-ssl/pic/smiles/robin.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/sheep.gif b/www-ssl/pic/smiles/sheep.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/sick.gif b/www-ssl/pic/smiles/sick.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/sleep.gif b/www-ssl/pic/smiles/sleep.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/soppy.gif b/www-ssl/pic/smiles/soppy.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/stress.gif b/www-ssl/pic/smiles/stress.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/sweet.gif b/www-ssl/pic/smiles/sweet.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/tired.gif b/www-ssl/pic/smiles/tired.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/urgh.gif b/www-ssl/pic/smiles/urgh.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/winken1.gif b/www-ssl/pic/smiles/winken1.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/worm.gif b/www-ssl/pic/smiles/worm.gif
old mode 100755
new mode 100644
diff --git a/www-ssl/pic/smiles/worry.gif b/www-ssl/pic/smiles/worry.gif
old mode 100755
new mode 100644
diff --git a/www/404.php b/www/404.php
index b9e5ed58..dc19cd26 100644
--- a/www/404.php
+++ b/www/404.php
@@ -1,3 +1,3 @@
-<?PHP
-header("Location: https://".$_SERVER['HTTP_HOST'].$_SERVER['REDIRECT_URL']);
+<?php
+  header("Location: https://" . $_SERVER['HTTP_HOST'] . $_SERVER['REDIRECT_URL']);
 ?>
diff --git a/www/index.php b/www/index.php
index 2e218040..9105555e 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,4 +1,3 @@
-<?PHP
-header("Location: https://".$_SERVER['HTTP_HOST']."/");
+<?php
+  header("Location: https://" . $_SERVER['HTTP_HOST'] . "/");
 ?>
-
-- 
cgit v1.2.3-54-g00ecf


From a537f4bf73101c467af3b01db32fcdb9fd0a91ce Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 14:48:31 +0200
Subject: bootstrapping

---
 www-ssl/admin/news.php                   |  15 +-
 www-ssl/css/base.css                     |   2 +-
 www-ssl/makeuser.php                     | 391 ++++++++++++++------------
 www-ssl/nonpublic/auth.php               |  59 ++--
 www-ssl/nonpublic/einstellungen.php      | 457 +++++++++++++++----------------
 www-ssl/nonpublic/engelbesprechung.php   |  40 +--
 www-ssl/nonpublic/faq.php                |  72 ++---
 www-ssl/nonpublic/messages.php           | 242 ++++++++--------
 www-ssl/nonpublic/myschichtplan.php      | 329 +++++++++++-----------
 www-ssl/nonpublic/myschichtplan_ical.php |  63 +++--
 www-ssl/nonpublic/news_comments.php      |  87 +++---
 www-ssl/nonpublic/schichtplan.1.php      |  27 +-
 www-ssl/nonpublic/schichtplan.2.php      |  28 +-
 www-ssl/nonpublic/schichtplan.php        | 360 ++++++++++++------------
 www-ssl/nonpublic/schichtplan_add.php    | 221 +++++++--------
 www-ssl/nonpublic/schichtplan_beamer.php |  56 ++--
 www-ssl/nonpublic/waeckliste.php         |  28 +-
 www-ssl/nonpublic/wecken.php             |  65 +++--
 18 files changed, 1292 insertions(+), 1250 deletions(-)

(limited to 'www-ssl/nonpublic/myschichtplan.php')

diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php
index f25eab93..b6d9dc69 100644
--- a/www-ssl/admin/news.php
+++ b/www-ssl/admin/news.php
@@ -1,9 +1,10 @@
 <?php
+require_once('../bootstrap.php');
 
 $title = "Newsverwaltung";
 $header = "Verwaltung der News";
-include ("../../../camp2011/includes/header.php");
-include ("../../../camp2011/includes/funktion_db_list.php");
+include ("includes/header.php");
+include ("includes/funktion_db_list.php");
 
 
 if (!IsSet($_GET["action"]))
@@ -85,7 +86,7 @@ else
         echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden";
     }
     else
-      echo "Fehler: \"date\" nicht übergeben";
+      echo "Fehler: \"date\" nicht �bergeben";
     break;
 
   case 'change_save':
@@ -93,20 +94,20 @@ else
       $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. 
         "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1";
     else
-      echo "Fehler: nicht genügend parameter übergeben";
+      echo "Fehler: nicht gen�gend parameter �bergeben";
     break;
 
   case 'delete':
     if (isset($_POST["date"]))
             $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1";
     else
-      echo "Fehler: \"date\" nicht übergeben";
+      echo "Fehler: \"date\" nicht �bergeben";
     break;
   } //SWITCH
 
   if (IsSet($chsql)) 
   {
-    // SQL-Statement ausführen...
+    // SQL-Statement ausf�hren...
     $Erg = mysql_query($chsql, $con);
     If ($Erg == 1)
       echo "&Auml;nderung erfolgreich gesichert...";
@@ -117,6 +118,6 @@ else
   }
 }// IF-ELSE
 
-include ("../../../camp2011/includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index b6017ad2..0fe3e5a9 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -33,7 +33,7 @@ footer p {
 	margin: 0 5%;
 }
 
-td {
+td, dt, dd {
 	padding: 4px;
 }
 
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index 785de1e8..a67f4bd5 100644
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -1,181 +1,214 @@
 <?php
-  $title = "Anmeldung zum Chaos-Engel";
-  $header = "";
-  $success = "none";
-
-  include "../config/config.php";
-  include "../includes/header.php";
-  include "../config/config_db.php";
-  include "../includes/crypt.php";
-
-  if(isset($_POST["send"])) {
-    $eNick = trim($_POST["Nick"]);
-
-    if($_POST["Alter"] == "")
-      $_POST["Alter"] = 0;
-
-    // user vorhanden?
-    $SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'";
-    $Ergans = mysql_query($SQLans, $con);
-
-    if(strlen($_POST["Nick"]) < 2)
-      $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
-    elseif(mysql_num_rows( $Ergans) > 0)
-      $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3");
-    elseif(strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false)
-      $error = Get_Text("makeuser_error_mail");
-    elseif(!is_numeric($_POST["Alter"]))
-      $error = Get_Text("makeuser_error_Alter");
-    elseif($_POST["Passwort"] != $_POST["Passwort2"])
-      $error = Get_Text("makeuser_error_password1");
-    elseif(strlen($_POST["Passwort"]) < 6)
-      $error = Get_Text("makeuser_error_password2");
-    else {
-      $_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
-      unset($_POST["Passwort2"]);
-
-      $SQL = "INSERT INTO `User` (".
-             "`Nick` , ".  "`Name` , ".
-             "`Vorname`, ".  "`Alter` , ".
-             "`Telefon`, ".  "`DECT`, ".
-             "`Handy`, ".  "`email`, ".
-             "`ICQ`, ".  "`jabber`, ".
-             "`Size`, ".  "`Passwort`, ".
-             "`Art` , ".  "`kommentar`, ".
-             "`Hometown`,".  "`CreateDate` ) ".
-             "VALUES ( ".
-             "'". $_POST["Nick"]. "', ".    "'". $_POST["Name"]. "', ".
-             "'". $_POST["Vorname"]. "', ".    "'". $_POST["Alter"]. "', ".
-             "'". $_POST["Telefon"]. "', ".    "'". $_POST["DECT"]. "', ".
-             "'". $_POST["Handy"]. "', ".    "'". $_POST["email"]. "', ".
-             "'". $_POST["ICQ"]. "', ".    "'". $_POST["jabber"]. "', ".
-             "'". $_POST["Size"]. "', ".    "'". $_POST["Passwort"]. "', ".
-             "'". $_POST["Art"]. "', ".    "'". $_POST["kommentar"]. "', ".
-             "'". $_POST["Hometown"]. "',".    "NOW());";
-      $Erg = mysql_query($SQL, $con);
-
-      if ($Erg != 1) {
-        echo Get_Text("makeuser_error_write1") . "<br />\n";
-        $error = mysql_error($con);
-      } else {
-        echo "<p class=\"important\">" . Get_Text("makeuser_writeOK") . "\n";
-
-        $SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "';";
-        $Erg2 = mysql_query($SQL2, $con);
-        $Data = mysql_fetch_array($Erg2);
-
-        $SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('" . $Data["UID"] . "');";
-        $Erg3 = mysql_query($SQL3, $con);
-
-        if ($Erg3 != 1) {
-          echo "<h1>". Get_Text("makeuser_error_write2"). "<br />\n";
-          $error = mysql_error($con);
-        } else {
-          echo Get_Text("makeuser_writeOK2") . "<br />\n";
-          echo "<h1>" . Get_Text("makeuser_writeOK3") . "</h1>\n";
-        }
-
-        echo Get_Text("makeuser_writeOK4") . "</p><p></p>\n<br /><br />\n";
-        $success = "any";
-
-        if (isset($SubscribeMailinglist)) {
-          if ($_POST["subscribe-mailinglist"] == "") {
-            $headers = "From: " . $_POST["email"] . "\r\n" .
-                       "X-Mailer: PHP/" . phpversion();
-            mail($SubscribeMailinglist, "subject", "message", $headers);
-          }
-        }
-      }
-    }
-
-    if(isset($error))
-      echo "<p class=\"warning\">\n" . $error . "\n</p>\n\n";
-  } else {
-    // init vars
-    $_POST["Nick"] = "";
-    $_POST["Name"] = "";
-    $_POST["Vorname"] = "";
-    $_POST["Alter"] = "";
-    $_POST["Telefon"] = "";
-    $_POST["DECT"] = "";
-    $_POST["Handy"] = "";
-    $_POST["email"] = "";
-    $_POST["subscribe-mailinglist"] = "";
-    $_POST["ICQ"] = "";
-    $_POST["jabber"] = "";
-    $_POST["Size"] = "L";
-    $_POST["Art"] = "";
-    $_POST["kommentar"] = "";
-    $_POST["Hometown"] = "";
-  }
-
-  if($success == "none") {
-    echo "<h1>" . Get_Text("makeuser_text0") . "</h1>\n";
-    echo "<h2>" . Get_Text("makeuser_text1") . "</h2>\n";
-    echo "<form action=\"\" method=\"post\">\n";
-    echo "<table>\n";
-    echo "<tr><td>" . Get_Text("makeuser_Nickname") . "*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"" . $_POST["Nick"] . "\" /></td></tr>\n";
-    echo "<tr><td>" . Get_Text("makeuser_Nachname") . "</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"" . $_POST["Name"] . "\" /></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Vorname") . "</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"" . $_POST["Vorname"] . "\" /></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Alter") . "</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"". $_POST["Alter"]. "\"></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Telefon"). "</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"". $_POST["Telefon"]. "\"></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_DECT"). "</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"". $_POST["DECT"]. "\"></td><td>\n";
-    echo "<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Handy"). "</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"". $_POST["Handy"]. "\"></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_E-Mail"). "*</td><td><input type=\"text\" size=\"40\" name=\"email\" value=\"". $_POST["email"]. "\"></td></tr>\n";
-
-    if(isset($SubscribeMailinglist))
-      echo "<tr><td>". Get_Text("makeuser_subscribe-mailinglist"). "</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"". $_POST["subscribe-mailinglist"]. "\">($SubscribeMailinglist)</td></tr>\n";
-
-    echo "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"". $_POST["ICQ"]. "\"></td></tr>\n";
-    echo "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"". $_POST["jabber"]. "\"></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_T-Shirt"). " Gr&ouml;sse*</td><td align=\"left\">\n";
-    echo "<select name=\"Size\">\n";
-    echo "<option value=\"S\"";  if ($_POST["Size"]=="S")   echo " selected";  echo ">S</option>\n";
-    echo "<option value=\"M\"";  if ($_POST["Size"]=="M")   echo " selected";  echo ">M</option>\n";
-    echo "<option value=\"L\"";  if ($_POST["Size"]=="L")   echo " selected";  echo ">L</option>\n";
-    echo "<option value=\"XL\"";  if ($_POST["Size"]=="XL")   echo " selected";  echo ">XL</option>\n";
-    echo "<option value=\"2XL\"";  if ($_POST["Size"]=="2XL")   echo " selected";  echo ">2XL</option>\n";
-    echo "<option value=\"3XL\"";  if ($_POST["Size"]=="3XL")   echo " selected";  echo ">3XL</option>\n";
-    echo "<option value=\"4XL\"";  if ($_POST["Size"]=="4XL")   echo " selected";  echo ">4XL</option>\n";
-    echo "<option value=\"5XL\"";  if ($_POST["Size"]=="5XL")   echo " selected";  echo ">5XL</option>\n";
-    echo "<option value=\"S-G\"";  if ($_POST["Size"]=="S-G")   echo " selected";  echo ">S Girl</option>\n";
-    echo "<option value=\"M-G\"";  if ($_POST["Size"]=="M-G")   echo " selected";  echo ">M Girl</option>\n";
-    echo "<option value=\"L-G\"";  if ($_POST["Size"]=="L-G")   echo " selected";  echo ">L Girl</option>\n";
-    echo "<option value=\"XL-G\"";  if ($_POST["Size"]=="XL-G")   echo " selected";  echo ">XL Girl</option>\n";
-    echo "</select>\n";
-    echo "</td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Engelart"). "</td><td align=\"left\">\n";
-    echo "<select name=\"Art\">\n";
-
-    $Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`";
-    $Erg = mysql_query($Sql, $con);
-
-    for($t = 0; $t < mysql_num_rows($Erg); $t++) {
-      $Name = mysql_result($Erg, $t, "Name"). Get_Text("inc_schicht_engel");
-      echo "<option value=\"" . $Name . "\"";
-
-      if($_POST["Art"]==$Name)
-        echo " selected"; 
-
-      echo ">$Name</option>\n";
-    }
-
-    echo "</select>\n";
-    echo "</td>\n";
-    echo "</tr>\n";
-    echo "<tr>\n";
-    echo "<td>". Get_Text("makeuser_text2"). "</td>\n";
-    echo "<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">". $_POST["kommentar"]. "</textarea></td>\n";
-    echo "</tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Hometown"). "</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"". $_POST["Hometown"]. "\"></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Passwort"). "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
-    echo "<tr><td>". Get_Text("makeuser_Passwort2"). "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
-    echo "<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"". Get_Text("makeuser_Anmelden"). "\"/></td></tr>\n";
-    echo "</table>\n";
-    echo "</form>\n";
-    Print_Text("makeuser_text3");
-  }
-
-  include "../includes/footer.php";
+require_once ('bootstrap.php');
+
+$title = "Anmeldung zum Chaos-Engel";
+$header = "";
+$success = "none";
+
+include "config/config.php";
+include "includes/header.php";
+include "config/config_db.php";
+include "includes/crypt.php";
+
+if (isset ($_POST["send"])) {
+	$eNick = trim($_POST["Nick"]);
+
+	if ($_POST["Alter"] == "")
+		$_POST["Alter"] = 0;
+
+	// user vorhanden?
+	$SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'";
+	$Ergans = mysql_query($SQLans, $con);
+
+	if (strlen($_POST["Nick"]) < 2)
+		$error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
+	elseif (mysql_num_rows($Ergans) > 0) $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3");
+	elseif (strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false) $error = Get_Text("makeuser_error_mail");
+	elseif (!is_numeric($_POST["Alter"])) $error = Get_Text("makeuser_error_Alter");
+	elseif ($_POST["Passwort"] != $_POST["Passwort2"]) $error = Get_Text("makeuser_error_password1");
+	elseif (strlen($_POST["Passwort"]) < 6) $error = Get_Text("makeuser_error_password2");
+	else {
+		$_POST["Passwort"] = PassCrypt($_POST["Passwort"]);
+		unset ($_POST["Passwort2"]);
+
+		$SQL = "INSERT INTO `User` (" .
+		"`Nick` , " . "`Name` , " .
+		"`Vorname`, " . "`Alter` , " .
+		"`Telefon`, " . "`DECT`, " .
+		"`Handy`, " . "`email`, " .
+		"`ICQ`, " . "`jabber`, " .
+		"`Size`, " . "`Passwort`, " .
+		"`Art` , " . "`kommentar`, " .
+		"`Hometown`," . "`CreateDate` ) " .
+		"VALUES ( " .
+		"'" . $_POST["Nick"] . "', " . "'" . $_POST["Name"] . "', " .
+		"'" . $_POST["Vorname"] . "', " . "'" . $_POST["Alter"] . "', " .
+		"'" . $_POST["Telefon"] . "', " . "'" . $_POST["DECT"] . "', " .
+		"'" . $_POST["Handy"] . "', " . "'" . $_POST["email"] . "', " .
+		"'" . $_POST["ICQ"] . "', " . "'" . $_POST["jabber"] . "', " .
+		"'" . $_POST["Size"] . "', " . "'" . $_POST["Passwort"] . "', " .
+		"'" . $_POST["Art"] . "', " . "'" . $_POST["kommentar"] . "', " .
+		"'" . $_POST["Hometown"] . "'," . "NOW());";
+		$Erg = mysql_query($SQL, $con);
+
+		if ($Erg != 1) {
+			echo Get_Text("makeuser_error_write1") . "<br />\n";
+			$error = mysql_error($con);
+		} else {
+			echo "<p class=\"important\">" . Get_Text("makeuser_writeOK") . "\n";
+
+			$SQL2 = "SELECT `UID` FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "';";
+			$Erg2 = mysql_query($SQL2, $con);
+			$Data = mysql_fetch_array($Erg2);
+
+			$SQL3 = "INSERT INTO `UserCVS` (`UID`) VALUES ('" . $Data["UID"] . "');";
+			$Erg3 = mysql_query($SQL3, $con);
+
+			if ($Erg3 != 1) {
+				echo "<h1>" . Get_Text("makeuser_error_write2") . "<br />\n";
+				$error = mysql_error($con);
+			} else {
+				echo Get_Text("makeuser_writeOK2") . "<br />\n";
+				echo "<h1>" . Get_Text("makeuser_writeOK3") . "</h1>\n";
+			}
+
+			echo Get_Text("makeuser_writeOK4") . "</p><p></p>\n<br /><br />\n";
+			$success = "any";
+
+			if (isset ($SubscribeMailinglist)) {
+				if ($_POST["subscribe-mailinglist"] == "") {
+					$headers = "From: " . $_POST["email"] . "\r\n" .
+					"X-Mailer: PHP/" . phpversion();
+					mail($SubscribeMailinglist, "subject", "message", $headers);
+				}
+			}
+		}
+	}
+
+	if (isset ($error))
+		echo "<p class=\"warning\">\n" . $error . "\n</p>\n\n";
+} else {
+	// init vars
+	$_POST["Nick"] = "";
+	$_POST["Name"] = "";
+	$_POST["Vorname"] = "";
+	$_POST["Alter"] = "";
+	$_POST["Telefon"] = "";
+	$_POST["DECT"] = "";
+	$_POST["Handy"] = "";
+	$_POST["email"] = "";
+	$_POST["subscribe-mailinglist"] = "";
+	$_POST["ICQ"] = "";
+	$_POST["jabber"] = "";
+	$_POST["Size"] = "L";
+	$_POST["Art"] = "";
+	$_POST["kommentar"] = "";
+	$_POST["Hometown"] = "";
+}
+
+if ($success == "none") {
+	echo "<h1>" . Get_Text("makeuser_text0") . "</h1>\n";
+	echo "<h2>" . Get_Text("makeuser_text1") . "</h2>\n";
+	echo "<form action=\"\" method=\"post\">\n";
+	echo "<table>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Nickname") . "*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"" . $_POST["Nick"] . "\" /></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Nachname") . "</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"" . $_POST["Name"] . "\" /></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Vorname") . "</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"" . $_POST["Vorname"] . "\" /></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Alter") . "</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"" . $_POST["Alter"] . "\"></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Telefon") . "</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"" . $_POST["Telefon"] . "\"></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_DECT") . "</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"" . $_POST["DECT"] . "\"></td><td>\n";
+	echo "<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Handy") . "</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"" . $_POST["Handy"] . "\"></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_E-Mail") . "*</td><td><input type=\"text\" size=\"40\" name=\"email\" value=\"" . $_POST["email"] . "\"></td></tr>\n";
+
+	if (isset ($SubscribeMailinglist))
+		echo "<tr><td>" . Get_Text("makeuser_subscribe-mailinglist") . "</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"" . $_POST["subscribe-mailinglist"] . "\">($SubscribeMailinglist)</td></tr>\n";
+
+	echo "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"" . $_POST["ICQ"] . "\"></td></tr>\n";
+	echo "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"" . $_POST["jabber"] . "\"></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_T-Shirt") . " Gr&ouml;sse*</td><td align=\"left\">\n";
+	echo "<select name=\"Size\">\n";
+	echo "<option value=\"S\"";
+	if ($_POST["Size"] == "S")
+		echo " selected";
+	echo ">S</option>\n";
+	echo "<option value=\"M\"";
+	if ($_POST["Size"] == "M")
+		echo " selected";
+	echo ">M</option>\n";
+	echo "<option value=\"L\"";
+	if ($_POST["Size"] == "L")
+		echo " selected";
+	echo ">L</option>\n";
+	echo "<option value=\"XL\"";
+	if ($_POST["Size"] == "XL")
+		echo " selected";
+	echo ">XL</option>\n";
+	echo "<option value=\"2XL\"";
+	if ($_POST["Size"] == "2XL")
+		echo " selected";
+	echo ">2XL</option>\n";
+	echo "<option value=\"3XL\"";
+	if ($_POST["Size"] == "3XL")
+		echo " selected";
+	echo ">3XL</option>\n";
+	echo "<option value=\"4XL\"";
+	if ($_POST["Size"] == "4XL")
+		echo " selected";
+	echo ">4XL</option>\n";
+	echo "<option value=\"5XL\"";
+	if ($_POST["Size"] == "5XL")
+		echo " selected";
+	echo ">5XL</option>\n";
+	echo "<option value=\"S-G\"";
+	if ($_POST["Size"] == "S-G")
+		echo " selected";
+	echo ">S Girl</option>\n";
+	echo "<option value=\"M-G\"";
+	if ($_POST["Size"] == "M-G")
+		echo " selected";
+	echo ">M Girl</option>\n";
+	echo "<option value=\"L-G\"";
+	if ($_POST["Size"] == "L-G")
+		echo " selected";
+	echo ">L Girl</option>\n";
+	echo "<option value=\"XL-G\"";
+	if ($_POST["Size"] == "XL-G")
+		echo " selected";
+	echo ">XL Girl</option>\n";
+	echo "</select>\n";
+	echo "</td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Engelart") . "</td><td align=\"left\">\n";
+	echo "<select name=\"Art\">\n";
+
+	$Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`";
+	$Erg = mysql_query($Sql, $con);
+
+	for ($t = 0; $t < mysql_num_rows($Erg); $t++) {
+		$Name = mysql_result($Erg, $t, "Name") . Get_Text("inc_schicht_engel");
+		echo "<option value=\"" . $Name . "\"";
+
+		if ($_POST["Art"] == $Name)
+			echo " selected";
+
+		echo ">$Name</option>\n";
+	}
+
+	echo "</select>\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+	echo "<tr>\n";
+	echo "<td>" . Get_Text("makeuser_text2") . "</td>\n";
+	echo "<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">" . $_POST["kommentar"] . "</textarea></td>\n";
+	echo "</tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Hometown") . "</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $_POST["Hometown"] . "\"></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Passwort") . "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
+	echo "<tr><td>" . Get_Text("makeuser_Passwort2") . "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
+	echo "<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"" . Get_Text("makeuser_Anmelden") . "\"/></td></tr>\n";
+	echo "</table>\n";
+	echo "</form>\n";
+	Print_Text("makeuser_text3");
+}
+
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php
index 2bd6f86f..7d58988c 100644
--- a/www-ssl/nonpublic/auth.php
+++ b/www-ssl/nonpublic/auth.php
@@ -1,32 +1,43 @@
 <?php
-  header("Content-Type: application/json");
+require_once ('../bootstrap.php');
 
-  include "../../../camp2011/includes/config.php";
-  include "../../../camp2011/includes/config_db.php";
+header("Content-Type: application/json");
 
-  $User = $_POST['user'];
-  $Pass = $_POST['pw'];
-  $SourceOuth = $_POST['so'];
+include "includes/config.php";
+include "includes/config_db.php";
 
-  if(isset($CurrentExternAuthPass) && $SourceOuth == $CurrentExternAuthPass) {
-    $sql = "SELECT * FROM `User` WHERE `Nick`='" . $User . "'";
-    $Erg = mysql_query($sql, $con);
+$User = $_POST['user'];
+$Pass = $_POST['pw'];
+$SourceOuth = $_POST['so'];
 
-    if(mysql_num_rows($Erg) == 1) {
-      if(mysql_result($Erg, 0, "Passwort") == $Pass) {
-        $UID = mysql_result($Erg, 0, "UID");
+if (isset ($CurrentExternAuthPass) && $SourceOuth == $CurrentExternAuthPass) {
+	$sql = "SELECT * FROM `User` WHERE `Nick`='" . $User . "'";
+	$Erg = mysql_query($sql, $con);
 
-        // get CVS import Data
-        $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $UID . "'";
-        $Erg_CVS =  mysql_query($SQL, $con);
-        $CVS = mysql_fetch_array($Erg_CVS);
+	if (mysql_num_rows($Erg) == 1) {
+		if (mysql_result($Erg, 0, "Passwort") == $Pass) {
+			$UID = mysql_result($Erg, 0, "UID");
 
-        $msg = array('status' => 'success', 'rights' => $CVS);
-        echo json_encode($msg);
-      } else
-        echo json_encode(array('status' => 'failed'));
-    } else
-      echo json_encode(array('status' => 'failed'));
-  } else
-    echo json_encode(array('status' => 'failed'));
+			// get CVS import Data
+			$SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $UID . "'";
+			$Erg_CVS = mysql_query($SQL, $con);
+			$CVS = mysql_fetch_array($Erg_CVS);
+
+			$msg = array (
+				'status' => 'success',
+				'rights' => $CVS
+			);
+			echo json_encode($msg);
+		} else
+			echo json_encode(array (
+				'status' => 'failed'
+			));
+	} else
+		echo json_encode(array (
+			'status' => 'failed'
+		));
+} else
+	echo json_encode(array (
+		'status' => 'failed'
+	));
 ?>
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 6ddb093a..81dda869 100644
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -1,12 +1,14 @@
 <?php
-  $title = "Himmel";
-  $header = "Deine pers&ouml;nlichen Einstellungen";
-  include "../../../camp2011/includes/header.php";
-  include "../../../camp2011/includes/crypt.php";
-
-  if(!isset($_POST["action"])) {
-    echo Get_Text("Hallo").$_SESSION['Nick'].",<br />\n\n";
-    Print_Text(13);
+require_once ('../bootstrap.php');
+
+$title = "Himmel";
+$header = "Deine pers&ouml;nlichen Einstellungen";
+include "includes/header.php";
+include "includes/crypt.php";
+
+if (!isset ($_POST["action"])) {
+	echo Get_Text("Hallo") . $_SESSION['Nick'] . ",<br />\n\n";
+	Print_Text(13);
 ?>
 <hr width="100%">
 <?php Print_Text("pub_einstellungen_Text_UserData"); ?>
@@ -69,7 +71,9 @@
     </tr>
 
 <?php
-if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
+
+
+	if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
 ?>
     <tr>
       <td><?php Print_Text("makeuser_T-Shirt"); ?></td>
@@ -83,7 +87,9 @@ if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
       </select></td>
     </tr>
 <?php
-}
+
+
+	}
 ?>
   </table>
   <input type="submit" value="<?php Print_Text("save"); ?>">
@@ -147,7 +153,11 @@ if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
       <select name="language">
         <option value="DE" <?php if($_SESSION['Sprache'] == 'DE') { echo "selected"; } ?>>Deutsch</option>
         <option value="EN" <?php if($_SESSION['Sprache'] == 'EN') { echo "selected"; } ?>>English</option>
-<?php /*       <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */ ?>
+<?php
+
+
+	/*       <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */
+?>
       </select>
     </td></tr>
   </table>
@@ -155,224 +165,211 @@ if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
 </form>
 
 <?php
-  if(get_cfg_var("file_uploads")) {
-    echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-    echo Get_Text('pub_einstellungen_PictureUpload') . "<br />";
-    echo "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
-    echo "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
-    echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"". get_cfg_var("post_max_size"). "\">\n";
-    echo "(max ". get_cfg_var("post_max_size"). "Byte)<br />\n";
-    echo "<input type=\"submit\" value=\"". Get_Text("upload"),"\">\n";
-    echo "</form>\n";
-  }
-
-  switch( GetPicturShow( $_SESSION['UID'])) {
-    case 'Y':
-      echo Get_Text('pub_einstellungen_PictureShow'). "<br />";
-      echo displayPictur($_SESSION['UID'], 0);
-      echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
-      echo "</form>\n";
-      break;
-    case 'N':
-      echo Get_Text('pub_einstellungen_PictureNoShow'). "<br />";
-      echo displayPictur($_SESSION['UID'], 0);
-      echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-      echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-      echo "<input type=\"submit\" value=\"". Get_Text("delete"),"\">\n";
-      echo "</form>\n";
-      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-    case '':  
-      echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-      echo Get_Text(22). "<br />"; 
-      echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
-      echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
-      echo "<table>\n";
-      echo "<tr>\n<td>". Get_Text(23). "<br /></td>\n</tr>\n";
-      echo "<tr>\n";
-      echo "<td>\n";
-      echo "<select name=\"eAvatar\" onChange=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\" onKeyup=\"document.avatar.src = '". $url. $ENGEL_ROOT. "pic/avatar/avatar' + this.value  + '.gif'\">\n"; 
-
-      for($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
-        echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
-
-      echo "</select>&nbsp;&nbsp;\n";
-      echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
-      echo "</td>\n</tr>\n";
-      echo "</table>\n";
-      echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
-      echo "</form>\n";
-      break;
-  } //CASE
-
-  } else {
-    switch ($_POST["action"]) {
-      case 'set':
-        if($_POST["new1"] == $_POST["new2"]) {
-          Print_Text(25); 
-          $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'";
-          $Erg = mysql_query($sql, $con);
-
-          if(PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) {
-            Print_Text(26);
-            Print_Text(27);
-            $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-           $Erg = mysql_query($usql, $con);
-
-           if ($Erg==1) {
-             Print_Text(28);
-           } else {
-             Print_Text(29);
-           }
-         } else {
-           Print_Text(30);
-         }
-       } else {
-         Print_Text(31);
-       }
-    break;
-
-    case 'colour':
-
-  $chsql="UPDATE `User` SET ".
-    "`color`= '". $_POST["colourid"]. "', ".
-    "`Menu`= '". $_POST["eMenu"]. "' ".
-    "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-  $Erg = mysql_query($chsql, $con);
-  echo mysql_error($con);
-  $_SESSION['color']=$_POST["colourid"];
-  $_SESSION['Menu']=$_POST["eMenu"];
-  if ($Erg==1) {
-    Print_Text(32);
-  } else {
-    Print_Text(29);
-  }
-  break;
-
-case 'sprache':
-
-  $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-  $Erg = mysql_query($chsql, $con);
-  $_SESSION['Sprache']=$_POST["language"];
-  if ($Erg==1) {
-    Print_Text(33);
-  } else {
-    Print_Text(29);
-  }
-  break;
-
-case 'avatar':
-  $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-        $Erg = mysql_query($chsql, $con);
-  $_SESSION['Avatar']=$_POST["eAvatar"];
-  if ($Erg==1)
-    Print_Text(34);
-        else
-    Print_Text(29);
-        break;
-
-case 'setUserData':
-  if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-  {
-    $chsql= "UPDATE `User` SET ".
-      "`Nick`='".     $_POST["eNick"].  "', `Name`='".   $_POST["eName"].  "', ".
-      "`Vorname`='".  $_POST["eVorname"].  "', `Alter`='".  $_POST["eAlter"]. "', ".
-      "`Telefon`='".  $_POST["eTelefon"].  "', `Handy`='".  $_POST["eHandy"]. "', ".
-      "`DECT`='".     $_POST["eDECT"].   "', `email`='".  $_POST["eemail"]. "', ".
-      "`ICQ`='".      $_POST["eICQ"].    "', `jabber`='". $_POST["ejabber"]."', ".
-      "`Hometown`='". $_POST["Hometown"].  "', `Size`='".   $_POST["Sizeid"]. "' ".
-      "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-  }
-  else
-  {
-    $chsql= "UPDATE `User` SET ".
-      "`Nick`='".     $_POST["eNick"].  "', `Name`='".   $_POST["eName"].  "', ".
-      "`Vorname`='".  $_POST["eVorname"].  "', `Alter`='".  $_POST["eAlter"]. "', ".
-      "`Telefon`='".  $_POST["eTelefon"].  "', `Handy`='".  $_POST["eHandy"]. "', ".
-      "`DECT`='".     $_POST["eDECT"].   "', `email`='".  $_POST["eemail"]. "', ".
-      "`ICQ`='".      $_POST["eICQ"].    "', `jabber`='". $_POST["ejabber"]."', ".
-      "`Hometown`='". $_POST["Hometown"].  "' ".
-      "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-  }
-        $Erg = mysql_query($chsql, $con);
-
-  if ($Erg==1) 
-  {
-    $_SESSION['Nick'] = $_POST["eNick"];
-    $_SESSION['Name'] = $_POST["eName"];
-    $_SESSION['Vorname'] = $_POST["eVorname"];
-    $_SESSION['Alter'] = $_POST["eAlter"];
-    $_SESSION['Telefon'] = $_POST["eTelefon"];
-    $_SESSION['Handy'] = $_POST["eHandy"];
-    $_SESSION['DECT'] = $_POST["eDECT"];
-    $_SESSION['email'] = $_POST["eemail"];
-    $_SESSION['ICQ'] = $_POST["eICQ"];
-    $_SESSION['jabber'] = $_POST["ejabber"];
-    $_SESSION['Hometown'] = $_POST["Hometown"];
-    if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" )
-    {
-      $_SESSION['Size']=$_POST["Sizeid"];    
-    }
-    else if( $_SESSION['Size'] != $_POST["Sizeid"]) 
-    {
-      array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
-    }
-
-  
-    Print_Text("pub_einstellungen_UserDateSaved");
-        } 
-  else
-  {
-    Print_Text(29);
-    echo mysql_error( $con);
-  }
-  break;
-
-case 'sendPicture':
-  if( $_FILES["file"]["size"] > 0)
-  {
-    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( $_SESSION['UID']) == "")
-      $SQL = "INSERT INTO `UserPicture` ".
-        "( `UID`,`Bild`, `ContentType`, `show`) ".
-        "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
-    else
-      $SQL = "UPDATE `UserPicture` SET ".
-        "`Bild`='$data', ".
-        "`ContentType`='". $_FILES["file"]["type"]. "', ".
-        "`show`='N' ".
-        "WHERE `UID`='". $_SESSION['UID']. "'";
-    
-    $res = mysql_query( $SQL, $con);
-    if( $res)
-      Print_Text("pub_einstellungen_send_OK");
-    else
-      Print_Text("pub_einstellungen_send_KO");
-  
-    echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)</h6>";
-    }
-    else
-    Print_Text("pub_einstellungen_send_KO");  
-  }
-  else
-    Print_Text("pub_einstellungen_send_KO");  
-  break;
-
-case 'delPicture':
-  $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1";
-        $Erg = mysql_query($chsql, $con);
-  if ($Erg==1)
-    Print_Text("pub_einstellungen_del_OK");
-        else
-    Print_Text("pub_einstellungen_del_KO");
-  Break;
-}
+
+
+	if (get_cfg_var("file_uploads")) {
+		echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+		echo Get_Text('pub_einstellungen_PictureUpload') . "<br />";
+		echo "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
+		echo "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
+		echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"" . get_cfg_var("post_max_size") . "\">\n";
+		echo "(max " . get_cfg_var("post_max_size") . "Byte)<br />\n";
+		echo "<input type=\"submit\" value=\"" . Get_Text("upload"), "\">\n";
+		echo "</form>\n";
+	}
+
+	switch (GetPicturShow($_SESSION['UID'])) {
+		case 'Y' :
+			echo Get_Text('pub_einstellungen_PictureShow') . "<br />";
+			echo displayPictur($_SESSION['UID'], 0);
+			echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+			echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+			echo "<input type=\"submit\" value=\"" . Get_Text("delete"), "\">\n";
+			echo "</form>\n";
+			break;
+		case 'N' :
+			echo Get_Text('pub_einstellungen_PictureNoShow') . "<br />";
+			echo displayPictur($_SESSION['UID'], 0);
+			echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+			echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+			echo "<input type=\"submit\" value=\"" . Get_Text("delete"), "\">\n";
+			echo "</form>\n";
+			echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+		case '' :
+			echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+			echo Get_Text(22) . "<br />";
+			echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
+			echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
+			echo "<table>\n";
+			echo "<tr>\n<td>" . Get_Text(23) . "<br /></td>\n</tr>\n";
+			echo "<tr>\n";
+			echo "<td>\n";
+			echo "<select name=\"eAvatar\" onChange=\"document.avatar.src = '" . $url . $ENGEL_ROOT . "pic/avatar/avatar' + this.value  + '.gif'\" onKeyup=\"document.avatar.src = '" . $url . $ENGEL_ROOT . "pic/avatar/avatar' + this.value  + '.gif'\">\n";
+
+			for ($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
+				echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
+
+			echo "</select>&nbsp;&nbsp;\n";
+			echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
+			echo "</td>\n</tr>\n";
+			echo "</table>\n";
+			echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
+			echo "</form>\n";
+			break;
+	} //CASE
+
+} else {
+	switch ($_POST["action"]) {
+		case 'set' :
+			if ($_POST["new1"] == $_POST["new2"]) {
+				Print_Text(25);
+				$sql = "SELECT * FROM `User` WHERE `UID`='" . $_SESSION['UID'] . "'";
+				$Erg = mysql_query($sql, $con);
+
+				if (PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) {
+					Print_Text(26);
+					Print_Text(27);
+					$usql = "UPDATE `User` SET `Passwort`='" . PassCrypt($_POST["new1"]) . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+					$Erg = mysql_query($usql, $con);
+
+					if ($Erg == 1) {
+						Print_Text(28);
+					} else {
+						Print_Text(29);
+					}
+				} else {
+					Print_Text(30);
+				}
+			} else {
+				Print_Text(31);
+			}
+			break;
+
+		case 'colour' :
+
+			$chsql = "UPDATE `User` SET " .
+			"`color`= '" . $_POST["colourid"] . "', " .
+			"`Menu`= '" . $_POST["eMenu"] . "' " .
+			"WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+			$Erg = mysql_query($chsql, $con);
+			echo mysql_error($con);
+			$_SESSION['color'] = $_POST["colourid"];
+			$_SESSION['Menu'] = $_POST["eMenu"];
+			if ($Erg == 1) {
+				Print_Text(32);
+			} else {
+				Print_Text(29);
+			}
+			break;
+
+		case 'sprache' :
+
+			$chsql = "UPDATE `User` SET `Sprache` = '" . $_POST["language"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+			$Erg = mysql_query($chsql, $con);
+			$_SESSION['Sprache'] = $_POST["language"];
+			if ($Erg == 1) {
+				Print_Text(33);
+			} else {
+				Print_Text(29);
+			}
+			break;
+
+		case 'avatar' :
+			$chsql = "UPDATE `User` SET `Avatar`='" . $_POST["eAvatar"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+			$Erg = mysql_query($chsql, $con);
+			$_SESSION['Avatar'] = $_POST["eAvatar"];
+			if ($Erg == 1)
+				Print_Text(34);
+			else
+				Print_Text(29);
+			break;
+
+		case 'setUserData' :
+			if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
+				$chsql = "UPDATE `User` SET " .
+				"`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " .
+				"`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " .
+				"`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " .
+				"`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " .
+				"`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " .
+				"`Hometown`='" . $_POST["Hometown"] . "', `Size`='" . $_POST["Sizeid"] . "' " .
+				"WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;";
+			} else {
+				$chsql = "UPDATE `User` SET " .
+				"`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " .
+				"`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " .
+				"`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " .
+				"`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " .
+				"`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " .
+				"`Hometown`='" . $_POST["Hometown"] . "' " .
+				"WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;";
+			}
+			$Erg = mysql_query($chsql, $con);
+
+			if ($Erg == 1) {
+				$_SESSION['Nick'] = $_POST["eNick"];
+				$_SESSION['Name'] = $_POST["eName"];
+				$_SESSION['Vorname'] = $_POST["eVorname"];
+				$_SESSION['Alter'] = $_POST["eAlter"];
+				$_SESSION['Telefon'] = $_POST["eTelefon"];
+				$_SESSION['Handy'] = $_POST["eHandy"];
+				$_SESSION['DECT'] = $_POST["eDECT"];
+				$_SESSION['email'] = $_POST["eemail"];
+				$_SESSION['ICQ'] = $_POST["eICQ"];
+				$_SESSION['jabber'] = $_POST["ejabber"];
+				$_SESSION['Hometown'] = $_POST["Hometown"];
+				if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
+					$_SESSION['Size'] = $_POST["Sizeid"];
+				} else
+					if ($_SESSION['Size'] != $_POST["Sizeid"]) {
+						array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
+					}
+
+				Print_Text("pub_einstellungen_UserDateSaved");
+			} else {
+				Print_Text(29);
+				echo mysql_error($con);
+			}
+			break;
+
+		case 'sendPicture' :
+			if ($_FILES["file"]["size"] > 0) {
+				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($_SESSION['UID']) == "")
+						$SQL = "INSERT INTO `UserPicture` " .
+						"( `UID`,`Bild`, `ContentType`, `show`) " .
+						"VALUES ('" . $_SESSION['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')";
+					else
+						$SQL = "UPDATE `UserPicture` SET " .
+						"`Bild`='$data', " .
+						"`ContentType`='" . $_FILES["file"]["type"] . "', " .
+						"`show`='N' " .
+						"WHERE `UID`='" . $_SESSION['UID'] . "'";
+
+					$res = mysql_query($SQL, $con);
+					if ($res)
+						Print_Text("pub_einstellungen_send_OK");
+					else
+						Print_Text("pub_einstellungen_send_KO");
+
+					echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"] . ", " . $_FILES["file"]["size"] . " Byte)</h6>";
+				} else
+					Print_Text("pub_einstellungen_send_KO");
+			} else
+				Print_Text("pub_einstellungen_send_KO");
+			break;
+
+		case 'delPicture' :
+			$chsql = "DELETE FROM `UserPicture` WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
+			$Erg = mysql_query($chsql, $con);
+			if ($Erg == 1)
+				Print_Text("pub_einstellungen_del_OK");
+			else
+				Print_Text("pub_einstellungen_del_KO");
+			Break;
+	}
 }
-include ("../../../camp2011/includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php
index 0f2892b7..7ff684d4 100644
--- a/www-ssl/nonpublic/engelbesprechung.php
+++ b/www-ssl/nonpublic/engelbesprechung.php
@@ -1,27 +1,29 @@
 <?php
-  $title = "Himmel";
-  $header = "Engelbesprechung";
-  include "../../../camp2011/includes/header.php";
+require_once ('../bootstrap.php');
 
-  $SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC";
-  $Erg = mysql_query($SQL, $con);
+$title = "Himmel";
+$header = "Engelbesprechung";
+include "includes/header.php";
 
-  // anzahl zeilen
-  $Zeilen  = mysql_num_rows($Erg);
+$SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC";
+$Erg = mysql_query($SQL, $con);
 
-  for ($n = 0 ; $n < $Zeilen ; $n++) {
-    if (mysql_result($Erg, $n, "Treffen") == "1") {
-      echo "<p class='question'><u>" . mysql_result($Erg, $n, "Betreff") . "</u>";
+// anzahl zeilen
+$Zeilen = mysql_num_rows($Erg);
 
-      // Show Admin Page
-      if($_SESSION['CVS']["admin/news.php"] == "Y")
-        echo " <a href=\"./../admin/news.php?action=change&date=". mysql_result($Erg, $n, "Datum"). "\">[edit]</a>";
+for ($n = 0; $n < $Zeilen; $n++) {
+	if (mysql_result($Erg, $n, "Treffen") == "1") {
+		echo "<p class='question'><u>" . mysql_result($Erg, $n, "Betreff") . "</u>";
 
-      echo "<br />&nbsp; &nbsp;<font size=1>".mysql_result($Erg, $n, "Datum").", ";
-      echo UID2Nick(mysql_result($Erg, $n, "UID"))."</font></p>\n";
-      echo "<p class='answetion'>".nl2br(mysql_result($Erg, $n, "Text"))."</p>\n";
-    }
-  }
+		// Show Admin Page
+		if ($_SESSION['CVS']["admin/news.php"] == "Y")
+			echo " <a href=\"./../admin/news.php?action=change&date=" . mysql_result($Erg, $n, "Datum") . "\">[edit]</a>";
 
-  include ("../../../camp2011/includes/footer.php");
+		echo "<br />&nbsp; &nbsp;<font size=1>" . mysql_result($Erg, $n, "Datum") . ", ";
+		echo UID2Nick(mysql_result($Erg, $n, "UID")) . "</font></p>\n";
+		echo "<p class='answetion'>" . nl2br(mysql_result($Erg, $n, "Text")) . "</p>\n";
+	}
+}
+
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php
index 7f768282..fcc17158 100644
--- a/www-ssl/nonpublic/faq.php
+++ b/www-ssl/nonpublic/faq.php
@@ -1,11 +1,13 @@
 <?php
-  $title = "Himmel";
-  $header = "FAQ / Fragen an die Erzengel";
-  include "../../../camp2011/includes/header.php";
+require_once ('../bootstrap.php');
 
-  // Erstaufruf, oder Frage bereits abgeschickt?
-  if(!isset($_POST["eUID"])) {
-    Print_Text(35);
+$title = "Himmel";
+$header = "FAQ / Fragen an die Erzengel";
+include "includes/header.php";
+
+// Erstaufruf, oder Frage bereits abgeschickt?
+if (!isset ($_POST["eUID"])) {
+	Print_Text(35);
 ?>
 <br /><br />
 <form action="./faq.php" method="POST">
@@ -14,56 +16,58 @@
   <input type="submit" value="<?php Print_Text("save"); ?>">
 </form>
 <?php
+
+
 } else {
-// Auswertung d. Formular-Daten:
+	// Auswertung d. Formular-Daten:
 
-echo "<b>".Get_Text(37)."</b><br /><br />\n".nl2br($_POST["frage"])."<br /><br />\n".Get_Text(38)."<br />\n";
+	echo "<b>" . Get_Text(37) . "</b><br /><br />\n" . nl2br($_POST["frage"]) . "<br /><br />\n" . Get_Text(38) . "<br />\n";
 
-$SQL = "INSERT INTO `Questions` VALUES ('', '".$_SESSION['UID']."', '". $_POST["frage"]. "', '', '')";
-$Erg = mysql_query($SQL, $con);
+	$SQL = "INSERT INTO `Questions` VALUES ('', '" . $_SESSION['UID'] . "', '" . $_POST["frage"] . "', '', '')";
+	$Erg = mysql_query($SQL, $con);
 
 }
 // Bisherige Anfragen:
-echo "<br />\n<b>".Get_Text(39)."</b><br />\n";
+echo "<br />\n<b>" . Get_Text(39) . "</b><br />\n";
 echo "<hr width=\"99%\">\n";
-echo "<br /><b>".Get_Text(40)."</b><br />\n";
+echo "<br /><b>" . Get_Text(40) . "</b><br />\n";
 
-$SQL = "SELECT * FROM `Questions` WHERE `UID` = ". $_SESSION['UID']. " AND `AID`='0' ORDER BY 'QID' DESC";
+$SQL = "SELECT * FROM `Questions` WHERE `UID` = " . $_SESSION['UID'] . " AND `AID`='0' ORDER BY 'QID' DESC";
 $Erg = mysql_query($SQL, $con);
 
 // anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
+$Zeilen = mysql_num_rows($Erg);
 
-if ($Zeilen==0){
-  Print_Text(41);
+if ($Zeilen == 0) {
+	Print_Text(41);
 
 } else {
-  for ($n = 0 ; $n < $Zeilen ; $n++) {
-    echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br />\n";
-// Es gibt ja noch keine Antwort:
-//    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer"))."</p>\n";
-    echo "\n<br />---<br />";
-  }
+	for ($n = 0; $n < $Zeilen; $n++) {
+		echo "<p class='question'>" . nl2br(mysql_result($Erg, $n, "Question")) . "<br />\n";
+		// Es gibt ja noch keine Antwort:
+		//    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer"))."</p>\n";
+		echo "\n<br />---<br />";
+	}
 }
 
 echo "<hr width=\"99%\">\n";
-echo "<br /><b>".Get_Text(42)."</b><br />\n";
-$SQL = "SELECT * FROM `Questions` WHERE `UID`='".$_SESSION['UID']."' and `AID`<>'0' ORDER BY 'QID' DESC";
+echo "<br /><b>" . Get_Text(42) . "</b><br />\n";
+$SQL = "SELECT * FROM `Questions` WHERE `UID`='" . $_SESSION['UID'] . "' and `AID`<>'0' ORDER BY 'QID' DESC";
 $Erg = mysql_query($SQL, $con);
 
 // anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
+$Zeilen = mysql_num_rows($Erg);
 
-if ($Zeilen==0){
-  Print_Text(41);
+if ($Zeilen == 0) {
+	Print_Text(41);
 } else {
-  for ($n = 0 ; $n < $Zeilen ; $n++) {
-    echo "<p class='question'>".nl2br(mysql_result($Erg, $n, "Question"))."<br />\n";
-    echo "<p class='answer'>".nl2br(mysql_result($Erg, $n, "Answer")).
-      "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n";
-    echo "\n<br />---<br />";
-  }
+	for ($n = 0; $n < $Zeilen; $n++) {
+		echo "<p class='question'>" . nl2br(mysql_result($Erg, $n, "Question")) . "<br />\n";
+		echo "<p class='answer'>" . nl2br(mysql_result($Erg, $n, "Answer")) .
+		"@" . UID2Nick(mysql_result($Erg, $n, "AID")) . "\n";
+		echo "\n<br />---<br />";
+	}
 }
 
-include ("../../../camp2011/includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php
index c85bf669..4868136d 100644
--- a/www-ssl/nonpublic/messages.php
+++ b/www-ssl/nonpublic/messages.php
@@ -1,122 +1,124 @@
 <?php
-  $title = "Himmel";
-  $header = "";
-
-  include "../../../camp2011/includes/header.php";
-
-  if(!isset($_GET["action"]))
-    $_GET["action"] = "start";
-
-  switch( $_GET["action"]) {
-    case "start":
-      echo Get_Text("Hello"). $_SESSION['Nick']. ", <br />\n";
-      echo Get_Text("pub_messages_text1"). "<br /><br />\n";
-
-      //show exist Messages
-      $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'";
-      $erg = mysql_query($SQL, $con);
-
-      echo "<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-      echo "<tr>\n";
-      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Datum"). "</b></td>\n";
-      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Von"). "</b></td>\n";
-      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_An"). "</b></td>\n";
-      echo "<td class=\"contenttopic\"><b>". Get_Text("pub_messages_Text"). "</b></td>\n";
-      echo "<td class=\"contenttopic\"></td>\n";
-      echo "</tr>\n";
-
-      for($i = 0; $i < mysql_num_rows($erg); $i++) {
-        echo "<tr class=\"content\">\n";
-        echo "<td>" . mysql_result($erg, $i, "Datum") . "</td>\n";
-        echo "<td>" . UID2Nick(mysql_result($erg, $i, "SUID")) . "</td>\n";
-        echo "<td>" . UID2Nick(mysql_result($erg, $i, "RUID")) . "</td>\n";
-        echo "<td>" . mysql_result($erg, $i, "Text") . "</td>\n";
-        echo "<td>"; 
-
-        if(mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) {
-          echo "<a href=\"?action=DelMsg&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_DelMsg") . "</a>";
-
-          if(mysql_result($erg, $i, "isRead") == "N")
-            echo "<a href=\"?action=MarkRead&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_MarkRead") . "</a>";
-        } else {
-          if(mysql_result($erg, $i, "isRead") == "N")
-            echo Get_Text("pub_messages_NotRead");
-        }
-
-        echo "</td>\n";
-        echo "</tr>\n";
-    }
-
-      // send Messeges
-      echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "?action=SendMsg\" method=\"POST\">";
-      echo "<tr class=\"content\">\n";
-      echo "<td></td>\n";
-      echo "<td></td>\n";
-
-      // Listet alle Nicks auf
-      echo "<td><select name=\"RUID\">\n";
-
-      $usql="SELECT * FROM `User` WHERE (`UID`!='". $_SESSION["UID"] ."') ORDER BY `Nick`";
-      $uErg = mysql_query($usql, $con);
-      $urowcount = mysql_num_rows($uErg);
-
-      for ($k = 0; $k < $urowcount; $k++) {
-        echo "<option value=\"" . mysql_result($uErg, $k, "UID") . "\">" . mysql_result($uErg, $k, "Nick") . "</option>\n";
-      }
-
-      echo "</select></td>\n";
-      echo "<td><textarea name=\"Text\"  cols=\"30\" rows=\"10\"></textarea></td>\n";
-      echo "<td><input type=\"submit\" value=\"" . Get_Text("save") . "\"></td>\n";
-      echo "</tr>\n";
-      echo "</form>";
-
-      echo "</table>\n";
-      break;
-
-    case "SendMsg":
-      echo Get_Text("pub_messages_Send1") . "...<br />\n";
-
-    $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (".
-           "'" . gmdate("Y-m-j H:i:s", time()) . "', ".
-           "'" . $_SESSION["UID"]. "', ".
-           "'" . $_POST["RUID"]."', ".
-           "'" . $_POST["Text"]. "');";
-
-    $Erg = mysql_query($SQL, $con);
-
-    if($Erg == 1) 
-      echo Get_Text("pub_messages_Send_OK") . "\n";
-    else 
-      echo Get_Text("pub_messages_Send_Error") . "...\n(". mysql_error($con). ")";
-    break;
-
-    case "MarkRead":
-      $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ".
-             "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ".
-             "LIMIT 1 ;";
-      $Erg = mysql_query($SQL, $con);
-
-      if ($Erg == 1) 
-        echo Get_Text("pub_messages_MarkRead_OK"). "\n";
-      else 
-        echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")";
-    break;
-
-    case "DelMsg":
-      $SQL = "DELETE FROM `Messages` ".
-             "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ".
-             "LIMIT 1;";
-      $Erg = mysql_query($SQL, $con);
-
-      if ($Erg == 1) 
-        echo Get_Text("pub_messages_DelMsg_OK"). "\n";
-      else 
-        echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")";
-    break;
-
-    default:
-      echo Get_Text("pub_messages_NoCommand");
-  }
-
-  include "../../../camp2011/includes/footer.php";
+require_once ('../bootstrap.php');
+
+$title = "Himmel";
+$header = "";
+
+include "includes/header.php";
+
+if (!isset ($_GET["action"]))
+	$_GET["action"] = "start";
+
+switch ($_GET["action"]) {
+	case "start" :
+		echo Get_Text("Hello") . $_SESSION['Nick'] . ", <br />\n";
+		echo Get_Text("pub_messages_text1") . "<br /><br />\n";
+
+		//show exist Messages
+		$SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'";
+		$erg = mysql_query($SQL, $con);
+
+		echo "<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+		echo "<tr>\n";
+		echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_Datum") . "</b></td>\n";
+		echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_Von") . "</b></td>\n";
+		echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_An") . "</b></td>\n";
+		echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_Text") . "</b></td>\n";
+		echo "<td class=\"contenttopic\"></td>\n";
+		echo "</tr>\n";
+
+		for ($i = 0; $i < mysql_num_rows($erg); $i++) {
+			echo "<tr class=\"content\">\n";
+			echo "<td>" . mysql_result($erg, $i, "Datum") . "</td>\n";
+			echo "<td>" . UID2Nick(mysql_result($erg, $i, "SUID")) . "</td>\n";
+			echo "<td>" . UID2Nick(mysql_result($erg, $i, "RUID")) . "</td>\n";
+			echo "<td>" . mysql_result($erg, $i, "Text") . "</td>\n";
+			echo "<td>";
+
+			if (mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) {
+				echo "<a href=\"?action=DelMsg&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_DelMsg") . "</a>";
+
+				if (mysql_result($erg, $i, "isRead") == "N")
+					echo "<a href=\"?action=MarkRead&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_MarkRead") . "</a>";
+			} else {
+				if (mysql_result($erg, $i, "isRead") == "N")
+					echo Get_Text("pub_messages_NotRead");
+			}
+
+			echo "</td>\n";
+			echo "</tr>\n";
+		}
+
+		// send Messeges
+		echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "?action=SendMsg\" method=\"POST\">";
+		echo "<tr class=\"content\">\n";
+		echo "<td></td>\n";
+		echo "<td></td>\n";
+
+		// Listet alle Nicks auf
+		echo "<td><select name=\"RUID\">\n";
+
+		$usql = "SELECT * FROM `User` WHERE (`UID`!='" . $_SESSION["UID"] . "') ORDER BY `Nick`";
+		$uErg = mysql_query($usql, $con);
+		$urowcount = mysql_num_rows($uErg);
+
+		for ($k = 0; $k < $urowcount; $k++) {
+			echo "<option value=\"" . mysql_result($uErg, $k, "UID") . "\">" . mysql_result($uErg, $k, "Nick") . "</option>\n";
+		}
+
+		echo "</select></td>\n";
+		echo "<td><textarea name=\"Text\"  cols=\"30\" rows=\"10\"></textarea></td>\n";
+		echo "<td><input type=\"submit\" value=\"" . Get_Text("save") . "\"></td>\n";
+		echo "</tr>\n";
+		echo "</form>";
+
+		echo "</table>\n";
+		break;
+
+	case "SendMsg" :
+		echo Get_Text("pub_messages_Send1") . "...<br />\n";
+
+		$SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (" .
+		"'" . gmdate("Y-m-j H:i:s", time()) . "', " .
+		"'" . $_SESSION["UID"] . "', " .
+		"'" . $_POST["RUID"] . "', " .
+		"'" . $_POST["Text"] . "');";
+
+		$Erg = mysql_query($SQL, $con);
+
+		if ($Erg == 1)
+			echo Get_Text("pub_messages_Send_OK") . "\n";
+		else
+			echo Get_Text("pub_messages_Send_Error") . "...\n(" . mysql_error($con) . ")";
+		break;
+
+	case "MarkRead" :
+		$SQL = "UPDATE `Messages` SET `isRead` = 'Y' " .
+		"WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID`='" . $_SESSION["UID"] . "' " .
+		"LIMIT 1 ;";
+		$Erg = mysql_query($SQL, $con);
+
+		if ($Erg == 1)
+			echo Get_Text("pub_messages_MarkRead_OK") . "\n";
+		else
+			echo Get_Text("pub_messages_MarkRead_KO") . "...\n(" . mysql_error($con) . ")";
+		break;
+
+	case "DelMsg" :
+		$SQL = "DELETE FROM `Messages` " .
+		"WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID` ='" . $_SESSION["UID"] . "' " .
+		"LIMIT 1;";
+		$Erg = mysql_query($SQL, $con);
+
+		if ($Erg == 1)
+			echo Get_Text("pub_messages_DelMsg_OK") . "\n";
+		else
+			echo Get_Text("pub_messages_DelMsg_KO") . "...\n(" . mysql_error($con) . ")";
+		break;
+
+	default :
+		echo Get_Text("pub_messages_NoCommand");
+}
+
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
index 6bbabbb6..5d7b5da3 100644
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -1,58 +1,61 @@
 <?php
-  $title = "Himmel";
-  $header = "Mein Schichtplan";
-
-  include ("../../../camp2011/includes/header.php");
-  include ("../../../camp2011/includes/funktionen.php");
-  include ("../../../camp2011/includes/funktion_schichtplan.php");
-  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-
-  if(!isset($_GET["action"])) {
-    echo Get_Text("Hello").$_SESSION['Nick'].", <br />\n";
-    echo Get_Text("pub_mywake_beschreibung1")."<br />\n";
-    echo Get_Text("pub_mywake_beschreibung2")."<br /><br />\n";
-    echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN).
-       Get_Text("pub_mywake_beschreibung4")."<br /><br />\n";
-
-    $USER_ID = $_SESSION['UID'];
-
-    if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" ) {
-      if( !isset( $_GET["UIDs"]) )
-        $_GET["UIDs"] = $_SESSION['UID'];
-      else
-        $USER_ID = $_GET["UIDs"];
-
-      echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
-
-      echo "Liste von <select name=\"UIDs\">\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 "<option value=\"".mysql_result($uErg, $k, "UID")."\" ".
-        ( ($_GET["UIDs"]==mysql_result($uErg, $k, "UID")) ? " selected":""). ">".
-        mysql_result($uErg, $k, "Nick").
-        "</option>\n";
-    }
-
-    echo "</select> anzeigen.\n";
-    echo mysql_error($con);
-    
-    echo "<input type=\"submit\" value=\"zeigen\">\n";
-
-    echo "</form>";
-  }
-  
-  $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ".
-         "INNER JOIN `ShiftEntry` ".
-         "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ".
-         "WHERE `ShiftEntry`.`UID`='$USER_ID' ".
-         "ORDER BY `DateS`";
-  $erg = mysql_query($SQL, $con);
-
-  ?>
+
+// Eigener Schichtplan
+require_once ('../bootstrap.php');
+
+$title = "Himmel";
+$header = "Mein Schichtplan";
+
+include ("includes/header.php");
+include ("includes/funktionen.php");
+include ("includes/funktion_schichtplan.php");
+include ("includes/funktion_schichtplan_aray.php");
+
+if (!isset ($_GET["action"])) {
+	echo Get_Text("Hello") . $_SESSION['Nick'] . ", <br />\n";
+	echo Get_Text("pub_mywake_beschreibung1") . "<br />\n";
+	echo Get_Text("pub_mywake_beschreibung2") . "<br /><br />\n";
+	echo Get_Text("pub_mywake_beschreibung3") . ($LETZTES_AUSTRAGEN) .
+	Get_Text("pub_mywake_beschreibung4") . "<br /><br />\n";
+
+	$USER_ID = $_SESSION['UID'];
+
+	if ($_SESSION['CVS']["admin/schichtplan.php"] == "Y") {
+		if (!isset ($_GET["UIDs"]))
+			$_GET["UIDs"] = $_SESSION['UID'];
+		else
+			$USER_ID = $_GET["UIDs"];
+
+		echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >";
+
+		echo "Liste von <select name=\"UIDs\">\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 "<option value=\"" . mysql_result($uErg, $k, "UID") . "\" " .
+			 (($_GET["UIDs"] == mysql_result($uErg, $k, "UID")) ? " selected" : "") . ">" .
+			mysql_result($uErg, $k, "Nick") .
+			"</option>\n";
+		}
+
+		echo "</select> anzeigen.\n";
+		echo mysql_error($con);
+
+		echo "<input type=\"submit\" value=\"zeigen\">\n";
+
+		echo "</form>";
+	}
+
+	$SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` " .
+	"INNER JOIN `ShiftEntry` " .
+	"ON `Shifts`.`SID`=`ShiftEntry`.`SID` " .
+	"WHERE `ShiftEntry`.`UID`='$USER_ID' " .
+	"ORDER BY `DateS`";
+	$erg = mysql_query($SQL, $con);
+?>
   <table border="0" class="border" cellpadding="2" cellspacing="1">
     <tr>
       <td class="contenttopic"><b><?php echo Get_Text("pub_mywake_Datum");?></b></td>
@@ -65,119 +68,111 @@
     </tr>
   <?php
 
-  for( $i=0; $i<mysql_num_rows( $erg ); $i++ )
-  {
-    echo "<tr class=\"content\">";
-
-    echo "<td>". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "</td>\n";
-    echo "<td>". substr(mysql_result( $erg, $i, "DateS" ), 11). "</td>\n";
-    echo "<td>". mysql_result( $erg, $i, "Len" ). " h</td>\n";
-    echo "<td>". mysql_result( $erg, $i, "Man" ). "</td>\n";
-    echo "<td>". $RoomID[mysql_result( $erg, $i, "RID" )]. "<br />\n".
-         "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")".
-         "</td>\n";
-    echo "<td><pre style=\"font-family:Fixedsys,Courier; padding:12x;\">\n". 
-         mysql_result( $erg, $i, "Comment" ). 
-         "\n</pre>\n";
-    echo "<br /><a href=\"./myschichtplan.php?action=edit&SID=\n".
-         mysql_result( $erg, $i, "SID" )."\"># vi #</a></td>\n";
-  
-    // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten 
-    //// selber noch austragen zu koennen...
-    $schichtdate = mysql_result( $erg, $i, "DateS" );
-    ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res );
-    $info["year"]  = $res[1];
-    $info["month"] = $res[2];
-    $info["day"]   = $res[3];
-    $info["hour"]  = $res[4];
-    $info["min"]   = $res[5];
-    $info["sec"]   = $res[6];
-    $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"]));
-    $lastAustragen = $LETZTES_AUSTRAGEN*3600;
-    $nowdate = time();
-    // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
-    // noch möglich sein
-    if( $schichtdatum > ($lastAustragen + $nowdate) ) 
-      echo "<td> <a href=\"./myschichtplan.php?action=austragen&SID=".
-                 mysql_result( $erg, $i, "SID" )."\">".
-                 Get_Text("pub_mywake_austragen")."</a></td>\n";
-    else 
-      echo "<td>". Get_Text("pub_mywake_austragen_n_c"). "</td>\n";
-  
-    echo "</tr>\n";
-  }
-echo "</table>\n\n";
-
-if( $_SESSION['CVS'][ "nonpublic/myschichtplan_ical.php" ] == "Y" )
-{
-  echo "<br /><a href=\"./myschichtplan_ical.php\">". Get_Text("pub_myschichtplan_ical"). "</a>\n";
-}
 
-} 
-else
-{
-    If( $_GET["action"] == "austragen" ) 
-    {
-  echo Get_Text("pub_mywake_delate1")."<br />\n";
-
-  $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')";
-  $Erg = mysql_query($sql, $con);
-
-  $schichtdate = mysql_result( $Erg, 0, "DateS" );
-  ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res );
-  $info["year"]  = $res[1];
-  $info["month"] = $res[2];
-  $info["day"]   = $res[3];
-  $info["hour"]  = $res[4];
-  $info["min"]   = $res[5];
-  $info["sec"]   = $res[6];
-  $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"]));
-  $lastAustragen = $LETZTES_AUSTRAGEN*3600;
-  $nowdate = time();
-  // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
-  // noch möglich sein
-  if( $schichtdatum > ($lastAustragen + $nowdate) ) 
-  {
-    $sql2 = "UPDATE `ShiftEntry` ".
-      "SET `UID` = '0', `Comment` = NULL ".
-            "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;";
-    $Erg2 = mysql_query($sql2, $con);
-    if ($Erg2 == 1)
-         echo Get_Text("pub_mywake_add_ok"). "\n";
-    else
-      echo Get_Text("pub_mywake_add_ko"). "\n";
-  }
-  else 
-    echo Get_Text("pub_mywake_after"). "\n";
-    }
-    elseif( $_GET["action"] == "edit" ) 
-    {
-      echo Get_Text("pub_myshift_Edit_Text1"). "\n";
-  
-  $sql = "SELECT * FROM `ShiftEntry` WHERE ";
-  $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')";
-  $Erg = mysql_query($sql, $con);
-
-  echo "<form action=\"./myschichtplan.php\" method=\"GET\">\n";
-  echo "<textarea name='newtext' cols='50' rows='10'>". mysql_result( $Erg, 0, "Comment" ). "</textarea><br /><br />\n";
-  echo "<input type=\"submit\" value=\"save\">\n";
-  echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
-  echo "<input type=\"hidden\" name=\"action\" value=\"editSave\">\n";
-  echo "</form>";
-    }
-    elseif( $_GET["action"] == "editSave" ) 
-    {
-      echo Get_Text("pub_myshift_EditSave_Text1"). "<br />\n";
-  $sql = "UPDATE `ShiftEntry` ".
-         "SET `Comment` = '". $_GET["newtext"]. "' ".
-         "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;";
-  $Erg = mysql_query($sql, $con);
-  if ($Erg == 1)
-    echo " ...". Get_Text("pub_myshift_EditSave_OK"). "\n";
-  else
-    echo " ...". Get_Text("pub_myshift_EditSave_KO"). "\n";
-  SetHeaderGo2Back();  
-    }
+	for ($i = 0; $i < mysql_num_rows($erg); $i++) {
+		echo "<tr class=\"content\">";
+
+		echo "<td>" . substr(mysql_result($erg, $i, "DateS"), 0, 10) . "</td>\n";
+		echo "<td>" . substr(mysql_result($erg, $i, "DateS"), 11) . "</td>\n";
+		echo "<td>" . mysql_result($erg, $i, "Len") . " h</td>\n";
+		echo "<td>" . mysql_result($erg, $i, "Man") . "</td>\n";
+		echo "<td>" . $RoomID[mysql_result($erg, $i, "RID")] . "<br />\n" .
+		"(" . TID2Type(mysql_result($erg, $i, "TID")) . Get_Text("inc_schicht_engel") . ")" .
+		"</td>\n";
+		echo "<td><pre style=\"font-family:Fixedsys,Courier; padding:12x;\">\n" .
+		mysql_result($erg, $i, "Comment") .
+		"\n</pre>\n";
+		echo "<br /><a href=\"./myschichtplan.php?action=edit&SID=\n" .
+		mysql_result($erg, $i, "SID") . "\"># vi #</a></td>\n";
+
+		// bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten 
+		//// selber noch austragen zu koennen...
+		$schichtdate = mysql_result($erg, $i, "DateS");
+		ereg("^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res);
+		$info["year"] = $res[1];
+		$info["month"] = $res[2];
+		$info["day"] = $res[3];
+		$info["hour"] = $res[4];
+		$info["min"] = $res[5];
+		$info["sec"] = $res[6];
+		$schichtdatum = (mktime($info["hour"], $info["min"], $info["sec"], $info["month"], $info["day"], $info["year"]));
+		$lastAustragen = $LETZTES_AUSTRAGEN * 3600;
+		$nowdate = time();
+		// wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
+		// noch m�glich sein
+		if ($schichtdatum > ($lastAustragen + $nowdate))
+			echo "<td> <a href=\"./myschichtplan.php?action=austragen&SID=" .
+			mysql_result($erg, $i, "SID") . "\">" .
+			Get_Text("pub_mywake_austragen") . "</a></td>\n";
+		else
+			echo "<td>" . Get_Text("pub_mywake_austragen_n_c") . "</td>\n";
+
+		echo "</tr>\n";
+	}
+	echo "</table>\n\n";
+
+	if ($_SESSION['CVS']["nonpublic/myschichtplan_ical.php"] == "Y") {
+		echo "<br /><a href=\"./myschichtplan_ical.php\">" . Get_Text("pub_myschichtplan_ical") . "</a>\n";
+	}
+
+} else {
+	If ($_GET["action"] == "austragen") {
+		echo Get_Text("pub_mywake_delate1") . "<br />\n";
+
+		$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "')";
+		$Erg = mysql_query($sql, $con);
+
+		$schichtdate = mysql_result($Erg, 0, "DateS");
+		ereg("^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res);
+		$info["year"] = $res[1];
+		$info["month"] = $res[2];
+		$info["day"] = $res[3];
+		$info["hour"] = $res[4];
+		$info["min"] = $res[5];
+		$info["sec"] = $res[6];
+		$schichtdatum = (mktime($info["hour"], $info["min"], $info["sec"], $info["month"], $info["day"], $info["year"]));
+		$lastAustragen = $LETZTES_AUSTRAGEN * 3600;
+		$nowdate = time();
+		// wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen 
+		// noch m�glich sein
+		if ($schichtdatum > ($lastAustragen + $nowdate)) {
+			$sql2 = "UPDATE `ShiftEntry` " .
+			"SET `UID` = '0', `Comment` = NULL " .
+			"WHERE `SID` = '" . $_GET["SID"] . "' AND `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;";
+			$Erg2 = mysql_query($sql2, $con);
+			if ($Erg2 == 1)
+				echo Get_Text("pub_mywake_add_ok") . "\n";
+			else
+				echo Get_Text("pub_mywake_add_ko") . "\n";
+		} else
+			echo Get_Text("pub_mywake_after") . "\n";
+	}
+	elseif ($_GET["action"] == "edit") {
+		echo Get_Text("pub_myshift_Edit_Text1") . "\n";
+
+		$sql = "SELECT * FROM `ShiftEntry` WHERE ";
+		$sql .= "(`SID`='" . $_GET["SID"] . "' AND `UID`='" . $_SESSION['UID'] . "')";
+		$Erg = mysql_query($sql, $con);
+
+		echo "<form action=\"./myschichtplan.php\" method=\"GET\">\n";
+		echo "<textarea name='newtext' cols='50' rows='10'>" . mysql_result($Erg, 0, "Comment") . "</textarea><br /><br />\n";
+		echo "<input type=\"submit\" value=\"save\">\n";
+		echo "<input type=\"hidden\" name=\"SID\" value=\"" . $_GET["SID"] . "\">\n";
+		echo "<input type=\"hidden\" name=\"action\" value=\"editSave\">\n";
+		echo "</form>";
+	}
+	elseif ($_GET["action"] == "editSave") {
+		echo Get_Text("pub_myshift_EditSave_Text1") . "<br />\n";
+		$sql = "UPDATE `ShiftEntry` " .
+		"SET `Comment` = '" . $_GET["newtext"] . "' " .
+		"WHERE `SID`='" . $_GET["SID"] . "' AND `UID`='" . $_SESSION['UID'] . "' LIMIT 1;";
+		$Erg = mysql_query($sql, $con);
+		if ($Erg == 1)
+			echo " ..." . Get_Text("pub_myshift_EditSave_OK") . "\n";
+		else
+			echo " ..." . Get_Text("pub_myshift_EditSave_KO") . "\n";
+		SetHeaderGo2Back();
+	}
 }
-include ("../../../camp2011/includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php
index 928f0c86..ff74fef0 100644
--- a/www-ssl/nonpublic/myschichtplan_ical.php
+++ b/www-ssl/nonpublic/myschichtplan_ical.php
@@ -1,52 +1,51 @@
 <?php
-include ("../../../camp2011/includes/header_start.php");
+require_once ('../bootstrap.php');
 
-include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+include ("includes/header_start.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);
+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\"" );
+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 "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 "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( "../../../camp2011/includes/funktion_counter.php");
-
+include ("includes/funktion_counter.php");
 ?>
 
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
index b90d5a82..db95ec8c 100644
--- a/www-ssl/nonpublic/news_comments.php
+++ b/www-ssl/nonpublic/news_comments.php
@@ -1,26 +1,28 @@
 <?php
+require_once ('../bootstrap.php');
+
 $title = "Kommentare zu den News";
 $header = "Kommentar";
-include ("../../../camp2011/includes/header.php");
-
-if(isset($_GET["nid"])) {
-  if(isset( $_GET["text"])) {
-    $ch_sql = "INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ".
-              "VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')";
-    $Erg = mysql_query($ch_sql, $con);
-
-    if ($Erg == 1) {
-      echo "Eintrag wurde gespeichert<br /><br />"; 
-      SetHeaderGo2Back();
-    }
-  }
-
-  $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'";
-  $Erg = mysql_query($SQL, $con);
-  echo mysql_error( $con);
-
-  // anzahl zeilen
-  $news_rows  = mysql_num_rows($Erg);
+include ("includes/header.php");
+
+if (isset ($_GET["nid"])) {
+	if (isset ($_GET["text"])) {
+		$ch_sql = "INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) " .
+		"VALUES ('" . $_GET["nid"] . "', '" . date("Y-m-d H:i:s") . "', '" . $_GET["text"] . "', '" . $_SESSION["UID"] . "')";
+		$Erg = mysql_query($ch_sql, $con);
+
+		if ($Erg == 1) {
+			echo "Eintrag wurde gespeichert<br /><br />";
+			SetHeaderGo2Back();
+		}
+	}
+
+	$SQL = "SELECT * FROM `news_comments` WHERE `Refid`='" . $_GET["nid"] . "' ORDER BY 'ID'";
+	$Erg = mysql_query($SQL, $con);
+	echo mysql_error($con);
+
+	// anzahl zeilen
+	$news_rows = mysql_num_rows($Erg);
 ?>
 
 <table border="0" width="100%" class="border" cellpadding="2" cellspacing="1">
@@ -33,26 +35,27 @@ if(isset($_GET["nid"])) {
   </tr>
 
 <?php
-for ($n = 0 ; $n < $news_rows ; $n++) {
-  echo "\t<tr class=\"content\">";
-  echo "\t\t<td width=100>";
-    echo mysql_result($Erg, $n, "Datum");
-  echo "\t\t</td>";
-  echo "\t\t<td>";
-    echo UID2Nick(mysql_result($Erg, $n, "UID"));
-    // avatar anzeigen?
-    echo DisplayAvatar (mysql_result($Erg, $n, "UID"));
-  echo "\t\t</td>";
-  echo "</tr>";
-  echo "\t<tr class=\"content\">";
-  echo "\t\t<td colspan=\"2\">";
-    echo nl2br(mysql_result($Erg, $n, "Text"))."\n";
-  echo "\t\t</td>";
-  echo "</tr>";
-}
 
-echo "</table>";
 
+	for ($n = 0; $n < $news_rows; $n++) {
+		echo "\t<tr class=\"content\">";
+		echo "\t\t<td width=100>";
+		echo mysql_result($Erg, $n, "Datum");
+		echo "\t\t</td>";
+		echo "\t\t<td>";
+		echo UID2Nick(mysql_result($Erg, $n, "UID"));
+		// avatar anzeigen?
+		echo DisplayAvatar(mysql_result($Erg, $n, "UID"));
+		echo "\t\t</td>";
+		echo "</tr>";
+		echo "\t<tr class=\"content\">";
+		echo "\t\t<td colspan=\"2\">";
+		echo nl2br(mysql_result($Erg, $n, "Text")) . "\n";
+		echo "\t\t</td>";
+		echo "</tr>";
+	}
+
+	echo "</table>";
 ?>
 
 <br />
@@ -75,11 +78,9 @@ echo "</table>";
 <?php
 
 
-} 
-else 
-{
-  echo "Fehlerhafter Aufruf!";
+} else {
+	echo "Fehlerhafter Aufruf!";
 }
 
-include ("../../../camp2011/includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php
index 1ed4d32f..9c99c6ca 100644
--- a/www-ssl/nonpublic/schichtplan.1.php
+++ b/www-ssl/nonpublic/schichtplan.1.php
@@ -1,21 +1,20 @@
 <h4>&nbsp;Tage </h4>
 
 <?PHP
-include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
+require_once ('../bootstrap.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);
+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/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php
index d0193178..92443e13 100644
--- a/www-ssl/nonpublic/schichtplan.2.php
+++ b/www-ssl/nonpublic/schichtplan.2.php
@@ -1,22 +1,22 @@
 <h4>&nbsp;Raum&uuml;bersicht</h4>
 <?php
+require_once ('../bootstrap.php');
 
-include ("../../../camp2011/includes/funktion_schichtplan_aray.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";
-    }
+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>";
+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>";
+	echo "<li><a href='./schichtplan.php?raum=-1'>alle</a></li>";
 ?>
 
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php
index e8f8f02a..766d6996 100644
--- a/www-ssl/nonpublic/schichtplan.php
+++ b/www-ssl/nonpublic/schichtplan.php
@@ -1,200 +1,178 @@
 <?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;
-        }
-      }
-    }
-  }
-
-  include ("../../../camp2011/includes/header.php");
-  include ("../../../camp2011/includes/funktionen.php");
-  include ("../../../camp2011/includes/funktion_schichtplan.php");
-  include ("../../../camp2011/includes/funktion_schichtplan_aray.php");
-
-  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>";
+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;
+			}
+		}
+	}
+}
+
+include ("includes/header.php");
+include ("includes/funktionen.php");
+include ("includes/funktion_schichtplan.php");
+include ("includes/funktion_schichtplan_aray.php");
+
+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 ($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";
-
-  if( isset($Room))
-  {
-    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
-  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 />";
-
-  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
-  if( $raum == -1 )
-  {
-    if( isset($Room))
-       foreach( $Room as $RoomEntry  )
-      if (SummRoomShifts($RoomEntry["RID"]) > 0)
-        echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n";
-  }
-  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 ("../../../camp2011/includes/footer.php");
+if (!isset ($raum)) {
+	// Ausgabe wenn kein Raum Ausgew�hlt:
+	echo Get_Text("pub_schicht_auswahl_raeume") . "<br /><br />\n";
+
+	if (isset ($Room)) {
+		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
+	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 />";
+
+	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
+	if ($raum == -1) {
+		if (isset ($Room))
+			foreach ($Room as $RoomEntry)
+				if (SummRoomShifts($RoomEntry["RID"]) > 0)
+					echo "\t\t<th>" . $RoomEntry["Name"] . "</th>\n";
+	}
+	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/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php
index 621cd97e..1bbcdc4b 100644
--- a/www-ssl/nonpublic/schichtplan_add.php
+++ b/www-ssl/nonpublic/schichtplan_add.php
@@ -1,111 +1,114 @@
 <?php
-  $title = "Himmel";
-  $header = "Schichtpl&auml;ne";
-  include "../../../camp2011/includes/header.php";
-  include "../../../camp2011/includes/funktion_schichtplan.php";
-  include "../../../camp2011/includes/funktion_schichtplan_aray.php";
-  include "../../../camp2011/includes/funktionen.php";
-
-  if(isset($_POST["newtext"]) && isset($_POST["SID"]) && isset($_POST["TID"])) {
-    SetHeaderGo2Back();
- 
-    // datum der einzutragenden Schicht heraussuhen...
-    $ShiftSQL = "SELECT `DateS`, `DateE` FROM `Shifts` WHERE `SID`='" . $_POST["SID"] . ".'";
-    $ShiftErg = mysql_query ($ShiftSQL, $con);
-    $beginSchicht = mysql_result($ShiftErg, 0, "DateS");
-    $endSchicht   = mysql_result($ShiftErg, 0, "DateE");
-
-    // wenn keien rechte definiert sind
-    if(!isset($_SESSION['CVS'][$TID2Name[$_POST["TID"]]]))
-      $_SESSION['CVS'][$TID2Name[$_POST["TID"]]] = "Y";
-
-    if($_SESSION['CVS'][$TID2Name[$_POST["TID"]]] == "Y") {
-      // Ueberpruefung, ob der Engel bereits fuer eine Schicht zu dieser Zeit eingetragen ist
-      $SSQL = "SELECT * FROM `Shifts`".
-              " INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`".
-              " WHERE ((".
-              " ((`Shifts`.`DateS` >= '$beginSchicht') and ".
-              "  (`Shifts`.`DateS` < '$endSchicht'))".
-              " OR ".
-              " ((`Shifts`.`DateE` > '$beginSchicht') and ".
-              "  (`Shifts`.`DateE` <= '$endSchicht')) ".
-              ") and ".
-              "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));";
-      $bErg = mysql_query($SSQL, $con);
-
-      if(mysql_num_rows($bErg) != 0)
-        echo Get_Text("pub_schichtplan_add_AllreadyinShift");
-      else {
-        // ermitteln der noch gesuchten
-        $SQL3 = "SELECT * FROM `ShiftEntry`".
-                " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));";
-        $Erg3 = mysql_query($SQL3, $con);
-
-        if(mysql_num_rows($Erg3) <= 0)
-          echo Get_Text("pub_schichtplan_add_ToManyYousers");
-        else {
-          //write shift
-          $SQL = "UPDATE `ShiftEntry` SET ".
-                 "`UID` = '". $_SESSION['UID']. "', ".
-                 "`Comment` = '". $_POST["newtext"]. "' ".
-                 "WHERE ( (`SID` = '". $_POST["SID"]. "') and ".
-                 "(`TID` = '". $_POST["TID"]. "') and ".
-                 "(`UID` = '0')) LIMIT 1;";
-          $Erg = mysql_query($SQL, $con);
-
-          if($Erg != 1)
-            echo Get_Text("pub_schichtplan_add_Error");
-          else
-            echo Get_Text("pub_schichtplan_add_WriteOK");
-        }
-      }
-    } else {
-      echo "<h1>:-(</h1>";
-      array_push($error_messages, "Hack atteck\n");
-    }
-  } elseif (isset($_GET["SID"]) && isset($_GET["TID"])) {
-    //wenn keine Rechte definiert sind
-    if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ]))
-      $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y";
-
-    if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") {
-      echo Get_Text("pub_schichtplan_add_Text1"). "<br /><br />\n\n".
-        "<form action=\"./schichtplan_add.php\" method=\"post\">\n".
-        "<table border=\"0\">\n";
-
-      $SQL = "SELECT * FROM `Shifts` WHERE ";
-      $SQL .="(`SID` = '". $_GET["SID"]. "')";
-      $Erg = mysql_query($SQL, $con);
-
-      echo "<tr><td>". Get_Text("pub_schichtplan_add_Date"). ":</td> <td>".
-        mysql_result($Erg, 0, "DateS"). "</td></tr>\n";
-
-      echo "<tr><td>". Get_Text("pub_schichtplan_add_Place"). ":</td> <td>".
-        $RoomID[ mysql_result($Erg, 0, "RID") ]. "</td></tr>\n";
-
-      echo "<tr><td>". Get_Text("pub_schichtplan_add_Job"). ":</td> <td>".
-        $EngelTypeID[$_GET["TID"]]. "</td></tr>\n";
-
-      echo "<tr><td>". Get_Text("pub_schichtplan_add_Len"). ":</td> <td>".
-        mysql_result($Erg, 0, "Len"). "h</td></tr>\n";
-
-      echo "<tr><td>". Get_Text("pub_schichtplan_add_TextFor"). ":</td> <td>".
-        mysql_result($Erg, 0, "Man"). "</td></tr>\n";
-
-      echo "<tr><td valign='top'>". Get_Text("pub_schichtplan_add_Comment"). ":</td>\n <td>".
-        "<textarea name='newtext' cols='50' rows='10'></textarea> </td></tr>\n";
-
-      echo "<tr><td>&nbsp;</td>\n".
-        "<td><input type=\"submit\" value=\"". Get_Text("pub_schichtplan_add_submit"). "\"> </td></tr>\n".
-        "</table>\n".
-        "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n".
-        "<input type=\"hidden\" name=\"TID\" value=\"". $_GET["TID"]. "\">\n".
-        "</form>";
-    } else {
-      echo "<h1>:-(</h1>";
-      array_push($error_messages, "Hack atteck\n");
-    }
-  }
-
-  include "../../../camp2011/includes/footer.php";
+require_once ('../bootstrap.php');
+
+$title = "Himmel";
+$header = "Schichtpl&auml;ne";
+include "includes/header.php";
+include "includes/funktion_schichtplan.php";
+include "includes/funktion_schichtplan_aray.php";
+include "includes/funktionen.php";
+
+if (isset ($_POST["newtext"]) && isset ($_POST["SID"]) && isset ($_POST["TID"])) {
+	SetHeaderGo2Back();
+
+	// datum der einzutragenden Schicht heraussuhen...
+	$ShiftSQL = "SELECT `DateS`, `DateE` FROM `Shifts` WHERE `SID`='" . $_POST["SID"] . ".'";
+	$ShiftErg = mysql_query($ShiftSQL, $con);
+	$beginSchicht = mysql_result($ShiftErg, 0, "DateS");
+	$endSchicht = mysql_result($ShiftErg, 0, "DateE");
+
+	// wenn keien rechte definiert sind
+	if (!isset ($_SESSION['CVS'][$TID2Name[$_POST["TID"]]]))
+		$_SESSION['CVS'][$TID2Name[$_POST["TID"]]] = "Y";
+
+	if ($_SESSION['CVS'][$TID2Name[$_POST["TID"]]] == "Y") {
+		// Ueberpruefung, ob der Engel bereits fuer eine Schicht zu dieser Zeit eingetragen ist
+		$SSQL = "SELECT * FROM `Shifts`" .
+		" INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`" .
+		" WHERE ((" .
+		" ((`Shifts`.`DateS` >= '$beginSchicht') and " .
+		"  (`Shifts`.`DateS` < '$endSchicht'))" .
+		" OR " .
+		" ((`Shifts`.`DateE` > '$beginSchicht') and " .
+		"  (`Shifts`.`DateE` <= '$endSchicht')) " .
+		") and " .
+		"(`ShiftEntry`.`UID` = '" . $_SESSION['UID'] . "'));";
+		$bErg = mysql_query($SSQL, $con);
+
+		if (mysql_num_rows($bErg) != 0)
+			echo Get_Text("pub_schichtplan_add_AllreadyinShift");
+		else {
+			// ermitteln der noch gesuchten
+			$SQL3 = "SELECT * FROM `ShiftEntry`" .
+			" WHERE ((`SID` = '" . $_POST["SID"] . "') AND (`TID` = '" . $_POST["TID"] . "') AND (`UID` = '0'));";
+			$Erg3 = mysql_query($SQL3, $con);
+
+			if (mysql_num_rows($Erg3) <= 0)
+				echo Get_Text("pub_schichtplan_add_ToManyYousers");
+			else {
+				//write shift
+				$SQL = "UPDATE `ShiftEntry` SET " .
+				"`UID` = '" . $_SESSION['UID'] . "', " .
+				"`Comment` = '" . $_POST["newtext"] . "' " .
+				"WHERE ( (`SID` = '" . $_POST["SID"] . "') and " .
+				"(`TID` = '" . $_POST["TID"] . "') and " .
+				"(`UID` = '0')) LIMIT 1;";
+				$Erg = mysql_query($SQL, $con);
+
+				if ($Erg != 1)
+					echo Get_Text("pub_schichtplan_add_Error");
+				else
+					echo Get_Text("pub_schichtplan_add_WriteOK");
+			}
+		}
+	} else {
+		echo "<h1>:-(</h1>";
+		array_push($error_messages, "Hack atteck\n");
+	}
+}
+elseif (isset ($_GET["SID"]) && isset ($_GET["TID"])) {
+	//wenn keine Rechte definiert sind
+	if (!isset ($_SESSION['CVS'][$TID2Name[$_GET["TID"]]]))
+		$_SESSION['CVS'][$TID2Name[$_GET["TID"]]] = "Y";
+
+	if ($_SESSION['CVS'][$TID2Name[$_GET["TID"]]] == "Y") {
+		echo Get_Text("pub_schichtplan_add_Text1") . "<br /><br />\n\n" .
+		"<form action=\"./schichtplan_add.php\" method=\"post\">\n" .
+		"<table border=\"0\">\n";
+
+		$SQL = "SELECT * FROM `Shifts` WHERE ";
+		$SQL .= "(`SID` = '" . $_GET["SID"] . "')";
+		$Erg = mysql_query($SQL, $con);
+
+		echo "<tr><td>" . Get_Text("pub_schichtplan_add_Date") . ":</td> <td>" .
+		mysql_result($Erg, 0, "DateS") . "</td></tr>\n";
+
+		echo "<tr><td>" . Get_Text("pub_schichtplan_add_Place") . ":</td> <td>" .
+		$RoomID[mysql_result($Erg, 0, "RID")] . "</td></tr>\n";
+
+		echo "<tr><td>" . Get_Text("pub_schichtplan_add_Job") . ":</td> <td>" .
+		$EngelTypeID[$_GET["TID"]] . "</td></tr>\n";
+
+		echo "<tr><td>" . Get_Text("pub_schichtplan_add_Len") . ":</td> <td>" .
+		mysql_result($Erg, 0, "Len") . "h</td></tr>\n";
+
+		echo "<tr><td>" . Get_Text("pub_schichtplan_add_TextFor") . ":</td> <td>" .
+		mysql_result($Erg, 0, "Man") . "</td></tr>\n";
+
+		echo "<tr><td valign='top'>" . Get_Text("pub_schichtplan_add_Comment") . ":</td>\n <td>" .
+		"<textarea name='newtext' cols='50' rows='10'></textarea> </td></tr>\n";
+
+		echo "<tr><td>&nbsp;</td>\n" .
+		"<td><input type=\"submit\" value=\"" . Get_Text("pub_schichtplan_add_submit") . "\"> </td></tr>\n" .
+		"</table>\n" .
+		"<input type=\"hidden\" name=\"SID\" value=\"" . $_GET["SID"] . "\">\n" .
+		"<input type=\"hidden\" name=\"TID\" value=\"" . $_GET["TID"] . "\">\n" .
+		"</form>";
+	} else {
+		echo "<h1>:-(</h1>";
+		array_push($error_messages, "Hack atteck\n");
+	}
+}
+
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php
index 2e4e78c2..269660e1 100644
--- a/www-ssl/nonpublic/schichtplan_beamer.php
+++ b/www-ssl/nonpublic/schichtplan_beamer.php
@@ -1,9 +1,11 @@
 <?php
-  include "../../../camp2011/includes/header_start.php";
-  include "../../../camp2011/includes/funktionen.php";
-  include "../../../camp2011/includes/funktion_schichtplan_beamer.php";
+require_once ('../bootstrap.php');
 
-  $Time = time() + 3600 + 3600;
+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">
@@ -16,7 +18,9 @@
 <body>
 
 <?php
-  echo "<table border=\"1\" width=\"100%\" height=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
+
+
+echo "<table border=\"1\" width=\"100%\" height=\"100%\" cellpadding=\"0\" cellspacing=\"0\" frame=\"void\">\n";
 
 echo "<colgroup span=\"4\" valign=\"center\">
   <col width=\"30\">
@@ -25,27 +29,27 @@ echo "<colgroup span=\"4\" valign=\"center\">
   <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;
+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;
 }
 ?>
 
diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php
index bb9a0668..d98dd455 100644
--- a/www-ssl/nonpublic/waeckliste.php
+++ b/www-ssl/nonpublic/waeckliste.php
@@ -1,8 +1,10 @@
 <?php
-  $title = "Himmel";
-  $header = "Weckdienst - Liste der zu weckenden Engel";
+require_once ('../bootstrap.php');
 
-  include "../../../camp2011/includes/header.php";
+$title = "Himmel";
+$header = "Weckdienst - Liste der zu weckenden Engel";
+
+include "includes/header.php";
 ?>
 
 <p><?php echo Get_Text("Hello") . $_SESSION['Nick'] . ",<br />\n" . Get_Text("pub_waeckliste_Text1"); ?></p>
@@ -15,12 +17,14 @@
   </tr>
 
 <?php
-  $sql = "SELECT * FROM `Wecken` ORDER BY `Date` ASC";
-  $Erg = mysql_query($sql, $con);
-  $count = mysql_num_rows($Erg);
 
-  for ($i = 0; $i < $count; $i++) {
-    $row = mysql_fetch_row($Erg);
+
+$sql = "SELECT * FROM `Wecken` ORDER BY `Date` ASC";
+$Erg = mysql_query($sql, $con);
+$count = mysql_num_rows($Erg);
+
+for ($i = 0; $i < $count; $i++) {
+	$row = mysql_fetch_row($Erg);
 ?>
   <tr class="content">
     <td align="left"><?php echo UID2Nick(mysql_result($Erg, $i, "UID")); ?> </td>
@@ -29,10 +33,14 @@
     <td align="left"><?php echo mysql_result($Erg, $i, "Bemerkung"); ?> </td>
   </tr>
 <?php
-  }
+
+
+}
 ?>
 </table>
 
 <?php
-  include "../../../camp2011/includes/footer.php";
+
+
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php
index 164a4bb0..0d44b48d 100644
--- a/www-ssl/nonpublic/wecken.php
+++ b/www-ssl/nonpublic/wecken.php
@@ -1,32 +1,34 @@
 <?php
-  $title = "Himmel";
-  $header = "Weckdienst";
+require_once ('../bootstrap.php');
 
-  include "../../../camp2011/includes/header.php";
+$title = "Himmel";
+$header = "Weckdienst";
 
-  if(isset($_POST["eintragen"])) {
-    if($_POST["eintragen"] == Get_Text("pub_wake_bouton")) {
-      $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) ".
-             "VALUES ('". $_SESSION['UID']. "', '". $_POST["Date"]. "', '". $_POST["Ort"]. "', ".
-             "'". $_POST["Bemerkung"]. "')";
-      $Erg = mysql_query($SQL, $con);
+include "includes/header.php";
 
-      if($Erg == 1) 
-        Print_Text(4);
-    }
-  }
+if (isset ($_POST["eintragen"])) {
+	if ($_POST["eintragen"] == Get_Text("pub_wake_bouton")) {
+		$SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) " .
+		"VALUES ('" . $_SESSION['UID'] . "', '" . $_POST["Date"] . "', '" . $_POST["Ort"] . "', " .
+		"'" . $_POST["Bemerkung"] . "')";
+		$Erg = mysql_query($SQL, $con);
 
-  if(isset($_GET["eintragen"])) {
-    if ($_GET["eintragen"] == "loeschen") {
-      $SQL = "DELETE FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' AND `ID`='" . $_GET["weckID"] . "' LIMIT 1";
-      $Erg = mysql_query($SQL, $con);
-      if ($Erg == 1)
-        Print_Text(4); 
-    }
-  }
+		if ($Erg == 1)
+			Print_Text(4);
+	}
+}
 
-  echo "<p>" . Get_Text("Hello") . $_SESSION['Nick'] . ",<br />" . Get_Text("pub_wake_beschreibung") . "</p>\n\n";
-  echo Get_Text("pub_wake_beschreibung2");
+if (isset ($_GET["eintragen"])) {
+	if ($_GET["eintragen"] == "loeschen") {
+		$SQL = "DELETE FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' AND `ID`='" . $_GET["weckID"] . "' LIMIT 1";
+		$Erg = mysql_query($SQL, $con);
+		if ($Erg == 1)
+			Print_Text(4);
+	}
+}
+
+echo "<p>" . Get_Text("Hello") . $_SESSION['Nick'] . ",<br />" . Get_Text("pub_wake_beschreibung") . "</p>\n\n";
+echo Get_Text("pub_wake_beschreibung2");
 ?>
 
 <table border="0" width="100%" class="border" cellpadding="2" cellspacing="1">
@@ -38,12 +40,13 @@
         </tr>
 
 <?php
-  $sql = "SELECT * FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' ORDER BY `Date` ASC";
-  $Erg = mysql_query($sql, $con);
-  $count = mysql_num_rows($Erg);
 
-  for ($i=0; $i < $count; $i++) {
-    $row = mysql_fetch_row($Erg);
+$sql = "SELECT * FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' ORDER BY `Date` ASC";
+$Erg = mysql_query($sql, $con);
+$count = mysql_num_rows($Erg);
+
+for ($i = 0; $i < $count; $i++) {
+	$row = mysql_fetch_row($Erg);
 ?>
   <tr class="content">
     <td align="left"><?php echo mysql_result($Erg, $i, "Date"); ?> </td>
@@ -52,7 +55,8 @@
     <td align="left"><a href="./wecken.php?eintragen=loeschen&weckID=<?php echo mysql_result($Erg, $i, "ID") . "\">" . Get_Text("pub_wake_del"); ?></a></td>
   </tr>
 <?php
-  }
+
+}
 ?>
 </table>
 <br /><br />
@@ -77,5 +81,6 @@
 <input type="submit" name="eintragen" value="<?php echo Get_Text("pub_wake_bouton"); ?>" />
 </form>
 <?php
-include ("../../../camp2011/includes/footer.php");
+
+include ("includes/footer.php");
 ?>
-- 
cgit v1.2.3-54-g00ecf