629 files changed, 2051 insertions, 5097 deletions

diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php
index 0b61d153..5a222c07 100644
--- a/www-ssl/ShowUserPicture.php
+++ b/www-ssl/ShowUserPicture.php
@@ -1,58 +1,56 @@
-<?PHP
+<?php
+// Momentan keine Avatar-Funktionen
+die();
 
-include ("../includes/config.php");
-include ("../includes/error_handler.php");
-include ("../includes/config_db.php");
-if( !isset($_SESSION))	session_start();
-include ("../includes/secure.php");
+require_once ('bootstrap.php');
 
+include "config/config.php";
+include "includes/error_handler.php";
+include "config/config_db.php";
+
+if (!isset ($_SESSION))
+	session_start();
+
+include "includes/secure.php";
 
 // Parameter check
-if( !isset($_GET["UID"]) )
-	$_GET["UID"]= "-1";
-
-$SQL= "SELECT * FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "'";
-$res = mysql_query( $SQL, $con);
-
-if( mysql_num_rows($res) == 1)
-{
-	//genügend rechte
-	if( !isset($_SESSION['UID']) || $_SESSION['UID'] == -1)
-	{
-		header( "HTTP/1.0 403 Forbidden");
-		die( "403 Forbidden");
+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");
+	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 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");
+	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");
 }
-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
deleted file mode 100755
index 29df5ad7..00000000
--- a/www-ssl/admin/EngelType.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-$title = "R&auml;ume";
-$header = "Verwaltung der R&auml;ume";
-include ("../../includes/header.php");
-include("../../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;
-	}
-}
-
-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;
-	}
-}
-
-
-
-$Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`";
-$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>";
-} 
-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;
-
-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;
-
-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);
-        
-	        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="";
-        foreach($vars as $key => $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;
-
-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;
-}
-}
-
-include ("../../includes/footer.php");
-?>
diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php
deleted file mode 100755
index ec167e17..00000000
--- a/www-ssl/admin/Recentchanges.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?PHP
-
-$title = "ChangeLog";
-$header = "Datenbank-Auszug";
-include ("../../includes/header.php");
-
-$SQL = "SELECT * FROM `ChangeLog` ORDER BY `Time` DESC LIMIT 0,10000";
-$Erg = mysql_query($SQL, $con);
-
-echo mysql_error($con);
-
-echo "<table border=1>\n";
-echo "<tr>\n\t<th>Time</th>\n\t<th>User</th>\n\t<th>Commend</th>\n\t<th>SQL Commad</th>\n</tr>\n";
-
-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 "</table>\n";
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php
index 5a1a60bf..25f8b54b 100755..100644
--- a/www-ssl/admin/UserPicture.php
+++ b/www-ssl/admin/UserPicture.php
@@ -1,120 +1,105 @@
 <?php
+require_once ('../bootstrap.php');
+
 $title = "UserPicture";
 $header = "Verwaltung der User Picture";
-include ("../../includes/header.php");
-include ("../../includes/funktion_schichtplan_array.php");
 
+include ("includes/header.php");
+include ("includes/funktion_schichtplan_aray.php");
 
-if( IsSet($_GET["action"]) )
-{
-	UnSet($SQL);
+if (IsSet ($_GET["action"])) {
+	UnSet ($SQL);
 
-	switch ($_GET["action"]) 
-	{
-		case 'FormUpload':
+	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`";
+			$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";
+			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 "\t<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"" . get_cfg_var("post_max_size") . "\">\n";
+			echo "\t(max " . get_cfg_var("post_max_size") . "Byte)<br />\n";
+			echo "\t<input type=\"submit\" value=\"" . Get_Text("upload"), "\">\n";
 			echo "</form>\n";
 			break;
-		case 'sendPicture':
-		        if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) )
-		        {
-			        if( ($_FILES["file"]["type"] == "image/jpeg") ||
-			            ($_FILES["file"]["type"] == "image/png")  ||
-			            ($_FILES["file"]["type"] == "image/gif")  )
-		        	{
-	                		$data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
-
-					if( GetPicturShow( $_POST['UID']) == "")
-	                		        $SQL = "INSERT INTO `UserPicture` ".
-			                                "( `UID`,`Bild`, `ContentType`, `show`) ".
-                			                "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')";
-		        	        else
-                			        $SQL = "UPDATE `UserPicture` SET ".
-		                        	        "`Bild`='$data', ".
-                		                	"`ContentType`='". $_FILES["file"]["type"]. "' ".
-			                                "WHERE `UID`='". $_POST['UID']. "'";
-
-			                	echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ".
-							"MIME-Type: " . $_FILES["file"]["type"]. ", ". 
-							$_FILES["file"]["size"]. " Byte ".
-							"for ". UID2Nick( $_POST["UID"]);
-				}
-				else
-			                Print_Text("pub_einstellungen_send_KO");
-		        }
-		        else
-                		Print_Text("pub_einstellungen_send_KO");
-		        break;
-
-		case 'SetN':
-			if (IsSet($_GET["UID"]))
-			{
-				echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:<br>";
-				$SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'";
-			}
-			else
+		case 'sendPicture' :
+			if (($_FILES["file"]["size"] > 0) && (isset ($_POST["UID"]))) {
+				if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) {
+					$data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
+
+					if (GetPicturShow($_POST['UID']) == "")
+						$SQL = "INSERT INTO `UserPicture` " .
+						"( `UID`,`Bild`, `ContentType`, `show`) " .
+						"VALUES ('" . $_POST['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')";
+					else
+						$SQL = "UPDATE `UserPicture` SET " .
+						"`Bild`='$data', " .
+						"`ContentType`='" . $_FILES["file"]["type"] . "' " .
+						"WHERE `UID`='" . $_POST['UID'] . "'";
+
+					echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', " .
+					"MIME-Type: " . $_FILES["file"]["type"] . ", " .
+					$_FILES["file"]["size"] . " Byte " .
+					"for " . UID2Nick($_POST["UID"]);
+				} else
+					Print_Text("pub_einstellungen_send_KO");
+			} else
+				Print_Text("pub_einstellungen_send_KO");
+			break;
+
+		case 'SetN' :
+			if (IsSet ($_GET["UID"])) {
+				echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde gesperrt:<br />";
+				$SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='" . $_GET["UID"] . "'";
+			} else
 				echo "Fehlerhafter Aufruf";
 			break;
-		case 'SetY':
-			if (IsSet($_GET["UID"]))
-			{
-				echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:<br>";
-				$SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'";
-			}
-			else
+		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>";
+		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
+		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:	
+		default :
 			echo "Fehlerhafter Aufruf";
-			
+
 	} //switch
 
 	// Update ???
-	if (IsSet($SQL))
-	{ 
+	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>";
+		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";
+	} // 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";
@@ -124,26 +109,24 @@ echo "\t<td>Status</td>\n";
 echo "\t<td>L&ouml;schen</td>\n";
 echo "</tr>";
 
-for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) 
-{	
+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>" . 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";
+	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>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 ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php
index 2ad92b3d..8db62f98 100755..100644
--- a/www-ssl/admin/aktiv.php
+++ b/www-ssl/admin/aktiv.php
@@ -1,31 +1,31 @@
-<?PHP
+<?php
+require_once ('../bootstrap.php');
 
 $title = "akive Engel";
 $header = "Liste der aktiven Engel";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
+include ("includes/header.php");
+include ("includes/funktion_db_list.php");
 
 echo "<form action=\"./aktiv.php\" method=\"post\">";
-echo Get_Text("pub_aktive_Text1")."<br>\n";
-echo Get_Text("pub_aktive_Text2")."<br><br>\n";
-	
+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 Get_Text("pub_aktive_Text31") . "\n";
 echo "<select name=\"Anzahl\">\n";
-for( $i=0; $i<50; $i++) 
+for ($i = 0; $i < 50; $i++)
 	echo "\t<option value=\"$i\">$i</option>\n";
 echo "</select>";
-echo Get_Text("pub_aktive_Text32")."<br><br>\n";
+echo Get_Text("pub_aktive_Text32") . "<br /><br />\n";
 echo "<input type=\"submit\" name=\"SendType\" value=\"Show..\">\n";
 echo "<input type=\"submit\" name=\"SendType\" value=\"Write..\">\n";
 echo "</form>\n";
 
 echo "<form action=\"./aktiv.php\" method=\"post\">\n";
-	echo "\t<br><input type=\"submit\" name=\"ResetActive\" value=\"reset Active setting\">\n";
+echo "\t<br /><input type=\"submit\" name=\"ResetActive\" value=\"reset Active setting\">\n";
 echo "</form>\n";
 
-if( Isset($_POST["ResetActive"]) )
-{
+if (Isset ($_POST["ResetActive"])) {
 	$SQLreset = "UPDATE `User` SET `Aktiv`='0'";
 	$ErgReset = db_query($SQLreset, "Reset Active");
 	if ($ErgReset != 1)
@@ -34,64 +34,59 @@ if( Isset($_POST["ResetActive"]) )
 		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"). ":";
+if (IsSet ($_POST["Anzahl"]))
+	echo "<br />\n\n" . Get_Text("pub_aktive_Text5_1") . $_POST["Anzahl"] . Get_Text("pub_aktive_Text5_2") . ":";
 
-echo "<br><br>\n\n";
+echo "<br /><br />\n\n";
 
 //ausgabe tabelle
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
 echo "<tr class=\"contenttopic\">\n";
-echo "\t<td>". Get_Text("pub_aktive_Nick"). "</td>\n";
-echo "\t<td>". Get_Text("pub_aktive_Anzahl"). "</td>\n";
-echo "\t<td>". Get_Text("pub_aktive_Time"). "</td>\n";
-echo "\t<td>". Get_Text("pub_aktive_Time"). " Weight</td>\n";
-echo "\t<td>Freeloader ". Get_Text("pub_aktive_Anzahl"). "</td>\n";
-echo "\t<td>Freeloader ". Get_Text("pub_aktive_Time"). "</td>\n";
-echo "\t<td>". Get_Text("pub_aktive_Time"). " result</td>\n";
-echo "\t<td>". Get_Text("pub_aktive_Active"). "</td>\n";
+echo "\t<td>" . Get_Text("pub_aktive_Nick") . "</td>\n";
+echo "\t<td>" . Get_Text("pub_aktive_Anzahl") . "</td>\n";
+echo "\t<td>" . Get_Text("pub_aktive_Time") . "</td>\n";
+echo "\t<td>" . Get_Text("pub_aktive_Time") . " Weight</td>\n";
+echo "\t<td>Freeloader " . Get_Text("pub_aktive_Anzahl") . "</td>\n";
+echo "\t<td>Freeloader " . Get_Text("pub_aktive_Time") . "</td>\n";
+echo "\t<td>" . Get_Text("pub_aktive_Time") . " result</td>\n";
+echo "\t<td>" . Get_Text("pub_aktive_Active") . "</td>\n";
 echo "</tr>\n";
-	
+
 $SQL = "
 SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal
-	FROM
-		(SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d
-		LEFT JOIN
-		(SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f
-		USING(UID)
-	ORDER BY lenReal DESC, nr DESC, UID";
+  FROM
+    (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d
+    LEFT JOIN
+    (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f
+    USING(UID)
+  ORDER BY lenReal DESC, nr DESC, UID";
 
 $Erg = mysql_query($SQL, $con);
 echo mysql_error($con);
 $rowcount = mysql_num_rows($Erg);
 
-$aktivecount=0;
-for ($i=0; $i<$rowcount; $i++)
-{
+$aktivecount = 0;
+for ($i = 0; $i < $rowcount; $i++) {
 	echo "\n\n\t<tr class=\"content\">\n";
-	echo "\t\t<td>". UID2Nick(mysql_result($Erg, $i, "UID")). "</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "nr"). "x</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "len"). "h</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "lenWeight"). "h</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "nrFree"). "x</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "lenFree"). "h</td>\n";
-	echo "\t\t<td>". mysql_result($Erg, $i, "lenReal"). "h</td>\n";
-
-	
+	echo "\t\t<td>" . 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") )
-		{
+	if (IsSet ($_POST["Anzahl"])) {
+		if ($_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal")) {
 			$aktivecount++;
-			if( $_POST["SendType"]=="Show..")
+			if ($_POST["SendType"] == "Show..")
 				echo "show set";
-			else
-			{
-				$SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1";
+			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"));
+					echo "Fehler beim speichern bei Engel " . UID2Nick(mysql_result($Erg, $i, "UID"));
 				else
 					echo "write set";
 			}
@@ -103,8 +98,8 @@ for ($i=0; $i<$rowcount; $i++)
 
 echo "</table>";
 
-echo "<br>Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br><br>";
+echo "<br />Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)<br /><br />";
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php
index 3f66a310..88879de7 100755..100644
--- a/www-ssl/admin/dbUpdateFromXLS.php
+++ b/www-ssl/admin/dbUpdateFromXLS.php
@@ -1,8 +1,10 @@
-<?PHP
+<?php
+require_once ('../bootstrap.php');
+
 $title = "DB Update from XML";
 $header = "DB Update from XML";
-include ("../../includes/header.php");
-include ("../../includes/funktion_xml.php");
+include ("includes/header.php");
+include ("includes/funktion_xml.php");
 
 ///////////
 // DEBUG //
@@ -14,280 +16,237 @@ $EnableSchudleFunctions = 1;
 $EnableSchudle = 1;
 $EnableSchudleDB = 1;
 
-
 /*##############################################################################################
-				erstellt Arrays der Reume
+        erstellt Arrays der Reume
   ##############################################################################################*/
-function CreateRoomArrays()
-{
+function CreateRoomArrays() {
 	global $Room, $RoomID, $RoomName, $con;
 
-	$sql =	"SELECT `RID`, `Name` FROM `Room` ".
-		"WHERE `Show`='Y'".
-		"ORDER BY `Number`, `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");
+	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");
+		$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";
-if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"]))
-{
+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")
-	{
-
-	//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".
+	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;
-
-				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)
+				fputs($fp, $head);
+				$Zeilen = -1;
+				while (!feof($fp)) {
+					$Temp = fgets($fp, 1024);
+
+					// ende des headers
+					if ($Temp == "f20\r\n") {
+						$Zeilen = 0;
 						$Temp = "";
-					if( strpos( "#$Temp", "783") > 0)
-						$Temp = "";
-					//schreiben in file
-					fputs( $fileOut, $Temp);
-					$Zeilen++;
+					}
+
+					//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>";
+				fclose($fileOut);
+
+				echo "<br />Es wurden $Zeilen Zeilen eingelesen<br />";
+			} else
+				echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
+			fclose($fp);
 		}
-		else
-			echo "<h2>fail: File '$Tempdir/engelXML' not writeable!</h2>";
-		fclose($fp);
 	}
-	}
-	elseif($PentabarfGetWith=="fopen")
-	{
+	elseif ($PentabarfGetWith == "fopen") {
 		//user uns password in url einbauen
-		$FileNameIn =	"https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
-				$PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
-
+		$FileNameIn = "https://" . $_POST["PentabarfUser"] . ':' . $_POST["password"] . "@" .
+		$PentabarfXMLhost . "/" . $PentabarfXMLpath . $_POST["PentabarfURL"];
 
-		if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
-		{
-			if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-			{
+		if (($fileIn = fopen($FileNameIn, "r")) != FALSE) {
+			if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) {
 				$Zeilen = 0;
-				while (!feof($fileIn)) 
-				{	
+				while (!feof($fileIn)) {
 					$Zeilen++;
-					fputs( $fileOut, fgets( $fileIn));	
+					fputs($fileOut, fgets($fileIn));
 				}
-				fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
-			}
-			else
+				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>";
+			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>";
+	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>";
+			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>";
+	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>";
+			echo "fail ($Status)($Command).<br />";
 	}
-	elseif($PentabarfGetWith=="fopen")
-	{
+	elseif ($PentabarfGetWith == "fopen") {
 		//user uns password in url einbauen
-		$FileNameIn =	"https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". 
-				$PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"];
-
+		$FileNameIn = "https://" . $_POST["PentabarfUser"] . ':' . $_POST["password"] . "@" .
+		$PentabarfXMLhost . "/" . $PentabarfXMLpath . $_POST["PentabarfURL"];
 
-		if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE)
-		{
-			if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE)
-			{
+		if (($fileIn = fopen($FileNameIn, "r")) != FALSE) {
+			if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) {
 				$Zeilen = 0;
-				while (!feof($fileIn)) 
-				{	
+				while (!feof($fileIn)) {
 					$Zeilen++;
-					fputs( $fileOut, fgets( $fileIn));	
+					fputs($fileOut, fgets($fileIn));
 				}
-				fclose( $fileOut);
-				echo "<br>Es wurden $Zeilen Zeilen eingelesen<br>";
-			}
-			else
+				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>";
+			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>";
+	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>";
+			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>";
+	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 "fail ($Status)($Command).<br />";
+	} else
 		echo "<h1>The PentabarfGetWith='$PentabarfGetWith' not supported</h1>";
-}
-else
-{
+} 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>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";
 }
 
-
-
 //readXMLfile("xml.php.xml");
-if( readXMLfile("$Tempdir/engelXML") == 0)
-{
-$XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR");
-
+if (readXMLfile("$Tempdir/engelXML") == 0) {
+	$XMLmain = getXMLsubPease($XMLmain, "VCALENDAR");
+
+	if ($ShowDataStrukture) {
+		echo "<pre><br />";
+		echo $XMLmain->name;
+		echo "<br />";
+		print_r(array_values($XMLmain->sub));
+		echo "</pre>";
+	}
 
-if( $ShowDataStrukture)
-{
-	echo "<pre><br>";
-	echo $XMLmain->name;
-	echo "<br>";
-	print_r(array_values ($XMLmain->sub));
+	/*
+	echo "<br />";
+	$Feld=7;
+	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 "</pre>";
-}
-
-/*
-echo "<br>";
-$Feld=7;
-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 "</pre>";
-*/
-
-
-/*##############################################################################################
-				           V e r s i o n
-  ##############################################################################################*/
-
-echo "<hr>\n";
-$XMLrelease = getXMLsubPease( $XMLmain, "X-WR-CALDESC");
-echo "release: ". $XMLrelease->data. "<br>\n";
-//$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE");
-//echo "release date: ". $XMLreleaseDate->data. "<br>\n";
-echo "<hr>\n";
-
-
-
-/*##############################################################################################
-				           V e r s i o n
-  ##############################################################################################*/
-if( $EnableRoomFunctions)
-	include("../../includes/funktion_xml_room.php");
-
-if( $EnableSchudleFunctions)
-	include("../../includes/funktion_xml_schudle.php");
-
-
-/*##############################################################################################
-				         U P D A T E  A L L 
-  ##############################################################################################*/
-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";
-echo "</form>\n";
+	*/
+
+	/*##############################################################################################
+	                   V e r s i o n
+	  ##############################################################################################*/
+
+	echo "<hr>\n";
+	$XMLrelease = getXMLsubPease($XMLmain, "X-WR-CALDESC");
+	echo "release: " . $XMLrelease->data . "<br />\n";
+	//$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE");
+	//echo "release date: ". $XMLreleaseDate->data. "<br />\n";
+	echo "<hr>\n";
+
+	/*##############################################################################################
+	                   V e r s i o n
+	  ##############################################################################################*/
+	if ($EnableRoomFunctions)
+		include ("includes/funktion_xml_room.php");
+
+	if ($EnableSchudleFunctions)
+		include ("includes/funktion_xml_schudle.php");
+
+	/*##############################################################################################
+	                 U P D A T E  A L L 
+	  ##############################################################################################*/
+	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";
+	echo "</form>\n";
 
 } //if XMLopenOOK
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php
deleted file mode 100755
index 708e2fb8..00000000
--- a/www-ssl/admin/debug.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?PHP
-
-$title = "Debug-Liste";
-$header = "Datenbank-Auszug";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-
-echo "<h1>Web Counter</h1>";
-funktion_db_list("Counter");
-
-/*
-echo "<h1>Raeume</h1> <br>";
-funktion_db_list("Raeume");
-
-echo "<h1>Schichtbelegung</h1> <br>";
-funktion_db_list("Schichtbelegung");
-
-echo "<h1>Schichtplan</h1> <br>Hier findest du alle bisher eingetragenen Schichten:";
-funktion_db_list("Schichtplan");
-
-echo "<h1>User</h1> <br>";
-funktion_db_list("User");
-
-echo "<h1>News</h1> <br>";
-funktion_db_list("News");
-
-echo "<h1>FAQ</h1> <br>";
-funktion_db_list("FAQ");
-
-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";
-funktion_db_element_list_2row( "Tshirt ausgegeben",
-				"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`");
-
-echo "<hr>\n";
-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 "<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";
-funktion_db_element_list_2row( "Geleisteter Arbeit",
-					"SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)");
-
-echo "<hr>\n";
-funktion_db_element_list_2row( "Gesamte Arbeit (Ohne Raum aufabau (RID=7)",
-					"SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)");
-echo "<br>\n";
-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)");
-
-
-
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php
index 43f8a77e..4e9f472a 100755..100644
--- a/www-ssl/admin/dect.php
+++ b/www-ssl/admin/dect.php
@@ -1,70 +1,69 @@
-<?PHP
+<?php
+require_once ('../bootstrap.php');
 
 $title = "Engelsystem - DECT";
 $header = "DECT send call";
-include ("../../includes/header.php");
+include ("includes/header.php");
 
-include ("../../includes/config_IAX.php");
-//include ("../../includes/funktion_modem.php");
-include ("../../includes/funktion_cron.php");
+include ("config/config_IAX.php");
+//include ("includes/funktion_modem.php");
+include ("includes/funktion_cron.php");
 
-if( !isset($_GET["dial"])) $_GET["dial"] = "";
-if( !isset($_GET["custum"])) $_GET["custum"] = "";
+if (!isset ($_GET["dial"]))
+	$_GET["dial"] = "";
+if (!isset ($_GET["custum"]))
+	$_GET["custum"] = "";
 
-if( $_GET["dial"]=="dial")
-{
-	if( $_GET["DECT"]=="")
+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 (strlen($_GET["timeh"]) == 1)
+		$_GET["timeh"] = "0" . $_GET["timeh"];
+
+	if (strlen($_GET["timem"]) == 1)
+		$_GET["timem"] = "0" . $_GET["timem"];
+
+	//  SetWackeup( $Number, $_GET["timeh"], $_GET["timem"]);
+	DialNumberIAX($Number, $_GET["timeh"], $_GET["timem"], 0);
 
 	$_GET["custum"] = $Number;
 }
 
+echo "<form action=\"./dect.php\" method=\"GET\">\n";
+echo "<table>\n";
+
+echo "<tr><th>Number</th><th>h:m</th><th></th></tr>\n";
+
+echo "<tr><td>\n";
+// Listet alle Nicks auf
+echo "<select name=\"DECT\">\n";
+echo "\t<option value=\"\">costum</option>\n";
+
+$usql = "SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`";
+$uErg = mysql_query($usql, $con);
+$urowcount = mysql_num_rows($uErg);
+for ($k = 0; $k < $urowcount; $k++) {
+	echo "\t<option value=\"" . mysql_result($uErg, $k, "DECT") . "\">" .
+	mysql_result($uErg, $k, "Nick") .
+	" (" . mysql_result($uErg, $k, "DECT") . ")" .
+	"</option>\n";
+}
+echo "</select>\n";
+
+echo "<input type=\"text\" name=\"custum\" size=\"4\" maxlength=\"4\" value=\"" . $_GET["custum"] . "\">\n";
+echo "</td>\n";
+
+echo "<td><input type=\"text\" name=\"timeh\" size=\"2\" maxlength=\"2\" value=\"" . gmdate("H", time() + 90 + 3600) . "\">:";
+echo "<input type=\"text\" name=\"timem\" size=\"2\" maxlength=\"2\" value=\"" . gmdate("i", time() + 90 + 3600) . "\"></td>\n";
+echo "<td><input type=\"submit\" name=\"dial\" value=\"dial\"></td>\n";
+echo "</tr>";
+echo "</table>\n";
+
+echo "</form>";
 
-	echo "<form action=\"./dect.php\" method=\"GET\">\n";
-	echo "<table>\n";
-
-	echo "<tr><th>Number</th><th>h:m</th><th></th></tr>\n";
-
-	echo "<tr><td>\n";
-	// Listet alle Nicks auf
-	echo "<select name=\"DECT\">\n";
-	echo "\t<option value=\"\">costum</option>\n";
-
-	$usql="SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`";
-	$uErg = mysql_query($usql, $con);
-	$urowcount = mysql_num_rows($uErg);
-	for ($k=0; $k<$urowcount; $k++)
-	{
-		echo "\t<option value=\"".mysql_result($uErg, $k, "DECT")."\">".
-		mysql_result($uErg, $k, "Nick").
-		" (". mysql_result($uErg, $k, "DECT"). ")".
-		"</option>\n";
-	}
-	echo "</select>\n";
-	
-	echo "<input type=\"text\" name=\"custum\" size=\"4\" maxlength=\"4\" value=\"". $_GET["custum"]. "\">\n";
-	echo "</td>\n";
-
-	echo "<td><input type=\"text\" name=\"timeh\" size=\"2\" maxlength=\"2\" value=\"". gmdate("H", time()+90+3600). "\">:";
-	echo "<input type=\"text\" name=\"timem\" size=\"2\" maxlength=\"2\" value=\"". gmdate("i", time()+90+3600). "\"></td>\n";
-	echo "<td><input type=\"submit\" name=\"dial\" value=\"dial\"></td>\n";
-	echo "</tr>";
-	echo "</table>\n";
-	
-	echo "</form>";
-
-
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php
deleted file mode 100755
index 0befbe3a..00000000
--- a/www-ssl/admin/dect_call.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?PHP
-include ("../../includes/header.php");
-
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/faq.1.php b/www-ssl/admin/faq.1.php
deleted file mode 100755
index 0951fcb6..00000000
--- a/www-ssl/admin/faq.1.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<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=faq">FAQ-Liste editiern</a></li>
-
diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php
deleted file mode 100755
index 2a927eab..00000000
--- a/www-ssl/admin/faq.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-$title = "Himmel";
-$header = "FAQ / Fragen an die Erzengel";
-$submenus = 1;
-include ("../../includes/header.php");
-include ("../../includes/funktion_db.php");
-
-//var init
-$quest_bearb=0;
-
-if (IsSet($_GET["quest"])) 
-{
-
-switch ($_GET["quest"]) 
-{
-
-// *---------------------------------------------------------------------------
-// * Anfragen - Bearbeitung
-// *---------------------------------------------------------------------------
-// * je nach Übergabeoption ($quest) koennen Anfragen beantwortet werden oder
-// * als FAQ uebergeben werden 
-// *---------------------------------------------------------------------------
-
-case "all":
-	$SQL="SELECT * FROM `Questions` ORDER BY QID DESC";
-?>
-	Alle Anfragen:<br>
-        <table  width="100%" class="border" cellpadding="2" cellspacing="1">
-                <tr class="contenttopic">
-			<th>Frage</th>
-			<th>Anfragender</th>
-                        <th>Beantwortet?</th>
-                        <th>Antwort</th>
-                        <th>Antwort von</th>
-			<th>change</th>
-                </tr>
-
-<?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;
-	
-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;
-	
-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;
-
-case "save":
-	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";
-        }
-	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;
-
-// *---------------------------------------------------------------------------
-// * FAQ - Bearbeitung
-// *---------------------------------------------------------------------------
-// * je nach Übergabeoption ($quest) koennen FAQ's erfasst werden,
-// * 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);
-
-	// 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;
-
-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);
-
-		// 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"]; ?>">
-        <input type="hidden" name="quest" value="faqdelete">
-        <input type="submit" value="L&ouml;schen...">
-	</form>
-<?php 
-	}
-	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;
-
-case "faqsave";
-        if (!IsSet($_GET["FAQID"]))
-		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";
-        }
-	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>
-        <input type="hidden" name="quest" value="faqnewsave">
-        <input type="submit" value="Sichern...">
-        </form>
-<?php
-	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";
-        else
-		echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n";
-        break;
-
-} //switch ($_GET["quest"])
-
-
-// Hilfsroutine für die Anfragen:
-// Fragenliste anzeigen???
-if ($quest_bearb==1) 
-{
-	$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 (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";
-}
-
-include ("../../includes/footer.php");
-?>
diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php
index 1781d434..b45fadcf 100755..100644
--- a/www-ssl/admin/free.php
+++ b/www-ssl/admin/free.php
@@ -1,15 +1,14 @@
-<?PHP
+<?php
+require_once ('../bootstrap.php');
 
 $title = "Erzengel";
 $header = "Freie Engel";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
+include ("includes/header.php");
+include ("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";
 
 #######################################################
 # Ermitteln freier Engel
@@ -21,34 +20,32 @@ 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);";		
+$SQL = "SELECT Shifts.*, ShiftEntry.* " .
+"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID " .
+"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";
 
 //SELECT User.Nick, Schichtplan.*, Schichtbelegung. * FROM User LEFT JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID, Schichtplan LEFT JOIN Schichtbelegung ON Schichtplan.SID = Schichtbelegung.SID WHERE Schichtplan.Date < now() and Schichtplan.EndDate > now() ORDER BY Nick
 
 //echo "<pre>$SQL</pre>"; 
 
 $Erg = mysql_query($SQL, $con);
-$Zeilen  = mysql_num_rows($Erg);
+$Zeilen = mysql_num_rows($Erg);
 
 // for ($i = 1; $i < mysql_num_fields($Erg); $i++)
 //  echo "|".mysql_field_name($Erg, $i);
 
-
-
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
 echo "\t<tr class=\"contenttopic\">\n";
 echo "\t\t<td>Nick</td>\n";
@@ -58,47 +55,44 @@ echo "\t\t<td>Von</td>\n";
 echo "\t\t<td>Bis</td>\n";
 echo "\t</tr>\n";
 
-
-$inuse="";
-for ($i=0; $i < $Zeilen; $i++)
-{
+$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><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 "<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 .= " OR ";
+	$inuse .= "(Nick = \"" . UID2Nick(mysql_result($Erg, $i, "UID")) . "\")";
 }
-if ($inuse!="") 
-	$inuse=" WHERE NOT (".$inuse.")";
+if ($inuse != "")
+	$inuse = " WHERE NOT (" .
+	$inuse . ")";
 echo "</table>\n";
 
-
 //##########################################################################################################
 
-echo "<br><br>\n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:<br><br>\n";
+echo "<br /><br />\n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:<br /><br />\n";
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\"\>\n";
 echo "\t<tr class=\"contenttopic\">\n\t\t<td>Nick</td>\n\t\t<td>DECT</td>\n\t</tr>\n";
 
-$SQL = "SELECT Nick, UID, DECT FROM User".$inuse.";";
+$SQL = "SELECT Nick, UID, DECT FROM User" . $inuse . ";";
 $Erg = mysql_query($SQL, $con);
-$Zeilen  = mysql_num_rows($Erg);
-for ($i=0; $i < $Zeilen; $i++)
-{
+$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\t<td><a href=\"./userChangeNormal.php?Type=Normal&enterUID=" . mysql_result($Erg, $i, "UID") . "\">" .
+	mysql_result($Erg, $i, "Nick") . "</a></td>\n";
+	echo "\t\t<td>" . mysql_result($Erg, $i, "DECT") . "</td>\n";
+	echo "\n</tr>\n";
 }
 echo "</table>\n";
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php
index 6ec38ff6..4b4e3085 100755..100644
--- a/www-ssl/admin/free_DECT.php
+++ b/www-ssl/admin/free_DECT.php
@@ -1,9 +1,9 @@
-<?PHP
-
-include ("../../includes/config_db.php");
-include ("../../includes/funktion_db_list.php");
-include ("../../includes/funktion_user.php");
+<?php
+require_once ('../bootstrap.php');
 
+include ("config/config_db.php");
+include ("includes/funktion_db_list.php");
+include ("includes/funktion_user.php");
 
 #######################################################
 # Ermitteln freier Engel
@@ -11,68 +11,55 @@ include ("../../includes/funktion_user.php");
 # auslesen aller Engel und dazugehoerige Schichten
 #######################################################
 
-$SQL =  "SELECT Shifts.*, ShiftEntry.* ".
-	"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ".
-	"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";		
+$SQL = "SELECT Shifts.*, ShiftEntry.* " .
+"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID " .
+"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND  ShiftEntry.UID>0);";
 
 $Erg = mysql_query($SQL, $con);
-$Zeilen  = mysql_num_rows($Erg);
+$Zeilen = mysql_num_rows($Erg);
 
-$inuse="";
-for ($i=0; $i < $Zeilen; $i++)
-{
-	if ($inuse!="") 
-  		$inuse.= " OR ";
-	$inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")";
-}
-if ($inuse!="") 
-{
-	$inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')";
+$inuse = "";
+for ($i = 0; $i < $Zeilen; $i++) {
+	if ($inuse != "")
+		$inuse .= " OR ";
+	$inuse .= "(UID = \"" . mysql_result($Erg, $i, "UID") . "\")";
 }
-else
-{
-	$inuse=" WHERE (DECT!='')";
+if ($inuse != "") {
+	$inuse = " WHERE (NOT (" . $inuse . ")) AND (DECT!='')";
+} else {
+	$inuse = " WHERE (DECT!='')";
 }
 
-
 //##########################################################################################################
 
-$SQL = "SELECT * FROM User".$inuse.";";
+$SQL = "SELECT * FROM User" . $inuse . ";";
 $Erg = mysql_query($SQL, $con);
-$Zeilen  = mysql_num_rows($Erg);
-for ($i=0; $i < $Zeilen; $i++)
-{
+$Zeilen = mysql_num_rows($Erg);
+for ($i = 0; $i < $Zeilen; $i++) {
 	// get DECT number
-	echo mysql_result($Erg, $i, "DECT"). "\t";
+	echo mysql_result($Erg, $i, "DECT") . "\t";
 
 	// get all user rights
-	$SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";";
+	$SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=" . mysql_result($Erg, $i, "UID") . ";";
 	$Erg_RIGHT = mysql_query($SQL_RIGHT, $con);
 	$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;";
+	$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";	
+	$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 "<br />";
 }
-
 ?>
 
diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php
deleted file mode 100755
index 00b7329f..00000000
--- a/www-ssl/admin/group.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?PHP
-
-$title = "User-Liste";
-$header = "Editieren der Engelliste";
-include ("../../includes/header.php");
-include ("../../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
-} 
-
-include ("../../includes/footer.php");
-?>
-
-
diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php
deleted file mode 100755
index bd10551b..00000000
--- a/www-ssl/admin/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?PHP
-
-$title = "Erzengel";
-$header = "Index";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-
-echo "Hallo Erzengel ".$_SESSION['Nick'].",<br>\n";
-
-?>
-
-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
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php
deleted file mode 100755
index ba79150b..00000000
--- a/www-ssl/admin/news.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?PHP
-
-$title = "Newsverwaltung";
-$header = "Verwaltung der News";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-
-
-if (!IsSet($_GET["action"]))
-{
-	$SQL = "SELECT * FROM `News` ORDER BY `Datum` DESC";
-	$Erg = mysql_query($SQL, $con);
-
-	$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>
-
-<table width="100%" class="border" cellpadding="2" cellspacing="1">
-        <tr class="contenttopic">
-         <td>Datum</td>
-         <td>Betreff</td>
-         <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>";
-} 
-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();
-	}
-}// IF-ELSE
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/schichtplan.1.php b/www-ssl/admin/schichtplan.1.php
index 30761390..fe8c0384 100755..100644
--- a/www-ssl/admin/schichtplan.1.php
+++ b/www-ssl/admin/schichtplan.1.php
@@ -1,5 +1,5 @@
-<h4 class="menu"> Schichtplan </h4>
-
+<h4>Schichtplan</h4>
+<ul class="content">
 <li><a href="./schichtplan.php">Ein-/Austragen</a></li>
 <li><a href="./schichtplan_druck.php">Druckversion</a></li>
-
+</ul>
\ No newline at end of file
diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php
index cf0eee98..70ef5a6a 100755..100644
--- a/www-ssl/admin/schichtplan.php
+++ b/www-ssl/admin/schichtplan.php
@@ -1,395 +1,362 @@
 <?php
+require_once ('../bootstrap.php');
+
 $title = "Schichtplan";
 $header = "Neue Schichten erfassen";
 $submenus = 1;
-include ("../../includes/header.php");
+include ("includes/header.php");
+
+function executeSQL($SQL) {
+	global $debug, $con;
 
-function executeSQL( $SQL)
-{
-	global $DEBUG, $con;
-	
 	$Erg = mysql_query($SQL, $con);
-	if( $DEBUG ) 
-		echo "DEBUG SQL: $SQL<br>\n";
-	if ($Erg == 1) 
-	{
-	     	echo "SQL war erfolgreich";
-	}
-	else 
-	{
-		echo "SQL Fehler (". mysql_error($con).")" ;
+	if ($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";
+if (!IsSet ($_GET["action"])) {
+	echo "Hallo " . $_SESSION['Nick'] . ",<br />\n";
+	echo "hier kannst du Schichten anlegen, &auml;ndern oder l&ouml;schen.<br /><br />";
+	echo "<a href=\"./shiftadd.php\">Neue Schicht einplanen</a><br /><br />\n\n";
 
-echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >\n";
+	echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >\n";
 ?>
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
-	<tr class="contenttopic">
-		<td></td>
-		<td>Datum</td>
-		<td>Raum</td>
-		<td>Dauer</td>
-		<td>&Auml;ndern</td>
-	</tr>
-<?PHP
-
-$sql =  "SELECT `SID`, `DateS`, `RID`, `Len` FROM `Shifts` ".
+  <tr class="contenttopic">
+    <td></td>
+    <td>Datum</td>
+    <td>Raum</td>
+    <td>Dauer</td>
+    <td>&Auml;ndern</td>
+  </tr>
+<?php
+
+
+	$sql = "SELECT `SID`, `DateS`, `RID`, `Len` FROM `Shifts` " .
 	"ORDER BY `RID`, `DateS` ";
-$Erg = mysql_query($sql, $con);
-$rowcount = mysql_num_rows($Erg);
-for( $i = 0; $i < $rowcount; $i++)
-{
-	echo "\t<tr class=\"content\">\n";
-	echo "\t\t<td><input type=\"checkbox\" name=\"SID". mysql_result($Erg, $i, "SID"). "\" ".
-		"value=\"". mysql_result($Erg, $i, "SID"). "\"></td>\n";
-	echo "\t\t<td>".mysql_result($Erg, $i, "DateS")."</td>\n";
-  
-	$sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'";
-	$Erg2 = mysql_query($sql2, $con);
-	if( mysql_num_rows($Erg2) > 0)
-		echo "\t\t<td>".mysql_result($Erg2, 0, "Name")."</td>\n";
-	else
-		echo "\t\t<td>Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")</td>\n";
-	echo "\t\t<td>".mysql_result($Erg, $i, "Len")." Std. </td>\n";
-	echo "\t\t<td><a href=\"./schichtplan.php?action=change&SID=".
-		mysql_result($Erg, $i, "SID")."\">####</a></td>\n";
-	echo "\t</tr>\n";
-}
-echo "</table>\n";
+	$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 "<input type=\"hidden\" name=\"action\" value=\"deleteShifs\">\n";
-echo "<input type=\"submit\" value=\"L&ouml;schen...\">\n";
-echo "</form>\n";
+		$sql2 = "SELECT `Name` FROM `Room` WHERE `RID`='" . mysql_result($Erg, $i, "RID") . "'";
+		$Erg2 = mysql_query($sql2, $con);
+		if (mysql_num_rows($Erg2) > 0)
+			echo "\t\t<td>" . mysql_result($Erg2, 0, "Name") . "</td>\n";
+		else
+			echo "\t\t<td>Unbenkannt (RID=" . mysql_result($Erg, $i, "RID") . ")</td>\n";
+		echo "\t\t<td>" . mysql_result($Erg, $i, "Len") . " Std. </td>\n";
+		echo "\t\t<td><a href=\"./schichtplan.php?action=change&SID=" .
+		mysql_result($Erg, $i, "SID") . "\">####</a></td>\n";
+		echo "\t</tr>\n";
+	}
+	echo "</table>\n";
 
+	echo "<input type=\"hidden\" name=\"action\" value=\"deleteShifs\">\n";
+	echo "<input type=\"submit\" value=\"L&ouml;schen...\">\n";
+	echo "</form>\n";
 
 } else {
 
-// aus sicherheitzgründen wegen späterer genuzung
-UnSet($chSQL);
+	// aus sicherheitzgr�nden wegen sp�terer genuzung
+	UnSet ($chSQL);
 
-switch ($_GET["action"]){
+	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);
+		case 'change' :
+			if (!IsSet ($_GET["SID"])) {
+				echo "Fehlerhafter Aufruf!\n";
+			} else {
 
-        echo "Schicht ab&auml;ndern: <br>\n";
-
-	// Anzeige Allgemeiner schaischt daten
-        echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >";
-        echo "<table>\n";
-        echo "  <tr><td>Schichtbeginn</td>".
-		"<td><input value=\"". mysql_result($Erg, 0, "DateS"). 
-		"\" type=\"text\" size=\"40\" name=\"eDate\"></td></tr>\n";
-	echo "  <tr><td>Raum</td><td>\n<select name=\"eRID\">\n";
-	
-	$sql2 = "SELECT `RID`, `Name`, `FromPentabarf` FROM `Room`";
-        $Erg2 = mysql_query($sql2, $con);
-	$rowcount = mysql_num_rows($Erg2);
-	$FromPentabarf = "N";
-	for( $i = 0; $i < $rowcount; $i++ )
-	{
-		$RID=mysql_result($Erg2, $i, "RID");
-		echo "   <option value=\"".$RID."\"";
-		if( $RID == mysql_result($Erg, 0, "RID") )
-		{
-			echo " selected";
-			$FromPentabarf = mysql_result($Erg2, $i, "FromPentabarf");
-		}
-		echo ">".mysql_result($Erg2, $i, "Name")."</option>\n";
-	}
-	echo "  </select>\n</td></tr>\n";
-	 
-	echo "  <tr><td>Dauer in h</td>".
-	 	"<td><input value=\"". mysql_result($Erg, 0, "Len").
-		"\" type=\"text\" size=\"40\" name=\"eDauer\"></td></tr>\n";
-	echo "  <tr><td>Beschreibung</td>".
-	 	"<td><input value=\"". mysql_result($Erg, 0, "Man").
-		"\" type=\"text\" size=\"40\" name=\"eName\"></td></tr>\n";
-	echo "  <tr><td>URL</td>".
-	 	"<td><input value=\"". mysql_result($Erg, 0, "URL").
-		"\" type=\"text\" size=\"40\" name=\"eURL\"></td></tr>\n";
-	if( $FromPentabarf == "Y")
-	{
-		echo "  <tr><td></td>".
-		 	"<td><h1>!!! Imported from Pentabarf !!!</h1></td></tr>\n";
-	}
-        echo "</table>\n";
-	 
-        echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
-        echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
-        echo "<input type=\"submit\" value=\"sichern...\">\n";
-        echo "</form>\n\n";
-         
-	// Löschen
-	echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "\" method=\"GET\" >\n";
-        echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
-        echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
-        echo "<input type=\"submit\" value=\"L&ouml;schen...\">\n";
-        echo "</form>\n\n";
-	
-	echo "<b>ACHTUNG:</b><br>\n";
-	echo "Beim L&ouml;schen werden die bisher eingetragenen Engel f&uuml;r diese Schicht mitgel&ouml;scht.<br>\n";
-
-	echo "<br><hr>\n\n\n\n";
-	
-	//Freie Engelschichten
-	$sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'";
-	$Erg3 = mysql_query($sql3, $con);
-	$rowcount = mysql_num_rows($Erg3);
-	
-	echo "Folgende Engelschichten sind noch nicht vergeben.\n";
-	echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:<br>\n";
-	for ($j=0; $j < $rowcount; $j++)
-	{
-		$TID = mysql_result($Erg3, $j, 0);
-		echo "<a href=\"./schichtplan.php?action=engelshiftdel&SID=". $_GET["SID"]. "&TID=$TID\">". 
-			"freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen</a><br>\n";
-	}	
-	echo "<br><hr>\n\n\n\n";
-
-	//Ausgabe eingetragener schischten
-	$sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'";
-	$Erg3 = mysql_query($sql3, $con);
-	$rowcount = mysql_num_rows($Erg3);
-	 
-	echo "Folgende Engel Sind fuer die Schicht eingetargen.\n";
-	echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:<br>\n";
-	echo "<table border=\"1\">\n".
-		"<tr class=\"contenttopic\">".
-		"<th>nick</th>". 
-		"<th>type</th>". 
-		"<th>normal</th>". 
-		"<th>freeloader :-(</th>". 
-		"</tr>";
-	
-	for ($j=0; $j < $rowcount; $j++)
-	{
-		$userUID=mysql_result($Erg3, $j, "UID");
-		echo "\t<tr>\n";
-		echo "\t\t<td>". UID2Nick($userUID). "</td>\n";
-		echo "\t\t<td>". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "</td>\n";
-		echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=0\">###-austragen-###</a></td>\n";
-		echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=". $_GET["SID"]. "&UIDs=$userUID&freeloader=1\">###-austragen-freeloader-###</a></td>\n";
-		echo "\t</tr>\n";
-	} // FOR
-
-	echo "</table><br><hr>\n\n\n\n";
-
-	//Nachtragen von Engeln
-	echo "Hat ein anderer Engel die Schicht &uuml;bernommen, trage ihn bitte ein:";
-	echo "<form action=\"".$_SERVER['SCRIPT_NAME']."\" method=\"GET\" >\n";
-	echo "<input type=\"hidden\" name=\"SID\" value=\"". $_GET["SID"]. "\">\n";
-        echo "<input type=\"hidden\" name=\"action\" value=\"engeladd\">\n";
-	
-	// Listet alle Nicks auf
-	echo "<select name=\"UIDs\">\n";
-	if( $FromPentabarf != "Y")
-	{
-		echo "\t<option value=\"0\">--neu--</option>\n";
-	}
-	
-	$usql="SELECT * FROM `User` ORDER BY `Nick`";
-	$uErg = mysql_query($usql, $con);
-	$urowcount = mysql_num_rows($uErg);
-	for ($k=0; $k<$urowcount; $k++)
-	{
-		echo "\t<option value=\"".mysql_result($uErg, $k, "UID")."\">".
-			mysql_result($uErg, $k, "Nick").
-			"</option>\n";
-	}
-	echo "</select>\n";
-	
-	echo " als \n";
-	
-	// holt eine liste der benötigten Engel zu dieser Schischt
-	$sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` ";
-	$sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') ";
-	$sql3.= "GROUP BY `SID`, `TID`, `UID` ";
-	$Erg3 = mysql_query($sql3, $con);
-	$i=-1;
-	while( ++$i < mysql_num_rows($Erg3))
-	{
-		$EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID");
-	}
-	
-	// Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden
-	echo "<select name=\"TID\">\n";
-	$SQL2 = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-	$Erg2 = mysql_query($SQL2, $con);
-        for ($l = 0; $l < mysql_num_rows($Erg2); $l++) 
-	{
-		$EngelTID = mysql_result($Erg2, $l, "TID");
-		echo "<option value=\"$EngelTID\">";
-		echo mysql_result($Erg2, $l, "Name"). Get_Text("inc_schicht_engel");
-		if( !isset($EngelNeed[$EngelTID]) )
-			echo " (0)";
-		else
-			echo " (".$EngelNeed[$EngelTID].")";
-		echo "</option>\n";
-        }
-	echo "</select>\n";
-	
-	echo "<input type=\"submit\" value=\"eintragen...\">\n";
-	
-	echo "<br>\n<input value=\"1\" type=\"text\" size=\"5\" name=\"eAnzahlNew\"> Anzahl New\n";
-	
-	echo "</form>";
-
-	} // IF ISSET(
-	break;
-
-case 'engeladd':
-	if( $_GET["UIDs"]>0)
-	{
-		
-		$SQL = "SELECT * FROM `ShiftEntry` ".
-			"WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')";
-		$ERG = mysql_query($SQL, $con);
-		if( mysql_num_rows($ERG) != 0 )
-		{
-			$chSQL  = "UPDATE `ShiftEntry` SET ".
-				  "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ".
-			      "WHERE (`SID`='". $_GET["SID"]. "' AND ".
-				  "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1";
-		}
-		else
-		{
-			$chSQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (".
-			          "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ".
-				      "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')";
-		}
-		echo "Es wird folgende Schicht zus&auml;tzlich eingetragen:<br>\n";
-		echo "Engel: ".UID2Nick($_GET["UIDs"])."<br>\n";
-		echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."<br>\n<br>\n";
-	}
-	else
-	{
-		echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zus&auml;tzlich eingetragen:<br>\n";
-		for( $i=0; $i<$_GET["eAnzahlNew"]; $i++)
-		{
-			echo "$i. <br>\n";
-			$SQL  = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (";
-			$SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)";
-			$ERG = mysql_query($SQL, $con);
-			if( $DEBUG ) 
-				echo "DEBUG SQL: $SQL<br>\n";
-			if ($ERG == 1) 
-			{
-			     	echo "&Auml;nderung wurde gesichert...<br>";
+				$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "' )";
+				$Erg = mysql_query($sql, $con);
+
+				echo "Schicht ab&auml;ndern: <br />\n";
+
+				// Anzeige Allgemeiner schaischt daten
+				echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >";
+				echo "<table>\n";
+				echo "  <tr><td>Schichtbeginn</td>" .
+				"<td><input value=\"" . mysql_result($Erg, 0, "DateS") .
+				"\" type=\"text\" size=\"40\" name=\"eDate\"></td></tr>\n";
+				echo "  <tr><td>Raum</td><td>\n<select name=\"eRID\">\n";
+
+				$sql2 = "SELECT `RID`, `Name`, `FromPentabarf` FROM `Room`";
+				$Erg2 = mysql_query($sql2, $con);
+				$rowcount = mysql_num_rows($Erg2);
+				$FromPentabarf = "N";
+				for ($i = 0; $i < $rowcount; $i++) {
+					$RID = mysql_result($Erg2, $i, "RID");
+					echo "   <option value=\"" . $RID . "\"";
+					if ($RID == mysql_result($Erg, 0, "RID")) {
+						echo " selected";
+						$FromPentabarf = mysql_result($Erg2, $i, "FromPentabarf");
+					}
+					echo ">" . mysql_result($Erg2, $i, "Name") . "</option>\n";
+				}
+				echo "  </select>\n</td></tr>\n";
+
+				echo "  <tr><td>Dauer in h</td>" .
+				"<td><input value=\"" . mysql_result($Erg, 0, "Len") .
+				"\" type=\"text\" size=\"40\" name=\"eDauer\"></td></tr>\n";
+				echo "  <tr><td>Beschreibung</td>" .
+				"<td><input value=\"" . mysql_result($Erg, 0, "Man") .
+				"\" type=\"text\" size=\"40\" name=\"eName\"></td></tr>\n";
+				echo "  <tr><td>URL</td>" .
+				"<td><input value=\"" . mysql_result($Erg, 0, "URL") .
+				"\" type=\"text\" size=\"40\" name=\"eURL\"></td></tr>\n";
+				if ($FromPentabarf == "Y") {
+					echo "  <tr><td></td>" .
+					"<td><h1>!!! Imported from Pentabarf !!!</h1></td></tr>\n";
+				}
+				echo "</table>\n";
+
+				echo "<input type=\"hidden\" name=\"SID\" value=\"" . $_GET["SID"] . "\">\n";
+				echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
+				echo "<input type=\"submit\" value=\"sichern...\">\n";
+				echo "</form>\n\n";
+
+				// L�schen
+				echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >\n";
+				echo "<input type=\"hidden\" name=\"SID\" value=\"" . $_GET["SID"] . "\">\n";
+				echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
+				echo "<input type=\"submit\" value=\"L&ouml;schen...\">\n";
+				echo "</form>\n\n";
+
+				echo "<b>ACHTUNG:</b><br />\n";
+				echo "Beim L&ouml;schen werden die bisher eingetragenen Engel f&uuml;r diese Schicht mitgel&ouml;scht.<br />\n";
+
+				echo "<br /><hr>\n\n\n\n";
+
+				//Freie Engelschichten
+				$sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND `UID`='0'";
+				$Erg3 = mysql_query($sql3, $con);
+				$rowcount = mysql_num_rows($Erg3);
+
+				echo "Folgende Engelschichten sind noch nicht vergeben.\n";
+				echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:<br />\n";
+				for ($j = 0; $j < $rowcount; $j++) {
+					$TID = mysql_result($Erg3, $j, 0);
+					echo "<a href=\"./schichtplan.php?action=engelshiftdel&SID=" . $_GET["SID"] . "&TID=$TID\">" .
+					"freie " . TID2Type($TID) . Get_Text("inc_schicht_Engel") . "schicht loeschen</a><br />\n";
+				}
+				echo "<br /><hr>\n\n\n\n";
+
+				//Ausgabe eingetragener schischten
+				$sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND NOT `UID`='0'";
+				$Erg3 = mysql_query($sql3, $con);
+				$rowcount = mysql_num_rows($Erg3);
+
+				echo "Folgende Engel Sind fuer die Schicht eingetargen.\n";
+				echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:<br />\n";
+				echo "<table border=\"1\">\n" .
+				"<tr class=\"contenttopic\">" .
+				"<th>nick</th>" .
+				"<th>type</th>" .
+				"<th>normal</th>" .
+				"<th>freeloader :-(</th>" .
+				"</tr>";
+
+				for ($j = 0; $j < $rowcount; $j++) {
+					$userUID = mysql_result($Erg3, $j, "UID");
+					echo "\t<tr>\n";
+					echo "\t\t<td>" . UID2Nick($userUID) . "</td>\n";
+					echo "\t\t<td>" . TID2Type(mysql_result($Erg3, $j, "TID")) . Get_Text("inc_schicht_Engel") . "</td>\n";
+					echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=" . $_GET["SID"] . "&UIDs=$userUID&freeloader=0\">###-austragen-###</a></td>\n";
+					echo "\t\t<td><a href=\"./schichtplan.php?action=engeldel&SID=" . $_GET["SID"] . "&UIDs=$userUID&freeloader=1\">###-austragen-freeloader-###</a></td>\n";
+					echo "\t</tr>\n";
+				} // FOR
+
+				echo "</table><br /><hr>\n\n\n\n";
+
+				//Nachtragen von Engeln
+				echo "Hat ein anderer Engel die Schicht &uuml;bernommen, trage ihn bitte ein:";
+				echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >\n";
+				echo "<input type=\"hidden\" name=\"SID\" value=\"" . $_GET["SID"] . "\">\n";
+				echo "<input type=\"hidden\" name=\"action\" value=\"engeladd\">\n";
+
+				// Listet alle Nicks auf
+				echo "<select name=\"UIDs\">\n";
+				if ($FromPentabarf != "Y") {
+					echo "\t<option value=\"0\">--neu--</option>\n";
+				}
+
+				$usql = "SELECT * FROM `User` ORDER BY `Nick`";
+				$uErg = mysql_query($usql, $con);
+				$urowcount = mysql_num_rows($uErg);
+				for ($k = 0; $k < $urowcount; $k++) {
+					echo "\t<option value=\"" . mysql_result($uErg, $k, "UID") . "\">" .
+					mysql_result($uErg, $k, "Nick") .
+					"</option>\n";
+				}
+				echo "</select>\n";
+
+				echo " als \n";
+
+				// holt eine liste der ben�tigten Engel zu dieser Schischt
+				$sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` ";
+				$sql3 .= "WHERE (`SID`='" . $_GET["SID"] . "' AND `UID`='0') ";
+				$sql3 .= "GROUP BY `SID`, `TID`, `UID` ";
+				$Erg3 = mysql_query($sql3, $con);
+				$i = -1;
+				while (++ $i < mysql_num_rows($Erg3)) {
+					$EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID");
+				}
+
+				// Gibt dei m�glich Engeltypen aus und zeigt w�efiel noch be�tigt werden
+				echo "<select name=\"TID\">\n";
+				$SQL2 = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
+				$Erg2 = mysql_query($SQL2, $con);
+				for ($l = 0; $l < mysql_num_rows($Erg2); $l++) {
+					$EngelTID = mysql_result($Erg2, $l, "TID");
+					echo "<option value=\"$EngelTID\">";
+					echo mysql_result($Erg2, $l, "Name") . Get_Text("inc_schicht_engel");
+					if (!isset ($EngelNeed[$EngelTID]))
+						echo " (0)";
+					else
+						echo " (" . $EngelNeed[$EngelTID] . ")";
+					echo "</option>\n";
+				}
+				echo "</select>\n";
+
+				echo "<input type=\"submit\" value=\"eintragen...\">\n";
+
+				echo "<br />\n<input value=\"1\" type=\"text\" size=\"5\" name=\"eAnzahlNew\"> Anzahl New\n";
+
+				echo "</form>";
+
+			} // IF ISSET(
+			break;
+
+		case 'engeladd' :
+			if ($_GET["UIDs"] > 0) {
+
+				$SQL = "SELECT * FROM `ShiftEntry` " .
+				"WHERE (`SID`='" . $_GET["SID"] . "' AND `TID`='" . $_GET["TID"] . "' AND `UID`='0')";
+				$ERG = mysql_query($SQL, $con);
+				if (mysql_num_rows($ERG) != 0) {
+					$chSQL = "UPDATE `ShiftEntry` SET " .
+					"`UID`='" . $_GET["UIDs"] . "', `Comment`='shift added by " . $_SESSION['Nick'] . "' " .
+					"WHERE (`SID`='" . $_GET["SID"] . "' AND " .
+					"`TID`='" . $_GET["TID"] . "' AND `UID`='0' ) LIMIT 1";
+				} else {
+					$chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (" .
+					"'" . $_GET["SID"] . "', '" . $_GET["TID"] . "', " .
+					"'" . $_GET["UIDs"] . "', 'shift added by " . $_SESSION['Nick'] . "')";
+				}
+				echo "Es wird folgende Schicht zus&auml;tzlich eingetragen:<br />\n";
+				echo "Engel: " . UID2Nick($_GET["UIDs"]) . "<br />\n";
+				echo "Bemerkung: Schicht eingetragen durch Erzengel " . $_SESSION['Nick'] . "<br />\n<br />\n";
+			} else {
+				echo "Es wird folgende Schicht wurde " . $_GET["eAnzahlNew"] . "x zus&auml;tzlich eingetragen:<br />\n";
+				for ($i = 0; $i < $_GET["eAnzahlNew"]; $i++) {
+					echo "$i. <br />\n";
+					$SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (";
+					$SQL .= "'" . $_GET["SID"] . "', '" . $_GET["TID"] . "', '0', NULL)";
+					$ERG = mysql_query($SQL, $con);
+					if ($debug)
+						echo "DEBUG SQL: $SQL<br />\n";
+					if ($ERG == 1) {
+						echo "&Auml;nderung wurde gesichert...<br />";
+					} else {
+						echo "Fehler beim speichern... bitte noch ein mal probieren :)<br />";
+						echo mysql_error($con);
+					}
+					echo "Es wird eine weitere Schicht eingetragen:<br /><br />\n";
+				}
 			}
-			else 
-			{
-				echo "Fehler beim speichern... bitte noch ein mal probieren :)<br>";
-				echo mysql_error($con);
+			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');";
+				}
 			}
-			echo "Es wird eine weitere Schicht eingetragen:<br><br>\n";
-		}
-	}
-	break;
-
-case 'engeldel':
-	$chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. 
-		 "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; 
-	if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1)
-	{
-		$sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )";
-		$Erg = mysql_query($sql, $con);
-		if( mysql_num_rows( $Erg) == 1)
-		{
-			$UID = $_GET["UIDs"];
-	 		$Length = mysql_result($Erg, 0, "Len");
-			$Comment = 	"Start: ". mysql_result($Erg, 0, "DateS"). "; ".
-					"Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ".
-					"Removed by ". $_SESSION['Nick'];
-			$ch2SQL = 
-				"INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ".
-				"VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');";
-		}
-	}
-	break;
-
-case 'engelshiftdel':
-	$chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". 
-			$_GET["TID"]. "' AND `UID`='0' LIMIT 1"; 
-	break;
-
-case 'changesave':
-	$query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con);
-	$enddate = mysql_fetch_row($query);
-	
-	$chSQL = "UPDATE `Shifts` SET ".
-			"`DateS`='". $_GET["eDate"]. "', ".
-			"`DateE`='".$enddate[0]. "', ".
-			"`RID`='". $_GET["eRID"]. "', ".
-			"`Len`='". $_GET["eDauer"]. "', ".
-			"`Man`='". $_GET["eName"]. "', ".
-			"`URL`='". $_GET["eURL"]. "' ".
-			"WHERE `SID`='". $_GET["SID"]. "'";
-	SetHeaderGo2Back();
-	break;
-	
-case 'delete':
-	$chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1";
-	$ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'";
-	SetHeaderGo2Back();
-	break;
-
-case 'deleteShifs':
-	foreach ($_GET as $k => $v)
-		if( strpos( " ".$k, "SID") == 1)
-		{
-			echo "Shifts $v wird gelöscht...";
-			executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1");
-			echo "<br>\n";
-			echo "ShiftEntry $v wird gelöscht...";
-			executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'");
-			echo "<br><br>\n";
-		}
-	break;
-
-} // end switch
-
-if (IsSet($chSQL)){
-//     echo $chSQL;
-	// hier muesste das SQL ausgefuehrt werden...
-	$Erg = mysql_query($chSQL, $con);
-	if( $DEBUG ) 
-		echo "DEBUG SQL: $chSQL<br>\n";
-	if ($Erg == 1) 
-	{
-	     	echo "&Auml;nderung wurde gesichert...<br>";
-		if( $DEBUG ) 
-			echo "DEBUG: ergebniss". $Erg. "<br>\n";
-		if (IsSet($ch2SQL))
-		{
-			$Erg = mysql_query($ch2SQL, $con);
-			if( $DEBUG ) 
-				echo "DEBUG SQL: $ch2SQL<br>\n";
-			if( $DEBUG ) echo "DEBUG: ergebniss". $Erg. "<br>\n";
+			break;
+
+		case 'engelshiftdel' :
+			$chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND `TID`='" .
+			$_GET["TID"] . "' AND `UID`='0' LIMIT 1";
+			break;
+
+		case 'changesave' :
+			$query = mysql_query("SELECT DATE_ADD('" . $_GET["eDate"] . "', INTERVAL '+0 " . $_GET["eDauer"] . "' DAY_HOUR)", $con);
+			$enddate = mysql_fetch_row($query);
+
+			$chSQL = "UPDATE `Shifts` SET " .
+			"`DateS`='" . $_GET["eDate"] . "', " .
+			"`DateE`='" . $enddate[0] . "', " .
+			"`RID`='" . $_GET["eRID"] . "', " .
+			"`Len`='" . $_GET["eDauer"] . "', " .
+			"`Man`='" . $_GET["eName"] . "', " .
+			"`URL`='" . $_GET["eURL"] . "' " .
+			"WHERE `SID`='" . $_GET["SID"] . "'";
+			SetHeaderGo2Back();
+			break;
+
+		case 'delete' :
+			$chSQL = "DELETE FROM `Shifts` WHERE `SID`='" . $_GET["SID"] . "' LIMIT 1";
+			$ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "'";
+			SetHeaderGo2Back();
+			break;
+
+		case 'deleteShifs' :
+			foreach ($_GET as $k => $v)
+				if (strpos(" " . $k, "SID") == 1) {
+					echo "Shifts $v wird gel�scht...";
+					executeSQL("DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1");
+					echo "<br />\n";
+					echo "ShiftEntry $v wird gel�scht...";
+					executeSQL("DELETE FROM `ShiftEntry` WHERE `SID`='$v'");
+					echo "<br /><br />\n";
+				}
+			break;
+
+	} // end switch
+
+	if (IsSet ($chSQL)) {
+		//     echo $chSQL;
+		// hier muesste das SQL ausgefuehrt werden...
+		$Erg = mysql_query($chSQL, $con);
+		if ($debug)
+			echo "DEBUG SQL: $chSQL<br />\n";
+		if ($Erg == 1) {
+			echo "&Auml;nderung wurde gesichert...<br />";
+			if ($debug)
+				echo "DEBUG: ergebniss" . $Erg . "<br />\n";
+			if (IsSet ($ch2SQL)) {
+				$Erg = mysql_query($ch2SQL, $con);
+				if ($debug)
+					echo "DEBUG SQL: $ch2SQL<br />\n";
+				if ($debug)
+					echo "DEBUG: ergebniss" . $Erg . "<br />\n";
+			}
+		} else {
+			echo "Fehler beim speichern... bitte noch ein mal probieren :)<br />";
+			echo mysql_error($con);
 		}
-	}
-	else 
-	{
-		echo "Fehler beim speichern... bitte noch ein mal probieren :)<br>";
-		echo mysql_error($con);
-	}
-} // Ende Update
+	} // Ende Update
 
 }
 
-
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/admin/schichtplan_druck.1.php b/www-ssl/admin/schichtplan_druck.1.php
index 30761390..30761390 100755..100644
--- a/www-ssl/admin/schichtplan_druck.1.php
+++ b/www-ssl/admin/schichtplan_druck.1.php
diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php
index 80205f9a..3e856c5e 100755..100644
--- a/www-ssl/admin/schichtplan_druck.php
+++ b/www-ssl/admin/schichtplan_druck.php
@@ -1,54 +1,50 @@
 <?php
+require_once ('../bootstrap.php');
+
 $title = "Himmel";
 $header = "Schichtpl&auml;ne";
 $submenus = 1;
 
+if (!IsSet ($_GET["action"])) {
+	include ("includes/header.php");
+	include ("includes/funktionen.php");
+	include ("includes/funktion_schichtplan_aray.php");
+	include ("includes/funktion_schichtplan.php");
 
-if (!IsSet($_GET["action"])) 
-{
-	include ("../../includes/header.php");
-	include ("../../includes/funktionen.php");
-	include ("../../includes/funktion_schichtplan_array.php");
-	include ("../../includes/funktion_schichtplan.php");
+	echo "Hallo " . $_SESSION['Nick'] . "<br />\n" .
+	"auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. W&auml;hle hierf&uuml;r ein Datum und den Raum:\n" .
+	"<br />\n";
 
-	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++) 
-		{
+	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");
+			$RID = mysql_result($res, $i, "RID");
 			$Rname = mysql_result($res, $i, "Name");
-			echo "\t<a href=\"./schichtplan_druck.php?action=1&Raum=$RID&ausdatum=$Tag\" target=\"_blank\">$Tag $Rname</a><br>\n";
+			echo "\t<a href=\"./schichtplan_druck.php?action=1&Raum=$RID&ausdatum=$Tag\" target=\"_blank\">$Tag $Rname</a><br />\n";
 		}
-		echo "<br>\n";
+		echo "<br />\n";
 	}
-	echo "<br><br>";
-	
-	include ("../../includes/footer.php");
-} 
-else 	//#################################################################
-{
-   if (IsSet($_GET["Raum"]) AND IsSet($_GET["ausdatum"])) 
+	echo "<br /><br />";
+
+	include ("includes/footer.php");
+} else //#################################################################
 	{
-   	$Raum = $_GET["Raum"];
-	$ausdatum = $_GET["ausdatum"];
-
-	include ("../../includes/config_db.php");
-	include ("../../includes/config.php");
-	include ("../../includes/secure.php");
-	//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
-	$_SESSION['CVS'][ "admin/schichtplan.php" ] = "N";	
-	include ("../../includes/funktion_lang.php");
-	include ("../../includes/funktion_schichtplan.php");
-	include ("../../includes/funktion_schichtplan_array.php");
-	include ("../../includes/funktion_user.php");
-	?>
+	if (IsSet ($_GET["Raum"]) AND IsSet ($_GET["ausdatum"])) {
+		$Raum = $_GET["Raum"];
+		$ausdatum = $_GET["ausdatum"];
+
+		include ("config/config_db.php");
+		include ("config/config.php");
+		include ("includes/secure.php");
+		//var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!!
+		$_SESSION['CVS']["admin/schichtplan.php"] = "N";
+		include ("includes/funktion_lang.php");
+		include ("includes/funktion_schichtplan.php");
+		include ("includes/funktion_schichtplan_aray.php");
+		include ("includes/funktion_user.php");
+?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -67,63 +63,57 @@ 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";
-			
-		}
-	}
 
+		//Zeit Ausgeben
+		for ($i = 0; $i < 24; $i++)
+			for ($j = 0; $j < $GlobalZeileProStunde; $j++) {
+				$Spalten[$i * $GlobalZeileProStunde + $j] = "\t<tr class=\"content\">\n";
+				if ($j == 0) {
+					$Spalten[$i * $GlobalZeileProStunde + $j] .= "\t\t<td rowspan=\"$GlobalZeileProStunde\">";
+					if ($i < 10)
+						$Spalten[$i * $GlobalZeileProStunde + $j] .= "0";
+					$Spalten[$i * $GlobalZeileProStunde + $j] .= "$i:";
+					if ((($j * 60) / $GlobalZeileProStunde) < 10)
+						$Spalten[$i * $GlobalZeileProStunde + $j] .= "0";
+					$Spalten[$i * $GlobalZeileProStunde + $j] .= (($j * 60) / $GlobalZeileProStunde) . "</td>\n";
 
-CreateRoomShifts( $Raum );
+				}
+			}
 
+		CreateRoomShifts($Raum);
 
-// Ausgabe Zeilen
-	for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i];
-// Ende
-echo "</table>\n";
+		// Ausgabe Zeilen
+		for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++)
+			echo $Spalten[$i];
+		// Ende
+		echo "</table>\n";
 
-echo "Stand: ". gmdate("Y-m-d H:i"). "\n";
-echo "</body>\n";
-echo "</html>\n";
+		echo "Stand: " . gmdate("Y-m-d H:i") . "\n";
+		echo "</body>\n";
+		echo "</html>\n";
 
-} //isset($Vars)
+	} //isset($Vars)
 } //isset($Action)
-
 ?>
diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php
index 70391041..d6b1f8ff 100755..100644
--- a/www-ssl/admin/shiftadd.php
+++ b/www-ssl/admin/shiftadd.php
@@ -1,38 +1,37 @@
 <?php
-$title = "Schicht Hinzufügen";
+require_once ('../bootstrap.php');
+
+$title = "Schicht Hinzufügen";
 $header = "Neue Schichten erfassen";
 
-include ("../../includes/header.php");
+include ("includes/header.php");
 
-$Time = time()+3600+3600;
+$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);
-
-	for ($i=0; $i<$rowcount; $i++) 
-	{
-		$Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-		$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-	}
+$sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`";
+$Erg = mysql_query($sql, $con);
+$rowcount = mysql_num_rows($Erg);
+
+for ($i = 0; $i < $rowcount; $i++) {
+	$Room[$i]["RID"] = mysql_result($Erg, $i, "RID");
+	$Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
+}
 
 // erstellt ein Aray der Engeltypen
-	$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-	$Erg = mysql_query($sql, $con);
-	$rowcount = mysql_num_rows($Erg);
-
-	for ($i=0; $i<$rowcount; $i++) 
-	{
-		$EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
-		$EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-	}
+$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
+$Erg = mysql_query($sql, $con);
+$rowcount = mysql_num_rows($Erg);
+
+for ($i = 0; $i < $rowcount; $i++) {
+	$EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID");
+	$EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name") . Get_Text("inc_schicht_engel");
+}
 
-// sesion mit stanadrt werten befüllen
-if( !isset( $_SESSION['shiftadd.php']['SchichtName']))
-{
+// 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);
@@ -45,314 +44,307 @@ if( !isset( $_SESSION['shiftadd.php']['SchichtName']))
 	$_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"]))
+// wenn werte �bergeben in sesion eintragen
+if (!isset ($_GET["NachtON"]))
 	$_GET["NachtON"] = "OFF";
-if( !isset($_GET["MoreThenOne"]))
+if (!isset ($_GET["MoreThenOne"]))
 	$_GET["MoreThenOne"] = "OFF";
-if( isset( $_GET["SchichtName"]))
-{
-	foreach ($_GET as $k => $v)
-	{
+if (isset ($_GET["SchichtName"])) {
+	foreach ($_GET as $k => $v) {
 		$_SESSION['shiftadd.php'][$k] = $v;
 	}
 }
 
-
-if (!IsSet($_GET["action"])) 
+if (!IsSet ($_GET["action"]))
 	$_GET["action"] = "new";
 
-switch( $_GET["action"])
-{
-case 'new':
+switch ($_GET["action"]) {
+	case 'new' :
 ?>
 Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende der Schichten eintragen.
 &Uuml;ber die L&auml;nge der Schichten errechnet sich dadurch die Anzahl dieser. Dadurch k&ouml;nnen gleich
 mehrere Schichten auf einmal erfasst werden:
 
-<form action="<?PHP echo $_SERVER['SCRIPT_NAME']; ?>" >
+<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
-
-case 'newsave':
-    if (isset($_GET["SDatum"]) && ($_GET["len"] > 0))
-    {
-	$lenOrg = $_GET["len"];
-	if( $_GET["NachtON"] == "ON" )
-	{	
-		$lenArrayDummy = explode( "-", $_GET["len_night"]);
-                foreach ( $lenArrayDummy as $Temp )
-                {
-			if( isset($Temp2) )
-				$lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2);
-			$Temp2 = $Temp;
-        	}//foreach
-	}//IF( $NachtON == "ON" )
-
-	echo "<table border=\"1\">\n";
-	echo "<tr>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Start</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">End</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">len</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">RID</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Beschreibung</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Entry 'Shifts'</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">SID</td>\n";
-	echo "\t<td valign=\"top\" align=\"center\">Entrys</td>\n";
-	echo "</tr>\n";
- 	
-	$DateEnd = $_GET["SDatum"];
- 	$TimeEnd = intval($_GET["STime"]);
-	$len=0;
-	do
-	{	
-		// define Start time
-		$Date = $DateEnd;
-		$Time = $TimeEnd;
-		$_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00";
-			
-		// define End time
-	 	if( $_GET["NachtON"] == "ON" )
-		{
-			if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert.");
-			$_GET["len"] = $lenArray[$Time];
-			if( $_GET["len"]<1) die("len <1");
-		}
-		$TimeEnd = $Time+ $_GET["len"];
-		
-		//Tagesüberschreitung
-		while( $TimeEnd >= 24 )
-		{
-			$TimeEnd -= 24;
-			$DateEnd += 1;
-		}
-		//ist schischt zu lang dan verkürzen
-		if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) 
-		{
-			$_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; 
-			$_GET["len"] -= ($TimeEnd- $_GET["ETime"]);		// -(-) ->> +
-			$DateEnd = $_GET["EDatum"];
-			$TimeEnd = $_GET["ETime"];
-		}
-		$_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00";
-
-		if( $_DateS != $_DateE )
-			CreateNewEntry();
-		
-		if( $_GET["MoreThenOne"]!="ON" ) break;
-		if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break;
-	} while( true );
-	echo "</table>";
-	
-	if( $_GET["OnlyShow"]=="ON" ) 
-	{
-		echo "<form action=\"". $_SERVER['SCRIPT_NAME']. "\">";
-		echo "\n\t<Input type=\"hidden\" name=\"SchichtName\" value=\"". $_GET["SchichtName"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"MonthJahr\" value=\"". $_GET["MonthJahr"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"SDatum\" value=\"". $_GET["SDatum"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"STime\" value=\"". $_GET["STime"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"MoreThenOne\" value=\"". $_GET["MoreThenOne"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"EDatum\" value=\"". $_GET["EDatum"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"ETime\" value=\"". $_GET["ETime"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"len\" value=\"". $lenOrg. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"NachtON\" value=\"". $_GET["NachtON"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"len_night\" value=\"". $_GET["len_night"]. "\">";
-		echo "\n\t<input type=\"hidden\" name=\"OnlyShow\" value=\"OFF\">";
-		foreach ($EngelType As $TTemp)
-		{
-			$Temp = "EngelType".$TTemp["TID"];
-			echo "\n\t<input type=\"hidden\" name=\"". $Temp. "\" value=\"". $_GET[$Temp]. "\">";
-		}	
-		echo "\n\t<input type=\"hidden\" name=\"action\" value=\"newsave\">";
-		echo "\n\t<input type=\"submit\" value=\"mach mal Gabriel!\">";
-		echo "\n</form>";
-	} //if
-    } //IF
-    break;
-
-case 'engeldel':
-	break;
+<?php
 
-} // end switch
 
+		break; // Ende new
+
+	case 'newsave' :
+		if (isset ($_GET["SDatum"]) && ($_GET["len"] > 0)) {
+			$lenOrg = $_GET["len"];
+			if ($_GET["NachtON"] == "ON") {
+				$lenArrayDummy = explode("-", $_GET["len_night"]);
+				foreach ($lenArrayDummy as $Temp) {
+					if (isset ($Temp2))
+						$lenArray[intval($Temp2)] = intval($Temp) - intval($Temp2);
+					$Temp2 = $Temp;
+				} //foreach
+			} //IF( $NachtON == "ON" )
+
+			echo "<table border=\"1\">\n";
+			echo "<tr>\n";
+			echo "\t<td valign=\"top\" align=\"center\">Start</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">End</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">len</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">RID</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">Beschreibung</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">Entry 'Shifts'</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">SID</td>\n";
+			echo "\t<td valign=\"top\" align=\"center\">Entrys</td>\n";
+			echo "</tr>\n";
+
+			$DateEnd = $_GET["SDatum"];
+			$TimeEnd = intval($_GET["STime"]);
+			$len = 0;
+			do {
+				// define Start time
+				$Date = $DateEnd;
+				$Time = $TimeEnd;
+				$_DateS = $_GET["MonthJahr"] . "-" . $Date . " " . $Time . ":00:00";
+
+				// define End time
+				if ($_GET["NachtON"] == "ON") {
+					if (!isset ($lenArray[$Time]))
+						die("Zeit $Time h nicht definiert.");
+					$_GET["len"] = $lenArray[$Time];
+					if ($_GET["len"] < 1)
+						die("len <1");
+				}
+				$TimeEnd = $Time + $_GET["len"];
+
+				//Tages�berschreitung
+				while ($TimeEnd >= 24) {
+					$TimeEnd -= 24;
+					$DateEnd += 1;
+				}
+				//ist schischt zu lang dan verk�rzen
+				if ($DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"])) {
+					$_GET["len"] -= ($DateEnd - $_GET["EDatum"]) * 24;
+					$_GET["len"] -= ($TimeEnd - $_GET["ETime"]); // -(-) ->> +
+					$DateEnd = $_GET["EDatum"];
+					$TimeEnd = $_GET["ETime"];
+				}
+				$_DateE = $_GET["MonthJahr"] . "-" . $DateEnd . " " . $TimeEnd . ":00:00";
+
+				if ($_DateS != $_DateE)
+					CreateNewEntry();
 
+				if ($_GET["MoreThenOne"] != "ON")
+					break;
+				if ($DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]))
+					break;
+			}
+			while (true);
+			echo "</table>";
+
+			if ($_GET["OnlyShow"] == "ON") {
+				echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\">";
+				echo "\n\t<Input type=\"hidden\" name=\"SchichtName\" value=\"" . $_GET["SchichtName"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"MonthJahr\" value=\"" . $_GET["MonthJahr"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"SDatum\" value=\"" . $_GET["SDatum"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"STime\" value=\"" . $_GET["STime"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"MoreThenOne\" value=\"" . $_GET["MoreThenOne"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"EDatum\" value=\"" . $_GET["EDatum"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"ETime\" value=\"" . $_GET["ETime"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"len\" value=\"" . $lenOrg . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"RID\" value=\"" . $_GET["RID"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"NachtON\" value=\"" . $_GET["NachtON"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"len_night\" value=\"" . $_GET["len_night"] . "\">";
+				echo "\n\t<input type=\"hidden\" name=\"OnlyShow\" value=\"OFF\">";
+				foreach ($EngelType As $TTemp) {
+					$Temp = "EngelType" . $TTemp["TID"];
+					echo "\n\t<input type=\"hidden\" name=\"" . $Temp . "\" value=\"" . $_GET[$Temp] . "\">";
+				}
+				echo "\n\t<input type=\"hidden\" name=\"action\" value=\"newsave\">";
+				echo "\n\t<input type=\"submit\" value=\"mach mal Gabriel!\">";
+				echo "\n</form>";
+			} //if
+		} //IF
+		break;
+
+	case 'engeldel' :
+		break;
 
-function CreateNewEntry() 
-{
-	global $con, $_DateS, $_DateE, $EngelType, $DEBUG;
-	foreach ($EngelType As $TTemp)
-	{
-		$Temp = "EngelType".$TTemp["TID"];
+} // end switch
+
+function CreateNewEntry() {
+	global $con, $_DateS, $_DateE, $EngelType, $debug;
+	foreach ($EngelType As $TTemp) {
+		$Temp = "EngelType" . $TTemp["TID"];
 		global $$Temp;
-	}	
+	}
 
 	echo "<tr>\n";
 
 	echo "\t<td>$_DateS</td>\n";
 	echo "\t<td>$_DateE</td>\n";
-	echo "\t<td>". $_GET["len"]. "</td>\n";
-	echo "\t<td>". $_GET["RID"]. "</td>\n";
-	echo "\t<td>". $_GET["SchichtName"]. "</td>\n";
-	
-	
-	// Ist eintarg schon vorhanden?	
-	$SQL  = "SELECT `SID` FROM `Shifts` ";
-	$SQL .=	"WHERE (".
-		"`DateS` = '". $_DateS. "' AND ".
-		"`DateE` = '". $_DateE. "' AND ".
-		"`RID` = '". $_GET["RID"]. "');";
+	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 )
+
+	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"]. "');";
+	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. "]";
+		$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";
+		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"]. "');";
+	$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 )
+	if (mysql_num_rows($Erg) == 0)
 		echo "\t<td>?</td>";
-	else	
-	{
+	else {
 		$SID = mysql_result($Erg, 0, "SID");
-		echo "\t<td>". $SID. "</td>";
+		echo "\t<td>" . $SID . "</td>";
 	}
 
-	// erstellt für jeden Engeltypen die eintrage in 'ShiftEntry'
+	// erstellt f�r jeden Engeltypen die eintrage in 'ShiftEntry'
 	echo "\t<td>";
-	foreach ($EngelType As $TTemp)
-	{
-		$Temp = "EngelType".$TTemp["TID"];
-		
-		if( $_GET[$Temp] > 0 )
-		{
+	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"]. "');";
+			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 ($debug)
+						$SQLFail = "\n\t<br />[" . $SQL . "]";
 
-					if ($Erg == 1) echo "'pass' ";
-					else           echo "'fail' <u>". mysql_error($con). "</u>$SQLFail</td>\n";
+					if ($Erg == 1)
+						echo "'pass' ";
+					else
+						echo "'fail' <u>" . mysql_error($con) . "</u>$SQLFail</td>\n";
 
-				}
-				else
+				} else
 					echo "+";
 			}
-			echo "<br>";
+			echo "<br />";
 		} // IF $$TEMP
 	} // FOREACH
 	echo "</td>";
-	
+
 	echo "</tr>\n";
 }
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php
deleted file mode 100755
index ba09dae0..00000000
--- a/www-ssl/admin/sprache.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?PHP
-
-$title = "Sprache";
-$header = "Liste der existierenden Sprcheintr&auml;ge";
-include ("../../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 "<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>";
-
-
-	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";
-
-	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);
-
-			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 ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php
index f7406d16..9a8e7010 100755..100644
--- a/www-ssl/admin/tshirt.php
+++ b/www-ssl/admin/tshirt.php
@@ -1,59 +1,62 @@
-<?PHP
+<?php
+require_once ('../bootstrap.php');
 
 $title = "T-Shirt-Ausgabe";
 $header = "T-Shirt-Ausgabe f&uuml;r aktiven Engel";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
+include ("includes/header.php");
+include ("includes/funktion_db_list.php");
 
+If (IsSet ($_GET["aktiv"])) {
 
-If (IsSet($_GET["aktiv"])) {
-
-	$SQL="UPDATE `User` SET `Tshirt`='1' WHERE `UID`='". $_GET["aktiv"]. "' limit 1";
+	$SQL = "UPDATE `User` SET `Tshirt`='1' WHERE `UID`='" . $_GET["aktiv"] . "' limit 1";
 	$Erg = mysql_query($SQL, $con);
-        if ($Erg == 1) {
-        } else {
-           echo "Fehler beim speichern bei Engel ". UID2Nick($_GET["aktive"]). "<br>";
-        }
+	if ($Erg == 1) {
+	} else {
+		echo "Fehler beim speichern bei Engel " . UID2Nick($_GET["aktive"]) . "<br />";
+	}
 }
-
 ?>
 
-&Uuml;ber die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.<br>
-Hinter diesem erscheint ein Link, &uuml;ber den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.<br><br>
+&Uuml;ber die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.<br />
+Hinter diesem erscheint ein Link, &uuml;ber den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.<br /><br />
 
 Liste aller aktiven Engel:
 
-<?PHP
-$SQL = "SELECT * FROM `User` WHERE (`Aktiv`='1') ORDER BY `Nick` ASC"; 
+<?php
+
+
+$SQL = "SELECT * FROM `User` WHERE (`Aktiv`='1') ORDER BY `Nick` ASC";
 $Erg = mysql_query($SQL, $con);
 
 $rowcount = mysql_num_rows($Erg);
 ?>
 <table width="100%" class="border" cellpadding="2" cellspacing="1">
         <tr class="contenttopic">
-	 <td>Nick</td>
-	 <td>Aktiv?</td>
-	 <td>Gr&ouml;sse</td>
-	 <td>T-Shirt ausgeben:</td>
-	</td>
-<?PHP
-for ($i=0; $i<$rowcount; $i++){
-  echo "\t<tr class=\"content\">\n";
-    $eUID=mysql_result($Erg, $i, "UID");
-    echo "\t\t<td>".UID2Nick($eUID)."</td>\n";
-    echo "\t\t<td>".mysql_result($Erg, $i, "Aktiv")."</td>\n";
-    echo "\t\t<td>".mysql_result($Erg, $i, "Size")."</td>\n";
-
-    if (mysql_result($Erg, $i, "Tshirt") =="1") {
-	echo "\t\t<td>bereits erhalten</td>";
-    } else {
-	echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
-    }
- echo "\t</tr>\n";
+   <td>Nick</td>
+   <td>Aktiv?</td>
+   <td>Gr&ouml;sse</td>
+   <td>T-Shirt ausgeben:</td>
+  </td>
+<?php
+
+
+for ($i = 0; $i < $rowcount; $i++) {
+	echo "\t<tr class=\"content\">\n";
+	$eUID = mysql_result($Erg, $i, "UID");
+	echo "\t\t<td>" . UID2Nick($eUID) . "</td>\n";
+	echo "\t\t<td>" . mysql_result($Erg, $i, "Aktiv") . "</td>\n";
+	echo "\t\t<td>" . mysql_result($Erg, $i, "Size") . "</td>\n";
+
+	if (mysql_result($Erg, $i, "Tshirt") == "1") {
+		echo "\t\t<td>bereits erhalten</td>";
+	} else {
+		echo "\t\t<td><a href=\"./tshirt.php?aktiv=$eUID\">XXXXXXXX</a></td>";
+	}
+	echo "\t</tr>\n";
 }
 
 echo "</table>";
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php
deleted file mode 100755
index 362d6a3b..00000000
--- a/www-ssl/admin/user.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?PHP
-
-$title = "User-Liste";
-$header = "Editieren der Engelliste";
-include ("../../includes/header.php");
-include ("../../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",
-                                        "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
-
-	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` ".
-		"");
-}
-else
-{
-	echo "error";
-}
-
-include ("../../includes/footer.php");
-?>
-
-
diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php
index 32cd230d..93857d2e 100755..100644
--- a/www-ssl/admin/userArrived.php
+++ b/www-ssl/admin/userArrived.php
@@ -1,54 +1,53 @@
-<?PHP
+<?php
+require_once ('../bootstrap.php');
 
 $title = "Engel Arrived";
 $header = "Engel was arrived";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
+include ("includes/header.php");
+include ("includes/funktion_db_list.php");
 
+If (IsSet ($_GET["arrived"])) {
 
-If (IsSet($_GET["arrived"])) {
-
-	$SQL="UPDATE `User` SET `Gekommen`='1' WHERE `UID`='". $_GET["arrived"]. "' limit 1";
+	$SQL = "UPDATE `User` SET `Gekommen`='1' WHERE `UID`='" . $_GET["arrived"] . "' limit 1";
 	$Erg = db_query($SQL, "Set User as Gekommen");
-        if ($Erg == 1) {
-		echo "<h2>". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\"</h2>";
-        } else {
-		echo "<h1>". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"</h1>";
-        }
+	if ($Erg == 1) {
+		echo "<h2>" . Get_Text("pri_userArrived_WriteOK") . " \"" . UID2Nick($_GET["arrived"]) . "\"</h2>";
+	} else {
+		echo "<h1>" . Get_Text("pri_userArrived_WriteError") . " \"" . UID2Nick($_GET["arrived"]) . "\"</h1>";
+	}
 }
 
-echo Get_Text("pri_userArrived_Text1"). "<br>";
-echo Get_Text("pri_userArrived_Text2"). "<br><br>";
+echo Get_Text("pri_userArrived_Text1") . "<br />";
+echo Get_Text("pri_userArrived_Text2") . "<br /><br />";
 
 echo Get_Text("pri_userArrived_TableToppic");
-$SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC"; 
+$SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC";
 $Erg = mysql_query($SQL, $con);
 
 $rowcount = mysql_num_rows($Erg);
 
 echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
 echo "\t<tr class=\"contenttopic\">\n";
-echo "\t\t<td>". Get_Text("pri_userArrived_TableTD_Nick"). "</td>\n";
-echo "\t\t<td>". Get_Text("pri_userArrived_TableTD_ArrivedShow"). "</td>\n";
-echo "\t\t<td>". Get_Text("pri_userArrived_TableTD_ArrivedSet"). "</td>\n";
+echo "\t\t<td>" . Get_Text("pri_userArrived_TableTD_Nick") . "</td>\n";
+echo "\t\t<td>" . Get_Text("pri_userArrived_TableTD_ArrivedShow") . "</td>\n";
+echo "\t\t<td>" . Get_Text("pri_userArrived_TableTD_ArrivedSet") . "</td>\n";
 echo "\t</td>\n";
 
-for ($i=0; $i<$rowcount; $i++){
+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";
+	$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>";
+	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\t<td><a href=\"./userArrived.php?arrived=$eUID\">" . Get_Text("pri_userArrived_TableEntry_Set") . "</a></td>";
 	}
 	echo "\t</tr>\n";
 }
 echo "</table>";
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
 
diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php
deleted file mode 100755
index 4ec014a7..00000000
--- a/www-ssl/admin/userChangeNormal.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?PHP
-
-$title = "User-Liste";
-$header = "Editieren der Engelliste";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-
-if (IsSet($_GET["enterUID"]))
-{ 
-	// 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 "<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";
- 
-		// 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";
-
-		// 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 "</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 "<hr>";
-	funktion_db_element_list_2row( 
-		"Freeloader Shifts", 
-		"SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); 
-}
-
-include ("../../includes/footer.php");
-?>
-
-
diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php
deleted file mode 100755
index 9da7bc75..00000000
--- a/www-ssl/admin/userChangeSecure.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?PHP
-
-$title = "User-Liste";
-$header = "Editieren der Engelliste";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-
-if (IsSet($_GET["enterUID"]))
-{ 
-	// 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";
-
-
-	$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=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\">";
-
-						$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>";
-	} 
-}
-
-include ("../../includes/footer.php");
-?>
-
-
diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php
deleted file mode 100755
index 84d880ad..00000000
--- a/www-ssl/admin/userDefaultSetting.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?PHP
-
-$title = "Defalut User Setting";
-$header = "Defalut User Setting";
-include ("../../includes/header.php");
-include ("../../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";
-				
-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";
-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
-} //IF(
-
-
-$erg = mysql_query("SHOW COLUMNS FROM `UserCVS`");
-echo mysql_error();
-echo "\t<tr class=\"content\">\n";
-echo "\t\t<form action=\"userDefaultSetting.php\">\n";
-echo "\t\t\t<input name=\"Field\" type=\"hidden\" value=\GroupID\">\n";
-echo "\t\t\t<td>Group</td>\n";
-echo "\t\t\t<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( 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";
-echo "\t\t\t    <input type=\"submit\" name=\"Send\" value=\"SetForAllUser\"></td>\n";
-echo "\t\t</form>\n";
-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\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</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";
-echo "\t\t\t<td><input name=\"Field\" type=\"text\" value=\"new\"></td>\n";
-echo "\t\t\t<td>\n";
-echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"Y\">allow\n";
-echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"N\">denied\n";
-echo "\t\t\t\t<input type=\"radio\" name=\"Default\" value=\"G\" checked>group-setting\n";
-echo "\t\t\t</td>\n";
-echo "\t\t\t<td><input type=\"submit\" name=\"Send\" value=\"New\"></td>\n";
-echo "\t\t</form>\n";
-echo "\t</tr>\n";
-
-
-
-echo "</table>\n";
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php
deleted file mode 100755
index 3a793d45..00000000
--- a/www-ssl/admin/userSaveNormal.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?PHP
-
-$title = "User-Liste";
-$header = "Index";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-include ("../../includes/crypt.php");
-include ("../../includes/funktion_db.php");
-
-if (IsSet($_GET["action"])) 
-{
-	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;
-
-	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 "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...";
-}
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php
deleted file mode 100755
index 4a3c1eae..00000000
--- a/www-ssl/admin/userSaveSecure.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?PHP
-
-$title = "User-Liste";
-$header = "Index";
-include ("../../includes/header.php");
-include ("../../includes/funktion_db_list.php");
-include ("../../includes/crypt.php");
-include ("../../includes/funktion_db.php");
-
-if( !IsSet($_POST["enterUID"]) ) 
-{
-	$Right = "N";
-} elseif( $_POST["enterUID"] > 0 ) {
-	$Right = $_SESSION['CVS'][ "admin/user.php"];
-} else {
-	$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;
-
-	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
-
-// 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). ")";
-			}
-
-		}
-
-		
-		break;
-	}
-} else {
-	// kein Action gesetzt -> abbruch
-	echo "Unzul&auml;ssiger Aufruf.<br>Bitte neu editieren...";
-}
-
-include ("../../includes/footer.php");
-?>
-
diff --git a/www-ssl/bootstrap.php b/www-ssl/bootstrap.php
new file mode 100644
index 00000000..40a32578
--- /dev/null
+++ b/www-ssl/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+// path and include settings
+$rootpath = str_replace(DIRECTORY_SEPARATOR . 'bootstrap.php', '', __FILE__);
+define('ROOTPATH', $rootpath);
+
+$includePath = ini_get('include_path');
+$includePath .= PATH_SEPARATOR . ROOTPATH . DIRECTORY_SEPARATOR . '..';
+
+ini_set('include_path', $includePath);
+?>
\ No newline at end of file
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
new file mode 100644
index 00000000..236eba81
--- /dev/null
+++ b/www-ssl/css/base.css
@@ -0,0 +1,205 @@
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    font-family: Arial;
+    sans-serif;
+    font-size:
+    14px;
+}
+
+header {
+    display: block;
+    width: 100%;
+}
+
+article, details {
+    clear: none;
+    display: block;
+    float: none;
+}
+
+footer {
+    clear: both;
+    display: block;
+    font-size: 12px;
+    text-align: center;
+    width: 100%;
+}
+
+footer p {
+    margin: 10px auto;
+}
+
+#logo {
+    background: url('../pic/himmel.png') top left no-repeat;
+    display: block;
+    height: 32px;
+    margin: 10px auto;
+    width: 380px;
+}
+
+#body {
+    margin: 0 5%;
+}
+
+#menu {
+    float: left;
+    width: 200px;
+}
+
+#content {
+    margin-left: 200px;
+}
+
+a {
+    color: #000;
+}
+
+td, dt, dd {
+    padding: 4px;
+}
+
+dt {
+    font-weight: bold;
+}
+
+dd {
+    margin-left: 20px;
+}
+
+h1, h2, h3, h4 {
+    font-size: 16px;
+    padding: 0 4px;
+}
+
+hr {
+    margin: 10px 0;
+}
+
+ul {
+    padding: 5px 0 5px 20px;
+}
+
+nav {
+    margin: 0 10px 10px 0;
+}
+
+#content > article {
+    padding: 10px;
+}
+
+p {
+    padding: 0 0 10px 0;
+}
+
+#menu p {
+    padding: 4px;
+}
+
+a.sprache img {
+    margin-right: 5px;
+}
+
+table {
+    border-collapse: collapse;
+}
+
+th {
+    background: #f0f0f0;
+}
+
+td, th {
+    border: 1px solid #888;
+}
+
+textarea {
+    height: 200px;
+    width: 300px;
+}
+
+.hidden {
+	background: #fff;
+	border: 1px solid #888;
+	display: none;
+	font-size: 12px;
+	padding: 4px;
+}
+
+td .hidden {
+	position: absolute;
+}
+
+tr:hover .hidden {
+	display: block;
+}
+
+.clear {
+    clear: both;
+}
+
+.pagination {
+    text-align: center;
+}
+
+.background {
+    background: #f0f0f0;
+}
+
+.container {
+    border: 1px solid #888;
+}
+
+.content {
+    background: #fff;
+}
+
+.error {
+    color: #f00;
+}
+
+.success {
+    color: #090;
+}
+
+.notice {
+    background: #f0f0f0;
+    border: 2px solid #888;
+    margin: 10px;
+    padding: 10px;
+}
+
+.new_message {
+    font-weight: bold;
+}
+
+.news_comment, .news {
+    border: 1px solid #888;
+    margin: 10px 0;
+}
+
+.news_comment details, .news details {
+    background: #f0f0f0;
+    padding: 4px;
+}
+
+.news_comment p, .news p, h3 {
+    padding: 4px;
+}
+
+.news_comment p, .news_comment details {
+    margin-left: 72px;
+}
+
+.avatar {
+    float: left;
+    margin: 4px;
+    max-width: 64px;
+}
+
+.news.meeting {
+    border: 1px solid #000;
+    box-shadow: 1px 1px 5px #888;
+}
diff --git a/www-ssl/css/grossbild.js b/www-ssl/css/grossbild.js
index 618ecc1f..618ecc1f 100755..100644
--- a/www-ssl/css/grossbild.js
+++ b/www-ssl/css/grossbild.js
diff --git a/www-ssl/css/style.css.old b/www-ssl/css/style.css.old
deleted file mode 100755
index 254fb1b7..00000000
--- a/www-ssl/css/style.css.old
+++ /dev/null
@@ -1,53 +0,0 @@
-H1  {
-       font-family : Helvetica,Arial,Verdana;
-       font-size : 25pt;
-}
-H4  {
-       font-family : Arial,Verdana;
-}
-A  {
-	font-family : Arial;
-	font-size : small;
-	text-decoration : none;
-	color : #0000a0;
-}
-A:Visited  {
-	font-family : Arial;
-	font-size : small;
-	color : #0000a0;
-	text-decoration : none;
-}
-										A:Active  {
-        text-decoration : none;
-        font-family : Arial;
-        font-size : small;
-}
-A:Hover {
-	font-family : Arial;
-	font-size : small;
-	color : #0000a0;
-	text-decoration : underline;
-	font-weight : bold;
-}	
-B  {
-	font-weight : bold;
-	font-family : Arial;
-	font-size : small;
-}	
-
-TD  {
-        font-size : small;
-        font-family : Arial;
-	padding-left : 1cm; 
-}
-
-BODY  {
-	font-size : small;
-	font-family : Arial;
-	background-color : #f3b115;
-	color : navy;
-}
-a.title {
-	color:#ffa000;	
-}
-																												
diff --git a/www-ssl/css/style.css.old2 b/www-ssl/css/style.css.old2
deleted file mode 100755
index 9f7c0c90..00000000
--- a/www-ssl/css/style.css.old2
+++ /dev/null
@@ -1,69 +0,0 @@
-H1  {
-        font-family : Helvetica,Arial,Verdana;
-        font-size : 25pt;
-}
-
-H4  {
-        font-family : Arial,Verdana;
-}
-
-A  {
-	font-family : Arial;
-	font-size : small;
-	text-decoration : none;
-	color : #778899;
-}
-
-A:Visited  {
-	font-family : Arial;
-	font-size : small;
-	color : #778899;
-	text-decoration : none;
-}
-
-A:Active  {
-        text-decoration : none;
-        font-family : Arial;
-        font-size : small;
-}
-
-A:Hover {
-	font-family : Arial;
-	font-size : small;
-	color : #778899;
-	text-decoration : underline;
-	font-weight : bold;
-}
-
-B  {
-        font-weight : bold;
-        font-family : Arial;
-        font-size : small;
-}
-
-TD  {
-        font-size : small;
-        font-family : Arial;
-}
-
-BODY  {
-	font-size : small;
-	font-family : Arial;
-	background-color : #f3b115;
-	color : navy;
-}
-
-
-a.title {
-color:#ffa000;	
-}
-
-
-p.question {
-	font-weight: bold;
-}
-
-p.answer {
-	margin-left: 30px;
-	margin-right: 30px;
-}			
diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css
index 8fec5db0..fd8426f1 100755..100644
--- a/www-ssl/css/style1.css
+++ b/www-ssl/css/style1.css
@@ -1,84 +1,83 @@
 
-body {
-	background-color: #131313;
-
-	color: #424242;
-
-	line-height: 150%;
-	font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif;
-
-	margin-bottom: 20px;
+body, .background {
+    background-color: #131313;
+    color: #424242;
+    line-height: 150%;
+    font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif;
 }
 
 a {
-	text-decoration: none;
-	color: #424242
+    text-decoration: none;
+    color: #424242
 }
 
 td {
-	font-size: small
+    font-size: small
 }
 
 a:active, a:hover {
-	font-weight: bold
+    font-weight: bold
 }
-	
+
 li {
-	font-size: small
+    font-size: small
 }
 
 .content {
-	background-color: #131313;
-	color: 		#424242;
+    background-color: #131313;
+    color: #424242;
 }
 
-.contenttopic {
-	font-weight: bold;
-	font-size: small;
-	color: #000000;
-	background-color: #333333
+.contenttopic, h1 {
+    font-weight: bold;
+    font-size: small;
+    color: #000000;
+    background-color: #333333
 }
 
-.border {
-	background-color: #333333
+.border, .container {
+    background-color: #333333;
+	border: 1px solid #424242;
 }
 
 .menu {
-	background-color: #131313;
-	color: #424242;
-	font-size: small
+    background-color: #131313;
+    color: #424242;
+    font-size: small
 }
-h4.menu { 
-	background-color: #333333;
-	font-weight: bold;
-	font-size: small;
-	color: #000000
+
+h4 {
+    background-color: #333333;
+    font-weight: bold;
+    font-size: small;
+    color: #000000
 }
 
 .linkbox {
-	background-color: #ffffff
+    background-color: #ffffff
 }
 
 .linkboxtitle {
-	font-weight: bold;
-	background-color: #000000;
-	color: #ffffff
+    font-weight: bold;
+    background-color: #000000;
+    color: #ffffff
 }
 
 .question {
-	font-weight: bold;
-	font-size: 9pt
+    font-weight: bold;
+    font-size: 9pt
 }
 
 .engeltreffen {
-        font-weight: bold;
-        font-size: 9pt;
-	color: #ff0000;
+    font-weight: bold;
+    font-size: 9pt;
+    color: #ff0000;
 }
 
 .answer {
-	font-size:  9pt;
+    font-size: 9pt;
 }
+
 .comment {
-	font-size : 6pt;
+    font-size: 6pt;
 }
diff --git a/www-ssl/css/style1.css.old b/www-ssl/css/style1.css.old
deleted file mode 100755
index 4a597f35..00000000
--- a/www-ssl/css/style1.css.old
+++ /dev/null
@@ -1,79 +0,0 @@
-
-body {
-	font-family: Arial;
-	background-color: #3e9fef;
-	color: #000000;
-	font-size: small
-}
-
-a {
-	text-decoration: none;
-	color: #304930
-}
-
-td {
-	font-size: small
-}
-
-a:active, a:hover {
-	font-weight: bold
-}
-	
-li {
-	font-size: small
-}
-
-.content {
-	background-color: #bdd9ef;
-	color: #000000
-}
-
-.contenttopic {
-	font-weight: bold;
-	font-size: small;
-	color: #fe961e;
-	background-color: #157cc1
-}
-
-.border {
-	background-color: #050509
-}
-
-.menu {
-	background-color: #bdd9ef;
-	color: #000022;
-	font-size: small
-}
-h4.menu { 
-	font-weight: bold;
-	font-size: small;
-	color: #3e9fef
-}
-
-.linkbox {
-	background-color: #ffffff
-}
-
-.linkboxtitle {
-	font-weight: bold;
-	background-color: #000000;
-	color: #bdd9ef
-}
-
-.question {
-	font-weight: bold;
-	font-size: 9pt
-}
-
-.engeltreffen {
-        font-weight: bold;
-        font-size: 9pt;
-	color: #ff0000;
-}
-
-.answer {
-	font-size:  9pt;
-}
-.comment {
-	font-size : 6pt;
-}
diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css
new file mode 100644
index 00000000..fdaf9398
--- /dev/null
+++ b/www-ssl/css/style10.css
@@ -0,0 +1,11 @@
+#logo {
+    background: url('../pic/engelsystem_logo.png') top left no-repeat;
+    display: block;
+    height: 69px;
+    margin: 10px auto;
+    width: 523px;
+}
+
+tr:hover > td {
+	background: #f0f0f0;
+}
\ No newline at end of file
diff --git a/www-ssl/css/style2.css b/www-ssl/css/style2.css
index e8510809..e8510809 100755..100644
--- a/www-ssl/css/style2.css
+++ b/www-ssl/css/style2.css
diff --git a/www-ssl/css/style3.css b/www-ssl/css/style3.css
index ca45d73c..ca45d73c 100755..100644
--- a/www-ssl/css/style3.css
+++ b/www-ssl/css/style3.css
diff --git a/www-ssl/css/style4.css b/www-ssl/css/style4.css
index b818c9c9..b818c9c9 100755..100644
--- a/www-ssl/css/style4.css
+++ b/www-ssl/css/style4.css
diff --git a/www-ssl/css/style5.css b/www-ssl/css/style5.css
index 4a8f7bcc..4a8f7bcc 100755..100644
--- a/www-ssl/css/style5.css
+++ b/www-ssl/css/style5.css
diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css
index 72e1024d..8dc008e7 100755..100644
--- a/www-ssl/css/style6.css
+++ b/www-ssl/css/style6.css
@@ -1,11 +1,15 @@
 
-body {
+body, .background {
 	font-family: Arial, Helvetica, sans-serif;
 	background-color: #121327;
 	color: #FFFFFF;
 	font-size: small
 }
 
+#logo {
+	background-image: url('../pic/himmel_w.png');
+}
+
 a {
 	text-decoration: none;
 	color: #ff9900
@@ -35,7 +39,7 @@ li {
 	background-color: #333e47
 }
 
-.border {
+.border, .container {
 	background-color: #000000
 }
 
@@ -66,3 +70,7 @@ h4.menu {
 .comment {
 	font-size : 6pt;
 }
+
+h4, h1, th {
+	background: #333E47;
+}
diff --git a/www-ssl/css/style7.css b/www-ssl/css/style7.css
index 297f1d0c..297f1d0c 100755..100644
--- a/www-ssl/css/style7.css
+++ b/www-ssl/css/style7.css
diff --git a/www-ssl/css/style8.css b/www-ssl/css/style8.css
index 91d3b325..91d3b325 100755..100644
--- a/www-ssl/css/style8.css
+++ b/www-ssl/css/style8.css
diff --git a/www-ssl/css/style9.css b/www-ssl/css/style9.css
index 4310ca8c..4310ca8c 100755..100644
--- a/www-ssl/css/style9.css
+++ b/www-ssl/css/style9.css
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
deleted file mode 100755
index 5aeaee54..00000000
--- a/www-ssl/faq.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$title = "Index";
-$header = "FAQ";
-include ("../includes/header.php");
-
-
-$SQL = "SELECT * FROM `FAQ`";
-$Erg = mysql_query($SQL, $con);
-
-// 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>";
-  }
-}
-
-include ("../includes/footer.php");
-?>
-
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 8192e987..e1a4496f 100755..100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,19 +1,155 @@
 <?php
-$title = "Index";
-$header = "Index";
-include ("../includes/header.php");
+require_once ('bootstrap.php');
+require_once ('includes/sys_auth.php');
+require_once ('includes/sys_counter.php');
+require_once ('includes/sys_lang.php');
+require_once ('includes/sys_menu.php');
+require_once ('includes/sys_mysql.php');
+require_once ('includes/sys_page.php');
+require_once ('includes/sys_shift.php');
+require_once ('includes/sys_template.php');
+require_once ('includes/sys_user.php');
 
-echo Get_Text("index_text1")."<br><br>";
-echo Get_Text("index_text2")."<br>";
-echo Get_Text("index_text3")."<br>";
+require_once ('config/config.php');
+require_once ('config/config_db.php');
 
-include ("../includes/login_eingabefeld.php");
+require_once ('includes/pages/admin_questions.php');
+require_once ('includes/pages/user_messages.php');
 
-echo "<h6>".Get_Text("index_text4")."</h6>";
+session_start();
 
-echo Get_Text("index_text5"). "<br>". $show_SSLCERT;
+sql_connect($config['host'], $config['user'], $config['pw'], $config['db']);
 
-include ("../includes/footer.php");
-?>
+load_auth();
+
+// JSON Authorisierung gewünscht?
+if (isset ($_REQUEST['auth']))
+	json_auth_service();
+
+// Gewünschte Seite/Funktion
+$p = isset ($user) ? "news" : "start";
+if (isset ($_REQUEST['p']))
+	$p = $_REQUEST['p'];
+
+$title = Get_Text($p);
+$content = "";
 
+// Recht dafür vorhanden?
+if (in_array($p, $privileges)) {
+	if ($p == "news") {
+		require_once ('includes/pages/user_news.php');
+		$content = user_news();
+	}
+	elseif ($p == "news_comments") {
+		require_once ('includes/pages/user_news.php');
+		$content = user_news_comments();
+	}
+	elseif ($p == "user_meetings") {
+		require_once ('includes/pages/user_news.php');
+		$content = user_meetings();
+	}
+	elseif ($p == "user_messages") {
+		$content = user_messages();
+	}
+	elseif ($p == "user_questions") {
+		require_once ('includes/pages/user_questions.php');
+		$content = user_questions();
+	}
+	elseif ($p == "user_wakeup") {
+		require_once ('includes/pages/user_wakeup.php');
+		$content = user_wakeup();
+	}
+	elseif ($p == "user_settings") {
+		require_once ('includes/pages/user_settings.php');
+		$content = user_settings();
+	}
+	elseif ($p == "login") {
+		require_once ('includes/pages/guest_login.php');
+		$content = guest_login();
+	}
+	elseif ($p == "register") {
+		require_once ('includes/pages/guest_login.php');
+		$content = guest_register();
+	}
+	elseif ($p == "logout") {
+		require_once ('includes/pages/guest_login.php');
+		$content = guest_logout();
+	}
+	elseif ($p == "admin_questions") {
+		$content = admin_questions();
+	}
+	elseif ($p == "admin_user") {
+		require_once ('includes/pages/admin_user.php');
+		$content = admin_user();
+	}
+	elseif ($p == "admin_news") {
+		require_once ('includes/pages/admin_news.php');
+		$content = admin_news();
+	}
+	elseif ($p == "admin_angel_types") {
+		require_once ('includes/pages/admin_angel_types.php');
+		$content = admin_angel_types();
+	}
+	elseif ($p == "admin_rooms") {
+		require_once ('includes/pages/admin_rooms.php');
+		$content = admin_rooms();
+	}
+	elseif ($p == "admin_groups") {
+		require_once ('includes/pages/admin_groups.php');
+		$content = admin_groups();
+	}
+	elseif ($p == "admin_faq") {
+		require_once ('includes/pages/admin_faq.php');
+		$content = admin_faq();
+	}
+	elseif ($p == "admin_language") {
+		require_once ('includes/pages/admin_language.php');
+		$content = admin_language();
+	}
+	elseif ($p == "admin_import") {
+		require_once ('includes/pages/admin_import.php');
+		$content = admin_import();
+	}
+	elseif ($p == "admin_log") {
+		require_once ('includes/pages/admin_log.php');
+		$content = admin_log();
+	} else {
+		require_once ('includes/pages/guest_start.php');
+		$content = guest_start();
+	}
+}
+elseif ($p == "credits") {
+	require_once ('includes/pages/guest_credits.php');
+	$content = guest_credits();
+}
+elseif ($p == "faq") {
+	require_once ('includes/pages/guest_faq.php');
+	$content = guest_faq();
+} else {
+	// Wenn schon eingeloggt, keine-Berechtigung-Seite anzeigen
+	if (isset ($user)) {
+		$title = Get_Text("no_access_title");
+		$content = Get_Text("no_access_text");
+	} else {
+		// Sonst zur Loginseite leiten
+		header("Location: " . page_link_to("login"));
+	}
+}
 
+// Hinweis für ungelesene Nachrichten
+if (isset ($user) && $p != "user_messages")
+	$content = user_unread_messages() . $content;
+
+// Erzengel Hinweis für unbeantwortete Fragen
+if (isset ($user) && $p != "admin_questions")
+	$content = admin_new_questions() . $content;
+
+echo template_render('../templates/layout.html', array (
+	'theme' => isset ($user) ? $user['color'] : $default_theme,
+	'title' => $title,
+	'menu' => make_menu(),
+	'content' => $content
+));
+
+counter();
+?>
diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php
deleted file mode 100755
index 03aacf79..00000000
--- a/www-ssl/lageplan.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$title = "Index";
-$header = "Lageplan";
-include ("../includes/header.php");
-
-echo "<p>". Get_Text("lageplan_text1"). "</p>";
-echo "<p><img src=\"./pic/lageplan/lageplan.jpg\"/>.";
-
-include ("../includes/footer.php");
-?>
-
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
deleted file mode 100755
index e038be69..00000000
--- a/www-ssl/logout.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-include ("../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);
-
-?>
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
deleted file mode 100755
index 9ce07861..00000000
--- a/www-ssl/makeuser.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?PHP
-$title = "Anmeldung zum Chaos-Engel";
-$header = "";
-$success = "none"; 
-include ("../includes/config.php");
-include ("../includes/header.php");
-include ("../includes/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>". "<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 ("../includes/footer.php");
-?>
-
diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php
deleted file mode 100755
index 99b153e5..00000000
--- a/www-ssl/nonpublic/auth.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?PHP
-header('Content-Type: application/json');
-
-include ("../../includes/config.php");
-include ("../../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'));
-}
-
-
-?>
-
-
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
deleted file mode 100755
index aabcb830..00000000
--- a/www-ssl/nonpublic/einstellungen.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?PHP
-/* Todo: -add if-construct with configvar for user-shirt-settings 
- *      
- *
- */
-$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");?>
-<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>
-
-		<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_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_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_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>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("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"); ?>">
-</form>
-<br>
-
-
-<hr width=\"100%\">
-<?PHP Print_Text(14);?>
-<form action="./einstellungen.php" method="post">
-	<input type="hidden" name="action" value="set">
-	<table>
-	  <tr><td><?PHP Print_Text(15); ?></td><td><input type="password" name="old" size="20"></td></tr>
-	  <tr><td><?PHP Print_Text(16); ?></td><td><input type="password" name="new1" size="20"></td></tr>
-	  <tr><td><?PHP Print_Text(17); ?></td><td><input type="password" name="new2" size="20"></td></tr>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
-</form>
-<br>
-
-
-<hr width="100%">
-<br>
-<?PHP Print_Text(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"); ?>">
-</form>
-<br>
-<hr width="100%">
-<br>
-<?PHP Print_Text(20); ?>
-<form action="./einstellungen.php" method="post">
-        <input type="hidden" name="action" value="sprache">
-	<table>
-	   <tr><td><?PHP Print_Text(21); ?></td>
-	   <td>
-		<select name="language">
-		   <option value="DE" <?php if($_SESSION['Sprache'] == 'DE') { echo "selected"; } ?>>Deutsch</option>
-		   <option value="EN" <?php if($_SESSION['Sprache'] == 'EN') { echo "selected"; } ?>>English</option>
-<?PHP /*		   <option value="NL" <?php if($_SESSION['Sprache'] == 'NL') { echo "selected"; } ?>>Dutch</option>  */?>
-		</select>
-	   </td></tr>
-	</table>
-	<input type="submit" value="<?PHP Print_Text("save"); ?>">
-</form>
-<?PHP 
-
-	
-	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);
-	}
-  } 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 ("../../includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php
deleted file mode 100755
index add50240..00000000
--- a/www-ssl/nonpublic/engelbesprechung.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-$title = "Himmel";
-$header = "Engelbesprechung";
-include ("../../includes/header.php");
-?>
-
-<br>
-
-<?php
-
-$SQL = "SELECT * FROM `News` ORDER BY 'Datum' DESC";
-$Erg = mysql_query($SQL, $con);
-
-// 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>";
-
-    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
deleted file mode 100755
index 5adfb67c..00000000
--- a/www-ssl/nonpublic/faq.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-$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">
-  <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
-
-} 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";
-
-$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 "<hr width=\"99%\">\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);
-
-// anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
-
-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>";
-	}
-}
-
-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";
-$Erg = mysql_query($SQL, $con);
-
-// anzahl zeilen
-$Zeilen  = mysql_num_rows($Erg);
-
-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>";
-	}
-}
-
-include ("../../includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
deleted file mode 100755
index affb571e..00000000
--- a/www-ssl/nonpublic/index.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?PHP
-$title = "Index";
-$header = "Index";
-
-include ("../../includes/config_db.php");
-include ("../../includes/crypt.php");
-
-session_start(); // alte Session - falls vorhanden - wiederherstellen...
-
-function LoginOK()
-{
-	include ("../../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();
-} 
-else
-{ // User ist noch nicht angemeldet 
-	$sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'";
-	$userstring = mysql_query($sql, $con);
-
-	// 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
-} 
-include ("../../includes/header.php");
-if( isset($ErrorText))
-	echo "<h2>". Get_Text($ErrorText). "</h2><br>\n";
-include ("../../includes/login_eingabefeld.php");
-include ("../../includes/footer.php");
-
-?>
-
-
diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php
deleted file mode 100755
index 7d3bb7fb..00000000
--- a/www-ssl/nonpublic/messages.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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 "\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 ("../../includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php
index d5e02dcd..5d7b5da3 100755..100644
--- a/www-ssl/nonpublic/myschichtplan.php
+++ b/www-ssl/nonpublic/myschichtplan.php
@@ -1,185 +1,178 @@
 <?php
-$title = "Himmel";
-$header = "Mein Schichtplan";
 
-include ("../../includes/header.php");
-include ("../../includes/funktionen.php");
-include ("../../includes/funktion_schichtplan.php");
-include ("../../includes/funktion_schichtplan_array.php");
+// Eigener Schichtplan
+require_once ('../bootstrap.php');
 
+$title = "Himmel";
+$header = "Mein Schichtplan";
 
-If( !IsSet($_GET["action"]) ) 
-{
+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>\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";
+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"]) )
+
+	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 "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "\" method=\"GET\" >";
 
 		echo "Liste von <select name=\"UIDs\">\n";
-		$usql="SELECT * FROM `User` ORDER BY `Nick`";
+
+		$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";
+
+		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>
-			<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++ )
-	{
+	$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";
-	
+		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];
+		$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;
+		$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";
-	
+		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";
+	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";
-}
+	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);
 
-} 
-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";
+		$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_mywake_add_ko"). "\n";
+			echo " ..." . Get_Text("pub_myshift_EditSave_KO") . "\n";
+		SetHeaderGo2Back();
 	}
-	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 "\t ...". Get_Text("pub_myshift_EditSave_OK"). "\n";
-	else
-		echo "\t ...". Get_Text("pub_myshift_EditSave_KO"). "\n";
-	SetHeaderGo2Back();	
-    }
 }
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php
index 5d572520..ff74fef0 100755..100644
--- a/www-ssl/nonpublic/myschichtplan_ical.php
+++ b/www-ssl/nonpublic/myschichtplan_ical.php
@@ -1,52 +1,51 @@
 <?php
-include ("../../includes/header_start.php");
+require_once ('../bootstrap.php');
 
-include ("../../includes/funktion_schichtplan_array.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";
+echo "X-WR-CALNAME;VALUE=TEXT:" . "Himmel - Schichtplan\n";
 
-for( $i=0; $i<mysql_num_rows( $erg ); $i++ ) 
-{
+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 "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 "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 "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 "DESCRIPTION:" . str_replace(',', '\\,', mysql_result($erg, $i, "Man")) . "\n";
 	echo "ACTION:DISPLAY\n";
 	echo "END:VALARM\n";
 	echo "END:VEVENT\n";
 }
 echo "END:VCALENDAR\n";
 
-include( "../../includes/funktion_counter.php");
-
+include ("includes/funktion_counter.php");
 ?>
 
diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php
deleted file mode 100755
index 2f04d22c..00000000
--- a/www-ssl/nonpublic/news.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$title = "Himmel";
-$header = "News";
-include ("../../includes/header.php");
-
-
-echo "<a href=\"#Neu\">".Get_Text(3)."</a>";
-include ("news_output.php");
-
-include ("../../includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php
deleted file mode 100755
index 710d33dc..00000000
--- a/www-ssl/nonpublic/news_comments.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-$title = "Kommentare zu den News";
-$header = "Kommentar";
-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">
-	<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
-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>
-<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"]; ?>">
-<table>
- <tr>
-  <td align="right" valign="top">Text:</td>
-  <td><textarea name="text" cols="50" rows="10"></textarea></td>
- </tr>
-</table>
-<br>
-<input type="submit" value="sichern...">
-</form>
-
-<?PHP
-
-
-} 
-else 
-{
-  echo "Fehlerhafter Aufruf!";
-}
-
-include ("../../includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php
deleted file mode 100755
index e1afc067..00000000
--- a/www-ssl/nonpublic/news_output.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-if( isset( $_POST["text"]) && isset( $_POST["betreff"]) && IsSet( $_POST["date"]) ) 
-{
-  if( !isset( $_POST["treffen"])) 
-  	$_POST["treffen"] = 0;
-  $SQL = "INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) ".
-			"VALUES ('". $_POST["date"]. "', '". $_POST["betreff"]. "', '". $_POST["text"]. "', '".$_SESSION['UID'].
-			"', '". $_POST["treffen"]. "');";
-  $Erg = mysql_query($SQL, $con);
-  if ($Erg == 1)
-  	Print_Text(4);
-}
-
-if( !IsSet( $_GET["news_begin"]))
-	$_GET["news_begin"]=0;
-	
-if( !IsSet( $_GET["DISPLAY_NEWS"]))
-	$_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);
-
-// anzahl zeilen
-$news_rows  = mysql_num_rows($Erg);
-
-for ($n = 0 ; $n < $news_rows ; $n++) 
-{
-
-  if (mysql_result($Erg, $n, "Treffen") == 0) 
-  	echo "<p class='question'>";
-  else 
-	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 "<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"));
-  echo "</p>\n";
-  echo "<p class='answer'>". ReplaceSmilies(nl2br(mysql_result($Erg, $n, "Text"))) ."</p>\n";
-  $RefID=mysql_result($Erg, $n, "ID");
-  $countSQL="SELECT COUNT(*) FROM `news_comments` WHERE `Refid`='$RefID'";
-  $countErg = mysql_query($countSQL, $con);
-  $countcom = mysql_result($countErg, 0, "COUNT(*)");
-  echo "<p class='comment' align='right'><a href=\"./news_comments.php?nid=$RefID\">$countcom comments</a></p>\n\n";
-}
-
-echo "<div align=\"center\">\n\n";
-$rowerg = mysql_query("SELECT * FROM `News`", $con);
-$rows  = mysql_num_rows($rowerg);
-$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; ";
-	}
-}
-echo "</div>";
-
-?>
-
-<br>
-<hr>
-<h4><?PHP Print_Text(6); ?></h4>
-<a name="Neu">&nbsp;</a>
-
-<form action="<?PHP echo $ENGEL_ROOT ?>nonpublic/news.php" method="post">
-<?PHP 
-// Datum mit uebergeben, um doppelte Eintraege zu verhindern 
-// (Reload nach dem Eintragen!)
-?>
-<input type="hidden" name="date" value="<?PHP echo date("Y-m-d H:i:s"); ?>">
-<table>
- <tr>
-  <td align="right"><?PHP Print_Text(7); ?></td>
-  <td><input type="text" name="betreff" size="60"></td>
- </tr>
- <tr>
-  <td align="right"><?PHP Print_Text(8); ?></td>
-  <td><textarea name="text" cols="50" rows="10"></textarea></td>
- </tr>
-
-<?PHP
-if ($_SESSION['CVS']["nonpublic/newsAddMeting"] == "Y") {
-?>
- <tr>
-  <td align="right"><?PHP Print_Text(9); ?></td>
-  <td><input type="checkbox" name="treffen" size="1" value="1"></td>
- </tr>
-<?PHP
-}
-?>
-</table>
-<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
index 5637d2d6..9c99c6ca 100755..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 ("../../includes/funktion_schichtplan_array.php");
+require_once ('../bootstrap.php');
 
-function Printlink( $Datum)
-{
+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)) 
+	if (IsSet ($raum))
 		echo "&raum=$raum";
 	echo "'>$Datum</a></li>\n";
 } //function Printlink(
 
-if( isset ($VeranstaltungsTage))
-	foreach( $VeranstaltungsTage as $k => $v)
-		Printlink( $v);
-
-
+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 1b1b2d08..92443e13 100755..100644
--- a/www-ssl/nonpublic/schichtplan.2.php
+++ b/www-ssl/nonpublic/schichtplan.2.php
@@ -1,20 +1,20 @@
 <h4>&nbsp;Raum&uuml;bersicht</h4>
 <?php
+require_once ('../bootstrap.php');
 
-include ("../../includes/funktion_schichtplan_array.php");
+include ("includes/funktion_schichtplan_aray.php");
 
-if( isset ($Room))
-    foreach( $Room as $RoomEntry  )
-    {
-	if(isset($ausdatum))
-	  echo "\t<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=". $RoomEntry["RID"]. "'>".
-	       $RoomEntry["Name"]. "</a></li>\n";
-	else
-	  echo "\t<li><a href='./schichtplan.php?raum=". $RoomEntry["RID"]. "'>".
-	       $RoomEntry["Name"]. "</a></li>\n";
-    }
-echo "<br>";
-if(isset($ausdatum))
+if (isset ($Room))
+	foreach ($Room as $RoomEntry) {
+		if (isset ($ausdatum))
+			echo "\t<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=" . $RoomEntry["RID"] . "'>" .
+			$RoomEntry["Name"] . "</a></li>\n";
+		else
+			echo "\t<li><a href='./schichtplan.php?raum=" . $RoomEntry["RID"] . "'>" .
+			$RoomEntry["Name"] . "</a></li>\n";
+	}
+echo "<br />";
+if (isset ($ausdatum))
 	echo "<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=-1'>alle</a></li>";
 else
 	echo "<li><a href='./schichtplan.php?raum=-1'>alle</a></li>";
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php
index aff33abd..2b9038a3 100755..100644
--- a/www-ssl/nonpublic/schichtplan.php
+++ b/www-ssl/nonpublic/schichtplan.php
@@ -1,77 +1,83 @@
 <?php
+require_once ('../bootstrap.php');
+
 $title = "Himmel";
 $header = "Schichtpl&auml;ne";
 $submenus = 2;
 
-if( isset($_GET["ausdatum"]))
+if (isset ($_GET["ausdatum"]))
 	$ausdatum = $_GET["ausdatum"];
-if( isset($_GET["raum"]))
-{
+if (isset ($_GET["raum"])) {
 	$raum = $_GET["raum"];
-	if( $raum==-1 &&  isset($_GET["show"]))
-	{
+
+	if ($raum == -1 && isset ($_GET["show"])) {
 		$raum = "";
-		foreach ($_GET as $k => $v) 
-		{	
-			if( substr($k, 0, 5) == "raum_") 
-			{
-				$raum = $raum. ";". $v;
+		foreach ($_GET as $k => $v) {
+			if (substr($k, 0, 5) == "raum_") {
+				$raum = $raum . ";" . $v;
 			}
 		}
 	}
 }
 
+<<<<<<< HEAD
 include ("../../includes/header.php");
 include ("../../includes/funktionen.php");
 include ("../../includes/funktion_schichtplan.php");
 include ("../../includes/funktion_schichtplan_array.php");
 ?>
+=======
+include ("includes/header.php");
+include ("includes/funktionen.php");
+include ("includes/funktion_schichtplan.php");
+include ("includes/funktion_schichtplan_aray.php");
+>>>>>>> spezial_includes_camp
 
-<?PHP echo Get_Text("Hello").$_SESSION['Nick'].",<br>".
-     	   Get_Text("pub_schicht_beschreibung"). "<br><br>";
+echo Get_Text("Hello") . $_SESSION['Nick'] . ",<br />" .
+Get_Text("pub_schicht_beschreibung") . "<br /><br />";
+
+function ShowSwitchDay() {
+	global $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum;
 
-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";
-		}
+
+	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`";
+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) {
+		$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);
+	if (mysql_num_rows($Erg) > 0)
+		$ausdatum = substr(mysql_result($Erg, 0, "DateS"), 0, 10);
 	else
-		$ausdatum = gmdate("Y-m-d", time()+$gmdateOffset);
+		$ausdatum = gmdate("Y-m-d", time() + $gmdateOffset);
 
 }
 
+if (!isset ($raum)) {
+	// Ausgabe wenn kein Raum Ausgew�hlt:
+	echo Get_Text("pub_schicht_auswahl_raeume") . "<br /><br />\n";
 
+<<<<<<< HEAD
 
 if ( !isset($raum) )
 {
@@ -80,11 +86,13 @@ if ( !isset($raum) )
 
 	if( isset($Room))
 	{
+=======
+	if (isset ($Room)) {
+>>>>>>> spezial_includes_camp
 		echo "<form action=\"./schichtplan.php\" method=\"GET\">\n";
-		foreach( $Room as $RoomEntry  )
-		{
-			echo "\t<li><input type=\"checkbox\" name=\"raum_". $RoomEntry["RID"]. "\" value=\"". $RoomEntry["RID"]." \">";
-			echo "<a href='./schichtplan.php?ausdatum=$ausdatum&raum=". $RoomEntry["RID"]. "'>". $RoomEntry["Name"]. "</a>";
+		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\">";
@@ -93,15 +101,15 @@ if ( !isset($raum) )
 		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 "<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";
-	
-	
+	echo Get_Text("pub_schicht_EmptyShifts") . "\n";
+
 	// zeit die naesten freien schichten
+<<<<<<< HEAD
 	showEmptyShifts(); 
 } 
 else 
@@ -113,6 +121,16 @@ else
 	else 
 		echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. 
 		     Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "<br><br>";
+=======
+	showEmptyShifts();
+} else { // Wenn einraum Ausgew�hlt ist:
+	if ($raum == -1)
+		echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . ":<br /><br />";
+	elseif (substr($raum, 0, 1) == ";") echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . ":<br /><br />";
+	else
+		echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum .
+		Get_Text("pub_schicht_Anzeige_2") . $RoomID[$raum] . "<br /><br />";
+>>>>>>> spezial_includes_camp
 
 	ShowSwitchDay();
 
@@ -121,85 +139,82 @@ else
 	echo "\t\t<td>start</td>\n";
 
 	//Ausgabe Spalten �berschrift
+<<<<<<< HEAD
 	if( $raum == -1 )
 	{
 		if( isset($Room))
 		   foreach( $Room as $RoomEntry  )
 			if (SummRoomShifts($RoomEntry["RID"]) > 0)
 				echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n";
+=======
+	if ($raum == -1) {
+		if (isset ($Room))
+			foreach ($Room as $RoomEntry)
+				if (SummRoomShifts($RoomEntry["RID"]) > 0)
+					echo "\t\t<th>" . $RoomEntry["Name"] . "</th>\n";
+>>>>>>> spezial_includes_camp
 	}
-	elseif( substr( $raum, 0, 1) == ";" )
-	{
-		$words = preg_split("/;/", $raum); 
-		foreach ($words as $word)
-		{
-			if( strlen(trim($word)) > 0)
-				echo "\t\t<th>". $RoomID[trim($word)]. "</th>\n";
+	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";
-	
+	} 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";
+	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:";
+			$SpaltenTemp = "";
+			$SpaltenTemp .= ($i < 10) ? "0$i:" : "$i:";
 
 			//Minute
-			$TempMinuten = (($j*60) / $GlobalZeileProStunde);
-			$SpaltenTemp.= ($TempMinuten<10)? "0$TempMinuten": "$TempMinuten";
-				
+			$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) )
+			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;
+			$Spalten[$i * $GlobalZeileProStunde + $j] .= $SpaltenTemp;
 		}
-	
-	if( $raum == -1 )
-	{
-		if( isset($Room))
-		    foreach( $Room as $RoomEntry  )
-			if (SummRoomShifts($RoomEntry["RID"]) > 0)
-				CreateRoomShifts( $RoomEntry["RID"] );
+
+	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 );
-		    }
+	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 );
-	
+	} else
+		CreateRoomShifts($raum);
+
 	//Ausageb Zeilen
-	for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) 
-	{
-		echo $Spalten[$i]."\t</tr>\n";
+	for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) {
+		echo $Spalten[$i] . "\t</tr>\n";
 	}
 
-  	echo "</table>\n";
-	
+	echo "</table>\n";
+
 	ShowSwitchDay();
 
-}//if (isset($raum))
+} //if (isset($raum))
 
-echo "<a href=\"". $_SESSION["newurl"]. "&Icon=0\">@</a>";
+echo "<a href=\"" . $_SESSION["newurl"] . "&Icon=0\">@</a>";
 
-include ("../../includes/footer.php");
+include ("includes/footer.php");
 ?>
diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php
index 50caf5c7..1bbcdc4b 100755..100644
--- a/www-ssl/nonpublic/schichtplan_add.php
+++ b/www-ssl/nonpublic/schichtplan_add.php
@@ -1,126 +1,114 @@
 <?php
+require_once ('../bootstrap.php');
+
 $title = "Himmel";
 $header = "Schichtpl&auml;ne";
-include ("../../includes/header.php");
-include ("../../includes/funktion_schichtplan.php");
-include ("../../includes/funktion_schichtplan_array.php");
-include ("../../includes/funktionen.php");
+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"])) {
+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);
+
+	// 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
-	{
+	$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 keien rechte definiert sind
-	if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ]))
-		$_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y";
-	
-
+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")
-	{
+	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";
 
-		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"]. "')";
+		$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 "<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");
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php
index cd410fc2..269660e1 100755..100644
--- a/www-ssl/nonpublic/schichtplan_beamer.php
+++ b/www-ssl/nonpublic/schichtplan_beamer.php
@@ -1,61 +1,59 @@
 <?php
-include ("../../includes/header_start.php");
+require_once ('../bootstrap.php');
 
-include ("../../includes/funktionen.php");
-include ("../../includes/funktion_schichtplan_beamer.php");
+include "includes/header_start.php";
+include "includes/funktionen.php";
+include "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>
+
+<?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
+  <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);
-	
-
-	//entfernt leere zeilen
-	if( $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\t<td>_". $RoomEntry["Name"]. "_</td>\n". $Out . "</tr>\n";
-	
+		$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
deleted file mode 100755
index 7ca7460e..00000000
--- a/www-ssl/nonpublic/waeckliste.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$title = "Himmel";
-$header = "Weckdienst - Liste der zu weckenden Engel";
-
-include ("../../includes/header.php");
-
-?>
-
-<?PHP echo Get_Text("Hello"). $_SESSION['Nick'].",<br>\n".
-     	   Get_Text("pub_waeckliste_Text1")?>
-<br><br>
-<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
-  $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>
-		<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 ("../../includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php
deleted file mode 100755
index 30ef689b..00000000
--- a/www-ssl/nonpublic/wecken.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$title = "Himmel";
-$header = "Weckdienst";
-
-include ("../../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); 
-	}
-
-echo Get_Text("Hello").$_SESSION['Nick'].",<br>".Get_Text("pub_wake_beschreibung"). "<br><br>\n\n";
-
-
-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>
-						
-<?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);
-?>
-	<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>
-
-<?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>
- </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>
- </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>
- </tr>
-</table>
-<input type="submit" name="eintragen" value="<?PHP echo Get_Text("pub_wake_bouton"); ?>">
-</form>
-<?PHP
-include ("../../includes/footer.php");
-?>
diff --git a/www-ssl/pic/avatar/avatar1.gif b/www-ssl/pic/avatar/avatar1.gif
index 1404f299..1404f299 100755..100644
--- a/www-ssl/pic/avatar/avatar1.gif
+++ b/www-ssl/pic/avatar/avatar1.gif
diff --git a/www-ssl/pic/avatar/avatar10.gif b/www-ssl/pic/avatar/avatar10.gif
index 6ef61330..6ef61330 100755..100644
--- a/www-ssl/pic/avatar/avatar10.gif
+++ b/www-ssl/pic/avatar/avatar10.gif
diff --git a/www-ssl/pic/avatar/avatar100.gif b/www-ssl/pic/avatar/avatar100.gif
index 1e00f0d3..1e00f0d3 100755..100644
--- a/www-ssl/pic/avatar/avatar100.gif
+++ b/www-ssl/pic/avatar/avatar100.gif
diff --git a/www-ssl/pic/avatar/avatar101.gif b/www-ssl/pic/avatar/avatar101.gif
index 15a41959..15a41959 100755..100644
--- a/www-ssl/pic/avatar/avatar101.gif
+++ b/www-ssl/pic/avatar/avatar101.gif
diff --git a/www-ssl/pic/avatar/avatar102.gif b/www-ssl/pic/avatar/avatar102.gif
index 325d9173..325d9173 100755..100644
--- a/www-ssl/pic/avatar/avatar102.gif
+++ b/www-ssl/pic/avatar/avatar102.gif
diff --git a/www-ssl/pic/avatar/avatar103.gif b/www-ssl/pic/avatar/avatar103.gif
index c842fcdf..c842fcdf 100755..100644
--- a/www-ssl/pic/avatar/avatar103.gif
+++ b/www-ssl/pic/avatar/avatar103.gif
diff --git a/www-ssl/pic/avatar/avatar104.gif b/www-ssl/pic/avatar/avatar104.gif
index 83483253..83483253 100755..100644
--- a/www-ssl/pic/avatar/avatar104.gif
+++ b/www-ssl/pic/avatar/avatar104.gif
diff --git a/www-ssl/pic/avatar/avatar105.gif b/www-ssl/pic/avatar/avatar105.gif
index 1cdc0d10..1cdc0d10 100755..100644
--- a/www-ssl/pic/avatar/avatar105.gif
+++ b/www-ssl/pic/avatar/avatar105.gif
diff --git a/www-ssl/pic/avatar/avatar106.gif b/www-ssl/pic/avatar/avatar106.gif
index be773e15..be773e15 100755..100644
--- a/www-ssl/pic/avatar/avatar106.gif
+++ b/www-ssl/pic/avatar/avatar106.gif
diff --git a/www-ssl/pic/avatar/avatar107.gif b/www-ssl/pic/avatar/avatar107.gif
index b111f9c8..b111f9c8 100755..100644
--- a/www-ssl/pic/avatar/avatar107.gif
+++ b/www-ssl/pic/avatar/avatar107.gif
diff --git a/www-ssl/pic/avatar/avatar108.gif b/www-ssl/pic/avatar/avatar108.gif
index 12a21a94..12a21a94 100755..100644
--- a/www-ssl/pic/avatar/avatar108.gif
+++ b/www-ssl/pic/avatar/avatar108.gif
diff --git a/www-ssl/pic/avatar/avatar109.gif b/www-ssl/pic/avatar/avatar109.gif
index 32534f83..32534f83 100755..100644
--- a/www-ssl/pic/avatar/avatar109.gif
+++ b/www-ssl/pic/avatar/avatar109.gif
diff --git a/www-ssl/pic/avatar/avatar11.gif b/www-ssl/pic/avatar/avatar11.gif
index 199b085d..199b085d 100755..100644
--- a/www-ssl/pic/avatar/avatar11.gif
+++ b/www-ssl/pic/avatar/avatar11.gif
diff --git a/www-ssl/pic/avatar/avatar110.gif b/www-ssl/pic/avatar/avatar110.gif
index e2c70f54..e2c70f54 100755..100644
--- a/www-ssl/pic/avatar/avatar110.gif
+++ b/www-ssl/pic/avatar/avatar110.gif
diff --git a/www-ssl/pic/avatar/avatar111.gif b/www-ssl/pic/avatar/avatar111.gif
index f197ea67..f197ea67 100755..100644
--- a/www-ssl/pic/avatar/avatar111.gif
+++ b/www-ssl/pic/avatar/avatar111.gif
diff --git a/www-ssl/pic/avatar/avatar112.gif b/www-ssl/pic/avatar/avatar112.gif
index ff4ec284..ff4ec284 100755..100644
--- a/www-ssl/pic/avatar/avatar112.gif
+++ b/www-ssl/pic/avatar/avatar112.gif
diff --git a/www-ssl/pic/avatar/avatar113.gif b/www-ssl/pic/avatar/avatar113.gif
index 1dbd37aa..1dbd37aa 100755..100644
--- a/www-ssl/pic/avatar/avatar113.gif
+++ b/www-ssl/pic/avatar/avatar113.gif
diff --git a/www-ssl/pic/avatar/avatar114.gif b/www-ssl/pic/avatar/avatar114.gif
index 6b4b107e..6b4b107e 100755..100644
--- a/www-ssl/pic/avatar/avatar114.gif
+++ b/www-ssl/pic/avatar/avatar114.gif
diff --git a/www-ssl/pic/avatar/avatar115.gif b/www-ssl/pic/avatar/avatar115.gif
index 2af52d2b..2af52d2b 100755..100644
--- a/www-ssl/pic/avatar/avatar115.gif
+++ b/www-ssl/pic/avatar/avatar115.gif
diff --git a/www-ssl/pic/avatar/avatar116.gif b/www-ssl/pic/avatar/avatar116.gif
index 7db21919..7db21919 100755..100644
--- a/www-ssl/pic/avatar/avatar116.gif
+++ b/www-ssl/pic/avatar/avatar116.gif
diff --git a/www-ssl/pic/avatar/avatar117.gif b/www-ssl/pic/avatar/avatar117.gif
index 5cb57d35..5cb57d35 100755..100644
--- a/www-ssl/pic/avatar/avatar117.gif
+++ b/www-ssl/pic/avatar/avatar117.gif
diff --git a/www-ssl/pic/avatar/avatar118.gif b/www-ssl/pic/avatar/avatar118.gif
index fb1e43b5..fb1e43b5 100755..100644
--- a/www-ssl/pic/avatar/avatar118.gif
+++ b/www-ssl/pic/avatar/avatar118.gif
diff --git a/www-ssl/pic/avatar/avatar119.gif b/www-ssl/pic/avatar/avatar119.gif
index 6a78fee5..6a78fee5 100755..100644
--- a/www-ssl/pic/avatar/avatar119.gif
+++ b/www-ssl/pic/avatar/avatar119.gif
diff --git a/www-ssl/pic/avatar/avatar12.gif b/www-ssl/pic/avatar/avatar12.gif
index c6ee6937..c6ee6937 100755..100644
--- a/www-ssl/pic/avatar/avatar12.gif
+++ b/www-ssl/pic/avatar/avatar12.gif
diff --git a/www-ssl/pic/avatar/avatar120.gif b/www-ssl/pic/avatar/avatar120.gif
index 278c5b14..278c5b14 100755..100644
--- a/www-ssl/pic/avatar/avatar120.gif
+++ b/www-ssl/pic/avatar/avatar120.gif
diff --git a/www-ssl/pic/avatar/avatar121.gif b/www-ssl/pic/avatar/avatar121.gif
index 77bb5793..77bb5793 100755..100644
--- a/www-ssl/pic/avatar/avatar121.gif
+++ b/www-ssl/pic/avatar/avatar121.gif
diff --git a/www-ssl/pic/avatar/avatar122.gif b/www-ssl/pic/avatar/avatar122.gif
index 67c03bfd..67c03bfd 100755..100644
--- a/www-ssl/pic/avatar/avatar122.gif
+++ b/www-ssl/pic/avatar/avatar122.gif
diff --git a/www-ssl/pic/avatar/avatar123.gif b/www-ssl/pic/avatar/avatar123.gif
index 351c7ee0..351c7ee0 100755..100644
--- a/www-ssl/pic/avatar/avatar123.gif
+++ b/www-ssl/pic/avatar/avatar123.gif
diff --git a/www-ssl/pic/avatar/avatar124.gif b/www-ssl/pic/avatar/avatar124.gif
index 13a090bc..13a090bc 100755..100644
--- a/www-ssl/pic/avatar/avatar124.gif
+++ b/www-ssl/pic/avatar/avatar124.gif
diff --git a/www-ssl/pic/avatar/avatar125.gif b/www-ssl/pic/avatar/avatar125.gif
index e4338b9f..e4338b9f 100755..100644
--- a/www-ssl/pic/avatar/avatar125.gif
+++ b/www-ssl/pic/avatar/avatar125.gif
diff --git a/www-ssl/pic/avatar/avatar126.gif b/www-ssl/pic/avatar/avatar126.gif
index 80759725..80759725 100755..100644
--- a/www-ssl/pic/avatar/avatar126.gif
+++ b/www-ssl/pic/avatar/avatar126.gif
diff --git a/www-ssl/pic/avatar/avatar127.gif b/www-ssl/pic/avatar/avatar127.gif
index e3c7e056..e3c7e056 100755..100644
--- a/www-ssl/pic/avatar/avatar127.gif
+++ b/www-ssl/pic/avatar/avatar127.gif
diff --git a/www-ssl/pic/avatar/avatar128.gif b/www-ssl/pic/avatar/avatar128.gif
index fb00ebd9..fb00ebd9 100755..100644
--- a/www-ssl/pic/avatar/avatar128.gif
+++ b/www-ssl/pic/avatar/avatar128.gif
diff --git a/www-ssl/pic/avatar/avatar129.gif b/www-ssl/pic/avatar/avatar129.gif
index 40651db7..40651db7 100755..100644
--- a/www-ssl/pic/avatar/avatar129.gif
+++ b/www-ssl/pic/avatar/avatar129.gif
diff --git a/www-ssl/pic/avatar/avatar13.gif b/www-ssl/pic/avatar/avatar13.gif
index 8328c337..8328c337 100755..100644
--- a/www-ssl/pic/avatar/avatar13.gif
+++ b/www-ssl/pic/avatar/avatar13.gif
diff --git a/www-ssl/pic/avatar/avatar130.gif b/www-ssl/pic/avatar/avatar130.gif
index 45faa378..45faa378 100755..100644
--- a/www-ssl/pic/avatar/avatar130.gif
+++ b/www-ssl/pic/avatar/avatar130.gif
diff --git a/www-ssl/pic/avatar/avatar131.gif b/www-ssl/pic/avatar/avatar131.gif
index 92cff06c..92cff06c 100755..100644
--- a/www-ssl/pic/avatar/avatar131.gif
+++ b/www-ssl/pic/avatar/avatar131.gif
diff --git a/www-ssl/pic/avatar/avatar132.gif b/www-ssl/pic/avatar/avatar132.gif
index 8835d905..8835d905 100755..100644
--- a/www-ssl/pic/avatar/avatar132.gif
+++ b/www-ssl/pic/avatar/avatar132.gif
diff --git a/www-ssl/pic/avatar/avatar133.gif b/www-ssl/pic/avatar/avatar133.gif
index 15abbcbe..15abbcbe 100755..100644
--- a/www-ssl/pic/avatar/avatar133.gif
+++ b/www-ssl/pic/avatar/avatar133.gif
diff --git a/www-ssl/pic/avatar/avatar134.gif b/www-ssl/pic/avatar/avatar134.gif
index f559359f..f559359f 100755..100644
--- a/www-ssl/pic/avatar/avatar134.gif
+++ b/www-ssl/pic/avatar/avatar134.gif
diff --git a/www-ssl/pic/avatar/avatar135.gif b/www-ssl/pic/avatar/avatar135.gif
index d9a07c47..d9a07c47 100755..100644
--- a/www-ssl/pic/avatar/avatar135.gif
+++ b/www-ssl/pic/avatar/avatar135.gif
diff --git a/www-ssl/pic/avatar/avatar136.gif b/www-ssl/pic/avatar/avatar136.gif
index e7f9f76c..e7f9f76c 100755..100644
--- a/www-ssl/pic/avatar/avatar136.gif
+++ b/www-ssl/pic/avatar/avatar136.gif
diff --git a/www-ssl/pic/avatar/avatar137.gif b/www-ssl/pic/avatar/avatar137.gif
index b62b374b..b62b374b 100755..100644
--- a/www-ssl/pic/avatar/avatar137.gif
+++ b/www-ssl/pic/avatar/avatar137.gif
diff --git a/www-ssl/pic/avatar/avatar138.gif b/www-ssl/pic/avatar/avatar138.gif
index 49c44308..49c44308 100755..100644
--- a/www-ssl/pic/avatar/avatar138.gif
+++ b/www-ssl/pic/avatar/avatar138.gif
diff --git a/www-ssl/pic/avatar/avatar139.gif b/www-ssl/pic/avatar/avatar139.gif
index 4281e84a..4281e84a 100755..100644
--- a/www-ssl/pic/avatar/avatar139.gif
+++ b/www-ssl/pic/avatar/avatar139.gif
diff --git a/www-ssl/pic/avatar/avatar14.gif b/www-ssl/pic/avatar/avatar14.gif
index 1edaa2ca..1edaa2ca 100755..100644
--- a/www-ssl/pic/avatar/avatar14.gif
+++ b/www-ssl/pic/avatar/avatar14.gif
diff --git a/www-ssl/pic/avatar/avatar140.gif b/www-ssl/pic/avatar/avatar140.gif
index b058941a..b058941a 100755..100644
--- a/www-ssl/pic/avatar/avatar140.gif
+++ b/www-ssl/pic/avatar/avatar140.gif
diff --git a/www-ssl/pic/avatar/avatar141.gif b/www-ssl/pic/avatar/avatar141.gif
index 33def8f5..33def8f5 100755..100644
--- a/www-ssl/pic/avatar/avatar141.gif
+++ b/www-ssl/pic/avatar/avatar141.gif
diff --git a/www-ssl/pic/avatar/avatar142.gif b/www-ssl/pic/avatar/avatar142.gif
index 416e7c26..416e7c26 100755..100644
--- a/www-ssl/pic/avatar/avatar142.gif
+++ b/www-ssl/pic/avatar/avatar142.gif
diff --git a/www-ssl/pic/avatar/avatar143.gif b/www-ssl/pic/avatar/avatar143.gif
index 18ee70d9..18ee70d9 100755..100644
--- a/www-ssl/pic/avatar/avatar143.gif
+++ b/www-ssl/pic/avatar/avatar143.gif
diff --git a/www-ssl/pic/avatar/avatar144.gif b/www-ssl/pic/avatar/avatar144.gif
index e322ac57..e322ac57 100755..100644
--- a/www-ssl/pic/avatar/avatar144.gif
+++ b/www-ssl/pic/avatar/avatar144.gif
diff --git a/www-ssl/pic/avatar/avatar145.gif b/www-ssl/pic/avatar/avatar145.gif
index 5f047a5f..5f047a5f 100755..100644
--- a/www-ssl/pic/avatar/avatar145.gif
+++ b/www-ssl/pic/avatar/avatar145.gif
diff --git a/www-ssl/pic/avatar/avatar146.gif b/www-ssl/pic/avatar/avatar146.gif
index 3d2fe843..3d2fe843 100755..100644
--- a/www-ssl/pic/avatar/avatar146.gif
+++ b/www-ssl/pic/avatar/avatar146.gif
diff --git a/www-ssl/pic/avatar/avatar147.gif b/www-ssl/pic/avatar/avatar147.gif
index d1d54f74..d1d54f74 100755..100644
--- a/www-ssl/pic/avatar/avatar147.gif
+++ b/www-ssl/pic/avatar/avatar147.gif
diff --git a/www-ssl/pic/avatar/avatar148.gif b/www-ssl/pic/avatar/avatar148.gif
index 0e715ed8..0e715ed8 100755..100644
--- a/www-ssl/pic/avatar/avatar148.gif
+++ b/www-ssl/pic/avatar/avatar148.gif
diff --git a/www-ssl/pic/avatar/avatar149.gif b/www-ssl/pic/avatar/avatar149.gif
index 9cbe72c6..9cbe72c6 100755..100644
--- a/www-ssl/pic/avatar/avatar149.gif
+++ b/www-ssl/pic/avatar/avatar149.gif
diff --git a/www-ssl/pic/avatar/avatar15.gif b/www-ssl/pic/avatar/avatar15.gif
index d197e82a..d197e82a 100755..100644
--- a/www-ssl/pic/avatar/avatar15.gif
+++ b/www-ssl/pic/avatar/avatar15.gif
diff --git a/www-ssl/pic/avatar/avatar150.gif b/www-ssl/pic/avatar/avatar150.gif
index b790d296..b790d296 100755..100644
--- a/www-ssl/pic/avatar/avatar150.gif
+++ b/www-ssl/pic/avatar/avatar150.gif
diff --git a/www-ssl/pic/avatar/avatar151.gif b/www-ssl/pic/avatar/avatar151.gif
index afc3b333..afc3b333 100755..100644
--- a/www-ssl/pic/avatar/avatar151.gif
+++ b/www-ssl/pic/avatar/avatar151.gif
diff --git a/www-ssl/pic/avatar/avatar152.gif b/www-ssl/pic/avatar/avatar152.gif
index e30287d6..e30287d6 100755..100644
--- a/www-ssl/pic/avatar/avatar152.gif
+++ b/www-ssl/pic/avatar/avatar152.gif
diff --git a/www-ssl/pic/avatar/avatar153.gif b/www-ssl/pic/avatar/avatar153.gif
index 82bb1775..82bb1775 100755..100644
--- a/www-ssl/pic/avatar/avatar153.gif
+++ b/www-ssl/pic/avatar/avatar153.gif
diff --git a/www-ssl/pic/avatar/avatar154.gif b/www-ssl/pic/avatar/avatar154.gif
index 872008da..872008da 100755..100644
--- a/www-ssl/pic/avatar/avatar154.gif
+++ b/www-ssl/pic/avatar/avatar154.gif
diff --git a/www-ssl/pic/avatar/avatar155.gif b/www-ssl/pic/avatar/avatar155.gif
index 51931858..51931858 100755..100644
--- a/www-ssl/pic/avatar/avatar155.gif
+++ b/www-ssl/pic/avatar/avatar155.gif
diff --git a/www-ssl/pic/avatar/avatar156.gif b/www-ssl/pic/avatar/avatar156.gif
index 8b3781ff..8b3781ff 100755..100644
--- a/www-ssl/pic/avatar/avatar156.gif
+++ b/www-ssl/pic/avatar/avatar156.gif
diff --git a/www-ssl/pic/avatar/avatar157.gif b/www-ssl/pic/avatar/avatar157.gif
index 7c8667cf..7c8667cf 100755..100644
--- a/www-ssl/pic/avatar/avatar157.gif
+++ b/www-ssl/pic/avatar/avatar157.gif
diff --git a/www-ssl/pic/avatar/avatar158.gif b/www-ssl/pic/avatar/avatar158.gif
index ce3472cd..ce3472cd 100755..100644
--- a/www-ssl/pic/avatar/avatar158.gif
+++ b/www-ssl/pic/avatar/avatar158.gif
diff --git a/www-ssl/pic/avatar/avatar159.gif b/www-ssl/pic/avatar/avatar159.gif
index c54f2b29..c54f2b29 100755..100644
--- a/www-ssl/pic/avatar/avatar159.gif
+++ b/www-ssl/pic/avatar/avatar159.gif
diff --git a/www-ssl/pic/avatar/avatar16.gif b/www-ssl/pic/avatar/avatar16.gif
index d76a15cd..d76a15cd 100755..100644
--- a/www-ssl/pic/avatar/avatar16.gif
+++ b/www-ssl/pic/avatar/avatar16.gif
diff --git a/www-ssl/pic/avatar/avatar160.gif b/www-ssl/pic/avatar/avatar160.gif
index deb3507c..deb3507c 100755..100644
--- a/www-ssl/pic/avatar/avatar160.gif
+++ b/www-ssl/pic/avatar/avatar160.gif
diff --git a/www-ssl/pic/avatar/avatar161.gif b/www-ssl/pic/avatar/avatar161.gif
index f425b1f2..f425b1f2 100755..100644
--- a/www-ssl/pic/avatar/avatar161.gif
+++ b/www-ssl/pic/avatar/avatar161.gif
diff --git a/www-ssl/pic/avatar/avatar162.gif b/www-ssl/pic/avatar/avatar162.gif
index 5625fe09..5625fe09 100755..100644
--- a/www-ssl/pic/avatar/avatar162.gif
+++ b/www-ssl/pic/avatar/avatar162.gif
diff --git a/www-ssl/pic/avatar/avatar163.gif b/www-ssl/pic/avatar/avatar163.gif
index 8146a09d..8146a09d 100755..100644
--- a/www-ssl/pic/avatar/avatar163.gif
+++ b/www-ssl/pic/avatar/avatar163.gif
diff --git a/www-ssl/pic/avatar/avatar164.gif b/www-ssl/pic/avatar/avatar164.gif
index 4690f9cb..4690f9cb 100755..100644
--- a/www-ssl/pic/avatar/avatar164.gif
+++ b/www-ssl/pic/avatar/avatar164.gif
diff --git a/www-ssl/pic/avatar/avatar165.gif b/www-ssl/pic/avatar/avatar165.gif
index efe72a35..efe72a35 100755..100644
--- a/www-ssl/pic/avatar/avatar165.gif
+++ b/www-ssl/pic/avatar/avatar165.gif
diff --git a/www-ssl/pic/avatar/avatar166.gif b/www-ssl/pic/avatar/avatar166.gif
index a1720be3..a1720be3 100755..100644
--- a/www-ssl/pic/avatar/avatar166.gif
+++ b/www-ssl/pic/avatar/avatar166.gif
diff --git a/www-ssl/pic/avatar/avatar167.gif b/www-ssl/pic/avatar/avatar167.gif
index 04d31691..04d31691 100755..100644
--- a/www-ssl/pic/avatar/avatar167.gif
+++ b/www-ssl/pic/avatar/avatar167.gif
diff --git a/www-ssl/pic/avatar/avatar168.gif b/www-ssl/pic/avatar/avatar168.gif
index 4d804c2a..4d804c2a 100755..100644
--- a/www-ssl/pic/avatar/avatar168.gif
+++ b/www-ssl/pic/avatar/avatar168.gif
diff --git a/www-ssl/pic/avatar/avatar169.gif b/www-ssl/pic/avatar/avatar169.gif
index afe58a3f..afe58a3f 100755..100644
--- a/www-ssl/pic/avatar/avatar169.gif
+++ b/www-ssl/pic/avatar/avatar169.gif
diff --git a/www-ssl/pic/avatar/avatar17.gif b/www-ssl/pic/avatar/avatar17.gif
index 994836b7..994836b7 100755..100644
--- a/www-ssl/pic/avatar/avatar17.gif
+++ b/www-ssl/pic/avatar/avatar17.gif
diff --git a/www-ssl/pic/avatar/avatar170.gif b/www-ssl/pic/avatar/avatar170.gif
index dae4c36a..dae4c36a 100755..100644
--- a/www-ssl/pic/avatar/avatar170.gif
+++ b/www-ssl/pic/avatar/avatar170.gif
diff --git a/www-ssl/pic/avatar/avatar171.gif b/www-ssl/pic/avatar/avatar171.gif
index 774aa9c2..774aa9c2 100755..100644
--- a/www-ssl/pic/avatar/avatar171.gif
+++ b/www-ssl/pic/avatar/avatar171.gif
diff --git a/www-ssl/pic/avatar/avatar172.gif b/www-ssl/pic/avatar/avatar172.gif
index e6f7bc6c..e6f7bc6c 100755..100644
--- a/www-ssl/pic/avatar/avatar172.gif
+++ b/www-ssl/pic/avatar/avatar172.gif
diff --git a/www-ssl/pic/avatar/avatar173.gif b/www-ssl/pic/avatar/avatar173.gif
index 3222ac99..3222ac99 100755..100644
--- a/www-ssl/pic/avatar/avatar173.gif
+++ b/www-ssl/pic/avatar/avatar173.gif
diff --git a/www-ssl/pic/avatar/avatar174.gif b/www-ssl/pic/avatar/avatar174.gif
index a64201ca..a64201ca 100755..100644
--- a/www-ssl/pic/avatar/avatar174.gif
+++ b/www-ssl/pic/avatar/avatar174.gif
diff --git a/www-ssl/pic/avatar/avatar175.gif b/www-ssl/pic/avatar/avatar175.gif
index c172a6eb..c172a6eb 100755..100644
--- a/www-ssl/pic/avatar/avatar175.gif
+++ b/www-ssl/pic/avatar/avatar175.gif
diff --git a/www-ssl/pic/avatar/avatar176.gif b/www-ssl/pic/avatar/avatar176.gif
index bda3bae5..bda3bae5 100755..100644
--- a/www-ssl/pic/avatar/avatar176.gif
+++ b/www-ssl/pic/avatar/avatar176.gif
diff --git a/www-ssl/pic/avatar/avatar177.gif b/www-ssl/pic/avatar/avatar177.gif
index d2951985..d2951985 100755..100644
--- a/www-ssl/pic/avatar/avatar177.gif
+++ b/www-ssl/pic/avatar/avatar177.gif
diff --git a/www-ssl/pic/avatar/avatar178.gif b/www-ssl/pic/avatar/avatar178.gif
index 400ae2eb..400ae2eb 100755..100644
--- a/www-ssl/pic/avatar/avatar178.gif
+++ b/www-ssl/pic/avatar/avatar178.gif
diff --git a/www-ssl/pic/avatar/avatar179.gif b/www-ssl/pic/avatar/avatar179.gif
index cfb7a1cf..cfb7a1cf 100755..100644
--- a/www-ssl/pic/avatar/avatar179.gif
+++ b/www-ssl/pic/avatar/avatar179.gif
diff --git a/www-ssl/pic/avatar/avatar18.gif b/www-ssl/pic/avatar/avatar18.gif
index 4c1d9b57..4c1d9b57 100755..100644
--- a/www-ssl/pic/avatar/avatar18.gif
+++ b/www-ssl/pic/avatar/avatar18.gif
diff --git a/www-ssl/pic/avatar/avatar180.gif b/www-ssl/pic/avatar/avatar180.gif
index 5be98c79..5be98c79 100755..100644
--- a/www-ssl/pic/avatar/avatar180.gif
+++ b/www-ssl/pic/avatar/avatar180.gif
diff --git a/www-ssl/pic/avatar/avatar181.gif b/www-ssl/pic/avatar/avatar181.gif
index 44918224..44918224 100755..100644
--- a/www-ssl/pic/avatar/avatar181.gif
+++ b/www-ssl/pic/avatar/avatar181.gif
diff --git a/www-ssl/pic/avatar/avatar182.gif b/www-ssl/pic/avatar/avatar182.gif
index 914c3efc..914c3efc 100755..100644
--- a/www-ssl/pic/avatar/avatar182.gif
+++ b/www-ssl/pic/avatar/avatar182.gif
diff --git a/www-ssl/pic/avatar/avatar183.gif b/www-ssl/pic/avatar/avatar183.gif
index 27d55f8f..27d55f8f 100755..100644
--- a/www-ssl/pic/avatar/avatar183.gif
+++ b/www-ssl/pic/avatar/avatar183.gif
diff --git a/www-ssl/pic/avatar/avatar184.gif b/www-ssl/pic/avatar/avatar184.gif
index 2ce57015..2ce57015 100755..100644
--- a/www-ssl/pic/avatar/avatar184.gif
+++ b/www-ssl/pic/avatar/avatar184.gif
diff --git a/www-ssl/pic/avatar/avatar185.gif b/www-ssl/pic/avatar/avatar185.gif
index 8eb60378..8eb60378 100755..100644
--- a/www-ssl/pic/avatar/avatar185.gif
+++ b/www-ssl/pic/avatar/avatar185.gif
diff --git a/www-ssl/pic/avatar/avatar186.gif b/www-ssl/pic/avatar/avatar186.gif
index d30bc664..d30bc664 100755..100644
--- a/www-ssl/pic/avatar/avatar186.gif
+++ b/www-ssl/pic/avatar/avatar186.gif
diff --git a/www-ssl/pic/avatar/avatar187.gif b/www-ssl/pic/avatar/avatar187.gif
index 34bcc7d2..34bcc7d2 100755..100644
--- a/www-ssl/pic/avatar/avatar187.gif
+++ b/www-ssl/pic/avatar/avatar187.gif
diff --git a/www-ssl/pic/avatar/avatar188.gif b/www-ssl/pic/avatar/avatar188.gif
index 3056d45a..3056d45a 100755..100644
--- a/www-ssl/pic/avatar/avatar188.gif
+++ b/www-ssl/pic/avatar/avatar188.gif
diff --git a/www-ssl/pic/avatar/avatar189.gif b/www-ssl/pic/avatar/avatar189.gif
index 9fb4cd83..9fb4cd83 100755..100644
--- a/www-ssl/pic/avatar/avatar189.gif
+++ b/www-ssl/pic/avatar/avatar189.gif
diff --git a/www-ssl/pic/avatar/avatar19.gif b/www-ssl/pic/avatar/avatar19.gif
index 40d42724..40d42724 100755..100644
--- a/www-ssl/pic/avatar/avatar19.gif
+++ b/www-ssl/pic/avatar/avatar19.gif
diff --git a/www-ssl/pic/avatar/avatar190.gif b/www-ssl/pic/avatar/avatar190.gif
index f8c38853..f8c38853 100755..100644
--- a/www-ssl/pic/avatar/avatar190.gif
+++ b/www-ssl/pic/avatar/avatar190.gif
diff --git a/www-ssl/pic/avatar/avatar191.gif b/www-ssl/pic/avatar/avatar191.gif
index e6af0d88..e6af0d88 100755..100644
--- a/www-ssl/pic/avatar/avatar191.gif
+++ b/www-ssl/pic/avatar/avatar191.gif
diff --git a/www-ssl/pic/avatar/avatar192.gif b/www-ssl/pic/avatar/avatar192.gif
index 123ed736..123ed736 100755..100644
--- a/www-ssl/pic/avatar/avatar192.gif
+++ b/www-ssl/pic/avatar/avatar192.gif
diff --git a/www-ssl/pic/avatar/avatar193.gif b/www-ssl/pic/avatar/avatar193.gif
index f82524d9..f82524d9 100755..100644
--- a/www-ssl/pic/avatar/avatar193.gif
+++ b/www-ssl/pic/avatar/avatar193.gif
diff --git a/www-ssl/pic/avatar/avatar194.gif b/www-ssl/pic/avatar/avatar194.gif
index ae1d743b..ae1d743b 100755..100644
--- a/www-ssl/pic/avatar/avatar194.gif
+++ b/www-ssl/pic/avatar/avatar194.gif
diff --git a/www-ssl/pic/avatar/avatar195.gif b/www-ssl/pic/avatar/avatar195.gif
index e22c9ba0..e22c9ba0 100755..100644
--- a/www-ssl/pic/avatar/avatar195.gif
+++ b/www-ssl/pic/avatar/avatar195.gif
diff --git a/www-ssl/pic/avatar/avatar196.gif b/www-ssl/pic/avatar/avatar196.gif
index 87e6293d..87e6293d 100755..100644
--- a/www-ssl/pic/avatar/avatar196.gif
+++ b/www-ssl/pic/avatar/avatar196.gif
diff --git a/www-ssl/pic/avatar/avatar197.gif b/www-ssl/pic/avatar/avatar197.gif
index 88764c73..88764c73 100755..100644
--- a/www-ssl/pic/avatar/avatar197.gif
+++ b/www-ssl/pic/avatar/avatar197.gif
diff --git a/www-ssl/pic/avatar/avatar198.gif b/www-ssl/pic/avatar/avatar198.gif
index 58a64280..58a64280 100755..100644
--- a/www-ssl/pic/avatar/avatar198.gif
+++ b/www-ssl/pic/avatar/avatar198.gif
diff --git a/www-ssl/pic/avatar/avatar199.gif b/www-ssl/pic/avatar/avatar199.gif
index e3861e3e..e3861e3e 100755..100644
--- a/www-ssl/pic/avatar/avatar199.gif
+++ b/www-ssl/pic/avatar/avatar199.gif
diff --git a/www-ssl/pic/avatar/avatar2.gif b/www-ssl/pic/avatar/avatar2.gif
index 6c1e79a7..6c1e79a7 100755..100644
--- a/www-ssl/pic/avatar/avatar2.gif
+++ b/www-ssl/pic/avatar/avatar2.gif
diff --git a/www-ssl/pic/avatar/avatar20.gif b/www-ssl/pic/avatar/avatar20.gif
index 7480ddd1..7480ddd1 100755..100644
--- a/www-ssl/pic/avatar/avatar20.gif
+++ b/www-ssl/pic/avatar/avatar20.gif
diff --git a/www-ssl/pic/avatar/avatar200.gif b/www-ssl/pic/avatar/avatar200.gif
index bcee18dd..bcee18dd 100755..100644
--- a/www-ssl/pic/avatar/avatar200.gif
+++ b/www-ssl/pic/avatar/avatar200.gif
diff --git a/www-ssl/pic/avatar/avatar201.gif b/www-ssl/pic/avatar/avatar201.gif
index 7ff54bd0..7ff54bd0 100755..100644
--- a/www-ssl/pic/avatar/avatar201.gif
+++ b/www-ssl/pic/avatar/avatar201.gif
diff --git a/www-ssl/pic/avatar/avatar202.gif b/www-ssl/pic/avatar/avatar202.gif
index 9b9ad5aa..9b9ad5aa 100755..100644
--- a/www-ssl/pic/avatar/avatar202.gif
+++ b/www-ssl/pic/avatar/avatar202.gif
diff --git a/www-ssl/pic/avatar/avatar203.gif b/www-ssl/pic/avatar/avatar203.gif
index 777e6ab9..777e6ab9 100755..100644
--- a/www-ssl/pic/avatar/avatar203.gif
+++ b/www-ssl/pic/avatar/avatar203.gif
diff --git a/www-ssl/pic/avatar/avatar204.gif b/www-ssl/pic/avatar/avatar204.gif
index 6e16ed30..6e16ed30 100755..100644
--- a/www-ssl/pic/avatar/avatar204.gif
+++ b/www-ssl/pic/avatar/avatar204.gif
diff --git a/www-ssl/pic/avatar/avatar205.gif b/www-ssl/pic/avatar/avatar205.gif
index f780d7d8..f780d7d8 100755..100644
--- a/www-ssl/pic/avatar/avatar205.gif
+++ b/www-ssl/pic/avatar/avatar205.gif
diff --git a/www-ssl/pic/avatar/avatar206.gif b/www-ssl/pic/avatar/avatar206.gif
index 6a5b3ad7..6a5b3ad7 100755..100644
--- a/www-ssl/pic/avatar/avatar206.gif
+++ b/www-ssl/pic/avatar/avatar206.gif
diff --git a/www-ssl/pic/avatar/avatar207.gif b/www-ssl/pic/avatar/avatar207.gif
index d956d1f9..d956d1f9 100755..100644
--- a/www-ssl/pic/avatar/avatar207.gif
+++ b/www-ssl/pic/avatar/avatar207.gif
diff --git a/www-ssl/pic/avatar/avatar208.gif b/www-ssl/pic/avatar/avatar208.gif
index 571e059f..571e059f 100755..100644
--- a/www-ssl/pic/avatar/avatar208.gif
+++ b/www-ssl/pic/avatar/avatar208.gif
diff --git a/www-ssl/pic/avatar/avatar209.gif b/www-ssl/pic/avatar/avatar209.gif
index d2976d85..d2976d85 100755..100644
--- a/www-ssl/pic/avatar/avatar209.gif
+++ b/www-ssl/pic/avatar/avatar209.gif
diff --git a/www-ssl/pic/avatar/avatar21.gif b/www-ssl/pic/avatar/avatar21.gif
index 45b1b8a3..45b1b8a3 100755..100644
--- a/www-ssl/pic/avatar/avatar21.gif
+++ b/www-ssl/pic/avatar/avatar21.gif
diff --git a/www-ssl/pic/avatar/avatar210.gif b/www-ssl/pic/avatar/avatar210.gif
index 2bd579b9..2bd579b9 100755..100644
--- a/www-ssl/pic/avatar/avatar210.gif
+++ b/www-ssl/pic/avatar/avatar210.gif
diff --git a/www-ssl/pic/avatar/avatar211.gif b/www-ssl/pic/avatar/avatar211.gif
index 6e95b7d5..6e95b7d5 100755..100644
--- a/www-ssl/pic/avatar/avatar211.gif
+++ b/www-ssl/pic/avatar/avatar211.gif
diff --git a/www-ssl/pic/avatar/avatar212.gif b/www-ssl/pic/avatar/avatar212.gif
index 39e012b7..39e012b7 100755..100644
--- a/www-ssl/pic/avatar/avatar212.gif
+++ b/www-ssl/pic/avatar/avatar212.gif
diff --git a/www-ssl/pic/avatar/avatar213.gif b/www-ssl/pic/avatar/avatar213.gif
index 659fbb65..659fbb65 100755..100644
--- a/www-ssl/pic/avatar/avatar213.gif
+++ b/www-ssl/pic/avatar/avatar213.gif
diff --git a/www-ssl/pic/avatar/avatar214.gif b/www-ssl/pic/avatar/avatar214.gif
index 822d3530..822d3530 100755..100644
--- a/www-ssl/pic/avatar/avatar214.gif
+++ b/www-ssl/pic/avatar/avatar214.gif
diff --git a/www-ssl/pic/avatar/avatar215.gif b/www-ssl/pic/avatar/avatar215.gif
index e0909042..e0909042 100755..100644
--- a/www-ssl/pic/avatar/avatar215.gif
+++ b/www-ssl/pic/avatar/avatar215.gif
diff --git a/www-ssl/pic/avatar/avatar216.gif b/www-ssl/pic/avatar/avatar216.gif
index 7ba52487..7ba52487 100755..100644
--- a/www-ssl/pic/avatar/avatar216.gif
+++ b/www-ssl/pic/avatar/avatar216.gif
diff --git a/www-ssl/pic/avatar/avatar217.gif b/www-ssl/pic/avatar/avatar217.gif
index 1d69bb45..1d69bb45 100755..100644
--- a/www-ssl/pic/avatar/avatar217.gif
+++ b/www-ssl/pic/avatar/avatar217.gif
diff --git a/www-ssl/pic/avatar/avatar218.gif b/www-ssl/pic/avatar/avatar218.gif
index 508bff13..508bff13 100755..100644
--- a/www-ssl/pic/avatar/avatar218.gif
+++ b/www-ssl/pic/avatar/avatar218.gif
diff --git a/www-ssl/pic/avatar/avatar219.gif b/www-ssl/pic/avatar/avatar219.gif
index 6c695dd8..6c695dd8 100755..100644
--- a/www-ssl/pic/avatar/avatar219.gif
+++ b/www-ssl/pic/avatar/avatar219.gif
diff --git a/www-ssl/pic/avatar/avatar22.gif b/www-ssl/pic/avatar/avatar22.gif
index 7f7d9a26..7f7d9a26 100755..100644
--- a/www-ssl/pic/avatar/avatar22.gif
+++ b/www-ssl/pic/avatar/avatar22.gif
diff --git a/www-ssl/pic/avatar/avatar220.gif b/www-ssl/pic/avatar/avatar220.gif
index 76604ced..76604ced 100755..100644
--- a/www-ssl/pic/avatar/avatar220.gif
+++ b/www-ssl/pic/avatar/avatar220.gif
diff --git a/www-ssl/pic/avatar/avatar221.gif b/www-ssl/pic/avatar/avatar221.gif
index 2d5ed7db..2d5ed7db 100755..100644
--- a/www-ssl/pic/avatar/avatar221.gif
+++ b/www-ssl/pic/avatar/avatar221.gif
diff --git a/www-ssl/pic/avatar/avatar222.gif b/www-ssl/pic/avatar/avatar222.gif
index 607887e5..607887e5 100755..100644
--- a/www-ssl/pic/avatar/avatar222.gif
+++ b/www-ssl/pic/avatar/avatar222.gif
diff --git a/www-ssl/pic/avatar/avatar223.gif b/www-ssl/pic/avatar/avatar223.gif
index 5c7f782f..5c7f782f 100755..100644
--- a/www-ssl/pic/avatar/avatar223.gif
+++ b/www-ssl/pic/avatar/avatar223.gif
diff --git a/www-ssl/pic/avatar/avatar224.gif b/www-ssl/pic/avatar/avatar224.gif
index 46e7f845..46e7f845 100755..100644
--- a/www-ssl/pic/avatar/avatar224.gif
+++ b/www-ssl/pic/avatar/avatar224.gif
diff --git a/www-ssl/pic/avatar/avatar225.gif b/www-ssl/pic/avatar/avatar225.gif
index 7eb3bfcd..7eb3bfcd 100755..100644
--- a/www-ssl/pic/avatar/avatar225.gif
+++ b/www-ssl/pic/avatar/avatar225.gif
diff --git a/www-ssl/pic/avatar/avatar226.gif b/www-ssl/pic/avatar/avatar226.gif
index a030d2f9..a030d2f9 100755..100644
--- a/www-ssl/pic/avatar/avatar226.gif
+++ b/www-ssl/pic/avatar/avatar226.gif
diff --git a/www-ssl/pic/avatar/avatar227.gif b/www-ssl/pic/avatar/avatar227.gif
index fe631b92..fe631b92 100755..100644
--- a/www-ssl/pic/avatar/avatar227.gif
+++ b/www-ssl/pic/avatar/avatar227.gif
diff --git a/www-ssl/pic/avatar/avatar228.gif b/www-ssl/pic/avatar/avatar228.gif
index 459ed140..459ed140 100755..100644
--- a/www-ssl/pic/avatar/avatar228.gif
+++ b/www-ssl/pic/avatar/avatar228.gif
diff --git a/www-ssl/pic/avatar/avatar229.gif b/www-ssl/pic/avatar/avatar229.gif
index 35546746..35546746 100755..100644
--- a/www-ssl/pic/avatar/avatar229.gif
+++ b/www-ssl/pic/avatar/avatar229.gif
diff --git a/www-ssl/pic/avatar/avatar23.gif b/www-ssl/pic/avatar/avatar23.gif
index 55f84741..55f84741 100755..100644
--- a/www-ssl/pic/avatar/avatar23.gif
+++ b/www-ssl/pic/avatar/avatar23.gif
diff --git a/www-ssl/pic/avatar/avatar230.gif b/www-ssl/pic/avatar/avatar230.gif
index 22ffccb0..22ffccb0 100755..100644
--- a/www-ssl/pic/avatar/avatar230.gif
+++ b/www-ssl/pic/avatar/avatar230.gif
diff --git a/www-ssl/pic/avatar/avatar231.gif b/www-ssl/pic/avatar/avatar231.gif
index 52a82830..52a82830 100755..100644
--- a/www-ssl/pic/avatar/avatar231.gif
+++ b/www-ssl/pic/avatar/avatar231.gif
diff --git a/www-ssl/pic/avatar/avatar232.gif b/www-ssl/pic/avatar/avatar232.gif
index a442015b..a442015b 100755..100644
--- a/www-ssl/pic/avatar/avatar232.gif
+++ b/www-ssl/pic/avatar/avatar232.gif
diff --git a/www-ssl/pic/avatar/avatar233.gif b/www-ssl/pic/avatar/avatar233.gif
index ad676d9c..ad676d9c 100755..100644
--- a/www-ssl/pic/avatar/avatar233.gif
+++ b/www-ssl/pic/avatar/avatar233.gif
diff --git a/www-ssl/pic/avatar/avatar234.gif b/www-ssl/pic/avatar/avatar234.gif
index bf9200c2..bf9200c2 100755..100644
--- a/www-ssl/pic/avatar/avatar234.gif
+++ b/www-ssl/pic/avatar/avatar234.gif
diff --git a/www-ssl/pic/avatar/avatar235.gif b/www-ssl/pic/avatar/avatar235.gif
index 80aee34d..80aee34d 100755..100644
--- a/www-ssl/pic/avatar/avatar235.gif
+++ b/www-ssl/pic/avatar/avatar235.gif
diff --git a/www-ssl/pic/avatar/avatar236.gif b/www-ssl/pic/avatar/avatar236.gif
index 036c71e1..036c71e1 100755..100644
--- a/www-ssl/pic/avatar/avatar236.gif
+++ b/www-ssl/pic/avatar/avatar236.gif
diff --git a/www-ssl/pic/avatar/avatar237.gif b/www-ssl/pic/avatar/avatar237.gif
index bf78ace7..bf78ace7 100755..100644
--- a/www-ssl/pic/avatar/avatar237.gif
+++ b/www-ssl/pic/avatar/avatar237.gif
diff --git a/www-ssl/pic/avatar/avatar238.gif b/www-ssl/pic/avatar/avatar238.gif
index 276187e1..276187e1 100755..100644
--- a/www-ssl/pic/avatar/avatar238.gif
+++ b/www-ssl/pic/avatar/avatar238.gif
diff --git a/www-ssl/pic/avatar/avatar239.gif b/www-ssl/pic/avatar/avatar239.gif
index 818b54a3..818b54a3 100755..100644
--- a/www-ssl/pic/avatar/avatar239.gif
+++ b/www-ssl/pic/avatar/avatar239.gif
diff --git a/www-ssl/pic/avatar/avatar24.gif b/www-ssl/pic/avatar/avatar24.gif
index 99226b50..99226b50 100755..100644
--- a/www-ssl/pic/avatar/avatar24.gif
+++ b/www-ssl/pic/avatar/avatar24.gif
diff --git a/www-ssl/pic/avatar/avatar240.gif b/www-ssl/pic/avatar/avatar240.gif
index ccfa1346..ccfa1346 100755..100644
--- a/www-ssl/pic/avatar/avatar240.gif
+++ b/www-ssl/pic/avatar/avatar240.gif
diff --git a/www-ssl/pic/avatar/avatar241.gif b/www-ssl/pic/avatar/avatar241.gif
index b2afaa82..b2afaa82 100755..100644
--- a/www-ssl/pic/avatar/avatar241.gif
+++ b/www-ssl/pic/avatar/avatar241.gif
diff --git a/www-ssl/pic/avatar/avatar242.gif b/www-ssl/pic/avatar/avatar242.gif
index dfdb3baa..dfdb3baa 100755..100644
--- a/www-ssl/pic/avatar/avatar242.gif
+++ b/www-ssl/pic/avatar/avatar242.gif
diff --git a/www-ssl/pic/avatar/avatar243.gif b/www-ssl/pic/avatar/avatar243.gif
index 14b7e935..14b7e935 100755..100644
--- a/www-ssl/pic/avatar/avatar243.gif
+++ b/www-ssl/pic/avatar/avatar243.gif
diff --git a/www-ssl/pic/avatar/avatar244.gif b/www-ssl/pic/avatar/avatar244.gif
index bfc10515..bfc10515 100755..100644
--- a/www-ssl/pic/avatar/avatar244.gif
+++ b/www-ssl/pic/avatar/avatar244.gif
diff --git a/www-ssl/pic/avatar/avatar245.gif b/www-ssl/pic/avatar/avatar245.gif
index 79dd0453..79dd0453 100755..100644
--- a/www-ssl/pic/avatar/avatar245.gif
+++ b/www-ssl/pic/avatar/avatar245.gif
diff --git a/www-ssl/pic/avatar/avatar246.gif b/www-ssl/pic/avatar/avatar246.gif
index 26878722..26878722 100755..100644
--- a/www-ssl/pic/avatar/avatar246.gif
+++ b/www-ssl/pic/avatar/avatar246.gif
diff --git a/www-ssl/pic/avatar/avatar247.gif b/www-ssl/pic/avatar/avatar247.gif
index 0b041108..0b041108 100755..100644
--- a/www-ssl/pic/avatar/avatar247.gif
+++ b/www-ssl/pic/avatar/avatar247.gif
diff --git a/www-ssl/pic/avatar/avatar248.gif b/www-ssl/pic/avatar/avatar248.gif
index 7aa13465..7aa13465 100755..100644
--- a/www-ssl/pic/avatar/avatar248.gif
+++ b/www-ssl/pic/avatar/avatar248.gif
diff --git a/www-ssl/pic/avatar/avatar249.gif b/www-ssl/pic/avatar/avatar249.gif
index c5cdf5d8..c5cdf5d8 100755..100644
--- a/www-ssl/pic/avatar/avatar249.gif
+++ b/www-ssl/pic/avatar/avatar249.gif
diff --git a/www-ssl/pic/avatar/avatar25.gif b/www-ssl/pic/avatar/avatar25.gif
index d5e29f52..d5e29f52 100755..100644
--- a/www-ssl/pic/avatar/avatar25.gif
+++ b/www-ssl/pic/avatar/avatar25.gif
diff --git a/www-ssl/pic/avatar/avatar250.gif b/www-ssl/pic/avatar/avatar250.gif
index 61c2b962..61c2b962 100755..100644
--- a/www-ssl/pic/avatar/avatar250.gif
+++ b/www-ssl/pic/avatar/avatar250.gif
diff --git a/www-ssl/pic/avatar/avatar251.gif b/www-ssl/pic/avatar/avatar251.gif
index 01c2a370..01c2a370 100755..100644
--- a/www-ssl/pic/avatar/avatar251.gif
+++ b/www-ssl/pic/avatar/avatar251.gif
diff --git a/www-ssl/pic/avatar/avatar252.gif b/www-ssl/pic/avatar/avatar252.gif
index 6656fe75..6656fe75 100755..100644
--- a/www-ssl/pic/avatar/avatar252.gif
+++ b/www-ssl/pic/avatar/avatar252.gif
diff --git a/www-ssl/pic/avatar/avatar253.gif b/www-ssl/pic/avatar/avatar253.gif
index 4aaa9318..4aaa9318 100755..100644
--- a/www-ssl/pic/avatar/avatar253.gif
+++ b/www-ssl/pic/avatar/avatar253.gif
diff --git a/www-ssl/pic/avatar/avatar254.gif b/www-ssl/pic/avatar/avatar254.gif
index 4439c722..4439c722 100755..100644
--- a/www-ssl/pic/avatar/avatar254.gif
+++ b/www-ssl/pic/avatar/avatar254.gif
diff --git a/www-ssl/pic/avatar/avatar255.gif b/www-ssl/pic/avatar/avatar255.gif
index 3a5fd768..3a5fd768 100755..100644
--- a/www-ssl/pic/avatar/avatar255.gif
+++ b/www-ssl/pic/avatar/avatar255.gif
diff --git a/www-ssl/pic/avatar/avatar256.gif b/www-ssl/pic/avatar/avatar256.gif
index 200dc450..200dc450 100755..100644
--- a/www-ssl/pic/avatar/avatar256.gif
+++ b/www-ssl/pic/avatar/avatar256.gif
diff --git a/www-ssl/pic/avatar/avatar257.gif b/www-ssl/pic/avatar/avatar257.gif
index 9d9c823c..9d9c823c 100755..100644
--- a/www-ssl/pic/avatar/avatar257.gif
+++ b/www-ssl/pic/avatar/avatar257.gif
diff --git a/www-ssl/pic/avatar/avatar258.gif b/www-ssl/pic/avatar/avatar258.gif
index 044edc01..044edc01 100755..100644
--- a/www-ssl/pic/avatar/avatar258.gif
+++ b/www-ssl/pic/avatar/avatar258.gif
diff --git a/www-ssl/pic/avatar/avatar259.gif b/www-ssl/pic/avatar/avatar259.gif
index 83334fb9..83334fb9 100755..100644
--- a/www-ssl/pic/avatar/avatar259.gif
+++ b/www-ssl/pic/avatar/avatar259.gif
diff --git a/www-ssl/pic/avatar/avatar26.gif b/www-ssl/pic/avatar/avatar26.gif
index 40d42724..40d42724 100755..100644
--- a/www-ssl/pic/avatar/avatar26.gif
+++ b/www-ssl/pic/avatar/avatar26.gif
diff --git a/www-ssl/pic/avatar/avatar260.gif b/www-ssl/pic/avatar/avatar260.gif
index 8ec72dbe..8ec72dbe 100755..100644
--- a/www-ssl/pic/avatar/avatar260.gif
+++ b/www-ssl/pic/avatar/avatar260.gif
diff --git a/www-ssl/pic/avatar/avatar261.gif b/www-ssl/pic/avatar/avatar261.gif
index 90505322..90505322 100755..100644
--- a/www-ssl/pic/avatar/avatar261.gif
+++ b/www-ssl/pic/avatar/avatar261.gif
diff --git a/www-ssl/pic/avatar/avatar262.gif b/www-ssl/pic/avatar/avatar262.gif
index 4656c222..4656c222 100755..100644
--- a/www-ssl/pic/avatar/avatar262.gif
+++ b/www-ssl/pic/avatar/avatar262.gif
diff --git a/www-ssl/pic/avatar/avatar263.gif b/www-ssl/pic/avatar/avatar263.gif
index 6954e902..6954e902 100755..100644
--- a/www-ssl/pic/avatar/avatar263.gif
+++ b/www-ssl/pic/avatar/avatar263.gif
diff --git a/www-ssl/pic/avatar/avatar264.gif b/www-ssl/pic/avatar/avatar264.gif
index 4e46f7b9..4e46f7b9 100755..100644
--- a/www-ssl/pic/avatar/avatar264.gif
+++ b/www-ssl/pic/avatar/avatar264.gif
diff --git a/www-ssl/pic/avatar/avatar265.gif b/www-ssl/pic/avatar/avatar265.gif
index df18535c..df18535c 100755..100644
--- a/www-ssl/pic/avatar/avatar265.gif
+++ b/www-ssl/pic/avatar/avatar265.gif
diff --git a/www-ssl/pic/avatar/avatar266.gif b/www-ssl/pic/avatar/avatar266.gif
index 838305a7..838305a7 100755..100644
--- a/www-ssl/pic/avatar/avatar266.gif
+++ b/www-ssl/pic/avatar/avatar266.gif
diff --git a/www-ssl/pic/avatar/avatar267.gif b/www-ssl/pic/avatar/avatar267.gif
index 8ac405e4..8ac405e4 100755..100644
--- a/www-ssl/pic/avatar/avatar267.gif
+++ b/www-ssl/pic/avatar/avatar267.gif
diff --git a/www-ssl/pic/avatar/avatar268.gif b/www-ssl/pic/avatar/avatar268.gif
index fe61c645..fe61c645 100755..100644
--- a/www-ssl/pic/avatar/avatar268.gif
+++ b/www-ssl/pic/avatar/avatar268.gif
diff --git a/www-ssl/pic/avatar/avatar269.gif b/www-ssl/pic/avatar/avatar269.gif
index c71da25a..c71da25a 100755..100644
--- a/www-ssl/pic/avatar/avatar269.gif
+++ b/www-ssl/pic/avatar/avatar269.gif
diff --git a/www-ssl/pic/avatar/avatar27.gif b/www-ssl/pic/avatar/avatar27.gif
index 43cf2125..43cf2125 100755..100644
--- a/www-ssl/pic/avatar/avatar27.gif
+++ b/www-ssl/pic/avatar/avatar27.gif
diff --git a/www-ssl/pic/avatar/avatar270.gif b/www-ssl/pic/avatar/avatar270.gif
index 9c11d479..9c11d479 100755..100644
--- a/www-ssl/pic/avatar/avatar270.gif
+++ b/www-ssl/pic/avatar/avatar270.gif
diff --git a/www-ssl/pic/avatar/avatar271.gif b/www-ssl/pic/avatar/avatar271.gif
index ac95c950..ac95c950 100755..100644
--- a/www-ssl/pic/avatar/avatar271.gif
+++ b/www-ssl/pic/avatar/avatar271.gif
diff --git a/www-ssl/pic/avatar/avatar272.gif b/www-ssl/pic/avatar/avatar272.gif
index 4d451488..4d451488 100755..100644
--- a/www-ssl/pic/avatar/avatar272.gif
+++ b/www-ssl/pic/avatar/avatar272.gif
diff --git a/www-ssl/pic/avatar/avatar273.gif b/www-ssl/pic/avatar/avatar273.gif
index e26b9106..e26b9106 100755..100644
--- a/www-ssl/pic/avatar/avatar273.gif
+++ b/www-ssl/pic/avatar/avatar273.gif
diff --git a/www-ssl/pic/avatar/avatar274.gif b/www-ssl/pic/avatar/avatar274.gif
index a941aa4c..a941aa4c 100755..100644
--- a/www-ssl/pic/avatar/avatar274.gif
+++ b/www-ssl/pic/avatar/avatar274.gif
diff --git a/www-ssl/pic/avatar/avatar275.gif b/www-ssl/pic/avatar/avatar275.gif
index f324f6c0..f324f6c0 100755..100644
--- a/www-ssl/pic/avatar/avatar275.gif
+++ b/www-ssl/pic/avatar/avatar275.gif
diff --git a/www-ssl/pic/avatar/avatar276.gif b/www-ssl/pic/avatar/avatar276.gif
index 6b0d8fee..6b0d8fee 100755..100644
--- a/www-ssl/pic/avatar/avatar276.gif
+++ b/www-ssl/pic/avatar/avatar276.gif
diff --git a/www-ssl/pic/avatar/avatar277.gif b/www-ssl/pic/avatar/avatar277.gif
index 6fddc745..6fddc745 100755..100644
--- a/www-ssl/pic/avatar/avatar277.gif
+++ b/www-ssl/pic/avatar/avatar277.gif
diff --git a/www-ssl/pic/avatar/avatar278.gif b/www-ssl/pic/avatar/avatar278.gif
index 59e3b51d..59e3b51d 100755..100644
--- a/www-ssl/pic/avatar/avatar278.gif
+++ b/www-ssl/pic/avatar/avatar278.gif
diff --git a/www-ssl/pic/avatar/avatar279.gif b/www-ssl/pic/avatar/avatar279.gif
index c8c0bb84..c8c0bb84 100755..100644
--- a/www-ssl/pic/avatar/avatar279.gif
+++ b/www-ssl/pic/avatar/avatar279.gif
diff --git a/www-ssl/pic/avatar/avatar28.gif b/www-ssl/pic/avatar/avatar28.gif
index 9251bdb6..9251bdb6 100755..100644
--- a/www-ssl/pic/avatar/avatar28.gif
+++ b/www-ssl/pic/avatar/avatar28.gif
diff --git a/www-ssl/pic/avatar/avatar280.gif b/www-ssl/pic/avatar/avatar280.gif
index 954920d5..954920d5 100755..100644
--- a/www-ssl/pic/avatar/avatar280.gif
+++ b/www-ssl/pic/avatar/avatar280.gif
diff --git a/www-ssl/pic/avatar/avatar281.gif b/www-ssl/pic/avatar/avatar281.gif
index 68ebd8cc..68ebd8cc 100755..100644
--- a/www-ssl/pic/avatar/avatar281.gif
+++ b/www-ssl/pic/avatar/avatar281.gif
diff --git a/www-ssl/pic/avatar/avatar282.gif b/www-ssl/pic/avatar/avatar282.gif
index ec06f9f5..ec06f9f5 100755..100644
--- a/www-ssl/pic/avatar/avatar282.gif
+++ b/www-ssl/pic/avatar/avatar282.gif
diff --git a/www-ssl/pic/avatar/avatar283.gif b/www-ssl/pic/avatar/avatar283.gif
index 2d0fad8a..2d0fad8a 100755..100644
--- a/www-ssl/pic/avatar/avatar283.gif
+++ b/www-ssl/pic/avatar/avatar283.gif
diff --git a/www-ssl/pic/avatar/avatar284.gif b/www-ssl/pic/avatar/avatar284.gif
index 9cc79890..9cc79890 100755..100644
--- a/www-ssl/pic/avatar/avatar284.gif
+++ b/www-ssl/pic/avatar/avatar284.gif
diff --git a/www-ssl/pic/avatar/avatar285.gif b/www-ssl/pic/avatar/avatar285.gif
index baf2c0b0..baf2c0b0 100755..100644
--- a/www-ssl/pic/avatar/avatar285.gif
+++ b/www-ssl/pic/avatar/avatar285.gif
diff --git a/www-ssl/pic/avatar/avatar286.gif b/www-ssl/pic/avatar/avatar286.gif
index d74af8d4..d74af8d4 100755..100644
--- a/www-ssl/pic/avatar/avatar286.gif
+++ b/www-ssl/pic/avatar/avatar286.gif
diff --git a/www-ssl/pic/avatar/avatar287.gif b/www-ssl/pic/avatar/avatar287.gif
index 0e4169ef..0e4169ef 100755..100644
--- a/www-ssl/pic/avatar/avatar287.gif
+++ b/www-ssl/pic/avatar/avatar287.gif
diff --git a/www-ssl/pic/avatar/avatar288.gif b/www-ssl/pic/avatar/avatar288.gif
index 41c2e9b4..41c2e9b4 100755..100644
--- a/www-ssl/pic/avatar/avatar288.gif
+++ b/www-ssl/pic/avatar/avatar288.gif
diff --git a/www-ssl/pic/avatar/avatar289.gif b/www-ssl/pic/avatar/avatar289.gif
index c68b431a..c68b431a 100755..100644
--- a/www-ssl/pic/avatar/avatar289.gif
+++ b/www-ssl/pic/avatar/avatar289.gif
diff --git a/www-ssl/pic/avatar/avatar29.gif b/www-ssl/pic/avatar/avatar29.gif
index 10063690..10063690 100755..100644
--- a/www-ssl/pic/avatar/avatar29.gif
+++ b/www-ssl/pic/avatar/avatar29.gif
diff --git a/www-ssl/pic/avatar/avatar290.gif b/www-ssl/pic/avatar/avatar290.gif
index f2ca018b..f2ca018b 100755..100644
--- a/www-ssl/pic/avatar/avatar290.gif
+++ b/www-ssl/pic/avatar/avatar290.gif
diff --git a/www-ssl/pic/avatar/avatar291.gif b/www-ssl/pic/avatar/avatar291.gif
index b9b0bbc3..b9b0bbc3 100755..100644
--- a/www-ssl/pic/avatar/avatar291.gif
+++ b/www-ssl/pic/avatar/avatar291.gif
diff --git a/www-ssl/pic/avatar/avatar292.gif b/www-ssl/pic/avatar/avatar292.gif
index 6eecd4d1..6eecd4d1 100755..100644
--- a/www-ssl/pic/avatar/avatar292.gif
+++ b/www-ssl/pic/avatar/avatar292.gif
diff --git a/www-ssl/pic/avatar/avatar293.gif b/www-ssl/pic/avatar/avatar293.gif
index a1834818..a1834818 100755..100644
--- a/www-ssl/pic/avatar/avatar293.gif
+++ b/www-ssl/pic/avatar/avatar293.gif
diff --git a/www-ssl/pic/avatar/avatar294.gif b/www-ssl/pic/avatar/avatar294.gif
index 6ef5611a..6ef5611a 100755..100644
--- a/www-ssl/pic/avatar/avatar294.gif
+++ b/www-ssl/pic/avatar/avatar294.gif
diff --git a/www-ssl/pic/avatar/avatar295.gif b/www-ssl/pic/avatar/avatar295.gif
index 4c9fa7c6..4c9fa7c6 100755..100644
--- a/www-ssl/pic/avatar/avatar295.gif
+++ b/www-ssl/pic/avatar/avatar295.gif
diff --git a/www-ssl/pic/avatar/avatar296.gif b/www-ssl/pic/avatar/avatar296.gif
index b6ab2095..b6ab2095 100755..100644
--- a/www-ssl/pic/avatar/avatar296.gif
+++ b/www-ssl/pic/avatar/avatar296.gif
diff --git a/www-ssl/pic/avatar/avatar297.gif b/www-ssl/pic/avatar/avatar297.gif
index 38d1d659..38d1d659 100755..100644
--- a/www-ssl/pic/avatar/avatar297.gif
+++ b/www-ssl/pic/avatar/avatar297.gif
diff --git a/www-ssl/pic/avatar/avatar298.gif b/www-ssl/pic/avatar/avatar298.gif
index f1ee804c..f1ee804c 100755..100644
--- a/www-ssl/pic/avatar/avatar298.gif
+++ b/www-ssl/pic/avatar/avatar298.gif
diff --git a/www-ssl/pic/avatar/avatar299.gif b/www-ssl/pic/avatar/avatar299.gif
index 0d0b77b6..0d0b77b6 100755..100644
--- a/www-ssl/pic/avatar/avatar299.gif
+++ b/www-ssl/pic/avatar/avatar299.gif
diff --git a/www-ssl/pic/avatar/avatar3.gif b/www-ssl/pic/avatar/avatar3.gif
index d8cd4306..d8cd4306 100755..100644
--- a/www-ssl/pic/avatar/avatar3.gif
+++ b/www-ssl/pic/avatar/avatar3.gif
diff --git a/www-ssl/pic/avatar/avatar30.gif b/www-ssl/pic/avatar/avatar30.gif
index b339d48d..b339d48d 100755..100644
--- a/www-ssl/pic/avatar/avatar30.gif
+++ b/www-ssl/pic/avatar/avatar30.gif
diff --git a/www-ssl/pic/avatar/avatar300.gif b/www-ssl/pic/avatar/avatar300.gif
index 2582b3a4..2582b3a4 100755..100644
--- a/www-ssl/pic/avatar/avatar300.gif
+++ b/www-ssl/pic/avatar/avatar300.gif
diff --git a/www-ssl/pic/avatar/avatar301.gif b/www-ssl/pic/avatar/avatar301.gif
index 2350bc8f..2350bc8f 100755..100644
--- a/www-ssl/pic/avatar/avatar301.gif
+++ b/www-ssl/pic/avatar/avatar301.gif
diff --git a/www-ssl/pic/avatar/avatar302.gif b/www-ssl/pic/avatar/avatar302.gif
index 2e05d242..2e05d242 100755..100644
--- a/www-ssl/pic/avatar/avatar302.gif
+++ b/www-ssl/pic/avatar/avatar302.gif
diff --git a/www-ssl/pic/avatar/avatar303.gif b/www-ssl/pic/avatar/avatar303.gif
index 776cec3b..776cec3b 100755..100644
--- a/www-ssl/pic/avatar/avatar303.gif
+++ b/www-ssl/pic/avatar/avatar303.gif
diff --git a/www-ssl/pic/avatar/avatar304.gif b/www-ssl/pic/avatar/avatar304.gif
index 219a1184..219a1184 100755..100644
--- a/www-ssl/pic/avatar/avatar304.gif
+++ b/www-ssl/pic/avatar/avatar304.gif
diff --git a/www-ssl/pic/avatar/avatar305.gif b/www-ssl/pic/avatar/avatar305.gif
index 27071b78..27071b78 100755..100644
--- a/www-ssl/pic/avatar/avatar305.gif
+++ b/www-ssl/pic/avatar/avatar305.gif
diff --git a/www-ssl/pic/avatar/avatar306.gif b/www-ssl/pic/avatar/avatar306.gif
index 6ab781bf..6ab781bf 100755..100644
--- a/www-ssl/pic/avatar/avatar306.gif
+++ b/www-ssl/pic/avatar/avatar306.gif
diff --git a/www-ssl/pic/avatar/avatar307.gif b/www-ssl/pic/avatar/avatar307.gif
index d40998b8..d40998b8 100755..100644
--- a/www-ssl/pic/avatar/avatar307.gif
+++ b/www-ssl/pic/avatar/avatar307.gif
diff --git a/www-ssl/pic/avatar/avatar308.gif b/www-ssl/pic/avatar/avatar308.gif
index aafbe741..aafbe741 100755..100644
--- a/www-ssl/pic/avatar/avatar308.gif
+++ b/www-ssl/pic/avatar/avatar308.gif
diff --git a/www-ssl/pic/avatar/avatar309.gif b/www-ssl/pic/avatar/avatar309.gif
index fe701cbf..fe701cbf 100755..100644
--- a/www-ssl/pic/avatar/avatar309.gif
+++ b/www-ssl/pic/avatar/avatar309.gif
diff --git a/www-ssl/pic/avatar/avatar31.gif b/www-ssl/pic/avatar/avatar31.gif
index d5a9caf6..d5a9caf6 100755..100644
--- a/www-ssl/pic/avatar/avatar31.gif
+++ b/www-ssl/pic/avatar/avatar31.gif
diff --git a/www-ssl/pic/avatar/avatar310.gif b/www-ssl/pic/avatar/avatar310.gif
index e6072552..e6072552 100755..100644
--- a/www-ssl/pic/avatar/avatar310.gif
+++ b/www-ssl/pic/avatar/avatar310.gif
diff --git a/www-ssl/pic/avatar/avatar311.gif b/www-ssl/pic/avatar/avatar311.gif
index 9b77a2a3..9b77a2a3 100755..100644
--- a/www-ssl/pic/avatar/avatar311.gif
+++ b/www-ssl/pic/avatar/avatar311.gif
diff --git a/www-ssl/pic/avatar/avatar312.gif b/www-ssl/pic/avatar/avatar312.gif
index 89acef5f..89acef5f 100755..100644
--- a/www-ssl/pic/avatar/avatar312.gif
+++ b/www-ssl/pic/avatar/avatar312.gif
diff --git a/www-ssl/pic/avatar/avatar313.gif b/www-ssl/pic/avatar/avatar313.gif
index fee5e41b..fee5e41b 100755..100644
--- a/www-ssl/pic/avatar/avatar313.gif
+++ b/www-ssl/pic/avatar/avatar313.gif
diff --git a/www-ssl/pic/avatar/avatar314.gif b/www-ssl/pic/avatar/avatar314.gif
index e706e088..e706e088 100755..100644
--- a/www-ssl/pic/avatar/avatar314.gif
+++ b/www-ssl/pic/avatar/avatar314.gif
diff --git a/www-ssl/pic/avatar/avatar315.gif b/www-ssl/pic/avatar/avatar315.gif
index fb3ee057..fb3ee057 100755..100644
--- a/www-ssl/pic/avatar/avatar315.gif
+++ b/www-ssl/pic/avatar/avatar315.gif
diff --git a/www-ssl/pic/avatar/avatar316.gif b/www-ssl/pic/avatar/avatar316.gif
index 662fe276..662fe276 100755..100644
--- a/www-ssl/pic/avatar/avatar316.gif
+++ b/www-ssl/pic/avatar/avatar316.gif
diff --git a/www-ssl/pic/avatar/avatar317.gif b/www-ssl/pic/avatar/avatar317.gif
index 0a858151..0a858151 100755..100644
--- a/www-ssl/pic/avatar/avatar317.gif
+++ b/www-ssl/pic/avatar/avatar317.gif
diff --git a/www-ssl/pic/avatar/avatar318.gif b/www-ssl/pic/avatar/avatar318.gif
index 4ca84803..4ca84803 100755..100644
--- a/www-ssl/pic/avatar/avatar318.gif
+++ b/www-ssl/pic/avatar/avatar318.gif
diff --git a/www-ssl/pic/avatar/avatar319.gif b/www-ssl/pic/avatar/avatar319.gif
index 503cae0a..503cae0a 100755..100644
--- a/www-ssl/pic/avatar/avatar319.gif
+++ b/www-ssl/pic/avatar/avatar319.gif
diff --git a/www-ssl/pic/avatar/avatar32.gif b/www-ssl/pic/avatar/avatar32.gif
index 5f3b5d43..5f3b5d43 100755..100644
--- a/www-ssl/pic/avatar/avatar32.gif
+++ b/www-ssl/pic/avatar/avatar32.gif
diff --git a/www-ssl/pic/avatar/avatar320.gif b/www-ssl/pic/avatar/avatar320.gif
index 0cd51805..0cd51805 100755..100644
--- a/www-ssl/pic/avatar/avatar320.gif
+++ b/www-ssl/pic/avatar/avatar320.gif
diff --git a/www-ssl/pic/avatar/avatar321.gif b/www-ssl/pic/avatar/avatar321.gif
index eefbbda9..eefbbda9 100755..100644
--- a/www-ssl/pic/avatar/avatar321.gif
+++ b/www-ssl/pic/avatar/avatar321.gif
diff --git a/www-ssl/pic/avatar/avatar322.gif b/www-ssl/pic/avatar/avatar322.gif
index 0243065b..0243065b 100755..100644
--- a/www-ssl/pic/avatar/avatar322.gif
+++ b/www-ssl/pic/avatar/avatar322.gif
diff --git a/www-ssl/pic/avatar/avatar323.gif b/www-ssl/pic/avatar/avatar323.gif
index b1e08c05..b1e08c05 100755..100644
--- a/www-ssl/pic/avatar/avatar323.gif
+++ b/www-ssl/pic/avatar/avatar323.gif
diff --git a/www-ssl/pic/avatar/avatar324.gif b/www-ssl/pic/avatar/avatar324.gif
index a2168e48..a2168e48 100755..100644
--- a/www-ssl/pic/avatar/avatar324.gif
+++ b/www-ssl/pic/avatar/avatar324.gif
diff --git a/www-ssl/pic/avatar/avatar325.gif b/www-ssl/pic/avatar/avatar325.gif
index dac85af5..dac85af5 100755..100644
--- a/www-ssl/pic/avatar/avatar325.gif
+++ b/www-ssl/pic/avatar/avatar325.gif
diff --git a/www-ssl/pic/avatar/avatar326.gif b/www-ssl/pic/avatar/avatar326.gif
index afe5442f..afe5442f 100755..100644
--- a/www-ssl/pic/avatar/avatar326.gif
+++ b/www-ssl/pic/avatar/avatar326.gif
diff --git a/www-ssl/pic/avatar/avatar327.gif b/www-ssl/pic/avatar/avatar327.gif
index 7db04c45..7db04c45 100755..100644
--- a/www-ssl/pic/avatar/avatar327.gif
+++ b/www-ssl/pic/avatar/avatar327.gif
diff --git a/www-ssl/pic/avatar/avatar328.gif b/www-ssl/pic/avatar/avatar328.gif
index 4d1d8a4a..4d1d8a4a 100755..100644
--- a/www-ssl/pic/avatar/avatar328.gif
+++ b/www-ssl/pic/avatar/avatar328.gif
diff --git a/www-ssl/pic/avatar/avatar329.gif b/www-ssl/pic/avatar/avatar329.gif
index ede4d487..ede4d487 100755..100644
--- a/www-ssl/pic/avatar/avatar329.gif
+++ b/www-ssl/pic/avatar/avatar329.gif
diff --git a/www-ssl/pic/avatar/avatar33.gif b/www-ssl/pic/avatar/avatar33.gif
index 03ca160e..03ca160e 100755..100644
--- a/www-ssl/pic/avatar/avatar33.gif
+++ b/www-ssl/pic/avatar/avatar33.gif
diff --git a/www-ssl/pic/avatar/avatar330.gif b/www-ssl/pic/avatar/avatar330.gif
index e4a0a821..e4a0a821 100755..100644
--- a/www-ssl/pic/avatar/avatar330.gif
+++ b/www-ssl/pic/avatar/avatar330.gif
diff --git a/www-ssl/pic/avatar/avatar331.gif b/www-ssl/pic/avatar/avatar331.gif
index 6a047501..6a047501 100755..100644
--- a/www-ssl/pic/avatar/avatar331.gif
+++ b/www-ssl/pic/avatar/avatar331.gif
diff --git a/www-ssl/pic/avatar/avatar332.gif b/www-ssl/pic/avatar/avatar332.gif
index 6bde912c..6bde912c 100755..100644
--- a/www-ssl/pic/avatar/avatar332.gif
+++ b/www-ssl/pic/avatar/avatar332.gif
diff --git a/www-ssl/pic/avatar/avatar333.gif b/www-ssl/pic/avatar/avatar333.gif
index 1bb07ba9..1bb07ba9 100755..100644
--- a/www-ssl/pic/avatar/avatar333.gif
+++ b/www-ssl/pic/avatar/avatar333.gif
diff --git a/www-ssl/pic/avatar/avatar334.gif b/www-ssl/pic/avatar/avatar334.gif
index c4ec9f85..c4ec9f85 100755..100644
--- a/www-ssl/pic/avatar/avatar334.gif
+++ b/www-ssl/pic/avatar/avatar334.gif
diff --git a/www-ssl/pic/avatar/avatar335.gif b/www-ssl/pic/avatar/avatar335.gif
index 3ce39e43..3ce39e43 100755..100644
--- a/www-ssl/pic/avatar/avatar335.gif
+++ b/www-ssl/pic/avatar/avatar335.gif
diff --git a/www-ssl/pic/avatar/avatar336.gif b/www-ssl/pic/avatar/avatar336.gif
index e9876066..e9876066 100755..100644
--- a/www-ssl/pic/avatar/avatar336.gif
+++ b/www-ssl/pic/avatar/avatar336.gif
diff --git a/www-ssl/pic/avatar/avatar337.gif b/www-ssl/pic/avatar/avatar337.gif
index f4e15213..f4e15213 100755..100644
--- a/www-ssl/pic/avatar/avatar337.gif
+++ b/www-ssl/pic/avatar/avatar337.gif
diff --git a/www-ssl/pic/avatar/avatar338.gif b/www-ssl/pic/avatar/avatar338.gif
index 0b70f568..0b70f568 100755..100644
--- a/www-ssl/pic/avatar/avatar338.gif
+++ b/www-ssl/pic/avatar/avatar338.gif
diff --git a/www-ssl/pic/avatar/avatar339.gif b/www-ssl/pic/avatar/avatar339.gif
index 08afad48..08afad48 100755..100644
--- a/www-ssl/pic/avatar/avatar339.gif
+++ b/www-ssl/pic/avatar/avatar339.gif
diff --git a/www-ssl/pic/avatar/avatar34.gif b/www-ssl/pic/avatar/avatar34.gif
index 49c49577..49c49577 100755..100644
--- a/www-ssl/pic/avatar/avatar34.gif
+++ b/www-ssl/pic/avatar/avatar34.gif
diff --git a/www-ssl/pic/avatar/avatar340.gif b/www-ssl/pic/avatar/avatar340.gif
index 640984a3..640984a3 100755..100644
--- a/www-ssl/pic/avatar/avatar340.gif
+++ b/www-ssl/pic/avatar/avatar340.gif
diff --git a/www-ssl/pic/avatar/avatar341.gif b/www-ssl/pic/avatar/avatar341.gif
index a4556966..a4556966 100755..100644
--- a/www-ssl/pic/avatar/avatar341.gif
+++ b/www-ssl/pic/avatar/avatar341.gif
diff --git a/www-ssl/pic/avatar/avatar342.gif b/www-ssl/pic/avatar/avatar342.gif
index 8022e7a2..8022e7a2 100755..100644
--- a/www-ssl/pic/avatar/avatar342.gif
+++ b/www-ssl/pic/avatar/avatar342.gif
diff --git a/www-ssl/pic/avatar/avatar343.gif b/www-ssl/pic/avatar/avatar343.gif
index 71a99e9a..71a99e9a 100755..100644
--- a/www-ssl/pic/avatar/avatar343.gif
+++ b/www-ssl/pic/avatar/avatar343.gif
diff --git a/www-ssl/pic/avatar/avatar344.gif b/www-ssl/pic/avatar/avatar344.gif
index fcdc99e8..fcdc99e8 100755..100644
--- a/www-ssl/pic/avatar/avatar344.gif
+++ b/www-ssl/pic/avatar/avatar344.gif
diff --git a/www-ssl/pic/avatar/avatar345.gif b/www-ssl/pic/avatar/avatar345.gif
index 57a63f4b..57a63f4b 100755..100644
--- a/www-ssl/pic/avatar/avatar345.gif
+++ b/www-ssl/pic/avatar/avatar345.gif
diff --git a/www-ssl/pic/avatar/avatar346.gif b/www-ssl/pic/avatar/avatar346.gif
index f41dcd30..f41dcd30 100755..100644
--- a/www-ssl/pic/avatar/avatar346.gif
+++ b/www-ssl/pic/avatar/avatar346.gif
diff --git a/www-ssl/pic/avatar/avatar347.gif b/www-ssl/pic/avatar/avatar347.gif
index 8d8a54cb..8d8a54cb 100755..100644
--- a/www-ssl/pic/avatar/avatar347.gif
+++ b/www-ssl/pic/avatar/avatar347.gif
diff --git a/www-ssl/pic/avatar/avatar348.gif b/www-ssl/pic/avatar/avatar348.gif
index 7c54eb39..7c54eb39 100755..100644
--- a/www-ssl/pic/avatar/avatar348.gif
+++ b/www-ssl/pic/avatar/avatar348.gif
diff --git a/www-ssl/pic/avatar/avatar349.gif b/www-ssl/pic/avatar/avatar349.gif
index 64de8b9e..64de8b9e 100755..100644
--- a/www-ssl/pic/avatar/avatar349.gif
+++ b/www-ssl/pic/avatar/avatar349.gif
diff --git a/www-ssl/pic/avatar/avatar35.gif b/www-ssl/pic/avatar/avatar35.gif
index 29eec4ac..29eec4ac 100755..100644
--- a/www-ssl/pic/avatar/avatar35.gif
+++ b/www-ssl/pic/avatar/avatar35.gif
diff --git a/www-ssl/pic/avatar/avatar350.gif b/www-ssl/pic/avatar/avatar350.gif
index c57f1061..c57f1061 100755..100644
--- a/www-ssl/pic/avatar/avatar350.gif
+++ b/www-ssl/pic/avatar/avatar350.gif
diff --git a/www-ssl/pic/avatar/avatar351.gif b/www-ssl/pic/avatar/avatar351.gif
index 8ccb8185..8ccb8185 100755..100644
--- a/www-ssl/pic/avatar/avatar351.gif
+++ b/www-ssl/pic/avatar/avatar351.gif
diff --git a/www-ssl/pic/avatar/avatar352.gif b/www-ssl/pic/avatar/avatar352.gif
index 8737e658..8737e658 100755..100644
--- a/www-ssl/pic/avatar/avatar352.gif
+++ b/www-ssl/pic/avatar/avatar352.gif
diff --git a/www-ssl/pic/avatar/avatar353.gif b/www-ssl/pic/avatar/avatar353.gif
index b6da0623..b6da0623 100755..100644
--- a/www-ssl/pic/avatar/avatar353.gif
+++ b/www-ssl/pic/avatar/avatar353.gif
diff --git a/www-ssl/pic/avatar/avatar354.gif b/www-ssl/pic/avatar/avatar354.gif
index 7565e6f9..7565e6f9 100755..100644
--- a/www-ssl/pic/avatar/avatar354.gif
+++ b/www-ssl/pic/avatar/avatar354.gif
diff --git a/www-ssl/pic/avatar/avatar355.gif b/www-ssl/pic/avatar/avatar355.gif
index 3b08b30f..3b08b30f 100755..100644
--- a/www-ssl/pic/avatar/avatar355.gif
+++ b/www-ssl/pic/avatar/avatar355.gif
diff --git a/www-ssl/pic/avatar/avatar356.gif b/www-ssl/pic/avatar/avatar356.gif
index 7d0dc95b..7d0dc95b 100755..100644
--- a/www-ssl/pic/avatar/avatar356.gif
+++ b/www-ssl/pic/avatar/avatar356.gif
diff --git a/www-ssl/pic/avatar/avatar357.gif b/www-ssl/pic/avatar/avatar357.gif
index ed1157a0..ed1157a0 100755..100644
--- a/www-ssl/pic/avatar/avatar357.gif
+++ b/www-ssl/pic/avatar/avatar357.gif
diff --git a/www-ssl/pic/avatar/avatar358.gif b/www-ssl/pic/avatar/avatar358.gif
index 2dc844a5..2dc844a5 100755..100644
--- a/www-ssl/pic/avatar/avatar358.gif
+++ b/www-ssl/pic/avatar/avatar358.gif
diff --git a/www-ssl/pic/avatar/avatar359.gif b/www-ssl/pic/avatar/avatar359.gif
index 8ac3f7fd..8ac3f7fd 100755..100644
--- a/www-ssl/pic/avatar/avatar359.gif
+++ b/www-ssl/pic/avatar/avatar359.gif
diff --git a/www-ssl/pic/avatar/avatar36.gif b/www-ssl/pic/avatar/avatar36.gif
index cab160e5..cab160e5 100755..100644
--- a/www-ssl/pic/avatar/avatar36.gif
+++ b/www-ssl/pic/avatar/avatar36.gif
diff --git a/www-ssl/pic/avatar/avatar360.gif b/www-ssl/pic/avatar/avatar360.gif
index b01fb184..b01fb184 100755..100644
--- a/www-ssl/pic/avatar/avatar360.gif
+++ b/www-ssl/pic/avatar/avatar360.gif
diff --git a/www-ssl/pic/avatar/avatar361.gif b/www-ssl/pic/avatar/avatar361.gif
index c4573da7..c4573da7 100755..100644
--- a/www-ssl/pic/avatar/avatar361.gif
+++ b/www-ssl/pic/avatar/avatar361.gif
diff --git a/www-ssl/pic/avatar/avatar362.gif b/www-ssl/pic/avatar/avatar362.gif
index 189c9276..189c9276 100755..100644
--- a/www-ssl/pic/avatar/avatar362.gif
+++ b/www-ssl/pic/avatar/avatar362.gif
diff --git a/www-ssl/pic/avatar/avatar363.gif b/www-ssl/pic/avatar/avatar363.gif
index 8ff0b39c..8ff0b39c 100755..100644
--- a/www-ssl/pic/avatar/avatar363.gif
+++ b/www-ssl/pic/avatar/avatar363.gif
diff --git a/www-ssl/pic/avatar/avatar364.gif b/www-ssl/pic/avatar/avatar364.gif
index 8f22d79f..8f22d79f 100755..100644
--- a/www-ssl/pic/avatar/avatar364.gif
+++ b/www-ssl/pic/avatar/avatar364.gif
diff --git a/www-ssl/pic/avatar/avatar365.gif b/www-ssl/pic/avatar/avatar365.gif
index 950aea2a..950aea2a 100755..100644
--- a/www-ssl/pic/avatar/avatar365.gif
+++ b/www-ssl/pic/avatar/avatar365.gif
diff --git a/www-ssl/pic/avatar/avatar366.gif b/www-ssl/pic/avatar/avatar366.gif
index b1dc12d2..b1dc12d2 100755..100644
--- a/www-ssl/pic/avatar/avatar366.gif
+++ b/www-ssl/pic/avatar/avatar366.gif
diff --git a/www-ssl/pic/avatar/avatar367.gif b/www-ssl/pic/avatar/avatar367.gif
index 0de8fe4b..0de8fe4b 100755..100644
--- a/www-ssl/pic/avatar/avatar367.gif
+++ b/www-ssl/pic/avatar/avatar367.gif
diff --git a/www-ssl/pic/avatar/avatar368.gif b/www-ssl/pic/avatar/avatar368.gif
index b3f7e0f6..b3f7e0f6 100755..100644
--- a/www-ssl/pic/avatar/avatar368.gif
+++ b/www-ssl/pic/avatar/avatar368.gif
diff --git a/www-ssl/pic/avatar/avatar369.gif b/www-ssl/pic/avatar/avatar369.gif
index 0efb8393..0efb8393 100755..100644
--- a/www-ssl/pic/avatar/avatar369.gif
+++ b/www-ssl/pic/avatar/avatar369.gif
diff --git a/www-ssl/pic/avatar/avatar37.gif b/www-ssl/pic/avatar/avatar37.gif
index 32b73e09..32b73e09 100755..100644
--- a/www-ssl/pic/avatar/avatar37.gif
+++ b/www-ssl/pic/avatar/avatar37.gif
diff --git a/www-ssl/pic/avatar/avatar370.gif b/www-ssl/pic/avatar/avatar370.gif
index d5dbc5df..d5dbc5df 100755..100644
--- a/www-ssl/pic/avatar/avatar370.gif
+++ b/www-ssl/pic/avatar/avatar370.gif
diff --git a/www-ssl/pic/avatar/avatar371.gif b/www-ssl/pic/avatar/avatar371.gif
index 868546f7..868546f7 100755..100644
--- a/www-ssl/pic/avatar/avatar371.gif
+++ b/www-ssl/pic/avatar/avatar371.gif
diff --git a/www-ssl/pic/avatar/avatar372.gif b/www-ssl/pic/avatar/avatar372.gif
index 6458885d..6458885d 100755..100644
--- a/www-ssl/pic/avatar/avatar372.gif
+++ b/www-ssl/pic/avatar/avatar372.gif
diff --git a/www-ssl/pic/avatar/avatar373.gif b/www-ssl/pic/avatar/avatar373.gif
index b1e04070..b1e04070 100755..100644
--- a/www-ssl/pic/avatar/avatar373.gif
+++ b/www-ssl/pic/avatar/avatar373.gif
diff --git a/www-ssl/pic/avatar/avatar374.gif b/www-ssl/pic/avatar/avatar374.gif
index e29653ba..e29653ba 100755..100644
--- a/www-ssl/pic/avatar/avatar374.gif
+++ b/www-ssl/pic/avatar/avatar374.gif
diff --git a/www-ssl/pic/avatar/avatar375.gif b/www-ssl/pic/avatar/avatar375.gif
index e5aefc87..e5aefc87 100755..100644
--- a/www-ssl/pic/avatar/avatar375.gif
+++ b/www-ssl/pic/avatar/avatar375.gif
diff --git a/www-ssl/pic/avatar/avatar376.gif b/www-ssl/pic/avatar/avatar376.gif
index b5785477..b5785477 100755..100644
--- a/www-ssl/pic/avatar/avatar376.gif
+++ b/www-ssl/pic/avatar/avatar376.gif
diff --git a/www-ssl/pic/avatar/avatar377.gif b/www-ssl/pic/avatar/avatar377.gif
index 67fd7cf4..67fd7cf4 100755..100644
--- a/www-ssl/pic/avatar/avatar377.gif
+++ b/www-ssl/pic/avatar/avatar377.gif
diff --git a/www-ssl/pic/avatar/avatar378.gif b/www-ssl/pic/avatar/avatar378.gif
index c3924d9c..c3924d9c 100755..100644
--- a/www-ssl/pic/avatar/avatar378.gif
+++ b/www-ssl/pic/avatar/avatar378.gif
diff --git a/www-ssl/pic/avatar/avatar379.gif b/www-ssl/pic/avatar/avatar379.gif
index def8a49d..def8a49d 100755..100644
--- a/www-ssl/pic/avatar/avatar379.gif
+++ b/www-ssl/pic/avatar/avatar379.gif
diff --git a/www-ssl/pic/avatar/avatar38.gif b/www-ssl/pic/avatar/avatar38.gif
index 109ce01a..109ce01a 100755..100644
--- a/www-ssl/pic/avatar/avatar38.gif
+++ b/www-ssl/pic/avatar/avatar38.gif
diff --git a/www-ssl/pic/avatar/avatar380.gif b/www-ssl/pic/avatar/avatar380.gif
index d02ed852..d02ed852 100755..100644
--- a/www-ssl/pic/avatar/avatar380.gif
+++ b/www-ssl/pic/avatar/avatar380.gif
diff --git a/www-ssl/pic/avatar/avatar381.gif b/www-ssl/pic/avatar/avatar381.gif
index 762871c2..762871c2 100755..100644
--- a/www-ssl/pic/avatar/avatar381.gif
+++ b/www-ssl/pic/avatar/avatar381.gif
diff --git a/www-ssl/pic/avatar/avatar382.gif b/www-ssl/pic/avatar/avatar382.gif
index 201872f9..201872f9 100755..100644
--- a/www-ssl/pic/avatar/avatar382.gif
+++ b/www-ssl/pic/avatar/avatar382.gif
diff --git a/www-ssl/pic/avatar/avatar383.gif b/www-ssl/pic/avatar/avatar383.gif
index a71bbad9..a71bbad9 100755..100644
--- a/www-ssl/pic/avatar/avatar383.gif
+++ b/www-ssl/pic/avatar/avatar383.gif
diff --git a/www-ssl/pic/avatar/avatar384.gif b/www-ssl/pic/avatar/avatar384.gif
index 6a9e2a45..6a9e2a45 100755..100644
--- a/www-ssl/pic/avatar/avatar384.gif
+++ b/www-ssl/pic/avatar/avatar384.gif
diff --git a/www-ssl/pic/avatar/avatar385.gif b/www-ssl/pic/avatar/avatar385.gif
index 8b51fdef..8b51fdef 100755..100644
--- a/www-ssl/pic/avatar/avatar385.gif
+++ b/www-ssl/pic/avatar/avatar385.gif
diff --git a/www-ssl/pic/avatar/avatar386.gif b/www-ssl/pic/avatar/avatar386.gif
index e1d42707..e1d42707 100755..100644
--- a/www-ssl/pic/avatar/avatar386.gif
+++ b/www-ssl/pic/avatar/avatar386.gif
diff --git a/www-ssl/pic/avatar/avatar387.gif b/www-ssl/pic/avatar/avatar387.gif
index 186869c5..186869c5 100755..100644
--- a/www-ssl/pic/avatar/avatar387.gif
+++ b/www-ssl/pic/avatar/avatar387.gif
diff --git a/www-ssl/pic/avatar/avatar388.gif b/www-ssl/pic/avatar/avatar388.gif
index 369f01bb..369f01bb 100755..100644
--- a/www-ssl/pic/avatar/avatar388.gif
+++ b/www-ssl/pic/avatar/avatar388.gif
diff --git a/www-ssl/pic/avatar/avatar389.gif b/www-ssl/pic/avatar/avatar389.gif
index d0cb95e4..d0cb95e4 100755..100644
--- a/www-ssl/pic/avatar/avatar389.gif
+++ b/www-ssl/pic/avatar/avatar389.gif
diff --git a/www-ssl/pic/avatar/avatar39.gif b/www-ssl/pic/avatar/avatar39.gif
index 307632c4..307632c4 100755..100644
--- a/www-ssl/pic/avatar/avatar39.gif
+++ b/www-ssl/pic/avatar/avatar39.gif
diff --git a/www-ssl/pic/avatar/avatar390.gif b/www-ssl/pic/avatar/avatar390.gif
index 901e2a4e..901e2a4e 100755..100644
--- a/www-ssl/pic/avatar/avatar390.gif
+++ b/www-ssl/pic/avatar/avatar390.gif
diff --git a/www-ssl/pic/avatar/avatar391.gif b/www-ssl/pic/avatar/avatar391.gif
index 65f58627..65f58627 100755..100644
--- a/www-ssl/pic/avatar/avatar391.gif
+++ b/www-ssl/pic/avatar/avatar391.gif
diff --git a/www-ssl/pic/avatar/avatar392.gif b/www-ssl/pic/avatar/avatar392.gif
index ff98710d..ff98710d 100755..100644
--- a/www-ssl/pic/avatar/avatar392.gif
+++ b/www-ssl/pic/avatar/avatar392.gif
diff --git a/www-ssl/pic/avatar/avatar393.gif b/www-ssl/pic/avatar/avatar393.gif
index 693be70b..693be70b 100755..100644
--- a/www-ssl/pic/avatar/avatar393.gif
+++ b/www-ssl/pic/avatar/avatar393.gif
diff --git a/www-ssl/pic/avatar/avatar394.gif b/www-ssl/pic/avatar/avatar394.gif
index baf43448..baf43448 100755..100644
--- a/www-ssl/pic/avatar/avatar394.gif
+++ b/www-ssl/pic/avatar/avatar394.gif
diff --git a/www-ssl/pic/avatar/avatar395.gif b/www-ssl/pic/avatar/avatar395.gif
index bff14e63..bff14e63 100755..100644
--- a/www-ssl/pic/avatar/avatar395.gif
+++ b/www-ssl/pic/avatar/avatar395.gif
diff --git a/www-ssl/pic/avatar/avatar396.gif b/www-ssl/pic/avatar/avatar396.gif
index 882469c0..882469c0 100755..100644
--- a/www-ssl/pic/avatar/avatar396.gif
+++ b/www-ssl/pic/avatar/avatar396.gif
diff --git a/www-ssl/pic/avatar/avatar397.gif b/www-ssl/pic/avatar/avatar397.gif
index de246f0d..de246f0d 100755..100644
--- a/www-ssl/pic/avatar/avatar397.gif
+++ b/www-ssl/pic/avatar/avatar397.gif
diff --git a/www-ssl/pic/avatar/avatar398.gif b/www-ssl/pic/avatar/avatar398.gif
index 07bae656..07bae656 100755..100644
--- a/www-ssl/pic/avatar/avatar398.gif
+++ b/www-ssl/pic/avatar/avatar398.gif
diff --git a/www-ssl/pic/avatar/avatar399.gif b/www-ssl/pic/avatar/avatar399.gif
index c3b92047..c3b92047 100755..100644
--- a/www-ssl/pic/avatar/avatar399.gif
+++ b/www-ssl/pic/avatar/avatar399.gif
diff --git a/www-ssl/pic/avatar/avatar4.gif b/www-ssl/pic/avatar/avatar4.gif
index e525aa86..e525aa86 100755..100644
--- a/www-ssl/pic/avatar/avatar4.gif
+++ b/www-ssl/pic/avatar/avatar4.gif
diff --git a/www-ssl/pic/avatar/avatar40.gif b/www-ssl/pic/avatar/avatar40.gif
index 34e32133..34e32133 100755..100644
--- a/www-ssl/pic/avatar/avatar40.gif
+++ b/www-ssl/pic/avatar/avatar40.gif
diff --git a/www-ssl/pic/avatar/avatar400.gif b/www-ssl/pic/avatar/avatar400.gif
index fe77d5a7..fe77d5a7 100755..100644
--- a/www-ssl/pic/avatar/avatar400.gif
+++ b/www-ssl/pic/avatar/avatar400.gif
diff --git a/www-ssl/pic/avatar/avatar401.gif b/www-ssl/pic/avatar/avatar401.gif
index a4d84be4..a4d84be4 100755..100644
--- a/www-ssl/pic/avatar/avatar401.gif
+++ b/www-ssl/pic/avatar/avatar401.gif
diff --git a/www-ssl/pic/avatar/avatar402.gif b/www-ssl/pic/avatar/avatar402.gif
index f8b7834f..f8b7834f 100755..100644
--- a/www-ssl/pic/avatar/avatar402.gif
+++ b/www-ssl/pic/avatar/avatar402.gif
diff --git a/www-ssl/pic/avatar/avatar403.gif b/www-ssl/pic/avatar/avatar403.gif
index 7f5f4bcb..7f5f4bcb 100755..100644
--- a/www-ssl/pic/avatar/avatar403.gif
+++ b/www-ssl/pic/avatar/avatar403.gif
diff --git a/www-ssl/pic/avatar/avatar404.gif b/www-ssl/pic/avatar/avatar404.gif
index 00ac94bc..00ac94bc 100755..100644
--- a/www-ssl/pic/avatar/avatar404.gif
+++ b/www-ssl/pic/avatar/avatar404.gif
diff --git a/www-ssl/pic/avatar/avatar405.gif b/www-ssl/pic/avatar/avatar405.gif
index c8b2506c..c8b2506c 100755..100644
--- a/www-ssl/pic/avatar/avatar405.gif
+++ b/www-ssl/pic/avatar/avatar405.gif
diff --git a/www-ssl/pic/avatar/avatar406.gif b/www-ssl/pic/avatar/avatar406.gif
index 831ccfc6..831ccfc6 100755..100644
--- a/www-ssl/pic/avatar/avatar406.gif
+++ b/www-ssl/pic/avatar/avatar406.gif
diff --git a/www-ssl/pic/avatar/avatar407.gif b/www-ssl/pic/avatar/avatar407.gif
index 9b989638..9b989638 100755..100644
--- a/www-ssl/pic/avatar/avatar407.gif
+++ b/www-ssl/pic/avatar/avatar407.gif
diff --git a/www-ssl/pic/avatar/avatar408.gif b/www-ssl/pic/avatar/avatar408.gif
index 5699f755..5699f755 100755..100644
--- a/www-ssl/pic/avatar/avatar408.gif
+++ b/www-ssl/pic/avatar/avatar408.gif
diff --git a/www-ssl/pic/avatar/avatar409.gif b/www-ssl/pic/avatar/avatar409.gif
index 4300f609..4300f609 100755..100644
--- a/www-ssl/pic/avatar/avatar409.gif
+++ b/www-ssl/pic/avatar/avatar409.gif
diff --git a/www-ssl/pic/avatar/avatar41.gif b/www-ssl/pic/avatar/avatar41.gif
index f6f631ba..f6f631ba 100755..100644
--- a/www-ssl/pic/avatar/avatar41.gif
+++ b/www-ssl/pic/avatar/avatar41.gif
diff --git a/www-ssl/pic/avatar/avatar410.gif b/www-ssl/pic/avatar/avatar410.gif
index a2ddb3e0..a2ddb3e0 100755..100644
--- a/www-ssl/pic/avatar/avatar410.gif
+++ b/www-ssl/pic/avatar/avatar410.gif
diff --git a/www-ssl/pic/avatar/avatar411.gif b/www-ssl/pic/avatar/avatar411.gif
index 8658510f..8658510f 100755..100644
--- a/www-ssl/pic/avatar/avatar411.gif
+++ b/www-ssl/pic/avatar/avatar411.gif
diff --git a/www-ssl/pic/avatar/avatar412.gif b/www-ssl/pic/avatar/avatar412.gif
index 1a4bae4b..1a4bae4b 100755..100644
--- a/www-ssl/pic/avatar/avatar412.gif
+++ b/www-ssl/pic/avatar/avatar412.gif
diff --git a/www-ssl/pic/avatar/avatar413.gif b/www-ssl/pic/avatar/avatar413.gif
index 14eb3a92..14eb3a92 100755..100644
--- a/www-ssl/pic/avatar/avatar413.gif
+++ b/www-ssl/pic/avatar/avatar413.gif
diff --git a/www-ssl/pic/avatar/avatar414.gif b/www-ssl/pic/avatar/avatar414.gif
index 5f23cc79..5f23cc79 100755..100644
--- a/www-ssl/pic/avatar/avatar414.gif
+++ b/www-ssl/pic/avatar/avatar414.gif
diff --git a/www-ssl/pic/avatar/avatar415.gif b/www-ssl/pic/avatar/avatar415.gif
index c7312a64..c7312a64 100755..100644
--- a/www-ssl/pic/avatar/avatar415.gif
+++ b/www-ssl/pic/avatar/avatar415.gif
diff --git a/www-ssl/pic/avatar/avatar416.gif b/www-ssl/pic/avatar/avatar416.gif
index fee5e41b..fee5e41b 100755..100644
--- a/www-ssl/pic/avatar/avatar416.gif
+++ b/www-ssl/pic/avatar/avatar416.gif
diff --git a/www-ssl/pic/avatar/avatar417.gif b/www-ssl/pic/avatar/avatar417.gif
index d3b3dbbe..d3b3dbbe 100755..100644
--- a/www-ssl/pic/avatar/avatar417.gif
+++ b/www-ssl/pic/avatar/avatar417.gif
diff --git a/www-ssl/pic/avatar/avatar418.gif b/www-ssl/pic/avatar/avatar418.gif
index 3f648c4f..3f648c4f 100755..100644
--- a/www-ssl/pic/avatar/avatar418.gif
+++ b/www-ssl/pic/avatar/avatar418.gif
diff --git a/www-ssl/pic/avatar/avatar419.gif b/www-ssl/pic/avatar/avatar419.gif
index 87587fe5..87587fe5 100755..100644
--- a/www-ssl/pic/avatar/avatar419.gif
+++ b/www-ssl/pic/avatar/avatar419.gif
diff --git a/www-ssl/pic/avatar/avatar42.gif b/www-ssl/pic/avatar/avatar42.gif
index 5828d2af..5828d2af 100755..100644
--- a/www-ssl/pic/avatar/avatar42.gif
+++ b/www-ssl/pic/avatar/avatar42.gif
diff --git a/www-ssl/pic/avatar/avatar420.gif b/www-ssl/pic/avatar/avatar420.gif
index 2aca0620..2aca0620 100755..100644
--- a/www-ssl/pic/avatar/avatar420.gif
+++ b/www-ssl/pic/avatar/avatar420.gif
diff --git a/www-ssl/pic/avatar/avatar421.gif b/www-ssl/pic/avatar/avatar421.gif
index 152f5252..152f5252 100755..100644
--- a/www-ssl/pic/avatar/avatar421.gif
+++ b/www-ssl/pic/avatar/avatar421.gif
diff --git a/www-ssl/pic/avatar/avatar422.gif b/www-ssl/pic/avatar/avatar422.gif
index 228f17d5..228f17d5 100755..100644
--- a/www-ssl/pic/avatar/avatar422.gif
+++ b/www-ssl/pic/avatar/avatar422.gif
diff --git a/www-ssl/pic/avatar/avatar423.gif b/www-ssl/pic/avatar/avatar423.gif
index 5f25f9c4..5f25f9c4 100755..100644
--- a/www-ssl/pic/avatar/avatar423.gif
+++ b/www-ssl/pic/avatar/avatar423.gif
diff --git a/www-ssl/pic/avatar/avatar424.gif b/www-ssl/pic/avatar/avatar424.gif
index d8e9b029..d8e9b029 100755..100644
--- a/www-ssl/pic/avatar/avatar424.gif
+++ b/www-ssl/pic/avatar/avatar424.gif
diff --git a/www-ssl/pic/avatar/avatar425.gif b/www-ssl/pic/avatar/avatar425.gif
index ec35e12b..ec35e12b 100755..100644
--- a/www-ssl/pic/avatar/avatar425.gif
+++ b/www-ssl/pic/avatar/avatar425.gif
diff --git a/www-ssl/pic/avatar/avatar426.gif b/www-ssl/pic/avatar/avatar426.gif
index 9e13452d..9e13452d 100755..100644
--- a/www-ssl/pic/avatar/avatar426.gif
+++ b/www-ssl/pic/avatar/avatar426.gif
diff --git a/www-ssl/pic/avatar/avatar427.gif b/www-ssl/pic/avatar/avatar427.gif
index aca392ec..aca392ec 100755..100644
--- a/www-ssl/pic/avatar/avatar427.gif
+++ b/www-ssl/pic/avatar/avatar427.gif
diff --git a/www-ssl/pic/avatar/avatar428.gif b/www-ssl/pic/avatar/avatar428.gif
index 2663bb30..2663bb30 100755..100644
--- a/www-ssl/pic/avatar/avatar428.gif
+++ b/www-ssl/pic/avatar/avatar428.gif
diff --git a/www-ssl/pic/avatar/avatar429.gif b/www-ssl/pic/avatar/avatar429.gif
index f6ae8487..f6ae8487 100755..100644
--- a/www-ssl/pic/avatar/avatar429.gif
+++ b/www-ssl/pic/avatar/avatar429.gif
diff --git a/www-ssl/pic/avatar/avatar43.gif b/www-ssl/pic/avatar/avatar43.gif
index 4ba29bd2..4ba29bd2 100755..100644
--- a/www-ssl/pic/avatar/avatar43.gif
+++ b/www-ssl/pic/avatar/avatar43.gif
diff --git a/www-ssl/pic/avatar/avatar430.gif b/www-ssl/pic/avatar/avatar430.gif
index f64e8229..f64e8229 100755..100644
--- a/www-ssl/pic/avatar/avatar430.gif
+++ b/www-ssl/pic/avatar/avatar430.gif
diff --git a/www-ssl/pic/avatar/avatar431.gif b/www-ssl/pic/avatar/avatar431.gif
index 28791161..28791161 100755..100644
--- a/www-ssl/pic/avatar/avatar431.gif
+++ b/www-ssl/pic/avatar/avatar431.gif
diff --git a/www-ssl/pic/avatar/avatar432.gif b/www-ssl/pic/avatar/avatar432.gif
index 7edc6132..7edc6132 100755..100644
--- a/www-ssl/pic/avatar/avatar432.gif
+++ b/www-ssl/pic/avatar/avatar432.gif
diff --git a/www-ssl/pic/avatar/avatar433.gif b/www-ssl/pic/avatar/avatar433.gif
index b300940b..b300940b 100755..100644
--- a/www-ssl/pic/avatar/avatar433.gif
+++ b/www-ssl/pic/avatar/avatar433.gif
diff --git a/www-ssl/pic/avatar/avatar434.gif b/www-ssl/pic/avatar/avatar434.gif
index 020863e3..020863e3 100755..100644
--- a/www-ssl/pic/avatar/avatar434.gif
+++ b/www-ssl/pic/avatar/avatar434.gif
diff --git a/www-ssl/pic/avatar/avatar435.gif b/www-ssl/pic/avatar/avatar435.gif
index 98122e5b..98122e5b 100755..100644
--- a/www-ssl/pic/avatar/avatar435.gif
+++ b/www-ssl/pic/avatar/avatar435.gif
diff --git a/www-ssl/pic/avatar/avatar436.gif b/www-ssl/pic/avatar/avatar436.gif
index 7698c886..7698c886 100755..100644
--- a/www-ssl/pic/avatar/avatar436.gif
+++ b/www-ssl/pic/avatar/avatar436.gif
diff --git a/www-ssl/pic/avatar/avatar437.gif b/www-ssl/pic/avatar/avatar437.gif
index 262ace97..262ace97 100755..100644
--- a/www-ssl/pic/avatar/avatar437.gif
+++ b/www-ssl/pic/avatar/avatar437.gif
diff --git a/www-ssl/pic/avatar/avatar438.gif b/www-ssl/pic/avatar/avatar438.gif
index 84033e11..84033e11 100755..100644
--- a/www-ssl/pic/avatar/avatar438.gif
+++ b/www-ssl/pic/avatar/avatar438.gif
diff --git a/www-ssl/pic/avatar/avatar439.gif b/www-ssl/pic/avatar/avatar439.gif
index 04fb6876..04fb6876 100755..100644
--- a/www-ssl/pic/avatar/avatar439.gif
+++ b/www-ssl/pic/avatar/avatar439.gif
diff --git a/www-ssl/pic/avatar/avatar44.gif b/www-ssl/pic/avatar/avatar44.gif
index 9db2cd9f..9db2cd9f 100755..100644
--- a/www-ssl/pic/avatar/avatar44.gif
+++ b/www-ssl/pic/avatar/avatar44.gif
diff --git a/www-ssl/pic/avatar/avatar440.gif b/www-ssl/pic/avatar/avatar440.gif
index b414dfcb..b414dfcb 100755..100644
--- a/www-ssl/pic/avatar/avatar440.gif
+++ b/www-ssl/pic/avatar/avatar440.gif
diff --git a/www-ssl/pic/avatar/avatar441.gif b/www-ssl/pic/avatar/avatar441.gif
index db79f0c8..db79f0c8 100755..100644
--- a/www-ssl/pic/avatar/avatar441.gif
+++ b/www-ssl/pic/avatar/avatar441.gif
diff --git a/www-ssl/pic/avatar/avatar442.gif b/www-ssl/pic/avatar/avatar442.gif
index 341395ac..341395ac 100755..100644
--- a/www-ssl/pic/avatar/avatar442.gif
+++ b/www-ssl/pic/avatar/avatar442.gif
diff --git a/www-ssl/pic/avatar/avatar443.gif b/www-ssl/pic/avatar/avatar443.gif
index 063034ac..063034ac 100755..100644
--- a/www-ssl/pic/avatar/avatar443.gif
+++ b/www-ssl/pic/avatar/avatar443.gif
diff --git a/www-ssl/pic/avatar/avatar444.gif b/www-ssl/pic/avatar/avatar444.gif
index c4f6aa92..c4f6aa92 100755..100644
--- a/www-ssl/pic/avatar/avatar444.gif
+++ b/www-ssl/pic/avatar/avatar444.gif
diff --git a/www-ssl/pic/avatar/avatar445.gif b/www-ssl/pic/avatar/avatar445.gif
index 5c26ccb3..5c26ccb3 100755..100644
--- a/www-ssl/pic/avatar/avatar445.gif
+++ b/www-ssl/pic/avatar/avatar445.gif
diff --git a/www-ssl/pic/avatar/avatar446.gif b/www-ssl/pic/avatar/avatar446.gif
index 0e14a043..0e14a043 100755..100644
--- a/www-ssl/pic/avatar/avatar446.gif
+++ b/www-ssl/pic/avatar/avatar446.gif
diff --git a/www-ssl/pic/avatar/avatar447.gif b/www-ssl/pic/avatar/avatar447.gif
index 8622aafb..8622aafb 100755..100644
--- a/www-ssl/pic/avatar/avatar447.gif
+++ b/www-ssl/pic/avatar/avatar447.gif
diff --git a/www-ssl/pic/avatar/avatar448.gif b/www-ssl/pic/avatar/avatar448.gif
index 3e35bfe4..3e35bfe4 100755..100644
--- a/www-ssl/pic/avatar/avatar448.gif
+++ b/www-ssl/pic/avatar/avatar448.gif
diff --git a/www-ssl/pic/avatar/avatar449.gif b/www-ssl/pic/avatar/avatar449.gif
index d53551f8..d53551f8 100755..100644
--- a/www-ssl/pic/avatar/avatar449.gif
+++ b/www-ssl/pic/avatar/avatar449.gif
diff --git a/www-ssl/pic/avatar/avatar45.gif b/www-ssl/pic/avatar/avatar45.gif
index c216f489..c216f489 100755..100644
--- a/www-ssl/pic/avatar/avatar45.gif
+++ b/www-ssl/pic/avatar/avatar45.gif
diff --git a/www-ssl/pic/avatar/avatar450.gif b/www-ssl/pic/avatar/avatar450.gif
index 6e0ab918..6e0ab918 100755..100644
--- a/www-ssl/pic/avatar/avatar450.gif
+++ b/www-ssl/pic/avatar/avatar450.gif
diff --git a/www-ssl/pic/avatar/avatar451.gif b/www-ssl/pic/avatar/avatar451.gif
index 7d0d79bd..7d0d79bd 100755..100644
--- a/www-ssl/pic/avatar/avatar451.gif
+++ b/www-ssl/pic/avatar/avatar451.gif
diff --git a/www-ssl/pic/avatar/avatar452.gif b/www-ssl/pic/avatar/avatar452.gif
index c64e07fc..c64e07fc 100755..100644
--- a/www-ssl/pic/avatar/avatar452.gif
+++ b/www-ssl/pic/avatar/avatar452.gif
diff --git a/www-ssl/pic/avatar/avatar453.gif b/www-ssl/pic/avatar/avatar453.gif
index 22f597a4..22f597a4 100755..100644
--- a/www-ssl/pic/avatar/avatar453.gif
+++ b/www-ssl/pic/avatar/avatar453.gif
diff --git a/www-ssl/pic/avatar/avatar454.gif b/www-ssl/pic/avatar/avatar454.gif
index 81fd63c4..81fd63c4 100755..100644
--- a/www-ssl/pic/avatar/avatar454.gif
+++ b/www-ssl/pic/avatar/avatar454.gif
diff --git a/www-ssl/pic/avatar/avatar455.gif b/www-ssl/pic/avatar/avatar455.gif
index 8e6e39ee..8e6e39ee 100755..100644
--- a/www-ssl/pic/avatar/avatar455.gif
+++ b/www-ssl/pic/avatar/avatar455.gif
diff --git a/www-ssl/pic/avatar/avatar456.gif b/www-ssl/pic/avatar/avatar456.gif
index 6fba116c..6fba116c 100755..100644
--- a/www-ssl/pic/avatar/avatar456.gif
+++ b/www-ssl/pic/avatar/avatar456.gif
diff --git a/www-ssl/pic/avatar/avatar457.gif b/www-ssl/pic/avatar/avatar457.gif
index 1a685aa9..1a685aa9 100755..100644
--- a/www-ssl/pic/avatar/avatar457.gif
+++ b/www-ssl/pic/avatar/avatar457.gif
diff --git a/www-ssl/pic/avatar/avatar458.gif b/www-ssl/pic/avatar/avatar458.gif
index 20f5e33a..20f5e33a 100755..100644
--- a/www-ssl/pic/avatar/avatar458.gif
+++ b/www-ssl/pic/avatar/avatar458.gif
diff --git a/www-ssl/pic/avatar/avatar459.gif b/www-ssl/pic/avatar/avatar459.gif
index 049cfc17..049cfc17 100755..100644
--- a/www-ssl/pic/avatar/avatar459.gif
+++ b/www-ssl/pic/avatar/avatar459.gif
diff --git a/www-ssl/pic/avatar/avatar46.gif b/www-ssl/pic/avatar/avatar46.gif
index 112346ca..112346ca 100755..100644
--- a/www-ssl/pic/avatar/avatar46.gif
+++ b/www-ssl/pic/avatar/avatar46.gif
diff --git a/www-ssl/pic/avatar/avatar460.gif b/www-ssl/pic/avatar/avatar460.gif
index 155e84b5..155e84b5 100755..100644
--- a/www-ssl/pic/avatar/avatar460.gif
+++ b/www-ssl/pic/avatar/avatar460.gif
diff --git a/www-ssl/pic/avatar/avatar461.gif b/www-ssl/pic/avatar/avatar461.gif
index 28057664..28057664 100755..100644
--- a/www-ssl/pic/avatar/avatar461.gif
+++ b/www-ssl/pic/avatar/avatar461.gif
diff --git a/www-ssl/pic/avatar/avatar462.gif b/www-ssl/pic/avatar/avatar462.gif
index acd3d942..acd3d942 100755..100644
--- a/www-ssl/pic/avatar/avatar462.gif
+++ b/www-ssl/pic/avatar/avatar462.gif
diff --git a/www-ssl/pic/avatar/avatar463.gif b/www-ssl/pic/avatar/avatar463.gif
index caf0b9c5..caf0b9c5 100755..100644
--- a/www-ssl/pic/avatar/avatar463.gif
+++ b/www-ssl/pic/avatar/avatar463.gif
diff --git a/www-ssl/pic/avatar/avatar464.gif b/www-ssl/pic/avatar/avatar464.gif
index 30a066f3..30a066f3 100755..100644
--- a/www-ssl/pic/avatar/avatar464.gif
+++ b/www-ssl/pic/avatar/avatar464.gif
diff --git a/www-ssl/pic/avatar/avatar465.gif b/www-ssl/pic/avatar/avatar465.gif
index 768c4003..768c4003 100755..100644
--- a/www-ssl/pic/avatar/avatar465.gif
+++ b/www-ssl/pic/avatar/avatar465.gif
diff --git a/www-ssl/pic/avatar/avatar466.gif b/www-ssl/pic/avatar/avatar466.gif
index ddf8c54c..ddf8c54c 100755..100644
--- a/www-ssl/pic/avatar/avatar466.gif
+++ b/www-ssl/pic/avatar/avatar466.gif
diff --git a/www-ssl/pic/avatar/avatar467.gif b/www-ssl/pic/avatar/avatar467.gif
index c293c4c8..c293c4c8 100755..100644
--- a/www-ssl/pic/avatar/avatar467.gif
+++ b/www-ssl/pic/avatar/avatar467.gif
diff --git a/www-ssl/pic/avatar/avatar468.gif b/www-ssl/pic/avatar/avatar468.gif
index ec0c778f..ec0c778f 100755..100644
--- a/www-ssl/pic/avatar/avatar468.gif
+++ b/www-ssl/pic/avatar/avatar468.gif
diff --git a/www-ssl/pic/avatar/avatar469.gif b/www-ssl/pic/avatar/avatar469.gif
index 12a62367..12a62367 100755..100644
--- a/www-ssl/pic/avatar/avatar469.gif
+++ b/www-ssl/pic/avatar/avatar469.gif
diff --git a/www-ssl/pic/avatar/avatar47.gif b/www-ssl/pic/avatar/avatar47.gif
index f9edc8c9..f9edc8c9 100755..100644
--- a/www-ssl/pic/avatar/avatar47.gif
+++ b/www-ssl/pic/avatar/avatar47.gif
diff --git a/www-ssl/pic/avatar/avatar470.gif b/www-ssl/pic/avatar/avatar470.gif
index a6feb187..a6feb187 100755..100644
--- a/www-ssl/pic/avatar/avatar470.gif
+++ b/www-ssl/pic/avatar/avatar470.gif
diff --git a/www-ssl/pic/avatar/avatar471.gif b/www-ssl/pic/avatar/avatar471.gif
index 3ce796c4..3ce796c4 100755..100644
--- a/www-ssl/pic/avatar/avatar471.gif
+++ b/www-ssl/pic/avatar/avatar471.gif
diff --git a/www-ssl/pic/avatar/avatar472.gif b/www-ssl/pic/avatar/avatar472.gif
index 467432c9..467432c9 100755..100644
--- a/www-ssl/pic/avatar/avatar472.gif
+++ b/www-ssl/pic/avatar/avatar472.gif
diff --git a/www-ssl/pic/avatar/avatar473.gif b/www-ssl/pic/avatar/avatar473.gif
index 47bf9a19..47bf9a19 100755..100644
--- a/www-ssl/pic/avatar/avatar473.gif
+++ b/www-ssl/pic/avatar/avatar473.gif
diff --git a/www-ssl/pic/avatar/avatar474.gif b/www-ssl/pic/avatar/avatar474.gif
index 7518dc8d..7518dc8d 100755..100644
--- a/www-ssl/pic/avatar/avatar474.gif
+++ b/www-ssl/pic/avatar/avatar474.gif
diff --git a/www-ssl/pic/avatar/avatar475.gif b/www-ssl/pic/avatar/avatar475.gif
index 1cd12980..1cd12980 100755..100644
--- a/www-ssl/pic/avatar/avatar475.gif
+++ b/www-ssl/pic/avatar/avatar475.gif
diff --git a/www-ssl/pic/avatar/avatar476.gif b/www-ssl/pic/avatar/avatar476.gif
index b300940b..b300940b 100755..100644
--- a/www-ssl/pic/avatar/avatar476.gif
+++ b/www-ssl/pic/avatar/avatar476.gif
diff --git a/www-ssl/pic/avatar/avatar477.gif b/www-ssl/pic/avatar/avatar477.gif
index d2ea55a0..d2ea55a0 100755..100644
--- a/www-ssl/pic/avatar/avatar477.gif
+++ b/www-ssl/pic/avatar/avatar477.gif
diff --git a/www-ssl/pic/avatar/avatar478.gif b/www-ssl/pic/avatar/avatar478.gif
index 924b2282..924b2282 100755..100644
--- a/www-ssl/pic/avatar/avatar478.gif
+++ b/www-ssl/pic/avatar/avatar478.gif
diff --git a/www-ssl/pic/avatar/avatar479.gif b/www-ssl/pic/avatar/avatar479.gif
index 1b4756ee..1b4756ee 100755..100644
--- a/www-ssl/pic/avatar/avatar479.gif
+++ b/www-ssl/pic/avatar/avatar479.gif
diff --git a/www-ssl/pic/avatar/avatar48.gif b/www-ssl/pic/avatar/avatar48.gif
index c34d4a50..c34d4a50 100755..100644
--- a/www-ssl/pic/avatar/avatar48.gif
+++ b/www-ssl/pic/avatar/avatar48.gif
diff --git a/www-ssl/pic/avatar/avatar480.gif b/www-ssl/pic/avatar/avatar480.gif
index 5fa9878f..5fa9878f 100755..100644
--- a/www-ssl/pic/avatar/avatar480.gif
+++ b/www-ssl/pic/avatar/avatar480.gif
diff --git a/www-ssl/pic/avatar/avatar481.gif b/www-ssl/pic/avatar/avatar481.gif
index f48cf52f..f48cf52f 100755..100644
--- a/www-ssl/pic/avatar/avatar481.gif
+++ b/www-ssl/pic/avatar/avatar481.gif
diff --git a/www-ssl/pic/avatar/avatar482.gif b/www-ssl/pic/avatar/avatar482.gif
index 754fa21c..754fa21c 100755..100644
--- a/www-ssl/pic/avatar/avatar482.gif
+++ b/www-ssl/pic/avatar/avatar482.gif
diff --git a/www-ssl/pic/avatar/avatar483.gif b/www-ssl/pic/avatar/avatar483.gif
index d72a4c09..d72a4c09 100755..100644
--- a/www-ssl/pic/avatar/avatar483.gif
+++ b/www-ssl/pic/avatar/avatar483.gif
diff --git a/www-ssl/pic/avatar/avatar484.gif b/www-ssl/pic/avatar/avatar484.gif
index 7429a913..7429a913 100755..100644
--- a/www-ssl/pic/avatar/avatar484.gif
+++ b/www-ssl/pic/avatar/avatar484.gif
diff --git a/www-ssl/pic/avatar/avatar485.gif b/www-ssl/pic/avatar/avatar485.gif
index aab93132..aab93132 100755..100644
--- a/www-ssl/pic/avatar/avatar485.gif
+++ b/www-ssl/pic/avatar/avatar485.gif
diff --git a/www-ssl/pic/avatar/avatar486.gif b/www-ssl/pic/avatar/avatar486.gif
index 99278401..99278401 100755..100644
--- a/www-ssl/pic/avatar/avatar486.gif
+++ b/www-ssl/pic/avatar/avatar486.gif
diff --git a/www-ssl/pic/avatar/avatar487.gif b/www-ssl/pic/avatar/avatar487.gif
index 2e41a5e9..2e41a5e9 100755..100644
--- a/www-ssl/pic/avatar/avatar487.gif
+++ b/www-ssl/pic/avatar/avatar487.gif
diff --git a/www-ssl/pic/avatar/avatar488.gif b/www-ssl/pic/avatar/avatar488.gif
index 3444526d..3444526d 100755..100644
--- a/www-ssl/pic/avatar/avatar488.gif
+++ b/www-ssl/pic/avatar/avatar488.gif
diff --git a/www-ssl/pic/avatar/avatar489.gif b/www-ssl/pic/avatar/avatar489.gif
index 6f63b13d..6f63b13d 100755..100644
--- a/www-ssl/pic/avatar/avatar489.gif
+++ b/www-ssl/pic/avatar/avatar489.gif
diff --git a/www-ssl/pic/avatar/avatar49.gif b/www-ssl/pic/avatar/avatar49.gif
index 2c637ed0..2c637ed0 100755..100644
--- a/www-ssl/pic/avatar/avatar49.gif
+++ b/www-ssl/pic/avatar/avatar49.gif
diff --git a/www-ssl/pic/avatar/avatar490.gif b/www-ssl/pic/avatar/avatar490.gif
index 80a07e2b..80a07e2b 100755..100644
--- a/www-ssl/pic/avatar/avatar490.gif
+++ b/www-ssl/pic/avatar/avatar490.gif
diff --git a/www-ssl/pic/avatar/avatar491.gif b/www-ssl/pic/avatar/avatar491.gif
index 65bb584e..65bb584e 100755..100644
--- a/www-ssl/pic/avatar/avatar491.gif
+++ b/www-ssl/pic/avatar/avatar491.gif
diff --git a/www-ssl/pic/avatar/avatar492.gif b/www-ssl/pic/avatar/avatar492.gif
index c8ce0d9d..c8ce0d9d 100755..100644
--- a/www-ssl/pic/avatar/avatar492.gif
+++ b/www-ssl/pic/avatar/avatar492.gif
diff --git a/www-ssl/pic/avatar/avatar493.gif b/www-ssl/pic/avatar/avatar493.gif
index 4ed86532..4ed86532 100755..100644
--- a/www-ssl/pic/avatar/avatar493.gif
+++ b/www-ssl/pic/avatar/avatar493.gif
diff --git a/www-ssl/pic/avatar/avatar494.gif b/www-ssl/pic/avatar/avatar494.gif
index 47d5e2e2..47d5e2e2 100755..100644
--- a/www-ssl/pic/avatar/avatar494.gif
+++ b/www-ssl/pic/avatar/avatar494.gif
diff --git a/www-ssl/pic/avatar/avatar495.gif b/www-ssl/pic/avatar/avatar495.gif
index 9b7bdd44..9b7bdd44 100755..100644
--- a/www-ssl/pic/avatar/avatar495.gif
+++ b/www-ssl/pic/avatar/avatar495.gif
diff --git a/www-ssl/pic/avatar/avatar496.gif b/www-ssl/pic/avatar/avatar496.gif
index 2a4429e8..2a4429e8 100755..100644
--- a/www-ssl/pic/avatar/avatar496.gif
+++ b/www-ssl/pic/avatar/avatar496.gif
diff --git a/www-ssl/pic/avatar/avatar497.gif b/www-ssl/pic/avatar/avatar497.gif
index aebb9cad..aebb9cad 100755..100644
--- a/www-ssl/pic/avatar/avatar497.gif
+++ b/www-ssl/pic/avatar/avatar497.gif
diff --git a/www-ssl/pic/avatar/avatar498.gif b/www-ssl/pic/avatar/avatar498.gif
index 2dab371f..2dab371f 100755..100644
--- a/www-ssl/pic/avatar/avatar498.gif
+++ b/www-ssl/pic/avatar/avatar498.gif
diff --git a/www-ssl/pic/avatar/avatar499.gif b/www-ssl/pic/avatar/avatar499.gif
index c23e44fd..c23e44fd 100755..100644
--- a/www-ssl/pic/avatar/avatar499.gif
+++ b/www-ssl/pic/avatar/avatar499.gif
diff --git a/www-ssl/pic/avatar/avatar5.gif b/www-ssl/pic/avatar/avatar5.gif
index c0134ee8..c0134ee8 100755..100644
--- a/www-ssl/pic/avatar/avatar5.gif
+++ b/www-ssl/pic/avatar/avatar5.gif
diff --git a/www-ssl/pic/avatar/avatar50.gif b/www-ssl/pic/avatar/avatar50.gif
index 101883c4..101883c4 100755..100644
--- a/www-ssl/pic/avatar/avatar50.gif
+++ b/www-ssl/pic/avatar/avatar50.gif
diff --git a/www-ssl/pic/avatar/avatar51.gif b/www-ssl/pic/avatar/avatar51.gif
index 310d6f66..310d6f66 100755..100644
--- a/www-ssl/pic/avatar/avatar51.gif
+++ b/www-ssl/pic/avatar/avatar51.gif
diff --git a/www-ssl/pic/avatar/avatar52.gif b/www-ssl/pic/avatar/avatar52.gif
index 01ce7062..01ce7062 100755..100644
--- a/www-ssl/pic/avatar/avatar52.gif
+++ b/www-ssl/pic/avatar/avatar52.gif
diff --git a/www-ssl/pic/avatar/avatar53.gif b/www-ssl/pic/avatar/avatar53.gif
index 7ba2db43..7ba2db43 100755..100644
--- a/www-ssl/pic/avatar/avatar53.gif
+++ b/www-ssl/pic/avatar/avatar53.gif
diff --git a/www-ssl/pic/avatar/avatar54.gif b/www-ssl/pic/avatar/avatar54.gif
index 2f4ef2a0..2f4ef2a0 100755..100644
--- a/www-ssl/pic/avatar/avatar54.gif
+++ b/www-ssl/pic/avatar/avatar54.gif
diff --git a/www-ssl/pic/avatar/avatar55.gif b/www-ssl/pic/avatar/avatar55.gif
index 7e9cd013..7e9cd013 100755..100644
--- a/www-ssl/pic/avatar/avatar55.gif
+++ b/www-ssl/pic/avatar/avatar55.gif
diff --git a/www-ssl/pic/avatar/avatar56.gif b/www-ssl/pic/avatar/avatar56.gif
index e9d115b5..e9d115b5 100755..100644
--- a/www-ssl/pic/avatar/avatar56.gif
+++ b/www-ssl/pic/avatar/avatar56.gif
diff --git a/www-ssl/pic/avatar/avatar57.gif b/www-ssl/pic/avatar/avatar57.gif
index a4d85078..a4d85078 100755..100644
--- a/www-ssl/pic/avatar/avatar57.gif
+++ b/www-ssl/pic/avatar/avatar57.gif
diff --git a/www-ssl/pic/avatar/avatar58.gif b/www-ssl/pic/avatar/avatar58.gif
index 597b70bd..597b70bd 100755..100644
--- a/www-ssl/pic/avatar/avatar58.gif
+++ b/www-ssl/pic/avatar/avatar58.gif
diff --git a/www-ssl/pic/avatar/avatar59.gif b/www-ssl/pic/avatar/avatar59.gif
index 9032b75b..9032b75b 100755..100644
--- a/www-ssl/pic/avatar/avatar59.gif
+++ b/www-ssl/pic/avatar/avatar59.gif
diff --git a/www-ssl/pic/avatar/avatar6.gif b/www-ssl/pic/avatar/avatar6.gif
index 6c0416b1..6c0416b1 100755..100644
--- a/www-ssl/pic/avatar/avatar6.gif
+++ b/www-ssl/pic/avatar/avatar6.gif
diff --git a/www-ssl/pic/avatar/avatar60.gif b/www-ssl/pic/avatar/avatar60.gif
index 33744c36..33744c36 100755..100644
--- a/www-ssl/pic/avatar/avatar60.gif
+++ b/www-ssl/pic/avatar/avatar60.gif
diff --git a/www-ssl/pic/avatar/avatar61.gif b/www-ssl/pic/avatar/avatar61.gif
index a88f6971..a88f6971 100755..100644
--- a/www-ssl/pic/avatar/avatar61.gif
+++ b/www-ssl/pic/avatar/avatar61.gif
diff --git a/www-ssl/pic/avatar/avatar62.gif b/www-ssl/pic/avatar/avatar62.gif
index 4f8d1bee..4f8d1bee 100755..100644
--- a/www-ssl/pic/avatar/avatar62.gif
+++ b/www-ssl/pic/avatar/avatar62.gif
diff --git a/www-ssl/pic/avatar/avatar63.gif b/www-ssl/pic/avatar/avatar63.gif
index d55fe2bd..d55fe2bd 100755..100644
--- a/www-ssl/pic/avatar/avatar63.gif
+++ b/www-ssl/pic/avatar/avatar63.gif
diff --git a/www-ssl/pic/avatar/avatar64.gif b/www-ssl/pic/avatar/avatar64.gif
index b7cf7a83..b7cf7a83 100755..100644
--- a/www-ssl/pic/avatar/avatar64.gif
+++ b/www-ssl/pic/avatar/avatar64.gif
diff --git a/www-ssl/pic/avatar/avatar65.gif b/www-ssl/pic/avatar/avatar65.gif
index e7d2ad6b..e7d2ad6b 100755..100644
--- a/www-ssl/pic/avatar/avatar65.gif
+++ b/www-ssl/pic/avatar/avatar65.gif
diff --git a/www-ssl/pic/avatar/avatar66.gif b/www-ssl/pic/avatar/avatar66.gif
index 0ce01bfc..0ce01bfc 100755..100644
--- a/www-ssl/pic/avatar/avatar66.gif
+++ b/www-ssl/pic/avatar/avatar66.gif
diff --git a/www-ssl/pic/avatar/avatar67.gif b/www-ssl/pic/avatar/avatar67.gif
index a99192c7..a99192c7 100755..100644
--- a/www-ssl/pic/avatar/avatar67.gif
+++ b/www-ssl/pic/avatar/avatar67.gif
diff --git a/www-ssl/pic/avatar/avatar68.gif b/www-ssl/pic/avatar/avatar68.gif
index d41c748c..d41c748c 100755..100644
--- a/www-ssl/pic/avatar/avatar68.gif
+++ b/www-ssl/pic/avatar/avatar68.gif
diff --git a/www-ssl/pic/avatar/avatar69.gif b/www-ssl/pic/avatar/avatar69.gif
index d8e3a099..d8e3a099 100755..100644
--- a/www-ssl/pic/avatar/avatar69.gif
+++ b/www-ssl/pic/avatar/avatar69.gif
diff --git a/www-ssl/pic/avatar/avatar7.gif b/www-ssl/pic/avatar/avatar7.gif
index 32e2aab7..32e2aab7 100755..100644
--- a/www-ssl/pic/avatar/avatar7.gif
+++ b/www-ssl/pic/avatar/avatar7.gif
diff --git a/www-ssl/pic/avatar/avatar70.gif b/www-ssl/pic/avatar/avatar70.gif
index c38e5813..c38e5813 100755..100644
--- a/www-ssl/pic/avatar/avatar70.gif
+++ b/www-ssl/pic/avatar/avatar70.gif
diff --git a/www-ssl/pic/avatar/avatar71.gif b/www-ssl/pic/avatar/avatar71.gif
index bc81138d..bc81138d 100755..100644
--- a/www-ssl/pic/avatar/avatar71.gif
+++ b/www-ssl/pic/avatar/avatar71.gif
diff --git a/www-ssl/pic/avatar/avatar72.gif b/www-ssl/pic/avatar/avatar72.gif
index 7105469a..7105469a 100755..100644
--- a/www-ssl/pic/avatar/avatar72.gif
+++ b/www-ssl/pic/avatar/avatar72.gif
diff --git a/www-ssl/pic/avatar/avatar73.gif b/www-ssl/pic/avatar/avatar73.gif
index c5cf7b5f..c5cf7b5f 100755..100644
--- a/www-ssl/pic/avatar/avatar73.gif
+++ b/www-ssl/pic/avatar/avatar73.gif
diff --git a/www-ssl/pic/avatar/avatar74.gif b/www-ssl/pic/avatar/avatar74.gif
index 3c6b4e38..3c6b4e38 100755..100644
--- a/www-ssl/pic/avatar/avatar74.gif
+++ b/www-ssl/pic/avatar/avatar74.gif
diff --git a/www-ssl/pic/avatar/avatar75.gif b/www-ssl/pic/avatar/avatar75.gif
index c193589f..c193589f 100755..100644
--- a/www-ssl/pic/avatar/avatar75.gif
+++ b/www-ssl/pic/avatar/avatar75.gif
diff --git a/www-ssl/pic/avatar/avatar76.gif b/www-ssl/pic/avatar/avatar76.gif
index 7926bb97..7926bb97 100755..100644
--- a/www-ssl/pic/avatar/avatar76.gif
+++ b/www-ssl/pic/avatar/avatar76.gif
diff --git a/www-ssl/pic/avatar/avatar77.gif b/www-ssl/pic/avatar/avatar77.gif
index 72991ce6..72991ce6 100755..100644
--- a/www-ssl/pic/avatar/avatar77.gif
+++ b/www-ssl/pic/avatar/avatar77.gif
diff --git a/www-ssl/pic/avatar/avatar78.gif b/www-ssl/pic/avatar/avatar78.gif
index 2972aa4f..2972aa4f 100755..100644
--- a/www-ssl/pic/avatar/avatar78.gif
+++ b/www-ssl/pic/avatar/avatar78.gif
diff --git a/www-ssl/pic/avatar/avatar79.gif b/www-ssl/pic/avatar/avatar79.gif
index d20e13af..d20e13af 100755..100644
--- a/www-ssl/pic/avatar/avatar79.gif
+++ b/www-ssl/pic/avatar/avatar79.gif
diff --git a/www-ssl/pic/avatar/avatar8.gif b/www-ssl/pic/avatar/avatar8.gif
index b3e710cb..b3e710cb 100755..100644
--- a/www-ssl/pic/avatar/avatar8.gif
+++ b/www-ssl/pic/avatar/avatar8.gif
diff --git a/www-ssl/pic/avatar/avatar80.gif b/www-ssl/pic/avatar/avatar80.gif
index 4c6afccc..4c6afccc 100755..100644
--- a/www-ssl/pic/avatar/avatar80.gif
+++ b/www-ssl/pic/avatar/avatar80.gif
diff --git a/www-ssl/pic/avatar/avatar81.gif b/www-ssl/pic/avatar/avatar81.gif
index 2513d085..2513d085 100755..100644
--- a/www-ssl/pic/avatar/avatar81.gif
+++ b/www-ssl/pic/avatar/avatar81.gif
diff --git a/www-ssl/pic/avatar/avatar82.gif b/www-ssl/pic/avatar/avatar82.gif
index ba761468..ba761468 100755..100644
--- a/www-ssl/pic/avatar/avatar82.gif
+++ b/www-ssl/pic/avatar/avatar82.gif
diff --git a/www-ssl/pic/avatar/avatar83.gif b/www-ssl/pic/avatar/avatar83.gif
index 085cab2b..085cab2b 100755..100644
--- a/www-ssl/pic/avatar/avatar83.gif
+++ b/www-ssl/pic/avatar/avatar83.gif
diff --git a/www-ssl/pic/avatar/avatar84.gif b/www-ssl/pic/avatar/avatar84.gif
index 07ee7424..07ee7424 100755..100644
--- a/www-ssl/pic/avatar/avatar84.gif
+++ b/www-ssl/pic/avatar/avatar84.gif
diff --git a/www-ssl/pic/avatar/avatar85.gif b/www-ssl/pic/avatar/avatar85.gif
index cd510ece..cd510ece 100755..100644
--- a/www-ssl/pic/avatar/avatar85.gif
+++ b/www-ssl/pic/avatar/avatar85.gif
diff --git a/www-ssl/pic/avatar/avatar86.gif b/www-ssl/pic/avatar/avatar86.gif
index 0c791d78..0c791d78 100755..100644
--- a/www-ssl/pic/avatar/avatar86.gif
+++ b/www-ssl/pic/avatar/avatar86.gif
diff --git a/www-ssl/pic/avatar/avatar87.gif b/www-ssl/pic/avatar/avatar87.gif
index dac9b589..dac9b589 100755..100644
--- a/www-ssl/pic/avatar/avatar87.gif
+++ b/www-ssl/pic/avatar/avatar87.gif
diff --git a/www-ssl/pic/avatar/avatar88.gif b/www-ssl/pic/avatar/avatar88.gif
index e27c3b3b..e27c3b3b 100755..100644
--- a/www-ssl/pic/avatar/avatar88.gif
+++ b/www-ssl/pic/avatar/avatar88.gif
diff --git a/www-ssl/pic/avatar/avatar89.gif b/www-ssl/pic/avatar/avatar89.gif
index c07019c0..c07019c0 100755..100644
--- a/www-ssl/pic/avatar/avatar89.gif
+++ b/www-ssl/pic/avatar/avatar89.gif
diff --git a/www-ssl/pic/avatar/avatar9.gif b/www-ssl/pic/avatar/avatar9.gif
index 448c6ecc..448c6ecc 100755..100644
--- a/www-ssl/pic/avatar/avatar9.gif
+++ b/www-ssl/pic/avatar/avatar9.gif
diff --git a/www-ssl/pic/avatar/avatar90.gif b/www-ssl/pic/avatar/avatar90.gif
index f71a5957..f71a5957 100755..100644
--- a/www-ssl/pic/avatar/avatar90.gif
+++ b/www-ssl/pic/avatar/avatar90.gif
diff --git a/www-ssl/pic/avatar/avatar91.gif b/www-ssl/pic/avatar/avatar91.gif
index 9b12113f..9b12113f 100755..100644
--- a/www-ssl/pic/avatar/avatar91.gif
+++ b/www-ssl/pic/avatar/avatar91.gif
diff --git a/www-ssl/pic/avatar/avatar92.gif b/www-ssl/pic/avatar/avatar92.gif
index c3c22c89..c3c22c89 100755..100644
--- a/www-ssl/pic/avatar/avatar92.gif
+++ b/www-ssl/pic/avatar/avatar92.gif
diff --git a/www-ssl/pic/avatar/avatar93.gif b/www-ssl/pic/avatar/avatar93.gif
index 1c33f2af..1c33f2af 100755..100644
--- a/www-ssl/pic/avatar/avatar93.gif
+++ b/www-ssl/pic/avatar/avatar93.gif
diff --git a/www-ssl/pic/avatar/avatar94.gif b/www-ssl/pic/avatar/avatar94.gif
index a91b90a2..a91b90a2 100755..100644
--- a/www-ssl/pic/avatar/avatar94.gif
+++ b/www-ssl/pic/avatar/avatar94.gif
diff --git a/www-ssl/pic/avatar/avatar95.gif b/www-ssl/pic/avatar/avatar95.gif
index dc7fe45f..dc7fe45f 100755..100644
--- a/www-ssl/pic/avatar/avatar95.gif
+++ b/www-ssl/pic/avatar/avatar95.gif
diff --git a/www-ssl/pic/avatar/avatar96.gif b/www-ssl/pic/avatar/avatar96.gif
index f9aec5bf..f9aec5bf 100755..100644
--- a/www-ssl/pic/avatar/avatar96.gif
+++ b/www-ssl/pic/avatar/avatar96.gif
diff --git a/www-ssl/pic/avatar/avatar97.gif b/www-ssl/pic/avatar/avatar97.gif
index 018fd0dc..018fd0dc 100755..100644
--- a/www-ssl/pic/avatar/avatar97.gif
+++ b/www-ssl/pic/avatar/avatar97.gif
diff --git a/www-ssl/pic/avatar/avatar98.gif b/www-ssl/pic/avatar/avatar98.gif
index e963d44f..e963d44f 100755..100644
--- a/www-ssl/pic/avatar/avatar98.gif
+++ b/www-ssl/pic/avatar/avatar98.gif
diff --git a/www-ssl/pic/avatar/avatar99.gif b/www-ssl/pic/avatar/avatar99.gif
index 3270bd87..3270bd87 100755..100644
--- a/www-ssl/pic/avatar/avatar99.gif
+++ b/www-ssl/pic/avatar/avatar99.gif
diff --git a/www-ssl/pic/engelsystem_logo.png b/www-ssl/pic/engelsystem_logo.png
new file mode 100644
index 00000000..b017302e
--- /dev/null
+++ b/www-ssl/pic/engelsystem_logo.png
diff --git a/www-ssl/pic/external.png b/www-ssl/pic/external.png
index 8ae475d8..8ae475d8 100755..100644
--- a/www-ssl/pic/external.png
+++ b/www-ssl/pic/external.png
diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif
deleted file mode 100755
index 15739e2e..00000000
--- a/www-ssl/pic/flag/de.gif
+++ /dev/null
diff --git a/www-ssl/pic/flag/de.png b/www-ssl/pic/flag/de.png
new file mode 100644
index 00000000..ac4a9773
--- /dev/null
+++ b/www-ssl/pic/flag/de.png
diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif
deleted file mode 100755
index 34936ee3..00000000
--- a/www-ssl/pic/flag/en.gif
+++ /dev/null
diff --git a/www-ssl/pic/flag/en.png b/www-ssl/pic/flag/en.png
new file mode 100644
index 00000000..ff701e19
--- /dev/null
+++ b/www-ssl/pic/flag/en.png
diff --git a/www-ssl/pic/himmel.png b/www-ssl/pic/himmel.png
index 6a2b5000..6a2b5000 100755..100644
--- a/www-ssl/pic/himmel.png
+++ b/www-ssl/pic/himmel.png
diff --git a/www-ssl/pic/himmel_w.png b/www-ssl/pic/himmel_w.png
index 2dd648ab..2dd648ab 100755..100644
--- a/www-ssl/pic/himmel_w.png
+++ b/www-ssl/pic/himmel_w.png
diff --git a/www-ssl/pic/smiles/aerger2.gif b/www-ssl/pic/smiles/aerger2.gif
index accb9774..accb9774 100755..100644
--- a/www-ssl/pic/smiles/aerger2.gif
+++ b/www-ssl/pic/smiles/aerger2.gif
diff --git a/www-ssl/pic/smiles/alien.gif b/www-ssl/pic/smiles/alien.gif
index 1404f299..1404f299 100755..100644
--- a/www-ssl/pic/smiles/alien.gif
+++ b/www-ssl/pic/smiles/alien.gif
diff --git a/www-ssl/pic/smiles/blush.gif b/www-ssl/pic/smiles/blush.gif
index 28ce436b..28ce436b 100755..100644
--- a/www-ssl/pic/smiles/blush.gif
+++ b/www-ssl/pic/smiles/blush.gif
diff --git a/www-ssl/pic/smiles/boggle.gif b/www-ssl/pic/smiles/boggle.gif
index 472a3c3c..472a3c3c 100755..100644
--- a/www-ssl/pic/smiles/boggle.gif
+++ b/www-ssl/pic/smiles/boggle.gif
diff --git a/www-ssl/pic/smiles/bounce.gif b/www-ssl/pic/smiles/bounce.gif
index 942318f3..942318f3 100755..100644
--- a/www-ssl/pic/smiles/bounce.gif
+++ b/www-ssl/pic/smiles/bounce.gif
diff --git a/www-ssl/pic/smiles/bun.gif b/www-ssl/pic/smiles/bun.gif
index c6ee6937..c6ee6937 100755..100644
--- a/www-ssl/pic/smiles/bun.gif
+++ b/www-ssl/pic/smiles/bun.gif
diff --git a/www-ssl/pic/smiles/candycane.gif b/www-ssl/pic/smiles/candycane.gif
index 4469a5c5..4469a5c5 100755..100644
--- a/www-ssl/pic/smiles/candycane.gif
+++ b/www-ssl/pic/smiles/candycane.gif
diff --git a/www-ssl/pic/smiles/cheesy.gif b/www-ssl/pic/smiles/cheesy.gif
index 52d35b27..52d35b27 100755..100644
--- a/www-ssl/pic/smiles/cheesy.gif
+++ b/www-ssl/pic/smiles/cheesy.gif
diff --git a/www-ssl/pic/smiles/dead.gif b/www-ssl/pic/smiles/dead.gif
index 8328c337..8328c337 100755..100644
--- a/www-ssl/pic/smiles/dead.gif
+++ b/www-ssl/pic/smiles/dead.gif
diff --git a/www-ssl/pic/smiles/depressed.gif b/www-ssl/pic/smiles/depressed.gif
index 17c24c42..17c24c42 100755..100644
--- a/www-ssl/pic/smiles/depressed.gif
+++ b/www-ssl/pic/smiles/depressed.gif
diff --git a/www-ssl/pic/smiles/ginger.gif b/www-ssl/pic/smiles/ginger.gif
index 199b085d..199b085d 100755..100644
--- a/www-ssl/pic/smiles/ginger.gif
+++ b/www-ssl/pic/smiles/ginger.gif
diff --git a/www-ssl/pic/smiles/hirsch1.gif b/www-ssl/pic/smiles/hirsch1.gif
index 6ef61330..6ef61330 100755..100644
--- a/www-ssl/pic/smiles/hirsch1.gif
+++ b/www-ssl/pic/smiles/hirsch1.gif
diff --git a/www-ssl/pic/smiles/huh.gif b/www-ssl/pic/smiles/huh.gif
index 448c6ecc..448c6ecc 100755..100644
--- a/www-ssl/pic/smiles/huh.gif
+++ b/www-ssl/pic/smiles/huh.gif
diff --git a/www-ssl/pic/smiles/icon_arrow.gif b/www-ssl/pic/smiles/icon_arrow.gif
index 2880055c..2880055c 100755..100644
--- a/www-ssl/pic/smiles/icon_arrow.gif
+++ b/www-ssl/pic/smiles/icon_arrow.gif
diff --git a/www-ssl/pic/smiles/icon_biggrin.gif b/www-ssl/pic/smiles/icon_biggrin.gif
index d3527723..d3527723 100755..100644
--- a/www-ssl/pic/smiles/icon_biggrin.gif
+++ b/www-ssl/pic/smiles/icon_biggrin.gif
diff --git a/www-ssl/pic/smiles/icon_confused.gif b/www-ssl/pic/smiles/icon_confused.gif
index 0c49e069..0c49e069 100755..100644
--- a/www-ssl/pic/smiles/icon_confused.gif
+++ b/www-ssl/pic/smiles/icon_confused.gif
diff --git a/www-ssl/pic/smiles/icon_cool.gif b/www-ssl/pic/smiles/icon_cool.gif
index cead0306..cead0306 100755..100644
--- a/www-ssl/pic/smiles/icon_cool.gif
+++ b/www-ssl/pic/smiles/icon_cool.gif
diff --git a/www-ssl/pic/smiles/icon_cry.gif b/www-ssl/pic/smiles/icon_cry.gif
index 7d54b1f9..7d54b1f9 100755..100644
--- a/www-ssl/pic/smiles/icon_cry.gif
+++ b/www-ssl/pic/smiles/icon_cry.gif
diff --git a/www-ssl/pic/smiles/icon_eek.gif b/www-ssl/pic/smiles/icon_eek.gif
index 5d397810..5d397810 100755..100644
--- a/www-ssl/pic/smiles/icon_eek.gif
+++ b/www-ssl/pic/smiles/icon_eek.gif
diff --git a/www-ssl/pic/smiles/icon_evil.gif b/www-ssl/pic/smiles/icon_evil.gif
index ab1aa8e1..ab1aa8e1 100755..100644
--- a/www-ssl/pic/smiles/icon_evil.gif
+++ b/www-ssl/pic/smiles/icon_evil.gif
diff --git a/www-ssl/pic/smiles/icon_exclaim.gif b/www-ssl/pic/smiles/icon_exclaim.gif
index 6e50e2ee..6e50e2ee 100755..100644
--- a/www-ssl/pic/smiles/icon_exclaim.gif
+++ b/www-ssl/pic/smiles/icon_exclaim.gif
diff --git a/www-ssl/pic/smiles/icon_frown.gif b/www-ssl/pic/smiles/icon_frown.gif
index d2ac78c0..d2ac78c0 100755..100644
--- a/www-ssl/pic/smiles/icon_frown.gif
+++ b/www-ssl/pic/smiles/icon_frown.gif
diff --git a/www-ssl/pic/smiles/icon_idea.gif b/www-ssl/pic/smiles/icon_idea.gif
index a40ae0d7..a40ae0d7 100755..100644
--- a/www-ssl/pic/smiles/icon_idea.gif
+++ b/www-ssl/pic/smiles/icon_idea.gif
diff --git a/www-ssl/pic/smiles/icon_lol.gif b/www-ssl/pic/smiles/icon_lol.gif
index 374ba150..374ba150 100755..100644
--- a/www-ssl/pic/smiles/icon_lol.gif
+++ b/www-ssl/pic/smiles/icon_lol.gif
diff --git a/www-ssl/pic/smiles/icon_mad.gif b/www-ssl/pic/smiles/icon_mad.gif
index 1f6c3c2f..1f6c3c2f 100755..100644
--- a/www-ssl/pic/smiles/icon_mad.gif
+++ b/www-ssl/pic/smiles/icon_mad.gif
diff --git a/www-ssl/pic/smiles/icon_mrgreen.gif b/www-ssl/pic/smiles/icon_mrgreen.gif
index b54cd0f9..b54cd0f9 100755..100644
--- a/www-ssl/pic/smiles/icon_mrgreen.gif
+++ b/www-ssl/pic/smiles/icon_mrgreen.gif
diff --git a/www-ssl/pic/smiles/icon_neutral.gif b/www-ssl/pic/smiles/icon_neutral.gif
index 4f311567..4f311567 100755..100644
--- a/www-ssl/pic/smiles/icon_neutral.gif
+++ b/www-ssl/pic/smiles/icon_neutral.gif
diff --git a/www-ssl/pic/smiles/icon_question.gif b/www-ssl/pic/smiles/icon_question.gif
index 9d072265..9d072265 100755..100644
--- a/www-ssl/pic/smiles/icon_question.gif
+++ b/www-ssl/pic/smiles/icon_question.gif
diff --git a/www-ssl/pic/smiles/icon_razz.gif b/www-ssl/pic/smiles/icon_razz.gif
index 29da2a2f..29da2a2f 100755..100644
--- a/www-ssl/pic/smiles/icon_razz.gif
+++ b/www-ssl/pic/smiles/icon_razz.gif
diff --git a/www-ssl/pic/smiles/icon_redface.gif b/www-ssl/pic/smiles/icon_redface.gif
index ad762832..ad762832 100755..100644
--- a/www-ssl/pic/smiles/icon_redface.gif
+++ b/www-ssl/pic/smiles/icon_redface.gif
diff --git a/www-ssl/pic/smiles/icon_rolleyes.gif b/www-ssl/pic/smiles/icon_rolleyes.gif
index d7f5f2f4..d7f5f2f4 100755..100644
--- a/www-ssl/pic/smiles/icon_rolleyes.gif
+++ b/www-ssl/pic/smiles/icon_rolleyes.gif
diff --git a/www-ssl/pic/smiles/icon_sad.gif b/www-ssl/pic/smiles/icon_sad.gif
index d2ac78c0..d2ac78c0 100755..100644
--- a/www-ssl/pic/smiles/icon_sad.gif
+++ b/www-ssl/pic/smiles/icon_sad.gif
diff --git a/www-ssl/pic/smiles/icon_smile.gif b/www-ssl/pic/smiles/icon_smile.gif
index 7b1f6d30..7b1f6d30 100755..100644
--- a/www-ssl/pic/smiles/icon_smile.gif
+++ b/www-ssl/pic/smiles/icon_smile.gif
diff --git a/www-ssl/pic/smiles/icon_surprised.gif b/www-ssl/pic/smiles/icon_surprised.gif
index cb214243..cb214243 100755..100644
--- a/www-ssl/pic/smiles/icon_surprised.gif
+++ b/www-ssl/pic/smiles/icon_surprised.gif
diff --git a/www-ssl/pic/smiles/icon_twisted.gif b/www-ssl/pic/smiles/icon_twisted.gif
index 502fe247..502fe247 100755..100644
--- a/www-ssl/pic/smiles/icon_twisted.gif
+++ b/www-ssl/pic/smiles/icon_twisted.gif
diff --git a/www-ssl/pic/smiles/icon_wind.gif b/www-ssl/pic/smiles/icon_wind.gif
index d1482880..d1482880 100755..100644
--- a/www-ssl/pic/smiles/icon_wind.gif
+++ b/www-ssl/pic/smiles/icon_wind.gif
diff --git a/www-ssl/pic/smiles/koenig1.gif b/www-ssl/pic/smiles/koenig1.gif
index b3e710cb..b3e710cb 100755..100644
--- a/www-ssl/pic/smiles/koenig1.gif
+++ b/www-ssl/pic/smiles/koenig1.gif
diff --git a/www-ssl/pic/smiles/laser1.gif b/www-ssl/pic/smiles/laser1.gif
index 32e2aab7..32e2aab7 100755..100644
--- a/www-ssl/pic/smiles/laser1.gif
+++ b/www-ssl/pic/smiles/laser1.gif
diff --git a/www-ssl/pic/smiles/love1.gif b/www-ssl/pic/smiles/love1.gif
index 88dd553a..88dd553a 100755..100644
--- a/www-ssl/pic/smiles/love1.gif
+++ b/www-ssl/pic/smiles/love1.gif
diff --git a/www-ssl/pic/smiles/moo.gif b/www-ssl/pic/smiles/moo.gif
index e525aa86..e525aa86 100755..100644
--- a/www-ssl/pic/smiles/moo.gif
+++ b/www-ssl/pic/smiles/moo.gif
diff --git a/www-ssl/pic/smiles/nuts.gif b/www-ssl/pic/smiles/nuts.gif
index 12d4c5d1..12d4c5d1 100755..100644
--- a/www-ssl/pic/smiles/nuts.gif
+++ b/www-ssl/pic/smiles/nuts.gif
diff --git a/www-ssl/pic/smiles/robin.gif b/www-ssl/pic/smiles/robin.gif
index ee0f0500..ee0f0500 100755..100644
--- a/www-ssl/pic/smiles/robin.gif
+++ b/www-ssl/pic/smiles/robin.gif
diff --git a/www-ssl/pic/smiles/sheep.gif b/www-ssl/pic/smiles/sheep.gif
index d1691491..d1691491 100755..100644
--- a/www-ssl/pic/smiles/sheep.gif
+++ b/www-ssl/pic/smiles/sheep.gif
diff --git a/www-ssl/pic/smiles/sick.gif b/www-ssl/pic/smiles/sick.gif
index 488d0e8e..488d0e8e 100755..100644
--- a/www-ssl/pic/smiles/sick.gif
+++ b/www-ssl/pic/smiles/sick.gif
diff --git a/www-ssl/pic/smiles/sleep.gif b/www-ssl/pic/smiles/sleep.gif
index 7e1a0c51..7e1a0c51 100755..100644
--- a/www-ssl/pic/smiles/sleep.gif
+++ b/www-ssl/pic/smiles/sleep.gif
diff --git a/www-ssl/pic/smiles/soppy.gif b/www-ssl/pic/smiles/soppy.gif
index 6c0416b1..6c0416b1 100755..100644
--- a/www-ssl/pic/smiles/soppy.gif
+++ b/www-ssl/pic/smiles/soppy.gif
diff --git a/www-ssl/pic/smiles/stress.gif b/www-ssl/pic/smiles/stress.gif
index 133913d7..133913d7 100755..100644
--- a/www-ssl/pic/smiles/stress.gif
+++ b/www-ssl/pic/smiles/stress.gif
diff --git a/www-ssl/pic/smiles/sweet.gif b/www-ssl/pic/smiles/sweet.gif
index 6c1e79a7..6c1e79a7 100755..100644
--- a/www-ssl/pic/smiles/sweet.gif
+++ b/www-ssl/pic/smiles/sweet.gif
diff --git a/www-ssl/pic/smiles/tired.gif b/www-ssl/pic/smiles/tired.gif
index d8cd4306..d8cd4306 100755..100644
--- a/www-ssl/pic/smiles/tired.gif
+++ b/www-ssl/pic/smiles/tired.gif
diff --git a/www-ssl/pic/smiles/urgh.gif b/www-ssl/pic/smiles/urgh.gif
index 16a9bc1d..16a9bc1d 100755..100644
--- a/www-ssl/pic/smiles/urgh.gif
+++ b/www-ssl/pic/smiles/urgh.gif
diff --git a/www-ssl/pic/smiles/winken1.gif b/www-ssl/pic/smiles/winken1.gif
index 98f1821b..98f1821b 100755..100644
--- a/www-ssl/pic/smiles/winken1.gif
+++ b/www-ssl/pic/smiles/winken1.gif
diff --git a/www-ssl/pic/smiles/worm.gif b/www-ssl/pic/smiles/worm.gif
index c0134ee8..c0134ee8 100755..100644
--- a/www-ssl/pic/smiles/worm.gif
+++ b/www-ssl/pic/smiles/worm.gif
diff --git a/www-ssl/pic/smiles/worry.gif b/www-ssl/pic/smiles/worry.gif
index c598b575..c598b575 100755..100644
--- a/www-ssl/pic/smiles/worry.gif
+++ b/www-ssl/pic/smiles/worry.gif