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/funktion_flag.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'includes/funktion_flag.php')

diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index 56d8a993..b6a02242 100644
--- a/includes/funktion_flag.php
+++ b/includes/funktion_flag.php
@@ -1,12 +1,9 @@
-<?PHP
-echo "<br>";
-
-if( strpos( $_SERVER["REQUEST_URI"], "?") >0)
-	$URL = $_SERVER["REQUEST_URI"]. "&SetLanguage=";
-else
-	$URL = $_SERVER["REQUEST_URI"]. "?SetLanguage=";
-
-echo "<a href=\"". $URL. "DE\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/de.gif\" alt=\"DE\"></a> ";
-echo "<a href=\"". $URL. "EN\"><img src=\"". $url. $ENGEL_ROOT. "pic/flag/en.gif\" alt=\"EN\"></a> ";
+<?php
+   if(strpos($_SERVER["REQUEST_URI"], "?") > 0)
+    $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage=";
+  else
+    $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
 
+  echo "<a href=\"" . $URL . "DE\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/de.gif\" alt=\"DE\" /></a> ";
+  echo "<a href=\"" . $URL . "EN\"><img src=\"" . $url . $ENGEL_ROOT . "pic/flag/en.gif\" alt=\"EN\" /></a> ";
 ?>
-- 
cgit v1.2.3-70-g09d2


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

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-70-g09d2


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/funktion_flag.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-70-g09d2


From 208c76fcb2f597d22d4339227b88099f91305522 Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 18:16:47 +0200
Subject: html5, css rewrite

---
 default-conf/var_www_includes/config_db.php |  8 +++++---
 includes/funktion_flag.php                  |  2 +-
 includes/menu.php                           | 10 ++--------
 www-ssl/admin/schichtplan.1.php             |  6 +++---
 www-ssl/nonpublic/einstellungen.php         |  1 +
 5 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'includes/funktion_flag.php')

diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php
index b49e5e0c..428a9339 100644
--- a/default-conf/var_www_includes/config_db.php
+++ b/default-conf/var_www_includes/config_db.php
@@ -1,6 +1,8 @@
 <?php
-include("../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());
+$con = mysql_connect("localhost", "root", "changeme") or die("connection failed");
+$sel = mysql_select_db("tabel") or die(mysql_error());
+mysql_query("SET CHARACTER SET utf8;", $sql_connection);
+mysql_query("SET NAMES 'utf8'", $sql_connection);
 ?>
diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index 7e88466d..6b4e2f06 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 '<p><a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
+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/menu.php b/includes/menu.php
index 3ca5e8ae..6a209a0f 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -20,15 +20,9 @@ if ($submenus >= 1) {
 
 	for ($index_nummer = 1; $index_nummer <= $submenus; $index_nummer++) {
 ?>
-<table align="center" class="border" cellpadding="3" cellspacing="1">
-  <tr>
-    <td width="160" class="menu"> 
+<nav class="container">
     <?php include ("./".$filepost.".".$index_nummer.$filepre); ?>
-    </td>
-  </tr>
-</table>
-
-<br />
+</nav>
 <?php
 
 
diff --git a/www-ssl/admin/schichtplan.1.php b/www-ssl/admin/schichtplan.1.php
index 30761390..fe8c0384 100644
--- a/www-ssl/admin/schichtplan.1.php
+++ b/www-ssl/admin/schichtplan.1.php
@@ -1,5 +1,5 @@
-<h4 class="menu"> Schichtplan </h4>
-
+<h4>Schichtplan</h4>
+<ul class="content">
 <li><a href="./schichtplan.php">Ein-/Austragen</a></li>
 <li><a href="./schichtplan_druck.php">Druckversion</a></li>
-
+</ul>
\ No newline at end of file
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 81dda869..713425bb 100644
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -128,6 +128,7 @@ if (!isset ($_POST["action"])) {
            <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>
-- 
cgit v1.2.3-70-g09d2


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/funktion_flag.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-70-g09d2