update engelanmeldung

upadte menue strucktur


git-svn-id: svn://svn.cccv.de/engel-system@25 29ba0400-6e00-0410-a75a-ca02368028f8

9 files changed, 320 insertions, 152 deletions

diff --git a/www-ssl/admin/menu.php b/www-ssl/admin/menu.php
index bd0761ed..45c59725 100755
--- a/www-ssl/admin/menu.php
+++ b/www-ssl/admin/menu.php
@@ -35,7 +35,8 @@ $Menu["Entry"][11]["Line"] = "<br><br>";
 $Menu["Entry"][10]["File"] = "list.php";
 $Menu["Entry"][10]["Name"] = "Debug";
 
-if ($_SESSION['CVS']["MenueShowAdminSection"] == "Y") {
+if ($_SESSION['CVS']["MenueShowAdminSection"] == "Y")
+{
         $MenuAdmin["Name"] = "Erzengel";
         $MenuAdmin["Entry"][0]["File"] = "../nonpublic/index.php";
         $MenuAdmin["Entry"][0]["Name"] = "Engel-Men&uuml;";
diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php
index a1c2aa4b..678a8a36 100755
--- a/www-ssl/admin/user.php
+++ b/www-ssl/admin/user.php
@@ -4,12 +4,15 @@ $title = "User-Liste";
 $header = "Editieren der Engelliste";
 include ("./inc/header.php");
 include ("./inc/funktion_db_list.php");
+include ("./inc/funktion_user.php");
 
 if (!IsSet($_GET["enterUID"]))
 {
 	// Userliste, keine UID uebergeben...
 
 	echo "<a href=\"../makeuser.php\">Neuen Engel eintragen</a><br><br>\n";
+	
+	echo "\n<a href=\"./user.php?enterUID=-1&Type=Secure\">Edit logout User</a><br><br>\n";
 
 	if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick";
 	$SQL = "SELECT * FROM User ORDER BY ". $_GET["OrderBy"]. " ASC";
@@ -98,27 +101,26 @@ else
 { 
 	// UserID wurde mit uebergeben --> Aendern...
 
-	$SQL = "SELECT * FROM User where UID=". $_GET["enterUID"];
-	$Erg = mysql_query($SQL, $con);
+	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";
 
-	$anzahl  = mysql_num_rows($Erg);
+	echo "<form action=\"./user2.php?action=change\" method=\"POST\">\n";
+	echo "<table>\n";
+	echo "<input type=\"hidden\" name=\"Type\" value=\"". $_GET["Type"]. "\">\n";
 
-	if ($anzahl != 1) 
-		echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden.";
-	else
+	if( $_GET["Type"] == "Normal" )
 	{
-		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=\"./user2.php?action=change\" method=\"POST\">\n";
-		echo "<table>\n";
-		echo "<input type=\"hidden\" name=\"Type\" value=\"". $_GET["Type"]. "\">\n";
-
-		if( $_GET["Type"] == "Normal" )
+		$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>Nick</td><td>".
 				"<input type=\"text\" size=\"40\" name=\"eNick\" value=\"".
@@ -192,14 +194,19 @@ else
 			echo ">Yes \n";
 			echo "</td></tr>\n";
 		} //IF TYPE
+	}
+	if( $_GET["Type"] == "Secure" )
+	{
+		// CVS-Rechte
+		echo "  <tr><td><br><u>Rights of \"". UID2Nick($_GET["enterUID"]). "\":</u></td></tr>\n";
 
-		if( $_GET["Type"] == "Secure" )
+		$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
 		{
-			// CVS-Rechte
-			echo "  <tr><td><br><u>Rights of \"". mysql_result($Erg, 0, "Nick"). "\":</u></td></tr>\n";
-
-			$SQL_CVS = "SELECT * FROM `UserCVS` WHERE UID=". $_GET["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) 
@@ -222,25 +229,22 @@ else
 			} //Foreach	    
 			echo "</td></tr>\n";
 		} // IF TYPE
+	}
 
+	// Ende Formular
+	echo "</td></tr>\n";
+	echo "</table>\n";
+	echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
+	echo "<input type=\"submit\" value=\"sichern...\">\n";
+	echo "</form>";
 
-		// Ende Formular
-		echo "</td></tr>\n";
-		echo "</table>\n";
+	if( $_GET["Type"] == "Normal" )
+	{
+		echo "<form action=\"./user2.php?action=delete\" method=\"POST\">\n";
 		echo "<input type=\"hidden\" name=\"enterUID\" value=\"". $_GET["enterUID"]. "\">\n";
-		echo "<input type=\"submit\" value=\"sichern...\">\n";
+		echo "<input type=\"submit\" value=\"l&ouml;schen...\">\n";
 		echo "</form>";
-
-		if( $_GET["Type"] == "Normal" )
-		{
-			echo "<form action=\"./user2.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 ("./inc/footer.php");
diff --git a/www-ssl/inc/funktion_user.php b/www-ssl/inc/funktion_user.php
index a420a09a..573a59d8 100755
--- a/www-ssl/inc/funktion_user.php
+++ b/www-ssl/inc/funktion_user.php
@@ -7,7 +7,15 @@ function UID2Nick($UID) {
   $Erg = mysql_query($SQL, $con);
 
   //echo $UID."#";
-  return mysql_result($Erg, 0);
+  if( mysql_num_rows($Erg))
+	return mysql_result($Erg, 0);
+  else
+  {
+  	if( $UID == -1)
+		return "logout User";
+	else
+	  	return "UserID $UID not found";
+  }
 }
 
 
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
deleted file mode 100755
index ae21b44a..00000000
--- a/www-ssl/makeuser.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?PHP
-
-$title = "MakeNewUser";
-$header = "Make New User";
-include ("./inc/header.php");
-include ("./inc/db.php");
-include ("./inc/crypt.php");
-
-//User Anzahl
-$SQL3 = "SELECT * FROM `User`";
-$Erg3 = mysql_query($SQL3, $con);
-echo "\n<!-- ". mysql_num_rows($Erg3). " //-->\n\n";
-
-if( !isset($_POST["action"]) )
-	$_POST["action"]="new";
-
-if( $_POST["action"]=="newsave")
-{
-	$eNick = trim($_POST["eNick"]);
-	if( strlen($_POST["eNick"]) < 2 )
-	{
-		$error= "<h3>error: nick '".$_POST["eNick"]."' is to short (min. 2 characters)</h3>";
-	}
-	elseif( strlen($_POST["eemail"]) <= 7 ||
-		strstr($_POST["eemail"], "@") == FALSE ||
-		strstr($_POST["eemail"], ".") == FALSE )
-	{
-		$error= "<h3>error: e-mail address is not correct</h3>";
-	}
-	elseif( $_POST["ePasswort"] != $_POST["ePasswort2"] )
-	{
-		$error= "error: passswords are not identical";
-	}
-	elseif( strlen($_POST["ePasswort"]) < 6 )
-	{
-		$error= "error: password is to short (min. 6 characters)";
-	}
-	else
-	{
-		$_POST["ePasswort"] =  PassCrypt($_POST["ePasswort"]);
-		$SQL = "INSERT INTO `User` (`Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, ".
-		       "`email`, `Size`, `Passwort`) ".
-		       "VALUES ('". $_POST["eNick"]. "', '". $_POST["eName"]. "', '". $_POST["eVorname"]. 
-		       "', '". $_POST["eAlter"]. "', '". $_POST["eTelefon"]. "', '". $_POST["eDECT"]. 
-		       "', '". $_POST["eHandy"]. "', '". $_POST["eemail"]. "', '". $_POST["eSize"]. 
-		       "', '". $_POST["ePasswort"]. "');";
-		$Erg = mysql_query($SQL, $con);
-		if ($Erg != 1) 
-			echo "error: can't save personal informations...<br><h6>(error: ".mysql_error($con).")</h6>";
-		else
-		{
-			echo "personal informations was saved...<br>";
-	
-			$SQL2 = "SELECT UID FROM `User` WHERE Nick='". $_POST["eNick"]. "';";
-			$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 "error: can't save userright... <br><h6>(".mysql_error($con).")</h6>";
-			}
-			else
-			{
-				echo "userright was saved...<br>";
-				echo "<br><br> Your acount was sucsessfull creat, hafe al lot of fun.";
-			}
-		}
-	}
-}
-
-if( $_POST["action"] == "new" || isset($error))
-{
-	  if( !isset($error) )
-	  	echo "If you wont to be an angel please insert your personal information into this form: <br>";
-	  else
-	  	echo $error;
-	  echo "\n\n<form action=\"https://". $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']. "\" method=\"POST\">\n";
-	  echo "<table>\n";
-	  echo "  <tr><td>nick*</td><td><input type=\"text\" size=\"40\" name=\"eNick\" value=\"". 
-	  	$_POST["eNick"]. "\"></td></tr>\n";
-	  echo "  <tr><td>last name</td><td><input type=\"text\" size=\"40\" name=\"eName\" value=\"". 
-	  	$_POST["eName"]. "\"></td></tr>\n";
-	  echo "  <tr><td>first name</td><td><input type=\"text\" size=\"40\" name=\"eVorname\" value=\"". 
-	  	$_POST["eVorname"]. "\"></td></tr>\n";
-	  echo "  <tr><td>age</td><td><input type=\"text\" size=\"40\" name=\"eAlter\" value=\"".
-	  	$_POST["eAlter"]. "\"></td></tr>\n";
-	  echo "  <tr><td>phone</td><td><input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"".
-	  	$_POST["eTelefon"]. "\"></td></tr>\n";
-	  echo "  <tr><td>DECT on congress</td><td><input type=\"text\" size=\"40\" name=\"eDECT\" value=\"". 
-	  	$_POST["eDECT"]. "\"></td></tr>\n";
-	  echo "  <tr><td>mobile</td><td><input type=\"text\" size=\"40\" name=\"eHandy\" value=\"".
-	  	$_POST["eHandy"]. "\"></td></tr>\n";
-	  echo "  <tr><td>e-mail*</td><td><input type=\"text\" size=\"40\" name=\"eemail\" value=\"".
-	  	$_POST["eemail"]. "\"></td></tr>\n";
-	  echo "  <tr><td>T-Shirt size*</td><td><input type=\"text\" size=\"40\" name=\"eSize\" value=\"". 
-	  	$_POST["eSize"]. "\"></td></tr>\n";
-	  echo "  <tr><td>password*</td><td><input type=\"password\" size=\"40\" name=\"ePasswort\"></td></tr>\n";
-	  echo "  <tr><td>password Confirm*</td><td><input type=\"password\" size=\"40\" name=\"ePasswort2\"></td></tr>\n";
-	  echo "</table>\n";
-	  echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
-	  echo "<input type=\"submit\" value=\"register me as an engel\">\n";
-	  echo "</form>";
-	  echo "\n\n\n\t* entry required!\n";
-}
-
-include ("./inc/footer.php");
-?>
-
diff --git a/www-ssl/makeuser.php.de b/www-ssl/makeuser.php.de
new file mode 100755
index 00000000..00033de1
--- /dev/null
+++ b/www-ssl/makeuser.php.de
@@ -0,0 +1,129 @@
+<?PHP
+
+$title = "Anmeldung zum Chaos-Engel";
+$header = "Anmeldung zum Chaos-Engel";
+
+include ("./inc/header.php");
+include ("./inc/db.php");
+include ("./inc/crypt.php");
+
+if( $_POST)
+{
+	$eNick = trim($_POST["Nick"]);
+	if( strlen($_POST["Nick"]) < 2 ) {
+		$error= "Fehler: Nickname '".$_POST["eNick"]."' ist zu kurz gew&auml;hlt (Mindestens 2 Zeichen).";
+	} elseif( strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == FALSE ) {
+		$error= "Fehler: E-Mail-Adresse ist nicht g&uuml;ltig.";
+	} elseif( $_POST["Passwort"] != $_POST["Passwort2"] ) {
+		$error= "Fehler: Passw&ouml;rter sind nicht identisch.";
+	} elseif( strlen($_POST["Passwort"]) < 6 ) {
+		$error= "Fehler: Passwort ist zu kurz (Mindestens 6 Zeichen)";
+	} else {
+		$_POST["Passwort"] =  PassCrypt($_POST["Passwort"]);
+		unset($_POST["Passwort2"]);
+		
+		function mysqlinsert($table, $con, $array){
+			foreach($array as $key => $value){
+
+				$value = strtr($value, get_html_translation_table(HTML_ENTITIES));
+				$keys .= $key.", ";
+				$values .= "'".$value."', ";
+			}
+			$keys = substr($keys, 0, -2);
+			$values = substr($values, 0, -2);
+			$sql = "INSERT INTO $table (".$keys.") VALUES (".$values.")";
+			mysql_query($sql, $con);
+		}
+
+		mysqlinsert('User', $con, $_POST);
+		$Erg = mysql_affected_rows();
+		
+		if ($Erg != 1) {
+			echo "Fehler: Kann die eingegebenen Daten nicht sichern?!?<br>";
+			echo "\n<h6>(Fehler: ".mysql_error($con).")</h6>";
+		} else {
+			echo "<p class=\"important\">Die Anmeldung war erfolgreich. Vielen Dank f&uuml;r deine Anmeldung.</p><p></p>\n<br><br>";
+	
+
+			$SQL2 = "SELECT UID FROM `User` WHERE Nick='". $_POST["Nick"]. "';";
+			$Erg2 = mysql_query($SQL2, $con);
+			$Data = mysql_fetch_array($Erg2);
+		}
+	}
+	  if( !isset($error) ){
+		echo "Wenn du dich zum Chaos-Engel anmelden m&ouml;chtest, f&uuml;lle bitte folgendes Formular aus: <br>";
+	  } else {
+                echo "<p class=\"warning\">\n$error\n</p>";
+	  }
+}
+else
+{
+	//init vars
+	$_POST["Nick"] = "";
+	$_POST["Name"] = "";
+	$_POST["Vorname"] = "";
+	$_POST["Alta"] = "";
+	$_POST["Telefon"] = "";
+	$_POST["DECT"] = "";
+	$_POST["Handy"] = "";
+	$_POST["email"] = "";
+	$_POST["Size"] = "";
+	$_POST["Art"] = "";
+}
+?>
+
+<h1>Anmeldung zum Chaos-Engel</h1>
+
+Mit dieser Maske meldet Ihr euch im Engelsystem an. Durch das Engelsystem findet auf dem Congress die Aufgabenverteilung der Engel statt. 
+
+
+	  <form action="https://<?php echo $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];?>" method="post">
+	  <table>
+	    <tr><td>Nickname*</td><td><input type="text" size="40" name="Nick" value="<?php echo $_POST["Nick"]; ?>"/></td></tr>
+	    <tr><td>Nachname</td><td><input type="text" size="40" name="Name" value="<?php echo $_POST["Name"]; ?>"/></td></tr>
+	    <tr><td>Vorname</td><td><input type="text" size="40" name="Vorname" value="<?php echo $_POST["Vorname"]; ?>"/></td></tr>
+	    <tr><td>Alter</td><td><input type="text" size="40" name="Alta" value="<?php echo $_POST["Alta"]; ?>"/></td></tr>
+	    <tr><td>Telefon</td><td><input type="text" size="40" name="Telefon" value="<?php echo $_POST["Telefon"]; ?>"/></td></tr>
+	    <tr><td>DECT</td><td><input type="text" size="40" name="DECT" value="<?php echo $_POST["DECT"]; ?>"/></td><td><!--a href="https://21c3.ccc.de/wiki/index.php/POC"><img src="./pic/external.png" alt="external: " /> DECT</a--></td></tr>
+	    <tr><td>Handy</td><td><input type="text" size="40" name="Handy" value="<?php echo $_POST["Handy"]; ?>"/></td></tr>
+	    <tr><td>E-Mail*</td><td><input type="text" size="40" name="email" value="<?php echo $_POST["email"]; ?>"/></td></tr>
+	    <tr><td>T-Shirt Gr&ouml;sse*</td><td align="left">
+		<select name="Size">
+			<option value="S"<?php if ($_POST["Size"]=="S") {echo " selected";}; ?>>S</option>
+			<option value="M"<?php if ($_POST["Size"]=="M") {echo " selected";}; ?>>M</option>
+			<option value="L"<?php if ($_POST["Size"]=="L") {echo " selected";}; ?>>L</option>
+			<option value="XL"<?php if ($_POST["Size"]=="XL") {echo " selected";}; ?>>XL</option>
+			<option value="XXL"<?php if ($_POST["Size"]=="XXL") {echo " selected";}; ?>>XXL</option>
+		</select>
+	    </td></tr>
+	    <tr><td>Engelart</td><td align="left">
+		<select name="Art">
+			<option value="Konferenz"<?php if ($_POST["Art"]=="Konferenz") {echo " selected";}; ?>>Konferenz</option>
+			<option value="Dokumentation"<?php if ($_POST["Art"]=="Dokumentation") {echo " selected";}; ?>>Dokumentation</option>
+			<option value="Eingang"<?php if ($_POST["Art"]=="Eingang") {echo " selected";}; ?>>Eingang</option>
+			<option value="Schutzengel"<?php if ($_POST["Art"]=="Schutzengel") {echo " selected";}; ?>>Schutzengel</option>
+			<option value="Netzengel"<?php if ($_POST["Art"]=="Netzengel") {echo " selected";}; ?>>Netzengel</option>
+			<option value="Rettung"<?php if ($_POST["Art"]=="Rettung") {echo " selected";}; ?>>Rettung</option>
+                        <option value="Verpflegung"<?php if ($_POST["Art"]=="Verpflegung") {echo " selected";}; ?>>Verpflegung</option>
+			<option value="egal"<?php if ($_POST["Art"]=="egal") {echo " selected";}; ?>>Egal-Engel</option>
+		</select>
+	        </td><td><!--a href="https://www.ccc.de/congress/2004/engel.de.html#d5e23"><img src="./pic/external.png" alt="external: " /> Congress 21C3</a--></td>
+	    </tr>
+	    <tr>
+	    	<td>Habt ihr schon einmal am<br />
+		    Congress mitgeholfen? <br />
+		    Wenn ja, in welchem/<br />
+		    welchen Aufgabengebiet(en)?</td>
+		<td><textarea rows="5" cols="40" name="qualifikationen"></textarea></td>
+	    </tr>
+	    <tr><td>Passwort*</td><td><input type="password" size="40" name="Passwort"/></td></tr>
+	    <tr><td>Passwort Best&auml;tigung*</td><td><input type="password" size="40" name="Passwort2"/></td></tr>
+	    <tr><td>&nbsp;</td><td><input type="submit" value="Anmelden..."/></td></tr>
+
+	  </table>
+  	  </form>
+	  * Dieser Eintrag ist eine Pflichtangabe.
+<?php
+include ("./inc/footer.php");
+?>
+
diff --git a/www-ssl/makeuser.php.en b/www-ssl/makeuser.php.en
new file mode 100755
index 00000000..86ee286d
--- /dev/null
+++ b/www-ssl/makeuser.php.en
@@ -0,0 +1,125 @@
+<?PHP
+
+$title = "Chaos-Angel Registration";
+$header = "Chaos-Angel Registration";
+include ("./inc/header.php");
+include ("./inc/db.php");
+include ("./inc/crypt.php");
+
+if( $_POST)
+{
+	$eNick = trim($_POST["Nick"]);
+	if( strlen($_POST["Nick"]) < 2 ) {
+		$error= "error: your nick '".$_POST["Nick"]."' is to short (min. 2 characters)";
+	} elseif( strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == FALSE ) {
+		$error= "error: e-mail address is not correct";
+	} elseif( $_POST["Passwort"] != $_POST["Passwort2"] ) {
+		$error= "error: your passswords are not identical";
+	} elseif( strlen($_POST["Passwort"]) < 6 ) {
+		$error= "error: your password is to short (min. 6 characters)";
+	} else {
+		$_POST["Passwort"] =  PassCrypt($_POST["Passwort"]);
+		unset($_POST["Passwort2"]);
+		
+		function mysqlinsert($table, $con, $array){
+			foreach($array as $key => $value){
+
+				$value = strtr($value, get_html_translation_table(HTML_ENTITIES));
+				$keys .= $key.", ";
+				$values .= "'".$value."', ";
+			}
+			$keys = substr($keys, 0, -2);
+			$values = substr($values, 0, -2);
+			$sql = "INSERT INTO $table (".$keys.") VALUES (".$values.")";
+			mysql_query($sql, $con);
+		}
+
+		mysqlinsert('User', $con, $_POST);
+		$Erg = mysql_affected_rows();
+		
+		if ($Erg != 1) {
+			echo "error: can't save your data...<br><h6>(error: ".mysql_error($con).")</h6>";
+		} else {
+                        echo "<p class=\"important\">transmitted. Thank you for your participation..</p><p></p>\n<br><br>";
+
+			$SQL2 = "SELECT UID FROM `User` WHERE Nick='". $_POST["Nick"]. "';";
+			$Erg2 = mysql_query($SQL2, $con);
+			$Data = mysql_fetch_array($Erg2);
+		}
+	}
+	  if( !isset($error) ){
+	  	echo "If you would like to be an chaos angel please insert following details into this form: <br>";
+	  } else {
+	  	echo "<p class=\"warning\">\n$error\n</p>";
+	  }
+}
+else
+{
+	//init vars
+	$_POST["Nick"] = "";
+	$_POST["Name"] = "";
+	$_POST["Vorname"] = "";
+	$_POST["Alta"] = "";
+	$_POST["Telefon"] = "";
+	$_POST["DECT"] = "";
+	$_POST["Handy"] = "";
+	$_POST["email"] = "";
+	$_POST["Size"] = "";
+	$_POST["Art"] = "";
+}
+?>
+<h1>Chaos-Angel registration</h1>
+
+By completing this form you're registering as a Chaos-Angel. This script will create you an account in the congress angel task system. 
+
+	<form action="https://<?php echo $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];?>" method="post">
+	  <table>
+	    <tr><td>nick*</td><td><input type="text" size="40" name="Nick" value="<?php echo $_POST["Nick"]; ?>"/></td></tr>
+	    <tr><td>last name</td><td><input type="text" size="40" name="Name" value="<?php echo $_POST["Name"]; ?>"/></td></tr>
+	    <tr><td>first name</td><td><input type="text" size="40" name="Vorname" value="<?php echo $_POST["Vorname"]; ?>"/></td></tr>
+	    <tr><td>age</td><td><input type="text" size="40" name="Alta" value="<?php echo $_POST["Alta"]; ?>"/></td></tr>
+	    <tr><td>phone</td><td><input type="text" size="40" name="Telefon" value="<?php echo $_POST["Telefon"]; ?>"/></td></tr>
+	    <tr><td>DECT</td><td><input type="text" size="40" name="DECT" value="<?php echo $_POST["DECT"]; ?>"/></td><td><!--a href="https://21c3.ccc.de/wiki/index.php/POC"><img src="./pic/external.png" alt="external: " /> DECT</a--></td></tr>
+	    <tr><td>mobile</td><td><input type="text" size="40" name="Handy" value="<?php echo $_POST["Handy"]; ?>"/></td></tr>
+	    <tr><td>e-mail*</td><td><input type="text" size="40" name="email" value="<?php echo $_POST["email"]; ?>"/></td></tr>
+            <tr><td>shirt size*</td><td align="left">
+		<select name="Size">
+			<option value="S"<?php if ($_POST["Size"]=="S") {echo " selected";}; ?>>S</option>
+			<option value="M"<?php if ($_POST["Size"]=="M") {echo " selected";}; ?>>M</option>
+			<option value="L"<?php if ($_POST["Size"]=="L") {echo " selected";}; ?>>L</option>
+			<option value="XL"<?php if ($_POST["Size"]=="XL") {echo " selected";}; ?>>XL</option>
+			<option value="XXL"<?php if ($_POST["Size"]=="XXL") {echo " selected";}; ?>>XXL</option>
+		</select>
+	    </td></tr>
+	    <tr><td>type of angel</td><td align="left">
+		<select name="Art">
+			<option value="Konferenz"<?php if ($_POST["Art"]=="Konferenz") {echo " selected";}; ?>>Conference</option>
+			<option value="Dokumentation"<?php if ($_POST["Art"]=="Dokumentation") {echo " selected";}; ?>>Documentation</option>
+			<option value="Eingang"<?php if ($_POST["Art"]=="Eingang") {echo " selected";}; ?>>Entrance</option>
+			<option value="Schutzengel"<?php if ($_POST["Art"]=="Schutzengel") {echo " selected";}; ?>>Guardian Angel</option>
+			<option value="Netzengel"<?php if ($_POST["Art"]=="Netzengel") {echo " selected";}; ?>>Netangels</option>
+			<option value="Rettung"<?php if ($_POST["Art"]=="Rettung") {echo " selected";}; ?>>Rescue</option>
+			<option value="Verpflegung"<?php if ($_POST["Art"]=="Verpflegung") {echo " selected";}; ?>>Catering</option>
+			<option value="egal"<?php if ($_POST["Art"]=="egal") {echo " selected";}; ?>>any kind</option>
+		</select>
+	    </td><td><!--a href="https://www.ccc.de/congress/2005/engel.en.html#d5e75"><img src="./pic/external.png" alt="external: " /> Congress 21C3</a--></td></tr>
+	    <tr>
+		<td>
+			Did you help at former <br />
+			congresses and which tasks <br />
+			have you performed then? <br />
+		</td>
+		<td><textarea rows="5" cols="40" name="qualifikationen"></textarea>
+		</td>
+	    </tr>
+	    <tr><td>password*</td><td><input type="password" size="40" name="Passwort"/></td></tr>
+	    <tr><td>password confirm*</td><td><input type="password" size="40" name="Passwort2"/></td></tr>
+	    <tr><td>&nbsp;</td><td><input type="submit" value="register me..."/></td></tr>
+	  </table>
+  	</form>
+	* entry required!
+
+<?php
+include ("./inc/footer.php");
+?>
+
diff --git a/www-ssl/menu.php b/www-ssl/menu.php
index f2789d17..9d9c7efa 100755
--- a/www-ssl/menu.php
+++ b/www-ssl/menu.php
@@ -34,4 +34,13 @@ $Menu["Entry"][3]["Line"] = "<br>";
 $Menu["Entry"][4]["File"] = "nonpublic/schichtplan_beamer.php";
 $Menu["Entry"][4]["Name"] = Get_Text("pub_menu_SchichtplanBeamer");
 
+if ($_SESSION['CVS']["nonpublic/index.php"] == "Y") 
+{
+	$MenuAdmin["Path"] = "";
+	$MenuAdmin["Name"] = Get_Text("pub_menu_menuname");
+	$MenuAdmin["Entry"][0]["File"] = "nonpublic/index.php";
+	$MenuAdmin["Entry"][0]["Name"] = "Engel-Men&uuml;";
+} // MenueShowAdminSection
+			
+
 ?>
diff --git a/www-ssl/nonpublic/menu.php b/www-ssl/nonpublic/menu.php
index 7dac48bb..10cf2a2d 100755
--- a/www-ssl/nonpublic/menu.php
+++ b/www-ssl/nonpublic/menu.php
@@ -24,7 +24,9 @@ $Menu["Entry"][8]["File"] = "../logout.php";
 $Menu["Entry"][8]["Name"] = Get_Text("pub_menu_Abmelden");
 
 
-if ($_SESSION['CVS']["MenueShowAdminSection"] == "Y") {
+if ($_SESSION['CVS']["MenueShowAdminSection"] == "Y") 
+{
+	$MenuAdmin["Path"] = "";
 	$MenuAdmin["Name"] = "Erzengel";
 	$MenuAdmin["Entry"][0]["File"] = "../admin/index.php";
 	$MenuAdmin["Entry"][0]["Name"] = "Erzengel-Men&uuml;";
diff --git a/www-ssl/pic/external.png b/www-ssl/pic/external.png
new file mode 100755
index 00000000..8ae475d8
--- /dev/null
+++ b/www-ssl/pic/external.png