From 550467697f8b3ae0b5d15d1d3a2bc3f83b003ff8 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 13:36:24 +0200
Subject: html5

---
 www-ssl/css/base.css | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 www-ssl/css/base.css

(limited to 'www-ssl/css/base.css')

diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
new file mode 100644
index 00000000..e5b1644a
--- /dev/null
+++ b/www-ssl/css/base.css
@@ -0,0 +1,39 @@
+* {
+    margin: 0;
+    padding: 0;
+}
+
+header {
+	display: block;
+	width: 100%;
+}
+
+footer {
+	display: block;
+	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%;
+}
+
+td {
+	padding: 4px;
+}
+
+.menu ul {
+	margin: 0 0 0 20px;
+}
-- 
cgit v1.2.3-54-g00ecf


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

---
 config/.gitignore                           |   4 +
 config/config_MessegeServer.php             |   7 ++
 default-conf/var_www_includes/config.php    |   9 +-
 default-conf/var_www_includes/config_db.php |   2 +-
 includes/UserCVS.php                        |   5 +-
 includes/config_MessegeServer.php           |   7 --
 includes/config_modem.php                   |  10 ---
 includes/crypt.php                          |   2 +-
 includes/error_handler.php                  |   2 +-
 includes/header.php                         |   4 +-
 includes/header_start.php                   |   4 +-
 includes/login_eingabefeld.php              |   2 +-
 www-ssl/bootstrap.php                       |  12 +++
 www-ssl/css/base.css                        |   3 +
 www-ssl/faq.php                             |  34 ++++----
 www-ssl/index.php                           |  20 +++--
 www-ssl/logout.php                          |  19 ++--
 www-ssl/makeuser.php                        |  10 +--
 www-ssl/nonpublic/index.php                 | 131 +++++++++++++---------------
 www-ssl/nonpublic/news.php                  |  14 +--
 20 files changed, 159 insertions(+), 142 deletions(-)
 create mode 100644 config/.gitignore
 create mode 100644 config/config_MessegeServer.php
 delete mode 100644 includes/config_MessegeServer.php
 delete mode 100644 includes/config_modem.php
 create mode 100644 www-ssl/bootstrap.php

(limited to 'www-ssl/css/base.css')

diff --git a/config/.gitignore b/config/.gitignore
new file mode 100644
index 00000000..9b65d8f4
--- /dev/null
+++ b/config/.gitignore
@@ -0,0 +1,4 @@
+config_db.php
+config_jabber.php
+config_modem.php
+config.php
diff --git a/config/config_MessegeServer.php b/config/config_MessegeServer.php
new file mode 100644
index 00000000..ce7c7c3a
--- /dev/null
+++ b/config/config_MessegeServer.php
@@ -0,0 +1,7 @@
+<?php
+  // Set the ip and port we will listen on
+  define(SERVER_ADDRESS, "127.0.0.1");
+  define(SERVER_PORT, 9000);
+
+  define(DEBUG, true);
+?>
diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php
index 4c8237f1..ca0c39c9 100644
--- a/default-conf/var_www_includes/config.php
+++ b/default-conf/var_www_includes/config.php
@@ -5,6 +5,9 @@ $url = "https://SEDENGELURL";
 // Startverzeichnis des Engelhome
 $ENGEL_ROOT = "/";
 
+// Default-Theme auf der Startseite, 1=style1.css usw.
+$default_theme = 10;
+
 // System disable message, ist ist set is: bages schow only this text
 //$SystemDisableMessage="<H1>This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room</H1>";
 
@@ -16,7 +19,7 @@ $LETZTES_AUSTRAGEN=3;
 
 //Setzt den zu verwendenden Crypto algorismis 
 // mp5 oder crypt
-// achtung crypt schaltet password ändern ab
+// achtung crypt schaltet password �ndern ab
 $crypt_system="md5";
 //$crypt_system="crypt";
 
@@ -26,7 +29,7 @@ $arch_angels="fnord";
 // timezonen offsett
 $gmdateOffset=3600;
 
-// für Developen 1, sonst = 0
+// f�r Developen 1, sonst = 0
 $debug = 0;
 
 // SSL Cert-KEY
@@ -42,7 +45,7 @@ $Tempdir="./tmp";
 // local timezone
 date_default_timezone_set("Europe/Berlin");
 
-//Pentabarf ConferenzDI für UpdateDB
+//Pentabarf ConferenzDI f�r UpdateDB
 $PentabarfXMLhost = "cccv.pentabarf.org";
 $PentabarfXMLpath = "Xcal/conference/";
 $PentabarfXMLEventID = "31";
diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php
index d959be90..b49e5e0c 100644
--- a/default-conf/var_www_includes/config_db.php
+++ b/default-conf/var_www_includes/config_db.php
@@ -1,5 +1,5 @@
 <?php
-include("funktion_db.php");
+include("../include/funktion_db.php");
 
 $con = mysql_connect("localhost", "root", "changeme") or die ("connection failed");
 $sel = mysql_select_db("tabel") or die (mysql_error());
diff --git a/includes/UserCVS.php b/includes/UserCVS.php
index 7798ee66..c062106f 100644
--- a/includes/UserCVS.php
+++ b/includes/UserCVS.php
@@ -20,13 +20,14 @@
   }
 
   // pagename ermitteln
-  $Page["Name"] = basename($_SERVER['PHP_SELF']);
+  //$Page["Name"] = basename($_SERVER['PHP_SELF']);
+  $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
 
   //recht fuer diese seite auslesen
   if(isset($_SESSION['CVS'][$Page["Name"]]))
     $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]];
   else {
-    echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists.";
+    echo "SYSTEM ERROR: no right for " . $Page["Name"] . " exists.";
     die;
   }
 
diff --git a/includes/config_MessegeServer.php b/includes/config_MessegeServer.php
deleted file mode 100644
index ce7c7c3a..00000000
--- a/includes/config_MessegeServer.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-  // Set the ip and port we will listen on
-  define(SERVER_ADDRESS, "127.0.0.1");
-  define(SERVER_PORT, 9000);
-
-  define(DEBUG, true);
-?>
diff --git a/includes/config_modem.php b/includes/config_modem.php
deleted file mode 100644
index 2de37cb7..00000000
--- a/includes/config_modem.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-  // ist ein modem angeschlossen
-  $ModemEnable = false;
-
-  // COM port
-  $ModemDev = "/dev/ttyS0";
-
-  // vorwahl, bei tnovis telefonanlage fuer das programmieren von weckrufen
-  $WakeupNumber = "**3";
-?>
diff --git a/includes/crypt.php b/includes/crypt.php
index d511e4f4..8de22030 100644
--- a/includes/crypt.php
+++ b/includes/crypt.php
@@ -1,6 +1,6 @@
 <?php
   function PassCrypt($passwort) {
-    include "config.php";
+    include "../../config/config.php";
 
     switch ($crypt_system) {
       case "crypt":
diff --git a/includes/error_handler.php b/includes/error_handler.php
index 5a58076b..42e561fc 100644
--- a/includes/error_handler.php
+++ b/includes/error_handler.php
@@ -100,7 +100,7 @@
   function send_message(&$message)
   {
     chdir(dirname(__FILE__));
-    require_once('./config_jabber.php');
+    require_once('../config/config_jabber.php');
 
     if (isset($jabber_recipient) && count($jabber_recipient)) {
       $jabber = new Jabber($server, $port, $username, $password, $resource);
diff --git a/includes/header.php b/includes/header.php
index 6b206049..9fb882bf 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -17,7 +17,9 @@ echo "<!DOCTYPE html>\n";
 <meta name="revisit-after" content="1 days" />
 <script type="text/javascript" src="css/grossbild.js"></script>
 <link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : "6" ?>.css" />
+<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
+<link rel="stylesheet" type="text/css" href="../css/base.css" />
+<link rel="stylesheet" type="text/css" href="../css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : $default_theme ?>.css" />
 
 <?php
 
diff --git a/includes/header_start.php b/includes/header_start.php
index 97b98fc3..70f986cf 100644
--- a/includes/header_start.php
+++ b/includes/header_start.php
@@ -1,9 +1,9 @@
 <?php
   ini_set("session.gc_maxlifetime", "65535");
 
-  include "config.php";
+  include "config/config.php";
   include "error_handler.php";
-  include "config_db.php";
+  include "config/config_db.php";
   include "funktion_lang.php";
   include "funktion_faq.php"; // fuer noAnswer() im menu
   include "funktion_menu.php";
diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php
index e68639cf..9e10271d 100644
--- a/includes/login_eingabefeld.php
+++ b/includes/login_eingabefeld.php
@@ -1,5 +1,5 @@
 <?php
-  include "config.php";
+  include "config/config.php";
 ?>
 
 <form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post">
diff --git a/www-ssl/bootstrap.php b/www-ssl/bootstrap.php
new file mode 100644
index 00000000..3189c89a
--- /dev/null
+++ b/www-ssl/bootstrap.php
@@ -0,0 +1,12 @@
+<?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
index e5b1644a..b6017ad2 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -3,6 +3,9 @@
     padding: 0;
 }
 
+body {
+}
+
 header {
 	display: block;
 	width: 100%;
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
index 26c261da..472915e5 100644
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -1,22 +1,24 @@
 <?php
-  $title = "Index";
-  $header = "FAQ";
-  include "../../camp2011/includes/header.php";
+require_once ('bootstrap.php');
 
-  $SQL = "SELECT * FROM `FAQ`";
-  $Erg = mysql_query($SQL, $con);
+$title = "FAQ";
+$header = "FAQ";
+include "includes/header.php";
 
-  // anzahl Zeilen
-  $Zeilen  = mysql_num_rows($Erg);
+$SQL = "SELECT * FROM `FAQ`";
+$Erg = mysql_query($SQL, $con);
 
-  for ($n = 0; $n < $Zeilen; $n++) {
-    if (mysql_result($Erg, $n, "Antwort") != "") {
-      echo "<dl>";
-      echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
-      echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
-      echo "</dl>";
-    }
-  }
+// anzahl Zeilen
+$Zeilen = mysql_num_rows($Erg);
 
-  include "../../camp2011/includes/footer.php";
+for ($n = 0; $n < $Zeilen; $n++) {
+	if (mysql_result($Erg, $n, "Antwort") != "") {
+		echo "<dl>";
+		echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
+		echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
+		echo "</dl>";
+	}
+}
+
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 4a34643c..cdec1559 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,15 +1,17 @@
 <?php
-  $title = "Start";
-  $header = "Start";
-  include "../includes/header.php";
+require_once ('bootstrap.php');
 
-  echo "<p>" . Get_Text("index_text1") . "</p>\n";
-  echo "<p>" . Get_Text("index_text2") . "</p>\n";
-  echo "<p>" . Get_Text("index_text3") . "</p>\n";
+$title = "Start";
+$header = "Start";
+include "includes/header.php";
 
-  include "../includes/login_eingabefeld.php";
+echo "<p>" . Get_Text("index_text1") . "</p>\n";
+echo "<p>" . Get_Text("index_text2") . "</p>\n";
+echo "<p>" . Get_Text("index_text3") . "</p>\n";
 
-  echo "<h6>" . Get_Text("index_text4") . "</h6>";
+include "includes/login_eingabefeld.php";
 
-  include "../includes/footer.php";
+echo "<h6>" . Get_Text("index_text4") . "</h6>";
+
+include "includes/footer.php";
 ?>
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index c137f48c..12b284f9 100644
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,12 +1,15 @@
 <?php
-  include "../../camp2011/includes/config.php";
 
-  // Die Session zerstoeren...
-  session_start();
-  session_destroy ();
-  // und eine neue erstellen, damit kein Erzengelmenue angezeigt wird (falls sich ein Erzengel abmeldet...)
-  session_start();
 
-  header("HTTP/1.1 302 Moved Temporarily");
-  header("Location: " . $url . $ENGEL_ROOT);
+// Die Session zerstoeren usw
+require_once ('bootstrap.php');
+include "config/config.php";
+
+session_start();
+session_destroy();
+// und eine neue erstellen, damit kein Erzengelmenue angezeigt wird (falls sich ein Erzengel abmeldet...)
+session_start();
+
+header("HTTP/1.1 302 Moved Temporarily");
+header("Location: " . $url . $ENGEL_ROOT);
 ?>
diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php
index ae205a62..785de1e8 100644
--- a/www-ssl/makeuser.php
+++ b/www-ssl/makeuser.php
@@ -3,10 +3,10 @@
   $header = "";
   $success = "none";
 
-  include "../../camp2011/includes/config.php";
-  include "../../camp2011/includes/header.php";
-  include "../../camp2011/includes/config_db.php";
-  include "../../camp2011/includes/crypt.php";
+  include "../config/config.php";
+  include "../includes/header.php";
+  include "../config/config_db.php";
+  include "../includes/crypt.php";
 
   if(isset($_POST["send"])) {
     $eNick = trim($_POST["Nick"]);
@@ -177,5 +177,5 @@
     Print_Text("makeuser_text3");
   }
 
-  include "../../camp2011/includes/footer.php";
+  include "../includes/footer.php";
 ?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index a4b2e975..add0fdd3 100644
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -1,84 +1,77 @@
 <?PHP
+include ('../bootstrap.php');
+
 $title = "Index";
 $header = "Index";
 
-include ("../../../camp2011/includes/config_db.php");
-include ("../../../camp2011/includes/crypt.php");
+include ("config/config_db.php");
+include ("includes/crypt.php");
 
 session_start(); // alte Session - falls vorhanden - wiederherstellen...
 
-function LoginOK()
-{
-  include ("../../../camp2011/includes/config.php");
-  header("HTTP/1.1 302 Moved Temporarily");
-  header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php");
+function LoginOK() {
+	include ("../../config/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);
+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);
 
-  // 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'];
 
-  if ($user_anz == 1) { // Check, ob User angemeldet wird...
-    if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok...
-      // Session wird eingeleitet und Session-Variablen gesetzt..
-      //  session_start();
-      session_name("Himmel");
-      $_SESSION['UID'] = mysql_result($userstring, 0, "UID");
-      $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick");
-      $_SESSION['Name'] = mysql_result($userstring, 0, "Name");
-      $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname");
-      $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter");
-      $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon");
-      $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy");
-      $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT");
-      $_SESSION['email'] = mysql_result($userstring, 0, "email");
-      $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ");
-      $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber");
-      $_SESSION['Size'] = mysql_result($userstring, 0, "Size");
-      $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen");
-      $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv");
-      $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt");
-      $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu");
-      $_SESSION['color'] = mysql_result($userstring, 0, "color");
-      $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar");
-      $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache");
-      $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown");
-      $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
-    
-      // CVS import Data
-      $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'";
-      $Erg_CVS =  mysql_query($SQL, $con);
-      $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
-      
-      LoginOK();
-    } 
-    else 
-    { // Passwort nicht ok...
-      $ErrorText = "pub_index_pass_no_ok";
-    } // Ende Passwort-Check
-  } 
-  else 
-  { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
-    if ($user_anz == 0) 
-        $ErrorText = "pub_index_User_unset";
-    else 
-      $ErrorText = "pub_index_User_more_as_one";
-  } // Ende Check, ob User angemeldet wurde
-} 
-include ("../../../camp2011/includes/header.php");
-if( isset($ErrorText))
-  echo "<h2>". Get_Text($ErrorText). "</h2><br />\n";
-include ("../../../camp2011/includes/login_eingabefeld.php");
-include ("../../../camp2011/includes/footer.php");
+			// 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/news.php b/www-ssl/nonpublic/news.php
index 7cc9a193..16006c52 100644
--- a/www-ssl/nonpublic/news.php
+++ b/www-ssl/nonpublic/news.php
@@ -1,10 +1,12 @@
 <?php
-  $title = "Himmel";
-  $header = "News";
-  include "../../../camp2011/includes/header.php";
+require_once ('../bootstrap.php');
 
-  echo "<a href=\"#Neu\">" . Get_Text(3) . "</a>";
-  include "news_output.php";
+$title = "News";
+$header = "News";
+include "includes/header.php";
 
-  include "../../../camp2011/includes/footer.php";
+echo "<a href=\"#Neu\">" . Get_Text(3) . "</a>";
+include "news_output.php";
+
+include "includes/footer.php";
 ?>
-- 
cgit v1.2.3-54-g00ecf


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

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

(limited to 'www-ssl/css/base.css')

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


From ee3080a861fb4ac95a7cd6ef5f666798ed63c0ab Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 15:25:05 +0200
Subject: credit page

---
 DB/UserCVS.sql       | 174 +++++++++++++++++++++++++++------------------------
 includes/footer.php  |   2 +-
 www-ssl/credits.php  |  18 ++++++
 www-ssl/css/base.css |  10 ++-
 4 files changed, 121 insertions(+), 83 deletions(-)
 create mode 100644 www-ssl/credits.php

(limited to 'www-ssl/css/base.css')

diff --git a/DB/UserCVS.sql b/DB/UserCVS.sql
index 53b202f8..3d2d99e6 100644
--- a/DB/UserCVS.sql
+++ b/DB/UserCVS.sql
@@ -1,101 +1,113 @@
+-- phpMyAdmin SQL Dump
+-- version 3.2.4
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Erstellungszeit: 01. Juni 2011 um 13:24
+-- Server Version: 5.1.44
+-- PHP-Version: 5.3.1
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+--
+-- Datenbank: `engelsystem`
+--
+
 -- --------------------------------------------------------
 
--- 
--- Tabellenstruktur für Tabelle `UserCVS`
--- 
-DROP TABLE IF EXISTS `UserCVS`;
-CREATE TABLE `UserCVS` (
-  `UID` int(11) NOT NULL default '0',
-  `GroupID` int(11) default '-2',
-  `index.php` char(1) NOT NULL default 'G',
-  `logout.php` char(1) NOT NULL default 'G',
-  `faq.php` char(1) NOT NULL default 'G',
-  `lageplan.php` char(1) NOT NULL default 'G',
-  `makeuser.php` char(1) NOT NULL default 'G',
-  `nonpublic/index.php` char(1) NOT NULL default 'G',
-  `nonpublic/news.php` char(1) NOT NULL default 'G',
-  `nonpublic/newsAddMeting` char(1) NOT NULL default 'G',
-  `nonpublic/news_comments.php` char(1) NOT NULL default 'G',
-  `nonpublic/myschichtplan.php` char(1) NOT NULL default 'G',
-  `nonpublic/myschichtplan_ical.php` char(1) NOT NULL default 'G',
-  `nonpublic/schichtplan_beamer.php` char(1) NOT NULL default 'G',
-  `nonpublic/engelbesprechung.php` char(1) NOT NULL default 'G',
-  `nonpublic/schichtplan.php` char(1) NOT NULL default 'G',
-  `nonpublic/schichtplan_add.php` char(1) NOT NULL default 'G',
-  `nonpublic/wecken.php` char(1) NOT NULL default 'G',
-  `nonpublic/waeckliste.php` char(1) NOT NULL default 'G',
-  `nonpublic/messages.php` char(1) NOT NULL default 'G',
-  `nonpublic/faq.php` char(1) NOT NULL default 'G',
-  `nonpublic/einstellungen.php` char(1) NOT NULL default 'G',
-  `Change T_Shirt Size` char(1) NOT NULL default 'G',
-  `admin/index.php` char(1) NOT NULL default 'G',
-  `admin/room.php` char(1) NOT NULL default 'G',
-  `admin/EngelType.php` char(1) NOT NULL default 'G',
-  `admin/schichtplan.php` char(1) NOT NULL default 'G',
-  `admin/shiftadd.php` char(1) NOT NULL default 'G',
-  `admin/schichtplan_druck.php` char(1) NOT NULL default 'G',
-  `admin/user.php` char(1) NOT NULL default 'G',
-  `admin/userChangeNormal.php` char(1) NOT NULL default 'G',
-  `admin/userSaveNormal.php` char(1) NOT NULL default 'G',
-  `admin/userChangeSecure.php` char(1) NOT NULL default 'G',
-  `admin/userSaveSecure.php` char(1) NOT NULL default 'G',
-  `admin/group.php` char(1) NOT NULL default 'G',
-  `admin/userDefaultSetting.php` char(1) NOT NULL default 'G',
-  `admin/UserPicture.php` char(1) NOT NULL default 'G',
-  `admin/userArrived.php` char(1) NOT NULL default 'G',
-  `admin/aktiv.php` char(1) NOT NULL default 'G',
-  `admin/tshirt.php` char(1) NOT NULL default 'G',
-  `admin/news.php` char(1) NOT NULL default 'G',
-  `admin/faq.php` char(1) NOT NULL default 'G',
-  `admin/free.php` char(1) NOT NULL default 'G',
-  `admin/sprache.php` char(1) NOT NULL default 'G',
-  `admin/dect.php` char(1) NOT NULL default 'G',
-  `admin/dect_call.php` char(1) NOT NULL default 'G',
-  `admin/dbUpdateFromXLS.php` char(1) NOT NULL default 'G',
-  `admin/Recentchanges.php` char(1) NOT NULL default 'G',
-  `admin/debug.php` char(1) NOT NULL default 'G',
-  `Herald` char(1) NOT NULL default 'G',
-  `Info` char(1) NOT NULL default 'G',
-  `Conference` char(1) NOT NULL default 'G',
-  `Kasse` char(1) NOT NULL default 'G',
-  PRIMARY KEY  (`UID`)
+--
+-- Tabellenstruktur für Tabelle `UserCVS`
+--
+
+CREATE TABLE IF NOT EXISTS `UserCVS` (
+  `UID` int(11) NOT NULL DEFAULT '0',
+  `GroupID` int(11) DEFAULT '-2',
+  `index.php` char(1) NOT NULL DEFAULT 'G',
+  `logout.php` char(1) NOT NULL DEFAULT 'G',
+  `faq.php` char(1) NOT NULL DEFAULT 'G',
+  `lageplan.php` char(1) NOT NULL DEFAULT 'G',
+  `makeuser.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/index.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/news.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/newsAddMeting` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/news_comments.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/myschichtplan.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/myschichtplan_ical.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/schichtplan_beamer.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/engelbesprechung.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/schichtplan.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/schichtplan_add.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/wecken.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/waeckliste.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/messages.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/faq.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/einstellungen.php` char(1) NOT NULL DEFAULT 'G',
+  `Change T_Shirt Size` char(1) NOT NULL DEFAULT 'G',
+  `admin/index.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/room.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/EngelType.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/schichtplan.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/shiftadd.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/schichtplan_druck.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/user.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userChangeNormal.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userSaveNormal.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userChangeSecure.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userSaveSecure.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/group.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userDefaultSetting.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/UserPicture.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userArrived.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/aktiv.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/tshirt.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/news.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/faq.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/free.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/sprache.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/dect.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/dect_call.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/dbUpdateFromXLS.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/Recentchanges.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/debug.php` char(1) NOT NULL DEFAULT 'G',
+  `Herald` char(1) NOT NULL DEFAULT 'G',
+  `Info` char(1) NOT NULL DEFAULT 'G',
+  `Conference` char(1) NOT NULL DEFAULT 'G',
+  `Kasse` char(1) NOT NULL DEFAULT 'G',
+  `credits.php` char(1) NOT NULL,
+  PRIMARY KEY (`UID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
--- 
--- Daten für Tabelle `UserCVS`
--- 
+--
+-- Daten für Tabelle `UserCVS`
+--
 
-INSERT INTO `UserCVS` (`UID`, `GroupID`, `index.php`, `logout.php`, `faq.php`, `lageplan.php`, `makeuser.php`, `nonpublic/index.php`, `nonpublic/news.php`, `nonpublic/newsAddMeting`, `nonpublic/news_comments.php`, `nonpublic/myschichtplan.php`, `nonpublic/myschichtplan_ical.php`, `nonpublic/schichtplan_beamer.php`, `nonpublic/engelbesprechung.php`, `nonpublic/schichtplan.php`, `nonpublic/schichtplan_add.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/messages.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `Change T_Shirt Size`, `admin/index.php`, `admin/room.php`, `admin/EngelType.php`, `admin/schichtplan.php`, `admin/shiftadd.php`, `admin/schichtplan_druck.php`, `admin/user.php`, `admin/userChangeNormal.php`, `admin/userSaveNormal.php`, `admin/userChangeSecure.php`, `admin/userSaveSecure.php`, `admin/group.php`, `admin/userDefaultSetting.php`, `admin/UserPicture.php`, `admin/userArrived.php`, `admin/aktiv.php`, `admin/tshirt.php`, `admin/news.php`, `admin/faq.php`, `admin/free.php`, `admin/sprache.php`, `admin/dect.php`, `admin/dect_call.php`, `admin/dbUpdateFromXLS.php`, `admin/Recentchanges.php`, `admin/debug.php`, `Herald`, `Info`, `Conference`, `Kasse`) VALUES 
-(1, -4, 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G'),
-(-1, NULL, 'Y', 'N', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'),
-(-2, NULL, 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'),
-(-3, NULL, 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', 'N', 'Y', 'Y', 'Y', 'Y'),
-(-4, NULL, 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y'),
-(-5, NULL, 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y');
+INSERT INTO `UserCVS` (`UID`, `GroupID`, `index.php`, `logout.php`, `faq.php`, `lageplan.php`, `makeuser.php`, `nonpublic/index.php`, `nonpublic/news.php`, `nonpublic/newsAddMeting`, `nonpublic/news_comments.php`, `nonpublic/myschichtplan.php`, `nonpublic/myschichtplan_ical.php`, `nonpublic/schichtplan_beamer.php`, `nonpublic/engelbesprechung.php`, `nonpublic/schichtplan.php`, `nonpublic/schichtplan_add.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/messages.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `Change T_Shirt Size`, `admin/index.php`, `admin/room.php`, `admin/EngelType.php`, `admin/schichtplan.php`, `admin/shiftadd.php`, `admin/schichtplan_druck.php`, `admin/user.php`, `admin/userChangeNormal.php`, `admin/userSaveNormal.php`, `admin/userChangeSecure.php`, `admin/userSaveSecure.php`, `admin/group.php`, `admin/userDefaultSetting.php`, `admin/UserPicture.php`, `admin/userArrived.php`, `admin/aktiv.php`, `admin/tshirt.php`, `admin/news.php`, `admin/faq.php`, `admin/free.php`, `admin/sprache.php`, `admin/dect.php`, `admin/dect_call.php`, `admin/dbUpdateFromXLS.php`, `admin/Recentchanges.php`, `admin/debug.php`, `Herald`, `Info`, `Conference`, `Kasse`, `credits.php`) VALUES
+(1, -4, 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G'),
+(-1, NULL, 'Y', 'N', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y'),
+(-2, NULL, 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y'),
+(-3, NULL, 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y'),
+(-4, NULL, 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'N', 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'Y', 'Y', 'N', 'Y', 'Y', 'Y', 'Y', 'Y'),
+(-5, NULL, 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y'),
 
--- --------------------------------------------------------
--- --------------------------------------------------------
 -- --------------------------------------------------------
 
--- 
--- Tabellenstruktur für Tabelle `UserGroups`
--- 
+--
+-- Tabellenstruktur für Tabelle `UserGroups`
+--
 
-DROP TABLE IF EXISTS `UserGroups`;
 CREATE TABLE IF NOT EXISTS `UserGroups` (
   `Name` varchar(35) NOT NULL,
   `UID` int(11) NOT NULL,
-  PRIMARY KEY  (`UID`)
+  PRIMARY KEY (`UID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
--- 
--- Daten für Tabelle `UserGroups`
--- 
+--
+-- Daten für Tabelle `UserGroups`
+--
 
-INSERT INTO `UserGroups` (`Name`, `UID`) VALUES 
+INSERT INTO `UserGroups` (`Name`, `UID`) VALUES
 ('1-logout User', -1),
 ('2-Engel', -2),
 ('3-Shift Coordinator', -3),
 ('4-Erzengel', -4),
 ('5-Developer', -5);
-
diff --git a/includes/footer.php b/includes/footer.php
index f56c299c..fdcf8e55 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -24,7 +24,7 @@ if ($_SESSION['Menu'] == "R")
 </table>
 <footer>
 	<p>
-		&copy; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a><br />
+		&copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Kontakt</a> | <a href="credits.php">Credits</a><br />
 		This is hell. Temporarily.
 	</p>
 </footer>
diff --git a/www-ssl/credits.php b/www-ssl/credits.php
new file mode 100644
index 00000000..bbfa747d
--- /dev/null
+++ b/www-ssl/credits.php
@@ -0,0 +1,18 @@
+<?php
+require_once ('bootstrap.php');
+
+$title = "Credits";
+$header = "Credits";
+include "includes/header.php";
+?>
+<h1>The angelsystem has been (re)done by:</h1>
+<ul>
+	<li>?</li>
+	<li>helios</li>
+	<li>msquare</li>
+</ul>
+<?php
+
+
+include "includes/footer.php";
+?>
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 0fe3e5a9..d87fc2f9 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -37,6 +37,14 @@ td, dt, dd {
 	padding: 4px;
 }
 
-.menu ul {
+dt {
+	font-weight: bold;
+}
+
+h4 {
+	padding: 0 4px;
+}
+
+ul {
 	margin: 0 0 0 20px;
 }
-- 
cgit v1.2.3-54-g00ecf


From d163b9921b3ddb71f027199c87e6cf18fbb9a624 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 17:28:03 +0200
Subject: rebase, new flags

---
 includes/funktion_activeUser.php |  87 ++++++++++++++-------------------------
 includes/funktion_flag.php       |  12 +++---
 includes/funktion_menu.php       |   4 +-
 includes/header_start.php        |  76 +++++++++++++++++-----------------
 includes/menu.php                |  53 ++++++++++--------------
 www-ssl/css/base.css             |  10 +++++
 www-ssl/css/style10.css          |   0
 www-ssl/faq.php                  |  11 ++++-
 www-ssl/nonpublic/index.php      |   2 +-
 www-ssl/pic/flag/de.gif          | Bin 321 -> 0 bytes
 www-ssl/pic/flag/de.png          | Bin 0 -> 545 bytes
 www-ssl/pic/flag/en.gif          | Bin 2430 -> 0 bytes
 www-ssl/pic/flag/en.png          | Bin 0 -> 599 bytes
 13 files changed, 119 insertions(+), 136 deletions(-)
 create mode 100644 www-ssl/css/style10.css
 delete mode 100644 www-ssl/pic/flag/de.gif
 create mode 100644 www-ssl/pic/flag/de.png
 delete mode 100644 www-ssl/pic/flag/en.gif
 create mode 100644 www-ssl/pic/flag/en.png

(limited to 'www-ssl/css/base.css')

diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php
index e214a1f9..ca6e3aaa 100644
--- a/includes/funktion_activeUser.php
+++ b/includes/funktion_activeUser.php
@@ -1,57 +1,34 @@
 <?php
-  // Funktionen gibt es nicht auf allen Rechnern
-  if(!function_exists("bcdiv")) {
-    function bcdiv( $param1, $param2) {
-      return floor( $param1 / $param2);
-    }
-  }
-
-  if(!function_exists("bcmod")) {
-    function bcmod( $param1, $param2) {
-      return $param1 - ( $param2 * bcdiv( $param1, $param2));
-    }
-  }
-
-  echo "<h4 class=\"menu\">Engel online</h4>";
-
-  $SQL = "SELECT UID, Nick, lastLogIn " . 
-         "FROM User " . 
-         "WHERE (`lastLogIn` > '" . gmdate("YmdHis", time() - (60 * 60)) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " . 
-         "ORDER BY lastLogIn DESC;";
-
-  $Erg = mysql_query($SQL, $con);
-  
-  $Tist = (gmdate("d", time()) * 60 * 60 * 24) +  // Tag
-          (gmdate("H", time()) * 60 * 60) +       // Stunde
-          (gmdate("i", time()) * 60) +            // Minute
-          (gmdate("s", time()) );                 // Sekunde
-
-  echo "<ul>";
-
-  for($i = 0; $i < mysql_num_rows($Erg); $i++) {
-    echo "<li>";
-
-    if($_SESSION['UID'] > 0)
-      echo DisplayAvatar( mysql_result( $Erg, $i, "UID"));
-
-    // Show Admin Page
-    echo funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=" . mysql_result($Erg, $i, "UID") . "&Type=Normal", mysql_result($Erg, $i, "Nick"));
-
-    $Tlog =  (substr(mysql_result($Erg, $i, "lastLogIn"),  8, 2) * 60 * 60 * 24) +  // Tag
-             (substr(mysql_result($Erg, $i, "lastLogIn"), 11, 2) * 60 * 60) +       // Stunde
-             (substr(mysql_result($Erg, $i, "lastLogIn"), 14, 2) * 60) +            // Minute
-             (substr(mysql_result($Erg, $i, "lastLogIn"), 17, 2) );                 // Sekunde
-  
-    $Tlog = $Tist - $Tlog;
-
-    echo " " . bcdiv($Tlog, 60) . ":";
-
-    if(strlen(bcmod($Tlog, 60)) == 1)
-      echo "0";
-
-    echo bcmod($Tlog, 60);
-    echo "</li>\n";
-  }
-  
-  echo "</ul>";
+
+
+// Funktionen gibt es nicht auf allen Rechnern
+echo "<h4>Engel online</h4>";
+
+$SQL = "SELECT UID, Nick, lastLogIn " .
+"FROM User " .
+"WHERE (`lastLogIn` > '" . (time() - 60 * 60) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " .
+"ORDER BY lastLogIn DESC;";
+
+$Erg = mysql_query($SQL, $con);
+
+echo "<ul>";
+
+for ($i = 0; $i < mysql_num_rows($Erg); $i++) {
+	echo "<li>";
+
+	if ($_SESSION['UID'] > 0)
+		echo DisplayAvatar(mysql_result($Erg, $i, "UID"));
+
+	// Show Admin Page
+	echo funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=" . mysql_result($Erg, $i, "UID") . "&Type=Normal", mysql_result($Erg, $i, "Nick"));
+
+	$timestamp = mktime($hour, $minute, $second, $month, $day, $year);
+
+	$Tlog = time() - mysql_result($Erg, $i, "lastLogIn");
+
+	echo " " . date("i:s", $Tlog);
+	echo "</li>\n";
+}
+
+echo "</ul>";
 ?>
diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index b6a02242..b394d18a 100644
--- a/includes/funktion_flag.php
+++ b/includes/funktion_flag.php
@@ -1,9 +1,9 @@
 <?php
-   if(strpos($_SERVER["REQUEST_URI"], "?") > 0)
-    $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
-  else
-    $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
+if (strpos($_SERVER["REQUEST_URI"], "?") > 0)
+	$URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
+else
+	$URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
 
-  echo "<a href=\"" . $URL . "DE\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/de.gif\" alt=\"DE\" /></a> ";
-  echo "<a href=\"" . $URL . "EN\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/en.gif\" alt=\"EN\" /></a> ";
+echo '<a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
+echo '<a class="sprache" href="' . $URL . 'EN"><img src="' . $ENGEL_ROOT . 'pic/flag/en.png" alt="EN" title="English"></a>';
 ?>
diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php
index 387310aa..3d20420b 100644
--- a/includes/funktion_menu.php
+++ b/includes/funktion_menu.php
@@ -7,7 +7,7 @@ function ShowMenu($MenuName) {
 	$Gefunden = false;
 
 	// Ueberschift
-	$Text = "<h4 class=\"menu\">" . Get_Text("$MenuName/") . "</h4><ul>";
+	$Text = "";
 
 	// Eintraege
 	foreach ($_SESSION['CVS'] as $Key => $Entry)
@@ -37,6 +37,6 @@ function ShowMenu($MenuName) {
 				}
 			}
 	if ($Gefunden)
-		echo $MenueTableStart . $Text . $MenueTableEnd;
+		echo '<nav><h4>' . Get_Text("$MenuName/") . '</h4><ul>' . $Text . '</ul></nav>';
 } //function ShowMenue
 ?>
diff --git a/includes/header_start.php b/includes/header_start.php
index 70f986cf..4795cee3 100644
--- a/includes/header_start.php
+++ b/includes/header_start.php
@@ -1,40 +1,40 @@
 <?php
-  ini_set("session.gc_maxlifetime", "65535");
-
-  include "config/config.php";
-  include "error_handler.php";
-  include "config/config_db.php";
-  include "funktion_lang.php";
-  include "funktion_faq.php"; // fuer noAnswer() im menu
-  include "funktion_menu.php";
-  include "funktion_user.php";
-
-  if(isset($SystemDisableMessage) && (strlen($SystemDisableMessage) > 0)) {
-    echo "<html><head><title>" . $SystemDisableMessage . "</title></head>";
-    echo "<body>" . $SystemDisableMessage . "</body></html>\n";
-    die();
-  }
-
-  if(!isset($_SESSION))
-    session_start();
-
-  include "secure.php";
-
-  if(!isset($_SESSION['IP']))
-    $_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
-
-  if(isset($_SESSION['UID']) && ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR'])) {
-    session_destroy ();
-    header("Location: " . $url . $ENGEL_ROOT);
-  }
-
-  include "UserCVS.php";
-
-  // update LASTlogin
-  if(isset($_SESSION['UID'])) {
-    $SQLlastLogIn = "UPDATE `User` SET " .
-      "`lastLogIn` = '" . gmdate("Y-m-j H:i:s", time()) . "'" . 
-      " WHERE `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;";
-    mysql_query ($SQLlastLogIn, $con);
-  }
+ini_set("session.gc_maxlifetime", "65535");
+
+include "config/config.php";
+include "error_handler.php";
+include "config/config_db.php";
+include "funktion_lang.php";
+include "funktion_faq.php"; // fuer noAnswer() im menu
+include "funktion_menu.php";
+include "funktion_user.php";
+
+if (isset ($SystemDisableMessage) && (strlen($SystemDisableMessage) > 0)) {
+	echo "<html><head><title>" . $SystemDisableMessage . "</title></head>";
+	echo "<body>" . $SystemDisableMessage . "</body></html>\n";
+	die();
+}
+
+if (!isset ($_SESSION))
+	session_start();
+
+include "secure.php";
+
+if (!isset ($_SESSION['IP']))
+	$_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
+
+if (isset ($_SESSION['UID']) && ($_SESSION['IP'] <> $_SERVER['REMOTE_ADDR'])) {
+	session_destroy();
+	header("Location: " . $url . $ENGEL_ROOT);
+}
+
+include "UserCVS.php";
+
+// update LASTlogin
+if (isset ($_SESSION['UID'])) {
+	$SQLlastLogIn = "UPDATE `User` SET " .
+	"`lastLogIn` = '" . time() . "'" .
+	" WHERE `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;";
+	mysql_query($SQLlastLogIn, $con);
+}
 ?>
diff --git a/includes/menu.php b/includes/menu.php
index 955de8b7..61a3ea73 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -2,35 +2,23 @@
 <!-- anfang des menue parts //-->
   <td width="160"  valign="top">
 <?php
-$MenueTableStart="
-<table align=\"center\" class=\"border\" cellpadding=\"3\" cellspacing=\"1\">
-  <tr> 
-    <td width=\"160\" class=\"menu\">
-";
-$MenueTableEnd="</ul>
-        <br />
-    </td>
-  </tr>
-</table><br />
-";
-
 ShowMenu("");
 ShowMenu("nonpublic");
 ShowMenu("admin");
 
-if(!isset($submenus))
-  $submenus = 0;
+if (!isset ($submenus))
+	$submenus = 0;
 
 if ($submenus >= 1) {
-  $inc_name = $_SERVER['PHP_SELF'];
-  $filenamepos = strrpos($inc_name, '/');
-  $filenamepos += 1;
-  $filename = substr ($inc_name, $filenamepos );
-  $filepost = substr ($filename, 0, -4);
-  $filepre = substr ($filename, -4 );
-  $verzeichnis = substr ($inc_name, 0 , $filenamepos);
-  
-  for ($index_nummer=1; $index_nummer <= $submenus; $index_nummer++) {
+	$inc_name = $_SERVER['PHP_SELF'];
+	$filenamepos = strrpos($inc_name, '/');
+	$filenamepos += 1;
+	$filename = substr($inc_name, $filenamepos);
+	$filepost = substr($filename, 0, -4);
+	$filepre = substr($filename, -4);
+	$verzeichnis = substr($inc_name, 0, $filenamepos);
+
+	for ($index_nummer = 1; $index_nummer <= $submenus; $index_nummer++) {
 ?>
 <table align="center" class="border" cellpadding="3" cellspacing="1">
   <tr>
@@ -42,26 +30,27 @@ if ($submenus >= 1) {
 
 <br />
 <?php
-    }
+
+	}
 }
 
-if( isset($_SESSION['UID']))
-{
+if (isset ($_SESSION['UID'])) {
 ?>
-<table align="center" class="border" cellpadding="3" cellspacing="1">
-  <tr>
-    <td width="160" class="menu">
+<nav>
     <?php include("funktion_activeUser.php"); ?>
-    </td>
-  </tr>
-</table>
+</nav>
 <?php
+
 }
 ?>
 
+<nav>
+<h4><?php echo Get_Text("Sprache") ?></h4>
 <?php
+
 include ("funktion_flag.php");
 ?>
+</nav>
     </td> 
 
 <!-- ende des menue parts //-->
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index d87fc2f9..b285c40d 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -4,6 +4,7 @@
 }
 
 body {
+	font-size: 14px;
 }
 
 header {
@@ -13,6 +14,7 @@ header {
 
 footer {
 	display: block;
+	font-size: 12px;
 	text-align: center;
 	width: 100%;
 }
@@ -41,6 +43,10 @@ dt {
 	font-weight: bold;
 }
 
+dd {
+	margin-left: 20px;
+}
+
 h4 {
 	padding: 0 4px;
 }
@@ -48,3 +54,7 @@ h4 {
 ul {
 	margin: 0 0 0 20px;
 }
+
+a.sprache img {
+	margin: 5px;
+}
diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css
new file mode 100644
index 00000000..e69de29b
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
index 472915e5..8a7b3ede 100644
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -13,9 +13,16 @@ $Zeilen = mysql_num_rows($Erg);
 
 for ($n = 0; $n < $Zeilen; $n++) {
 	if (mysql_result($Erg, $n, "Antwort") != "") {
+		list ($frage_de, $frage_en) = split('<br />', mysql_result($Erg, $n, "Frage"));
+		list ($antwort_de, $antwort_en) = split('<br />', mysql_result($Erg, $n, "Antwort"));
 		echo "<dl>";
-		echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
-		echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
+		if ($_SESSION['Sprache'] == "DE") {
+			echo "<dt>" . $frage_de . "</dt>";
+			echo "<dd>" . $antwort_de . "</dd>";
+		} else {
+			echo "<dt>" . $frage_en . "</dt>";
+			echo "<dd>" . $antwort_en . "</dd>";
+		}
 		echo "</dl>";
 	}
 }
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index add0fdd3..b53f8088 100644
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -10,7 +10,7 @@ include ("includes/crypt.php");
 session_start(); // alte Session - falls vorhanden - wiederherstellen...
 
 function LoginOK() {
-	include ("../../config/config.php");
+	include ("config/config.php");
 	header("HTTP/1.1 302 Moved Temporarily");
 	header("Location: " . $url . $ENGEL_ROOT . "nonpublic/news.php");
 }
diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif
deleted file mode 100644
index 15739e2e..00000000
Binary files a/www-ssl/pic/flag/de.gif and /dev/null differ
diff --git a/www-ssl/pic/flag/de.png b/www-ssl/pic/flag/de.png
new file mode 100644
index 00000000..ac4a9773
Binary files /dev/null and b/www-ssl/pic/flag/de.png differ
diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif
deleted file mode 100644
index 34936ee3..00000000
Binary files a/www-ssl/pic/flag/en.gif and /dev/null differ
diff --git a/www-ssl/pic/flag/en.png b/www-ssl/pic/flag/en.png
new file mode 100644
index 00000000..ff701e19
Binary files /dev/null and b/www-ssl/pic/flag/en.png differ
-- 
cgit v1.2.3-54-g00ecf


From ac8dbe835e368b9c7d97584c3722206b134db890 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 17:41:49 +0200
Subject: html5, css rewrite

---
 includes/footer.php        | 28 ++----------------
 includes/funktion_flag.php |  4 +--
 includes/header.php        | 26 ++++-------------
 www-ssl/css/base.css       | 71 ++++++++++++++++++++++++++++++++++------------
 4 files changed, 64 insertions(+), 65 deletions(-)

(limited to 'www-ssl/css/base.css')

diff --git a/includes/footer.php b/includes/footer.php
index 62260e55..8e5b35b9 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,27 +1,7 @@
-<!-- anfang des footers //-->
-    <br />
-      <p align="center">
-        <?php
-if (IsSet ($_SESSION['oldurl']))
-	echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
-?>
-        <a href="#top"><?php echo Get_Text("top"); ?></a>
-      </p>
-    </td>
-  </tr>
-</table>
-</td>
-
-<!-- anfang des menue parts //-->
-<?php
-
+</article>
+</div>
+</div>
 
-if ($_SESSION['Menu'] == "R")
-	include ("menu.php");
-?>
-
-<!-- ende des menue parts //-->
-</table>
 <footer>
 	<p>
 		&copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Kontakt</a> | <a href="<?php echo $ENGEL_ROOT; ?>credits.php">Credits</a><br />
@@ -30,8 +10,6 @@ if ($_SESSION['Menu'] == "R")
 </footer>
 
 <?php
-
-
 include ("funktion_counter.php");
 mysql_close($con);
 ?>
diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index b394d18a..7e88466d 100644
--- a/includes/funktion_flag.php
+++ b/includes/funktion_flag.php
@@ -4,6 +4,6 @@ if (strpos($_SERVER["REQUEST_URI"], "?") > 0)
 else
 	$URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
 
-echo '<a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
-echo '<a class="sprache" href="' . $URL . 'EN"><img src="' . $ENGEL_ROOT . 'pic/flag/en.png" alt="EN" title="English"></a>';
+echo '<p><a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
+echo '<a class="sprache" href="' . $URL . 'EN"><img src="' . $ENGEL_ROOT . 'pic/flag/en.png" alt="EN" title="English"></a></p>';
 ?>
diff --git a/includes/header.php b/includes/header.php
index 9fb882bf..750c82fb 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -57,8 +57,8 @@ if (isset ($_SESSION['CVS']["nonpublic/messages.php"])) {
 	}
 }
 ?>
-<table id="body" width="90%" align="center" border="0" cellpadding="7" cellspacing="0">
-  <tr>
+<div id="body">
+<div id="menu">
 <?php
 
 
@@ -68,27 +68,13 @@ if (!isset ($_SESSION['Menu']))
 if ($_SESSION['Menu'] == "L")
 	include ("menu.php");
 ?>
-
-    <td valign="top" align="center">
-<table border="0" width="100%" align="center" class="border" cellpadding="5" cellspacing="1">
-  <tr class="contenttopic">
-    <td>
+</div>
+<div id="content">
 <?php
 
 
-echo "<a name=\"" . $header . "\" class=\"contenttopic\">";
-if (strlen($header) == 0)
-	echo "\n<b>" . Get_Text($Page["Name"]) . "</b></a>\n";
-else
-	echo "\n<b>$header</b></a>\n";
-?>
-    </td>
-  </tr>
-  <tr class="content">
-     <td>
-<br />
-<?php
-
+echo '<h1>' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . '</h1>';
+echo '<article>';
 
 if (isset ($_SESSION['UID'])) {
 	if (isset ($_SESSION['oldurl']))
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index b285c40d..27e20788 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -4,57 +4,92 @@
 }
 
 body {
-	font-size: 14px;
+    background: #f0f0f0;
+    font-family: Arial;
+    sans-serif;
+    font-size:
+    14px;
 }
 
 header {
-	display: block;
-	width: 100%;
+    display: block;
+    width: 100%;
 }
 
 footer {
-	display: block;
-	font-size: 12px;
-	text-align: center;
-	width: 100%;
+    clear: both;
+    display: block;
+    font-size: 12px;
+    text-align: center;
+    width: 100%;
 }
 
 footer p {
-	margin: 10px auto;
+    margin: 10px auto;
 }
 
 #logo {
     background: url('../pic/himmel.png') top left no-repeat;
     display: block;
-	height: 32px;
-	margin: 10px auto;
+    height: 32px;
+    margin: 10px auto;
     width: 380px;
 }
 
 #body {
-	margin: 0 5%;
+    margin: 0 5%;
+}
+
+#menu {
+    float: left;
+    width: 200px;
+}
+
+#content {
+    margin-left: 200px;
+}
+
+a {
+    color: #000;
 }
 
 td, dt, dd {
-	padding: 4px;
+    padding: 4px;
 }
 
 dt {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 dd {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 
-h4 {
-	padding: 0 4px;
+h1, h4 {
+    font-size: 16px;
+    padding: 0 4px;
 }
 
 ul {
-	margin: 0 0 0 20px;
+    padding: 5px 0 5px 20px;
+}
+
+nav {
+    margin: 0 10px 10px 0;
+}
+
+nav, #content {
+    border: 1px solid #888;
+}
+
+#content article {
+    padding: 10px;
+}
+
+nav ul, nav p, #content article {
+    background: #fff;
 }
 
 a.sprache img {
-	margin: 5px;
+    margin: 5px;
 }
-- 
cgit v1.2.3-54-g00ecf


From 54aa90e6414b2e23d02915495b66d64e8ba6e286 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 17:51:39 +0200
Subject: html5, css rewrite

---
 includes/funktion_activeUser.php |  2 +-
 includes/funktion_menu.php       |  2 +-
 includes/header.php              |  6 +--
 includes/menu.php                |  8 ++--
 www-ssl/css/base.css             | 21 +++++-----
 www-ssl/css/style1.css           | 85 ++++++++++++++++++++--------------------
 6 files changed, 64 insertions(+), 60 deletions(-)

(limited to 'www-ssl/css/base.css')

diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php
index ca6e3aaa..631ec2d1 100644
--- a/includes/funktion_activeUser.php
+++ b/includes/funktion_activeUser.php
@@ -11,7 +11,7 @@ $SQL = "SELECT UID, Nick, lastLogIn " .
 
 $Erg = mysql_query($SQL, $con);
 
-echo "<ul>";
+echo "<ul class=\"content\">";
 
 for ($i = 0; $i < mysql_num_rows($Erg); $i++) {
 	echo "<li>";
diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php
index 3d20420b..8246dcc5 100644
--- a/includes/funktion_menu.php
+++ b/includes/funktion_menu.php
@@ -37,6 +37,6 @@ function ShowMenu($MenuName) {
 				}
 			}
 	if ($Gefunden)
-		echo '<nav><h4>' . Get_Text("$MenuName/") . '</h4><ul>' . $Text . '</ul></nav>';
+		echo '<nav class="container"><h4>' . Get_Text("$MenuName/") . '</h4><ul class="content">' . $Text . '</ul></nav>';
 } //function ShowMenue
 ?>
diff --git a/includes/header.php b/includes/header.php
index 750c82fb..d4f212d9 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -40,7 +40,7 @@ echo "</head>\n";
 /////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////// B O D Y
 /////////////////////////////////////////////////////////////////////////////////////////////
-echo "<body>\n";
+echo "<body class=\"background\">\n";
 
 echo '<header><a href="' . $url . $ENGEL_ROOT . '" id="logo"></a></header>';
 
@@ -69,12 +69,12 @@ if ($_SESSION['Menu'] == "L")
 	include ("menu.php");
 ?>
 </div>
-<div id="content">
+<div id="content" class="container">
 <?php
 
 
 echo '<h1>' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . '</h1>';
-echo '<article>';
+echo '<article class="content">';
 
 if (isset ($_SESSION['UID'])) {
 	if (isset ($_SESSION['oldurl']))
diff --git a/includes/menu.php b/includes/menu.php
index 61a3ea73..3ca5e8ae 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -31,26 +31,28 @@ if ($submenus >= 1) {
 <br />
 <?php
 
+
 	}
 }
 
 if (isset ($_SESSION['UID'])) {
 ?>
-<nav>
+<nav class="container">
     <?php include("funktion_activeUser.php"); ?>
 </nav>
 <?php
 
+
 }
 ?>
 
-<nav>
+<nav class="container">
 <h4><?php echo Get_Text("Sprache") ?></h4>
 <?php
 
+
 include ("funktion_flag.php");
 ?>
 </nav>
-    </td> 
 
 <!-- ende des menue parts //-->
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 27e20788..6c0bc298 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -4,7 +4,6 @@
 }
 
 body {
-    background: #f0f0f0;
     font-family: Arial;
     sans-serif;
     font-size:
@@ -78,18 +77,22 @@ nav {
     margin: 0 10px 10px 0;
 }
 
-nav, #content {
-    border: 1px solid #888;
-}
-
 #content article {
     padding: 10px;
 }
 
-nav ul, nav p, #content article {
-    background: #fff;
-}
-
 a.sprache img {
     margin: 5px;
 }
+
+.background {
+    background: #f0f0f0;
+}
+
+.container {
+    border: 1px solid #888;
+}
+
+.content {
+    background: #fff;
+}
diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css
index 8fec5db0..fd8426f1 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;
 }
-- 
cgit v1.2.3-54-g00ecf


From a3be0289286c43d8656052217457d9162261ba90 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Thu, 2 Jun 2011 00:48:29 +0200
Subject: rewrite

---
 includes/UserCVS.php             |   4 +-
 includes/footer.php              |   2 +-
 includes/funktion_lang.php       |  27 -----
 includes/pages/guest_credits.php |   5 +
 includes/pages/guest_faq.php     |  21 ++++
 includes/pages/guest_login.php   | 250 +++++++++++++++++++++++++++++++++++++++
 includes/pages/guest_start.php   |  13 ++
 includes/sys_auth.php            |  47 ++++++++
 includes/sys_lang.php            |  26 ++++
 includes/sys_menu.php            |  72 +++++++++++
 includes/sys_mysql.php           |  61 ++++++++++
 includes/sys_page.php            |   9 ++
 includes/sys_template.php        |  17 +++
 templates/guest_credits.html     |  12 ++
 templates/guest_login_form.html  |  22 ++++
 templates/layout.html            |  42 +++++++
 www-ssl/credits.php              |  18 ---
 www-ssl/css/base.css             |  18 ++-
 www-ssl/index.php                |  74 ++++++++++--
 19 files changed, 682 insertions(+), 58 deletions(-)
 delete mode 100644 includes/funktion_lang.php
 create mode 100644 includes/pages/guest_credits.php
 create mode 100644 includes/pages/guest_faq.php
 create mode 100644 includes/pages/guest_login.php
 create mode 100644 includes/pages/guest_start.php
 create mode 100644 includes/sys_auth.php
 create mode 100644 includes/sys_lang.php
 create mode 100644 includes/sys_menu.php
 create mode 100644 includes/sys_mysql.php
 create mode 100644 includes/sys_page.php
 create mode 100644 includes/sys_template.php
 create mode 100644 templates/guest_credits.html
 create mode 100644 templates/guest_login_form.html
 create mode 100644 templates/layout.html
 delete mode 100644 www-ssl/credits.php

(limited to 'www-ssl/css/base.css')

diff --git a/includes/UserCVS.php b/includes/UserCVS.php
index 98a4fec7..b7fb412c 100644
--- a/includes/UserCVS.php
+++ b/includes/UserCVS.php
@@ -20,8 +20,8 @@
   }
 
   // pagename ermitteln
-  $Page["Name"] = basename($_SERVER['PHP_SELF']);
-//  $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
+//  $Page["Name"] = basename($_SERVER['PHP_SELF']);
+  $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']);
 
   //recht fuer diese seite auslesen
   if(isset($_SESSION['CVS'][$Page["Name"]]))
diff --git a/includes/footer.php b/includes/footer.php
index 8e5b35b9..fdf00581 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -4,7 +4,7 @@
 
 <footer>
 	<p>
-		&copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Kontakt</a> | <a href="<?php echo $ENGEL_ROOT; ?>credits.php">Credits</a><br />
+		&copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Contact</a> | <a href="<?php echo $ENGEL_ROOT; ?>credits.php">Credits</a><br />
 		This is hell. Temporarily.
 	</p>
 </footer>
diff --git a/includes/funktion_lang.php b/includes/funktion_lang.php
deleted file mode 100644
index 3e26ea33..00000000
--- a/includes/funktion_lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-function Get_Text($TextID, $NoError = false) {
-	global $con, $error_messages, $debug;
-
-	if (!isset ($_SESSION['Sprache']))
-		$_SESSION['Sprache'] = "EN";
-	if ($_SESSION['Sprache'] == "")
-		$_SESSION['Sprache'] = "EN";
-	if (isset ($_GET["SetLanguage"]))
-		$_SESSION['Sprache'] = $_GET["SetLanguage"];
-
-	$SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='" . $_SESSION['Sprache'] . "'";
-	@ $Erg = mysql_query($SQL, $con);
-
-	if (mysql_num_rows($Erg) == 1)
-		return (@ mysql_result($Erg, 0, "Text"));
-	elseif ($NoError && !$debug) return "";
-	else {
-		array_push($error_messages, "Get_Text, '$TextID' found " . mysql_num_rows($Erg) . "x in Sprache Database Table for Language (" . $_SESSION['Sprache'] . ")\n");
-		return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x";
-	}
-}
-
-function Print_Text($TextID, $NoError = false) {
-	echo Get_Text($TextID, $NoError);
-}
-?>
diff --git a/includes/pages/guest_credits.php b/includes/pages/guest_credits.php
new file mode 100644
index 00000000..89f68fde
--- /dev/null
+++ b/includes/pages/guest_credits.php
@@ -0,0 +1,5 @@
+<?php
+function guest_credits() {
+	return template_render('../templates/guest_credits.html', array ());
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/guest_faq.php b/includes/pages/guest_faq.php
new file mode 100644
index 00000000..6b5eeeeb
--- /dev/null
+++ b/includes/pages/guest_faq.php
@@ -0,0 +1,21 @@
+<?php
+function guest_faq() {
+	$html = "";
+	$faqs = sql_select("SELECT * FROM `FAQ`");
+	foreach ($faqs as $faq)
+		if ($faq['Antwort'] != "") {
+			list ($frage_de, $frage_en) = explode('<br />', $faq['Frage']);
+			list ($antwort_de, $antwort_en) = explode('<br />', $faq['Antwort']);
+			$html .= "<dl>";
+			if ($_SESSION['Sprache'] == "DE") {
+				$html .= "<dt>" . $frage_de . "</dt>";
+				$html .= "<dd>" . $antwort_de . "</dd>";
+			} else {
+				$html .= "<dt>" . $frage_en . "</dt>";
+				$html .= "<dd>" . $antwort_en . "</dd>";
+			}
+			$html .= "</dl>";
+		}
+	return $html;
+}
+?>
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
new file mode 100644
index 00000000..76a473df
--- /dev/null
+++ b/includes/pages/guest_login.php
@@ -0,0 +1,250 @@
+<?php
+
+
+// Engel registrieren
+function guest_register() {
+	$html = "";
+	$success = "none";
+
+	if (isset ($_POST["send"])) {
+		$eNick = trim($_POST["Nick"]);
+
+		if ($_POST["Alter"] == "")
+			$_POST["Alter"] = 23;
+
+		// user vorhanden?
+		$Ergans = sql_select("SELECT UID FROM `User` WHERE `Nick`='" . sql_escape($_POST["Nick"]) . "'");
+
+		if (strlen($_POST["Nick"]) < 2)
+			$error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2");
+		elseif (count($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"]);
+
+			$Erg = sql_query("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())");
+
+			if ($Erg != 1) {
+				$html .= Get_Text("makeuser_error_write1") . "<br />\n";
+				$error = sql_error();
+			} else {
+				$html .= "<p class=\"success\">" . 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) {
+					$html .= "<h1>" . Get_Text("makeuser_error_write2") . "<br />\n";
+					$error = mysql_error($con);
+				} else {
+					$html .= Get_Text("makeuser_writeOK2") . "<br />\n";
+					$html .= "<h1>" . Get_Text("makeuser_writeOK3") . "</h1>\n";
+				}
+
+				$html .= 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))
+			$html .= error($error);
+	} 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") {
+		$html .= "<h1>" . Get_Text("makeuser_text0") . "</h1>\n";
+		$html .= "<h2>" . Get_Text("makeuser_text1") . "</h2>\n";
+		$html .= "<form action=\"\" method=\"post\">\n";
+		$html .= "<table>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Nickname") . "*</td><td><input type=\"text\" size=\"40\" name=\"Nick\" value=\"" . $_POST["Nick"] . "\" /></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Nachname") . "</td><td><input type=\"text\" size=\"40\" name=\"Name\" value=\"" . $_POST["Name"] . "\" /></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Vorname") . "</td><td><input type=\"text\" size=\"40\" name=\"Vorname\" value=\"" . $_POST["Vorname"] . "\" /></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Alter") . "</td><td><input type=\"text\" size=\"40\" name=\"Alter\" value=\"" . $_POST["Alter"] . "\"></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Telefon") . "</td><td><input type=\"text\" size=\"40\" name=\"Telefon\" value=\"" . $_POST["Telefon"] . "\"></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_DECT") . "</td><td><input type=\"text\" size=\"40\" name=\"DECT\" value=\"" . $_POST["DECT"] . "\"></td><td>\n";
+		$html .= "<!--a href=\"https://21c3.ccc.de/wiki/index.php/POC\"><img src=\"./pic/external.png\" alt=\"external: \">DECT</a--></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Handy") . "</td><td><input type=\"text\" size=\"40\" name=\"Handy\" value=\"" . $_POST["Handy"] . "\"></td></tr>\n";
+		$html .= "<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))
+			$html .= "<tr><td>" . Get_Text("makeuser_subscribe-mailinglist") . "</td><td><input type=\"checkbox\" name=\"subscribe-mailinglist\" value=\"" . $_POST["subscribe-mailinglist"] . "\">($SubscribeMailinglist)</td></tr>\n";
+
+		$html .= "<tr><td>ICQ</td><td><input type=\"text\" size=\"40\" name=\"ICQ\" value=\"" . $_POST["ICQ"] . "\"></td></tr>\n";
+		$html .= "<tr><td>jabber</td><td><input type=\"text\" size=\"40\" name=\"jabber\" value=\"" . $_POST["jabber"] . "\"></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_T-Shirt") . " Gr&ouml;sse*</td><td align=\"left\">\n";
+		$html .= "<select name=\"Size\">\n";
+		$html .= "<option value=\"S\"";
+		if ($_POST["Size"] == "S")
+			$html .= " selected";
+		$html .= ">S</option>\n";
+		$html .= "<option value=\"M\"";
+		if ($_POST["Size"] == "M")
+			$html .= " selected";
+		$html .= ">M</option>\n";
+		$html .= "<option value=\"L\"";
+		if ($_POST["Size"] == "L")
+			$html .= " selected";
+		$html .= ">L</option>\n";
+		$html .= "<option value=\"XL\"";
+		if ($_POST["Size"] == "XL")
+			$html .= " selected";
+		$html .= ">XL</option>\n";
+		$html .= "<option value=\"2XL\"";
+		if ($_POST["Size"] == "2XL")
+			$html .= " selected";
+		$html .= ">2XL</option>\n";
+		$html .= "<option value=\"3XL\"";
+		if ($_POST["Size"] == "3XL")
+			$html .= " selected";
+		$html .= ">3XL</option>\n";
+		$html .= "<option value=\"4XL\"";
+		if ($_POST["Size"] == "4XL")
+			$html .= " selected";
+		$html .= ">4XL</option>\n";
+		$html .= "<option value=\"5XL\"";
+		if ($_POST["Size"] == "5XL")
+			$html .= " selected";
+		$html .= ">5XL</option>\n";
+		$html .= "<option value=\"S-G\"";
+		if ($_POST["Size"] == "S-G")
+			$html .= " selected";
+		$html .= ">S Girl</option>\n";
+		$html .= "<option value=\"M-G\"";
+		if ($_POST["Size"] == "M-G")
+			$html .= " selected";
+		$html .= ">M Girl</option>\n";
+		$html .= "<option value=\"L-G\"";
+		if ($_POST["Size"] == "L-G")
+			$html .= " selected";
+		$html .= ">L Girl</option>\n";
+		$html .= "<option value=\"XL-G\"";
+		if ($_POST["Size"] == "XL-G")
+			$html .= " selected";
+		$html .= ">XL Girl</option>\n";
+		$html .= "</select>\n";
+		$html .= "</td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Engelart") . "</td><td align=\"left\">\n";
+		$html .= "<select name=\"Art\">\n";
+
+		$engel_types = sql_select("SELECT * FROM `EngelType` ORDER BY `NAME`");
+		foreach ($engel_types as $engel_type) {
+			$Name = $engel_type['Name'] . Get_Text("inc_schicht_engel");
+			$html .= "<option value=\"" . $Name . "\"";
+
+			if ($_POST["Art"] == $Name)
+				$html .= " selected";
+
+			$html .= ">$Name</option>\n";
+		}
+
+		$html .= "</select>\n";
+		$html .= "</td>\n";
+		$html .= "</tr>\n";
+		$html .= "<tr>\n";
+		$html .= "<td>" . Get_Text("makeuser_text2") . "</td>\n";
+		$html .= "<td><textarea rows=\"5\" cols=\"40\" name=\"kommentar\">" . $_POST["kommentar"] . "</textarea></td>\n";
+		$html .= "</tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Hometown") . "</td><td><input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $_POST["Hometown"] . "\"></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Passwort") . "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort\"/></td></tr>\n";
+		$html .= "<tr><td>" . Get_Text("makeuser_Passwort2") . "*</td><td><input type=\"password\" size=\"40\" name=\"Passwort2\"/></td></tr>\n";
+		$html .= "<tr><td>&nbsp;</td><td><input type=\"submit\" name=\"send\" value=\"" . Get_Text("makeuser_Anmelden") . "\"/></td></tr>\n";
+		$html .= "</table>\n";
+		$html .= "</form>\n";
+		$html .= Get_Text("makeuser_text3");
+	}
+	return $html;
+}
+
+function guest_logout() {
+	unset ($_SESSION['uid']);
+	header("Location: " . page_link_to("start"));
+}
+
+function guest_login() {
+	global $user;
+	unset ($_SESSION['uid']);
+
+	$html = "";
+	if (isset ($_REQUEST['login_submit'])) {
+		$login_user = sql_select("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($_REQUEST["user"]) . "'");
+
+		if (count($login_user) == 1) { // Check, ob User angemeldet wird...
+			$login_user = $login_user[0];
+			if ($login_user["Passwort"] == PassCrypt($_REQUEST["password"])) { // Passwort ok...
+				$_SESSION['uid'] = $login_user['UID'];
+				$_SESSION['Sprache'] = $login_user['Sprache'];
+				header("Location: " . page_link_to("news"));
+			} else { // Passwort nicht ok...
+				$ErrorText = "pub_index_pass_no_ok";
+			} // Ende Passwort-Check
+		} else { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
+			if ($user_anz == 0)
+				$ErrorText = "pub_index_User_unset";
+			else
+				$ErrorText = "pub_index_User_more_as_one";
+		} // Ende Check, ob User angemeldet wurde}
+	}
+	if (isset ($ErrorText))
+		$html .= error(Get_Text($ErrorText));
+	$html .= guest_login_form();
+	return $html;
+}
+
+function guest_login_form() {
+	return template_render("../templates/guest_login_form.html", array (
+		'link' => page_link_to("login"),
+		'nick' => Get_Text("index_lang_nick"),
+		'pass' => Get_Text("index_lang_pass"),
+		'send' => Get_Text("index_lang_send")
+	));
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/guest_start.php b/includes/pages/guest_start.php
new file mode 100644
index 00000000..286511f2
--- /dev/null
+++ b/includes/pages/guest_start.php
@@ -0,0 +1,13 @@
+<?php
+function guest_start() {
+	require_once ('includes/pages/guest_login.php');
+	$html = "<p>" . Get_Text("index_text1") . "</p>\n";
+	$html .= "<p>" . Get_Text("index_text2") . "</p>\n";
+	$html .= "<p>" . Get_Text("index_text3") . "</p>\n";
+
+	$html .= guest_login_form();
+
+	$html .= "<h6>" . Get_Text("index_text4") . "</h6>";
+	return $html;
+}
+?>
\ No newline at end of file
diff --git a/includes/sys_auth.php b/includes/sys_auth.php
new file mode 100644
index 00000000..1c15122e
--- /dev/null
+++ b/includes/sys_auth.php
@@ -0,0 +1,47 @@
+<?php
+
+
+// Testet ob ein User eingeloggt ist und lädt die entsprechenden Privilegien
+function load_auth() {
+	global $user;
+
+	$user = null;
+	if (isset ($_SESSION['uid'])) {
+		$user = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_SESSION['uid']) . " LIMIT 1");
+		if (count($user) > 0) {
+			// User ist eingeloggt, Datensatz zur Verfügung stellen und Timestamp updaten
+			list ($user) = $user;
+			sql_query("UPDATE `User` SET " . "`lastLogIn` = '" . time() . "'" . " WHERE `UID` = '" . $_SESSION['uid'] . "' LIMIT 1;");
+		} else
+			unset ($_SESSION['uid']);
+	}
+
+	load_privileges();
+}
+
+function load_privileges() {
+	global $privileges, $user;
+
+	$privileges = array ();
+	if (isset ($user)) {
+		$user_privs = sql_select("SELECT `Privileges`.`name` FROM `User` JOIN `UserGroups` ON (`User`.`UID` = `UserGroups`.`uid`) JOIN `GroupPrivileges` ON (`UserGroups`.`group_id` = `GroupPrivileges`.`group_id`) JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `User`.`UID`=" . sql_escape($user['UID']) . ";");
+		foreach ($user_privs as $user_priv)
+			$privileges[] = $user_priv['name'];
+	} else {
+		$guest_privs = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=-1;");
+		foreach ($guest_privs as $guest_priv)
+			$privileges[] = $guest_priv['name'];
+	}
+}
+
+function PassCrypt($passwort) {
+	global $crypt_system;
+
+	switch ($crypt_system) {
+		case "crypt" :
+			return "{crypt}" . crypt($passwort, "77");
+		case "md5" :
+			return md5($passwort);
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/sys_lang.php b/includes/sys_lang.php
new file mode 100644
index 00000000..833d00b8
--- /dev/null
+++ b/includes/sys_lang.php
@@ -0,0 +1,26 @@
+<?php
+function Get_Text($TextID, $NoError = false) {
+	global $con, $error_messages, $debug;
+
+	if (!isset ($_SESSION['Sprache']))
+		$_SESSION['Sprache'] = "EN";
+	if ($_SESSION['Sprache'] == "")
+		$_SESSION['Sprache'] = "EN";
+	if (isset ($_GET["SetLanguage"]))
+		$_SESSION['Sprache'] = $_GET["SetLanguage"];
+
+	$SQL = "SELECT * FROM `Sprache` WHERE TextID=\"$TextID\" AND Sprache ='" . $_SESSION['Sprache'] . "'";
+	@ $Erg = mysql_query($SQL, $con);
+
+	if (mysql_num_rows($Erg) == 1)
+		return (@ mysql_result($Erg, 0, "Text"));
+	elseif ($NoError && !$debug) return "";
+	else {
+		return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x";
+	}
+}
+
+function Print_Text($TextID, $NoError = false) {
+	echo Get_Text($TextID, $NoError);
+}
+?>
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
new file mode 100644
index 00000000..8c993d1b
--- /dev/null
+++ b/includes/sys_menu.php
@@ -0,0 +1,72 @@
+<?php
+function page_link_to($page) {
+	return '?p=' . $page;
+}
+
+function make_navigation() {
+	global $p;
+	global $privileges;
+	$menu_items = $privileges;
+	$menu_items[] = "faq";
+
+	$menu = '<nav class="container"><h4>' . Get_Text('/') . '</h4><ul class="content">';
+	foreach ($menu_items as $item)
+		$menu .= '<li' . ($item == $p ? ' class="selected"' : '') . '><a href="' . page_link_to($item) . '">' . Get_Text($item) . '</a></li>';
+	$menu .= '</ul></nav>';
+	return $menu;
+}
+
+function make_menu() {
+	return make_navigation() . make_onlineusers() . make_langselect();
+}
+
+function make_onlineusers() {
+	global $privileges, $user;
+	$html = '<nav class="container"><h4>Engel online</h4>';
+
+	$query = "SELECT UID, Nick, lastLogIn " . "FROM User " . "WHERE (`lastLogIn` > '" . (time() - 60 * 60) . "') " . "ORDER BY lastLogIn DESC";
+	$users = sql_select($query);
+
+	if (count($users) > 0) {
+		$html .= "<ul class=\"content\">";
+
+		foreach ($users as $online_user) {
+			if (isset ($user) && $online_user['UID'] == $user['UID'])
+				continue;
+
+			$html .= "<li>";
+
+			if (isset ($user))
+				$html .= DisplayAvatar($online_user['UID']);
+
+			// Show Admin Page
+			if (in_array("admin_user_edit", $privileges)) {
+				$html .= '<a href="admin/userChangeNormal.php?enterUID=' . $online_user['UID'] . '&Type=Normal">' . $online_user['Nick'] . '</a>';
+			} else {
+				$html .= $online_user['Nick'];
+			}
+			$last_action = time() - $online_user['lastLogIn'];
+
+			$html .= " " . date("i:s", $last_action);
+			$html .= "</li>\n";
+		}
+
+		$html .= "</ul>";
+	} else {
+		$html .= '<p class="content">Nobody...</p>';
+	}
+	$html .= '</nav>';
+	return $html;
+}
+
+function make_langselect() {
+	if (strpos($_SERVER["REQUEST_URI"], "?") > 0)
+		$URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
+	else
+		$URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
+
+	$html = '<p class="content"><a class="sprache" href="' . $URL . 'DE"><img src="pic/flag/de.png" alt="DE" title="Deutsch"></a>';
+	$html .= '<a class="sprache" href="' . $URL . 'EN"><img src="pic/flag/en.png" alt="EN" title="English"></a></p>';
+	return '<nav class="container"><h4>' . Get_Text("Sprache") . '</h4>' . $html . '</nav>';
+}
+?>
\ No newline at end of file
diff --git a/includes/sys_mysql.php b/includes/sys_mysql.php
new file mode 100644
index 00000000..c076be7c
--- /dev/null
+++ b/includes/sys_mysql.php
@@ -0,0 +1,61 @@
+<?php
+function sql_connect($host, $user, $pw, $db) {
+	global $con;
+	global $host;
+
+	@ $con = mysql_connect($host, $user, $pw);
+
+	if ($con == null)
+		die("no mysql-connection");
+
+	if (!mysql_select_db($db, $con))
+		die("mysql db-selection failed");
+
+	mysql_query("SET CHARACTER SET utf8;", $con);
+	mysql_query("SET NAMES 'utf8'", $con);
+}
+
+// Do select query
+function sql_select($query) {
+	global $con;
+	$start = microtime(true);
+	if ($result = mysql_query($query, $con)) {
+		$data = array ();
+		while ($line = mysql_fetch_assoc($result)) {
+			array_push($data, $line);
+		}
+		return $data;
+	} else {
+		die('MySQL-query error: ' . $query . ", " . mysql_error($con));
+	}
+}
+
+// Execute a query
+function sql_query($query) {
+	global $con;
+	$start = microtime(true);
+	if ($result = mysql_query($query, $con)) {
+		return $result;
+	} else {
+		die('MySQL-query error: ' . $query . ", " . mysql_error($con));
+	}
+}
+
+function sql_id() {
+	global $con;
+	return mysql_insert_id($con);
+}
+
+function sql_escape($query) {
+	return mysql_real_escape_string($query);
+}
+
+function sql_num_query($query) {
+	return mysql_num_rows(sql_query($query));
+}
+
+function sql_error() {
+	global $con;
+	return mysql_error($con);
+}
+?>
diff --git a/includes/sys_page.php b/includes/sys_page.php
new file mode 100644
index 00000000..ab8b05e2
--- /dev/null
+++ b/includes/sys_page.php
@@ -0,0 +1,9 @@
+<?php
+function error($msg) {
+	return '<p class="error">' . $msg . '</p>';
+}
+
+function success($msg) {
+	return '<p class="success">' . $msg . '</p>';
+}
+?>
\ No newline at end of file
diff --git a/includes/sys_template.php b/includes/sys_template.php
new file mode 100644
index 00000000..ab613c07
--- /dev/null
+++ b/includes/sys_template.php
@@ -0,0 +1,17 @@
+<?php
+
+
+// Load and render template
+function template_render($file, $data) {
+	if (file_exists($file)) {
+		$template = file_get_contents($file);
+		if (is_array($data))
+			foreach ($data as $name => $content) {
+				$template = str_replace("%" . $name . "%", $content, $template);
+			}
+		return $template;
+	} else {
+		die('Cannot find template file &laquo;' . $file . '&raquo;.');
+	}
+}
+?>
\ No newline at end of file
diff --git a/templates/guest_credits.html b/templates/guest_credits.html
new file mode 100644
index 00000000..a248d431
--- /dev/null
+++ b/templates/guest_credits.html
@@ -0,0 +1,12 @@
+<h2>The angelsystem has been (re)done by:</h2>
+<ul>
+    <li>
+        ?
+    </li>
+    <li>
+        helios
+    </li>
+    <li>
+        msquare
+    </li>
+</ul>
diff --git a/templates/guest_login_form.html b/templates/guest_login_form.html
new file mode 100644
index 00000000..c0cef263
--- /dev/null
+++ b/templates/guest_login_form.html
@@ -0,0 +1,22 @@
+<form action="%link%" method="post">
+    <table>
+        <tr>
+            <td align="right">
+                %nick%
+            </td>
+            <td>
+                <input type="text" name="user" size="23" />
+            </td>
+        </tr>
+        <tr>
+            <td align="right">
+                %pass%
+            </td>
+            <td>
+                <input type="password" name="password" size="23">
+            </td>
+        </tr>
+    </table>
+    <br/>
+    <input type="submit" name="login_submit" value="%send%">
+</form>
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
new file mode 100644
index 00000000..0eb67e5b
--- /dev/null
+++ b/templates/layout.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>%title% - Engelsystem</title>
+        <meta charset="UTF-8" />
+        <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+        <meta name="content-style-type" content="text/css" />
+        <meta name="keywords" content="Engel, Himmelsverwaltung" />
+        <meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="expires" content="0" />
+        <meta name="robots" content="index" />
+        <meta name="revisit-after" content="1 days" />
+        <script type="text/javascript" src="css/grossbild.js">
+        </script>
+        <link rel="stylesheet" type="text/css" href="css/base.css" />
+        <link rel="stylesheet" type="text/css" href="css/style%theme%.css" />
+    </head>
+    <body class="background">
+        <header>
+            <a href="?" id="logo"></a>
+        </header>
+        <div id="body">
+            <div id="menu">
+                %menu%
+            </div>
+            <div id="content" class="container">
+                <h1>%title%</h1>
+                <article class="content">
+                    %content%
+                </article>
+            </div>
+        </div>
+        <footer>
+            <p>
+                &copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Contact</a>
+                | <a href="?p=credits">Credits</a>
+                <br/>
+                This is hell. Temporarily.
+            </p>
+        </footer>
+    </body>
+</html>
diff --git a/www-ssl/credits.php b/www-ssl/credits.php
deleted file mode 100644
index bbfa747d..00000000
--- a/www-ssl/credits.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-require_once ('bootstrap.php');
-
-$title = "Credits";
-$header = "Credits";
-include "includes/header.php";
-?>
-<h1>The angelsystem has been (re)done by:</h1>
-<ul>
-	<li>?</li>
-	<li>helios</li>
-	<li>msquare</li>
-</ul>
-<?php
-
-
-include "includes/footer.php";
-?>
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 6c0bc298..808fb512 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -81,8 +81,16 @@ nav {
     padding: 10px;
 }
 
+p {
+    padding: 0 0 10px 0;
+}
+
+#menu p {
+    padding: 4px;
+}
+
 a.sprache img {
-    margin: 5px;
+    margin-right: 5px;
 }
 
 .background {
@@ -96,3 +104,11 @@ a.sprache img {
 .content {
     background: #fff;
 }
+
+.error {
+	color: #f00;
+}
+
+.success {
+	color: #090;
+}
diff --git a/www-ssl/index.php b/www-ssl/index.php
index cdec1559..5126981c 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,17 +1,73 @@
 <?php
 require_once ('bootstrap.php');
+require_once ('includes/sys_auth.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_template.php');
 
-$title = "Start";
-$header = "Start";
-include "includes/header.php";
+require_once ('config/config.php');
+require_once ('config/config_db.php');
 
-echo "<p>" . Get_Text("index_text1") . "</p>\n";
-echo "<p>" . Get_Text("index_text2") . "</p>\n";
-echo "<p>" . Get_Text("index_text3") . "</p>\n";
+session_start();
 
-include "includes/login_eingabefeld.php";
+sql_connect($config['host'], $config['user'], $config['pw'], $config['db']);
 
-echo "<h6>" . Get_Text("index_text4") . "</h6>";
+load_auth();
 
-include "includes/footer.php";
+// Gewünschte Seite/Funktion
+$p = "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 = "news";
+	}
+	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();
+	} 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"));
+	}
+}
+
+echo template_render('../templates/layout.html', array (
+	'theme' => isset ($user) ? $user['color'] : $default_theme,
+	'title' => $title,
+	'menu' => make_menu(),
+	'content' => $content
+));
 ?>
-- 
cgit v1.2.3-54-g00ecf


From 0d351f47915679f98cbd93cd5d8f4d32d91a834a Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Thu, 2 Jun 2011 16:56:45 +0200
Subject: admin rooms

---
 includes/funktion_schichtplan.php      | 389 -----------------------------
 includes/funktion_schichtplan_Tage.php | 101 --------
 includes/funktion_schichtplan_aray.php |  38 ---
 includes/pages/admin_rooms.php         | 148 +++++++++++
 includes/pages/user_news.php           |  54 ++--
 includes/sys_shift.php                 | 442 +++++++++++++++++++++++++++++++++
 includes/sys_template.php              |   8 +
 templates/admin_rooms_edit_form.html   |  59 +++++
 templates/admin_rooms_new_form.html    |  46 ++++
 www-ssl/css/base.css                   |  16 ++
 www-ssl/index.php                      |   5 +
 11 files changed, 751 insertions(+), 555 deletions(-)
 delete mode 100644 includes/funktion_schichtplan.php
 delete mode 100644 includes/funktion_schichtplan_Tage.php
 delete mode 100644 includes/funktion_schichtplan_aray.php
 create mode 100644 includes/pages/admin_rooms.php
 create mode 100644 includes/sys_shift.php
 create mode 100644 templates/admin_rooms_edit_form.html
 create mode 100644 templates/admin_rooms_new_form.html

(limited to 'www-ssl/css/base.css')

diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php
deleted file mode 100644
index 6d6c3553..00000000
--- a/includes/funktion_schichtplan.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-
-/*#######################################################
-#  gibt die engelschischten aus      #
-#######################################################*/
-function ausgabe_Feld_Inhalt( $SID, $Man ) 
-{
-// gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung,
-// die eingetragenden und und offenden Schichteintäge zurück
-  global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset;
-
-  $Spalten = "";
-
-  if( !isset($_GET["Icon"]))
-    $_GET["Icon"]=1;
-
-  ///////////////////////////////////////////////////////////////////
-  // Schow Admin Page
-  ///////////////////////////////////////////////////////////////////
-  $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( 
-    "admin/schichtplan.php?action=change&SID=$SID",
-    "edit<br />\n");
-
-  ///////////////////////////////////////////////////////////////////
-    // Ausgabe des Schischtnamens
-  ///////////////////////////////////////////////////////////////////
-  $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
-  $Erg = mysql_query($SQL, $con);
-  if( mysql_result($Erg, 0, 0) != "")
-    $Spalten.="<a href=\"". mysql_result($Erg, 0, 0). "\" target=\"_black\"><u>$Man:</u></a><br />";
-  else
-      $Spalten.="<u>".$Man.":</u><br />";
-
-
-  ///////////////////////////////////////////////////////////////////
-  // SQL abfrage für die benötigten schichten
-  ///////////////////////////////////////////////////////////////////
-  $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
-  $Erg = mysql_query($SQL, $con);
-  
-  $Anzahl = mysql_num_rows($Erg);
-  $Feld=0;
-  $Temp_TID_old=-1;
-  for( $i = 0; $i < $Anzahl; $i++ )
-  {
-    if( isset($Temp[$Feld]["TID"]))
-      $Temp_TID_old = $Temp[$Feld]["TID"];
-    if( isset($Temp[$Feld]["UID"]))
-      $Temp_UID_old = $Temp[$Feld]["UID"];
-    
-    $Temp_TID = mysql_result($Erg, $i, "TID");
-    
-    // wenn sich der Type ändert wird zumnästen feld geweckselt
-    if( $Temp_TID_old != $Temp_TID )
-      $Feld++;
-      
-    $Temp[$Feld]["TID"] = $Temp_TID;
-    $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
-    
-    // sonderfall ersten durchlauf
-    if( $i == 0 )
-    {
-      $Temp_TID_old = $Temp[$Feld]["TID"];
-      $Temp_UID_old = $Temp[$Feld]["UID"];
-    }
-    
-    // ist es eine zu vergeben schicht?
-    if( $Temp[$Feld]["UID"] == 0 )
-    {
-      if( isset($Temp[$Feld]["free"]))
-        $Temp[$Feld]["free"]++;
-      else
-        $Temp[$Feld]["free"]=1;
-    }
-    else
-      $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
-  } // FOR
-  
-
-  ///////////////////////////////////////////////////////////////////
-  // Aus gabe der Schicht
-  ///////////////////////////////////////////////////////////////////
-  if( isset($Temp))
-    if( count($Temp) )
-      foreach( $Temp as $TempEntry => $TempValue )
-      {
-    if( !isset($TempValue["free"]))
-      $TempValue["free"] = 0;
-    
-    // ausgabe EngelType
-    $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " ";
-    
-    // ausgabe Eingetragener Engel
-    if( isset($TempValue["Engel"]))
-      if( count($TempValue["Engel"]) > 0  )
-      {
-      if( count($TempValue["Engel"]) == 1  )
-        $Spalten.= Get_Text("inc_schicht_ist"). ":<br />\n";
-      else 
-        $Spalten.= Get_Text("inc_schicht_sind"). ":<br />\n";
-      
-      foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID )
-      {
-        if( funktion_isLinkAllowed( "admin/user.php") === TRUE)
-        {
-          // add color, wenn Engel "Gekommen"
-                $TempText= 
-            ((UIDgekommen( $TempEngelID ) == "1")
-              ? "<span style=\"color: blue;\">"
-              : "<span style=\"color: red;\">").
-            UID2Nick( $TempEngelID). "</span>";
-        }
-        else
-        {
-          $TempText = UID2Nick( $TempEngelID );
-        }
-        
-        // add link to user
-        $TempText= funktion_isLinkAllowed_addLink_OrLinkText(
-          "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal",
-          $TempText);
-        
-        $Spalten.= "&nbsp;&nbsp;". $TempText.
-            ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): "").
-            "<br />\n";
-
-
-      }
-      $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 );
-      }
-    
-    // ausgabe benötigter Engel
-    ////////////////////////////
-    //in vergangenheit
-    $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". 
-      gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')";
-    $Ergtime = mysql_query($SQLtime, $con);
-    if( mysql_num_rows( $Ergtime) > 0)
-    {
-      //wenn keien rechte definiert sind 
-         if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ]))
-            $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y";
-
-      if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y")
-        if( $TempValue["free"] > 0 )
-        {
-          $Spalten.= "<br />\n&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=".
-               $TempValue["TID"]."\">";
-          $Spalten.= $TempValue["free"];
-          if( $TempValue["free"] != 1 )
-            $Spalten.= Get_Text("inc_schicht_weitere").
-                  " ".Get_Text("inc_schicht_Engel").
-                  Get_Text("inc_schicht_wird");
-          else
-            $Spalten.= Get_Text("inc_schicht_weiterer").
-                     " ".Get_Text("inc_schicht_Engel").
-                 Get_Text("inc_schicht_werden");
-          $Spalten.= Get_Text("inc_schicht_noch_gesucht");
-          $Spalten.= "</a>";
-           }   
-    }
-    else
-    {
-      if( isset($TempValue["free"]))
-        if( $TempValue["free"] > 0 )
-          $Spalten.= "<br />\n&nbsp;&nbsp;<h3><a>Fehlen noch: ". 
-              $TempValue["free"]. "</a></h3>";
-    }
-    $Spalten.= "<br />\n";
-  
-  } // FOREACH
-  return $Spalten;
-} // function Ausgabe_Feld_Inhalt
-
-
-
-/*#######################################################
-#  gibt die engelschischten Druckergerecht aus  #
-#######################################################*/
-function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) 
-{
-// gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung,
-// die eingetragenden und und offenden Schichteintäge zurück
-
-
-} // function Ausgabe_Feld_Inhalt
-
-
-
-
-/*#######################################################
-#  Ausgabe der Raum Spalten      #
-#######################################################*/
-function CreateRoomShifts( $raum )
-{
-  global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages;
-  
-  /////////////////////////////////////////////////////////////
-  // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus
-  /////////////////////////////////////////////////////////////
-  $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
-         "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ".
-           "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
-  $ErgSonder = mysql_query($SQLSonder, $con);
-  if( (mysql_num_rows( $ErgSonder) > 1) )
-  {
-    if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
-    {
-      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-      for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
-      {
-        echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-          mysql_result($ErgSonder, $i, "SID"). "\">".
-          mysql_result($ErgSonder, $i, "DateS"). 
-          " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)".
-          "</a><br />\n";
-      }
-    }
-  }
-  elseif( (mysql_num_rows( $ErgSonder) == 1) )
-  {
-    $Spalten[0].=  "<td valign=\"top\" rowspan=\"". (24 * $GlobalZeileProStunde). "\">\n".
-        "<h3>&uarr;&uarr;&uarr;</h3>".
-              Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
-                 mysql_result($ErgSonder, 0, "Man") ).
-        "<h3>&darr;&darr;&darr;</h3>".
-               "\n</td>\n";
-    return;
-  }
-  
-  $ZeitZeiger = 0;
-
-  /////////////////////////////////////////////////////////////
-  // beginnt die erste schicht vor dem heutigen tag?
-  /////////////////////////////////////////////////////////////
-  $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ".
-         "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ".
-           "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
-  $ErgSonder = mysql_query($SQLSonder, $con);
-  if( (mysql_num_rows( $ErgSonder) > 1) )
-  {
-    if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE )
-    {
-      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-      for( $i=0; $i<mysql_num_rows( $ErgSonder); $i++)
-      {
-        echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-          mysql_result($ErgSonder, $i, "SID"). "\">".
-          mysql_result($ErgSonder, $i, "DateS"). 
-          " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)".
-          "</a><br />\n";
-      }
-    }
-  }
-  elseif( (mysql_num_rows( $ErgSonder) == 1) )
-  {
-    $ZeitZeiger =  substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+
-        (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60);
-    $Spalten[0].=  "<td valign=\"top\" rowspan=\"". ($ZeitZeiger * $GlobalZeileProStunde). "\">\n".
-        "<h3>&uarr;&uarr;&uarr;</h3>".
-              Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), 
-                 mysql_result($ErgSonder, 0, "Man") ).
-               "\n</td>\n";
-  }
-         
-  /////////////////////////////////////////////////////////////
-  // gibt die schichten für den tag aus
-  /////////////////////////////////////////////////////////////
-  $SQL =  "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
-    "WHERE ((`RID` = '$raum') and ".
-    "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ".
-    "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;";
-        $Erg = mysql_query($SQL, $con);
-  for( $i = 0; $i < mysql_num_rows($Erg); ++$i )
-  {  
-    $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+
-        (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60);
-    $len = mysql_result($Erg, $i, "Len");
-
-    if( $len <= 0)
-      array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len");
-    
-    if( $ZeitZeiger < $ZeitPos  )
-    {
-             $Spalten[$ZeitZeiger * $GlobalZeileProStunde].=  
-        "<td valign=\"top\" rowspan=\"". ( ($ZeitPos - $ZeitZeiger ) * $GlobalZeileProStunde ). "\">&nbsp;</td>\n";
-
-      $ZeitZeiger += $ZeitPos - $ZeitZeiger;
-    }
-    if($ZeitZeiger == $ZeitPos )
-    {
-      //sonderfall wenn die schicht über dei 24 stunden hinaus geht
-      // (eintrag abkürzen, pfeiel ausgeben)
-             $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= 
-          "<td valign=\"top\" rowspan=\"". 
-          ( ( ($len+$ZeitZeiger)? $len : 24-$len+$ZeitZeiger) * $GlobalZeileProStunde). 
-          "\">\n".
-          "".
-                Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), 
-                   mysql_result($Erg, $i, "Man") ).
-          (( ($ZeitZeiger+$len) > 24)? "<h3>&darr;&darr;&darr;</h3>" : "").
-                 "\n</td>\n";
-      $ZeitZeiger += $len;
-    }
-    else
-    {
-      echo "<h1>". Get_Text("pub_schichtplan_colision"). "</h1> ";
-      echo "<a href=\"./../admin/schichtplan.php?action=change&SID=". 
-        mysql_result($Erg, $i, "SID"). "\">".
-        mysql_result($Erg, $i, "DateS"). 
-        " '". mysql_result($Erg, $i, "Man"). "' ".
-        " (".  mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)</a><br /><br />";
-    }
-  }
-  if( $ZeitZeiger < 24 )
-           $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].=  
-          "<td valign=\"top\" rowspan=\"". 
-          ((24 - $ZeitZeiger) * $GlobalZeileProStunde ). 
-          "\">&nbsp;</td>\n";
-} // function CreateRoomShifts
-
-
-/*#######################################################
-#  Ausgabe der freien schichten      #
-#######################################################*/
-function showEmptyShifts( )
-{
-  global $con, $debug, $RoomID, $gmdateOffset;
-
-  echo "<table border=\"1\">\n";
-  echo "<tr>\n";
-  echo "<th>". Get_Text("inc_schicht_date"). "</th>\n";
-  echo "<th>". Get_Text("inc_schicht_time"). "</th>\n";
-  echo "<th>". Get_Text("inc_schicht_room"). "</th>\n";
-  echo "<th>". Get_Text("inc_schicht_commend"). "</th>\n";
-  echo "</tr>\n";
-  
-  $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ".
-    "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ".
-    "ORDER BY `DateS`, `RID`;";
-  $Erg = mysql_query($sql, $con);
-
-  $angezeigt = 0;
-  for ($i=0; ($i<mysql_num_rows($Erg)) && ($angezeigt< 15); $i++)
-    if( isset($RoomID[mysql_result( $Erg, $i, "RID")]))
-     if( $RoomID[mysql_result( $Erg, $i, "RID")]!="" )
-     {
-     $Sql2 = "SELECT `UID` FROM `ShiftEntry` ".
-      "WHERE `SID`=". mysql_result( $Erg, $i, "SID"). " AND ".
-        "`UID`='0';";
-    $Erg2 = mysql_query($Sql2, $con);
-    
-    if( mysql_num_rows($Erg2)>0)
-    {
-      $angezeigt++;
-      echo "<tr>\n";
-      echo "<td>". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "</td>\n";
-      echo "<td>". substr(mysql_result( $Erg, $i, "DateS"), 11). "</td>\n";
-      echo "<td>". $RoomID[mysql_result( $Erg, $i, "RID")]. "</td>\n";
-      echo "<td>". 
-        ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")).
-        "</td>\n";
-      echo "</tr>\n";
-    }
-     }
-  
-  echo "</table>\n";
-  
-} //function showEmptyShifts
-
-  
-/*#######################################################
-#  Gibt die anzahl der Schichten im Raum zurück  #
-#######################################################*/
-function SummRoomShifts( $raum )
-{
-  global $ausdatum, $con, $debug, $GlobalZeileProStunde;
-  
-  $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ".
-         "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ".
-           "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;";
-
-        $ErgSonder = mysql_query($SQLSonder, $con);
-  
-  return mysql_num_rows($ErgSonder);
-}
-
-?>
diff --git a/includes/funktion_schichtplan_Tage.php b/includes/funktion_schichtplan_Tage.php
deleted file mode 100644
index 2c21a992..00000000
--- a/includes/funktion_schichtplan_Tage.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-  if(!function_exists("DatumUm1TagErhoehen")) {
-    function DatumUm1TagErhoehen( $Datum) {
-      $Jahr = substr($Datum, 0, 4);
-      $Monat = substr($Datum, 5, 2);
-      $Tag = substr($Datum, 8, 2);
-
-      $Tag++;
-
-      switch( $Monat) {
-        case 1:
-          $Mmax = 31;
-          break;
-        case 2:
-          $Mmax = 28;
-          break;
-        case 3:
-          $Mmax = 31;
-          break;
-        case 4:
-          $Mmax = 30;
-          break;
-        case 5:
-          $Mmax = 31;
-          break;
-        case 6:
-          $Mmax = 30;
-          break;
-        case 7:
-          $Mmax = 31;
-          break;
-        case 8:
-          $Mmax = 31;
-          break;
-        case 9:
-          $Mmax = 30;
-          break;
-        case 10:
-          $Mmax = 31;
-          break;
-        case 11:
-          $Mmax = 30;
-          break;
-        case 12:
-          $Mmax = 31;
-          break;
-      }
-
-      if($Tag > $Mmax) {
-        $Tag = 1;
-        $Monat++;
-      }
-
-      if($Monat > 12) {
-        $Monat = 1;
-        $Jahr++;
-      }
-
-      $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag;
-      $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat;
-
-      return ("$Jahr-$Monat-$Tag");
-    }
-  }
-
-  // suchen den ersten eintrags
-  $SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1";
-  $Erg = mysql_query($SQL, $con);
-
-  $Pos = 0;
-
-  if(mysql_num_rows($Erg) > 0) {
-    do {
-      // Startdatum einlesen und link ausgeben
-      $DateS = substr(mysql_result($Erg, 0 , 0), 0,10);
-      $VeranstaltungsTage[$Pos++] = $DateS;
-  
-      // auslesen den endes und eventuelle weitere tage ausgeben
-      $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))";
-      $Erg2 = mysql_query($SQL2, $con);
-      $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10);
-
-      if(strlen($DateE) == 0)
-        $DateE = $DateS;
-      else
-        while( $DateS != $DateE) {
-          $DateS = DatumUm1TagErhoehen( $DateS);
-          $VeranstaltungsTage[$Pos++] = $DateS;
-        }
-
-        // suchen den naesten eintrag
-        $SQL = "SELECT `DateS` FROM `Shifts` ".
-               "WHERE (`DateS` > '$DateE 23:59:59' ) ".
-               "ORDER BY `DateS` ".
-               "LIMIT 1";
-        $Erg = mysql_query($SQL, $con);
-    } while( mysql_fetch_row($Erg) > 0);
-  }
-
-  $VeranstaltungsTageMax = $Pos - 1;
-?>
diff --git a/includes/funktion_schichtplan_aray.php b/includes/funktion_schichtplan_aray.php
deleted file mode 100644
index f9b04bd6..00000000
--- a/includes/funktion_schichtplan_aray.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*#######################################################
-#       Aufbau von Standart Feldern                     #
-#######################################################*/
-
-// erstellt ein Array der Reume
-  $sql = "SELECT `RID`, `Name` FROM `Room` ".
-    "WHERE `Show`='Y'". 
-    "ORDER BY `Number`, `Name`;";
-  
-  $Erg = mysql_query($sql, $con);
-  $rowcount = mysql_num_rows($Erg);
-
-  for ($i=0; $i<$rowcount; $i++)
-  {
-    $Room[$i]["RID"]  = mysql_result($Erg, $i, "RID");
-    $Room[$i]["Name"] = mysql_result($Erg, $i, "Name");
-  
-    $RoomID[ mysql_result($Erg, $i, "RID") ] =  mysql_result($Erg, $i, "Name");
-  }
-
-// erstellt ein Aray der Engeltypen
-  $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`";
-  $Erg = mysql_query($sql, $con);
-  $rowcount = mysql_num_rows($Erg);
-  for ($i=0; $i<$rowcount; $i++)
-  {
-    $EngelType[$i]["TID"]  = mysql_result($Erg, $i, "TID");
-    $EngelType[$i]["Name"]  = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-
-    $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = 
-      mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel");
-    $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name");
-  }                        
-
-include ("funktion_schichtplan_Tage.php");
-?>
diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php
new file mode 100644
index 00000000..6695d6a9
--- /dev/null
+++ b/includes/pages/admin_rooms.php
@@ -0,0 +1,148 @@
+<?php
+function admin_rooms() {
+	global $user;
+
+	$html = "";
+	$rooms = sql_select("SELECT * FROM `Room` ORDER BY `Number`, `Name`");
+	if (!isset ($_REQUEST["action"])) {
+		$html .= "Hallo " . $user['Nick'] .
+		",<br />\nhier hast du die M&ouml;glichkeit, neue R&auml;ume f&uuml;r die Schichtpl&auml;ne einzutragen " .
+		"oder vorhandene abzu&auml;ndern:<br /><br />\n";
+
+		$html .= "<a href=\"" . page_link_to("admin_rooms") . "&action=new\">Neuen Raum/Ort eintragen</a><br />\n";
+
+		// Räume auflisten
+		if (count($rooms) > 0) {
+			$html .= '<table><thead><tr>';
+
+			$html .= "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+			$html .= "<tr class=\"contenttopic\">\n";
+
+			// Tabellenüberschriften generieren
+			foreach ($rooms[0] as $attr => $tmp)
+				if ($attr == 'RID')
+					$html .= '<th>Anzahl: ' . count($rooms) . '</th>';
+				else
+					$html .= '<th>' . $attr . '</th>';
+			$html .= '<th>&nbsp;</th>';
+			$html .= '</tr></thead><tbody>';
+
+			foreach ($rooms as $i => $room) {
+				$html .= '<tr>';
+				foreach ($room as $attr => $value)
+					if ($attr == 'RID')
+						$html .= '<td>' . ($i +1) . '</td>';
+					else
+						$html .= '<td>' . $value . '</td>';
+				$html .= '<td><a href="' . page_link_to("admin_rooms") . '&action=change&RID=' . $room['RID'] . '">Edit</a></td>';
+				$html .= '</tr>';
+			}
+
+			$html .= '</tbody></table>';
+		}
+	} else {
+		switch ($_REQUEST["action"]) {
+
+			case 'new' :
+				$html .= template_render('../templates/admin_rooms_new_form.html', array (
+					'link' => page_link_to("admin_rooms")
+				));
+				break;
+
+			case 'newsave' :
+				$name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Name']));
+				$man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Man']));
+				$from_pentabarf = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['FromPentabarf']));
+				$show = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['Show']));
+				$number = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['Number']));
+				sql_query("INSERT INTO `Room` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($show) . "', `Number`='" . sql_escape($number) . "'");
+				header("Location: " . page_link_to("admin_rooms"));
+				break;
+
+			case 'change' :
+				if (isset ($_REQUEST['RID']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['RID']))
+					$rid = $_REQUEST['RID'];
+				else
+					return error("Incomplete call, missing Room ID.");
+
+				$room = sql_select("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1");
+				if (count($room) > 0) {
+					list ($room) = $room;
+					$room_angel_types = sql_select("SELECT * FROM `AngelTypes` LEFT OUTER JOIN `RoomAngelTypes` ON (`AngelTypes`.`TID` = `RoomAngelTypes`.`angel_type_id` AND `RoomAngelTypes`.`room_id`=" . sql_escape($rid) . ") ORDER BY `AngelTypes`.`Name`");
+
+					$angel_types = "";
+					foreach ($room_angel_types as $room_angel_type) {
+						if ($room_angel_type['count'] == "")
+							$room_angel_type['count'] = "0";
+						$angel_types .= '<tr><td>' . $room_angel_type['Name'] . '</td><td><input type="text" name="angel_type_' . $room_angel_type['TID'] . '" value="' . $room_angel_type['count'] . '" /></td></tr>';
+					}
+
+					$html .= template_render('../templates/admin_rooms_edit_form.html', array (
+						'link' => page_link_to("admin_rooms"),
+						'room_id' => $rid,
+						'name' => $room['Name'],
+						'man' => $room['Man'],
+						'number' => $room['Number'],
+						'from_pentabarf_options' => html_options('FromPentabarf', array (
+							'Y' => 'Yes',
+							'N' => 'No'
+						), $room['FromPentabarf']),
+						'show_options' => html_options('Show', array (
+							'Y' => 'Yes',
+							'N' => 'No'
+						), $room['show']),
+						'angel_types' => $angel_types
+					));
+				} else
+					return error("No Room found.");
+				break;
+
+			case 'changesave' :
+				if (isset ($_REQUEST['RID']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['RID']))
+					$rid = $_REQUEST['RID'];
+				else
+					return error("Incomplete call, missing Room ID.");
+
+				$room = sql_select("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1");
+				if (count($room) > 0) {
+					list ($room) = $room;
+					$room_angel_types = sql_select("SELECT * FROM `AngelTypes` LEFT OUTER JOIN `RoomAngelTypes` ON (`AngelTypes`.`TID` = `RoomAngelTypes`.`angel_type_id` AND `RoomAngelTypes`.`room_id`=" . sql_escape($rid) . ") ORDER BY `AngelTypes`.`Name`");
+
+					$name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Name']));
+					$man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Man']));
+					$from_pentabarf = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['FromPentabarf']));
+					$show = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['Show']));
+					$number = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['Number']));
+					sql_query("UPDATE `Room` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($show) . "', `Number`='" . sql_escape($number) . "' WHERE `RID`=" . sql_escape($rid) . " LIMIT 1");
+					sql_query("DELETE FROM `RoomAngelTypes` WHERE `room_id`=" . sql_escape($rid));
+					foreach ($room_angel_types as $room_angel_type) {
+						if (isset ($_REQUEST['angel_type_' . $room_angel_type['TID']]) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['angel_type_' . $room_angel_type['TID']]))
+							$count = $_REQUEST['angel_type_' . $room_angel_type['TID']];
+						else
+							$count = "0";
+						sql_query("INSERT INTO `RoomAngelTypes` SET `room_id`=" . sql_escape($rid) . ", `angel_type_id`=" . sql_escape($room_angel_type['TID']) . ", `count`=" . sql_escape($count));
+					}
+					header("Location: " . page_link_to("admin_rooms"));
+				} else
+					return error("No Room found.");
+				break;
+
+			case 'delete' :
+				if (isset ($_REQUEST['RID']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['RID']))
+					$rid = $_REQUEST['RID'];
+				else
+					return error("Incomplete call, missing Room ID.");
+
+				if (sql_num_query("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1") > 0) {
+					sql_query("DELETE FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1");
+					sql_query("DELETE FROM `RoomAngelTypes` WHERE `room_id`=" . sql_escape($rid) . " LIMIT 1");
+					header("Location: " . page_link_to("admin_rooms"));
+				} else
+					return error("No Room found.");
+				break;
+
+		}
+	}
+	return $html;
+}
+?>
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index 7012bb99..4295edb8 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -64,43 +64,43 @@ function user_news_output() {
 
 	for ($i = 1; $i <= $dis_rows; $i++) {
 		if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) {
-			$html .= "<a href=\"./news.php?news_begin=" . (($i * $DISPLAY_NEWS) - $DISPLAY_NEWS -1) . "\">$i</a>&nbsp; ";
+			$html .= '<a href="' . page_link_to("news") . '&news_begin=' . (($i * $DISPLAY_NEWS) - $DISPLAY_NEWS -1) . '">' . $i . '</a>&nbsp; ';
 		} else {
 			$html .= "$i&nbsp; ";
 		}
 	}
 	$html .= '</div>
-			<br /><hr />
-			<h2>' . Get_Text(6) . '</h2>
-			<a name="Neu">&nbsp;</a>
-			
-			<form action="" method="post">
-			<?PHP
-			
-				// Datum mit uebergeben, um doppelte Eintraege zu verhindern 
-				// (Reload nach dem Eintragen!)
-			?>
-			<input type="hidden" name="date" value="' . date("Y-m-d H:i:s") . '">
-			<table>
-			 <tr>
-			  <td align="right">' . Get_Text(7) . '</td>
-			  <td><input type="text" name="betreff" size="60"></td>
-			 </tr>
-			 <tr>
-			  <td align="right">' . Get_Text(8) . '</td>
-			  <td><textarea name="text" cols="50" rows="10"></textarea></td>
-			 </tr>';
+					<br /><hr />
+					<h2>' . Get_Text(6) . '</h2>
+					<a name="Neu">&nbsp;</a>
+					
+					<form action="" method="post">
+					<?PHP
+					
+						// Datum mit uebergeben, um doppelte Eintraege zu verhindern 
+						// (Reload nach dem Eintragen!)
+					?>
+					<input type="hidden" name="date" value="' . date("Y-m-d H:i:s") . '">
+					<table>
+					 <tr>
+					  <td align="right">' . Get_Text(7) . '</td>
+					  <td><input type="text" name="betreff" size="60"></td>
+					 </tr>
+					 <tr>
+					  <td align="right">' . Get_Text(8) . '</td>
+					  <td><textarea name="text" cols="50" rows="10"></textarea></td>
+					 </tr>';
 	if (in_array('news_add_meeting', $privileges)) {
 		$html .= ' <tr>
-						  <td align="right">' . Get_Text(9) . '</td>
-						  <td><input type="checkbox" name="treffen" size="1" value="1"></td>
-						 </tr>';
+										  <td align="right">' . Get_Text(9) . '</td>
+										  <td><input type="checkbox" name="treffen" size="1" value="1"></td>
+										 </tr>';
 
 	}
 	$html .= '</table>
-			<br />
-			<input type="submit" value="' . Get_Text("save") . '">
-			</form>';
+					<br />
+					<input type="submit" value="' . Get_Text("save") . '">
+					</form>';
 	return $html;
 }
 ?>
\ No newline at end of file
diff --git a/includes/sys_shift.php b/includes/sys_shift.php
new file mode 100644
index 00000000..ff75465c
--- /dev/null
+++ b/includes/sys_shift.php
@@ -0,0 +1,442 @@
+<?php
+function load_shift_basics() {
+	global $VeranstaltungsTageMax, $Room, $RoomID, $EngelType, $EngelTypeID, $TID2Name, $Veranstaltungstage;
+
+	// erstellt ein Array der Räume
+	$rooms = sql_select("SELECT `RID`, `Name` FROM `Room` WHERE `Show`='Y' ORDER BY `Number`, `Name`");
+	foreach ($rooms as $i => $r) {
+		$Room[$i] = array (
+			'RID' => $r['RID'],
+			'Name' => $r['Name']
+		);
+		$RoomID[$r['RID']] = $r['Name'];
+	}
+
+	// erstellt ein Array der Engeltypen
+	$engel_types = sql_select("SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`");
+	foreach ($engel_types as $engel_type) {
+		$EngelType[$i] = array (
+			'TID' => $engel_type['TID'],
+			'Name' => $engel_type['Name'] . Get_Text("inc_schicht_engel")
+		);
+		$EngelTypeID[$engel_type['TID']] = $engel_type['Name'] . Get_Text("inc_schicht_engel");
+		$TID2Name[$engel_type['TID']] = $engel_type['Name'];
+	}
+
+	// Erste Schicht suchen
+	$Pos = 0;
+	$first_shift = sql_select("SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1");
+	if (count($first_shift) > 0) {
+		do {
+			// Startdatum einlesen und link ausgeben
+			$DateS = substr($first_shift[0]['DateS'], 0, 10);
+			$VeranstaltungsTage[$Pos++] = $DateS;
+
+			// auslesen den endes und eventuelle weitere tage ausgeben
+			$last_shift = sql_select("SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '" . sql_escape($DateS) . "%') AND NOT (`DateE` like '%00:00:00'))");
+			$DateE = substr($last_shift[0]['DateE'], 0, 10);
+
+			if (strlen($DateE) == 0)
+				$DateE = $DateS;
+			else
+				while ($DateS != $DateE) {
+					$DateS = DatumUm1TagErhoehen($DateS);
+					$VeranstaltungsTage[$Pos++] = $DateS;
+				}
+
+			// suchen den nächsten eintrag
+			$first_shift = sql_select("SELECT `DateS` FROM `Shifts` " . "WHERE (`DateS` > '" . sql_escape($DateE) . " 23:59:59' ) " . "ORDER BY `DateS` " . "LIMIT 1");
+		} while (count($first_shift) > 0);
+	}
+
+	$VeranstaltungsTageMax = $Pos -1;
+}
+
+/*#######################################################
+#  gibt die engelschischten aus      #
+#######################################################*/
+function ausgabe_Feld_Inhalt($SID, $Man) {
+	// gibt, nach �bergabe der der SchichtID (SID) und der RaumBeschreibung,
+	// die eingetragenden und und offenden Schichteint�ge zur�ck
+	global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset;
+
+	$Spalten = "";
+
+	if (!isset ($_GET["Icon"]))
+		$_GET["Icon"] = 1;
+
+	///////////////////////////////////////////////////////////////////
+	// Schow Admin Page
+	///////////////////////////////////////////////////////////////////
+	$Spalten .= funktion_isLinkAllowed_addLink_OrEmpty("admin/schichtplan.php?action=change&SID=$SID", "edit<br />\n");
+
+	///////////////////////////////////////////////////////////////////
+	// Ausgabe des Schischtnamens
+	///////////////////////////////////////////////////////////////////
+	$SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');";
+	$Erg = mysql_query($SQL, $con);
+	if (mysql_result($Erg, 0, 0) != "")
+		$Spalten .= "<a href=\"" . mysql_result($Erg, 0, 0) . "\" target=\"_black\"><u>$Man:</u></a><br />";
+	else
+		$Spalten .= "<u>" .
+		$Man . ":</u><br />";
+
+	///////////////////////////////////////////////////////////////////
+	// SQL abfrage f�r die ben�tigten schichten
+	///////////////////////////////////////////////////////////////////
+	$SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;";
+	$Erg = mysql_query($SQL, $con);
+
+	$Anzahl = mysql_num_rows($Erg);
+	$Feld = 0;
+	$Temp_TID_old = -1;
+	for ($i = 0; $i < $Anzahl; $i++) {
+		if (isset ($Temp[$Feld]["TID"]))
+			$Temp_TID_old = $Temp[$Feld]["TID"];
+		if (isset ($Temp[$Feld]["UID"]))
+			$Temp_UID_old = $Temp[$Feld]["UID"];
+
+		$Temp_TID = mysql_result($Erg, $i, "TID");
+
+		// wenn sich der Type �ndert wird zumn�sten feld geweckselt
+		if ($Temp_TID_old != $Temp_TID)
+			$Feld++;
+
+		$Temp[$Feld]["TID"] = $Temp_TID;
+		$Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID");
+
+		// sonderfall ersten durchlauf
+		if ($i == 0) {
+			$Temp_TID_old = $Temp[$Feld]["TID"];
+			$Temp_UID_old = $Temp[$Feld]["UID"];
+		}
+
+		// ist es eine zu vergeben schicht?
+		if ($Temp[$Feld]["UID"] == 0) {
+			if (isset ($Temp[$Feld]["free"]))
+				$Temp[$Feld]["free"]++;
+			else
+				$Temp[$Feld]["free"] = 1;
+		} else
+			$Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"];
+	} // FOR
+
+	///////////////////////////////////////////////////////////////////
+	// Aus gabe der Schicht
+	///////////////////////////////////////////////////////////////////
+	if (isset ($Temp))
+		if (count($Temp))
+			foreach ($Temp as $TempEntry => $TempValue) {
+				if (!isset ($TempValue["free"]))
+					$TempValue["free"] = 0;
+
+				// ausgabe EngelType
+				$Spalten .= $EngelTypeID[$TempValue["TID"]] . " ";
+
+				// ausgabe Eingetragener Engel
+				if (isset ($TempValue["Engel"]))
+					if (count($TempValue["Engel"]) > 0) {
+						if (count($TempValue["Engel"]) == 1)
+							$Spalten .= Get_Text("inc_schicht_ist") . ":<br />\n";
+						else
+							$Spalten .= Get_Text("inc_schicht_sind") . ":<br />\n";
+
+						foreach ($TempValue["Engel"] as $TempEngelEntry => $TempEngelID) {
+							if (funktion_isLinkAllowed("admin/user.php") === TRUE) {
+								// add color, wenn Engel "Gekommen"
+								$TempText = ((UIDgekommen($TempEngelID) == "1") ? "<span style=\"color: blue;\">" : "<span style=\"color: red;\">") .
+								UID2Nick($TempEngelID) . "</span>";
+							} else {
+								$TempText = UID2Nick($TempEngelID);
+							}
+
+							// add link to user
+							$TempText = funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", $TempText);
+
+							$Spalten .= "&nbsp;&nbsp;" . $TempText .
+							 (($_GET["Icon"] == 1) ? DisplayAvatar($TempEngelID) : "") .
+							"<br />\n";
+
+						}
+						$Spalten = substr($Spalten, 0, strlen($Spalten) - 7);
+					}
+
+				// ausgabe ben�tigter Engel
+				////////////////////////////
+				//in vergangenheit
+				$SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '" .
+				gmdate("Y-m-d H:i:s", time() + $gmdateOffset) . "')";
+				$Ergtime = mysql_query($SQLtime, $con);
+				if (mysql_num_rows($Ergtime) > 0) {
+					//wenn keien rechte definiert sind 
+					if (!isset ($_SESSION['CVS'][$TID2Name[$TempValue["TID"]]]))
+						$_SESSION['CVS'][$TID2Name[$TempValue["TID"]]] = "Y";
+
+					if ($_SESSION['CVS'][$TID2Name[$TempValue["TID"]]] == "Y")
+						if ($TempValue["free"] > 0) {
+							$Spalten .= "<br />\n&nbsp;&nbsp;<a href=\"./schichtplan_add.php?SID=$SID&TID=" .
+							$TempValue["TID"] . "\">";
+							$Spalten .= $TempValue["free"];
+							if ($TempValue["free"] != 1)
+								$Spalten .= Get_Text("inc_schicht_weitere") .
+								" " . Get_Text("inc_schicht_Engel") .
+								Get_Text("inc_schicht_wird");
+							else
+								$Spalten .= Get_Text("inc_schicht_weiterer") .
+								" " . Get_Text("inc_schicht_Engel") .
+								Get_Text("inc_schicht_werden");
+							$Spalten .= Get_Text("inc_schicht_noch_gesucht");
+							$Spalten .= "</a>";
+						}
+				} else {
+					if (isset ($TempValue["free"]))
+						if ($TempValue["free"] > 0)
+							$Spalten .= "<br />\n&nbsp;&nbsp;<h3><a>Fehlen noch: " .
+							$TempValue["free"] . "</a></h3>";
+				}
+				$Spalten .= "<br />\n";
+
+			} // FOREACH
+	return $Spalten;
+} // function Ausgabe_Feld_Inhalt
+
+/*#######################################################
+#  gibt die engelschischten Druckergerecht aus  #
+#######################################################*/
+function Ausgabe_Feld_Inhalt_Druck($RID, $Man) {
+	// gibt, nach �bergabe der der SchichtID (SID) und der RaumBeschreibung,
+	// die eingetragenden und und offenden Schichteint�ge zur�ck
+
+} // function Ausgabe_Feld_Inhalt
+
+/*#######################################################
+#  Ausgabe der Raum Spalten      #
+#######################################################*/
+function CreateRoomShifts($raum) {
+	global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages;
+
+	/////////////////////////////////////////////////////////////
+	// beginnt die erste schicht vor dem heutigen tag und geht dar�ber hinaus
+	/////////////////////////////////////////////////////////////
+	$SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` " .
+	"WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND " .
+	"(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
+	$ErgSonder = mysql_query($SQLSonder, $con);
+	if ((mysql_num_rows($ErgSonder) > 1)) {
+		if (funktion_isLinkAllowed("admin/schichtplan.php") === TRUE) {
+			echo "<h1>" . Get_Text("pub_schichtplan_colision") . "</h1> ";
+			for ($i = 0; $i < mysql_num_rows($ErgSonder); $i++) {
+				echo "<a href=\"./../admin/schichtplan.php?action=change&SID=" .
+				mysql_result($ErgSonder, $i, "SID") . "\">" .
+				mysql_result($ErgSonder, $i, "DateS") .
+				" '" . mysql_result($ErgSonder, $i, "Man") . "' (RID $raum) (00-24)" .
+				"</a><br />\n";
+			}
+		}
+	}
+	elseif ((mysql_num_rows($ErgSonder) == 1)) {
+		$Spalten[0] .= "<td valign=\"top\" rowspan=\"" . (24 * $GlobalZeileProStunde) . "\">\n" .
+		"<h3>&uarr;&uarr;&uarr;</h3>" .
+		Ausgabe_Feld_Inhalt(mysql_result($ErgSonder, 0, "SID"), mysql_result($ErgSonder, 0, "Man")) .
+		"<h3>&darr;&darr;&darr;</h3>" .
+		"\n</td>\n";
+		return;
+	}
+
+	$ZeitZeiger = 0;
+
+	/////////////////////////////////////////////////////////////
+	// beginnt die erste schicht vor dem heutigen tag?
+	/////////////////////////////////////////////////////////////
+	$SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` " .
+	"WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND " .
+	"(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;";
+	$ErgSonder = mysql_query($SQLSonder, $con);
+	if ((mysql_num_rows($ErgSonder) > 1)) {
+		if (funktion_isLinkAllowed("admin/schichtplan.php") === TRUE) {
+			echo "<h1>" . Get_Text("pub_schichtplan_colision") . "</h1> ";
+			for ($i = 0; $i < mysql_num_rows($ErgSonder); $i++) {
+				echo "<a href=\"./../admin/schichtplan.php?action=change&SID=" .
+				mysql_result($ErgSonder, $i, "SID") . "\">" .
+				mysql_result($ErgSonder, $i, "DateS") .
+				" '" . mysql_result($ErgSonder, $i, "Man") . "' (RID $raum) (00-xx)" .
+				"</a><br />\n";
+			}
+		}
+	}
+	elseif ((mysql_num_rows($ErgSonder) == 1)) {
+		$ZeitZeiger = substr(mysql_result($ErgSonder, 0, "DateE"), 11, 2) + (substr(mysql_result($ErgSonder, 0, "DateE"), 14, 2) / 60);
+		$Spalten[0] .= "<td valign=\"top\" rowspan=\"" . ($ZeitZeiger * $GlobalZeileProStunde) . "\">\n" .
+		"<h3>&uarr;&uarr;&uarr;</h3>" .
+		Ausgabe_Feld_Inhalt(mysql_result($ErgSonder, 0, "SID"), mysql_result($ErgSonder, 0, "Man")) .
+		"\n</td>\n";
+	}
+
+	/////////////////////////////////////////////////////////////
+	// gibt die schichten f�r den tag aus
+	/////////////////////////////////////////////////////////////
+	$SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` " .
+	"WHERE ((`RID` = '$raum') and " .
+	"(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and " .
+	"(`DateS` like '$ausdatum%')) ORDER BY `DateS`;";
+	$Erg = mysql_query($SQL, $con);
+	for ($i = 0; $i < mysql_num_rows($Erg); ++ $i) {
+		$ZeitPos = substr(mysql_result($Erg, $i, "DateS"), 11, 2) + (substr(mysql_result($Erg, $i, "DateS"), 14, 2) / 60);
+		$len = mysql_result($Erg, $i, "Len");
+
+		if ($len <= 0)
+			array_push($error_messages, "Error in shift denition SID=" . mysql_result($Erg, $i, "SID") . " Len=$len");
+
+		if ($ZeitZeiger < $ZeitPos) {
+			$Spalten[$ZeitZeiger * $GlobalZeileProStunde] .= "<td valign=\"top\" rowspan=\"" . (($ZeitPos - $ZeitZeiger) * $GlobalZeileProStunde) . "\">&nbsp;</td>\n";
+
+			$ZeitZeiger += $ZeitPos - $ZeitZeiger;
+		}
+		if ($ZeitZeiger == $ZeitPos) {
+			//sonderfall wenn die schicht �ber dei 24 stunden hinaus geht
+			// (eintrag abk�rzen, pfeiel ausgeben)
+			$Spalten[$ZeitZeiger * $GlobalZeileProStunde] .= "<td valign=\"top\" rowspan=\"" .
+			 ((($len + $ZeitZeiger) ? $len : 24 - $len + $ZeitZeiger) * $GlobalZeileProStunde) .
+			"\">\n" .
+			"" .
+			Ausgabe_Feld_Inhalt(mysql_result($Erg, $i, "SID"), mysql_result($Erg, $i, "Man")) .
+			 ((($ZeitZeiger + $len) > 24) ? "<h3>&darr;&darr;&darr;</h3>" : "") .
+			"\n</td>\n";
+			$ZeitZeiger += $len;
+		} else {
+			echo "<h1>" . Get_Text("pub_schichtplan_colision") . "</h1> ";
+			echo "<a href=\"./../admin/schichtplan.php?action=change&SID=" .
+			mysql_result($Erg, $i, "SID") . "\">" .
+			mysql_result($Erg, $i, "DateS") .
+			" '" . mysql_result($Erg, $i, "Man") . "' " .
+			" (" . mysql_result($Erg, $i, "SID") . " R$raum) (xx-xx)</a><br /><br />";
+		}
+	}
+	if ($ZeitZeiger < 24)
+		$Spalten[($ZeitZeiger * $GlobalZeileProStunde)] .= "<td valign=\"top\" rowspan=\"" .
+		 ((24 - $ZeitZeiger) * $GlobalZeileProStunde) .
+		"\">&nbsp;</td>\n";
+} // function CreateRoomShifts
+
+/*#######################################################
+#  Ausgabe der freien schichten      #
+#######################################################*/
+function showEmptyShifts() {
+	global $con, $debug, $RoomID, $gmdateOffset;
+
+	echo "<table border=\"1\">\n";
+	echo "<tr>\n";
+	echo "<th>" . Get_Text("inc_schicht_date") . "</th>\n";
+	echo "<th>" . Get_Text("inc_schicht_time") . "</th>\n";
+	echo "<th>" . Get_Text("inc_schicht_room") . "</th>\n";
+	echo "<th>" . Get_Text("inc_schicht_commend") . "</th>\n";
+	echo "</tr>\n";
+
+	$sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` " .
+	"WHERE (`Shifts`.`DateS`>='" . gmdate("Y-m-d H:i:s", time() + $gmdateOffset) . "') " .
+	"ORDER BY `DateS`, `RID`;";
+	$Erg = mysql_query($sql, $con);
+
+	$angezeigt = 0;
+	for ($i = 0;($i < mysql_num_rows($Erg)) && ($angezeigt < 15); $i++)
+		if (isset ($RoomID[mysql_result($Erg, $i, "RID")]))
+			if ($RoomID[mysql_result($Erg, $i, "RID")] != "") {
+				$Sql2 = "SELECT `UID` FROM `ShiftEntry` " .
+				"WHERE `SID`=" . mysql_result($Erg, $i, "SID") . " AND " .
+				"`UID`='0';";
+				$Erg2 = mysql_query($Sql2, $con);
+
+				if (mysql_num_rows($Erg2) > 0) {
+					$angezeigt++;
+					echo "<tr>\n";
+					echo "<td>" . substr(mysql_result($Erg, $i, "DateS"), 0, 10) . "</td>\n";
+					echo "<td>" . substr(mysql_result($Erg, $i, "DateS"), 11) . "</td>\n";
+					echo "<td>" . $RoomID[mysql_result($Erg, $i, "RID")] . "</td>\n";
+					echo "<td>" .
+					ausgabe_Feld_Inhalt(mysql_result($Erg, $i, "SID"), mysql_result($Erg, $i, "Man")) .
+					"</td>\n";
+					echo "</tr>\n";
+				}
+			}
+
+	echo "</table>\n";
+
+} //function showEmptyShifts
+
+/*#######################################################
+#  Gibt die anzahl der Schichten im Raum zur�ck  #
+#######################################################*/
+function SummRoomShifts($raum) {
+	global $ausdatum, $con, $debug, $GlobalZeileProStunde;
+
+	$SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` " .
+	"WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND " .
+	"(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;";
+
+	$ErgSonder = mysql_query($SQLSonder, $con);
+
+	return mysql_num_rows($ErgSonder);
+}
+
+function DatumUm1TagErhoehen($Datum) {
+	$Jahr = substr($Datum, 0, 4);
+	$Monat = substr($Datum, 5, 2);
+	$Tag = substr($Datum, 8, 2);
+
+	$Tag++;
+
+	switch ($Monat) {
+		case 1 :
+			$Mmax = 31;
+			break;
+		case 2 :
+			$Mmax = 28;
+			break;
+		case 3 :
+			$Mmax = 31;
+			break;
+		case 4 :
+			$Mmax = 30;
+			break;
+		case 5 :
+			$Mmax = 31;
+			break;
+		case 6 :
+			$Mmax = 30;
+			break;
+		case 7 :
+			$Mmax = 31;
+			break;
+		case 8 :
+			$Mmax = 31;
+			break;
+		case 9 :
+			$Mmax = 30;
+			break;
+		case 10 :
+			$Mmax = 31;
+			break;
+		case 11 :
+			$Mmax = 30;
+			break;
+		case 12 :
+			$Mmax = 31;
+			break;
+	}
+
+	if ($Tag > $Mmax) {
+		$Tag = 1;
+		$Monat++;
+	}
+
+	if ($Monat > 12) {
+		$Monat = 1;
+		$Jahr++;
+	}
+
+	$Tag = strlen($Tag) == 1 ? "0" . $Tag : $Tag;
+	$Monat = strlen($Monat) == 1 ? "0" . $Monat : $Monat;
+
+	return ("$Jahr-$Monat-$Tag");
+}
+?>
diff --git a/includes/sys_template.php b/includes/sys_template.php
index ab613c07..2c7f4f22 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -14,4 +14,12 @@ function template_render($file, $data) {
 		die('Cannot find template file &laquo;' . $file . '&raquo;.');
 	}
 }
+
+function html_options($name, $options, $selected = "") {
+	$html = "";
+	foreach ($options as $value => $label)
+		$html .= '<input type="radio"' . ($value == $selected ? ' selected="selected"' : '') . ' name="' . $name . '" value="' . $value . '"> ' . $label;
+
+	return $html;
+}
 ?>
\ No newline at end of file
diff --git a/templates/admin_rooms_edit_form.html b/templates/admin_rooms_edit_form.html
new file mode 100644
index 00000000..cd1506fa
--- /dev/null
+++ b/templates/admin_rooms_edit_form.html
@@ -0,0 +1,59 @@
+Raum und dafür benötigte Engel bearbeiten: 
+<br/>
+<form action="%link%&action=changesave" method="post">
+    <table>
+        <tr>
+            <td>
+                Name
+            </td>
+            <td>
+                <input type="text" name="Name" value="%name%" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Man
+            </td>
+            <td>
+                <input type="text" name="Man" value="%man%" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                From Pentabarf
+            </td>
+            <td>
+                %from_pentabarf_options%
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Show
+            </td>
+            <td>
+                %show_options%
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Number
+            </td>
+            <td>
+                <input type="text" name="Number" value="%number%" />
+            </td>
+        </tr>
+        <tr>
+            <th>
+                Angle Type
+            </th>
+            <th>
+                Needed for this room
+            </th>
+        </tr>
+        %angel_types%
+    </table>
+    <input type="hidden" name="RID" value="%room_id%" /><input type="submit" value="Save" />
+</form>
+<form action="%link%&action=delete" method="post">
+    <input type="hidden" name="RID" value="%room_id%" /><input type="submit" value="Delete" />
+</form>
\ No newline at end of file
diff --git a/templates/admin_rooms_new_form.html b/templates/admin_rooms_new_form.html
new file mode 100644
index 00000000..68ea9485
--- /dev/null
+++ b/templates/admin_rooms_new_form.html
@@ -0,0 +1,46 @@
+Neuen Raum einrichten: 
+<br/>
+<form action="%link%&action=newsave" method="post">
+    <table>
+        <tr>
+            <td>
+                Name
+            </td>
+            <td>
+                <input type="text" name="Name" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Man
+            </td>
+            <td>
+                <input type="text" name="Man" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                From Pentabarf
+            </td>
+            <td>
+                <input type="radio" name="FromPentabarf" value="Y" /> Yes <input type="radio" name="FromPentabarf" value="N" />No
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Show
+            </td>
+            <td>
+                <input type="radio" name="Show" value="Y" /> Yes<input type="radio" name="Show" value="N" /> No
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Number
+            </td>
+            <td>
+                <input type="text" name="Number" value="%number%" />
+            </td>
+        </tr>
+    </table><input type="submit" value="Create" />
+</form>
\ No newline at end of file
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 808fb512..8b46e703 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -93,6 +93,22 @@ a.sprache img {
     margin-right: 5px;
 }
 
+table {
+	border-collapse: collapse;
+}
+
+tr:hover > td {
+	background: #f0f0f0;
+}
+
+th {
+	background: #f0f0f0;
+}
+
+td, th {
+	border: 1px solid #888;
+}
+
 .background {
     background: #f0f0f0;
 }
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 98c7e439..184702c8 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -6,6 +6,7 @@ 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');
 
@@ -43,6 +44,10 @@ if (in_array($p, $privileges)) {
 	elseif ($p == "logout") {
 		require_once ('includes/pages/guest_login.php');
 		$content = guest_logout();
+	}
+	elseif ($p == "admin_rooms") {
+		require_once ('includes/pages/admin_rooms.php');
+		$content = admin_rooms();
 	} else {
 		require_once ('includes/pages/guest_start.php');
 		$content = guest_start();
-- 
cgit v1.2.3-54-g00ecf


From 1c38d62127e45a9703b834144aa02e8d24b6a62a Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Thu, 2 Jun 2011 17:48:27 +0200
Subject: admin angel types done

---
 DB/db_rewrite.sql                          | 168 +++++++++++++++--------------
 includes/pages/admin_angel_types.php       |  76 ++++++++++++-
 templates/admin_angel_types_edit_form.html |  24 +++++
 www-ssl/css/base.css                       |   4 +
 4 files changed, 186 insertions(+), 86 deletions(-)
 create mode 100644 templates/admin_angel_types_edit_form.html

(limited to 'www-ssl/css/base.css')

diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql
index 888bddbf..64fe75e8 100644
--- a/DB/db_rewrite.sql
+++ b/DB/db_rewrite.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 02. Juni 2011 um 15:01
+-- Erstellungszeit: 02. Juni 2011 um 15:48
 -- Server Version: 5.1.44
 -- PHP-Version: 5.3.1
 
@@ -25,15 +25,15 @@ CREATE TABLE IF NOT EXISTS `AngelTypes` (
   `Man` text,
   PRIMARY KEY (`TID`),
   UNIQUE KEY `Name` (`Name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;
 
 --
 -- Daten für Tabelle `AngelTypes`
 --
 
 INSERT INTO `AngelTypes` (`TID`, `Name`, `Man`) VALUES
-(1, 'Video', NULL),
-(2, 'Audio', NULL);
+(1, 'Sex', ''),
+(4, 'Audio', '');
 
 -- --------------------------------------------------------
 
@@ -75,9 +75,10 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES
 ('logout', 2),
 ('start', 8),
 ('faq', 4),
-('credits', 1),
+('credits', 2),
 ('register', 1),
-('admin_rooms', 64);
+('admin_rooms', 64),
+('admin_angel_types', 58);
 
 -- --------------------------------------------------------
 
@@ -121,7 +122,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
   `privilege_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `group_id` (`group_id`,`privilege_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ;
 
 --
 -- Daten für Tabelle `GroupPrivileges`
@@ -133,7 +134,8 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
 (3, -2, 3),
 (4, -2, 4),
 (5, -1, 5),
-(6, -4, 6);
+(6, -4, 6),
+(7, -4, 7);
 
 -- --------------------------------------------------------
 
@@ -239,7 +241,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
   `desc` varchar(1024) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ;
 
 --
 -- Daten für Tabelle `Privileges`
@@ -251,7 +253,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (3, 'news', 'Anzeigen der News-Seite'),
 (4, 'logout', 'User darf sich ausloggen'),
 (5, 'register', 'Einen neuen Engel registerieren'),
-(6, 'admin_rooms', 'Räume administrieren');
+(6, 'admin_rooms', 'Räume administrieren'),
+(7, 'admin_angel_types', 'Engel Typen administrieren');
 
 -- --------------------------------------------------------
 
@@ -314,7 +317,6 @@ CREATE TABLE IF NOT EXISTS `RoomAngelTypes` (
 --
 
 INSERT INTO `RoomAngelTypes` (`id`, `room_id`, `angel_type_id`, `count`) VALUES
-(1, 1, 2, 2),
 (2, 1, 1, 3);
 
 -- --------------------------------------------------------
@@ -494,7 +496,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('pub_schicht_Anzeige_2', 'DE', ' im Raum: '),
 ('pub_schicht_Anzeige_3', 'DE', 'Anzeige des Schichtplans f&uuml;r den '),
 ('inc_schicht_engel', 'DE', 'Engel'),
-('inc_schicht_engel', 'EN', 'Drone'),
+('inc_schicht_engel', 'EN', 'Angel'),
 ('inc_schicht_ist', 'DE', 'ist'),
 ('inc_schicht_sind', 'DE', 'sind'),
 ('inc_schicht_weitere', 'DE', ' weitere'),
@@ -838,8 +840,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('pub_sprache_ShowEntry', 'EN', 'show entrys'),
 ('admin_rooms', 'DE', 'Räume'),
 ('admin_rooms', 'EN', 'Rooms'),
-('pub_menu_Engeltypen', 'DE', 'Engeltypen'),
-('pub_menu_Engeltypen', 'EN', 'Dronetypes'),
+('admin_angel_types', 'DE', 'Engeltypen'),
+('admin_angel_types', 'EN', 'Angel types'),
 ('pub_menu_SchichtplanEdit', 'DE', 'Schichtplan'),
 ('pub_menu_SchichtplanEdit', 'EN', 'Shiftplan'),
 ('pub_menu_UpdateDB', 'DE', 'UpdateDB'),
@@ -987,30 +989,30 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 
 CREATE TABLE IF NOT EXISTS `User` (
   `UID` int(11) NOT NULL AUTO_INCREMENT,
-  `Nick` varchar(23) CHARACTER SET utf8 NOT NULL DEFAULT '',
-  `Name` varchar(23) CHARACTER SET utf8 DEFAULT NULL,
-  `Vorname` varchar(23) CHARACTER SET utf8 DEFAULT NULL,
+  `Nick` varchar(23) NOT NULL DEFAULT '',
+  `Name` varchar(23) DEFAULT NULL,
+  `Vorname` varchar(23) DEFAULT NULL,
   `Alter` int(4) DEFAULT NULL,
-  `Telefon` varchar(40) CHARACTER SET utf8 DEFAULT NULL,
-  `DECT` varchar(4) CHARACTER SET utf8 DEFAULT NULL,
-  `Handy` varchar(40) CHARACTER SET utf8 DEFAULT NULL,
-  `email` varchar(123) CHARACTER SET utf8 DEFAULT NULL,
-  `ICQ` varchar(30) CHARACTER SET utf8 DEFAULT NULL,
-  `jabber` varchar(200) CHARACTER SET utf8 DEFAULT NULL,
-  `Size` varchar(4) CHARACTER SET utf8 DEFAULT NULL,
-  `Passwort` varchar(40) CHARACTER SET utf8 DEFAULT NULL,
+  `Telefon` varchar(40) DEFAULT NULL,
+  `DECT` varchar(4) DEFAULT NULL,
+  `Handy` varchar(40) DEFAULT NULL,
+  `email` varchar(123) DEFAULT NULL,
+  `ICQ` varchar(30) DEFAULT NULL,
+  `jabber` varchar(200) DEFAULT NULL,
+  `Size` varchar(4) DEFAULT NULL,
+  `Passwort` varchar(40) DEFAULT NULL,
   `Gekommen` tinyint(4) NOT NULL DEFAULT '0',
   `Aktiv` tinyint(4) NOT NULL DEFAULT '0',
   `Tshirt` tinyint(4) DEFAULT '0',
   `color` tinyint(4) DEFAULT '6',
-  `Sprache` char(2) CHARACTER SET utf8 DEFAULT 'EN',
+  `Sprache` char(2) DEFAULT 'EN',
   `Avatar` int(11) DEFAULT '0',
-  `Menu` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'L',
+  `Menu` char(1) NOT NULL DEFAULT 'L',
   `lastLogIn` int(11) NOT NULL,
   `CreateDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `Art` varchar(30) CHARACTER SET utf8 DEFAULT NULL,
-  `kommentar` text CHARACTER SET utf8,
-  `Hometown` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `Art` varchar(30) DEFAULT NULL,
+  `kommentar` text,
+  `Hometown` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`UID`,`Nick`),
   UNIQUE KEY `Nick` (`Nick`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=148 ;
@@ -1020,7 +1022,7 @@ CREATE TABLE IF NOT EXISTS `User` (
 --
 
 INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES
-(1, 'admin', '', '', 0, '', '', '', '', NULL, NULL, '', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307026626, '0000-00-00 00:00:00', '', '', ''),
+(1, 'admin', '', '', 0, '', '', '', '', NULL, NULL, '', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307029663, '0000-00-00 00:00:00', '', '', ''),
 (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1306971362, '2011-06-02 00:55:09', '', '', '');
 
 -- --------------------------------------------------------
@@ -1032,58 +1034,58 @@ INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`
 CREATE TABLE IF NOT EXISTS `UserCVS` (
   `UID` int(11) NOT NULL DEFAULT '0',
   `GroupID` int(11) DEFAULT '-2',
-  `index.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `logout.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `faq.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `lageplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `makeuser.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/index.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/news.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/newsAddMeting` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/news_comments.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/myschichtplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/myschichtplan_ical.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/schichtplan_beamer.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/engelbesprechung.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/schichtplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/schichtplan_add.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/wecken.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/waeckliste.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/messages.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/faq.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `nonpublic/einstellungen.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `Change T_Shirt Size` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/index.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/room.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/EngelType.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/schichtplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/shiftadd.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/schichtplan_druck.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/user.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/userChangeNormal.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/userSaveNormal.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/userChangeSecure.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/userSaveSecure.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/group.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/userDefaultSetting.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/UserPicture.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/userArrived.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/aktiv.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/tshirt.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/news.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/faq.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/free.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/sprache.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/dect.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/dect_call.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/dbUpdateFromXLS.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/Recentchanges.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `admin/debug.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `Herald` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `Info` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `Conference` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `Kasse` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G',
-  `credits.php` char(1) CHARACTER SET utf8 NOT NULL,
+  `index.php` char(1) NOT NULL DEFAULT 'G',
+  `logout.php` char(1) NOT NULL DEFAULT 'G',
+  `faq.php` char(1) NOT NULL DEFAULT 'G',
+  `lageplan.php` char(1) NOT NULL DEFAULT 'G',
+  `makeuser.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/index.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/news.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/newsAddMeting` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/news_comments.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/myschichtplan.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/myschichtplan_ical.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/schichtplan_beamer.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/engelbesprechung.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/schichtplan.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/schichtplan_add.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/wecken.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/waeckliste.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/messages.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/faq.php` char(1) NOT NULL DEFAULT 'G',
+  `nonpublic/einstellungen.php` char(1) NOT NULL DEFAULT 'G',
+  `Change T_Shirt Size` char(1) NOT NULL DEFAULT 'G',
+  `admin/index.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/room.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/EngelType.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/schichtplan.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/shiftadd.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/schichtplan_druck.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/user.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userChangeNormal.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userSaveNormal.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userChangeSecure.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userSaveSecure.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/group.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userDefaultSetting.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/UserPicture.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/userArrived.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/aktiv.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/tshirt.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/news.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/faq.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/free.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/sprache.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/dect.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/dect_call.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/dbUpdateFromXLS.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/Recentchanges.php` char(1) NOT NULL DEFAULT 'G',
+  `admin/debug.php` char(1) NOT NULL DEFAULT 'G',
+  `Herald` char(1) NOT NULL DEFAULT 'G',
+  `Info` char(1) NOT NULL DEFAULT 'G',
+  `Conference` char(1) NOT NULL DEFAULT 'G',
+  `Kasse` char(1) NOT NULL DEFAULT 'G',
+  `credits.php` char(1) NOT NULL,
   PRIMARY KEY (`UID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
diff --git a/includes/pages/admin_angel_types.php b/includes/pages/admin_angel_types.php
index e5952d10..7ca4fe2b 100644
--- a/includes/pages/admin_angel_types.php
+++ b/includes/pages/admin_angel_types.php
@@ -1,10 +1,80 @@
 <?php
 function admin_angel_types() {
 	include ("includes/funktion_db.php");
-	
+
 	$html = "";
-	if(!isset($_REQUEST['action'])) {
-		$html .= template_render('../templates/admin_angel_types.html', array());
+	if (!isset ($_REQUEST['action'])) {
+		$table = "";
+		$angel_types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `Name`");
+		foreach ($angel_types as $angel_type)
+			$table .= '<tr><td>' . $angel_type['Name'] . '</td><td>' . $angel_type['Man'] . '</td><td><a href="' . page_link_to("admin_angel_types") . '&action=edit&id=' . $angel_type['TID'] . '">Edit</a></td></tr>';
+
+		$html .= template_render('../templates/admin_angel_types.html', array (
+			'link' => page_link_to("admin_angel_types"),
+			'table' => $table
+		));
+	} else {
+		switch ($_REQUEST['action']) {
+			case 'create' :
+				$name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['name']));
+				$man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['man']));
+				sql_query("INSERT INTO `AngelTypes` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "'");
+				header("Location: " . page_link_to("admin_angel_types"));
+				break;
+
+			case 'edit' :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing AngelType ID.");
+
+				$angel_type = sql_select("SELECT * FROM `AngelTypes` WHERE `TID`=" . sql_escape($id) . " LIMIT 1");
+				if (count($angel_type) > 0) {
+					list ($angel_type) = $angel_type;
+
+					$html .= template_render('../templates/admin_angel_types_edit_form.html', array (
+						'link' => page_link_to("admin_angel_types"),
+						'id' => $id,
+						'name' => $angel_type['Name'],
+						'man' => $angel_type['Man']
+					));
+				} else
+					return error("No Angel Type found.");
+				break;
+
+			case 'save' :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing AngelType ID.");
+
+				$angel_type = sql_select("SELECT * FROM `AngelTypes` WHERE `TID`=" . sql_escape($id) . " LIMIT 1");
+				if (count($angel_type) > 0) {
+					list ($angel_type) = $angel_type;
+
+					$name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['name']));
+					$man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['man']));
+					sql_query("UPDATE `AngelTypes` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "' WHERE `TID`=" . sql_escape($id) . " LIMIT 1");
+					header("Location: " . page_link_to("admin_angel_types"));
+				} else
+					return error("No Angel Type found.");
+				break;
+
+			case 'delete' :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing AngelType ID.");
+
+				$angel_type = sql_select("SELECT * FROM `AngelTypes` WHERE `TID`=" . sql_escape($id) . " LIMIT 1");
+				if (count($angel_type) > 0) {
+					sql_query("DELETE FROM `AngelTypes` WHERE `TID`=" . sql_escape($id) . " LIMIT 1");
+					sql_query("DELETE FROM `RoomAngelTypes` WHERE `angel_type_id`=" . sql_escape($id) . " LIMIT 1");
+					header("Location: " . page_link_to("admin_angel_types"));
+				} else
+					return error("No Angel Type found.");
+				break;
+		}
 	}
 
 	return $html;
diff --git a/templates/admin_angel_types_edit_form.html b/templates/admin_angel_types_edit_form.html
new file mode 100644
index 00000000..16ffebca
--- /dev/null
+++ b/templates/admin_angel_types_edit_form.html
@@ -0,0 +1,24 @@
+Edit angel type:
+<form action="%link%&action=save" method="post">
+    <table>
+        <tr>
+            <td>
+                Name
+            </td>
+            <td>
+                <input type="text" name="name" value="%name%" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Man
+            </td>
+            <td>
+                <input type="text" name="man" value="%man%" />
+            </td>
+        </tr>
+    </table><input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Save" />
+</form>
+<form action="%link%&action=delete" method="post">
+    <input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Delete" />
+</form>
\ No newline at end of file
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 8b46e703..3a1a545f 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -69,6 +69,10 @@ h1, h4 {
     padding: 0 4px;
 }
 
+hr {
+	margin: 10px 0;
+}
+
 ul {
     padding: 5px 0 5px 20px;
 }
-- 
cgit v1.2.3-54-g00ecf


From d381f57951463a366b5264986a147ef5798ba205 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Thu, 2 Jun 2011 20:18:01 +0200
Subject: user settings

---
 DB/db_rewrite.sql                   |  40 +++---
 includes/pages/user_settings.php    | 252 ++++++++++++++++++++++++++++++++++++
 includes/sys_menu.php               |   3 +-
 includes/sys_template.php           |  11 ++
 templates/user_settings.html        | 106 +++++++++++++++
 templates/user_settings_tshirt.html |   4 +
 txt/TODO                            |   5 +
 www-ssl/css/base.css                |   4 -
 www-ssl/css/style10.css             |   4 +
 www-ssl/index.php                   |   4 +
 www/404.php                         |   3 -
 www/index.php                       |   3 -
 12 files changed, 410 insertions(+), 29 deletions(-)
 create mode 100644 includes/pages/user_settings.php
 create mode 100644 templates/user_settings.html
 create mode 100644 templates/user_settings_tshirt.html
 delete mode 100644 www/404.php
 delete mode 100644 www/index.php

(limited to 'www-ssl/css/base.css')

diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql
index 64fe75e8..71b968e7 100644
--- a/DB/db_rewrite.sql
+++ b/DB/db_rewrite.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 02. Juni 2011 um 15:48
+-- Erstellungszeit: 02. Juni 2011 um 18:17
 -- Server Version: 5.1.44
 -- PHP-Version: 5.3.1
 
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `AngelTypes` (
   `Man` text,
   PRIMARY KEY (`TID`),
   UNIQUE KEY `Name` (`Name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ;
 
 --
 -- Daten für Tabelle `AngelTypes`
@@ -33,7 +33,8 @@ CREATE TABLE IF NOT EXISTS `AngelTypes` (
 
 INSERT INTO `AngelTypes` (`TID`, `Name`, `Man`) VALUES
 (1, 'Sex', ''),
-(4, 'Audio', '');
+(4, 'Audio', ''),
+(5, 'Massage', '');
 
 -- --------------------------------------------------------
 
@@ -70,15 +71,16 @@ CREATE TABLE IF NOT EXISTS `Counter` (
 --
 
 INSERT INTO `Counter` (`URL`, `Anz`) VALUES
-('news', 39),
-('login', 5),
-('logout', 2),
-('start', 8),
+('news', 44),
+('login', 12),
+('logout', 5),
+('start', 13),
 ('faq', 4),
-('credits', 2),
-('register', 1),
-('admin_rooms', 64),
-('admin_angel_types', 58);
+('credits', 3),
+('register', 3),
+('admin_rooms', 70),
+('admin_angel_types', 68),
+('user_settings', 109);
 
 -- --------------------------------------------------------
 
@@ -122,7 +124,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
   `privilege_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `group_id` (`group_id`,`privilege_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
 
 --
 -- Daten für Tabelle `GroupPrivileges`
@@ -135,7 +137,8 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
 (4, -2, 4),
 (5, -1, 5),
 (6, -4, 6),
-(7, -4, 7);
+(7, -4, 7),
+(8, -2, 8);
 
 -- --------------------------------------------------------
 
@@ -241,7 +244,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
   `desc` varchar(1024) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
 
 --
 -- Daten für Tabelle `Privileges`
@@ -254,7 +257,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (4, 'logout', 'User darf sich ausloggen'),
 (5, 'register', 'Einen neuen Engel registerieren'),
 (6, 'admin_rooms', 'Räume administrieren'),
-(7, 'admin_angel_types', 'Engel Typen administrieren');
+(7, 'admin_angel_types', 'Engel Typen administrieren'),
+(8, 'user_settings', 'User profile settings');
 
 -- --------------------------------------------------------
 
@@ -606,7 +610,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('pub_menu_Wecken', 'DE', 'Wecken'),
 ('pub_menu_mySchichtplan', 'DE', 'Mein Schichtplan'),
 ('pub_menu_questionEngel', 'DE', 'Anfragen an die Dispatcher'),
-('pub_menu_Einstellungen', 'DE', 'Einstellungen'),
+('user_settings', 'DE', 'Einstellungen'),
 ('pub_menu_Engelbesprechung', 'EN', 'Drone meeting'),
 ('logout', 'DE', 'Abmelden'),
 ('pub_menu_Schichtplan', 'EN', 'Available Shifts'),
@@ -615,7 +619,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('pub_menu_mySchichtplan', 'EN', 'My Shifts'),
 ('pub_menu_questionEngel', 'EN', 'Questions for the Dispatcher'),
 ('logout', 'EN', 'Logout'),
-('pub_menu_Einstellungen', 'EN', 'Options'),
+('user_settings', 'EN', 'Settings'),
 ('menu_Name', 'DE', 'Garage'),
 ('menu_Name', 'EN', 'Garage'),
 ('menu_MakeUser', 'DE', 'Benutzer anlegen'),
@@ -1022,7 +1026,7 @@ CREATE TABLE IF NOT EXISTS `User` (
 --
 
 INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES
-(1, 'admin', '', '', 0, '', '', '', '', NULL, NULL, '', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307029663, '0000-00-00 00:00:00', '', '', ''),
+(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307038600, '0000-00-00 00:00:00', '', '', ''),
 (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1306971362, '2011-06-02 00:55:09', '', '', '');
 
 -- --------------------------------------------------------
diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php
new file mode 100644
index 00000000..97c8626f
--- /dev/null
+++ b/includes/pages/user_settings.php
@@ -0,0 +1,252 @@
+<?php
+function user_settings() {
+	global $user;
+
+	if (!isset ($_REQUEST['action'])) {
+		$tshirt_html = template_render('../templates/user_settings_tshirt.html', array (
+			'label_size' => Get_Text("makeuser_T-Shirt"),
+			'size_select' => ($user['Tshirt'] == 0) ? html_select_key('size', array (
+				'S' => "S",
+				'M' => "M",
+				'L' => "L",
+				'XL' => "XL",
+				'2XL' => "2XL",
+				'3XL' => "3XL",
+				'4XL' => "4XL",
+				'5XL' => "5XL",
+				'S-G' => "S Girl",
+				'M-G' => "M Girl",
+				'L-G' => "L Girl",
+				'XL-G' => "XL Girl"
+			), $user['Size']) : $user['Size']
+		));
+
+		return template_render('../templates/user_settings.html', array (
+			'link' => page_link_to("user_settings"),
+			'greeting' => Get_Text("Hallo") . $user['Nick'] . ",<br />" . Get_Text(13),
+			'text_user_data' => Get_Text("pub_einstellungen_Text_UserData"),
+			'label_nick' => Get_Text("pub_einstellungen_Nick"),
+			'label_name' => Get_Text("pub_einstellungen_Name"),
+			'label_prename' => Get_Text("pub_einstellungen_Vorname"),
+			'label_age' => Get_Text("pub_einstellungen_Alter"),
+			'label_tel' => Get_Text("pub_einstellungen_Telefon"),
+			'label_mobile' => Get_Text("pub_einstellungen_Handy"),
+			'label_dect' => Get_Text("pub_einstellungen_DECT"),
+			'label_mail' => Get_Text("pub_einstellungen_Email"),
+			'label_hometown' => Get_Text("pub_einstellungen_Hometown"),
+			'nick' => $user['Nick'],
+			'name' => $user['Name'],
+			'prename' => $user['Vorname'],
+			'age' => $user['Alter'],
+			'tel' => $user['Telefon'],
+			'mobile' => $user['Handy'],
+			'dect' => $user['DECT'],
+			'mail' => $user['email'],
+			'icq' => $user['ICQ'],
+			'jabber' => $user['jabber'],
+			'hometown' => $user['Hometown'],
+			'label_save' => Get_Text("save"),
+			'tshirts' => $tshirt_html,
+			'text_password' => Get_Text(14),
+			'current_pw_label' => Get_Text(15),
+			'new_pw_label' => Get_Text(16),
+			'new_pw2_label' => Get_Text(17),
+			'text_theme' => Get_Text(18),
+			'theme_label' => Get_Text(19),
+			'theme_select' => html_select_key('theme', array (
+				"1" => "Standard-Style",
+				"2" => "ot/Gelber Style",
+				"3" => "Club-Mate Style",
+				"5" => "Debian Style",
+				"6" => "c-base Style",
+				"7" => "Blau/Gelber Style",
+				"8" => "Pastel Style",
+				"4" => "Test Style",
+				"9" => "Test Style 21c3",
+				"10" => "msquare (cccamp2011)"
+			), $user['color']),
+			'text_language' => Get_Text(20),
+			'language_label' => Get_Text(21),
+			'language_select' => html_select_key('language', array (
+				'DE' => "Deutsch",
+				'EN' => "English"
+			), $user['Sprache'])
+		));
+	} else {
+		switch ($_REQUEST['action']) {
+			case 'sprache' :
+				if (isset ($_REQUEST['language']) && preg_match("/^DE|EN$/", $_REQUEST['language']))
+					$language = $_REQUEST['language'];
+				else
+					$language = "EN";
+				sql_query("UPDATE `User` SET " . "`Sprache`='" . sql_escape($language) . "' WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1");
+				$_SESSION['Sprache'] = $language;
+				header("Location: " . page_link_to("user_settings"));
+				break;
+
+			case 'colour' :
+				$theme = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['theme']));
+				sql_query("UPDATE `User` SET " . "`color`='" . sql_escape($theme) . "' WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1");
+				header("Location: " . page_link_to("user_settings"));
+				break;
+
+			case 'set' :
+				$html = "";
+				if ($_REQUEST["new_pw"] == $_REQUEST["new_pw2"]) {
+					if (PassCrypt($_REQUEST["current_pw"]) == $user['Passwort']) {
+						sql_query("UPDATE `User` SET `Passwort`='" . sql_escape(PassCrypt($_REQUEST['new_pw'])) . "' WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1");
+						header("Location: " . page_link_to("user_settings"));
+					} else {
+						$html .= error(Get_Text(30));
+					}
+				} else {
+					$html .= error(Get_Text(31));
+				}
+				return $html;
+				break;
+
+			case "setUserData" :
+				$nick = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['nick']));
+				$name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['name']));
+				$prename = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['prename']));
+				$age = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['age']));
+				$tel = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['tel']));
+				$mobile = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['mobile']));
+				$dect = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['dect']));
+				$mail = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['mail']));
+				$icq = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['icq']));
+				$jabber = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['jabber']));
+				$hometown = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['hometown']));
+				$size = ($user['TShirt'] == 0) ? preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['size'])) : $user['Size'];
+
+				sql_query("UPDATE `User` SET " .
+				"`Nick`='" . sql_escape($nick) . "', " .
+				"`Name`='" . sql_escape($name) . "', " .
+				"`Vorname`='" . sql_escape($prename) . "', " .
+				"`Alter`='" . sql_escape($age) . "', " .
+				"`Telefon`='" . sql_escape($tel) . "', " .
+				"`Handy`='" . sql_escape($mobile) . "', " .
+				"`DECT`='" . sql_escape($dect) . "', " .
+				"`email`='" . sql_escape($mail) . "', " .
+				"`ICQ`='" . sql_escape($icq) . "', " .
+				"`jabber`='" . sql_escape($jabber) . "', " .
+				"`Hometown`='" . sql_escape($hometown) . "', " .
+				"`Size`='" . sql_escape($size) . "' " .
+				"WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1");
+				header("Location: " . page_link_to("user_settings"));
+				break;
+		}
+	}
+
+	// AVATARE
+	/*
+		if (get_cfg_var("file_uploads")) {
+			echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+			echo Get_Text('pub_einstellungen_PictureUpload') . "<br />";
+			echo "<form action=\"./einstellungen.php\" method=\"post\" enctype=\"multipart/form-data\">\n";
+			echo "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
+			echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"" . get_cfg_var("post_max_size") . "\">\n";
+			echo "(max " . get_cfg_var("post_max_size") . "Byte)<br />\n";
+			echo "<input type=\"submit\" value=\"" . Get_Text("upload"), "\">\n";
+			echo "</form>\n";
+		}
+	
+		switch (GetPicturShow($_SESSION['UID'])) {
+			case 'Y' :
+				echo Get_Text('pub_einstellungen_PictureShow') . "<br />";
+				echo displayPictur($_SESSION['UID'], 0);
+				echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+				echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+				echo "<input type=\"submit\" value=\"" . Get_Text("delete"), "\">\n";
+				echo "</form>\n";
+				break;
+			case 'N' :
+				echo Get_Text('pub_einstellungen_PictureNoShow') . "<br />";
+				echo displayPictur($_SESSION['UID'], 0);
+				echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
+				echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
+				echo "<input type=\"submit\" value=\"" . Get_Text("delete"), "\">\n";
+				echo "</form>\n";
+				echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+			case '' :
+				echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
+				echo Get_Text(22) . "<br />";
+				echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
+				echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
+				echo "<table>\n";
+				echo "<tr>\n<td>" . Get_Text(23) . "<br /></td>\n</tr>\n";
+				echo "<tr>\n";
+				echo "<td>\n";
+				echo "<select name=\"eAvatar\" onChange=\"document.avatar.src = '" . $url . $ENGEL_ROOT . "pic/avatar/avatar' + this.value  + '.gif'\" onKeyup=\"document.avatar.src = '" . $url . $ENGEL_ROOT . "pic/avatar/avatar' + this.value  + '.gif'\">\n";
+	
+				for ($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
+					echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
+	
+				echo "</select>&nbsp;&nbsp;\n";
+				echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
+				echo "</td>\n</tr>\n";
+				echo "</table>\n";
+				echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
+				echo "</form>\n";
+				break;
+		} //CASE
+	
+	} else {
+		switch ($_POST["action"]) {
+	
+			case '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' :
+	
+				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;
+		}
+	}
+	*/
+}
+?>
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 3b8847de..da9d5666 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -21,7 +21,8 @@ function make_navigation() {
 
 	// Engel Navigation
 	$menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array (
-		"news"
+		"news",
+		"user_settings"
 	));
 
 	// Admin Navigation
diff --git a/includes/sys_template.php b/includes/sys_template.php
index 2c7f4f22..893d2d7e 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -22,4 +22,15 @@ function html_options($name, $options, $selected = "") {
 
 	return $html;
 }
+
+function html_select_key($name, $rows, $selected) {
+	$html = '<select name="' . $name . '">';
+	foreach ($rows as $key => $row)
+		if (($key == $selected) || ($row == $selected))
+			$html .= '<option value="' . $key . '" selected="selected">' . $row . '</option>';
+		else
+			$html .= '<option value="' . $key . '">' . $row . '</option>';
+	$html .= '</select>';
+	return $html;
+}
 ?>
\ No newline at end of file
diff --git a/templates/user_settings.html b/templates/user_settings.html
new file mode 100644
index 00000000..08790d33
--- /dev/null
+++ b/templates/user_settings.html
@@ -0,0 +1,106 @@
+%greeting%
+
+<hr width="100%">
+%text_user_data%
+<form action="%link%&action=setUserData" method="post">
+  <table>
+    <tr>
+      <td>%label_nick%</td>
+      <td><input type="text" name="nick" size="23" value="%nick%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_name%</td>
+      <td><input type="text" name="name" size="23" value="%name%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_prename%</td>
+      <td><input type="text" name="prename" size="23" value="%prename%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_age%</td>
+      <td><input type="text" name="age" size="3" value="%age%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_tel%</td>
+      <td><input type="text" name="tel" size="40" value="%tel%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_mobile%</td>
+      <td><input type="text" name="mobile" size="40" value="%mobile%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_dect%</td>
+      <td><input type="text" name="dect" size="4" value="%dect%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_mail%</td>
+      <td><input type="text" name="mail" size="40" value="%mail%"></td>
+    </tr>
+
+    <tr>
+      <td>ICQ</td>
+      <td><input type="text" name="icq" size="40" value="%icq%"></td>
+    </tr>
+
+    <tr>
+      <td>jabber</td>
+      <td><input type="text" name="jabber" size="40" value="%jabber%"></td>
+    </tr>
+
+    <tr>
+      <td>%label_hometown%</td>
+      <td><input type="text" name="hometown" size="40" value="%hometown%"></td>
+    </tr>
+%tshirts%
+  </table>
+  <input type="submit" value="%label_save%">
+</form>
+
+<hr />
+
+%text_password%
+<form action="%link%&action=set" method="post">
+  <table>
+    <tr><td>%current_pw_label%</td><td><input type="password" name="current_pw" size="20"></td></tr>
+    <tr><td>%new_pw_label%</td><td><input type="password" name="new_pw" size="20"></td></tr>
+    <tr><td>%new_pw2_label%</td><td><input type="password" name="new_pw2" size="20"></td></tr>
+  </table>
+  <input type="submit" value="%label_save%">
+</form>
+
+<hr />
+
+%text_theme%
+<form action="%link%&action=colour" method="post">
+  <table>
+     <tr>
+       <td>%theme_label%</td>
+       <td>
+       	%theme_select%
+       </td>
+     </tr>
+  </table>
+  <input type="submit" value="%label_save%">
+</form>
+
+<hr />
+
+%text_language%
+<form action="%link%&action=sprache" method="post">
+  <table>
+  <tr>
+    <td>%language_label%</td>
+    <td>
+    	%language_select%
+    </td>
+	</tr>
+  </table>
+  <input type="submit" value="%label_save%">
+</form>
diff --git a/templates/user_settings_tshirt.html b/templates/user_settings_tshirt.html
new file mode 100644
index 00000000..e147acae
--- /dev/null
+++ b/templates/user_settings_tshirt.html
@@ -0,0 +1,4 @@
+    <tr>
+      <td>%label_size%</td>
+      <td>%size_select%</td>
+    </tr>
\ No newline at end of file
diff --git a/txt/TODO b/txt/TODO
index 21ea5ecc..c6d32b39 100644
--- a/txt/TODO
+++ b/txt/TODO
@@ -1,3 +1,8 @@
+ * MD5-Passwörter mit Salt speichern
+ * Passwort-Mindestanforderungen stellen
+ * Avatare
+
+
 * schichten ueber monatsgrenzen einbaue im moment werden die tage nur 
   hochgezaehlt und die monatzgrenzen werden ignoriert
 * verify use of dect_clear.php and jabberserver.php
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 3a1a545f..5731fec0 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -101,10 +101,6 @@ table {
 	border-collapse: collapse;
 }
 
-tr:hover > td {
-	background: #f0f0f0;
-}
-
 th {
 	background: #f0f0f0;
 }
diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css
index 311097c7..fdaf9398 100644
--- a/www-ssl/css/style10.css
+++ b/www-ssl/css/style10.css
@@ -5,3 +5,7 @@
     margin: 10px auto;
     width: 523px;
 }
+
+tr:hover > td {
+	background: #f0f0f0;
+}
\ No newline at end of file
diff --git a/www-ssl/index.php b/www-ssl/index.php
index e8c900a5..6b2e267b 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -33,6 +33,10 @@ if (in_array($p, $privileges)) {
 		require_once ('includes/pages/user_news.php');
 		$content = user_news();
 	}
+	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();
diff --git a/www/404.php b/www/404.php
deleted file mode 100644
index dc19cd26..00000000
--- a/www/404.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  header("Location: https://" . $_SERVER['HTTP_HOST'] . $_SERVER['REDIRECT_URL']);
-?>
diff --git a/www/index.php b/www/index.php
deleted file mode 100644
index 9105555e..00000000
--- a/www/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-  header("Location: https://" . $_SERVER['HTTP_HOST'] . "/");
-?>
-- 
cgit v1.2.3-54-g00ecf


From c0b15dfe0dce7c4603cc7ec7c19b5a6cf226dc95 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Thu, 2 Jun 2011 21:38:19 +0200
Subject: user messages

---
 DB/db_rewrite.sql                   |  64 +++---
 includes/pages/user_messages.php    | 216 +++++++++++++++++++++
 includes/sys_menu.php               |   1 +
 templates/user_messages.html        |  50 +++++
 txt/TODO                            |   5 +-
 www-ssl/css/base.css                |  11 ++
 www-ssl/css/style6.css              |   2 +-
 www-ssl/index.php                   |  11 +-
 www-ssl/nonpublic/einstellungen.php | 376 ------------------------------------
 www-ssl/nonpublic/index.php         |  77 --------
 10 files changed, 331 insertions(+), 482 deletions(-)
 create mode 100644 includes/pages/user_messages.php
 create mode 100644 templates/user_messages.html
 delete mode 100644 www-ssl/nonpublic/einstellungen.php
 delete mode 100644 www-ssl/nonpublic/index.php

(limited to 'www-ssl/css/base.css')

diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql
index 71b968e7..d4811235 100644
--- a/DB/db_rewrite.sql
+++ b/DB/db_rewrite.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 02. Juni 2011 um 18:17
+-- Erstellungszeit: 02. Juni 2011 um 19:37
 -- Server Version: 5.1.44
 -- PHP-Version: 5.3.1
 
@@ -71,16 +71,17 @@ CREATE TABLE IF NOT EXISTS `Counter` (
 --
 
 INSERT INTO `Counter` (`URL`, `Anz`) VALUES
-('news', 44),
-('login', 12),
-('logout', 5),
-('start', 13),
+('news', 73),
+('login', 18),
+('logout', 11),
+('start', 23),
 ('faq', 4),
 ('credits', 3),
 ('register', 3),
 ('admin_rooms', 70),
-('admin_angel_types', 68),
-('user_settings', 109);
+('admin_angel_types', 69),
+('user_settings', 111),
+('user_messages', 102);
 
 -- --------------------------------------------------------
 
@@ -124,7 +125,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
   `privilege_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `group_id` (`group_id`,`privilege_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
 
 --
 -- Daten für Tabelle `GroupPrivileges`
@@ -138,7 +139,8 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
 (5, -1, 5),
 (6, -4, 6),
 (7, -4, 7),
-(8, -2, 8);
+(8, -2, 8),
+(9, -2, 9);
 
 -- --------------------------------------------------------
 
@@ -170,18 +172,28 @@ INSERT INTO `Groups` (`Name`, `UID`) VALUES
 --
 
 CREATE TABLE IF NOT EXISTS `Messages` (
-  `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `Datum` int(11) NOT NULL,
   `SUID` int(11) NOT NULL DEFAULT '0',
   `RUID` int(11) NOT NULL DEFAULT '0',
   `isRead` char(1) NOT NULL DEFAULT 'N',
   `Text` text NOT NULL,
-  PRIMARY KEY (`Datum`,`SUID`,`RUID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fuers interen Communikationssystem';
+  PRIMARY KEY (`id`),
+  KEY `Datum` (`Datum`),
+  KEY `SUID` (`SUID`),
+  KEY `RUID` (`RUID`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COMMENT='Fuers interen Communikationssystem' AUTO_INCREMENT=8 ;
 
 --
 -- Daten für Tabelle `Messages`
 --
 
+INSERT INTO `Messages` (`id`, `Datum`, `SUID`, `RUID`, `isRead`, `Text`) VALUES
+(2, 1307042342, 1, 147, 'Y', 'asdfasdfasdfasdf'),
+(4, 1307042622, 1, 147, 'Y', 'asdfasdfasdf'),
+(5, 1307042643, 1, 147, 'Y', 'foobar'),
+(6, 1307042663, 1, 147, 'Y', 'foobar'),
+(7, 1307042692, 147, 1, 'Y', 'foobar');
 
 -- --------------------------------------------------------
 
@@ -197,19 +209,16 @@ CREATE TABLE IF NOT EXISTS `News` (
   `UID` int(11) NOT NULL DEFAULT '0',
   `Treffen` tinyint(4) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ;
 
 --
 -- Daten für Tabelle `News`
 --
 
 INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES
-(3, '2011-06-02 01:32:31', '', '', 0, 0),
-(4, '2011-06-02 01:36:27', 'Darf ich News erstellen?', 'Darf ich.', 0, 0),
-(5, '2011-06-02 01:36:35', 'Darf ich News erstellen?', 'asdfasdfasdf', 1, 0),
-(6, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0),
-(7, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0),
-(8, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0);
+(1, '2011-06-02 21:35:27', '', '', 1, 0),
+(2, '2011-06-02 21:36:57', '', '', 1, 0),
+(3, '2011-06-02 21:36:57', '', '', 1, 0);
 
 -- --------------------------------------------------------
 
@@ -244,7 +253,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
   `desc` varchar(1024) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ;
 
 --
 -- Daten für Tabelle `Privileges`
@@ -258,7 +267,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (5, 'register', 'Einen neuen Engel registerieren'),
 (6, 'admin_rooms', 'Räume administrieren'),
 (7, 'admin_angel_types', 'Engel Typen administrieren'),
-(8, 'user_settings', 'User profile settings');
+(8, 'user_settings', 'User profile settings'),
+(9, 'user_messages', 'Writing and reading messages from user to user');
 
 -- --------------------------------------------------------
 
@@ -800,8 +810,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('pub_einstellungen_Hometown', 'EN', 'hometown'),
 ('makeuser_error_Alter', 'DE', 'Fehler: Dein Alter muss eine Zahl oder leer sein'),
 ('makeuser_error_Alter', 'EN', 'error: your age must be a number or empty'),
-('pub_menu_messages', 'DE', 'Nachrichten'),
-('pub_menu_messages', 'EN', 'messages'),
+('user_messages', 'DE', 'Nachrichten'),
+('user_messages', 'EN', 'Messages'),
 ('pub_messages_Datum', 'DE', 'Datum'),
 ('pub_messages_Datum', 'EN', 'date'),
 ('pub_messages_Von', 'DE', 'Gesendet'),
@@ -983,7 +993,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('login', 'DE', 'Login'),
 ('login', 'EN', 'Login'),
 ('credits', 'DE', 'Credits'),
-('credits', 'EN', 'Credits');
+('credits', 'EN', 'Credits'),
+('pub_messages_Neu', 'DE', 'Neu'),
+('pub_messages_Neu', 'EN', 'New');
 
 -- --------------------------------------------------------
 
@@ -1026,8 +1038,8 @@ CREATE TABLE IF NOT EXISTS `User` (
 --
 
 INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES
-(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307038600, '0000-00-00 00:00:00', '', '', ''),
-(147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1306971362, '2011-06-02 00:55:09', '', '', '');
+(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307043433, '0000-00-00 00:00:00', '', '', ''),
+(147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', '');
 
 -- --------------------------------------------------------
 
diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php
new file mode 100644
index 00000000..e3e9a469
--- /dev/null
+++ b/includes/pages/user_messages.php
@@ -0,0 +1,216 @@
+<?php
+function user_unread_messages() {
+	global $user;
+
+	$new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
+
+	if ($new_messages > 0)
+		return '<p class="notice"><a href="' . page_link_to("user_messages") . '">' . Get_Text("pub_messages_new1") . " " . $new_messages . " " . Get_Text("pub_messages_new2") . '</a></p><hr />';
+
+	return "";
+}
+
+function user_messages() {
+	global $user;
+
+	if (!isset ($_REQUEST['action'])) {
+		$users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" . sql_escape($user['UID']) . " ORDER BY `Nick`");
+		$to_select_data = array (
+			"" => "Select receiver..."
+		);
+		foreach ($users as $u)
+			$to_select_data[$u['UID']] = $u['Nick'];
+		$to_select = html_select_key('to', $to_select_data, '');
+
+		$messages_html = "";
+		$messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" . sql_escape($user['UID']) . " OR `RUID`=" . sql_escape($user['UID']) . " ORDER BY `isRead`,`Datum` DESC");
+		foreach ($messages as $message) {
+			$messages_html .= '<tr' . ($message['isRead'] == 'N' ? ' class="new_message"' : '') . '>';
+			$messages_html .= '<td>' . ($message['isRead'] == 'N' ? '•' : '') . '</td>';
+			$messages_html .= '<td>' . date("Y-m-d H:i", $message['Datum']) . '</td>';
+			$messages_html .= '<td>' . UID2Nick($message['SUID']) . '</td>';
+			$messages_html .= '<td>' . UID2Nick($message['RUID']) . '</td>';
+			$messages_html .= '<td>' . str_replace("\n", '<br />', $message['Text']) . '</td>';
+			$messages_html .= '<td>';
+			if ($message['RUID'] == $user['UID']) {
+				if ($message['isRead'] == 'N')
+					$messages_html .= '<a href="' . page_link_to("user_messages") . '&action=read&id=' . $message['id'] . '">' . Get_Text("pub_messages_MarkRead") . '</a>';
+			} else {
+				$messages_html .= '<a href="' . page_link_to("user_messages") . '&action=delete&id=' . $message['id'] . '">' . Get_Text("pub_messages_DelMsg") . '</a>';
+			}
+			$messages_html .= '</td></tr>';
+		}
+
+		return template_render('../templates/user_messages.html', array (
+			'link' => page_link_to("user_messages"),
+			'greeting' => Get_Text("Hello") . $user['Nick'] . ", <br />\n" . Get_Text("pub_messages_text1") . "<br /><br />\n",
+			'messages' => $messages_html,
+			'new_label' => Get_Text("pub_messages_Neu"),
+			'date_label' => Get_Text("pub_messages_Datum"),
+			'from_label' => Get_Text("pub_messages_Von"),
+			'to_label' => Get_Text("pub_messages_An"),
+			'text_label' => Get_Text("pub_messages_Text"),
+			'date' => date("Y-m-d H:i"),
+			'from' => $user['Nick'],
+			'to_select' => $to_select,
+			'submit_label' => Get_Text("save")
+		));
+	} else {
+		switch ($_REQUEST['action']) {
+			case "read" :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing Message ID.");
+
+				$message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
+				if (count($message) > 0 && $message[0]['RUID'] == $user['UID']) {
+					sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`=" . sql_escape($id) . " LIMIT 1");
+					header("Location: " . page_link_to("user_messages"));
+				} else
+					return error("No Message found.");
+				break;
+
+			case "delete" :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing Message ID.");
+
+				$message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
+				if (count($message) > 0 && $message[0]['SUID'] == $user['UID']) {
+					sql_query("DELETE FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
+					header("Location: " . page_link_to("user_messages"));
+				} else
+					return error("No Message found.");
+				break;
+
+			case "send" :
+				$text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text']));
+				$to = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['to']));
+				if ($text != "" && is_numeric($to) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($to) . " AND NOT `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0) {
+					sql_query("INSERT INTO `Messages` SET `Datum`=" . sql_escape(time()) . ", `SUID`=" . sql_escape($user['UID']) . ", `RUID`=" . sql_escape($to) . ", `Text`='" . sql_escape($text) . "'");
+					header("Location: " . page_link_to("user_messages"));
+				} else {
+					return error(Get_Text("pub_messages_Send_Error"));
+				}
+				break;
+		}
+		return "";
+	}
+
+	if (!isset ($_GET["action"]))
+		$_GET["action"] = "start";
+
+	switch ($_GET["action"]) {
+		case "start" :
+			echo Get_Text("Hello") . $_SESSION['Nick'] . ", <br />\n";
+			echo Get_Text("pub_messages_text1") . "<br /><br />\n";
+
+			//show exist Messages
+			$SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'";
+			$erg = mysql_query($SQL, $con);
+
+			echo "<table border=\"0\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+			echo "<tr>\n";
+			echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_Datum") . "</b></td>\n";
+			echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_Von") . "</b></td>\n";
+			echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_An") . "</b></td>\n";
+			echo "<td class=\"contenttopic\"><b>" . Get_Text("pub_messages_Text") . "</b></td>\n";
+			echo "<td class=\"contenttopic\"></td>\n";
+			echo "</tr>\n";
+
+			for ($i = 0; $i < mysql_num_rows($erg); $i++) {
+				echo "<tr class=\"content\">\n";
+				echo "<td>" . mysql_result($erg, $i, "Datum") . "</td>\n";
+				echo "<td>" . UID2Nick(mysql_result($erg, $i, "SUID")) . "</td>\n";
+				echo "<td>" . UID2Nick(mysql_result($erg, $i, "RUID")) . "</td>\n";
+				echo "<td>" . mysql_result($erg, $i, "Text") . "</td>\n";
+				echo "<td>";
+
+				if (mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) {
+					echo "<a href=\"?action=DelMsg&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_DelMsg") . "</a>";
+
+					if (mysql_result($erg, $i, "isRead") == "N")
+						echo "<a href=\"?action=MarkRead&Datum=" . mysql_result($erg, $i, "Datum") . "\">" . Get_Text("pub_messages_MarkRead") . "</a>";
+				} else {
+					if (mysql_result($erg, $i, "isRead") == "N")
+						echo Get_Text("pub_messages_NotRead");
+				}
+
+				echo "</td>\n";
+				echo "</tr>\n";
+			}
+
+			// send Messeges
+			echo "<form action=\"" . $_SERVER['SCRIPT_NAME'] . "?action=SendMsg\" method=\"POST\">";
+			echo "<tr class=\"content\">\n";
+			echo "<td></td>\n";
+			echo "<td></td>\n";
+
+			// Listet alle Nicks auf
+			echo "<td><select name=\"RUID\">\n";
+
+			$usql = "SELECT * FROM `User` WHERE (`UID`!='" . $_SESSION["UID"] . "') ORDER BY `Nick`";
+			$uErg = mysql_query($usql, $con);
+			$urowcount = mysql_num_rows($uErg);
+
+			for ($k = 0; $k < $urowcount; $k++) {
+				echo "<option value=\"" . mysql_result($uErg, $k, "UID") . "\">" . mysql_result($uErg, $k, "Nick") . "</option>\n";
+			}
+
+			echo "</select></td>\n";
+			echo "<td><textarea name=\"Text\"  cols=\"30\" rows=\"10\"></textarea></td>\n";
+			echo "<td><input type=\"submit\" value=\"" . Get_Text("save") . "\"></td>\n";
+			echo "</tr>\n";
+			echo "</form>";
+
+			echo "</table>\n";
+			break;
+
+		case "SendMsg" :
+			echo Get_Text("pub_messages_Send1") . "...<br />\n";
+
+			$SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (" .
+			"'" . gmdate("Y-m-j H:i:s", time()) . "', " .
+			"'" . $_SESSION["UID"] . "', " .
+			"'" . $_POST["RUID"] . "', " .
+			"'" . $_POST["Text"] . "');";
+
+			$Erg = mysql_query($SQL, $con);
+
+			if ($Erg == 1)
+				echo Get_Text("pub_messages_Send_OK") . "\n";
+			else
+				echo Get_Text("pub_messages_Send_Error") . "...\n(" . mysql_error($con) . ")";
+			break;
+
+		case "MarkRead" :
+			$SQL = "UPDATE `Messages` SET `isRead` = 'Y' " .
+			"WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID`='" . $_SESSION["UID"] . "' " .
+			"LIMIT 1 ;";
+			$Erg = mysql_query($SQL, $con);
+
+			if ($Erg == 1)
+				echo Get_Text("pub_messages_MarkRead_OK") . "\n";
+			else
+				echo Get_Text("pub_messages_MarkRead_KO") . "...\n(" . mysql_error($con) . ")";
+			break;
+
+		case "DelMsg" :
+			$SQL = "DELETE FROM `Messages` " .
+			"WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID` ='" . $_SESSION["UID"] . "' " .
+			"LIMIT 1;";
+			$Erg = mysql_query($SQL, $con);
+
+			if ($Erg == 1)
+				echo Get_Text("pub_messages_DelMsg_OK") . "\n";
+			else
+				echo Get_Text("pub_messages_DelMsg_KO") . "...\n(" . mysql_error($con) . ")";
+			break;
+
+		default :
+			echo Get_Text("pub_messages_NoCommand");
+	}
+}
+?>
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index da9d5666..822d558f 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -22,6 +22,7 @@ function make_navigation() {
 	// Engel Navigation
 	$menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array (
 		"news",
+		"user_messages",
 		"user_settings"
 	));
 
diff --git a/templates/user_messages.html b/templates/user_messages.html
new file mode 100644
index 00000000..b7bb26fb
--- /dev/null
+++ b/templates/user_messages.html
@@ -0,0 +1,50 @@
+%greeting%
+<form action="%link%&action=send" method="post">
+    <table>
+        <thead>
+            <tr>
+                <th>
+                    %new_label%
+                </th>
+                <th>
+                    %date_label%
+                </th>
+                <th>
+                    %from_label%
+                </th>
+                <th>
+                    %to_label%
+                </th>
+                <th>
+                    %text_label%
+                </th>
+                <th>
+                    &nbsp;
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            %messages%
+            <tr>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    %date%
+                </td>
+                <td>
+                    %from%
+                </td>
+                <td>
+                    %to_select%
+                </td>
+                <td>
+                    <textarea name="text"></textarea>
+                </td>
+                <td>
+                    <input type="submit" name="submit" value="%submit_label%" />
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</form>
\ No newline at end of file
diff --git a/txt/TODO b/txt/TODO
index c6d32b39..fbaf4377 100644
--- a/txt/TODO
+++ b/txt/TODO
@@ -1,6 +1,9 @@
  * MD5-Passwörter mit Salt speichern
  * Passwort-Mindestanforderungen stellen
- * Avatare
+ * User-Avatare
+ * user_messages schön machen
+ * Formulare weg von Tabellen
+ * user_news lässt sich nicht bedienen (POST ohne redirects...)
 
 
 * schichten ueber monatsgrenzen einbaue im moment werden die tage nur 
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 5731fec0..bfe050a5 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -128,3 +128,14 @@ td, th {
 .success {
 	color: #090;
 }
+
+.notice {
+	background: #f0f0f0;
+	border: 2px solid #888;
+	margin: 10px;
+	padding: 10px;
+}
+
+.new_message {
+	font-weight: bold;
+}
diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css
index 2272f598..8dc008e7 100644
--- a/www-ssl/css/style6.css
+++ b/www-ssl/css/style6.css
@@ -71,6 +71,6 @@ h4.menu {
 	font-size : 6pt;
 }
 
-h4, h1 {
+h4, h1, th {
 	background: #333E47;
 }
diff --git a/www-ssl/index.php b/www-ssl/index.php
index 6b2e267b..48aea75c 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -13,6 +13,8 @@ require_once ('includes/sys_user.php');
 require_once ('config/config.php');
 require_once ('config/config_db.php');
 
+require_once ('includes/pages/user_messages.php');
+
 session_start();
 
 sql_connect($config['host'], $config['user'], $config['pw'], $config['db']);
@@ -20,7 +22,7 @@ sql_connect($config['host'], $config['user'], $config['pw'], $config['db']);
 load_auth();
 
 // Gewünschte Seite/Funktion
-$p = "start";
+$p = isset ($user) ? "news" : "start";
 if (isset ($_REQUEST['p']))
 	$p = $_REQUEST['p'];
 
@@ -33,6 +35,9 @@ if (in_array($p, $privileges)) {
 		require_once ('includes/pages/user_news.php');
 		$content = user_news();
 	}
+	elseif ($p == "user_messages") {
+		$content = user_messages();
+	}
 	elseif ($p == "user_settings") {
 		require_once ('includes/pages/user_settings.php');
 		$content = user_settings();
@@ -79,6 +84,10 @@ elseif ($p == "faq") {
 	}
 }
 
+// Hinweis für ungelesene Nachrichten
+if (isset ($user) && $p != "user_messages")
+	$content = user_unread_messages() . $content;
+
 echo template_render('../templates/layout.html', array (
 	'theme' => isset ($user) ? $user['color'] : $default_theme,
 	'title' => $title,
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
deleted file mode 100644
index 713425bb..00000000
--- a/www-ssl/nonpublic/einstellungen.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-require_once ('../bootstrap.php');
-
-$title = "Himmel";
-$header = "Deine pers&ouml;nlichen Einstellungen";
-include "includes/header.php";
-include "includes/crypt.php";
-
-if (!isset ($_POST["action"])) {
-	echo Get_Text("Hallo") . $_SESSION['Nick'] . ",<br />\n\n";
-	Print_Text(13);
-?>
-<hr width="100%">
-<?php Print_Text("pub_einstellungen_Text_UserData"); ?>
-<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>
-           <option <?php if($_SESSION['color'] == 10) { echo "selected"; } ?> value="10">msquare (cccamp2011)</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 "<input type=\"hidden\" name=\"action\" value=\"sendPicture\">\n";
-		echo "<input name=\"file\" type=\"file\" size=\"50\" maxlength=\"" . get_cfg_var("post_max_size") . "\">\n";
-		echo "(max " . get_cfg_var("post_max_size") . "Byte)<br />\n";
-		echo "<input type=\"submit\" value=\"" . Get_Text("upload"), "\">\n";
-		echo "</form>\n";
-	}
-
-	switch (GetPicturShow($_SESSION['UID'])) {
-		case 'Y' :
-			echo Get_Text('pub_einstellungen_PictureShow') . "<br />";
-			echo displayPictur($_SESSION['UID'], 0);
-			echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-			echo "<input type=\"submit\" value=\"" . Get_Text("delete"), "\">\n";
-			echo "</form>\n";
-			break;
-		case 'N' :
-			echo Get_Text('pub_einstellungen_PictureNoShow') . "<br />";
-			echo displayPictur($_SESSION['UID'], 0);
-			echo "<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"delPicture\">\n";
-			echo "<input type=\"submit\" value=\"" . Get_Text("delete"), "\">\n";
-			echo "</form>\n";
-			echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-		case '' :
-			echo "<br />\n<hr width=\"100%\">\n<br />\n\n";
-			echo Get_Text(22) . "<br />";
-			echo "\n<form action=\"./einstellungen.php\" method=\"post\">\n";
-			echo "<input type=\"hidden\" name=\"action\" value=\"avatar\">\n";
-			echo "<table>\n";
-			echo "<tr>\n<td>" . Get_Text(23) . "<br /></td>\n</tr>\n";
-			echo "<tr>\n";
-			echo "<td>\n";
-			echo "<select name=\"eAvatar\" onChange=\"document.avatar.src = '" . $url . $ENGEL_ROOT . "pic/avatar/avatar' + this.value  + '.gif'\" onKeyup=\"document.avatar.src = '" . $url . $ENGEL_ROOT . "pic/avatar/avatar' + this.value  + '.gif'\">\n";
-
-			for ($i = 1; file_exists("../pic/avatar/avatar" . $i . ".gif"); $i++)
-				echo "<option value=\"" . $i . "\"" . ($_SESSION['Avatar'] == $i ? " selected" : "") . ">avatar" . $i . "</option>\n";
-
-			echo "</select>&nbsp;&nbsp;\n";
-			echo "<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . $_SESSION['Avatar'] . ".gif\" name=\"avatar\" border=\"0\" align=\"top\">\n";
-			echo "</td>\n</tr>\n";
-			echo "</table>\n";
-			echo "<input type=\"submit\" value=\"" . Get_Text("save") . "\">\n";
-			echo "</form>\n";
-			break;
-	} //CASE
-
-} else {
-	switch ($_POST["action"]) {
-		case 'set' :
-			if ($_POST["new1"] == $_POST["new2"]) {
-				Print_Text(25);
-				$sql = "SELECT * FROM `User` WHERE `UID`='" . $_SESSION['UID'] . "'";
-				$Erg = mysql_query($sql, $con);
-
-				if (PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) {
-					Print_Text(26);
-					Print_Text(27);
-					$usql = "UPDATE `User` SET `Passwort`='" . PassCrypt($_POST["new1"]) . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-					$Erg = mysql_query($usql, $con);
-
-					if ($Erg == 1) {
-						Print_Text(28);
-					} else {
-						Print_Text(29);
-					}
-				} else {
-					Print_Text(30);
-				}
-			} else {
-				Print_Text(31);
-			}
-			break;
-
-		case 'colour' :
-
-			$chsql = "UPDATE `User` SET " .
-			"`color`= '" . $_POST["colourid"] . "', " .
-			"`Menu`= '" . $_POST["eMenu"] . "' " .
-			"WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-			$Erg = mysql_query($chsql, $con);
-			echo mysql_error($con);
-			$_SESSION['color'] = $_POST["colourid"];
-			$_SESSION['Menu'] = $_POST["eMenu"];
-			if ($Erg == 1) {
-				Print_Text(32);
-			} else {
-				Print_Text(29);
-			}
-			break;
-
-		case 'sprache' :
-
-			$chsql = "UPDATE `User` SET `Sprache` = '" . $_POST["language"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-			$Erg = mysql_query($chsql, $con);
-			$_SESSION['Sprache'] = $_POST["language"];
-			if ($Erg == 1) {
-				Print_Text(33);
-			} else {
-				Print_Text(29);
-			}
-			break;
-
-		case 'avatar' :
-			$chsql = "UPDATE `User` SET `Avatar`='" . $_POST["eAvatar"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-			$Erg = mysql_query($chsql, $con);
-			$_SESSION['Avatar'] = $_POST["eAvatar"];
-			if ($Erg == 1)
-				Print_Text(34);
-			else
-				Print_Text(29);
-			break;
-
-		case 'setUserData' :
-			if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
-				$chsql = "UPDATE `User` SET " .
-				"`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " .
-				"`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " .
-				"`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " .
-				"`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " .
-				"`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " .
-				"`Hometown`='" . $_POST["Hometown"] . "', `Size`='" . $_POST["Sizeid"] . "' " .
-				"WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;";
-			} else {
-				$chsql = "UPDATE `User` SET " .
-				"`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " .
-				"`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " .
-				"`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " .
-				"`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " .
-				"`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " .
-				"`Hometown`='" . $_POST["Hometown"] . "' " .
-				"WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;";
-			}
-			$Erg = mysql_query($chsql, $con);
-
-			if ($Erg == 1) {
-				$_SESSION['Nick'] = $_POST["eNick"];
-				$_SESSION['Name'] = $_POST["eName"];
-				$_SESSION['Vorname'] = $_POST["eVorname"];
-				$_SESSION['Alter'] = $_POST["eAlter"];
-				$_SESSION['Telefon'] = $_POST["eTelefon"];
-				$_SESSION['Handy'] = $_POST["eHandy"];
-				$_SESSION['DECT'] = $_POST["eDECT"];
-				$_SESSION['email'] = $_POST["eemail"];
-				$_SESSION['ICQ'] = $_POST["eICQ"];
-				$_SESSION['jabber'] = $_POST["ejabber"];
-				$_SESSION['Hometown'] = $_POST["Hometown"];
-				if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") {
-					$_SESSION['Size'] = $_POST["Sizeid"];
-				} else
-					if ($_SESSION['Size'] != $_POST["Sizeid"]) {
-						array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n");
-					}
-
-				Print_Text("pub_einstellungen_UserDateSaved");
-			} else {
-				Print_Text(29);
-				echo mysql_error($con);
-			}
-			break;
-
-		case 'sendPicture' :
-			if ($_FILES["file"]["size"] > 0) {
-				if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) {
-					$data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"])));
-
-					if (GetPicturShow($_SESSION['UID']) == "")
-						$SQL = "INSERT INTO `UserPicture` " .
-						"( `UID`,`Bild`, `ContentType`, `show`) " .
-						"VALUES ('" . $_SESSION['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')";
-					else
-						$SQL = "UPDATE `UserPicture` SET " .
-						"`Bild`='$data', " .
-						"`ContentType`='" . $_FILES["file"]["type"] . "', " .
-						"`show`='N' " .
-						"WHERE `UID`='" . $_SESSION['UID'] . "'";
-
-					$res = mysql_query($SQL, $con);
-					if ($res)
-						Print_Text("pub_einstellungen_send_OK");
-					else
-						Print_Text("pub_einstellungen_send_KO");
-
-					echo "<h6>('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"] . ", " . $_FILES["file"]["size"] . " Byte)</h6>";
-				} else
-					Print_Text("pub_einstellungen_send_KO");
-			} else
-				Print_Text("pub_einstellungen_send_KO");
-			break;
-
-		case 'delPicture' :
-			$chsql = "DELETE FROM `UserPicture` WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1";
-			$Erg = mysql_query($chsql, $con);
-			if ($Erg == 1)
-				Print_Text("pub_einstellungen_del_OK");
-			else
-				Print_Text("pub_einstellungen_del_KO");
-			Break;
-	}
-}
-include ("includes/footer.php");
-?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
deleted file mode 100644
index b53f8088..00000000
--- a/www-ssl/nonpublic/index.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?PHP
-include ('../bootstrap.php');
-
-$title = "Index";
-$header = "Index";
-
-include ("config/config_db.php");
-include ("includes/crypt.php");
-
-session_start(); // alte Session - falls vorhanden - wiederherstellen...
-
-function LoginOK() {
-	include ("config/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");
-?>
-
-
-- 
cgit v1.2.3-54-g00ecf


From 626b9a81f303a07fab5be1302496d8823d1fede4 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Fri, 3 Jun 2011 01:03:39 +0200
Subject: admin faq

---
 DB/db_rewrite.sql                  |  65 +++++----
 includes/pages/admin_faq.php       |  85 ++++++++++++
 includes/pages/guest_faq.php       |  32 ++---
 includes/sys_menu.php              |   3 +-
 templates/admin_faq.html           |  56 ++++++++
 templates/admin_faq_edit_form.html |  41 ++++++
 txt/TODO                           |   1 +
 www-ssl/admin/faq.1.php            |   6 -
 www-ssl/admin/faq.php              | 271 -------------------------------------
 www-ssl/css/base.css               |   5 +
 www-ssl/index.php                  |   4 +
 www-ssl/nonpublic/faq.php          |  73 ----------
 12 files changed, 240 insertions(+), 402 deletions(-)
 create mode 100644 includes/pages/admin_faq.php
 create mode 100644 templates/admin_faq.html
 create mode 100644 templates/admin_faq_edit_form.html
 delete mode 100644 www-ssl/admin/faq.1.php
 delete mode 100644 www-ssl/admin/faq.php
 delete mode 100644 www-ssl/nonpublic/faq.php

(limited to 'www-ssl/css/base.css')

diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql
index 5d6b4e2c..fa31c6f8 100644
--- a/DB/db_rewrite.sql
+++ b/DB/db_rewrite.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 02. Juni 2011 um 22:21
+-- Erstellungszeit: 02. Juni 2011 um 23:02
 -- Server Version: 5.1.44
 -- PHP-Version: 5.3.1
 
@@ -75,16 +75,17 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES
 ('login', 24),
 ('logout', 13),
 ('start', 25),
-('faq', 6),
+('faq', 16),
 ('credits', 3),
 ('register', 3),
 ('admin_rooms', 70),
 ('admin_angel_types', 69),
 ('user_settings', 116),
-('user_messages', 108),
-('admin_groups', 99),
-('user_questions', 53),
-('admin_questions', 41);
+('user_messages', 111),
+('admin_groups', 104),
+('user_questions', 54),
+('admin_questions', 41),
+('admin_faq', 53);
 
 -- --------------------------------------------------------
 
@@ -94,27 +95,29 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES
 
 CREATE TABLE IF NOT EXISTS `FAQ` (
   `FID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `Frage` text NOT NULL,
-  `Antwort` text NOT NULL,
+  `Frage_de` text NOT NULL,
+  `Antwort_de` text NOT NULL,
+  `Frage_en` text NOT NULL,
+  `Antwort_en` text NOT NULL,
   PRIMARY KEY (`FID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=24 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=26 ;
 
 --
 -- Daten für Tabelle `FAQ`
 --
 
-INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES
-(1, 'Komme ich als Engel billiger/kostenlos auf den Congress?<br />\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.<br />\r\nNo, every angel has to pay full price.'),
-(2, 'Was bekomme ich f&uuml;r meine Mitarbeit?<br />\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung <br />\r\nEvery working angel gets a free shirt after the event. '),
-(3, 'Wie lange muss ich als Engel arbeiten?<br />\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es h&auml;ngt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen. <br />\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '),
-(6, 'Ich bin erst XX Jahre alt. Kann ich &uuml;berhaupt helfen?<br />\r\nI''m only XX years old. Can I help anyway?', 'Wir k&ouml;nnen jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen. <br />\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'),
-(8, 'Wer sind eigentlich die Erzengel?<br />\r\nWho <b>are</b> the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty<br /> \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'),
-(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?<br />\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!<br />\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'),
-(10, 'Wie gehe ich mit den Besuchern um? <br />\r\nHow do I treat visitors?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)  <br />\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
-(11, 'Wann sind die Engelbesprechungen? <br />\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.<br />\r\nThe information on the Angel Briefings will be in the news section of this system.'),
-(12, 'Was muss ich noch bedenken?<br />\r\nAnything else I should know?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.<br />\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
-(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden? <br />\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.<br />\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'),
-(20, 'Wer muss alles Eintritt zahlen?<br />\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...<br />\r\nEveryone who is at older than 12 years old.');
+INSERT INTO `FAQ` (`FID`, `Frage_de`, `Antwort_de`, `Frage_en`, `Antwort_en`) VALUES
+(1, 'Komme ich als Engel billiger/kostenlos auf den Congress?', 'Nein, jeder Engel muss normal Eintritt bezahlen.', 'Do I get in cheaper / for free to the congress as an angel ?', 'No, every angel has to pay full price.'),
+(2, 'Was bekomme ich f&uuml;r meine Mitarbeit?', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung', 'What can i expect in return for my help?', 'Every working angel gets a free shirt after the event.'),
+(3, 'Wie lange muss ich als Engel arbeiten?', 'Diese Frage ist schwer zu beantworten. Es h&auml;ngt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen.', 'How long do I have to work as an angel ?', 'This is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend.'),
+(6, 'Ich bin erst XX Jahre alt. Kann ich &uuml;berhaupt helfen?', 'Wir k&ouml;nnen jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.', 'I''m only XX years old. Can I help anyway?', 'We need every help we can get. If your old enough to come to the congress, your old enough to help.'),
+(8, 'Wer sind eigentlich die Erzengel?', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty', 'Who <b>are</b> the Arch-Angels?', 'The ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty'),
+(9, 'Gibt es dieses Jahr wieder einen IRC-Channel f&uuml;r Engel?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!', 'Will there be an IRC-channel for angels again?', 'Yes, in the IRC-net there''s #chaos-angel. Just have a look!'),
+(10, 'Wie gehe ich mit den Besuchern um?', 'Man soll gegen&uuml;ber den Besuchern immer h&ouml;flich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gef&uuml;hl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterst&uuml;tzung holen, bevor man selbst auch gestresst wird :-)', 'How do I treat visitors?', 'You should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'),
+(11, 'Wann sind die Engelbesprechungen?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.', 'When are the angels briefings?', 'The information on the Angel Briefings will be in the news section of this system.'),
+(12, 'Was muss ich noch bedenken?', 'Man sollte nicht total &uuml;berm&uuml;det oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.', 'Anything else I should know?', 'You should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'),
+(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.', 'I have a guestion not answered here. Who can I ask?', 'If you have further questions, you can use the Questions for the ArchAngels form.'),
+(20, 'Wer muss alles Eintritt zahlen?', 'Jeder. Zumindest, solange er/sie &auml;lter als 12 Jahre ist...', 'Who has to pay the full entrance price?', 'Everyone who is at older than 12 years old.');
 
 -- --------------------------------------------------------
 
@@ -128,7 +131,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
   `privilege_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `group_id` (`group_id`,`privilege_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=36 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=40 ;
 
 --
 -- Daten für Tabelle `GroupPrivileges`
@@ -140,12 +143,13 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
 (31, -2, 11),
 (30, -2, 9),
 (23, -1, 2),
-(34, -4, 12),
-(33, -4, 7),
+(36, -4, 7),
+(37, -4, 13),
 (29, -2, 3),
 (28, -2, 4),
 (12, -5, 10),
-(35, -4, 6);
+(38, -4, 12),
+(39, -4, 6);
 
 -- --------------------------------------------------------
 
@@ -256,7 +260,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
   `desc` varchar(1024) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=13 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=14 ;
 
 --
 -- Daten für Tabelle `Privileges`
@@ -274,7 +278,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (9, 'user_messages', 'Writing and reading messages from user to user'),
 (10, 'admin_groups', 'Manage usergroups and their rights'),
 (11, 'user_questions', 'Let users ask questions'),
-(12, 'admin_questions', 'Answer user''s questions');
+(12, 'admin_questions', 'Answer user''s questions'),
+(13, 'admin_faq', 'Edit FAQs');
 
 -- --------------------------------------------------------
 
@@ -1009,7 +1014,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('user_questions', 'DE', 'Erzengel fragen'),
 ('user_questions', 'EN', 'Ask arch angel'),
 ('admin_questions', 'DE', 'Fragen beantworten'),
-('admin_questions', 'EN', 'Answer questions');
+('admin_questions', 'EN', 'Answer questions'),
+('admin_faq', 'DE', 'FAQs bearbeiten'),
+('admin_faq', 'EN', 'Edit FAQs');
 
 -- --------------------------------------------------------
 
@@ -1052,7 +1059,7 @@ CREATE TABLE IF NOT EXISTS `User` (
 --
 
 INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES
-(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307053257, '0000-00-00 00:00:00', '', '', ''),
+(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307055685, '0000-00-00 00:00:00', '', '', ''),
 (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', '');
 
 -- --------------------------------------------------------
diff --git a/includes/pages/admin_faq.php b/includes/pages/admin_faq.php
new file mode 100644
index 00000000..5b9a338f
--- /dev/null
+++ b/includes/pages/admin_faq.php
@@ -0,0 +1,85 @@
+<?php
+function admin_faq() {
+	if (!isset ($_REQUEST['action'])) {
+		$faqs_html = "";
+		$faqs = sql_select("SELECT * FROM `FAQ`");
+		foreach ($faqs as $faq) {
+			$faqs_html .= '<tr><td><dl><dt>' . $faq['Frage_de'] . '</dt><dd>' . $faq['Antwort_de'] . '</dd></dl></td><td><dl><dt>' . $faq['Frage_en'] . '</dt><dd>' . $faq['Antwort_en'] . '</dd></dl></td>';
+			$faqs_html .= '<td><a href="' . page_link_to("admin_faq") . '&action=edit&id=' . $faq['FID'] . '">Edit</a></td></tr>';
+		}
+		return template_render('../templates/admin_faq.html', array (
+			'link' => page_link_to("admin_faq"),
+			'faqs' => $faqs_html
+		));
+	} else {
+		switch ($_REQUEST['action']) {
+			case 'create' :
+				$frage = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['frage']));
+				$antwort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['antwort']));
+				$question = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['question']));
+				$answer = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['answer']));
+				sql_query("INSERT INTO `FAQ` SET `Frage_de`='" . sql_escape($frage) . "', `Frage_en`='" . sql_escape($question) . "', `Antwort_de`='" . sql_escape($antwort) . "', `Antwort_en`='" . sql_escape($answer) . "'");
+				header("Location: " . page_link_to("admin_faq"));
+				break;
+
+			case 'save' :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing FAQ ID.");
+
+				$faq = sql_select("SELECT * FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
+				if (count($faq) > 0) {
+					list ($faq) = $faq;
+
+					$frage = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['frage']));
+					$antwort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['antwort']));
+					$question = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['question']));
+					$answer = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['answer']));
+					sql_query("UPDATE `FAQ` SET `Frage_de`='" . sql_escape($frage) . "', `Frage_en`='" . sql_escape($question) . "', `Antwort_de`='" . sql_escape($antwort) . "', `Antwort_en`='" . sql_escape($answer) . "' WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
+					header("Location: " . page_link_to("admin_faq"));
+				} else
+					return error("No FAQ found.");
+				break;
+
+			case 'edit' :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing FAQ ID.");
+
+				$faq = sql_select("SELECT * FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
+				if (count($faq) > 0) {
+					list ($faq) = $faq;
+
+					return template_render('../templates/admin_faq_edit_form.html', array (
+						'link' => page_link_to("admin_faq"),
+						'id' => $id,
+						'frage' => $faq['Frage_de'],
+						'antwort' => $faq['Antwort_de'],
+						'question' => $faq['Frage_en'],
+						'answer' => $faq['Antwort_en']
+					));
+				} else
+					return error("No FAQ found.");
+				break;
+
+			case 'delete' :
+				if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
+					$id = $_REQUEST['id'];
+				else
+					return error("Incomplete call, missing FAQ ID.");
+
+				$faq = sql_select("SELECT * FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
+				if (count($faq) > 0) {
+					list ($faq) = $faq;
+
+					sql_query("DELETE FROM `FAQ` WHERE `FID`=" . sql_escape($id) . " LIMIT 1");
+					header("Location: " . page_link_to("admin_faq"));
+				} else
+					return error("No FAQ found.");
+				break;
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/includes/pages/guest_faq.php b/includes/pages/guest_faq.php
index 48e75d16..c4bcd0bb 100644
--- a/includes/pages/guest_faq.php
+++ b/includes/pages/guest_faq.php
@@ -2,29 +2,17 @@
 function guest_faq() {
 	$html = "";
 	$faqs = sql_select("SELECT * FROM `FAQ`");
-	foreach ($faqs as $faq)
-		if ($faq['Antwort'] != "") {
-			list ($frage_de, $frage_en) = explode('<br />', $faq['Frage']);
-			list ($antwort_de, $antwort_en) = explode('<br />', $faq['Antwort']);
-			$html .= "<dl>";
-			if ($_SESSION['Sprache'] == "DE") {
-				$html .= "<dt>" . $frage_de . "</dt>";
-				$html .= "<dd>" . $antwort_de . "</dd>";
-			} else {
-				$html .= "<dt>" . $frage_en . "</dt>";
-				$html .= "<dd>" . $antwort_en . "</dd>";
-			}
-			$html .= "</dl>";
+	foreach ($faqs as $faq) {
+		$html .= "<dl>";
+		if ($_SESSION['Sprache'] == "DE") {
+			$html .= "<dt>" . $faq['Frage_de'] . "</dt>";
+			$html .= "<dd>" . $faq['Antwort_de'] . "</dd>";
+		} else {
+			$html .= "<dt>" . $faq['Frage_en'] . "</dt>";
+			$html .= "<dd>" . $faq['Antwort_en'] . "</dd>";
 		}
+		$html .= "</dl>";
+	}
 	return $html;
 }
-
-function noAnswer() {
-	global $con;
-
-	$SQL = "SELECT UID FROM Questions WHERE `AID`='0'";
-	$Res = mysql_query($SQL, $con);
-
-	return mysql_num_rows($Res);
-}
 ?>
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index c3dfa041..ca34ee6c 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -32,7 +32,8 @@ function make_navigation() {
 		"admin_questions",
 		"admin_angel_types",
 		"admin_rooms",
-		"admin_groups"
+		"admin_groups",
+		"admin_faq"
 	));
 	return $menu;
 }
diff --git a/templates/admin_faq.html b/templates/admin_faq.html
new file mode 100644
index 00000000..5dacf522
--- /dev/null
+++ b/templates/admin_faq.html
@@ -0,0 +1,56 @@
+<table>
+    <thead>
+        <tr>
+            <th>
+                Deutsch
+            </th>
+            <th>
+                English
+            </th>
+            <th>
+                &nbsp;
+            </th>
+        </tr>
+    </thead>
+    <tbody>
+        %faqs%
+    </tbody>
+</table>
+<hr/>Create new FAQ:
+<form action="%link%&action=create" method="post">
+    <table>
+        <tr>
+            <td>
+                Frage
+            </td>
+            <td>
+                <textarea name="frage"></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Antwort
+            </td>
+            <td>
+                <textarea name="antwort"></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Question
+            </td>
+            <td>
+                <textarea name="question"></textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Answer
+            </td>
+            <td>
+                <textarea name="answer"></textarea>
+            </td>
+        </tr>
+    </table>
+    <input type="submit" name="submit" value="Create" />
+</form>
\ No newline at end of file
diff --git a/templates/admin_faq_edit_form.html b/templates/admin_faq_edit_form.html
new file mode 100644
index 00000000..1ef791aa
--- /dev/null
+++ b/templates/admin_faq_edit_form.html
@@ -0,0 +1,41 @@
+Edit FAQ:
+<form action="%link%&action=save" method="post">
+    <table>
+        <tr>
+            <td>
+                Frage
+            </td>
+            <td>
+                <textarea name="frage">%frage%</textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Antwort
+            </td>
+            <td>
+                <textarea name="antwort">%antwort%</textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Question
+            </td>
+            <td>
+                <textarea name="question">%question%</textarea>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Answer
+            </td>
+            <td>
+                <textarea name="answer">%answer%</textarea>
+            </td>
+        </tr>
+    </table>
+    <input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Save" />
+</form><hr/>
+<form action="%link%&action=delete" method="post">
+    Delete FAQ: <input type="hidden" name="id" value="%id%" /><input type="submit" name="submit" value="Delete" />
+</form>
\ No newline at end of file
diff --git a/txt/TODO b/txt/TODO
index 14188a6f..5609482b 100644
--- a/txt/TODO
+++ b/txt/TODO
@@ -7,6 +7,7 @@
  * Privilegien korrigieren (an die vom CVS anpassen)
  * Beim Raum-Management die benötigten Engel anzeigen
  * Löschen nur mit Rückfrage
+ * FAQ ordentlich mehrsprachig machen
 
 * schichten ueber monatsgrenzen einbaue im moment werden die tage nur 
   hochgezaehlt und die monatzgrenzen werden ignoriert
diff --git a/www-ssl/admin/faq.1.php b/www-ssl/admin/faq.1.php
deleted file mode 100644
index 04dda6aa..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 100644
index 779d8822..00000000
--- a/www-ssl/admin/faq.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-require_once ('../bootstrap.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/css/base.css b/www-ssl/css/base.css
index bfe050a5..44e1959c 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -109,6 +109,11 @@ td, th {
 	border: 1px solid #888;
 }
 
+textarea {
+	height: 200px;
+	width: 300px;
+}
+
 .background {
     background: #f0f0f0;
 }
diff --git a/www-ssl/index.php b/www-ssl/index.php
index d722de32..8ad025aa 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -73,6 +73,10 @@ if (in_array($p, $privileges)) {
 	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();
 	} else {
 		require_once ('includes/pages/guest_start.php');
 		$content = guest_start();
diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php
deleted file mode 100644
index fcc17158..00000000
--- a/www-ssl/nonpublic/faq.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-require_once ('../bootstrap.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");
-?>
-- 
cgit v1.2.3-54-g00ecf


From 91f6e7bbaf7c9ed8820fea59e041c8fa17bcea91 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Fri, 3 Jun 2011 05:12:50 +0200
Subject: news refined

---
 DB/db_rewrite.sql            |  76 ++++++++++-------
 includes/pages/user_news.php | 197 +++++++++++++++++++++++++------------------
 includes/sys_user.php        |   6 +-
 txt/TODO                     |   2 +-
 www-ssl/css/base.css         |  73 ++++++++++++----
 www-ssl/index.php            |   4 +
 6 files changed, 224 insertions(+), 134 deletions(-)

(limited to 'www-ssl/css/base.css')

diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql
index fa31c6f8..b85f04c9 100644
--- a/DB/db_rewrite.sql
+++ b/DB/db_rewrite.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 02. Juni 2011 um 23:02
+-- Erstellungszeit: 03. Juni 2011 um 03:12
 -- Server Version: 5.1.44
 -- PHP-Version: 5.3.1
 
@@ -71,21 +71,23 @@ CREATE TABLE IF NOT EXISTS `Counter` (
 --
 
 INSERT INTO `Counter` (`URL`, `Anz`) VALUES
-('news', 80),
-('login', 24),
+('news', 164),
+('login', 26),
 ('logout', 13),
-('start', 25),
-('faq', 16),
+('start', 26),
+('faq', 18),
 ('credits', 3),
 ('register', 3),
-('admin_rooms', 70),
-('admin_angel_types', 69),
-('user_settings', 116),
-('user_messages', 111),
-('admin_groups', 104),
-('user_questions', 54),
-('admin_questions', 41),
-('admin_faq', 53);
+('admin_rooms', 75),
+('admin_angel_types', 70),
+('user_settings', 125),
+('user_messages', 112),
+('admin_groups', 114),
+('user_questions', 55),
+('admin_questions', 42),
+('admin_faq', 55),
+('admin_news', 2),
+('news_comments', 144);
 
 -- --------------------------------------------------------
 
@@ -131,25 +133,27 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
   `privilege_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `group_id` (`group_id`,`privilege_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=40 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=51 ;
 
 --
 -- Daten für Tabelle `GroupPrivileges`
 --
 
 INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
-(32, -2, 8),
+(42, -2, 15),
 (24, -1, 5),
-(31, -2, 11),
-(30, -2, 9),
+(40, -2, 4),
+(41, -2, 3),
 (23, -1, 2),
-(36, -4, 7),
-(37, -4, 13),
-(29, -2, 3),
-(28, -2, 4),
+(48, -4, 14),
+(46, -4, 7),
+(44, -2, 11),
+(43, -2, 9),
 (12, -5, 10),
-(38, -4, 12),
-(39, -4, 6);
+(47, -4, 13),
+(49, -4, 12),
+(45, -2, 8),
+(50, -4, 6);
 
 -- --------------------------------------------------------
 
@@ -210,7 +214,7 @@ INSERT INTO `Messages` (`id`, `Datum`, `SUID`, `RUID`, `isRead`, `Text`) VALUES
 
 CREATE TABLE IF NOT EXISTS `News` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
-  `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `Datum` int(11) NOT NULL,
   `Betreff` varchar(150) NOT NULL DEFAULT '',
   `Text` text NOT NULL,
   `UID` int(11) NOT NULL DEFAULT '0',
@@ -223,9 +227,9 @@ CREATE TABLE IF NOT EXISTS `News` (
 --
 
 INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES
-(1, '2011-06-02 21:35:27', '', '', 1, 0),
-(2, '2011-06-02 21:36:57', '', '', 1, 0),
-(3, '2011-06-02 21:36:57', '', '', 1, 0);
+(1, 1307070566, 'asdf', 'asdf', 1, 0),
+(2, 1307070579, 'Achtung, Treffen!', 'Uiuiuiui.', 1, 0),
+(3, 1307070686, 'Achtung, Treffen!', 'Jojojo!', 1, 1);
 
 -- --------------------------------------------------------
 
@@ -241,12 +245,16 @@ CREATE TABLE IF NOT EXISTS `news_comments` (
   `UID` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`),
   KEY `Refid` (`Refid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ;
 
 --
 -- Daten für Tabelle `news_comments`
 --
 
+INSERT INTO `news_comments` (`ID`, `Refid`, `Datum`, `Text`, `UID`) VALUES
+(1, 10, '2011-06-03 04:12:28', 'FOobar :)', 1),
+(2, 10, '2011-06-03 04:13:03', 'FOobar :)', 1),
+(3, 10, '2011-06-03 04:13:06', 'FOobar :)', 1);
 
 -- --------------------------------------------------------
 
@@ -260,7 +268,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
   `desc` varchar(1024) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=14 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=16 ;
 
 --
 -- Daten für Tabelle `Privileges`
@@ -279,7 +287,9 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (10, 'admin_groups', 'Manage usergroups and their rights'),
 (11, 'user_questions', 'Let users ask questions'),
 (12, 'admin_questions', 'Answer user''s questions'),
-(13, 'admin_faq', 'Edit FAQs');
+(13, 'admin_faq', 'Edit FAQs'),
+(14, 'admin_news', 'Administrate the news section'),
+(15, 'news_comments', 'User can comment news');
 
 -- --------------------------------------------------------
 
@@ -1016,7 +1026,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('admin_questions', 'DE', 'Fragen beantworten'),
 ('admin_questions', 'EN', 'Answer questions'),
 ('admin_faq', 'DE', 'FAQs bearbeiten'),
-('admin_faq', 'EN', 'Edit FAQs');
+('admin_faq', 'EN', 'Edit FAQs'),
+('news_comments', 'DE', 'News Kommentare'),
+('news_comments', 'EN', 'News comments');
 
 -- --------------------------------------------------------
 
@@ -1059,7 +1071,7 @@ CREATE TABLE IF NOT EXISTS `User` (
 --
 
 INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES
-(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307055685, '0000-00-00 00:00:00', '', '', ''),
+(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307070695, '0000-00-00 00:00:00', '', '', ''),
 (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', '');
 
 -- --------------------------------------------------------
diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index 56c5bb68..34c346dd 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -1,108 +1,139 @@
 <?php
-function user_news() {
-	return "<a href=\"#Neu\">" . Get_Text(3) . "</a>" . user_news_output();
+function display_news($news) {
+	global $privileges, $p;
+
+	$html .= "";
+	$html .= '<article class="news' . ($news['Treffen'] == 1 ? ' meeting' : '') . '">';
+	$html .= '<details>';
+	$html .= date("Y-m-d H:i",$news['Datum']) . ', ';
+	$html .= UID2Nick($news['UID']);
+	if ($p != "news_comments")
+		$html .= ', <a href="' . page_link_to("news_comments") . '&nid=' . $news['ID'] . '">Kommentare (' . sql_num_query("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . ') &raquo;</a>';
+	$html .= '</details>';
+	$html .= '<h3>'.($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '</h3>';
+	$html .= '<p>' . ReplaceSmilies(nl2br($news['Text'])) . '</p>';
+	if (in_array("admin_news", $privileges))
+		$html .= "<details><a href=\"" . page_link_to("admin_news") . "&action=edit&id=" . $news['ID'] . "\">Edit</a></details>\n";
+
+	$html .= '</article>';
+	return $html;
 }
 
-function user_news_output() {
-	global $DISPLAY_NEWS, $privileges;
-	
+function user_news_comments() {
+	global $user;
+
 	$html = "";
+	if (isset ($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) {
+		$nid = $_REQUEST["nid"];
+		list ($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1");
+		if (isset ($_REQUEST["text"])) {
+			$text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text']));
+			sql_query("INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) VALUES ('" . sql_escape($nid) . "', '" . date("Y-m-d H:i:s") . "', '" . sql_escape($text) . "', '" . sql_escape($user["UID"]) . "')");
+			$html .= success("Eintrag wurde gespeichert");
+		}
 
-	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 ('" . sql_escape($_POST["date"]) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($_SESSION['uid']) .
-		"', '" . sql_escape($_POST["treffen"]) . "');";
-		$Erg = sql_query($SQL);
-		if ($Erg == 1)
-			$html .= Get_Text(4);
-	}
+		$html .= '<a href="' . page_link_to("news") . '">&laquo; Back</a>';
+		$html .= display_news($news);
 
-	if (!IsSet ($_GET["news_begin"]))
-		$_GET["news_begin"] = 0;
+		$html .= '<h2>Comments</h2>';
+
+		$comments = sql_select("SELECT * FROM `news_comments` WHERE `Refid`='" . $nid . "' ORDER BY 'ID'");
+		foreach ($comments as $comment) {
+			$html .= '<article class="news_comment">';
+			$html .= DisplayAvatar($comment['UID']);
+			$html .= '<details>';
+			$html .= $comment['Datum'] . ', ';
+			$html .= UID2Nick($comment['UID']);
+			$html .= '</details>';
+			$html .= '<p>' . nl2br($comment['Text']) . '</p>';
+			$html .= '</article>';
+		}
 
-	if (!IsSet ($_GET["DISPLAY_NEWS"]))
-		$_GET["DISPLAY_NEWS"] = 5;
+		$html .= "</table>";
+		$html .= '
+					<br />
+					<hr>
+					<h2>Neuer Kommentar:</h2>
+					<a name="Neu">&nbsp;</a>
+					
+					<form action="' . page_link_to("news_comments") . '" method="post">
+					<input type="hidden" name="nid" value="' . $_REQUEST["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>';
+	} else {
+		$html .= "Fehlerhafter Aufruf!";
+	}
 
-	$SQL = "SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . intval($_GET["news_begin"]) . ", " . intval($_GET["DISPLAY_NEWS"]);
-	$Erg = sql_query($SQL);
+	return $html;
+}
 
-	// anzahl zeilen
-	$news_rows = mysql_num_rows($Erg);
+function user_news() {
+	global $DISPLAY_NEWS, $privileges, $user;
 
-	for ($n = 0; $n < $news_rows; $n++) {
+	$html = "";
 
-		if (mysql_result($Erg, $n, "Treffen") == 0)
-			$html .= "<p class='question'>";
-		else
-			$html .= "<p class='engeltreffen'>";
-
-		$html .= "<u>" . ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) . "</u>\n";
-
-		// Schow Admin Page
-		if ($_SESSION['CVS']["admin/news.php"] == "Y")
-			$html .= " <a href=\"./../admin/news.php?action=change&date=" . mysql_result($Erg, $n, "Datum") . "\">[edit]</a><br />\n\t\t";
-
-		$html .= "<br />&nbsp; &nbsp;<font size=1>" . mysql_result($Erg, $n, "Datum") . ", ";
-		$html .= UID2Nick(mysql_result($Erg, $n, "UID")) . "</font>";
-		// avatar anzeigen?
-		$html .= DisplayAvatar(mysql_result($Erg, $n, "UID"));
-		$html .= "</p>\n";
-		$html .= "<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 = sql_query($countSQL);
-		$countcom = mysql_result($countErg, 0, "COUNT(*)");
-		$html .= "<p class='comment' align='right'><a href=\"./news_comments.php?nid=$RefID\">$countcom comments</a></p>\n\n";
+	if (isset ($_POST["text"]) && isset ($_POST["betreff"])) {
+		if (!isset ($_POST["treffen"]) || !in_array("admin_news", $privileges))
+			$_POST["treffen"] = 0;
+		sql_query("INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " .
+		"VALUES ('" . sql_escape(time()) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($user['UID']) .
+		"', '" . sql_escape($_POST["treffen"]) . "');");
+		$html .= success(Get_Text(4));
 	}
 
-	$html .= "<div align=\"center\">\n\n";
-	$rowerg = sql_query("SELECT * FROM `News`");
-	$rows = mysql_num_rows($rowerg);
-	$dis_rows = round(($rows / $DISPLAY_NEWS) + 0.5);
+	if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page']))
+		$page = $_REQUEST['page'];
+	else
+		$page = 0;
+
+	$news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . ($page * $DISPLAY_NEWS) . ", " . $DISPLAY_NEWS);
+	foreach ($news as $entry)
+		$html .= display_news($entry);
+
+	$html .= "<div class=\"pagination\">\n\n";
+	$dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS);
 
 	$html .= Get_Text(5);
 
-	for ($i = 1; $i <= $dis_rows; $i++) {
-		if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) {
-			$html .= '<a href="' . page_link_to("news") . '&news_begin=' . (($i * $DISPLAY_NEWS) - $DISPLAY_NEWS -1) . '">' . $i . '</a>&nbsp; ';
-		} else {
-			$html .= "$i&nbsp; ";
-		}
+	for ($i = 0; $i < $dis_rows; $i++) {
+		if ($i == $_REQUEST['page'])
+			$html .= ($i +1) . "&nbsp; ";
+		else
+			$html .= '<a href="' . page_link_to("news") . '&page=' . $i . '">' . ($i +1) . '</a>&nbsp; ';
 	}
 	$html .= '</div>
-					<br /><hr />
-					<h2>' . Get_Text(6) . '</h2>
-					<a name="Neu">&nbsp;</a>
-					
-					<form action="" method="post">
-					<?PHP
-					
-						// Datum mit uebergeben, um doppelte Eintraege zu verhindern 
-						// (Reload nach dem Eintragen!)
-					?>
-					<input type="hidden" name="date" value="' . date("Y-m-d H:i:s") . '">
-					<table>
-					 <tr>
-					  <td align="right">' . Get_Text(7) . '</td>
-					  <td><input type="text" name="betreff" size="60"></td>
-					 </tr>
-					 <tr>
-					  <td align="right">' . Get_Text(8) . '</td>
-					  <td><textarea name="text" cols="50" rows="10"></textarea></td>
-					 </tr>';
-	if (in_array('news_add_meeting', $privileges)) {
+			<br /><hr />
+			<h2>' . Get_Text(6) . '</h2>
+			<a name="Neu">&nbsp;</a>
+			
+			<form action="" method="post">
+			<table>
+			 <tr>
+			  <td align="right">' . Get_Text(7) . '</td>
+			  <td><input type="text" name="betreff" size="60"></td>
+			 </tr>
+			 <tr>
+			  <td align="right">' . Get_Text(8) . '</td>
+			  <td><textarea name="text" cols="50" rows="10"></textarea></td>
+			 </tr>';
+	if (in_array('admin_news', $privileges)) {
 		$html .= ' <tr>
-										  <td align="right">' . Get_Text(9) . '</td>
-										  <td><input type="checkbox" name="treffen" size="1" value="1"></td>
-										 </tr>';
+		  <td align="right">' . Get_Text(9) . '</td>
+		  <td><input type="checkbox" name="treffen" size="1" value="1"></td>
+		 </tr>';
 
 	}
 	$html .= '</table>
-					<br />
-					<input type="submit" value="' . Get_Text("save") . '">
-					</form>';
+		<br />
+		<input type="submit" value="' . Get_Text("save") . '">
+		</form>';
 	return $html;
 }
 ?>
\ No newline at end of file
diff --git a/includes/sys_user.php b/includes/sys_user.php
index 6274003d..5dcf3f1f 100644
--- a/includes/sys_user.php
+++ b/includes/sys_user.php
@@ -75,9 +75,9 @@ function displayPictur($UID, $height = "30") {
 	global $url, $ENGEL_ROOT;
 
 	if ($height > 0)
-		return ("<img src=\"" . $url . $ENGEL_ROOT . "ShowUserPicture.php?UID=$UID\" height=\"$height\" alt=\"picture of USER$UID\" class=\"photo\">");
+		return ("<div class=\"avatar\"><img src=\"" . $url . $ENGEL_ROOT . "ShowUserPicture.php?UID=$UID\" height=\"$height\" alt=\"picture of USER$UID\" class=\"photo\"></div>");
 	else
-		return ("<img src=\"" . $url . $ENGEL_ROOT . "ShowUserPicture.php?UID=$UID\" alt=\"picture of USER$UID\">");
+		return ("<div class=\"avatar\"><img class=\"avatar\" src=\"" . $url . $ENGEL_ROOT . "ShowUserPicture.php?UID=$UID\" alt=\"picture of USER$UID\"></div>");
 }
 
 function displayavatar($UID, $height = "30") {
@@ -92,7 +92,7 @@ function displayavatar($UID, $height = "30") {
 
 	if (mysql_num_rows($aerg))
 		if (mysql_result($aerg, 0, "Avatar") > 0)
-			return ("&nbsp;<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . mysql_result($aerg, 0, "Avatar") . ".gif\">");
+			return'<div class="avatar">'. ("&nbsp;<img src=\"" . $url . $ENGEL_ROOT . "pic/avatar/avatar" . mysql_result($aerg, 0, "Avatar") . ".gif\">").'</div>';
 }
 
 function UIDgekommen($UID) {
diff --git a/txt/TODO b/txt/TODO
index cebcb0de..fb1b3098 100644
--- a/txt/TODO
+++ b/txt/TODO
@@ -10,12 +10,12 @@ jetzt:
  * weckservice?
 
 später:
+ * Zurück-/Backlinks setzen
  * MD5-Passwörter mit Salt speichern
  * Passwort-Mindestanforderungen stellen
  * User-Avatare (code liegt auskommentiert in user_settings.php)
  * user_messages schön machen
  * Formulare weg von Tabellen
- * user_news lässt sich nicht bedienen (POST ohne redirects...)
  * Privilegien korrigieren (an die vom CVS anpassen)
  * Beim Raum-Management die benötigten Engel anzeigen
  * Löschen nur mit Rückfrage
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 44e1959c..0a137099 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -15,6 +15,12 @@ header {
     width: 100%;
 }
 
+article, details {
+    clear: none;
+    display: block;
+    float: none;
+}
+
 footer {
     clear: both;
     display: block;
@@ -64,13 +70,13 @@ dd {
     margin-left: 20px;
 }
 
-h1, h4 {
+h1, h2, h3, h4 {
     font-size: 16px;
     padding: 0 4px;
 }
 
 hr {
-	margin: 10px 0;
+    margin: 10px 0;
 }
 
 ul {
@@ -81,7 +87,7 @@ nav {
     margin: 0 10px 10px 0;
 }
 
-#content article {
+#content > article {
     padding: 10px;
 }
 
@@ -98,20 +104,28 @@ a.sprache img {
 }
 
 table {
-	border-collapse: collapse;
+    border-collapse: collapse;
 }
 
 th {
-	background: #f0f0f0;
+    background: #f0f0f0;
 }
 
 td, th {
-	border: 1px solid #888;
+    border: 1px solid #888;
 }
 
 textarea {
-	height: 200px;
-	width: 300px;
+    height: 200px;
+    width: 300px;
+}
+
+.clear {
+    clear: both;
+}
+
+.pagination {
+    text-align: center;
 }
 
 .background {
@@ -127,20 +141,49 @@ textarea {
 }
 
 .error {
-	color: #f00;
+    color: #f00;
 }
 
 .success {
-	color: #090;
+    color: #090;
 }
 
 .notice {
-	background: #f0f0f0;
-	border: 2px solid #888;
-	margin: 10px;
-	padding: 10px;
+    background: #f0f0f0;
+    border: 2px solid #888;
+    margin: 10px;
+    padding: 10px;
 }
 
 .new_message {
-	font-weight: bold;
+    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/index.php b/www-ssl/index.php
index 8ad025aa..9524459a 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -36,6 +36,10 @@ if (in_array($p, $privileges)) {
 		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_messages") {
 		$content = user_messages();
 	}
-- 
cgit v1.2.3-54-g00ecf


From 35fe4b3ed65718e9d09951b8879cc7cc69f7c1ef Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Fri, 3 Jun 2011 06:40:29 +0200
Subject: admin user

---
 DB/db_rewrite.sql             |  36 ++++++++------
 includes/funktion_db_list.php |  27 +++++-----
 includes/pages/admin_user.php | 111 ++++++++++++++++++++++++++++++++++++++++++
 includes/sys_menu.php         |   1 +
 www-ssl/css/base.css          |  16 ++++++
 www-ssl/index.php             |   4 ++
 6 files changed, 165 insertions(+), 30 deletions(-)
 create mode 100644 includes/pages/admin_user.php

(limited to 'www-ssl/css/base.css')

diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql
index f5ba1c6d..f713c813 100644
--- a/DB/db_rewrite.sql
+++ b/DB/db_rewrite.sql
@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Erstellungszeit: 03. Juni 2011 um 03:49
+-- Erstellungszeit: 03. Juni 2011 um 04:40
 -- Server Version: 5.1.44
 -- PHP-Version: 5.3.1
 
@@ -71,23 +71,24 @@ CREATE TABLE IF NOT EXISTS `Counter` (
 --
 
 INSERT INTO `Counter` (`URL`, `Anz`) VALUES
-('news', 187),
+('news', 190),
 ('login', 26),
 ('logout', 13),
 ('start', 26),
 ('faq', 19),
 ('credits', 3),
-('register', 3),
+('register', 8),
 ('admin_rooms', 89),
 ('admin_angel_types', 71),
 ('user_settings', 126),
 ('user_messages', 113),
-('admin_groups', 117),
+('admin_groups', 125),
 ('user_questions', 55),
 ('admin_questions', 42),
 ('admin_faq', 55),
 ('admin_news', 32),
-('news_comments', 151);
+('news_comments', 151),
+('admin_user', 55);
 
 -- --------------------------------------------------------
 
@@ -133,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` (
   `privilege_id` int(11) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `group_id` (`group_id`,`privilege_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=51 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=64 ;
 
 --
 -- Daten für Tabelle `GroupPrivileges`
@@ -145,15 +146,17 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES
 (40, -2, 4),
 (41, -2, 3),
 (23, -1, 2),
-(48, -4, 14),
-(46, -4, 7),
+(62, -4, 16),
+(61, -4, 6),
 (44, -2, 11),
 (43, -2, 9),
 (12, -5, 10),
-(47, -4, 13),
-(49, -4, 12),
+(60, -4, 12),
+(59, -4, 14),
 (45, -2, 8),
-(50, -4, 6);
+(58, -4, 13),
+(57, -4, 7),
+(63, -4, 5);
 
 -- --------------------------------------------------------
 
@@ -265,7 +268,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` (
   `desc` varchar(1024) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=16 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=17 ;
 
 --
 -- Daten für Tabelle `Privileges`
@@ -286,7 +289,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES
 (12, 'admin_questions', 'Answer user''s questions'),
 (13, 'admin_faq', 'Edit FAQs'),
 (14, 'admin_news', 'Administrate the news section'),
-(15, 'news_comments', 'User can comment news');
+(15, 'news_comments', 'User can comment news'),
+(16, 'admin_user', 'Administrate the angels');
 
 -- --------------------------------------------------------
 
@@ -984,8 +988,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES
 ('admin/dect.php', 'EN', 'Dect'),
 ('admin/dect_call.php', 'DE', ' '),
 ('admin/dect_call.php', 'EN', ' '),
-('admin/user.php', 'DE', 'Engelliste'),
-('admin/user.php', 'EN', 'Drone-list'),
+('admin_user', 'DE', 'Engelliste'),
+('admin_user', 'EN', 'Manage angels'),
 ('admin/userDefaultSetting.php', 'DE', 'Engel Voreinstellungen'),
 ('admin/userDefaultSetting.php', 'EN', 'Drone Default Setting'),
 ('admin/UserPicture.php', 'DE', 'Benutzerbilder'),
@@ -1072,7 +1076,7 @@ CREATE TABLE IF NOT EXISTS `User` (
 --
 
 INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES
-(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307072950, '0000-00-00 00:00:00', '', '', ''),
+(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307075960, '0000-00-00 00:00:00', '', '', ''),
 (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', '');
 
 -- --------------------------------------------------------
diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php
index 44e3d865..3e2878da 100644
--- a/includes/funktion_db_list.php
+++ b/includes/funktion_db_list.php
@@ -34,32 +34,31 @@
 
 function funktion_db_element_list_2row( $TopicName, $SQL) 
 {
-  global $con;
+	$html = "";
+  $html .= "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+  $html .= "<caption>$TopicName</caption>";
+#  $html .= "<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
 
-  echo "<table class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
-  echo "<caption>$TopicName</caption>";
-#  echo "<tr class=\"contenttopic\"> <td><h1>$TopicName</h1></td> </tr>\n";
-
-  $Erg = mysql_query($SQL, $con);
-  echo mysql_error($con);
+  $Erg = sql_query($SQL);
   
-  echo "<tr class=\"contenttopic\">";
+  $html .= "<tr class=\"contenttopic\">";
   for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
   {
-    echo "<th>". mysql_field_name($Erg, $m). "</th>";
+    $html .= "<th>". mysql_field_name($Erg, $m). "</th>";
   }
-  echo "</tr>";
+  $html .= "</tr>";
 
   for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++)
   {
-    echo "<tr class=\"content\">";
+    $html .= "<tr class=\"content\">";
     for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++)
     {
-      echo "<td>".mysql_result($Erg, $n, $m). "</td>"; 
+      $html .= "<td>".mysql_result($Erg, $n, $m). "</td>"; 
     }
-    echo "</tr>";
+    $html .= "</tr>";
   }
-  echo "</table>\n";
+  $html .= "</table>\n";
+  return $html;
 }
 
 ?>
diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
new file mode 100644
index 00000000..b64c9678
--- /dev/null
+++ b/includes/pages/admin_user.php
@@ -0,0 +1,111 @@
+<?php
+function admin_user() {
+	include ("includes/funktion_db_list.php");
+
+	$html = "";
+	// Userliste, keine UID uebergeben...
+
+	$html .= "<a href=\"" . page_link_to("register") . "\">Neuen Engel eintragen &raquo;</a><br /><br />\n";
+
+	if (!isset ($_GET["OrderBy"]))
+		$_GET["OrderBy"] = "Nick";
+	$SQL = "SELECT * FROM `User` ORDER BY `" . $_GET["OrderBy"] . "` ASC";
+	$Erg = sql_query($SQL);
+
+	// anzahl zeilen
+	$Zeilen = mysql_num_rows($Erg);
+
+	$html .= "Anzahl Engel: $Zeilen<br /><br />\n";
+	$html .= '
+	<table width="100%" class="border" cellpadding="2" cellspacing="1"> <thead>
+	  <tr class="contenttopic">
+	    <th>
+	      <a href="' . page_link_to("admin_user") . '&OrderBy=Nick">Nick</a>
+	    </th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Vorname">Vorname</a> <a href="' . page_link_to("admin_user") . '&OrderBy=Name">Name</a></th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Alter">Alter</a></th>
+	    <th>
+	      <a href="' . page_link_to("admin_user") . '&OrderBy=email">E-Mail</a>
+	    </th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Size">Gr&ouml;&szlig;e</a></th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Gekommen">Gekommen</a></th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Aktiv">Aktiv</a></th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=Tshirt">T-Shirt</a></th>
+	    <th><a href="' . page_link_to("admin_user") . '&OrderBy=CreateDate">Registrier</a></th>
+	    <th>&Auml;nd.</th>
+	  </tr></thead>';
+	$Gekommen = 0;
+	$Active = 0;
+	$Tshirt = 0;
+
+	for ($n = 0; $n < $Zeilen; $n++) {
+		$title = "";
+		$user_groups = sql_select("SELECT * FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape(mysql_result($Erg, $n, "UID")) . " ORDER BY `Groups`.`Name`");
+		$groups = array ();
+		foreach ($user_groups as $user_group) {
+			$groups[] = $user_group['Name'];
+		}
+		$title .= 'Groups: ' . join(", ", $groups) . "<br />";
+		if (strlen(mysql_result($Erg, $n, "Telefon")) > 0)
+			$title .= "Tel: " . mysql_result($Erg, $n, "Telefon") . "<br />";
+		if (strlen(mysql_result($Erg, $n, "Handy")) > 0)
+			$title .= "Handy: " . mysql_result($Erg, $n, "Handy") . "<br />";
+		if (strlen(mysql_result($Erg, $n, "DECT")) > 0)
+			$title .= "DECT: <a href=\"./dect.php?custum=" . mysql_result($Erg, $n, "DECT") . "\">" .
+			mysql_result($Erg, $n, "DECT") . "</a><br />";
+		if (strlen(mysql_result($Erg, $n, "Hometown")) > 0)
+			$title .= "Hometown: " . mysql_result($Erg, $n, "Hometown") . "<br />";
+		if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0)
+			$title .= "Last login: " . date("Y-m-d H:i", mysql_result($Erg, $n, "lastLogIn")) . "<br />";
+		if (strlen(mysql_result($Erg, $n, "Art")) > 0)
+			$title .= "Type: " . mysql_result($Erg, $n, "Art") . "<br />";
+		if (strlen(mysql_result($Erg, $n, "ICQ")) > 0)
+			$title .= "ICQ: " . mysql_result($Erg, $n, "ICQ") . "<br />";
+		if (strlen(mysql_result($Erg, $n, "jabber")) > 0)
+			$title .= "jabber: " . mysql_result($Erg, $n, "jabber") . "<br />";
+
+		$html .= "<tr class=\"content\">\n";
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Nick") . "</td>\n";
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Vorname") . " " . mysql_result($Erg, $n, "Name") . "</td>\n";
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Alter") . "</td>\n";
+		$html .= "\t<td>";
+		if (strlen(mysql_result($Erg, $n, "email")) > 0)
+			$html .= "<a href=\"mailto:" . mysql_result($Erg, $n, "email") . "\">" .
+			mysql_result($Erg, $n, "email") . "</a>";
+		$html .= '<div class="hidden">' . $title . '</div>';
+		$html .= "</td>\n";
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Size") . "</td>\n";
+		$Gekommen += mysql_result($Erg, $n, "Gekommen");
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Gekommen") . "</td>\n";
+		$Active += mysql_result($Erg, $n, "Aktiv");
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Aktiv") . "</td>\n";
+		$Tshirt += mysql_result($Erg, $n, "Tshirt");
+		$html .= "\t<td>" . mysql_result($Erg, $n, "Tshirt") . "</td>\n";
+		$html .= "<td>" . mysql_result($Erg, $n, "CreateDate") . "</td>";
+		$html .= "\t<td>" . '<a href="">Edit</a>' .
+		"</td>\n";
+		$html .= "</tr>\n";
+	}
+	$html .= "<tr>" .
+	"<td></td><td></td><td></td><td></td><td></td>" .
+	"<td>$Gekommen</td><td>$Active</td><td>$Tshirt</td><td></td><td></td></tr>\n";
+	$html .= "\t</table>\n";
+	// Ende Userliste
+
+	$html .= "<hr /><h2>Statistics</h2>";
+	$html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
+
+	$html .= "<br />\n";
+
+	$html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
+
+	$html .= "<br />\n";
+
+	$html .= funktion_db_element_list_2row("Used Groups", "SELECT Groups.Name AS 'GroupName', COUNT(Groups.Name) AS Count FROM `UserGroups` " .
+	"LEFT JOIN `Groups` ON Groups.UID = UserGroups.group_id " .
+	"WHERE (UserGroups.group_id!='NULL') " .
+	"GROUP BY `GroupName` " .
+	"");
+	return $html;
+}
+?>
\ No newline at end of file
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 2a05fdb4..6a10c32b 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -31,6 +31,7 @@ function make_navigation() {
 
 	// Admin Navigation
 	$menu .= make_navigation_for(Get_Text('admin/'), array (
+		"admin_user",
 		"admin_usershifts",
 		"admin_questions",
 		"admin_angel_types",
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index 0a137099..236eba81 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -120,6 +120,22 @@ textarea {
     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;
 }
diff --git a/www-ssl/index.php b/www-ssl/index.php
index c62b03e0..f6c6aaa2 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -66,6 +66,10 @@ if (in_array($p, $privileges)) {
 	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();
-- 
cgit v1.2.3-54-g00ecf