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

---
 includes/footer.php | 70 ++++++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 44 deletions(-)
 mode change 100755 => 100644 includes/footer.php

(limited to 'includes/footer.php')

diff --git a/includes/footer.php b/includes/footer.php
old mode 100755
new mode 100644
index f65e8a7e..8f736c4d
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,57 +1,39 @@
-<?PHP
-
-?>
-
-
-
 <!-- anfang des footers //-->
-
-
-
-
-		<br>
-			<p align="center">
-				<?PHP If (IsSet($_SESSION['oldurl']))
-					echo "<a href=\"". $_SESSION["oldurl"]. "\">".Get_Text("back")."</a>&nbsp;";
-				?>
-				<a href="#top"><?PHP echo Get_Text("top"); ?></a>
-			</p>
-		</td>
-	</tr>
+    <br />
+      <p align="center">
+        <?php if(IsSet($_SESSION['oldurl']))
+          echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
+        ?>
+        <a href="#top"><?php echo Get_Text("top"); ?></a>
+      </p>
+    </td>
+  </tr>
 </table>
-        </td>
-
-
-
+</td>
 
 <!-- anfang des menue parts //-->
-<?PHP
-if( $_SESSION['Menu'] =="R")            include("menu.php");
+<?php
+if($_SESSION['Menu'] == "R")
+  include("menu.php");
 ?>
-		</td> 
-
-
 
 <!-- ende des menue parts //-->
 
-
-
-	</tr>
-	<tr>
-		<td colspan="2">
-			<h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
-			<?PHP 
-				include( "funktion_counter.php"); 
-				include( "funktion_flag.php"); 
-			?></h5>
-        	</td>
-	</tr>
+  </tr>
+  <tr>
+    <td colspan="2">
+      <h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
+      <?php
+        include("funktion_counter.php"); 
+        include("funktion_flag.php"); 
+      ?></h5>
+  </td>
+  </tr>
 </table>
 
 <!-- </div> -->
 <?php mysql_close($con); ?>
-</div>
-
+<!-- </div> -->
 
-</BODY>
-</HTML>
+</body>
+</html>
-- 
cgit v1.2.3-54-g00ecf


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

---
 includes/footer.php    |  39 +++++++--------
 includes/header.php    | 129 +++++++++++++++++++++++--------------------------
 includes/menu.php      |   4 ++
 www-ssl/css/base.css   |  39 +++++++++++++++
 www-ssl/css/style6.css |   4 ++
 www-ssl/index.php      |  10 ++--
 6 files changed, 132 insertions(+), 93 deletions(-)
 create mode 100644 www-ssl/css/base.css

(limited to 'includes/footer.php')

diff --git a/includes/footer.php b/includes/footer.php
index 8f736c4d..584e4b9b 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,9 +1,10 @@
 <!-- anfang des footers //-->
     <br />
       <p align="center">
-        <?php if(IsSet($_SESSION['oldurl']))
-          echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
-        ?>
+        <?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>
@@ -13,27 +14,27 @@
 
 <!-- anfang des menue parts //-->
 <?php
-if($_SESSION['Menu'] == "R")
-  include("menu.php");
+
+
+if ($_SESSION['Menu'] == "R")
+	include ("menu.php");
 ?>
 
 <!-- ende des menue parts //-->
-
-  </tr>
-  <tr>
-    <td colspan="2">
-      <h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
-      <?php
-        include("funktion_counter.php"); 
-        include("funktion_flag.php"); 
-      ?></h5>
-  </td>
-  </tr>
 </table>
+<footer>
+	<p>
+		&copy; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a><br />
+		This is hell. Really.
+	</p>
+</footer>
+
+<?php
 
-<!-- </div> -->
-<?php mysql_close($con); ?>
-<!-- </div> -->
+
+include ("funktion_counter.php");
+mysql_close($con);
+?>
 
 </body>
 </html>
diff --git a/includes/header.php b/includes/header.php
index 3b6a4c23..6b206049 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,40 +1,37 @@
 <?php
 include "header_start.php";
 
-echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
+echo "<!DOCTYPE html>\n";
 ?>
-<html xmlns="http://www.w3.org/1999/xhtml"> 
+<html> 
 <head>
 
-<title><?php echo $title; ?></title>
-
+<title><?php echo $title; ?> - Engelsystem</title>
+<meta charset="UTF-8" />
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+<meta name="content-style-type" content="text/css" />
 <meta name="keywords" content="Engel, Himmelsverwaltung" />
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta http-equiv="expires" content="0" />
 <meta name="robots" content="index" />
 <meta name="revisit-after" content="1 days" />
-<meta http-equiv="content-language" content="de" />
-<script type="text/javascript" src="<?php echo $url . $ENGEL_ROOT; ?>/css/grossbild.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $url . $ENGEL_ROOT; ?>css/style<?php
-
-  if(!isset($_SESSION['color'])) 
-    echo "6";
-  else
-    echo $_SESSION['color'];
-  ?>.css" />
+<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" />
 
 <?php
-if(isset($reload)) {
-  if ($reload == "")
-    $reload = 3330;
 
-  echo "\n<meta http-equiv=\"refresh\" content=\"" . $reload . "; URL=./?reload=" . $reload . "\">\n";
+
+if (isset ($reload)) {
+	if ($reload == "")
+		$reload = 3330;
+
+	echo "\n<meta http-equiv=\"refresh\" content=\"" . $reload . "; URL=./?reload=" . $reload . "\">\n";
 }
 
-if(isset($Page["AutoReload"])) 
-  echo "\n<meta http-equiv=\"refresh\" content=\"". $Page["AutoReload"].
-    "; URL=". $url. $ENGEL_ROOT. $Page["Name"]."\">\n";
+if (isset ($Page["AutoReload"]))
+	echo "\n<meta http-equiv=\"refresh\" content=\"" . $Page["AutoReload"] .
+	"; URL=" . $url . $ENGEL_ROOT . $Page["Name"] . "\">\n";
 
 echo "</head>\n";
 
@@ -43,40 +40,31 @@ echo "</head>\n";
 /////////////////////////////////////////////////////////////////////////////////////////////
 echo "<body>\n";
 
-echo "<div align=\"center\">\n\n";
-
-if( isset($_SESSION['color']) && ($_SESSION['color']==6) )
-{
-  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel_w.png\" alt=\"Unser Himmel\" /></a>\n";
-}
-else
-{
-  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel.png\" alt=\"Unser Himmel\" /></a>\n";
-}
-echo "</div>\n\n";
-
+echo '<header><a href="' . $url . $ENGEL_ROOT . '" id="logo"></a></header>';
 
 //ausgabe new message
-if( isset($_SESSION['CVS']["nonpublic/messages.php"]))
-{
-    if( $_SESSION['CVS']["nonpublic/messages.php"] == "Y")
-    {
-  $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'";
-  $erg = mysql_query($SQL, $con);
-  if( mysql_num_rows( $erg ) > 0 )
-    echo "<br /><a href=\"". $url. $ENGEL_ROOT.
-      "nonpublic/messages.php\">". Get_Text("pub_messages_new1").
-      " ".  mysql_num_rows( $erg ). " ".
-      Get_Text("pub_messages_new2"). "</a><br /><br />";
-    }
+if (isset ($_SESSION['CVS']["nonpublic/messages.php"])) {
+	if ($_SESSION['CVS']["nonpublic/messages.php"] == "Y") {
+		$SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=" . $_SESSION["UID"] . " AND `isRead`='N'";
+		$erg = mysql_query($SQL, $con);
+		if (mysql_num_rows($erg) > 0)
+			echo "<br /><a href=\"" . $url . $ENGEL_ROOT .
+			"nonpublic/messages.php\">" . Get_Text("pub_messages_new1") .
+			" " . mysql_num_rows($erg) . " " .
+			Get_Text("pub_messages_new2") . "</a><br /><br />";
+	}
 }
 ?>
-<table width="95%" align="center" border="0" cellpadding="7" cellspacing="0">
+<table id="body" width="90%" align="center" border="0" cellpadding="7" cellspacing="0">
   <tr>
 <?php
+
+
 //ausgaeb Menu
-if( !isset($_SESSION['Menu']))    $_SESSION['Menu'] = "L";
-if( $_SESSION['Menu'] =="L")    include("menu.php");
+if (!isset ($_SESSION['Menu']))
+	$_SESSION['Menu'] = "L";
+if ($_SESSION['Menu'] == "L")
+	include ("menu.php");
 ?>
 
     <td valign="top" align="center">
@@ -84,41 +72,44 @@ if( $_SESSION['Menu'] =="L")    include("menu.php");
   <tr class="contenttopic">
     <td>
 <?php
-    echo "<a name=\"" . $header . "\" class=\"contenttopic\">";
-    if( strlen( $header) == 0 )
-      echo "\n<b>". Get_Text($Page["Name"]). "</b></a>\n";
-    else
-      echo "\n<b>$header</b></a>\n";
 
+
+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 
-if(isset($_SESSION['UID'])) {
-  if(isset($_SESSION['oldurl']))
-    $BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
-  if(isset($_SESSION['newurl']))
-    $_SESSION['oldurl'] = $_SESSION['newurl'];
-  $_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
+<?php
+
+
+if (isset ($_SESSION['UID'])) {
+	if (isset ($_SESSION['oldurl']))
+		$BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
+	if (isset ($_SESSION['newurl']))
+		$_SESSION['oldurl'] = $_SESSION['newurl'];
+	$_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
 }
 
 function SetHeaderGo2Back() {
-  global $BACKUP_SESSION_OLDURL;
-  $_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
+	global $BACKUP_SESSION_OLDURL;
+	$_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
 }
 
-if($Page["CVS"] != "Y") {
-  echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
+if ($Page["CVS"] != "Y") {
+	echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
 
-  if(isset($_SESSION['oldurl']))
-    echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
-  else
-    echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+	if (isset ($_SESSION['oldurl']))
+		echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+	else
+		echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
 
-  exit ();
+	exit ();
 }
 ?>
 
diff --git a/includes/menu.php b/includes/menu.php
index 799e6c75..955de8b7 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -57,6 +57,10 @@ if( isset($_SESSION['UID']))
 </table>
 <?php
 }
+?>
+
+<?php
+include ("funktion_flag.php");
 ?>
     </td> 
 
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;
+}
diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css
index 72e1024d..eaca462f 100644
--- a/www-ssl/css/style6.css
+++ b/www-ssl/css/style6.css
@@ -6,6 +6,10 @@ body {
 	font-size: small
 }
 
+#logo {
+	background-image: url('../pic/himmel_w.png');
+}
+
 a {
 	text-decoration: none;
 	color: #ff9900
diff --git a/www-ssl/index.php b/www-ssl/index.php
index e61db41a..4a34643c 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,15 +1,15 @@
 <?php
-  $title = "Index";
-  $header = "Index";
-  include "../../camp2011/includes/header.php";
+  $title = "Start";
+  $header = "Start";
+  include "../includes/header.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";
 
-  include "../../camp2011/includes/login_eingabefeld.php";
+  include "../includes/login_eingabefeld.php";
 
   echo "<h6>" . Get_Text("index_text4") . "</h6>";
 
-  include "../../camp2011/includes/footer.php";
+  include "../includes/footer.php";
 ?>
-- 
cgit v1.2.3-54-g00ecf


From 9ee80208718277954a066be26e10c5be881cc50b Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 15:06:09 +0200
Subject: footer :)

---
 includes/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/footer.php')

diff --git a/includes/footer.php b/includes/footer.php
index 584e4b9b..f56c299c 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -25,7 +25,7 @@ if ($_SESSION['Menu'] == "R")
 <footer>
 	<p>
 		&copy; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a><br />
-		This is hell. Really.
+		This is hell. Temporarily.
 	</p>
 </footer>
 
-- 
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 'includes/footer.php')

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 bf64254625123ecd36662628862442ccf7671699 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 15:37:41 +0200
Subject: fixed menu and credits link

---
 includes/footer.php        |  2 +-
 includes/funktion_menu.php | 67 +++++++++++++++++++++++-----------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

(limited to 'includes/footer.php')

diff --git a/includes/footer.php b/includes/footer.php
index fdcf8e55..62260e55 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> | <a href="credits.php">Credits</a><br />
+		&copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Kontakt</a> | <a href="<?php echo $ENGEL_ROOT; ?>credits.php">Credits</a><br />
 		This is hell. Temporarily.
 	</p>
 </footer>
diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php
index c751c764..387310aa 100644
--- a/includes/funktion_menu.php
+++ b/includes/funktion_menu.php
@@ -1,41 +1,42 @@
 <?php
-  function ShowMenu( $MenuName) {
-    global $MenueTableStart, $MenueTableEnd, $_SESSION, $debug, $url, $ENGEL_ROOT;
-    $Gefunden = false;
 
-    // Ueberschift
-    $Text = "<h4 class=\"menu\">". Get_Text("$MenuName/"). "</h4><ul>";
 
-    // Eintraege
-    foreach($_SESSION['CVS'] as $Key => $Entry)
-      if( strpos( $Key, ".php") > 0)
-        if( (strpos( "00$Key", "0$MenuName") > 0) ||
-          ((strlen($MenuName)==0) && (strpos( "0$Key", "/") == 0) ) ) {
-          $TempName = Get_Text($Key, true);
+// Menü generieren
+function ShowMenu($MenuName) {
+	global $MenueTableStart, $MenueTableEnd, $_SESSION, $debug, $url, $ENGEL_ROOT;
+	$Gefunden = false;
 
-          if(( true||$debug) && (strlen($TempName)==0) )
-            $TempName = "not found: \"$Key\"";
+	// Ueberschift
+	$Text = "<h4 class=\"menu\">" . Get_Text("$MenuName/") . "</h4><ul>";
 
-          if( $Entry == "Y") {
-            //zum absichtlkichen ausblenden von einträgen
-            if( strlen($TempName)>1) {
-              //sonderfälle:
+	// Eintraege
+	foreach ($_SESSION['CVS'] as $Key => $Entry)
+		if (strpos($Key, ".php") > 0)
+			if ((strpos("00$Key", "0$MenuName") > 0) || ((strlen($MenuName) == 0) && (strpos("0$Key", "/") == 0))) {
+				$TempName = Get_Text($Key, true);
 
-              if( $Key=="admin/faq.php")
-                $TempName .= " (". noAnswer(). ")";
-            //ausgabe
-            $Text .= "\t\t\t<li><a href=\"". $url. $ENGEL_ROOT. $Key. "\">$TempName</a></li>\n";
-            $Gefunden = true;
-          }
-        }
-        elseif( $debug ) 
-        {
-          $Gefunden = true;
-          $Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
-        }
-      }
-  if( $Gefunden)
-    echo $MenueTableStart.$Text.$MenueTableEnd;
-}//function ShowMenue
+				if ((true || $debug) && (strlen($TempName) == 0))
+					$TempName = "not found: \"$Key\"";
 
+				if ($Entry == "Y") {
+					//zum absichtlkichen ausblenden von einträgen
+					if (strlen($TempName) > 1) {
+						//sonderfälle:
+
+						if ($Key == "admin/faq.php")
+							$TempName .= " (" . noAnswer() . ")";
+						elseif ($Key == "credits.php") continue;
+						//ausgabe
+						$Text .= "\t\t\t<li><a href=\"" . $url . $ENGEL_ROOT . $Key . "\">$TempName</a></li>\n";
+						$Gefunden = true;
+					}
+				}
+				elseif ($debug) {
+					$Gefunden = true;
+					$Text .= "\t\t\t<li>$TempName ($Key)</li>\n";
+				}
+			}
+	if ($Gefunden)
+		echo $MenueTableStart . $Text . $MenueTableEnd;
+} //function ShowMenue
 ?>
-- 
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 'includes/footer.php')

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 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 'includes/footer.php')

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 06497b3a5387f30ea140562cc71e371b2ec1e131 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Thu, 2 Jun 2011 01:18:08 +0200
Subject: cleanup

---
 includes/footer.php              |  18 ----
 includes/funktion_activeUser.php |  34 -------
 includes/funktion_faq.php        |  10 --
 includes/funktion_flag.php       |   9 --
 includes/header_start.php        |  40 --------
 includes/login_eingabefeld.php   |  17 ----
 includes/pages/guest_faq.php     |   9 ++
 includes/secure.php              |  25 -----
 includes/sys_auth.php            |   8 ++
 www-ssl/css/style.css.old        |  53 ----------
 www-ssl/css/style.css.old2       |  69 -------------
 www-ssl/css/style1.css.old       |  79 ---------------
 www-ssl/faq.php                  |  31 ------
 www-ssl/logout.php               |  15 ---
 www-ssl/makeuser.php             | 214 ---------------------------------------
 15 files changed, 17 insertions(+), 614 deletions(-)
 delete mode 100644 includes/footer.php
 delete mode 100644 includes/funktion_activeUser.php
 delete mode 100644 includes/funktion_faq.php
 delete mode 100644 includes/funktion_flag.php
 delete mode 100644 includes/header_start.php
 delete mode 100644 includes/login_eingabefeld.php
 delete mode 100644 includes/secure.php
 delete mode 100644 www-ssl/css/style.css.old
 delete mode 100644 www-ssl/css/style.css.old2
 delete mode 100644 www-ssl/css/style1.css.old
 delete mode 100644 www-ssl/faq.php
 delete mode 100644 www-ssl/logout.php
 delete mode 100644 www-ssl/makeuser.php

(limited to 'includes/footer.php')

diff --git a/includes/footer.php b/includes/footer.php
deleted file mode 100644
index fdf00581..00000000
--- a/includes/footer.php
+++ /dev/null
@@ -1,18 +0,0 @@
-</article>
-</div>
-</div>
-
-<footer>
-	<p>
-		&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>
-
-<?php
-include ("funktion_counter.php");
-mysql_close($con);
-?>
-
-</body>
-</html>
diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php
deleted file mode 100644
index 631ec2d1..00000000
--- a/includes/funktion_activeUser.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-
-// 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 class=\"content\">";
-
-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_faq.php b/includes/funktion_faq.php
deleted file mode 100644
index e9f09e7c..00000000
--- a/includes/funktion_faq.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-  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/funktion_flag.php b/includes/funktion_flag.php
deleted file mode 100644
index 6b4e2f06..00000000
--- a/includes/funktion_flag.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-if (strpos($_SERVER["REQUEST_URI"], "?") > 0)
-	$URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
-else
-	$URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
-
-echo '<p class="content"><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_start.php b/includes/header_start.php
deleted file mode 100644
index 4795cee3..00000000
--- a/includes/header_start.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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` = '" . time() . "'" .
-	" WHERE `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;";
-	mysql_query($SQLlastLogIn, $con);
-}
-?>
diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php
deleted file mode 100644
index 9e10271d..00000000
--- a/includes/login_eingabefeld.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-  include "config/config.php";
-?>
-
-<form action="<?php echo $url . $ENGEL_ROOT; ?>nonpublic/index.php" method="post">
-<table>
-  <tr>
-  <td align="right"><?php echo Get_Text("index_lang_nick"); ?></td>
-  <td><input type="text" name="user" size="23" /></td>
-  </tr>
-  <tr>
-  <td align="right"><?php echo Get_Text("index_lang_pass"); ?></td>
-  <td><input type="password" name="password" size="23"></td>
-  </tr>
-  </table>
-  <br /><input type="submit" value="<?php echo Get_Text("index_lang_send"); ?>">
-</form>
diff --git a/includes/pages/guest_faq.php b/includes/pages/guest_faq.php
index 6b5eeeeb..48e75d16 100644
--- a/includes/pages/guest_faq.php
+++ b/includes/pages/guest_faq.php
@@ -18,4 +18,13 @@ function guest_faq() {
 		}
 	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/secure.php b/includes/secure.php
deleted file mode 100644
index 1d1a9e46..00000000
--- a/includes/secure.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-  if($debug)
-    echo "secure.php START<br />\n";
-
-  foreach ($_GET as $k => $v) {
-    $v = htmlentities($v, ENT_QUOTES);
-    preg_replace('/([\'"`\'])/', '', $v);
-    $_GET[$k] = $v;
-
-    if($debug)
-      echo "GET $k=\"$v\"<br />";
-  }
-  
-  foreach ($_POST as $k => $v) {
-    $v = htmlentities($v, ENT_QUOTES);
-    preg_replace('/([\'"`\'])/', '', $v);
-    $_POST[$k] = $v;
-  
-    if($debug)
-      echo "POST $k=\"$v\"<br />";
-  }
-
-  if($debug)
-    echo "secure.php END<br />\n";
-?>
diff --git a/includes/sys_auth.php b/includes/sys_auth.php
index 1c15122e..68e336b0 100644
--- a/includes/sys_auth.php
+++ b/includes/sys_auth.php
@@ -5,6 +5,14 @@
 function load_auth() {
 	global $user;
 
+	if (!isset ($_SESSION['IP']))
+		$_SESSION['IP'] = $_SERVER['REMOTE_ADDR'];
+
+	if ($_SESSION['IP'] != $_SERVER['REMOTE_ADDR']) {
+		session_destroy();
+		header("Location: " . link_to_page($start));
+	}
+
 	$user = null;
 	if (isset ($_SESSION['uid'])) {
 		$user = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_SESSION['uid']) . " LIMIT 1");
diff --git a/www-ssl/css/style.css.old b/www-ssl/css/style.css.old
deleted file mode 100644
index 254fb1b7..00000000
--- a/www-ssl/css/style.css.old
+++ /dev/null
@@ -1,53 +0,0 @@
-H1  {
-       font-family : Helvetica,Arial,Verdana;
-       font-size : 25pt;
-}
-H4  {
-       font-family : Arial,Verdana;
-}
-A  {
-	font-family : Arial;
-	font-size : small;
-	text-decoration : none;
-	color : #0000a0;
-}
-A:Visited  {
-	font-family : Arial;
-	font-size : small;
-	color : #0000a0;
-	text-decoration : none;
-}
-										A:Active  {
-        text-decoration : none;
-        font-family : Arial;
-        font-size : small;
-}
-A:Hover {
-	font-family : Arial;
-	font-size : small;
-	color : #0000a0;
-	text-decoration : underline;
-	font-weight : bold;
-}	
-B  {
-	font-weight : bold;
-	font-family : Arial;
-	font-size : small;
-}	
-
-TD  {
-        font-size : small;
-        font-family : Arial;
-	padding-left : 1cm; 
-}
-
-BODY  {
-	font-size : small;
-	font-family : Arial;
-	background-color : #f3b115;
-	color : navy;
-}
-a.title {
-	color:#ffa000;	
-}
-																												
diff --git a/www-ssl/css/style.css.old2 b/www-ssl/css/style.css.old2
deleted file mode 100644
index 9f7c0c90..00000000
--- a/www-ssl/css/style.css.old2
+++ /dev/null
@@ -1,69 +0,0 @@
-H1  {
-        font-family : Helvetica,Arial,Verdana;
-        font-size : 25pt;
-}
-
-H4  {
-        font-family : Arial,Verdana;
-}
-
-A  {
-	font-family : Arial;
-	font-size : small;
-	text-decoration : none;
-	color : #778899;
-}
-
-A:Visited  {
-	font-family : Arial;
-	font-size : small;
-	color : #778899;
-	text-decoration : none;
-}
-
-A:Active  {
-        text-decoration : none;
-        font-family : Arial;
-        font-size : small;
-}
-
-A:Hover {
-	font-family : Arial;
-	font-size : small;
-	color : #778899;
-	text-decoration : underline;
-	font-weight : bold;
-}
-
-B  {
-        font-weight : bold;
-        font-family : Arial;
-        font-size : small;
-}
-
-TD  {
-        font-size : small;
-        font-family : Arial;
-}
-
-BODY  {
-	font-size : small;
-	font-family : Arial;
-	background-color : #f3b115;
-	color : navy;
-}
-
-
-a.title {
-color:#ffa000;	
-}
-
-
-p.question {
-	font-weight: bold;
-}
-
-p.answer {
-	margin-left: 30px;
-	margin-right: 30px;
-}			
diff --git a/www-ssl/css/style1.css.old b/www-ssl/css/style1.css.old
deleted file mode 100644
index 4a597f35..00000000
--- a/www-ssl/css/style1.css.old
+++ /dev/null
@@ -1,79 +0,0 @@
-
-body {
-	font-family: Arial;
-	background-color: #3e9fef;
-	color: #000000;
-	font-size: small
-}
-
-a {
-	text-decoration: none;
-	color: #304930
-}
-
-td {
-	font-size: small
-}
-
-a:active, a:hover {
-	font-weight: bold
-}
-	
-li {
-	font-size: small
-}
-
-.content {
-	background-color: #bdd9ef;
-	color: #000000
-}
-
-.contenttopic {
-	font-weight: bold;
-	font-size: small;
-	color: #fe961e;
-	background-color: #157cc1
-}
-
-.border {
-	background-color: #050509
-}
-
-.menu {
-	background-color: #bdd9ef;
-	color: #000022;
-	font-size: small
-}
-h4.menu { 
-	font-weight: bold;
-	font-size: small;
-	color: #3e9fef
-}
-
-.linkbox {
-	background-color: #ffffff
-}
-
-.linkboxtitle {
-	font-weight: bold;
-	background-color: #000000;
-	color: #bdd9ef
-}
-
-.question {
-	font-weight: bold;
-	font-size: 9pt
-}
-
-.engeltreffen {
-        font-weight: bold;
-        font-size: 9pt;
-	color: #ff0000;
-}
-
-.answer {
-	font-size:  9pt;
-}
-.comment {
-	font-size : 6pt;
-}
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
deleted file mode 100644
index 8a7b3ede..00000000
--- a/www-ssl/faq.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-require_once ('bootstrap.php');
-
-$title = "FAQ";
-$header = "FAQ";
-include "includes/header.php";
-
-$SQL = "SELECT * FROM `FAQ`";
-$Erg = mysql_query($SQL, $con);
-
-// anzahl Zeilen
-$Zeilen = mysql_num_rows($Erg);
-
-for ($n = 0; $n < $Zeilen; $n++) {
-	if (mysql_result($Erg, $n, "Antwort") != "") {
-		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>";
-		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>";
-	}
-}
-
-include "includes/footer.php";
-?>
diff --git a/www-ssl/logout.php b/www-ssl/logout.php
deleted file mode 100644
index 12b284f9..00000000
--- a/www-ssl/logout.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-
-// 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
deleted file mode 100644
index a67f4bd5..00000000
--- a/www-ssl/makeuser.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?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";
-?>
-- 
cgit v1.2.3-54-g00ecf