From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: fixes --- includes/header_start.php | 88 +++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 49 deletions(-) mode change 100755 => 100644 includes/header_start.php (limited to 'includes/header_start.php') diff --git a/includes/header_start.php b/includes/header_start.php old mode 100755 new mode 100644 index 997fa94e..97b98fc3 --- a/includes/header_start.php +++ b/includes/header_start.php @@ -1,50 +1,40 @@ -0) ) -{ - echo "\n". - "\n". $SystemDisableMessage. "\n\n". - ""; - die(); -} - -if( !isset($_SESSION)) -{ - session_start(); -} -include ("secure.php"); - -if( !isset($_SESSION['IP'])) -{ - $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; -} - -if (IsSet($_SESSION['UID']) and ($_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); -} - + 0)) { + echo "" . $SystemDisableMessage . ""; + echo "" . $SystemDisableMessage . "\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); + } ?> -- cgit v1.2.3-70-g09d2 From 6ebee2c46ba11ce42e85b830189346b13514d497 Mon Sep 17 00:00:00 2001 From: Philip HÃ¤usler Date: Wed, 1 Jun 2011 14:30:29 +0200 Subject: bootstrapping --- config/.gitignore | 4 + config/config_MessegeServer.php | 7 ++ default-conf/var_www_includes/config.php | 9 +- default-conf/var_www_includes/config_db.php | 2 +- includes/UserCVS.php | 5 +- includes/config_MessegeServer.php | 7 -- includes/config_modem.php | 10 --- includes/crypt.php | 2 +- includes/error_handler.php | 2 +- includes/header.php | 4 +- includes/header_start.php | 4 +- includes/login_eingabefeld.php | 2 +- www-ssl/bootstrap.php | 12 +++ www-ssl/css/base.css | 3 + www-ssl/faq.php | 34 ++++---- www-ssl/index.php | 20 +++-- www-ssl/logout.php | 19 ++-- www-ssl/makeuser.php | 10 +-- www-ssl/nonpublic/index.php | 131 +++++++++++++--------------- www-ssl/nonpublic/news.php | 14 +-- 20 files changed, 159 insertions(+), 142 deletions(-) create mode 100644 config/.gitignore create mode 100644 config/config_MessegeServer.php delete mode 100644 includes/config_MessegeServer.php delete mode 100644 includes/config_modem.php create mode 100644 www-ssl/bootstrap.php (limited to 'includes/header_start.php') diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 00000000..9b65d8f4 --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,4 @@ +config_db.php +config_jabber.php +config_modem.php +config.php diff --git a/config/config_MessegeServer.php b/config/config_MessegeServer.php new file mode 100644 index 00000000..ce7c7c3a --- /dev/null +++ b/config/config_MessegeServer.php @@ -0,0 +1,7 @@ + diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php index 4c8237f1..ca0c39c9 100644 --- a/default-conf/var_www_includes/config.php +++ b/default-conf/var_www_includes/config.php @@ -5,6 +5,9 @@ $url = "https://SEDENGELURL"; // Startverzeichnis des Engelhome $ENGEL_ROOT = "/"; +// Default-Theme auf der Startseite, 1=style1.css usw. +$default_theme = 10; + // System disable message, ist ist set is: bages schow only this text //$SystemDisableMessage="

This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room

"; @@ -16,7 +19,7 @@ $LETZTES_AUSTRAGEN=3; //Setzt den zu verwendenden Crypto algorismis // mp5 oder crypt -// achtung crypt schaltet password ändern ab +// achtung crypt schaltet password ï¿½ndern ab $crypt_system="md5"; //$crypt_system="crypt"; @@ -26,7 +29,7 @@ $arch_angels="fnord"; // timezonen offsett $gmdateOffset=3600; -// für Developen 1, sonst = 0 +// fï¿½r Developen 1, sonst = 0 $debug = 0; // SSL Cert-KEY @@ -42,7 +45,7 @@ $Tempdir="./tmp"; // local timezone date_default_timezone_set("Europe/Berlin"); -//Pentabarf ConferenzDI für UpdateDB +//Pentabarf ConferenzDI fï¿½r UpdateDB $PentabarfXMLhost = "cccv.pentabarf.org"; $PentabarfXMLpath = "Xcal/conference/"; $PentabarfXMLEventID = "31"; diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php index d959be90..b49e5e0c 100644 --- a/default-conf/var_www_includes/config_db.php +++ b/default-conf/var_www_includes/config_db.php @@ -1,5 +1,5 @@ diff --git a/includes/config_modem.php b/includes/config_modem.php deleted file mode 100644 index 2de37cb7..00000000 --- a/includes/config_modem.php +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/includes/crypt.php b/includes/crypt.php index d511e4f4..8de22030 100644 --- a/includes/crypt.php +++ b/includes/crypt.php @@ -1,6 +1,6 @@ \n"; -.css" /> + + +

diff --git a/www-ssl/bootstrap.php b/www-ssl/bootstrap.php new file mode 100644 index 00000000..3189c89a --- /dev/null +++ b/www-ssl/bootstrap.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index e5b1644a..b6017ad2 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -3,6 +3,9 @@ padding: 0; } +body { +} + header { display: block; width: 100%; diff --git a/www-ssl/faq.php b/www-ssl/faq.php index 26c261da..472915e5 100644 --- a/www-ssl/faq.php +++ b/www-ssl/faq.php @@ -1,22 +1,24 @@ "; - echo "

" . mysql_result($Erg, $n, "Frage") . "

"; - echo "

" . mysql_result($Erg, $n, "Antwort") . "

"; - echo ""; - } - } +// anzahl Zeilen +$Zeilen = mysql_num_rows($Erg); - include "../../camp2011/includes/footer.php"; +for ($n = 0; $n < $Zeilen; $n++) { + if (mysql_result($Erg, $n, "Antwort") != "") { + echo "

" . mysql_result($Erg, $n, "Frage") . ": " . mysql_result($Erg, $n, "Antwort") . "

"; + } +} + +include "includes/footer.php"; ?> diff --git a/www-ssl/index.php b/www-ssl/index.php index 4a34643c..cdec1559 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -1,15 +1,17 @@ " . Get_Text("index_text1") . "

\n"; - echo "

" . Get_Text("index_text2") . "

\n"; - echo "

" . Get_Text("index_text3") . "

\n"; +$title = "Start"; +$header = "Start"; +include "includes/header.php"; - include "../includes/login_eingabefeld.php"; +echo "

" . Get_Text("index_text1") . "

\n"; +echo "

" . Get_Text("index_text2") . "

\n"; +echo "

" . Get_Text("index_text3") . "

\n"; - echo "

" . Get_Text("index_text4") . "

"; +include "includes/login_eingabefeld.php"; - include "../includes/footer.php"; +echo "

" . Get_Text("index_text4") . "

"; + +include "includes/footer.php"; ?> diff --git a/www-ssl/logout.php b/www-ssl/logout.php index c137f48c..12b284f9 100644 --- a/www-ssl/logout.php +++ b/www-ssl/logout.php @@ -1,12 +1,15 @@ diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php index ae205a62..785de1e8 100644 --- a/www-ssl/makeuser.php +++ b/www-ssl/makeuser.php @@ -3,10 +3,10 @@ $header = ""; $success = "none"; - include "../../camp2011/includes/config.php"; - include "../../camp2011/includes/header.php"; - include "../../camp2011/includes/config_db.php"; - include "../../camp2011/includes/crypt.php"; + include "../config/config.php"; + include "../includes/header.php"; + include "../config/config_db.php"; + include "../includes/crypt.php"; if(isset($_POST["send"])) { $eNick = trim($_POST["Nick"]); @@ -177,5 +177,5 @@ Print_Text("makeuser_text3"); } - include "../../camp2011/includes/footer.php"; + include "../includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php index a4b2e975..add0fdd3 100644 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -1,84 +1,77 @@ 1 --> keine Anmeldung - if ($user_anz == 0) - $ErrorText = "pub_index_User_unset"; - else - $ErrorText = "pub_index_User_more_as_one"; - } // Ende Check, ob User angemeldet wurde -} -include ("../../../camp2011/includes/header.php"); -if( isset($ErrorText)) - echo "

". Get_Text($ErrorText). "

\n"; -include ("../../../camp2011/includes/login_eingabefeld.php"); -include ("../../../camp2011/includes/footer.php"); + // CVS import Data + $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_SESSION['UID'] . "'"; + $Erg_CVS = mysql_query($SQL, $con); + $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS); + LoginOK(); + } else { // Passwort nicht ok... + $ErrorText = "pub_index_pass_no_ok"; + } // Ende Passwort-Check + } else { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung + if ($user_anz == 0) + $ErrorText = "pub_index_User_unset"; + else + $ErrorText = "pub_index_User_more_as_one"; + } // Ende Check, ob User angemeldet wurde +} +include ("includes/header.php"); +if (isset ($ErrorText)) + echo "

" . Get_Text($ErrorText) . "

\n"; +include ("includes/login_eingabefeld.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php index 7cc9a193..16006c52 100644 --- a/www-ssl/nonpublic/news.php +++ b/www-ssl/nonpublic/news.php @@ -1,10 +1,12 @@ " . Get_Text(3) . ""; - include "news_output.php"; +$title = "News"; +$header = "News"; +include "includes/header.php"; - include "../../../camp2011/includes/footer.php"; +echo "" . Get_Text(3) . ""; +include "news_output.php"; + +include "includes/footer.php"; ?> -- cgit v1.2.3-70-g09d2 From d163b9921b3ddb71f027199c87e6cf18fbb9a624 Mon Sep 17 00:00:00 2001 From: Philip HÃ¤usler 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/header_start.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 @@ Engel online"; - - $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 "

"; - - 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 "

"; + + +// Funktionen gibt es nicht auf allen Rechnern +echo "

Engel online

"; + +$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 "

"; + + 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 "

"; ?> 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 @@ 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 " $\"DE\"$ "; - echo " $\"EN\"$ "; +echo '

'; +echo '

'; ?> 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 = "

" . $SystemDisableMessage . "

-
- - -
-"; - 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++) { ?> @@ -42,26 +30,27 @@ if ($submenus >= 1) {
-

- - - -

+ + 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('
', mysql_result($Erg, $n, "Frage")); + list ($antwort_de, $antwort_en) = split('
', mysql_result($Erg, $n, "Antwort")); echo "

" . mysql_result($Erg, $n, "Frage") . ": " . mysql_result($Erg, $n, "Antwort") . "
" . $frage_de . ": " . $antwort_de . "
" . $frage_en . ": " . $antwort_en . "

"; } } 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 06497b3a5387f30ea140562cc71e371b2ec1e131 Mon Sep 17 00:00:00 2001 From: Philip HÃ¤usler 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/header_start.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 @@ - - - - - - - - - - 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 @@ -Engel online"; - -$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 "

"; - - 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 "

"; -?> 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 @@ - 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 @@ - 0) - $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage="; -else - $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; - -echo '

'; -echo '

'; -?> 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 @@ - 0)) { - echo "" . $SystemDisableMessage . ""; - echo "" . $SystemDisableMessage . "\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 @@ - - - - - - - - - - - - -

-
"> - 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 @@ -\n"; - - foreach ($_GET as $k => $v) { - $v = htmlentities($v, ENT_QUOTES); - preg_replace('/([\'"`\'])/', '', $v); - $_GET[$k] = $v; - - if($debug) - echo "GET $k=\"$v\"
"; - } - - foreach ($_POST as $k => $v) { - $v = htmlentities($v, ENT_QUOTES); - preg_replace('/([\'"`\'])/', '', $v); - $_POST[$k] = $v; - - if($debug) - echo "POST $k=\"$v\"
"; - } - - if($debug) - echo "secure.php END
\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 @@ -', mysql_result($Erg, $n, "Frage")); - list ($antwort_de, $antwort_en) = split('
', mysql_result($Erg, $n, "Antwort")); - echo "

" . $frage_de . ": " . $antwort_de . "
" . $frage_en . ": " . $antwort_en . "

"; - } -} - -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 @@ - 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 @@ - 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") . "
\n"; - $error = mysql_error($con); - } else { - echo "

" . 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 "

" . Get_Text("makeuser_error_write2") . "
\n"; - $error = mysql_error($con); - } else { - echo Get_Text("makeuser_writeOK2") . "
\n"; - echo "

" . Get_Text("makeuser_writeOK3") . "

\n"; - } - - echo Get_Text("makeuser_writeOK4") . "

\n

\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 "

\n" . $error . "\n

\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 "

" . Get_Text("makeuser_text0") . "

\n"; - echo "

" . Get_Text("makeuser_text1") . "

\n"; - echo "

\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - if (isset ($SubscribeMailinglist)) - echo "\n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "

" . Get_Text("makeuser_Nickname") . "*
" . Get_Text("makeuser_Nachname") . "
" . Get_Text("makeuser_Vorname") . "
" . Get_Text("makeuser_Alter") . "
" . Get_Text("makeuser_Telefon") . "
" . Get_Text("makeuser_DECT") . "		\n"; - echo "
" . Get_Text("makeuser_Handy") . "
" . Get_Text("makeuser_E-Mail") . "*
" . Get_Text("makeuser_subscribe-mailinglist") . "	($SubscribeMailinglist)
ICQ
jabber
" . Get_Text("makeuser_T-Shirt") . " Grösse*	\n"; - echo "\n"; - echo "
" . Get_Text("makeuser_Engelart") . "	\n"; - echo "\n"; - echo "
" . Get_Text("makeuser_text2") . "	" . $_POST["kommentar"] . "
" . Get_Text("makeuser_Hometown") . "
" . Get_Text("makeuser_Passwort") . "*
" . Get_Text("makeuser_Passwort2") . "*

\n"; - echo "

\n"; - Print_Text("makeuser_text3"); -} - -include "includes/footer.php"; -?> -- cgit v1.2.3-70-g09d2

This system ist moved to a server in the BCC, you can in the moment only youse it in the in Engel Room

" . Get_Text("index_text4") . "

" . Get_Text("index_text4") . "

". Get_Text($ErrorText). "

" . Get_Text($ErrorText) . "

Engel online

" . Get_Text("$MenuName/") . "

" . Get_Text("makeuser_error_write2") . "\n"; - $error = mysql_error($con); - } else { - echo Get_Text("makeuser_writeOK2") . "\n"; - echo "

" . Get_Text("makeuser_writeOK3") . "

" . Get_Text("makeuser_text0") . "

" . Get_Text("makeuser_text1") . "

" . Get_Text("makeuser_error_write2") . "
\n"; - $error = mysql_error($con); - } else { - echo Get_Text("makeuser_writeOK2") . "
\n"; - echo "