From 26b183befb40fb22be0dac2697ca474e25411b72 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 10 Nov 2010 21:03:28 +0100 Subject: local changes for spezial includes --- www-ssl/ShowUserPicture.php | 8 ++++---- www-ssl/admin/EngelType.php | 6 +++--- www-ssl/admin/Recentchanges.php | 4 ++-- www-ssl/admin/UserPicture.php | 6 +++--- www-ssl/admin/aktiv.php | 6 +++--- www-ssl/admin/dbUpdateFromXLS.php | 10 +++++----- www-ssl/admin/debug.php | 6 +++--- www-ssl/admin/dect.php | 10 +++++----- www-ssl/admin/dect_call.php | 4 ++-- www-ssl/admin/faq.php | 6 +++--- www-ssl/admin/free.php | 6 +++--- www-ssl/admin/free_DECT.php | 6 +++--- www-ssl/admin/group.php | 6 +++--- www-ssl/admin/index.php | 6 +++--- www-ssl/admin/news.php | 6 +++--- www-ssl/admin/room.php | 6 +++--- www-ssl/admin/schichtplan.php | 4 ++-- www-ssl/admin/schichtplan_druck.php | 24 ++++++++++++------------ www-ssl/admin/shiftadd.php | 4 ++-- www-ssl/admin/sprache.php | 4 ++-- www-ssl/admin/tshirt.php | 6 +++--- www-ssl/admin/user.php | 6 +++--- www-ssl/admin/userArrived.php | 6 +++--- www-ssl/admin/userChangeNormal.php | 6 +++--- www-ssl/admin/userChangeSecure.php | 6 +++--- www-ssl/admin/userDefaultSetting.php | 6 +++--- www-ssl/admin/userSaveNormal.php | 10 +++++----- www-ssl/admin/userSaveSecure.php | 10 +++++----- www-ssl/faq.php | 4 ++-- www-ssl/index.php | 8 ++++---- www-ssl/lageplan.php | 4 ++-- www-ssl/logout.php | 2 +- www-ssl/makeuser.php | 10 +++++----- www-ssl/nonpublic/einstellungen.php | 6 +++--- www-ssl/nonpublic/engelbesprechung.php | 4 ++-- www-ssl/nonpublic/faq.php | 4 ++-- www-ssl/nonpublic/index.php | 12 ++++++------ www-ssl/nonpublic/messages.php | 4 ++-- www-ssl/nonpublic/myschichtplan.php | 10 +++++----- www-ssl/nonpublic/myschichtplan_ical.php | 6 +++--- www-ssl/nonpublic/news.php | 4 ++-- www-ssl/nonpublic/news_comments.php | 4 ++-- www-ssl/nonpublic/schichtplan.1.php | 2 +- www-ssl/nonpublic/schichtplan.2.php | 2 +- www-ssl/nonpublic/schichtplan.php | 10 +++++----- www-ssl/nonpublic/schichtplan_add.php | 10 +++++----- www-ssl/nonpublic/schichtplan_beamer.php | 6 +++--- www-ssl/nonpublic/waeckliste.php | 4 ++-- www-ssl/nonpublic/wecken.php | 4 ++-- 49 files changed, 157 insertions(+), 157 deletions(-) diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index 0b61d153..928c4ed8 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,10 +1,10 @@ diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php index ec167e17..9c334c39 100755 --- a/www-ssl/admin/Recentchanges.php +++ b/www-ssl/admin/Recentchanges.php @@ -2,7 +2,7 @@ $title = "ChangeLog"; $header = "Datenbank-Auszug"; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); $SQL = "SELECT * FROM `ChangeLog` ORDER BY `Time` DESC LIMIT 0,10000"; $Erg = mysql_query($SQL, $con); @@ -24,6 +24,6 @@ for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) echo "\n"; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php index 1b636dcf..5beccc02 100755 --- a/www-ssl/admin/UserPicture.php +++ b/www-ssl/admin/UserPicture.php @@ -1,8 +1,8 @@ "; echo "
picture upload\n"; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php index 9c6174f8..f7a44c7d 100755 --- a/www-ssl/admin/aktiv.php +++ b/www-ssl/admin/aktiv.php @@ -2,8 +2,8 @@ $title = "akive Engel"; $header = "Liste der aktiven Engel"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); echo "
"; echo Get_Text("pub_aktive_Text1")."
\n"; @@ -92,6 +92,6 @@ echo ""; echo "
Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

"; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php index 3f66a310..f31c4729 100755 --- a/www-ssl/admin/dbUpdateFromXLS.php +++ b/www-ssl/admin/dbUpdateFromXLS.php @@ -1,8 +1,8 @@ \n"; V e r s i o n ##############################################################################################*/ if( $EnableRoomFunctions) - include("../../includes/funktion_xml_room.php"); + include("../../../27c3/includes/funktion_xml_room.php"); if( $EnableSchudleFunctions) - include("../../includes/funktion_xml_schudle.php"); + include("../../../27c3/includes/funktion_xml_schudle.php"); /*############################################################################################## @@ -288,6 +288,6 @@ echo "
\n"; } //if XMLopenOOK -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php index af42dd20..6c4d50c7 100755 --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -2,8 +2,8 @@ $title = "Debug-Liste"; $header = "Datenbank-Auszug"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); echo "

Web Counter

"; funktion_db_list("Counter"); @@ -51,6 +51,6 @@ funktion_db_element_list_2row( "Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php index 43f8a77e..2286a472 100755 --- a/www-ssl/admin/dect.php +++ b/www-ssl/admin/dect.php @@ -2,11 +2,11 @@ $title = "Engelsystem - DECT"; $header = "DECT send call"; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); -include ("../../includes/config_IAX.php"); -//include ("../../includes/funktion_modem.php"); -include ("../../includes/funktion_cron.php"); +include ("../../../27c3/includes/config_IAX.php"); +//include ("../../../27c3/includes/funktion_modem.php"); +include ("../../../27c3/includes/funktion_cron.php"); if( !isset($_GET["dial"])) $_GET["dial"] = ""; if( !isset($_GET["custum"])) $_GET["custum"] = ""; @@ -65,6 +65,6 @@ if( $_GET["dial"]=="dial") echo ""; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php index 0befbe3a..d21949db 100755 --- a/www-ssl/admin/dect_call.php +++ b/www-ssl/admin/dect_call.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php index 2a927eab..66cc40f5 100755 --- a/www-ssl/admin/faq.php +++ b/www-ssl/admin/faq.php @@ -2,8 +2,8 @@ $title = "Himmel"; $header = "FAQ / Fragen an die Erzengel"; $submenus = 1; -include ("../../includes/header.php"); -include ("../../includes/funktion_db.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db.php"); //var init $quest_bearb=0; @@ -279,5 +279,5 @@ else echo "\n"; } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php index 1781d434..9bf1d4e3 100755 --- a/www-ssl/admin/free.php +++ b/www-ssl/admin/free.php @@ -2,8 +2,8 @@ $title = "Erzengel"; $header = "Freie Engel"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); echo "Hallo ".$_SESSION['Nick'].",
\n"; @@ -99,6 +99,6 @@ for ($i=0; $i < $Zeilen; $i++) } echo "\n"; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php index 6ec38ff6..99f24317 100755 --- a/www-ssl/admin/free_DECT.php +++ b/www-ssl/admin/free_DECT.php @@ -1,8 +1,8 @@ diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php index bd10551b..5599c200 100755 --- a/www-ssl/admin/index.php +++ b/www-ssl/admin/index.php @@ -2,8 +2,8 @@ $title = "Erzengel"; $header = "Index"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); echo "Hallo Erzengel ".$_SESSION['Nick'].",
\n"; @@ -14,6 +14,6 @@ du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen Bitte melde dich hier nach getaner Arbeit immer ab, damit kein anderer hier Änderungen vornehmen kann. diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php index ba79150b..a49e8ac3 100755 --- a/www-ssl/admin/news.php +++ b/www-ssl/admin/news.php @@ -2,8 +2,8 @@ $title = "Newsverwaltung"; $header = "Verwaltung der News"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); if (!IsSet($_GET["action"])) @@ -117,6 +117,6 @@ else } }// IF-ELSE -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php index 151d9bca..9e3e0c3e 100755 --- a/www-ssl/admin/room.php +++ b/www-ssl/admin/room.php @@ -1,8 +1,8 @@ diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php index 92cf78ef..ae275486 100755 --- a/www-ssl/admin/schichtplan.php +++ b/www-ssl/admin/schichtplan.php @@ -2,7 +2,7 @@ $title = "Schichtplan"; $header = "Neue Schichten erfassen"; $submenus = 1; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); function executeSQL( $SQL) { @@ -353,5 +353,5 @@ if (IsSet($chSQL)){ } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php index fd2a989e..77965c82 100755 --- a/www-ssl/admin/schichtplan_druck.php +++ b/www-ssl/admin/schichtplan_druck.php @@ -6,10 +6,10 @@ $submenus = 1; if (!IsSet($_GET["action"])) { - include ("../../includes/header.php"); - include ("../../includes/funktionen.php"); - include ("../../includes/funktion_schichtplan_aray.php"); - include ("../../includes/funktion_schichtplan.php"); + include ("../../../27c3/includes/header.php"); + include ("../../../27c3/includes/funktionen.php"); + include ("../../../27c3/includes/funktion_schichtplan_aray.php"); + include ("../../../27c3/includes/funktion_schichtplan.php"); echo "Hallo ". $_SESSION['Nick']. "
\n". "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". @@ -30,7 +30,7 @@ if (!IsSet($_GET["action"])) } echo "

"; - include ("../../includes/footer.php"); + include ("../../../27c3/includes/footer.php"); } else //################################################################# { @@ -39,15 +39,15 @@ else //################################################################# $Raum = $_GET["Raum"]; $ausdatum = $_GET["ausdatum"]; - include ("../../includes/config_db.php"); - include ("../../includes/config.php"); - include ("../../includes/secure.php"); + include ("../../../27c3/includes/config_db.php"); + include ("../../../27c3/includes/config.php"); + include ("../../../27c3/includes/secure.php"); //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; - include ("../../includes/funktion_lang.php"); - include ("../../includes/funktion_schichtplan.php"); - include ("../../includes/funktion_schichtplan_aray.php"); - include ("../../includes/funktion_user.php"); + include ("../../../27c3/includes/funktion_lang.php"); + include ("../../../27c3/includes/funktion_schichtplan.php"); + include ("../../../27c3/includes/funktion_schichtplan_aray.php"); + include ("../../../27c3/includes/funktion_user.php"); ?> diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php index 70391041..46fda7d0 100755 --- a/www-ssl/admin/shiftadd.php +++ b/www-ssl/admin/shiftadd.php @@ -2,7 +2,7 @@ $title = "Schicht Hinzufügen"; $header = "Neue Schichten erfassen"; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); $Time = time()+3600+3600; @@ -354,5 +354,5 @@ function CreateNewEntry() echo "\n"; } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php index ba09dae0..6edba89b 100755 --- a/www-ssl/admin/sprache.php +++ b/www-ssl/admin/sprache.php @@ -2,7 +2,7 @@ $title = "Sprache"; $header = "Liste der existierenden Sprcheinträge"; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); if( !isset( $_GET["TextID"] ) ) @@ -117,6 +117,6 @@ else } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php index f7406d16..52b9fc70 100755 --- a/www-ssl/admin/tshirt.php +++ b/www-ssl/admin/tshirt.php @@ -2,8 +2,8 @@ $title = "T-Shirt-Ausgabe"; $header = "T-Shirt-Ausgabe für aktiven Engel"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); If (IsSet($_GET["aktiv"])) { @@ -54,6 +54,6 @@ for ($i=0; $i<$rowcount; $i++){ echo ""; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php index a792f864..dcd0194a 100755 --- a/www-ssl/admin/user.php +++ b/www-ssl/admin/user.php @@ -2,8 +2,8 @@ $title = "User-Liste"; $header = "Editieren der Engelliste"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); if (!IsSet($_GET["enterUID"])) { @@ -116,7 +116,7 @@ else echo "error"; } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php index 7470d695..51de39c0 100755 --- a/www-ssl/admin/userArrived.php +++ b/www-ssl/admin/userArrived.php @@ -2,8 +2,8 @@ $title = "Engel Arrived"; $header = "Engel was arrived"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); If (IsSet($_GET["arrived"])) { @@ -49,6 +49,6 @@ for ($i=0; $i<$rowcount; $i++){ } echo ""; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php index 7bcca841..31e1bf49 100755 --- a/www-ssl/admin/userChangeNormal.php +++ b/www-ssl/admin/userChangeNormal.php @@ -2,8 +2,8 @@ $title = "User-Liste"; $header = "Editieren der Engelliste"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); if (IsSet($_GET["enterUID"])) { @@ -137,7 +137,7 @@ if (IsSet($_GET["enterUID"])) echo ""; } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php index 9da7bc75..1e3bd3db 100755 --- a/www-ssl/admin/userChangeSecure.php +++ b/www-ssl/admin/userChangeSecure.php @@ -2,8 +2,8 @@ $title = "User-Liste"; $header = "Editieren der Engelliste"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); if (IsSet($_GET["enterUID"])) { @@ -106,7 +106,7 @@ if (IsSet($_GET["enterUID"])) } } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php index 84d880ad..25f82699 100755 --- a/www-ssl/admin/userDefaultSetting.php +++ b/www-ssl/admin/userDefaultSetting.php @@ -2,8 +2,8 @@ $title = "Defalut User Setting"; $header = "Defalut User Setting"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); echo "Hallo ".$_SESSION['Nick']. ",
\nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

\n"; @@ -139,6 +139,6 @@ echo "\t\n"; echo "\n"; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php index 62ba44a3..629ad31a 100755 --- a/www-ssl/admin/userSaveNormal.php +++ b/www-ssl/admin/userSaveNormal.php @@ -2,10 +2,10 @@ $title = "User-Liste"; $header = "Index"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); -include ("../../includes/crypt.php"); -include ("../../includes/funktion_db.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../27c3/includes/crypt.php"); +include ("../../../27c3/includes/funktion_db.php"); if (IsSet($_GET["action"])) { @@ -126,6 +126,6 @@ else echo "Unzulässiger Aufruf.
Bitte neu editieren..."; } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php index 4a3c1eae..0041694e 100755 --- a/www-ssl/admin/userSaveSecure.php +++ b/www-ssl/admin/userSaveSecure.php @@ -2,10 +2,10 @@ $title = "User-Liste"; $header = "Index"; -include ("../../includes/header.php"); -include ("../../includes/funktion_db_list.php"); -include ("../../includes/crypt.php"); -include ("../../includes/funktion_db.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../27c3/includes/crypt.php"); +include ("../../../27c3/includes/funktion_db.php"); if( !IsSet($_POST["enterUID"]) ) { @@ -173,6 +173,6 @@ if ( ($Right=="Y") && IsSet($_GET["action"])) echo "Unzulässiger Aufruf.
Bitte neu editieren..."; } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/faq.php b/www-ssl/faq.php index 5aeaee54..af52ef21 100755 --- a/www-ssl/faq.php +++ b/www-ssl/faq.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/index.php b/www-ssl/index.php index 8192e987..194f859c 100755 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -1,19 +1,19 @@
"; echo Get_Text("index_text2")."
"; echo Get_Text("index_text3")."
"; -include ("../includes/login_eingabefeld.php"); +include ("../../27c3/includes/login_eingabefeld.php"); echo "
".Get_Text("index_text4")."
"; -echo Get_Text("index_text5"). "
". $show_SSLCERT; +//echo Get_Text("index_text5"). "
". $show_SSLCERT; -include ("../includes/footer.php"); +include ("../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php index 03aacf79..217887cd 100755 --- a/www-ssl/lageplan.php +++ b/www-ssl/lageplan.php @@ -1,11 +1,11 @@ ". Get_Text("lageplan_text1"). "

"; echo "

."; -include ("../includes/footer.php"); +include ("../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/logout.php b/www-ssl/logout.php index e038be69..d6e56fcd 100755 --- a/www-ssl/logout.php +++ b/www-ssl/logout.php @@ -1,5 +1,5 @@ \n"; Print_Text("makeuser_text3"); } -include ("../includes/footer.php"); +include ("../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php index aabcb830..8cba1c30 100755 --- a/www-ssl/nonpublic/einstellungen.php +++ b/www-ssl/nonpublic/einstellungen.php @@ -5,8 +5,8 @@ */ $title = "Himmel"; $header = "Deine persönlichen Einstellungen"; -include ("../../includes/header.php"); -include ("../../includes/crypt.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/crypt.php"); if (!IsSet($_POST["action"])) { @@ -357,5 +357,5 @@ case 'delPicture': Break; } } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php index add50240..dd5097d9 100755 --- a/www-ssl/nonpublic/engelbesprechung.php +++ b/www-ssl/nonpublic/engelbesprechung.php @@ -1,7 +1,7 @@
@@ -33,5 +33,5 @@ for ($n = 0 ; $n < $Zeilen ; $n++) } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php index 5adfb67c..bde7540d 100755 --- a/www-ssl/nonpublic/faq.php +++ b/www-ssl/nonpublic/faq.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php index affb571e..4ed00ee7 100755 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -2,14 +2,14 @@ $title = "Index"; $header = "Index"; -include ("../../includes/config_db.php"); -include ("../../includes/crypt.php"); +include ("../../../27c3/includes/config_db.php"); +include ("../../../27c3/includes/crypt.php"); session_start(); // alte Session - falls vorhanden - wiederherstellen... function LoginOK() { - include ("../../includes/config.php"); + include ("../../../27c3/includes/config.php"); header("HTTP/1.1 302 Moved Temporarily"); header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php"); } @@ -73,11 +73,11 @@ else $ErrorText = "pub_index_User_more_as_one"; } // Ende Check, ob User angemeldet wurde } -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); if( isset($ErrorText)) echo "

". Get_Text($ErrorText). "


\n"; -include ("../../includes/login_eingabefeld.php"); -include ("../../includes/footer.php"); +include ("../../../27c3/includes/login_eingabefeld.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php index 7d3bb7fb..fa0e9b5f 100755 --- a/www-ssl/nonpublic/messages.php +++ b/www-ssl/nonpublic/messages.php @@ -2,7 +2,7 @@ $title = "Himmel"; $header = ""; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); If( !isset($_GET["action"]) ) $_GET["action"] = "start"; @@ -123,5 +123,5 @@ switch( $_GET["action"]) echo Get_Text("pub_messages_NoCommand"); } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php index 5c7b304e..c4cbfba2 100755 --- a/www-ssl/nonpublic/myschichtplan.php +++ b/www-ssl/nonpublic/myschichtplan.php @@ -2,10 +2,10 @@ $title = "Himmel"; $header = "Mein Schichtplan"; -include ("../../includes/header.php"); -include ("../../includes/funktionen.php"); -include ("../../includes/funktion_schichtplan.php"); -include ("../../includes/funktion_schichtplan_aray.php"); +include ("../../../27c3/includes/header.php"); +include ("../../../27c3/includes/funktionen.php"); +include ("../../../27c3/includes/funktion_schichtplan.php"); +include ("../../../27c3/includes/funktion_schichtplan_aray.php"); If( !IsSet($_GET["action"]) ) @@ -181,5 +181,5 @@ else SetHeaderGo2Back(); } } -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php index 9cbef3b2..80904d8e 100755 --- a/www-ssl/nonpublic/myschichtplan_ical.php +++ b/www-ssl/nonpublic/myschichtplan_ical.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php index 2f04d22c..5329b2dc 100755 --- a/www-ssl/nonpublic/news.php +++ b/www-ssl/nonpublic/news.php @@ -1,11 +1,11 @@ ".Get_Text(3).""; include ("news_output.php"); -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php index 710d33dc..14b67d71 100755 --- a/www-ssl/nonpublic/news_comments.php +++ b/www-ssl/nonpublic/news_comments.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php index ab27d698..3014506d 100755 --- a/www-ssl/nonpublic/schichtplan.1.php +++ b/www-ssl/nonpublic/schichtplan.1.php @@ -1,7 +1,7 @@

 Tage

 Raumübersicht ". @@ -201,5 +201,5 @@ else echo "@"; -include ("../../includes/footer.php"); +include ("../../../27c3/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php index 05ff52b7..7d02afca 100755 --- a/www-ssl/nonpublic/schichtplan_add.php +++ b/www-ssl/nonpublic/schichtplan_add.php @@ -1,10 +1,10 @@ diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php index cd410fc2..95e75abf 100755 --- a/www-ssl/nonpublic/schichtplan_beamer.php +++ b/www-ssl/nonpublic/schichtplan_beamer.php @@ -1,8 +1,8 @@ @@ -36,5 +36,5 @@ include ("../../includes/header.php"); ?> diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php index 30ef689b..7e0551fe 100755 --- a/www-ssl/nonpublic/wecken.php +++ b/www-ssl/nonpublic/wecken.php @@ -2,7 +2,7 @@ $title = "Himmel"; $header = "Weckdienst"; -include ("../../includes/header.php"); +include ("../../../27c3/includes/header.php"); if( isset($_POST["eintragen"])) if( $_POST["eintragen"] == Get_Text("pub_wake_bouton") ) @@ -77,5 +77,5 @@ echo Get_Text("pub_wake_beschreibung2"); ?> "> -- cgit v1.2.3-54-g00ecf From e1146179aea6fff0908b693b10cf098b6dfa3219 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 Dec 2010 14:31:53 +0100 Subject: change include --- www-ssl/nonpublic/auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php index 99b153e5..52c8b6f5 100755 --- a/www-ssl/nonpublic/auth.php +++ b/www-ssl/nonpublic/auth.php @@ -1,8 +1,8 @@ Date: Thu, 26 May 2011 00:52:57 +0200 Subject: local changes for spezial includes camp-version --- www-ssl/ShowUserPicture.php | 8 ++++---- www-ssl/admin/EngelType.php | 6 +++--- www-ssl/admin/Recentchanges.php | 4 ++-- www-ssl/admin/UserPicture.php | 6 +++--- www-ssl/admin/aktiv.php | 6 +++--- www-ssl/admin/dbUpdateFromXLS.php | 10 +++++----- www-ssl/admin/debug.php | 6 +++--- www-ssl/admin/dect.php | 10 +++++----- www-ssl/admin/dect_call.php | 4 ++-- www-ssl/admin/faq.php | 6 +++--- www-ssl/admin/free.php | 6 +++--- www-ssl/admin/free_DECT.php | 6 +++--- www-ssl/admin/group.php | 6 +++--- www-ssl/admin/index.php | 6 +++--- www-ssl/admin/news.php | 6 +++--- www-ssl/admin/room.php | 6 +++--- www-ssl/admin/schichtplan.php | 4 ++-- www-ssl/admin/schichtplan_druck.php | 24 ++++++++++++------------ www-ssl/admin/shiftadd.php | 4 ++-- www-ssl/admin/sprache.php | 4 ++-- www-ssl/admin/tshirt.php | 6 +++--- www-ssl/admin/user.php | 6 +++--- www-ssl/admin/userArrived.php | 6 +++--- www-ssl/admin/userChangeNormal.php | 6 +++--- www-ssl/admin/userChangeSecure.php | 6 +++--- www-ssl/admin/userDefaultSetting.php | 6 +++--- www-ssl/admin/userSaveNormal.php | 10 +++++----- www-ssl/admin/userSaveSecure.php | 10 +++++----- www-ssl/faq.php | 4 ++-- www-ssl/index.php | 6 +++--- www-ssl/lageplan.php | 4 ++-- www-ssl/logout.php | 2 +- www-ssl/makeuser.php | 10 +++++----- www-ssl/nonpublic/auth.php | 4 ++-- www-ssl/nonpublic/einstellungen.php | 6 +++--- www-ssl/nonpublic/engelbesprechung.php | 4 ++-- www-ssl/nonpublic/faq.php | 4 ++-- www-ssl/nonpublic/index.php | 12 ++++++------ www-ssl/nonpublic/messages.php | 4 ++-- www-ssl/nonpublic/myschichtplan.php | 10 +++++----- www-ssl/nonpublic/myschichtplan_ical.php | 6 +++--- www-ssl/nonpublic/news.php | 4 ++-- www-ssl/nonpublic/news_comments.php | 4 ++-- www-ssl/nonpublic/schichtplan.1.php | 2 +- www-ssl/nonpublic/schichtplan.2.php | 2 +- www-ssl/nonpublic/schichtplan.php | 10 +++++----- www-ssl/nonpublic/schichtplan_add.php | 10 +++++----- www-ssl/nonpublic/schichtplan_beamer.php | 6 +++--- www-ssl/nonpublic/waeckliste.php | 4 ++-- www-ssl/nonpublic/wecken.php | 4 ++-- 50 files changed, 158 insertions(+), 158 deletions(-) diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index 928c4ed8..793b5546 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,10 +1,10 @@ diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php index 9c334c39..38c659dd 100755 --- a/www-ssl/admin/Recentchanges.php +++ b/www-ssl/admin/Recentchanges.php @@ -2,7 +2,7 @@ $title = "ChangeLog"; $header = "Datenbank-Auszug"; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); $SQL = "SELECT * FROM `ChangeLog` ORDER BY `Time` DESC LIMIT 0,10000"; $Erg = mysql_query($SQL, $con); @@ -24,6 +24,6 @@ for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) echo "\n"; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php index 5beccc02..93e75bf1 100755 --- a/www-ssl/admin/UserPicture.php +++ b/www-ssl/admin/UserPicture.php @@ -1,8 +1,8 @@ "; echo "
picture upload\n"; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php index 3b294402..f5e8c9c3 100755 --- a/www-ssl/admin/aktiv.php +++ b/www-ssl/admin/aktiv.php @@ -2,8 +2,8 @@ $title = "akive Engel"; $header = "Liste der aktiven Engel"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); echo "
"; echo Get_Text("pub_aktive_Text1")."
\n"; @@ -105,6 +105,6 @@ echo ""; echo "
Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

"; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php index f31c4729..37612d7f 100755 --- a/www-ssl/admin/dbUpdateFromXLS.php +++ b/www-ssl/admin/dbUpdateFromXLS.php @@ -1,8 +1,8 @@ \n"; V e r s i o n ##############################################################################################*/ if( $EnableRoomFunctions) - include("../../../27c3/includes/funktion_xml_room.php"); + include("../../../camp2011/includes/funktion_xml_room.php"); if( $EnableSchudleFunctions) - include("../../../27c3/includes/funktion_xml_schudle.php"); + include("../../../camp2011/includes/funktion_xml_schudle.php"); /*############################################################################################## @@ -288,6 +288,6 @@ echo "
\n"; } //if XMLopenOOK -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php index 2acabb87..b01a8a6c 100755 --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -2,8 +2,8 @@ $title = "Debug-Liste"; $header = "Datenbank-Auszug"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); echo "

Web Counter

"; funktion_db_list("Counter"); @@ -64,6 +64,6 @@ funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php index 2286a472..e6096d27 100755 --- a/www-ssl/admin/dect.php +++ b/www-ssl/admin/dect.php @@ -2,11 +2,11 @@ $title = "Engelsystem - DECT"; $header = "DECT send call"; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); -include ("../../../27c3/includes/config_IAX.php"); -//include ("../../../27c3/includes/funktion_modem.php"); -include ("../../../27c3/includes/funktion_cron.php"); +include ("../../../camp2011/includes/config_IAX.php"); +//include ("../../../camp2011/includes/funktion_modem.php"); +include ("../../../camp2011/includes/funktion_cron.php"); if( !isset($_GET["dial"])) $_GET["dial"] = ""; if( !isset($_GET["custum"])) $_GET["custum"] = ""; @@ -65,6 +65,6 @@ if( $_GET["dial"]=="dial") echo ""; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php index d21949db..c69efa17 100755 --- a/www-ssl/admin/dect_call.php +++ b/www-ssl/admin/dect_call.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php index 66cc40f5..645c08cd 100755 --- a/www-ssl/admin/faq.php +++ b/www-ssl/admin/faq.php @@ -2,8 +2,8 @@ $title = "Himmel"; $header = "FAQ / Fragen an die Erzengel"; $submenus = 1; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db.php"); //var init $quest_bearb=0; @@ -279,5 +279,5 @@ else echo "\n"; } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php index 9bf1d4e3..5ceaebb6 100755 --- a/www-ssl/admin/free.php +++ b/www-ssl/admin/free.php @@ -2,8 +2,8 @@ $title = "Erzengel"; $header = "Freie Engel"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); echo "Hallo ".$_SESSION['Nick'].",
\n"; @@ -99,6 +99,6 @@ for ($i=0; $i < $Zeilen; $i++) } echo "\n"; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php index 99f24317..c28c78af 100755 --- a/www-ssl/admin/free_DECT.php +++ b/www-ssl/admin/free_DECT.php @@ -1,8 +1,8 @@ diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php index 5599c200..b89bdb93 100755 --- a/www-ssl/admin/index.php +++ b/www-ssl/admin/index.php @@ -2,8 +2,8 @@ $title = "Erzengel"; $header = "Index"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); echo "Hallo Erzengel ".$_SESSION['Nick'].",
\n"; @@ -14,6 +14,6 @@ du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen Bitte melde dich hier nach getaner Arbeit immer ab, damit kein anderer hier Änderungen vornehmen kann. diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php index a49e8ac3..78f49ee2 100755 --- a/www-ssl/admin/news.php +++ b/www-ssl/admin/news.php @@ -2,8 +2,8 @@ $title = "Newsverwaltung"; $header = "Verwaltung der News"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); if (!IsSet($_GET["action"])) @@ -117,6 +117,6 @@ else } }// IF-ELSE -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php index 9e3e0c3e..ebbe1e36 100755 --- a/www-ssl/admin/room.php +++ b/www-ssl/admin/room.php @@ -1,8 +1,8 @@ diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php index bbccc14a..ba2f8d66 100755 --- a/www-ssl/admin/schichtplan.php +++ b/www-ssl/admin/schichtplan.php @@ -2,7 +2,7 @@ $title = "Schichtplan"; $header = "Neue Schichten erfassen"; $submenus = 1; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); function executeSQL( $SQL) { @@ -391,5 +391,5 @@ if (IsSet($chSQL)){ } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php index 77965c82..23e65166 100755 --- a/www-ssl/admin/schichtplan_druck.php +++ b/www-ssl/admin/schichtplan_druck.php @@ -6,10 +6,10 @@ $submenus = 1; if (!IsSet($_GET["action"])) { - include ("../../../27c3/includes/header.php"); - include ("../../../27c3/includes/funktionen.php"); - include ("../../../27c3/includes/funktion_schichtplan_aray.php"); - include ("../../../27c3/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/header.php"); + include ("../../../camp2011/includes/funktionen.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); echo "Hallo ". $_SESSION['Nick']. "
\n". "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". @@ -30,7 +30,7 @@ if (!IsSet($_GET["action"])) } echo "

"; - include ("../../../27c3/includes/footer.php"); + include ("../../../camp2011/includes/footer.php"); } else //################################################################# { @@ -39,15 +39,15 @@ else //################################################################# $Raum = $_GET["Raum"]; $ausdatum = $_GET["ausdatum"]; - include ("../../../27c3/includes/config_db.php"); - include ("../../../27c3/includes/config.php"); - include ("../../../27c3/includes/secure.php"); + include ("../../../camp2011/includes/config_db.php"); + include ("../../../camp2011/includes/config.php"); + include ("../../../camp2011/includes/secure.php"); //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; - include ("../../../27c3/includes/funktion_lang.php"); - include ("../../../27c3/includes/funktion_schichtplan.php"); - include ("../../../27c3/includes/funktion_schichtplan_aray.php"); - include ("../../../27c3/includes/funktion_user.php"); + include ("../../../camp2011/includes/funktion_lang.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + include ("../../../camp2011/includes/funktion_user.php"); ?> diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php index 46fda7d0..7c64543f 100755 --- a/www-ssl/admin/shiftadd.php +++ b/www-ssl/admin/shiftadd.php @@ -2,7 +2,7 @@ $title = "Schicht Hinzufügen"; $header = "Neue Schichten erfassen"; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); $Time = time()+3600+3600; @@ -354,5 +354,5 @@ function CreateNewEntry() echo "\n"; } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php index 6edba89b..050b0736 100755 --- a/www-ssl/admin/sprache.php +++ b/www-ssl/admin/sprache.php @@ -2,7 +2,7 @@ $title = "Sprache"; $header = "Liste der existierenden Sprcheinträge"; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); if( !isset( $_GET["TextID"] ) ) @@ -117,6 +117,6 @@ else } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php index 52b9fc70..df33494d 100755 --- a/www-ssl/admin/tshirt.php +++ b/www-ssl/admin/tshirt.php @@ -2,8 +2,8 @@ $title = "T-Shirt-Ausgabe"; $header = "T-Shirt-Ausgabe für aktiven Engel"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); If (IsSet($_GET["aktiv"])) { @@ -54,6 +54,6 @@ for ($i=0; $i<$rowcount; $i++){ echo ""; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php index 3e8e98c9..b86c2382 100755 --- a/www-ssl/admin/user.php +++ b/www-ssl/admin/user.php @@ -2,8 +2,8 @@ $title = "User-Liste"; $header = "Editieren der Engelliste"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); if (!IsSet($_GET["enterUID"])) { @@ -134,7 +134,7 @@ else echo "error"; } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php index 5e319b07..da68a5da 100755 --- a/www-ssl/admin/userArrived.php +++ b/www-ssl/admin/userArrived.php @@ -2,8 +2,8 @@ $title = "Engel Arrived"; $header = "Engel was arrived"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); If (IsSet($_GET["arrived"])) { @@ -49,6 +49,6 @@ for ($i=0; $i<$rowcount; $i++){ } echo ""; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php index f95e044a..51c49944 100755 --- a/www-ssl/admin/userChangeNormal.php +++ b/www-ssl/admin/userChangeNormal.php @@ -2,8 +2,8 @@ $title = "User-Liste"; $header = "Editieren der Engelliste"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); if (IsSet($_GET["enterUID"])) { @@ -131,7 +131,7 @@ if (IsSet($_GET["enterUID"])) "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php index 1e3bd3db..c1799fb8 100755 --- a/www-ssl/admin/userChangeSecure.php +++ b/www-ssl/admin/userChangeSecure.php @@ -2,8 +2,8 @@ $title = "User-Liste"; $header = "Editieren der Engelliste"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); if (IsSet($_GET["enterUID"])) { @@ -106,7 +106,7 @@ if (IsSet($_GET["enterUID"])) } } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php index 25f82699..d3564400 100755 --- a/www-ssl/admin/userDefaultSetting.php +++ b/www-ssl/admin/userDefaultSetting.php @@ -2,8 +2,8 @@ $title = "Defalut User Setting"; $header = "Defalut User Setting"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); echo "Hallo ".$_SESSION['Nick']. ",
\nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

\n"; @@ -139,6 +139,6 @@ echo "\t\n"; echo "\n"; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php index 72a864f4..4a7f7126 100755 --- a/www-ssl/admin/userSaveNormal.php +++ b/www-ssl/admin/userSaveNormal.php @@ -2,10 +2,10 @@ $title = "User-Liste"; $header = "Index"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); -include ("../../../27c3/includes/crypt.php"); -include ("../../../27c3/includes/funktion_db.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/crypt.php"); +include ("../../../camp2011/includes/funktion_db.php"); if (IsSet($_GET["action"])) { @@ -125,6 +125,6 @@ else echo "Unzulässiger Aufruf.
Bitte neu editieren..."; } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php index 0041694e..277c7127 100755 --- a/www-ssl/admin/userSaveSecure.php +++ b/www-ssl/admin/userSaveSecure.php @@ -2,10 +2,10 @@ $title = "User-Liste"; $header = "Index"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktion_db_list.php"); -include ("../../../27c3/includes/crypt.php"); -include ("../../../27c3/includes/funktion_db.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktion_db_list.php"); +include ("../../../camp2011/includes/crypt.php"); +include ("../../../camp2011/includes/funktion_db.php"); if( !IsSet($_POST["enterUID"]) ) { @@ -173,6 +173,6 @@ if ( ($Right=="Y") && IsSet($_GET["action"])) echo "Unzulässiger Aufruf.
Bitte neu editieren..."; } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/faq.php b/www-ssl/faq.php index af52ef21..5bb6824e 100755 --- a/www-ssl/faq.php +++ b/www-ssl/faq.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/index.php b/www-ssl/index.php index 194f859c..56e7223b 100755 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -1,19 +1,19 @@
"; echo Get_Text("index_text2")."
"; echo Get_Text("index_text3")."
"; -include ("../../27c3/includes/login_eingabefeld.php"); +include ("../../camp2011/includes/login_eingabefeld.php"); echo "
".Get_Text("index_text4")."
"; //echo Get_Text("index_text5"). "
". $show_SSLCERT; -include ("../../27c3/includes/footer.php"); +include ("../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php index 217887cd..617eafe3 100755 --- a/www-ssl/lageplan.php +++ b/www-ssl/lageplan.php @@ -1,11 +1,11 @@ ". Get_Text("lageplan_text1"). "

"; echo "

."; -include ("../../27c3/includes/footer.php"); +include ("../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/logout.php b/www-ssl/logout.php index d6e56fcd..d413dfc7 100755 --- a/www-ssl/logout.php +++ b/www-ssl/logout.php @@ -1,5 +1,5 @@ \n"; Print_Text("makeuser_text3"); } -include ("../../27c3/includes/footer.php"); +include ("../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php index 52c8b6f5..3356a81c 100755 --- a/www-ssl/nonpublic/auth.php +++ b/www-ssl/nonpublic/auth.php @@ -1,8 +1,8 @@ diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php index dd5097d9..ea5c6e3c 100755 --- a/www-ssl/nonpublic/engelbesprechung.php +++ b/www-ssl/nonpublic/engelbesprechung.php @@ -1,7 +1,7 @@
@@ -33,5 +33,5 @@ for ($n = 0 ; $n < $Zeilen ; $n++) } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php index bde7540d..79044c2c 100755 --- a/www-ssl/nonpublic/faq.php +++ b/www-ssl/nonpublic/faq.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php index 4ed00ee7..1072e2d6 100755 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -2,14 +2,14 @@ $title = "Index"; $header = "Index"; -include ("../../../27c3/includes/config_db.php"); -include ("../../../27c3/includes/crypt.php"); +include ("../../../camp2011/includes/config_db.php"); +include ("../../../camp2011/includes/crypt.php"); session_start(); // alte Session - falls vorhanden - wiederherstellen... function LoginOK() { - include ("../../../27c3/includes/config.php"); + include ("../../../camp2011/includes/config.php"); header("HTTP/1.1 302 Moved Temporarily"); header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php"); } @@ -73,11 +73,11 @@ else $ErrorText = "pub_index_User_more_as_one"; } // Ende Check, ob User angemeldet wurde } -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); if( isset($ErrorText)) echo "

". Get_Text($ErrorText). "


\n"; -include ("../../../27c3/includes/login_eingabefeld.php"); -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/login_eingabefeld.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php index fa0e9b5f..2ba852d4 100755 --- a/www-ssl/nonpublic/messages.php +++ b/www-ssl/nonpublic/messages.php @@ -2,7 +2,7 @@ $title = "Himmel"; $header = ""; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); If( !isset($_GET["action"]) ) $_GET["action"] = "start"; @@ -123,5 +123,5 @@ switch( $_GET["action"]) echo Get_Text("pub_messages_NoCommand"); } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php index 28e2c13d..e11453c4 100755 --- a/www-ssl/nonpublic/myschichtplan.php +++ b/www-ssl/nonpublic/myschichtplan.php @@ -2,10 +2,10 @@ $title = "Himmel"; $header = "Mein Schichtplan"; -include ("../../../27c3/includes/header.php"); -include ("../../../27c3/includes/funktionen.php"); -include ("../../../27c3/includes/funktion_schichtplan.php"); -include ("../../../27c3/includes/funktion_schichtplan_aray.php"); +include ("../../../camp2011/includes/header.php"); +include ("../../../camp2011/includes/funktionen.php"); +include ("../../../camp2011/includes/funktion_schichtplan.php"); +include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); If( !IsSet($_GET["action"]) ) @@ -181,5 +181,5 @@ else SetHeaderGo2Back(); } } -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php index 80904d8e..bcb9eb6f 100755 --- a/www-ssl/nonpublic/myschichtplan_ical.php +++ b/www-ssl/nonpublic/myschichtplan_ical.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php index 5329b2dc..b1513716 100755 --- a/www-ssl/nonpublic/news.php +++ b/www-ssl/nonpublic/news.php @@ -1,11 +1,11 @@ ".Get_Text(3).""; include ("news_output.php"); -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php index 14b67d71..826733c1 100755 --- a/www-ssl/nonpublic/news_comments.php +++ b/www-ssl/nonpublic/news_comments.php @@ -1,7 +1,7 @@ diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php index 3014506d..490167a0 100755 --- a/www-ssl/nonpublic/schichtplan.1.php +++ b/www-ssl/nonpublic/schichtplan.1.php @@ -1,7 +1,7 @@

 Tage

 Raumübersicht ". @@ -201,5 +201,5 @@ else echo "@"; -include ("../../../27c3/includes/footer.php"); +include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php index 7d02afca..359425bf 100755 --- a/www-ssl/nonpublic/schichtplan_add.php +++ b/www-ssl/nonpublic/schichtplan_add.php @@ -1,10 +1,10 @@ diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php index 95e75abf..cc2a48e7 100755 --- a/www-ssl/nonpublic/schichtplan_beamer.php +++ b/www-ssl/nonpublic/schichtplan_beamer.php @@ -1,8 +1,8 @@ @@ -36,5 +36,5 @@ include ("../../../27c3/includes/header.php"); ?> diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php index 7e0551fe..67e32e28 100755 --- a/www-ssl/nonpublic/wecken.php +++ b/www-ssl/nonpublic/wecken.php @@ -2,7 +2,7 @@ $title = "Himmel"; $header = "Weckdienst"; -include ("../../../27c3/includes/header.php"); +include ("../../../camp2011/includes/header.php"); if( isset($_POST["eintragen"])) if( $_POST["eintragen"] == Get_Text("pub_wake_bouton") ) @@ -77,5 +77,5 @@ echo Get_Text("pub_wake_beschreibung2"); ?> "> -- cgit v1.2.3-54-g00ecf From 12e0b0d809c29d435a247798d7318cc9835980ea Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 May 2011 00:53:42 +0200 Subject: local changes for spezial includes camp-version --- includes/UserCVS.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/UserCVS.php b/includes/UserCVS.php index 9210e446..ad7e1d66 100755 --- a/includes/UserCVS.php +++ b/includes/UserCVS.php @@ -1,5 +1,6 @@ Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: fixes --- DB/ChangeLog.sql | 6 +- DB/Himmel.sql | 44 +- DB/SDrohnen.sql | 2 +- DB/Sprache.sql | 2 +- DB/UserPicture.sql | 2 +- default-conf/var_www_includes/config.php | 6 +- default-conf/var_www_includes/config_IAX.php | 2 +- default-conf/var_www_includes/config_db.php | 0 default-conf/var_www_includes/config_jabber.php | 0 default-conf/var_www_includes/config_modem.php | 15 +- includes/UserCVS.php | 178 +++---- includes/config_MessegeServer.php | 11 +- includes/config_modem.php | 15 +- includes/crypt.php | 24 +- includes/error_handler.php | 84 ++- includes/footer.php | 70 +-- includes/funktion_SendMessenges.php | 32 +- includes/funktion_activeUser.php | 114 ++--- includes/funktion_counter.php | 36 +- includes/funktion_cron.php | 271 +++++----- includes/funktion_db.php | 288 +++++------ includes/funktion_db_list.php | 100 ++-- includes/funktion_faq.php | 16 +- includes/funktion_flag.php | 17 +- includes/funktion_jabber.php | 0 includes/funktion_lang.php | 53 +- includes/funktion_menu.php | 75 ++- includes/funktion_modem.php | 49 +- includes/funktion_schichtplan.php | 654 ++++++++++++------------ includes/funktion_schichtplan_Tage.php | 160 +++--- includes/funktion_schichtplan_aray.php | 48 +- includes/funktion_schichtplan_beamer.php | 300 +++++------ includes/funktion_user.php | 221 ++++---- includes/funktion_xml.php | 228 ++++----- includes/funktion_xml_room.php | 130 +++-- includes/funktion_xml_schudle.php | 524 +++++++++---------- includes/funktionen.php | 43 +- includes/header.php | 174 +++---- includes/header_start.php | 88 ++-- includes/login_eingabefeld.php | 33 +- includes/menu.php | 58 +-- includes/secure.php | 54 +- services/cron_dect.php | 106 ++-- services/dect_clear.php | 32 +- services/jabberserver.php | 188 +++---- txt/LICENSE | 0 txt/README | 4 +- www-ssl/ShowUserPicture.php | 105 ++-- www-ssl/admin/EngelType.php | 290 +++++------ www-ssl/admin/Recentchanges.php | 14 +- www-ssl/admin/UserPicture.php | 226 ++++---- www-ssl/admin/aktiv.php | 106 ++-- www-ssl/admin/dbUpdateFromXLS.php | 406 +++++++-------- www-ssl/admin/debug.php | 42 +- www-ssl/admin/dect.php | 86 ++-- www-ssl/admin/dect_call.php | 2 +- www-ssl/admin/faq.1.php | 2 +- www-ssl/admin/faq.php | 362 ++++++------- www-ssl/admin/free.php | 68 +-- www-ssl/admin/free_DECT.php | 68 +-- www-ssl/admin/group.php | 70 +-- www-ssl/admin/index.php | 8 +- www-ssl/admin/news.php | 188 +++---- www-ssl/admin/room.php | 320 ++++++------ www-ssl/admin/schichtplan.1.php | 0 www-ssl/admin/schichtplan.php | 620 +++++++++++----------- www-ssl/admin/schichtplan_druck.1.php | 0 www-ssl/admin/schichtplan_druck.php | 148 +++--- www-ssl/admin/shiftadd.php | 518 +++++++++---------- www-ssl/admin/sprache.php | 198 +++---- www-ssl/admin/tshirt.php | 30 +- www-ssl/admin/user.php | 240 ++++----- www-ssl/admin/userArrived.php | 38 +- www-ssl/admin/userChangeNormal.php | 226 ++++---- www-ssl/admin/userChangeSecure.php | 178 +++---- www-ssl/admin/userDefaultSetting.php | 164 +++--- www-ssl/admin/userSaveNormal.php | 210 ++++---- www-ssl/admin/userSaveSecure.php | 298 +++++------ www-ssl/css/grossbild.js | 0 www-ssl/css/style.css.old | 0 www-ssl/css/style.css.old2 | 0 www-ssl/css/style1.css | 0 www-ssl/css/style1.css.old | 0 www-ssl/css/style2.css | 0 www-ssl/css/style3.css | 0 www-ssl/css/style4.css | 0 www-ssl/css/style5.css | 0 www-ssl/css/style6.css | 0 www-ssl/css/style7.css | 0 www-ssl/css/style8.css | 0 www-ssl/css/style9.css | 0 www-ssl/faq.php | 30 +- www-ssl/index.php | 22 +- www-ssl/lageplan.php | 13 +- www-ssl/logout.php | 17 +- www-ssl/makeuser.php | 393 +++++++------- www-ssl/nonpublic/auth.php | 96 ++-- www-ssl/nonpublic/einstellungen.php | 637 ++++++++++++----------- www-ssl/nonpublic/engelbesprechung.php | 46 +- www-ssl/nonpublic/faq.php | 59 +-- www-ssl/nonpublic/index.php | 110 ++-- www-ssl/nonpublic/messages.php | 245 +++++---- www-ssl/nonpublic/myschichtplan.php | 322 ++++++------ www-ssl/nonpublic/myschichtplan_ical.php | 32 +- www-ssl/nonpublic/news.php | 13 +- www-ssl/nonpublic/news_comments.php | 70 ++- www-ssl/nonpublic/news_output.php | 36 +- www-ssl/nonpublic/schichtplan.1.php | 16 +- www-ssl/nonpublic/schichtplan.2.php | 18 +- www-ssl/nonpublic/schichtplan.php | 359 +++++++------ www-ssl/nonpublic/schichtplan_add.php | 231 ++++----- www-ssl/nonpublic/schichtplan_beamer.php | 96 ++-- www-ssl/nonpublic/waeckliste.php | 50 +- www-ssl/nonpublic/wecken.php | 102 ++-- www-ssl/pic/avatar/avatar1.gif | Bin www-ssl/pic/avatar/avatar10.gif | Bin www-ssl/pic/avatar/avatar100.gif | Bin www-ssl/pic/avatar/avatar101.gif | Bin www-ssl/pic/avatar/avatar102.gif | Bin www-ssl/pic/avatar/avatar103.gif | Bin www-ssl/pic/avatar/avatar104.gif | Bin www-ssl/pic/avatar/avatar105.gif | Bin www-ssl/pic/avatar/avatar106.gif | Bin www-ssl/pic/avatar/avatar107.gif | Bin www-ssl/pic/avatar/avatar108.gif | Bin www-ssl/pic/avatar/avatar109.gif | Bin www-ssl/pic/avatar/avatar11.gif | Bin www-ssl/pic/avatar/avatar110.gif | Bin www-ssl/pic/avatar/avatar111.gif | Bin www-ssl/pic/avatar/avatar112.gif | Bin www-ssl/pic/avatar/avatar113.gif | Bin www-ssl/pic/avatar/avatar114.gif | Bin www-ssl/pic/avatar/avatar115.gif | Bin www-ssl/pic/avatar/avatar116.gif | Bin www-ssl/pic/avatar/avatar117.gif | Bin www-ssl/pic/avatar/avatar118.gif | Bin www-ssl/pic/avatar/avatar119.gif | Bin www-ssl/pic/avatar/avatar12.gif | Bin www-ssl/pic/avatar/avatar120.gif | Bin www-ssl/pic/avatar/avatar121.gif | Bin www-ssl/pic/avatar/avatar122.gif | Bin www-ssl/pic/avatar/avatar123.gif | Bin www-ssl/pic/avatar/avatar124.gif | Bin www-ssl/pic/avatar/avatar125.gif | Bin www-ssl/pic/avatar/avatar126.gif | Bin www-ssl/pic/avatar/avatar127.gif | Bin www-ssl/pic/avatar/avatar128.gif | Bin www-ssl/pic/avatar/avatar129.gif | Bin www-ssl/pic/avatar/avatar13.gif | Bin www-ssl/pic/avatar/avatar130.gif | Bin www-ssl/pic/avatar/avatar131.gif | Bin www-ssl/pic/avatar/avatar132.gif | Bin www-ssl/pic/avatar/avatar133.gif | Bin www-ssl/pic/avatar/avatar134.gif | Bin www-ssl/pic/avatar/avatar135.gif | Bin www-ssl/pic/avatar/avatar136.gif | Bin www-ssl/pic/avatar/avatar137.gif | Bin www-ssl/pic/avatar/avatar138.gif | Bin www-ssl/pic/avatar/avatar139.gif | Bin www-ssl/pic/avatar/avatar14.gif | Bin www-ssl/pic/avatar/avatar140.gif | Bin www-ssl/pic/avatar/avatar141.gif | Bin www-ssl/pic/avatar/avatar142.gif | Bin www-ssl/pic/avatar/avatar143.gif | Bin www-ssl/pic/avatar/avatar144.gif | Bin www-ssl/pic/avatar/avatar145.gif | Bin www-ssl/pic/avatar/avatar146.gif | Bin www-ssl/pic/avatar/avatar147.gif | Bin www-ssl/pic/avatar/avatar148.gif | Bin www-ssl/pic/avatar/avatar149.gif | Bin www-ssl/pic/avatar/avatar15.gif | Bin www-ssl/pic/avatar/avatar150.gif | Bin www-ssl/pic/avatar/avatar151.gif | Bin www-ssl/pic/avatar/avatar152.gif | Bin www-ssl/pic/avatar/avatar153.gif | Bin www-ssl/pic/avatar/avatar154.gif | Bin www-ssl/pic/avatar/avatar155.gif | Bin www-ssl/pic/avatar/avatar156.gif | Bin www-ssl/pic/avatar/avatar157.gif | Bin www-ssl/pic/avatar/avatar158.gif | Bin www-ssl/pic/avatar/avatar159.gif | Bin www-ssl/pic/avatar/avatar16.gif | Bin www-ssl/pic/avatar/avatar160.gif | Bin www-ssl/pic/avatar/avatar161.gif | Bin www-ssl/pic/avatar/avatar162.gif | Bin www-ssl/pic/avatar/avatar163.gif | Bin www-ssl/pic/avatar/avatar164.gif | Bin www-ssl/pic/avatar/avatar165.gif | Bin www-ssl/pic/avatar/avatar166.gif | Bin www-ssl/pic/avatar/avatar167.gif | Bin www-ssl/pic/avatar/avatar168.gif | Bin www-ssl/pic/avatar/avatar169.gif | Bin www-ssl/pic/avatar/avatar17.gif | Bin www-ssl/pic/avatar/avatar170.gif | Bin www-ssl/pic/avatar/avatar171.gif | Bin www-ssl/pic/avatar/avatar172.gif | Bin www-ssl/pic/avatar/avatar173.gif | Bin www-ssl/pic/avatar/avatar174.gif | Bin www-ssl/pic/avatar/avatar175.gif | Bin www-ssl/pic/avatar/avatar176.gif | Bin www-ssl/pic/avatar/avatar177.gif | Bin www-ssl/pic/avatar/avatar178.gif | Bin www-ssl/pic/avatar/avatar179.gif | Bin www-ssl/pic/avatar/avatar18.gif | Bin www-ssl/pic/avatar/avatar180.gif | Bin www-ssl/pic/avatar/avatar181.gif | Bin www-ssl/pic/avatar/avatar182.gif | Bin www-ssl/pic/avatar/avatar183.gif | Bin www-ssl/pic/avatar/avatar184.gif | Bin www-ssl/pic/avatar/avatar185.gif | Bin www-ssl/pic/avatar/avatar186.gif | Bin www-ssl/pic/avatar/avatar187.gif | Bin www-ssl/pic/avatar/avatar188.gif | Bin www-ssl/pic/avatar/avatar189.gif | Bin www-ssl/pic/avatar/avatar19.gif | Bin www-ssl/pic/avatar/avatar190.gif | Bin www-ssl/pic/avatar/avatar191.gif | Bin www-ssl/pic/avatar/avatar192.gif | Bin www-ssl/pic/avatar/avatar193.gif | Bin www-ssl/pic/avatar/avatar194.gif | Bin www-ssl/pic/avatar/avatar195.gif | Bin www-ssl/pic/avatar/avatar196.gif | Bin www-ssl/pic/avatar/avatar197.gif | Bin www-ssl/pic/avatar/avatar198.gif | Bin www-ssl/pic/avatar/avatar199.gif | Bin www-ssl/pic/avatar/avatar2.gif | Bin www-ssl/pic/avatar/avatar20.gif | Bin www-ssl/pic/avatar/avatar200.gif | Bin www-ssl/pic/avatar/avatar201.gif | Bin www-ssl/pic/avatar/avatar202.gif | Bin www-ssl/pic/avatar/avatar203.gif | Bin www-ssl/pic/avatar/avatar204.gif | Bin www-ssl/pic/avatar/avatar205.gif | Bin www-ssl/pic/avatar/avatar206.gif | Bin www-ssl/pic/avatar/avatar207.gif | Bin www-ssl/pic/avatar/avatar208.gif | Bin www-ssl/pic/avatar/avatar209.gif | Bin www-ssl/pic/avatar/avatar21.gif | Bin www-ssl/pic/avatar/avatar210.gif | Bin www-ssl/pic/avatar/avatar211.gif | Bin www-ssl/pic/avatar/avatar212.gif | Bin www-ssl/pic/avatar/avatar213.gif | Bin www-ssl/pic/avatar/avatar214.gif | Bin www-ssl/pic/avatar/avatar215.gif | Bin www-ssl/pic/avatar/avatar216.gif | Bin www-ssl/pic/avatar/avatar217.gif | Bin www-ssl/pic/avatar/avatar218.gif | Bin www-ssl/pic/avatar/avatar219.gif | Bin www-ssl/pic/avatar/avatar22.gif | Bin www-ssl/pic/avatar/avatar220.gif | Bin www-ssl/pic/avatar/avatar221.gif | Bin www-ssl/pic/avatar/avatar222.gif | Bin www-ssl/pic/avatar/avatar223.gif | Bin www-ssl/pic/avatar/avatar224.gif | Bin www-ssl/pic/avatar/avatar225.gif | Bin www-ssl/pic/avatar/avatar226.gif | Bin www-ssl/pic/avatar/avatar227.gif | Bin www-ssl/pic/avatar/avatar228.gif | Bin www-ssl/pic/avatar/avatar229.gif | Bin www-ssl/pic/avatar/avatar23.gif | Bin www-ssl/pic/avatar/avatar230.gif | Bin www-ssl/pic/avatar/avatar231.gif | Bin www-ssl/pic/avatar/avatar232.gif | Bin www-ssl/pic/avatar/avatar233.gif | Bin www-ssl/pic/avatar/avatar234.gif | Bin www-ssl/pic/avatar/avatar235.gif | Bin www-ssl/pic/avatar/avatar236.gif | Bin www-ssl/pic/avatar/avatar237.gif | Bin www-ssl/pic/avatar/avatar238.gif | Bin www-ssl/pic/avatar/avatar239.gif | Bin www-ssl/pic/avatar/avatar24.gif | Bin www-ssl/pic/avatar/avatar240.gif | Bin www-ssl/pic/avatar/avatar241.gif | Bin www-ssl/pic/avatar/avatar242.gif | Bin www-ssl/pic/avatar/avatar243.gif | Bin www-ssl/pic/avatar/avatar244.gif | Bin www-ssl/pic/avatar/avatar245.gif | Bin www-ssl/pic/avatar/avatar246.gif | Bin www-ssl/pic/avatar/avatar247.gif | Bin www-ssl/pic/avatar/avatar248.gif | Bin www-ssl/pic/avatar/avatar249.gif | Bin www-ssl/pic/avatar/avatar25.gif | Bin www-ssl/pic/avatar/avatar250.gif | Bin www-ssl/pic/avatar/avatar251.gif | Bin www-ssl/pic/avatar/avatar252.gif | Bin www-ssl/pic/avatar/avatar253.gif | Bin www-ssl/pic/avatar/avatar254.gif | Bin www-ssl/pic/avatar/avatar255.gif | Bin www-ssl/pic/avatar/avatar256.gif | Bin www-ssl/pic/avatar/avatar257.gif | Bin www-ssl/pic/avatar/avatar258.gif | Bin www-ssl/pic/avatar/avatar259.gif | Bin www-ssl/pic/avatar/avatar26.gif | Bin www-ssl/pic/avatar/avatar260.gif | Bin www-ssl/pic/avatar/avatar261.gif | Bin www-ssl/pic/avatar/avatar262.gif | Bin www-ssl/pic/avatar/avatar263.gif | Bin www-ssl/pic/avatar/avatar264.gif | Bin www-ssl/pic/avatar/avatar265.gif | Bin www-ssl/pic/avatar/avatar266.gif | Bin www-ssl/pic/avatar/avatar267.gif | Bin www-ssl/pic/avatar/avatar268.gif | Bin www-ssl/pic/avatar/avatar269.gif | Bin www-ssl/pic/avatar/avatar27.gif | Bin www-ssl/pic/avatar/avatar270.gif | Bin www-ssl/pic/avatar/avatar271.gif | Bin www-ssl/pic/avatar/avatar272.gif | Bin www-ssl/pic/avatar/avatar273.gif | Bin www-ssl/pic/avatar/avatar274.gif | Bin www-ssl/pic/avatar/avatar275.gif | Bin www-ssl/pic/avatar/avatar276.gif | Bin www-ssl/pic/avatar/avatar277.gif | Bin www-ssl/pic/avatar/avatar278.gif | Bin www-ssl/pic/avatar/avatar279.gif | Bin www-ssl/pic/avatar/avatar28.gif | Bin www-ssl/pic/avatar/avatar280.gif | Bin www-ssl/pic/avatar/avatar281.gif | Bin www-ssl/pic/avatar/avatar282.gif | Bin www-ssl/pic/avatar/avatar283.gif | Bin www-ssl/pic/avatar/avatar284.gif | Bin www-ssl/pic/avatar/avatar285.gif | Bin www-ssl/pic/avatar/avatar286.gif | Bin www-ssl/pic/avatar/avatar287.gif | Bin www-ssl/pic/avatar/avatar288.gif | Bin www-ssl/pic/avatar/avatar289.gif | Bin www-ssl/pic/avatar/avatar29.gif | Bin www-ssl/pic/avatar/avatar290.gif | Bin www-ssl/pic/avatar/avatar291.gif | Bin www-ssl/pic/avatar/avatar292.gif | Bin www-ssl/pic/avatar/avatar293.gif | Bin www-ssl/pic/avatar/avatar294.gif | Bin www-ssl/pic/avatar/avatar295.gif | Bin www-ssl/pic/avatar/avatar296.gif | Bin www-ssl/pic/avatar/avatar297.gif | Bin www-ssl/pic/avatar/avatar298.gif | Bin www-ssl/pic/avatar/avatar299.gif | Bin www-ssl/pic/avatar/avatar3.gif | Bin www-ssl/pic/avatar/avatar30.gif | Bin www-ssl/pic/avatar/avatar300.gif | Bin www-ssl/pic/avatar/avatar301.gif | Bin www-ssl/pic/avatar/avatar302.gif | Bin www-ssl/pic/avatar/avatar303.gif | Bin www-ssl/pic/avatar/avatar304.gif | Bin www-ssl/pic/avatar/avatar305.gif | Bin www-ssl/pic/avatar/avatar306.gif | Bin www-ssl/pic/avatar/avatar307.gif | Bin www-ssl/pic/avatar/avatar308.gif | Bin www-ssl/pic/avatar/avatar309.gif | Bin www-ssl/pic/avatar/avatar31.gif | Bin www-ssl/pic/avatar/avatar310.gif | Bin www-ssl/pic/avatar/avatar311.gif | Bin www-ssl/pic/avatar/avatar312.gif | Bin www-ssl/pic/avatar/avatar313.gif | Bin www-ssl/pic/avatar/avatar314.gif | Bin www-ssl/pic/avatar/avatar315.gif | Bin www-ssl/pic/avatar/avatar316.gif | Bin www-ssl/pic/avatar/avatar317.gif | Bin www-ssl/pic/avatar/avatar318.gif | Bin www-ssl/pic/avatar/avatar319.gif | Bin www-ssl/pic/avatar/avatar32.gif | Bin www-ssl/pic/avatar/avatar320.gif | Bin www-ssl/pic/avatar/avatar321.gif | Bin www-ssl/pic/avatar/avatar322.gif | Bin www-ssl/pic/avatar/avatar323.gif | Bin www-ssl/pic/avatar/avatar324.gif | Bin www-ssl/pic/avatar/avatar325.gif | Bin www-ssl/pic/avatar/avatar326.gif | Bin www-ssl/pic/avatar/avatar327.gif | Bin www-ssl/pic/avatar/avatar328.gif | Bin www-ssl/pic/avatar/avatar329.gif | Bin www-ssl/pic/avatar/avatar33.gif | Bin www-ssl/pic/avatar/avatar330.gif | Bin www-ssl/pic/avatar/avatar331.gif | Bin www-ssl/pic/avatar/avatar332.gif | Bin www-ssl/pic/avatar/avatar333.gif | Bin www-ssl/pic/avatar/avatar334.gif | Bin www-ssl/pic/avatar/avatar335.gif | Bin www-ssl/pic/avatar/avatar336.gif | Bin www-ssl/pic/avatar/avatar337.gif | Bin www-ssl/pic/avatar/avatar338.gif | Bin www-ssl/pic/avatar/avatar339.gif | Bin www-ssl/pic/avatar/avatar34.gif | Bin www-ssl/pic/avatar/avatar340.gif | Bin www-ssl/pic/avatar/avatar341.gif | Bin www-ssl/pic/avatar/avatar342.gif | Bin www-ssl/pic/avatar/avatar343.gif | Bin www-ssl/pic/avatar/avatar344.gif | Bin www-ssl/pic/avatar/avatar345.gif | Bin www-ssl/pic/avatar/avatar346.gif | Bin www-ssl/pic/avatar/avatar347.gif | Bin www-ssl/pic/avatar/avatar348.gif | Bin www-ssl/pic/avatar/avatar349.gif | Bin www-ssl/pic/avatar/avatar35.gif | Bin www-ssl/pic/avatar/avatar350.gif | Bin www-ssl/pic/avatar/avatar351.gif | Bin www-ssl/pic/avatar/avatar352.gif | Bin www-ssl/pic/avatar/avatar353.gif | Bin www-ssl/pic/avatar/avatar354.gif | Bin www-ssl/pic/avatar/avatar355.gif | Bin www-ssl/pic/avatar/avatar356.gif | Bin www-ssl/pic/avatar/avatar357.gif | Bin www-ssl/pic/avatar/avatar358.gif | Bin www-ssl/pic/avatar/avatar359.gif | Bin www-ssl/pic/avatar/avatar36.gif | Bin www-ssl/pic/avatar/avatar360.gif | Bin www-ssl/pic/avatar/avatar361.gif | Bin www-ssl/pic/avatar/avatar362.gif | Bin www-ssl/pic/avatar/avatar363.gif | Bin www-ssl/pic/avatar/avatar364.gif | Bin www-ssl/pic/avatar/avatar365.gif | Bin www-ssl/pic/avatar/avatar366.gif | Bin www-ssl/pic/avatar/avatar367.gif | Bin www-ssl/pic/avatar/avatar368.gif | Bin www-ssl/pic/avatar/avatar369.gif | Bin www-ssl/pic/avatar/avatar37.gif | Bin www-ssl/pic/avatar/avatar370.gif | Bin www-ssl/pic/avatar/avatar371.gif | Bin www-ssl/pic/avatar/avatar372.gif | Bin www-ssl/pic/avatar/avatar373.gif | Bin www-ssl/pic/avatar/avatar374.gif | Bin www-ssl/pic/avatar/avatar375.gif | Bin www-ssl/pic/avatar/avatar376.gif | Bin www-ssl/pic/avatar/avatar377.gif | Bin www-ssl/pic/avatar/avatar378.gif | Bin www-ssl/pic/avatar/avatar379.gif | Bin www-ssl/pic/avatar/avatar38.gif | Bin www-ssl/pic/avatar/avatar380.gif | Bin www-ssl/pic/avatar/avatar381.gif | Bin www-ssl/pic/avatar/avatar382.gif | Bin www-ssl/pic/avatar/avatar383.gif | Bin www-ssl/pic/avatar/avatar384.gif | Bin www-ssl/pic/avatar/avatar385.gif | Bin www-ssl/pic/avatar/avatar386.gif | Bin www-ssl/pic/avatar/avatar387.gif | Bin www-ssl/pic/avatar/avatar388.gif | Bin www-ssl/pic/avatar/avatar389.gif | Bin www-ssl/pic/avatar/avatar39.gif | Bin www-ssl/pic/avatar/avatar390.gif | Bin www-ssl/pic/avatar/avatar391.gif | Bin www-ssl/pic/avatar/avatar392.gif | Bin www-ssl/pic/avatar/avatar393.gif | Bin www-ssl/pic/avatar/avatar394.gif | Bin www-ssl/pic/avatar/avatar395.gif | Bin www-ssl/pic/avatar/avatar396.gif | Bin www-ssl/pic/avatar/avatar397.gif | Bin www-ssl/pic/avatar/avatar398.gif | Bin www-ssl/pic/avatar/avatar399.gif | Bin www-ssl/pic/avatar/avatar4.gif | Bin www-ssl/pic/avatar/avatar40.gif | Bin www-ssl/pic/avatar/avatar400.gif | Bin www-ssl/pic/avatar/avatar401.gif | Bin www-ssl/pic/avatar/avatar402.gif | Bin www-ssl/pic/avatar/avatar403.gif | Bin www-ssl/pic/avatar/avatar404.gif | Bin www-ssl/pic/avatar/avatar405.gif | Bin www-ssl/pic/avatar/avatar406.gif | Bin www-ssl/pic/avatar/avatar407.gif | Bin www-ssl/pic/avatar/avatar408.gif | Bin www-ssl/pic/avatar/avatar409.gif | Bin www-ssl/pic/avatar/avatar41.gif | Bin www-ssl/pic/avatar/avatar410.gif | Bin www-ssl/pic/avatar/avatar411.gif | Bin www-ssl/pic/avatar/avatar412.gif | Bin www-ssl/pic/avatar/avatar413.gif | Bin www-ssl/pic/avatar/avatar414.gif | Bin www-ssl/pic/avatar/avatar415.gif | Bin www-ssl/pic/avatar/avatar416.gif | Bin www-ssl/pic/avatar/avatar417.gif | Bin www-ssl/pic/avatar/avatar418.gif | Bin www-ssl/pic/avatar/avatar419.gif | Bin www-ssl/pic/avatar/avatar42.gif | Bin www-ssl/pic/avatar/avatar420.gif | Bin www-ssl/pic/avatar/avatar421.gif | Bin www-ssl/pic/avatar/avatar422.gif | Bin www-ssl/pic/avatar/avatar423.gif | Bin www-ssl/pic/avatar/avatar424.gif | Bin www-ssl/pic/avatar/avatar425.gif | Bin www-ssl/pic/avatar/avatar426.gif | Bin www-ssl/pic/avatar/avatar427.gif | Bin www-ssl/pic/avatar/avatar428.gif | Bin www-ssl/pic/avatar/avatar429.gif | Bin www-ssl/pic/avatar/avatar43.gif | Bin www-ssl/pic/avatar/avatar430.gif | Bin www-ssl/pic/avatar/avatar431.gif | Bin www-ssl/pic/avatar/avatar432.gif | Bin www-ssl/pic/avatar/avatar433.gif | Bin www-ssl/pic/avatar/avatar434.gif | Bin www-ssl/pic/avatar/avatar435.gif | Bin www-ssl/pic/avatar/avatar436.gif | Bin www-ssl/pic/avatar/avatar437.gif | Bin www-ssl/pic/avatar/avatar438.gif | Bin www-ssl/pic/avatar/avatar439.gif | Bin www-ssl/pic/avatar/avatar44.gif | Bin www-ssl/pic/avatar/avatar440.gif | Bin www-ssl/pic/avatar/avatar441.gif | Bin www-ssl/pic/avatar/avatar442.gif | Bin www-ssl/pic/avatar/avatar443.gif | Bin www-ssl/pic/avatar/avatar444.gif | Bin www-ssl/pic/avatar/avatar445.gif | Bin www-ssl/pic/avatar/avatar446.gif | Bin www-ssl/pic/avatar/avatar447.gif | Bin www-ssl/pic/avatar/avatar448.gif | Bin www-ssl/pic/avatar/avatar449.gif | Bin www-ssl/pic/avatar/avatar45.gif | Bin www-ssl/pic/avatar/avatar450.gif | Bin www-ssl/pic/avatar/avatar451.gif | Bin www-ssl/pic/avatar/avatar452.gif | Bin www-ssl/pic/avatar/avatar453.gif | Bin www-ssl/pic/avatar/avatar454.gif | Bin www-ssl/pic/avatar/avatar455.gif | Bin www-ssl/pic/avatar/avatar456.gif | Bin www-ssl/pic/avatar/avatar457.gif | Bin www-ssl/pic/avatar/avatar458.gif | Bin www-ssl/pic/avatar/avatar459.gif | Bin www-ssl/pic/avatar/avatar46.gif | Bin www-ssl/pic/avatar/avatar460.gif | Bin www-ssl/pic/avatar/avatar461.gif | Bin www-ssl/pic/avatar/avatar462.gif | Bin www-ssl/pic/avatar/avatar463.gif | Bin www-ssl/pic/avatar/avatar464.gif | Bin www-ssl/pic/avatar/avatar465.gif | Bin www-ssl/pic/avatar/avatar466.gif | Bin www-ssl/pic/avatar/avatar467.gif | Bin www-ssl/pic/avatar/avatar468.gif | Bin www-ssl/pic/avatar/avatar469.gif | Bin www-ssl/pic/avatar/avatar47.gif | Bin www-ssl/pic/avatar/avatar470.gif | Bin www-ssl/pic/avatar/avatar471.gif | Bin www-ssl/pic/avatar/avatar472.gif | Bin www-ssl/pic/avatar/avatar473.gif | Bin www-ssl/pic/avatar/avatar474.gif | Bin www-ssl/pic/avatar/avatar475.gif | Bin www-ssl/pic/avatar/avatar476.gif | Bin www-ssl/pic/avatar/avatar477.gif | Bin www-ssl/pic/avatar/avatar478.gif | Bin www-ssl/pic/avatar/avatar479.gif | Bin www-ssl/pic/avatar/avatar48.gif | Bin www-ssl/pic/avatar/avatar480.gif | Bin www-ssl/pic/avatar/avatar481.gif | Bin www-ssl/pic/avatar/avatar482.gif | Bin www-ssl/pic/avatar/avatar483.gif | Bin www-ssl/pic/avatar/avatar484.gif | Bin www-ssl/pic/avatar/avatar485.gif | Bin www-ssl/pic/avatar/avatar486.gif | Bin www-ssl/pic/avatar/avatar487.gif | Bin www-ssl/pic/avatar/avatar488.gif | Bin www-ssl/pic/avatar/avatar489.gif | Bin www-ssl/pic/avatar/avatar49.gif | Bin www-ssl/pic/avatar/avatar490.gif | Bin www-ssl/pic/avatar/avatar491.gif | Bin www-ssl/pic/avatar/avatar492.gif | Bin www-ssl/pic/avatar/avatar493.gif | Bin www-ssl/pic/avatar/avatar494.gif | Bin www-ssl/pic/avatar/avatar495.gif | Bin www-ssl/pic/avatar/avatar496.gif | Bin www-ssl/pic/avatar/avatar497.gif | Bin www-ssl/pic/avatar/avatar498.gif | Bin www-ssl/pic/avatar/avatar499.gif | Bin www-ssl/pic/avatar/avatar5.gif | Bin www-ssl/pic/avatar/avatar50.gif | Bin www-ssl/pic/avatar/avatar51.gif | Bin www-ssl/pic/avatar/avatar52.gif | Bin www-ssl/pic/avatar/avatar53.gif | Bin www-ssl/pic/avatar/avatar54.gif | Bin www-ssl/pic/avatar/avatar55.gif | Bin www-ssl/pic/avatar/avatar56.gif | Bin www-ssl/pic/avatar/avatar57.gif | Bin www-ssl/pic/avatar/avatar58.gif | Bin www-ssl/pic/avatar/avatar59.gif | Bin www-ssl/pic/avatar/avatar6.gif | Bin www-ssl/pic/avatar/avatar60.gif | Bin www-ssl/pic/avatar/avatar61.gif | Bin www-ssl/pic/avatar/avatar62.gif | Bin www-ssl/pic/avatar/avatar63.gif | Bin www-ssl/pic/avatar/avatar64.gif | Bin www-ssl/pic/avatar/avatar65.gif | Bin www-ssl/pic/avatar/avatar66.gif | Bin www-ssl/pic/avatar/avatar67.gif | Bin www-ssl/pic/avatar/avatar68.gif | Bin www-ssl/pic/avatar/avatar69.gif | Bin www-ssl/pic/avatar/avatar7.gif | Bin www-ssl/pic/avatar/avatar70.gif | Bin www-ssl/pic/avatar/avatar71.gif | Bin www-ssl/pic/avatar/avatar72.gif | Bin www-ssl/pic/avatar/avatar73.gif | Bin www-ssl/pic/avatar/avatar74.gif | Bin www-ssl/pic/avatar/avatar75.gif | Bin www-ssl/pic/avatar/avatar76.gif | Bin www-ssl/pic/avatar/avatar77.gif | Bin www-ssl/pic/avatar/avatar78.gif | Bin www-ssl/pic/avatar/avatar79.gif | Bin www-ssl/pic/avatar/avatar8.gif | Bin www-ssl/pic/avatar/avatar80.gif | Bin www-ssl/pic/avatar/avatar81.gif | Bin www-ssl/pic/avatar/avatar82.gif | Bin www-ssl/pic/avatar/avatar83.gif | Bin www-ssl/pic/avatar/avatar84.gif | Bin www-ssl/pic/avatar/avatar85.gif | Bin www-ssl/pic/avatar/avatar86.gif | Bin www-ssl/pic/avatar/avatar87.gif | Bin www-ssl/pic/avatar/avatar88.gif | Bin www-ssl/pic/avatar/avatar89.gif | Bin www-ssl/pic/avatar/avatar9.gif | Bin www-ssl/pic/avatar/avatar90.gif | Bin www-ssl/pic/avatar/avatar91.gif | Bin www-ssl/pic/avatar/avatar92.gif | Bin www-ssl/pic/avatar/avatar93.gif | Bin www-ssl/pic/avatar/avatar94.gif | Bin www-ssl/pic/avatar/avatar95.gif | Bin www-ssl/pic/avatar/avatar96.gif | Bin www-ssl/pic/avatar/avatar97.gif | Bin www-ssl/pic/avatar/avatar98.gif | Bin www-ssl/pic/avatar/avatar99.gif | Bin www-ssl/pic/external.png | Bin www-ssl/pic/flag/de.gif | Bin www-ssl/pic/flag/en.gif | Bin www-ssl/pic/himmel.png | Bin www-ssl/pic/himmel_w.png | Bin www-ssl/pic/smiles/aerger2.gif | Bin www-ssl/pic/smiles/alien.gif | Bin www-ssl/pic/smiles/blush.gif | Bin www-ssl/pic/smiles/boggle.gif | Bin www-ssl/pic/smiles/bounce.gif | Bin www-ssl/pic/smiles/bun.gif | Bin www-ssl/pic/smiles/candycane.gif | Bin www-ssl/pic/smiles/cheesy.gif | Bin www-ssl/pic/smiles/dead.gif | Bin www-ssl/pic/smiles/depressed.gif | Bin www-ssl/pic/smiles/ginger.gif | Bin www-ssl/pic/smiles/hirsch1.gif | Bin www-ssl/pic/smiles/huh.gif | Bin www-ssl/pic/smiles/icon_arrow.gif | Bin www-ssl/pic/smiles/icon_biggrin.gif | Bin www-ssl/pic/smiles/icon_confused.gif | Bin www-ssl/pic/smiles/icon_cool.gif | Bin www-ssl/pic/smiles/icon_cry.gif | Bin www-ssl/pic/smiles/icon_eek.gif | Bin www-ssl/pic/smiles/icon_evil.gif | Bin www-ssl/pic/smiles/icon_exclaim.gif | Bin www-ssl/pic/smiles/icon_frown.gif | Bin www-ssl/pic/smiles/icon_idea.gif | Bin www-ssl/pic/smiles/icon_lol.gif | Bin www-ssl/pic/smiles/icon_mad.gif | Bin www-ssl/pic/smiles/icon_mrgreen.gif | Bin www-ssl/pic/smiles/icon_neutral.gif | Bin www-ssl/pic/smiles/icon_question.gif | Bin www-ssl/pic/smiles/icon_razz.gif | Bin www-ssl/pic/smiles/icon_redface.gif | Bin www-ssl/pic/smiles/icon_rolleyes.gif | Bin www-ssl/pic/smiles/icon_sad.gif | Bin www-ssl/pic/smiles/icon_smile.gif | Bin www-ssl/pic/smiles/icon_surprised.gif | Bin www-ssl/pic/smiles/icon_twisted.gif | Bin www-ssl/pic/smiles/icon_wind.gif | Bin www-ssl/pic/smiles/koenig1.gif | Bin www-ssl/pic/smiles/laser1.gif | Bin www-ssl/pic/smiles/love1.gif | Bin www-ssl/pic/smiles/moo.gif | Bin www-ssl/pic/smiles/nuts.gif | Bin www-ssl/pic/smiles/robin.gif | Bin www-ssl/pic/smiles/sheep.gif | Bin www-ssl/pic/smiles/sick.gif | Bin www-ssl/pic/smiles/sleep.gif | Bin www-ssl/pic/smiles/soppy.gif | Bin www-ssl/pic/smiles/stress.gif | Bin www-ssl/pic/smiles/sweet.gif | Bin www-ssl/pic/smiles/tired.gif | Bin www-ssl/pic/smiles/urgh.gif | Bin www-ssl/pic/smiles/winken1.gif | Bin www-ssl/pic/smiles/worm.gif | Bin www-ssl/pic/smiles/worry.gif | Bin www/404.php | 4 +- www/index.php | 5 +- 673 files changed, 6235 insertions(+), 6575 deletions(-) mode change 100755 => 100644 DB/ChangeLog.sql mode change 100755 => 100644 DB/Himmel.sql mode change 100755 => 100644 DB/SDrohnen.sql mode change 100755 => 100644 DB/Sprache.sql mode change 100755 => 100644 default-conf/var_www_includes/config.php mode change 100755 => 100644 default-conf/var_www_includes/config_db.php mode change 100755 => 100644 default-conf/var_www_includes/config_jabber.php mode change 100755 => 100644 includes/UserCVS.php mode change 100755 => 100644 includes/crypt.php mode change 100755 => 100644 includes/error_handler.php mode change 100755 => 100644 includes/footer.php mode change 100755 => 100644 includes/funktion_activeUser.php mode change 100755 => 100644 includes/funktion_cron.php mode change 100755 => 100644 includes/funktion_db_list.php mode change 100755 => 100644 includes/funktion_faq.php mode change 100755 => 100644 includes/funktion_jabber.php mode change 100755 => 100644 includes/funktion_lang.php mode change 100755 => 100644 includes/funktion_menu.php mode change 100755 => 100644 includes/funktion_modem.php mode change 100755 => 100644 includes/funktion_schichtplan.php mode change 100755 => 100644 includes/funktion_schichtplan_Tage.php mode change 100755 => 100644 includes/funktion_schichtplan_aray.php mode change 100755 => 100644 includes/funktion_schichtplan_beamer.php mode change 100755 => 100644 includes/funktion_user.php mode change 100755 => 100644 includes/funktion_xml.php mode change 100755 => 100644 includes/funktion_xml_room.php mode change 100755 => 100644 includes/funktion_xml_schudle.php mode change 100755 => 100644 includes/funktionen.php mode change 100755 => 100644 includes/header.php mode change 100755 => 100644 includes/header_start.php mode change 100755 => 100644 includes/login_eingabefeld.php mode change 100755 => 100644 includes/menu.php mode change 100755 => 100644 includes/secure.php mode change 100755 => 100644 txt/LICENSE mode change 100755 => 100644 www-ssl/admin/EngelType.php mode change 100755 => 100644 www-ssl/admin/Recentchanges.php mode change 100755 => 100644 www-ssl/admin/UserPicture.php mode change 100755 => 100644 www-ssl/admin/aktiv.php mode change 100755 => 100644 www-ssl/admin/dbUpdateFromXLS.php mode change 100755 => 100644 www-ssl/admin/debug.php mode change 100755 => 100644 www-ssl/admin/dect.php mode change 100755 => 100644 www-ssl/admin/dect_call.php mode change 100755 => 100644 www-ssl/admin/faq.1.php mode change 100755 => 100644 www-ssl/admin/faq.php mode change 100755 => 100644 www-ssl/admin/free.php mode change 100755 => 100644 www-ssl/admin/free_DECT.php mode change 100755 => 100644 www-ssl/admin/group.php mode change 100755 => 100644 www-ssl/admin/index.php mode change 100755 => 100644 www-ssl/admin/news.php mode change 100755 => 100644 www-ssl/admin/room.php mode change 100755 => 100644 www-ssl/admin/schichtplan.1.php mode change 100755 => 100644 www-ssl/admin/schichtplan.php mode change 100755 => 100644 www-ssl/admin/schichtplan_druck.1.php mode change 100755 => 100644 www-ssl/admin/schichtplan_druck.php mode change 100755 => 100644 www-ssl/admin/shiftadd.php mode change 100755 => 100644 www-ssl/admin/sprache.php mode change 100755 => 100644 www-ssl/admin/tshirt.php mode change 100755 => 100644 www-ssl/admin/user.php mode change 100755 => 100644 www-ssl/admin/userArrived.php mode change 100755 => 100644 www-ssl/admin/userChangeNormal.php mode change 100755 => 100644 www-ssl/admin/userChangeSecure.php mode change 100755 => 100644 www-ssl/admin/userDefaultSetting.php mode change 100755 => 100644 www-ssl/admin/userSaveNormal.php mode change 100755 => 100644 www-ssl/admin/userSaveSecure.php mode change 100755 => 100644 www-ssl/css/grossbild.js mode change 100755 => 100644 www-ssl/css/style.css.old mode change 100755 => 100644 www-ssl/css/style.css.old2 mode change 100755 => 100644 www-ssl/css/style1.css mode change 100755 => 100644 www-ssl/css/style1.css.old mode change 100755 => 100644 www-ssl/css/style2.css mode change 100755 => 100644 www-ssl/css/style3.css mode change 100755 => 100644 www-ssl/css/style4.css mode change 100755 => 100644 www-ssl/css/style5.css mode change 100755 => 100644 www-ssl/css/style6.css mode change 100755 => 100644 www-ssl/css/style7.css mode change 100755 => 100644 www-ssl/css/style8.css mode change 100755 => 100644 www-ssl/css/style9.css mode change 100755 => 100644 www-ssl/faq.php mode change 100755 => 100644 www-ssl/index.php mode change 100755 => 100644 www-ssl/lageplan.php mode change 100755 => 100644 www-ssl/logout.php mode change 100755 => 100644 www-ssl/makeuser.php mode change 100755 => 100644 www-ssl/nonpublic/auth.php mode change 100755 => 100644 www-ssl/nonpublic/einstellungen.php mode change 100755 => 100644 www-ssl/nonpublic/engelbesprechung.php mode change 100755 => 100644 www-ssl/nonpublic/faq.php mode change 100755 => 100644 www-ssl/nonpublic/index.php mode change 100755 => 100644 www-ssl/nonpublic/messages.php mode change 100755 => 100644 www-ssl/nonpublic/myschichtplan.php mode change 100755 => 100644 www-ssl/nonpublic/myschichtplan_ical.php mode change 100755 => 100644 www-ssl/nonpublic/news.php mode change 100755 => 100644 www-ssl/nonpublic/news_comments.php mode change 100755 => 100644 www-ssl/nonpublic/news_output.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.1.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.2.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan_add.php mode change 100755 => 100644 www-ssl/nonpublic/schichtplan_beamer.php mode change 100755 => 100644 www-ssl/nonpublic/waeckliste.php mode change 100755 => 100644 www-ssl/nonpublic/wecken.php mode change 100755 => 100644 www-ssl/pic/avatar/avatar1.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar10.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar100.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar101.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar102.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar103.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar104.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar105.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar106.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar107.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar108.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar109.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar11.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar110.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar111.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar112.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar113.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar114.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar115.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar116.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar117.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar118.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar119.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar12.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar120.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar121.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar122.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar123.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar124.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar125.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar126.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar127.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar128.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar129.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar13.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar130.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar131.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar132.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar133.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar134.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar135.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar136.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar137.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar138.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar139.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar14.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar140.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar141.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar142.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar143.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar144.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar145.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar146.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar147.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar148.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar149.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar15.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar150.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar151.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar152.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar153.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar154.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar155.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar156.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar157.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar158.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar159.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar16.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar160.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar161.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar162.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar163.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar164.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar165.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar166.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar167.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar168.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar169.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar17.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar170.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar171.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar172.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar173.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar174.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar175.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar176.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar177.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar178.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar179.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar18.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar180.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar181.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar182.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar183.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar184.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar185.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar186.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar187.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar188.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar189.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar19.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar190.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar191.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar192.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar193.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar194.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar195.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar196.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar197.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar198.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar199.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar2.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar20.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar200.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar201.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar202.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar203.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar204.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar205.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar206.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar207.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar208.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar209.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar21.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar210.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar211.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar212.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar213.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar214.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar215.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar216.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar217.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar218.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar219.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar22.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar220.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar221.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar222.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar223.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar224.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar225.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar226.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar227.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar228.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar229.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar23.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar230.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar231.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar232.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar233.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar234.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar235.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar236.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar237.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar238.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar239.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar24.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar240.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar241.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar242.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar243.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar244.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar245.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar246.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar247.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar248.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar249.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar25.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar250.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar251.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar252.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar253.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar254.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar255.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar256.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar257.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar258.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar259.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar26.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar260.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar261.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar262.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar263.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar264.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar265.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar266.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar267.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar268.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar269.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar27.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar270.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar271.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar272.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar273.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar274.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar275.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar276.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar277.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar278.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar279.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar28.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar280.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar281.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar282.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar283.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar284.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar285.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar286.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar287.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar288.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar289.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar29.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar290.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar291.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar292.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar293.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar294.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar295.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar296.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar297.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar298.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar299.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar3.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar30.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar300.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar301.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar302.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar303.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar304.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar305.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar306.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar307.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar308.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar309.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar31.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar310.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar311.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar312.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar313.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar314.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar315.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar316.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar317.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar318.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar319.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar32.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar320.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar321.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar322.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar323.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar324.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar325.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar326.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar327.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar328.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar329.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar33.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar330.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar331.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar332.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar333.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar334.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar335.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar336.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar337.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar338.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar339.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar34.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar340.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar341.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar342.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar343.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar344.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar345.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar346.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar347.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar348.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar349.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar35.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar350.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar351.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar352.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar353.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar354.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar355.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar356.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar357.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar358.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar359.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar36.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar360.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar361.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar362.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar363.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar364.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar365.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar366.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar367.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar368.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar369.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar37.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar370.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar371.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar372.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar373.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar374.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar375.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar376.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar377.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar378.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar379.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar38.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar380.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar381.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar382.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar383.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar384.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar385.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar386.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar387.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar388.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar389.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar39.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar390.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar391.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar392.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar393.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar394.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar395.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar396.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar397.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar398.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar399.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar4.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar40.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar400.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar401.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar402.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar403.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar404.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar405.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar406.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar407.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar408.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar409.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar41.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar410.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar411.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar412.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar413.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar414.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar415.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar416.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar417.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar418.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar419.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar42.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar420.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar421.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar422.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar423.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar424.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar425.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar426.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar427.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar428.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar429.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar43.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar430.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar431.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar432.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar433.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar434.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar435.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar436.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar437.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar438.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar439.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar44.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar440.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar441.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar442.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar443.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar444.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar445.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar446.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar447.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar448.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar449.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar45.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar450.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar451.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar452.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar453.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar454.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar455.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar456.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar457.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar458.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar459.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar46.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar460.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar461.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar462.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar463.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar464.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar465.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar466.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar467.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar468.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar469.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar47.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar470.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar471.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar472.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar473.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar474.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar475.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar476.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar477.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar478.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar479.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar48.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar480.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar481.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar482.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar483.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar484.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar485.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar486.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar487.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar488.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar489.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar49.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar490.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar491.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar492.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar493.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar494.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar495.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar496.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar497.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar498.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar499.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar5.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar50.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar51.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar52.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar53.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar54.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar55.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar56.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar57.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar58.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar59.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar6.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar60.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar61.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar62.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar63.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar64.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar65.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar66.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar67.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar68.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar69.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar7.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar70.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar71.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar72.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar73.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar74.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar75.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar76.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar77.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar78.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar79.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar8.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar80.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar81.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar82.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar83.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar84.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar85.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar86.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar87.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar88.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar89.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar9.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar90.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar91.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar92.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar93.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar94.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar95.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar96.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar97.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar98.gif mode change 100755 => 100644 www-ssl/pic/avatar/avatar99.gif mode change 100755 => 100644 www-ssl/pic/external.png mode change 100755 => 100644 www-ssl/pic/flag/de.gif mode change 100755 => 100644 www-ssl/pic/flag/en.gif mode change 100755 => 100644 www-ssl/pic/himmel.png mode change 100755 => 100644 www-ssl/pic/himmel_w.png mode change 100755 => 100644 www-ssl/pic/smiles/aerger2.gif mode change 100755 => 100644 www-ssl/pic/smiles/alien.gif mode change 100755 => 100644 www-ssl/pic/smiles/blush.gif mode change 100755 => 100644 www-ssl/pic/smiles/boggle.gif mode change 100755 => 100644 www-ssl/pic/smiles/bounce.gif mode change 100755 => 100644 www-ssl/pic/smiles/bun.gif mode change 100755 => 100644 www-ssl/pic/smiles/candycane.gif mode change 100755 => 100644 www-ssl/pic/smiles/cheesy.gif mode change 100755 => 100644 www-ssl/pic/smiles/dead.gif mode change 100755 => 100644 www-ssl/pic/smiles/depressed.gif mode change 100755 => 100644 www-ssl/pic/smiles/ginger.gif mode change 100755 => 100644 www-ssl/pic/smiles/hirsch1.gif mode change 100755 => 100644 www-ssl/pic/smiles/huh.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_arrow.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_biggrin.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_confused.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_cool.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_cry.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_eek.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_evil.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_exclaim.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_frown.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_idea.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_lol.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_mad.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_mrgreen.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_neutral.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_question.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_razz.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_redface.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_rolleyes.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_sad.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_smile.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_surprised.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_twisted.gif mode change 100755 => 100644 www-ssl/pic/smiles/icon_wind.gif mode change 100755 => 100644 www-ssl/pic/smiles/koenig1.gif mode change 100755 => 100644 www-ssl/pic/smiles/laser1.gif mode change 100755 => 100644 www-ssl/pic/smiles/love1.gif mode change 100755 => 100644 www-ssl/pic/smiles/moo.gif mode change 100755 => 100644 www-ssl/pic/smiles/nuts.gif mode change 100755 => 100644 www-ssl/pic/smiles/robin.gif mode change 100755 => 100644 www-ssl/pic/smiles/sheep.gif mode change 100755 => 100644 www-ssl/pic/smiles/sick.gif mode change 100755 => 100644 www-ssl/pic/smiles/sleep.gif mode change 100755 => 100644 www-ssl/pic/smiles/soppy.gif mode change 100755 => 100644 www-ssl/pic/smiles/stress.gif mode change 100755 => 100644 www-ssl/pic/smiles/sweet.gif mode change 100755 => 100644 www-ssl/pic/smiles/tired.gif mode change 100755 => 100644 www-ssl/pic/smiles/urgh.gif mode change 100755 => 100644 www-ssl/pic/smiles/winken1.gif mode change 100755 => 100644 www-ssl/pic/smiles/worm.gif mode change 100755 => 100644 www-ssl/pic/smiles/worry.gif diff --git a/DB/ChangeLog.sql b/DB/ChangeLog.sql old mode 100755 new mode 100644 index 383c897a..bfb41cb5 --- a/DB/ChangeLog.sql +++ b/DB/ChangeLog.sql @@ -18,8 +18,8 @@ DROP TABLE IF EXISTS `ChangeLog`; CREATE TABLE IF NOT EXISTS `ChangeLog` ( - `Time` timestamp(14) NOT NULL, - `UID` int(11) NOT NULL default '0', + `Time` timestamp NOT NULL, + `UID` int(11) NOT NULL default 0, `Commend` text NOT NULL, `SQLCommad` text NOT NULL -) TYPE=MyISAM; +) ENGINE=MyISAM; diff --git a/DB/Himmel.sql b/DB/Himmel.sql old mode 100755 new mode 100644 index e8edbc80..e513441c --- a/DB/Himmel.sql +++ b/DB/Himmel.sql @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `EngelType` ( `Man` text, PRIMARY KEY (`TID`), UNIQUE KEY `Name` (`Name`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -43,23 +43,23 @@ CREATE TABLE IF NOT EXISTS `FAQ` ( `Frage` text NOT NULL, `Antwort` text NOT NULL, PRIMARY KEY (`FID`) -) TYPE=MyISAM AUTO_INCREMENT=24 ; +) ENGINE=MyISAM AUTO_INCREMENT=24 ; -- -- Daten für Tabelle `FAQ` -- -INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?
\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.
\r\nNo, every angel has to pay full price.'), -(2, 'Was bekomme ich für meine Mitarbeit?
\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung
\r\nEvery working angel gets a free shirt after the event. '), -(3, 'Wie lange muss ich als Engel arbeiten?
\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen.
\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '), -(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?
\r\nI''m only XX years old. Can I help anyway?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.
\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'), -(8, 'Wer sind eigentlich die Erzengel?
\r\nWho are the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty
\r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'), -(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?
\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!
\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'), -(10, 'Wie gehe ich mit den Besuchern um?
\r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-)
\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'), -(11, 'Wann sind die Engelbesprechungen?
\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.
\r\nThe information on the Angel Briefings will be in the news section of this system.'), -(12, 'Was muss ich noch bedenken?
\r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.
\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'), -(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?
\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.
\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'), -(20, 'Wer muss alles Eintritt zahlen?
\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...
\r\nEveryone who is at older than 12 years old.'); +INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES (1, 'Komme ich als Engel billiger/kostenlos auf den Congress?
\r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.
\r\nNo, every angel has to pay full price.'), +(2, 'Was bekomme ich für meine Mitarbeit?
\r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung
\r\nEvery working angel gets a free shirt after the event. '), +(3, 'Wie lange muss ich als Engel arbeiten?
\r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen.
\r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '), +(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?
\r\nI''m only XX years old. Can I help anyway?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.
\r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'), +(8, 'Wer sind eigentlich die Erzengel?
\r\nWho are the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty
\r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'), +(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?
\r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!
\r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'), +(10, 'Wie gehe ich mit den Besuchern um?
\r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-)
\r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'), +(11, 'Wann sind die Engelbesprechungen?
\r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.
\r\nThe information on the Angel Briefings will be in the news section of this system.'), +(12, 'Was muss ich noch bedenken?
\r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.
\r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'), +(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?
\r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.
\r\nIf you have further questions, you can use the Questions for the ArchAngels form.'), +(20, 'Wer muss alles Eintritt zahlen?
\r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...
\r\nEveryone who is at older than 12 years old.'); -- -------------------------------------------------------- @@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS `News` ( `UID` int(11) NOT NULL default '0', `Treffen` tinyint(4) NOT NULL default '0', PRIMARY KEY (`ID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `Questions` ( `AID` int(11) NOT NULL default '0', `Answer` text NOT NULL, PRIMARY KEY (`QID`) -) TYPE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; +) ENGINE=MyISAM COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; -- -------------------------------------------------------- @@ -118,7 +118,7 @@ CREATE TABLE IF NOT EXISTS `Room` ( `show` char(1) NOT NULL default 'Y', `Number` int(11) default NULL, PRIMARY KEY (`RID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` ( `TID` int(11) NOT NULL default '0', `UID` int(11) NOT NULL default '0', `Comment` text -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -161,7 +161,7 @@ CREATE TABLE IF NOT EXISTS `Shifts` ( `URL` text, `PSID` text, PRIMARY KEY (`SID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -180,7 +180,7 @@ CREATE TABLE IF NOT EXISTS `Wecken` ( `Ort` text NOT NULL, `Bemerkung` text NOT NULL, PRIMARY KEY (`ID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -201,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `news_comments` ( `UID` int(11) NOT NULL default '0', PRIMARY KEY (`ID`), KEY `Refid` (`Refid`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; -- -- Tabellenstruktur für Tabelle `Counter` @@ -212,7 +212,7 @@ CREATE TABLE IF NOT EXISTS `Counter` ( `URL` varchar(255) NOT NULL default '', `Anz` bigint(20) NOT NULL default '0', PRIMARY KEY (`URL`) -) TYPE=MyISAM COMMENT='Counter der Seiten'; +) ENGINE=MyISAM COMMENT='Counter der Seiten'; -- -- Tabellenstruktur für Tabelle `ShiftFreeloader` @@ -225,5 +225,5 @@ CREATE TABLE IF NOT EXISTS `ShiftFreeloader` ( `Length` int(11) NOT NULL, `Comment` text NOT NULL, PRIMARY KEY (`ID`) -) TYPE=MyISAM AUTO_INCREMENT=1 ; +) ENGINE=MyISAM AUTO_INCREMENT=1 ; diff --git a/DB/SDrohnen.sql b/DB/SDrohnen.sql old mode 100755 new mode 100644 index 8cb4fc42..a2c93fab --- a/DB/SDrohnen.sql +++ b/DB/SDrohnen.sql @@ -22,7 +22,7 @@ CREATE TABLE `Sprache` ( `Sprache` char(2) NOT NULL default 'DE', `Text` text NOT NULL, KEY `TextID` (`TextID`,`Sprache`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Daten fuer Tabelle `Sprache` diff --git a/DB/Sprache.sql b/DB/Sprache.sql old mode 100755 new mode 100644 index 76597b71..52434198 --- a/DB/Sprache.sql +++ b/DB/Sprache.sql @@ -22,7 +22,7 @@ CREATE TABLE `Sprache` ( `Sprache` char(2) NOT NULL default 'DE', `Text` text NOT NULL, KEY `TextID` (`TextID`,`Sprache`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Daten für Tabelle `Sprache` diff --git a/DB/UserPicture.sql b/DB/UserPicture.sql index 6dfbe523..095684b3 100644 --- a/DB/UserPicture.sql +++ b/DB/UserPicture.sql @@ -22,7 +22,7 @@ CREATE TABLE `UserPicture` ( `ContentType` varchar(20) NOT NULL default '', `show` char(1) NOT NULL default 'N', PRIMARY KEY (`UID`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -- Daten für Tabelle `UserPicture` diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php old mode 100755 new mode 100644 index 574d9947..4c8237f1 --- a/default-conf/var_www_includes/config.php +++ b/default-conf/var_www_includes/config.php @@ -1,4 +1,4 @@ -MD5SED
\n". - "SHA1:
SHA1SED"; + "SHA1:
SHA1SED"; //globale const. fuer schischtplan $GlobalZeileProStunde = 4; diff --git a/default-conf/var_www_includes/config_IAX.php b/default-conf/var_www_includes/config_IAX.php index e7eca465..87c3d8ea 100644 --- a/default-conf/var_www_includes/config_IAX.php +++ b/default-conf/var_www_includes/config_IAX.php @@ -1,4 +1,4 @@ - diff --git a/includes/UserCVS.php b/includes/UserCVS.php old mode 100755 new mode 100644 index ad7e1d66..7798ee66 --- a/includes/UserCVS.php +++ b/includes/UserCVS.php @@ -1,103 +1,79 @@ $v) - { - if($v=="G") // Right == Group - $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k]; - } -} - -//pagename ermitteln -$Page["Name"] = substr( $_SERVER['PHP_SELF'], strlen($ENGEL_ROOT) ); - -//recht f?r diese seite auslesen -if( isset( $_SESSION['CVS'][ $Page["Name"] ])) - $Page["CVS"] = $_SESSION['CVS'][ $Page["Name"] ]; -else -{ - echo "SYSTEM ERROR: now right for ". $Page["Name"]. "exist"; - die; -} - -if( $DEBUG ) -{ -// foreach( $_SESSION as $k => $v) -// echo "$k = $v
\n"; - echo "
\$_SESSION:\n";
-		print_r($_SESSION);
-	echo "
"; - - if( strlen($Page["CVS"]) == 0 ) - echo "

CVS ERROR, on page '". $Page["Name"]. "'

"; - else - echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'
"; - -} - -function funktion_isLinkAllowed( $PageName) -{ - global $_SESSION; - - // separate page parameter - $ParameterPos = strpos( $PageName, ".php?"); - if( $ParameterPos === FALSE) - { - $pName = $PageName; - } - else - { - $pName = substr( $PageName, 0, $ParameterPos + 4); - } - - // check rights - if( (isset( $_SESSION['CVS'][ $pName ]) === TRUE) && - ($_SESSION['CVS'][ $pName ] == "Y") ) - { - return TRUE; - } - - return FALSE; -} - -function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) -{ - global $url, $ENGEL_ROOT; - - if( funktion_isLinkAllowed( $PageName) === TRUE) - { - return "". $LinkText. ""; - } - - return $LinkText; -} - -function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) -{ - global $url, $ENGEL_ROOT; - - if( funktion_isLinkAllowed( $PageName) === TRUE) - { - return "". $LinkText. ""; - } - - return ""; -} - + if(!isset($_SESSION['UID'])) + $_SESSION['UID'] = -1; + + // CVS import Data + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE UID=" . $_SESSION['UID']; + $Erg_CVS = mysql_query($SQL_CVS, $con); + $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS); + + // Group import Data, if nesseary + if(isset($_SESSION['CVS']["GroupID"])) { + $SQL_GRP = "SELECT * FROM `UserCVS` WHERE UID=" . $_SESSION['CVS'][ "GroupID" ]; + $Erg_GRP = mysql_query($SQL_GRP, $con); + $_SESSION['CVS_Group'] = mysql_fetch_array($Erg_GRP); + + foreach($_SESSION['CVS'] as $k => $v) { + if($v == "G") + $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k]; + } + } + + // pagename ermitteln + $Page["Name"] = basename($_SERVER['PHP_SELF']); + + //recht fuer diese seite auslesen + if(isset($_SESSION['CVS'][$Page["Name"]])) + $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]]; + else { + echo "SYSTEM ERROR: now right for " . $Page["Name"] . " exists."; + die; + } + + if($debug) { + echo "
\$_SESSION:\n";
+    print_r($_SESSION);
+    echo "
"; + + if( strlen($Page["CVS"]) == 0 ) + echo "

CVS ERROR, on page '". $Page["Name"]. "'

"; + else + echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'
"; + } + + function funktion_isLinkAllowed($PageName) { + global $_SESSION; + + // separate page parameter + $ParameterPos = strpos($PageName, ".php?"); + + if($ParameterPos === false) + $pName = $PageName; + else + $pName = substr($PageName, 0, $ParameterPos + 4); + + // check rights + if((isset( $_SESSION['CVS'][ $pName ]) === true) && $_SESSION['CVS'][ $pName ] == "Y") + return true; + + return false; + } + + function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) { + global $url, $ENGEL_ROOT; + + if(funktion_isLinkAllowed( $PageName) === true) + return "" . $LinkText . ""; + + return $LinkText; + } + + function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) { + global $url, $ENGEL_ROOT; + + if(funktion_isLinkAllowed( $PageName) === true) + return "" . $LinkText . ""; + + return ""; + } ?> diff --git a/includes/config_MessegeServer.php b/includes/config_MessegeServer.php index 3454ae0c..ce7c7c3a 100644 --- a/includes/config_MessegeServer.php +++ b/includes/config_MessegeServer.php @@ -1,8 +1,7 @@ - diff --git a/includes/config_modem.php b/includes/config_modem.php index 0625936d..2de37cb7 100644 --- a/includes/config_modem.php +++ b/includes/config_modem.php @@ -1,11 +1,10 @@ - diff --git a/includes/crypt.php b/includes/crypt.php old mode 100755 new mode 100644 index 9707e719..d511e4f4 --- a/includes/crypt.php +++ b/includes/crypt.php @@ -1,18 +1,12 @@ diff --git a/includes/error_handler.php b/includes/error_handler.php old mode 100755 new mode 100644 index 10f27d58..5a58076b --- a/includes/error_handler.php +++ b/includes/error_handler.php @@ -1,88 +1,86 @@ $v ) - if( (strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0)) - $Temp .= "Error Context: $k = $v\n"; - - if( (strpos( "0$error_string", "MySQL") > 0) ) - $Temp .= "Error MySQL: ". mysql_error($con). "\n"; - - //übergeben des arrays - array_push( $error_messages, "Error Number: $error_number\n". - "Error String: $error_string\n". - "Error File: $error_file\n". - "Error Line: $error_line\n". - (strlen($Temp)? "$Temp": "") - ); + foreach ($error_context as $k => $v) + if((strpos( "0$k", "sql") > 0) || (strpos( "0$k", "SQL") > 0)) + $Temp .= "Error Context: $k = $v\n"; + + if((strpos( "0$error_string", "MySQL") > 0)) + $Temp .= "Error MySQL: ". mysql_error($con). "\n"; + + // Uebergeben des arrays + array_push($error_messages, "Error Number: " . $error_number . "\n". + "Error String: " . $error_string . "\n". + "Error File: " . $error_file . "\n". + "Error Line: " . $error_line . "\n". + (strlen($Temp)? "$Temp": "")); } // register error handler set_error_handler("Error_Handler"); - ini_set( "error_reporting", E_ALL); - if( $DEBUG) - { - ini_set( "display_errors", "On"); - ini_set( "display_startup_errors", "On"); - ini_set( "html_errors", "On"); + error_reporting(E_ALL); + + if($debug) { + ini_set("display_errors", "On"); + ini_set("display_startup_errors", "On"); + ini_set("html_errors", "On"); } // send errors - function send_errors() - { + function send_errors() { global $error_messages; - if (!$error_messages) return; - + if(!$error_messages) + return; + $message = ""; foreach($error_messages as $value) $message .= $value."\n"; + $message .= "\n"; - - if( isset( $_POST)) - { - foreach ($_POST as $k => $v ) + + if(isset($_POST)) { + foreach ($_POST as $k => $v) $message .= "_POST: $k = ". ( $k!="password"? $v : "???..."). "\n"; + $message .= "\n"; } - - if( isset( $_GET)) - { - foreach ($_GET as $k => $v ) - $message .= "_GET: $k = $v\n"; + + if(isset($_GET)) { + foreach ($_GET as $k => $v) + $message .= "_GET: $k = $v\n"; + $message .= "\n"; } - + $message .= "\n\n"; if( isset( $_SESSION)) { - foreach ($_SESSION as $k => $v ) + foreach ($_SESSION as $k => $v ) $message .= "_SESSION: $k = $v\n"; $message .= "\n"; } if( isset( $_SESSION['CVS'])) { - foreach ($_SESSION['CVS'] as $k => $v ) + foreach ($_SESSION['CVS'] as $k => $v ) if( strlen($k)>3 ) $message .= "_SESSION['CVS']: $k = $v\n"; $message .= "\n"; } - - foreach ($_SERVER as $k => $v ) + + foreach ($_SERVER as $k => $v ) if( strpos( "0$k", "SERVER_")==0) $message .= "_SERVER: $k = $v\n"; 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 @@ - - - - - - - - -
-

- ".Get_Text("back")." "; - ?> - -

- - +
+

+ " . Get_Text("back") . " "; + ?> + +

+ + - - - - + - - - - - - - - - -
© copyleft - Kontakt -
- - + + + +
© copyleft - Kontakt +
+ + - - + - - + + diff --git a/includes/funktion_SendMessenges.php b/includes/funktion_SendMessenges.php index d71e4804..b6de67cc 100644 --- a/includes/funktion_SendMessenges.php +++ b/includes/funktion_SendMessenges.php @@ -1,18 +1,14 @@ - + diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php old mode 100755 new mode 100644 index d19895a8..e214a1f9 --- a/includes/funktion_activeUser.php +++ b/includes/funktion_activeUser.php @@ -1,59 +1,57 @@ -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 - -for( $i=0; $i"; - if( $_SESSION['UID']>0 ) - echo DisplayAvatar( mysql_result( $Erg, $i, "UID")); - // Schow 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 "\n"; -} - +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 "
    "; + + for($i = 0; $i < mysql_num_rows($Erg); $i++) { + 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 "
    • \n"; + } + + echo "
"; ?> diff --git a/includes/funktion_counter.php b/includes/funktion_counter.php index 70b104d4..39d65a1f 100644 --- a/includes/funktion_counter.php +++ b/includes/funktion_counter.php @@ -1,24 +1,14 @@ - diff --git a/includes/funktion_cron.php b/includes/funktion_cron.php old mode 100755 new mode 100644 index 17ac5a76..3a0e984b --- a/includes/funktion_cron.php +++ b/includes/funktion_cron.php @@ -1,144 +1,131 @@ -$v) - { - $o.= "$k=".urlencode(utf8_encode($v))."&"; - } - $post_data=substr($o,0,-1); - - $ch = curl_init(); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_HEADER, 0); - curl_setopt($ch, CURLOPT_URL, $url); - curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); - $result = curl_exec($ch); - echo curl_error($ch); - curl_close($ch); - } - else - { - // IAX file Schareiebn - $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber"; - - if($DebugDECT) echo "IAX create file for dialing Number $DECTnumber\n"; - $file = fopen( $CallFile, 'w' ); - if( $file != FALSE) - { - fputs( $file, "Channel: SIP/$DECTnumber@$IAXserver\n"); //Ziel nummer - fputs( $file, "Callerid: Engelserver\n"); - // fputs( $file, "Callerid: $IAXcontent\n"); - // fputs( $file, "Context: $DECTnumber@$IAXserver\n"); - fputs( $file, "Extension: s\n"); - fputs( $file, "MaxRetries: 1\n"); - fputs( $file, "RetryTime: 10\n"); - fputs( $file, "SetVar: msg=$Message\n"); -// fputs( $file, "SetVar: TimeH=$TimeH\n"); -// fputs( $file, "SetVar: TimeM=$TimeM\n"); -// fputs( $file, "SetVar: DECTnumber=$DECTnumber\n"); -// fputs( $file, "SetVar: Room=". RID2Room( $RID). "\n"); -// fputs( $file, "SetVar: Engeltype=". TID2Engeltype( $TID). "\n"); - fclose($file); - system( "chmod 777 ". $CallFile); - system( "mv ". $CallFile. " ". $AsteriskOutputDir); - - } - else - echo "error: $CallFile not created"; - } - } - else - if($DebugDECT) echo "IAX is disable\n"; -} - -function DialNumberModem( $DECTnumber, $Time) -{ - global $AnrufDelay; - - //Parameter verarbeiten - $TimeH = substr( $Time, 11, 2); - $TimeM = substr( $Time, 14, 2); - $TimeM = substr( $Time, 14, 2) + $AnrufDelay; - if( $TimeM < 0 ) - { - $TimeM += 60; - $TimeH -= 1; - } - if( $TimeH < 0 ) - $TimeH += 24; - - if( strlen( $TimeH) == 1) - $TimeH = "0".$TimeH; - - SetWackeup( $DECTnumber, $TimeH, $TimeM); -} - -return 0; + + if(mysql_num_rows( $Erg) == 1) + return mysql_result($Erg, 0); + else + return ""; + } + + function RID2Room($RID) { + global $con; + $SQL = "SELECT Name FROM `Room` WHERE RID='$RID'"; + $Erg = mysql_query($SQL, $con); + + if(mysql_num_rows( $Erg) == 1) + return mysql_result($Erg, 0); + else + return ""; + } + + function TID2Engeltype($TID) { + global $con; + $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; + $Erg = mysql_query($SQL, $con); + + if(mysql_num_rows( $Erg) == 1) + return mysql_result($Erg, 0); + else + return ""; + } + + + function DialNumberIAX( $DECTnumber, $Time, $RID, $TID) { + global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT, $Tempdir, $AsteriskOutputDir; + + // Parameter verarbeiten + $TimeH = substr( $Time, 11, 2); + $TimeM = substr( $Time, 14, 2); + $TimeM = substr( $Time, 14, 2) + $AnrufDelay; + + if($TimeM < 0) { + $TimeM += 60; + $TimeH -= 1; + } + + if($TimeH < 0) + $TimeH += 24; + + if(strlen( $TimeH) == 1) + $TimeH = "0" . $TimeH; + + if($IAXenable) { + $Message = "die-nee shisht beh-kinned, in where-neegin me-nooten . . . your shift beginns in a few minutes"; + if(isset($SetHttpIAX)) { + $post_data = array(); + $post_data['code'] = "89o8eu9cg4"; + $post_data['callerid'] = "1023"; + $post_data['nr'] = "$DECTnumber"; + //$post_data['message'] = "Deine schicht beginnt in ein paar minuten . . . your shift beginns in a few minutes "; + $post_data['message'] = "die-nee shisht beh-kinned , in where-neegin me-nooten . . . your shift beginns in a few minutes "; + $url = "https://23c3.eventphone.de/~bef/call.php"; + + $o = ""; + foreach ($post_data as $k => $v) { + $o.= "$k=" . urlencode(utf8_encode($v)) . "&"; + } + + $post_data = substr($o, 0, -1); + + $ch = curl_init(); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + $result = curl_exec($ch); + echo curl_error($ch); + curl_close($ch); + } else { + // IAX file Schareiebn + $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber"; + + if($DebugDECT) + echo "IAX create file for dialing Number $DECTnumber\n"; + + $file = fopen( $CallFile, 'w'); + + if($file != false) { + fputs($file, "Channel: SIP/$DECTnumber@$IAXserver\n"); + fputs($file, "Callerid: Engelserver\n"); + fputs($file, "Extension: s\n"); + fputs($file, "MaxRetries: 1\n"); + fputs($file, "RetryTime: 10\n"); + fputs($file, "SetVar: msg=$Message\n"); + fclose($file); + system("chmod 777 " . $CallFile); + system("mv " . $CallFile . " " . $AsteriskOutputDir); + } else + echo "error: $CallFile not created"; + } + } else + if($DebugDECT) + echo "IAX is disable\n"; + } + + function DialNumberModem($DECTnumber, $Time) { + global $AnrufDelay; + + // Parameter verarbeiten + $TimeH = substr($Time, 11, 2); + $TimeM = substr($Time, 14, 2); + $TimeM = substr($Time, 14, 2) + $AnrufDelay; + + if($TimeM < 0) { + $TimeM += 60; + $TimeH -= 1; + } + + if($TimeH < 0) + $TimeH += 24; + + if(strlen( $TimeH) == 1) + $TimeH = "0" . $TimeH; + + SetWackeup($DECTnumber, $TimeH, $TimeM); + } +?> diff --git a/includes/funktion_db.php b/includes/funktion_db.php index cbfb198f..160a9c59 100644 --- a/includes/funktion_db.php +++ b/includes/funktion_db.php @@ -1,149 +1,145 @@ -"; - $Diff .= ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - $Diff .= "". mysql_field_name($Erg, $m). ""; - $Diff .= ""; - - for ($n = 0 ; $n < $Zeilen ; $n++) - { - $Diff .= ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - $Diff .= "".mysql_result($Erg, $n, $m). ""; - $Diff .= ""; - } - $Diff .= ""; - return $Diff; - } - - function db_querry_getDatenAssocArray($SQL) - { - global $con; - - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - $Daten = array(); - for( $i=0; $i $Data1) - { - if( isset( $Daten2[$DataKey])) - { - $Data2 = $Daten2[$DataKey]; - foreach($Data1 as $key => $value) - if( $value != $Data2[$key]) - { - $Gefunden=TRUE; - $Diff .= "\n\t$key\n\t$value\n\t".$Data2[$key]."\n"; - } - } - else - foreach($Data1 as $key => $value) - { - $Gefunden=TRUE; - $Diff .= "\n\t$key\n\t$value\n\t\n"; - } - } - $Diff .= "\n"; - - if( $Gefunden) - return $Diff; - else - return "\nno changes Fount\n"; - } - - function db_query( $SQL, $comment) - { - global $con, $Page; - $Diff = ""; - - //commed anlyse udn daten sicherung - if( strpos( "#$SQL", "UPDATE") > 0) - { - //Tabellen name ermitteln - $Table_Start = strpos( $SQL, "`"); - $Table_End = strpos( $SQL, "`", $Table_Start+1); - $Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1)); - - //SecureTest - if( $Table_Start == 0 || $Table_End == 0) die("

funktion_db ERROR SQL: '$SQL' nicht OK

"); - - //WHERE ermitteln - $Where_Start = strpos( $SQL, "WHERE"); - $Where = substr( $SQL, $Where_Start); - if( $Where_Start == 0) $Where = ";"; - - if( strlen( $Where) < 2) - { - $Diff = "can't show, too mutch data (no filter was set)"; - $querry_erg = mysql_query($SQL, $con); - } - else - { - $Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); - $querry_erg = mysql_query($SQL, $con); - $Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); - $Diff = db_querry_diffDaten($Daten1, $Daten2); - } - } - elseif( strpos( "#$SQL", "DELETE") > 0) - { - $TableWhere = substr( $SQL, 6); - $Diff .= Ausgabe_Daten( "SELECT * $TableWhere"); - - //execute command - $querry_erg = mysql_query($SQL, $con); - } - elseif( strpos( "#$SQL", "INSERT") > 0) - { - //execute command - $querry_erg = mysql_query($SQL, $con); - } - else - { - //execute command - $querry_erg = mysql_query($SQL, $con); - } - - $SQLCommand = "SQL:
". htmlentities( $SQL, ENT_QUOTES); - if( strlen($Diff) > 0) - $SQLCommand .= "

Diff:
$Diff"; - - $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES); - //LOG commands in DB - $SQL_SEC = "INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ". - " VALUES ( '". $_SESSION['UID']. "', ". - "'". mysql_escape_string( $SQLCommand). "', ". - "'". mysql_escape_string( $Commend). "' );"; - $erg = mysql_query($SQL_SEC, $con); - echo mysql_error($con); - return $querry_erg; - }//function db_query( +"; + $Diff .= ""; + + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + $Diff .= "". mysql_field_name($Erg, $m). ""; + + $Diff .= ""; + + for ($n = 0 ; $n < $Zeilen ; $n++) { + $Diff .= ""; + + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + $Diff .= "".mysql_result($Erg, $n, $m). ""; + + $Diff .= ""; + } + + $Diff .= ""; + return $Diff; + } + + function db_querry_getDatenAssocArray($SQL) { + global $con; + + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + $Daten = array(); + + for( $i=0; $i $Data1) { + if(isset( $Daten2[$DataKey])) { + $Data2 = $Daten2[$DataKey]; + + foreach($Data1 as $key => $value) + if( $value != $Data2[$key]) { + $Gefunden = true; + $Diff .= "\n\t$key\n\t$value\n\t" . $Data2[$key] . "\n"; + } + } else + foreach($Data1 as $key => $value) { + $Gefunden = true; + $Diff .= "\n\t$key\n\t$value\n\t\n"; + } + } + + $Diff .= "\n"; + + if($Gefunden) + return $Diff; + else + return "\nno changes Fount\n"; + } + + function db_query( $SQL, $comment) { + global $con, $Page; + $Diff = ""; + + // commed anlyse udn daten sicherung + if(strpos("#$SQL", "UPDATE") > 0) { + // Tabellen name ermitteln + $Table_Start = strpos( $SQL, "`"); + $Table_End = strpos( $SQL, "`", $Table_Start+1); + $Table = substr( $SQL, $Table_Start, ($Table_End-$Table_Start+1)); + + //SecureTest + if( $Table_Start == 0 || $Table_End == 0) die("

funktion_db ERROR SQL: '$SQL' nicht OK

"); + + //WHERE ermitteln + $Where_Start = strpos( $SQL, "WHERE"); + $Where = substr( $SQL, $Where_Start); + if( $Where_Start == 0) $Where = ";"; + + if( strlen( $Where) < 2) + { + $Diff = "can't show, too mutch data (no filter was set)"; + $querry_erg = mysql_query($SQL, $con); + } + else + { + $Daten1 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); + $querry_erg = mysql_query($SQL, $con); + $Daten2 = db_querry_getDatenAssocArray( "SELECT * FROM $Table $Where"); + $Diff = db_querry_diffDaten($Daten1, $Daten2); + } + } + elseif( strpos( "#$SQL", "DELETE") > 0) + { + $TableWhere = substr( $SQL, 6); + $Diff .= Ausgabe_Daten( "SELECT * $TableWhere"); + + //execute command + $querry_erg = mysql_query($SQL, $con); + } + elseif( strpos( "#$SQL", "INSERT") > 0) + { + //execute command + $querry_erg = mysql_query($SQL, $con); + } + else + { + //execute command + $querry_erg = mysql_query($SQL, $con); + } + + $SQLCommand = "SQL:
". htmlentities( $SQL, ENT_QUOTES); + if( strlen($Diff) > 0) + $SQLCommand .= "

Diff:
$Diff"; + + $Commend = htmlentities( ($Page["Name"]. ": ". $comment), ENT_QUOTES); + //LOG commands in DB + $SQL_SEC = "INSERT INTO `ChangeLog` ( `UID` , `SQLCommad` , `Commend` ) ". + " VALUES ( '". $_SESSION['UID']. "', ". + "'". mysql_escape_string( $SQLCommand). "', ". + "'". mysql_escape_string( $Commend). "' );"; + $erg = mysql_query($SQL_SEC, $con); + echo mysql_error($con); + return $querry_erg; + }//function db_query( } ?> diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php old mode 100755 new mode 100644 index 9393e97e..1131ffd3 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -1,67 +1,65 @@ -"; - echo "DB: $Table_Name"; + echo ""; + echo ""; - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo ""; - } - echo ""; + echo ""; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + { + echo ""; + } + echo ""; - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo ""; - } - echo ""; - } - echo "
DB: $Table_Name
". mysql_field_name($Erg, $m). "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
"; + for ($n = 0 ; $n < $Zeilen ; $n++) + { + echo ""; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + { + echo "".mysql_result($Erg, $n, $m). ""; + } + echo ""; + } + echo ""; } function funktion_db_element_list_2row( $TopicName, $SQL) { - global $con; + global $con; - echo "\n"; - echo ""; -# echo "\t\n"; + echo "
$TopicName

$TopicName
\n"; + echo ""; +# echo "\t\n"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - echo ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - echo ""; - } - echo ""; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + echo ""; + for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) + { + echo ""; + } + echo ""; - for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) - { - echo ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - echo ""; - } - echo ""; - } - echo "
$TopicName

$TopicName
". mysql_field_name($Erg, $m). "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
\n"; + for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) + { + echo ""; + for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) + { + echo "".mysql_result($Erg, $n, $m). ""; + } + echo ""; + } + echo "\n"; } ?> diff --git a/includes/funktion_faq.php b/includes/funktion_faq.php old mode 100755 new mode 100644 index 641ea38d..e9f09e7c --- a/includes/funktion_faq.php +++ b/includes/funktion_faq.php @@ -1,12 +1,10 @@ - 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 @@ -"; - -if( strpos( $_SERVER["REQUEST_URI"], "?") >0) - $URL = $_SERVER["REQUEST_URI"]. "&SetLanguage="; -else - $URL = $_SERVER["REQUEST_URI"]. "?SetLanguage="; - -echo "\"DE\" "; -echo "\"EN\" "; + 0) + $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage="; + else + $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; + echo "\"DE\" "; + echo "\"EN\" "; ?> diff --git a/includes/funktion_jabber.php b/includes/funktion_jabber.php old mode 100755 new mode 100644 diff --git a/includes/funktion_lang.php b/includes/funktion_lang.php old mode 100755 new mode 100644 index d5d3e144..e04dd8eb --- a/includes/funktion_lang.php +++ b/includes/funktion_lang.php @@ -1,35 +1,28 @@ - diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php old mode 100755 new mode 100644 index 87196ede..c751c764 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -1,44 +1,41 @@ -". Get_Text("$MenuName/"). "
    "; - //Überschift - $Text = "

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

    "; - - //einträge - 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(( 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(). ")"; - //ausgabe - $Text .= "\t\t\t
  • $TempName
    • \n"; - $Gefunden = TRUE; - } - } - elseif( $DEBUG ) - { - $Gefunden = TRUE; - $Text .= "\t\t\t
  • $TempName ($Key)
    • \n"; - } - } - if( $Gefunden) - echo $MenueTableStart.$Text.$MenueTableEnd; + // 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(( 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(). ")"; + //ausgabe + $Text .= "\t\t\t
  • $TempName
    • \n"; + $Gefunden = true; + } + } + elseif( $debug ) + { + $Gefunden = true; + $Text .= "\t\t\t
  • $TempName ($Key)
    • \n"; + } + } + if( $Gefunden) + echo $MenueTableStart.$Text.$MenueTableEnd; }//function ShowMenue ?> diff --git a/includes/funktion_modem.php b/includes/funktion_modem.php old mode 100755 new mode 100644 index 3a74e0f8..8e93ebf4 --- a/includes/funktion_modem.php +++ b/includes/funktion_modem.php @@ -1,35 +1,34 @@ -$Number' was called
    \n"; - if( $ModemEnable) - { - echo "Dial number: '$Number' was called
    \n"; - $fp = fopen( $ModemDev, "w"); - sleep(1); - fwrite( $fp, "+++"); - sleep(1); - fwrite( $fp, "ATZ\n"); - sleep(1); - fwrite( $fp, "ATX1\n"); - sleep(1); - fwrite( $fp, "ATD $Number \n"); - sleep(8); - fclose($fp); - sleep(1); - } - else - echo "Modem is Disable, number: '$Number' was not called
    \n"; + $fp = fopen( $ModemDev, "w"); + sleep(1); + fwrite( $fp, "+++"); + sleep(1); + fwrite( $fp, "ATZ\n"); + sleep(1); + fwrite( $fp, "ATX1\n"); + sleep(1); + fwrite( $fp, "ATD $Number \n"); + sleep(8); + fclose($fp); + sleep(1); + } + else + echo "Modem is Disable, number: '$Number' was not called
    \n"; } function SetWackeup( $Number, $TimeH, $TimeM) { - global $WackupNumber; - DialNumber( "$WackupNumber$TimeH$TimeM$Number"); + global $WakeupNumber; + DialNumber( "$WakeupNumber$TimeH$TimeM$Number"); } ?> diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php old mode 100755 new mode 100644 index 0b5b9910..afa79144 --- a/includes/funktion_schichtplan.php +++ b/includes/funktion_schichtplan.php @@ -2,181 +2,181 @@ /*####################################################### -# gibt die engelschischten aus # +# gibt die engelschischten aus # #######################################################*/ function ausgabe_Feld_Inhalt( $SID, $Man ) { // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung, // die eingetragenden und und offenden Schichteintäge zurück - global $EngelType, $EngelTypeID, $TID2Name, $con, $DEBUG, $gmdateOffset; + global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset; - $Spalten = ""; + $Spalten = ""; - if( !isset($_GET["Icon"])) - $_GET["Icon"]=1; + if( !isset($_GET["Icon"])) + $_GET["Icon"]=1; - /////////////////////////////////////////////////////////////////// - // Schow Admin Page - /////////////////////////////////////////////////////////////////// - $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( - "admin/schichtplan.php?action=change&SID=$SID", - "edit
    \n\t\t"); + /////////////////////////////////////////////////////////////////// + // Schow Admin Page + /////////////////////////////////////////////////////////////////// + $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( + "admin/schichtplan.php?action=change&SID=$SID", + "edit
    \n\t\t"); - /////////////////////////////////////////////////////////////////// - // Ausgabe des Schischtnamens - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; - $Erg = mysql_query($SQL, $con); - if( mysql_result($Erg, 0, 0) != "") - $Spalten.="$Man:
    "; - else - $Spalten.="".$Man.":
    "; + /////////////////////////////////////////////////////////////////// + // Ausgabe des Schischtnamens + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; + $Erg = mysql_query($SQL, $con); + if( mysql_result($Erg, 0, 0) != "") + $Spalten.="$Man:
    "; + else + $Spalten.="".$Man.":
    "; - /////////////////////////////////////////////////////////////////// - // SQL abfrage für die benötigten schichten - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; - $Erg = mysql_query($SQL, $con); - - $Anzahl = mysql_num_rows($Erg); - $Feld=0; - $Temp_TID_old=-1; - for( $i = 0; $i < $Anzahl; $i++ ) - { - if( isset($Temp[$Feld]["TID"])) - $Temp_TID_old = $Temp[$Feld]["TID"]; - if( isset($Temp[$Feld]["UID"])) - $Temp_UID_old = $Temp[$Feld]["UID"]; - - $Temp_TID = mysql_result($Erg, $i, "TID"); - - // wenn sich der Type ändert wird zumnästen feld geweckselt - if( $Temp_TID_old != $Temp_TID ) - $Feld++; - - $Temp[$Feld]["TID"] = $Temp_TID; - $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); - - // sonderfall ersten durchlauf - if( $i == 0 ) - { - $Temp_TID_old = $Temp[$Feld]["TID"]; - $Temp_UID_old = $Temp[$Feld]["UID"]; - } - - // ist es eine zu vergeben schicht? - if( $Temp[$Feld]["UID"] == 0 ) - { - if( isset($Temp[$Feld]["free"])) - $Temp[$Feld]["free"]++; - else - $Temp[$Feld]["free"]=1; - } - else - $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; - } // FOR - + /////////////////////////////////////////////////////////////////// + // SQL abfrage für die benötigten schichten + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; + $Erg = mysql_query($SQL, $con); + + $Anzahl = mysql_num_rows($Erg); + $Feld=0; + $Temp_TID_old=-1; + for( $i = 0; $i < $Anzahl; $i++ ) + { + if( isset($Temp[$Feld]["TID"])) + $Temp_TID_old = $Temp[$Feld]["TID"]; + if( isset($Temp[$Feld]["UID"])) + $Temp_UID_old = $Temp[$Feld]["UID"]; + + $Temp_TID = mysql_result($Erg, $i, "TID"); + + // wenn sich der Type ändert wird zumnästen feld geweckselt + if( $Temp_TID_old != $Temp_TID ) + $Feld++; + + $Temp[$Feld]["TID"] = $Temp_TID; + $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); + + // sonderfall ersten durchlauf + if( $i == 0 ) + { + $Temp_TID_old = $Temp[$Feld]["TID"]; + $Temp_UID_old = $Temp[$Feld]["UID"]; + } + + // ist es eine zu vergeben schicht? + if( $Temp[$Feld]["UID"] == 0 ) + { + if( isset($Temp[$Feld]["free"])) + $Temp[$Feld]["free"]++; + else + $Temp[$Feld]["free"]=1; + } + else + $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; + } // FOR + - /////////////////////////////////////////////////////////////////// - // Aus gabe der Schicht - /////////////////////////////////////////////////////////////////// - if( isset($Temp)) - if( count($Temp) ) - foreach( $Temp as $TempEntry => $TempValue ) - { - if( !isset($TempValue["free"])) - $TempValue["free"] = 0; - - // ausgabe EngelType - $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " "; - - // ausgabe Eingetragener Engel - if( isset($TempValue["Engel"])) - if( count($TempValue["Engel"]) > 0 ) - { - if( count($TempValue["Engel"]) == 1 ) - $Spalten.= Get_Text("inc_schicht_ist"). ":
    \n\t\t"; - else - $Spalten.= Get_Text("inc_schicht_sind"). ":
    \n\t\t"; - - foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) - { - if( funktion_isLinkAllowed( "admin/user.php") === TRUE) - { - // add color, wenn Engel "Gekommen" - $TempText= - ((UIDgekommen( $TempEngelID ) == "1") - ? "" - : ""). - UID2Nick( $TempEngelID). ""; - } - else - { - $TempText = UID2Nick( $TempEngelID ); - } - - // add link to user - $TempText= funktion_isLinkAllowed_addLink_OrLinkText( - "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", - $TempText); - - $Spalten.= "  ". $TempText. - ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): ""). - "
    \n\t\t"; + /////////////////////////////////////////////////////////////////// + // Aus gabe der Schicht + /////////////////////////////////////////////////////////////////// + if( isset($Temp)) + if( count($Temp) ) + foreach( $Temp as $TempEntry => $TempValue ) + { + if( !isset($TempValue["free"])) + $TempValue["free"] = 0; + + // ausgabe EngelType + $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " "; + + // ausgabe Eingetragener Engel + if( isset($TempValue["Engel"])) + if( count($TempValue["Engel"]) > 0 ) + { + if( count($TempValue["Engel"]) == 1 ) + $Spalten.= Get_Text("inc_schicht_ist"). ":
    \n\t\t"; + else + $Spalten.= Get_Text("inc_schicht_sind"). ":
    \n\t\t"; + + foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) + { + if( funktion_isLinkAllowed( "admin/user.php") === TRUE) + { + // add color, wenn Engel "Gekommen" + $TempText= + ((UIDgekommen( $TempEngelID ) == "1") + ? "" + : ""). + UID2Nick( $TempEngelID). ""; + } + else + { + $TempText = UID2Nick( $TempEngelID ); + } + + // add link to user + $TempText= funktion_isLinkAllowed_addLink_OrLinkText( + "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", + $TempText); + + $Spalten.= "  ". $TempText. + ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): ""). + "
    \n\t\t"; - } - $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 ); - } - - // ausgabe benötigter Engel - //////////////////////////// - //in vergangenheit - $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". - gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')"; - $Ergtime = mysql_query($SQLtime, $con); - if( mysql_num_rows( $Ergtime) > 0) - { - //wenn keien rechte definiert sind - if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ])) - $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y"; + } + $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 ); + } + + // ausgabe benötigter Engel + //////////////////////////// + //in vergangenheit + $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". + gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')"; + $Ergtime = mysql_query($SQLtime, $con); + if( mysql_num_rows( $Ergtime) > 0) + { + //wenn keien rechte definiert sind + if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ])) + $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y"; - if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y") - if( $TempValue["free"] > 0 ) - { - $Spalten.= "
    \n\t\t  "; - $Spalten.= $TempValue["free"]; - if( $TempValue["free"] != 1 ) - $Spalten.= Get_Text("inc_schicht_weitere"). - " ".Get_Text("inc_schicht_Engel"). - Get_Text("inc_schicht_wird"); - else - $Spalten.= Get_Text("inc_schicht_weiterer"). - " ".Get_Text("inc_schicht_Engel"). - Get_Text("inc_schicht_werden"); - $Spalten.= Get_Text("inc_schicht_noch_gesucht"); - $Spalten.= ""; - } - } - else - { - if( isset($TempValue["free"])) - if( $TempValue["free"] > 0 ) - $Spalten.= "
    \n\t\t  

    Fehlen noch: ". - $TempValue["free"]. "

    "; - } - $Spalten.= "
    \n\t\t"; - - } // FOREACH - return $Spalten; + if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y") + if( $TempValue["free"] > 0 ) + { + $Spalten.= "
    \n\t\t  "; + $Spalten.= $TempValue["free"]; + if( $TempValue["free"] != 1 ) + $Spalten.= Get_Text("inc_schicht_weitere"). + " ".Get_Text("inc_schicht_Engel"). + Get_Text("inc_schicht_wird"); + else + $Spalten.= Get_Text("inc_schicht_weiterer"). + " ".Get_Text("inc_schicht_Engel"). + Get_Text("inc_schicht_werden"); + $Spalten.= Get_Text("inc_schicht_noch_gesucht"); + $Spalten.= ""; + } + } + else + { + if( isset($TempValue["free"])) + if( $TempValue["free"] > 0 ) + $Spalten.= "
    \n\t\t  

    Fehlen noch: ". + $TempValue["free"]. "

    "; + } + $Spalten.= "
    \n\t\t"; + + } // FOREACH + return $Spalten; } // function Ausgabe_Feld_Inhalt /*####################################################### -# gibt die engelschischten Druckergerecht aus # +# gibt die engelschischten Druckergerecht aus # #######################################################*/ function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) { @@ -190,200 +190,200 @@ function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) /*####################################################### -# Ausgabe der Raum Spalten # +# Ausgabe der Raum Spalten # #######################################################*/ function CreateRoomShifts( $raum ) { - global $Spalten, $ausdatum, $con, $DEBUG, $GlobalZeileProStunde, $error_messages; - - ///////////////////////////////////////////////////////////// - // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus - ///////////////////////////////////////////////////////////// - $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ". - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - if( (mysql_num_rows( $ErgSonder) > 1) ) - { - if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) - { - echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; - for( $i=0; $i". - mysql_result($ErgSonder, $i, "DateS"). - " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)". - "
    \n\t\t"; - } - } - } - elseif( (mysql_num_rows( $ErgSonder) == 1) ) - { - $Spalten[0].= "\t\t\n". - "\t\t\t

    ↑↑↑

    ". - Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), - mysql_result($ErgSonder, 0, "Man") ). - "\t\t\t

    ↓↓↓

    ". - "\n\t\t\n"; - return; - } - - $ZeitZeiger = 0; + global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages; + + ///////////////////////////////////////////////////////////// + // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus + ///////////////////////////////////////////////////////////// + $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ". + "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); + if( (mysql_num_rows( $ErgSonder) > 1) ) + { + if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) + { + echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; + for( $i=0; $i". + mysql_result($ErgSonder, $i, "DateS"). + " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)". + "
    \n\t\t"; + } + } + } + elseif( (mysql_num_rows( $ErgSonder) == 1) ) + { + $Spalten[0].= "\t\t\n". + "\t\t\t

    ↑↑↑

    ". + Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), + mysql_result($ErgSonder, 0, "Man") ). + "\t\t\t

    ↓↓↓

    ". + "\n\t\t\n"; + return; + } + + $ZeitZeiger = 0; - ///////////////////////////////////////////////////////////// - // beginnt die erste schicht vor dem heutigen tag? - ///////////////////////////////////////////////////////////// - $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ". - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - if( (mysql_num_rows( $ErgSonder) > 1) ) - { - if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) - { - echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; - for( $i=0; $i". - mysql_result($ErgSonder, $i, "DateS"). - " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)". - "
    \n\t\t"; - } - } - } - elseif( (mysql_num_rows( $ErgSonder) == 1) ) - { - $ZeitZeiger = substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+ - (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60); - $Spalten[0].= "\t\t\n". - "\t\t\t

    ↑↑↑

    ". - Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), - mysql_result($ErgSonder, 0, "Man") ). - "\n\t\t\n"; - } - - ///////////////////////////////////////////////////////////// - // gibt die schichten für den tag aus - ///////////////////////////////////////////////////////////// - $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') and ". - "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ". - "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; - $Erg = mysql_query($SQL, $con); - for( $i = 0; $i < mysql_num_rows($Erg); ++$i ) - { - $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+ - (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60); - $len = mysql_result($Erg, $i, "Len"); + ///////////////////////////////////////////////////////////// + // beginnt die erste schicht vor dem heutigen tag? + ///////////////////////////////////////////////////////////// + $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ". + "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); + if( (mysql_num_rows( $ErgSonder) > 1) ) + { + if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) + { + echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; + for( $i=0; $i". + mysql_result($ErgSonder, $i, "DateS"). + " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)". + "
    \n\t\t"; + } + } + } + elseif( (mysql_num_rows( $ErgSonder) == 1) ) + { + $ZeitZeiger = substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+ + (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60); + $Spalten[0].= "\t\t\n". + "\t\t\t

    ↑↑↑

    ". + Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), + mysql_result($ErgSonder, 0, "Man") ). + "\n\t\t\n"; + } + + ///////////////////////////////////////////////////////////// + // gibt die schichten für den tag aus + ///////////////////////////////////////////////////////////// + $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') and ". + "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ". + "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; + $Erg = mysql_query($SQL, $con); + for( $i = 0; $i < mysql_num_rows($Erg); ++$i ) + { + $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+ + (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60); + $len = mysql_result($Erg, $i, "Len"); - if( $len <= 0) - array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len"); - - if( $ZeitZeiger < $ZeitPos ) - { - $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\t\t \n"; + if( $len <= 0) + array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len"); + + if( $ZeitZeiger < $ZeitPos ) + { + $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= + "\t\t \n"; - $ZeitZeiger += $ZeitPos - $ZeitZeiger; - } - if($ZeitZeiger == $ZeitPos ) - { - //sonderfall wenn die schicht über dei 24 stunden hinaus geht - // (eintrag abkürzen, pfeiel ausgeben) - $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\t\t\n". - "\t\t\t". - Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), - mysql_result($Erg, $i, "Man") ). - (( ($ZeitZeiger+$len) > 24)? "\t\t\t

    ↓↓↓

    " : ""). - "\n\t\t\n"; - $ZeitZeiger += $len; - } - else - { - echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; - echo "". - mysql_result($Erg, $i, "DateS"). - " '". mysql_result($Erg, $i, "Man"). "' ". - " (". mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)

    "; - } - } - if( $ZeitZeiger < 24 ) - $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].= - "\t\t \n"; + $ZeitZeiger += $ZeitPos - $ZeitZeiger; + } + if($ZeitZeiger == $ZeitPos ) + { + //sonderfall wenn die schicht über dei 24 stunden hinaus geht + // (eintrag abkürzen, pfeiel ausgeben) + $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= + "\t\t\n". + "\t\t\t". + Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), + mysql_result($Erg, $i, "Man") ). + (( ($ZeitZeiger+$len) > 24)? "\t\t\t

    ↓↓↓

    " : ""). + "\n\t\t\n"; + $ZeitZeiger += $len; + } + else + { + echo "

    ". Get_Text("pub_schichtplan_colision"). "

    "; + echo "". + mysql_result($Erg, $i, "DateS"). + " '". mysql_result($Erg, $i, "Man"). "' ". + " (". mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)

    "; + } + } + if( $ZeitZeiger < 24 ) + $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].= + "\t\t \n"; } // function CreateRoomShifts /*####################################################### -# Ausgabe der freien schichten # +# Ausgabe der freien schichten # #######################################################*/ function showEmptyShifts( ) { - global $con, $DEBUG, $RoomID, $gmdateOffset; + global $con, $debug, $RoomID, $gmdateOffset; - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ". - "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ". - "ORDER BY `DateS`, `RID`;"; - $Erg = mysql_query($sql, $con); + echo "
    ". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "
    \n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ". + "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ". + "ORDER BY `DateS`, `RID`;"; + $Erg = mysql_query($sql, $con); - $angezeigt = 0; - for ($i=0; ($i0) - { - $angezeigt++; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - } - - echo "
    ". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "
    ". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "". substr(mysql_result( $Erg, $i, "DateS"), 11). "". $RoomID[mysql_result( $Erg, $i, "RID")]. "". - ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")). - "
    \n"; - + $angezeigt = 0; + for ($i=0; ($i0) + { + $angezeigt++; + echo "\n"; + echo "\t". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "\n"; + echo "\t". substr(mysql_result( $Erg, $i, "DateS"), 11). "\n"; + echo "\t". $RoomID[mysql_result( $Erg, $i, "RID")]. "\n"; + echo "\t". + ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")). + "\n"; + echo "\n"; + } + } + + echo "\n"; + } //function showEmptyShifts - + /*####################################################### -# Gibt die anzahl der Schichten im Raum zurück # +# Gibt die anzahl der Schichten im Raum zurück # #######################################################*/ function SummRoomShifts( $raum ) { - global $ausdatum, $con, $DEBUG, $GlobalZeileProStunde; - - $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ". - "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; + global $ausdatum, $con, $debug, $GlobalZeileProStunde; + + $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". + "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ". + "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - - return mysql_num_rows($ErgSonder); + $ErgSonder = mysql_query($SQLSonder, $con); + + return mysql_num_rows($ErgSonder); } ?> diff --git a/includes/funktion_schichtplan_Tage.php b/includes/funktion_schichtplan_Tage.php old mode 100755 new mode 100644 index 5ac92e7e..2c21a992 --- a/includes/funktion_schichtplan_Tage.php +++ b/includes/funktion_schichtplan_Tage.php @@ -1,87 +1,101 @@ - $Mmax) - { - $Tag = 1; - $Monat++; - } + if($Tag > $Mmax) { + $Tag = 1; + $Monat++; + } - if( $Monat > 12 ) - { - $Monat = 1; - $Jahr++; - } + if($Monat > 12) { + $Monat = 1; + $Jahr++; + } - $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag; - $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat; + $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag; + $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat; - return ("$Jahr-$Monat-$Tag"); - } //function DatumUm1Tagerhoehen( -} + return ("$Jahr-$Monat-$Tag"); + } + } -//suchen den ersten eintrags -$SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1"; -$Erg = mysql_query($SQL, $con); + // suchen den ersten eintrags + $SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1"; + $Erg = mysql_query($SQL, $con); -$Pos=0; + $Pos = 0; -if( mysql_num_rows($Erg)>0) -{ - do - { - //Startdatum einlesen und link ausgeben - $DateS = substr(mysql_result($Erg, 0 , 0), 0,10); - $VeranstaltungsTage[$Pos++] = $DateS; - - //auslesen den endes und eventuelle weitere tage ausgeben - $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` ". - "WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))"; - $Erg2 = mysql_query($SQL2, $con); - $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10); + if(mysql_num_rows($Erg) > 0) { + do { + // Startdatum einlesen und link ausgeben + $DateS = substr(mysql_result($Erg, 0 , 0), 0,10); + $VeranstaltungsTage[$Pos++] = $DateS; + + // auslesen den endes und eventuelle weitere tage ausgeben + $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))"; + $Erg2 = mysql_query($SQL2, $con); + $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10); - if( strlen($DateE) == 0) - $DateE = $DateS; - else - while( $DateS != $DateE) - { - $DateS = DatumUm1TagErhoehen( $DateS); - $VeranstaltungsTage[$Pos++] = $DateS; - } + if(strlen($DateE) == 0) + $DateE = $DateS; + else + while( $DateS != $DateE) { + $DateS = DatumUm1TagErhoehen( $DateS); + $VeranstaltungsTage[$Pos++] = $DateS; + } - //suchen den nästen eintrag - $SQL = "SELECT `DateS` FROM `Shifts` ". - "WHERE (`DateS` > '$DateE 23:59:59' ) ". - "ORDER BY `DateS` ". - "LIMIT 1"; - $Erg = mysql_query($SQL, $con); + // suchen den naesten eintrag + $SQL = "SELECT `DateS` FROM `Shifts` ". + "WHERE (`DateS` > '$DateE 23:59:59' ) ". + "ORDER BY `DateS` ". + "LIMIT 1"; + $Erg = mysql_query($SQL, $con); } while( mysql_fetch_row($Erg) > 0); -} -$VeranstaltungsTageMax = $Pos-1; + } + $VeranstaltungsTageMax = $Pos - 1; ?> diff --git a/includes/funktion_schichtplan_aray.php b/includes/funktion_schichtplan_aray.php old mode 100755 new mode 100644 index 2f7f4b36..f9b04bd6 --- a/includes/funktion_schichtplan_aray.php +++ b/includes/funktion_schichtplan_aray.php @@ -5,34 +5,34 @@ #######################################################*/ // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ". - "WHERE `Show`='Y'". - "ORDER BY `Number`, `Name`;"; - - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `RID`, `Name` FROM `Room` ". + "WHERE `Show`='Y'". + "ORDER BY `Number`, `Name`;"; + + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - - $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); - } + for ($i=0; $i<$rowcount; $i++) + { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + + $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); + } // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + for ($i=0; $i<$rowcount; $i++) + { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = - mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name"); - } + $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = + mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + $TID2Name[ mysql_result($Erg, $i, "TID") ] = mysql_result($Erg, $i, "Name"); + } include ("funktion_schichtplan_Tage.php"); ?> diff --git a/includes/funktion_schichtplan_beamer.php b/includes/funktion_schichtplan_beamer.php old mode 100755 new mode 100644 index ab935e0d..177b6cb3 --- a/includes/funktion_schichtplan_beamer.php +++ b/includes/funktion_schichtplan_beamer.php @@ -5,176 +5,176 @@ #######################################################*/ // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ". - "WHERE `Show`='Y'". - "ORDER BY `Number`, `Name`;"; - - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); - - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - - $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); - } + $sql = "SELECT `RID`, `Name` FROM `Room` ". + "WHERE `Show`='Y'". + "ORDER BY `Number`, `Name`;"; + + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + + for ($i=0; $i<$rowcount; $i++) + { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + + $RoomID[ mysql_result($Erg, $i, "RID") ] = mysql_result($Erg, $i, "Name"); + } // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + for ($i=0; $i<$rowcount; $i++) + { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = - mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - } + $EngelTypeID[ mysql_result($Erg, $i, "TID") ] = + mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + } /*####################################################### -# gibt die engelschischten aus # +# gibt die engelschischten aus # #######################################################*/ function ausgabe_Feld_Inhalt( $SID, $Man ) { // gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung, // die eingetragenden und und offenden Schichteintäge zurück - global $EngelType, $EngelTypeID, $con; - //form Config - global $DEBUG; - - $Out = ""; - - $Out.= "\n"; - - $Out.= "\t\t\t\n". - "\t\t\t\t\n". - "\t\t\t\t\n". - "\t\t\t\t\n"; - - /////////////////////////////////////////////////////////////////// - // SQL abfrage für die benötigten schichten - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; - $Erg = mysql_query($SQL, $con); - - $Anzahl = mysql_num_rows($Erg); - $Feld=-1; - for( $i = 0; $i < $Anzahl; $i++ ) - { - - $Temp_TID = mysql_result($Erg, $i, "TID"); - - // wenn sich der Type ändert wird zumnästen feld geweckselt - if( ($i==0) || ($Temp_TID_old != $Temp_TID) ) - { - $Feld++; - $Temp[$Feld]["free"]=0; - $Temp[$Feld]["Engel"]=array(); - } - - $Temp[$Feld]["TID"] = $Temp_TID; - $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); - - // ist es eine zu vergeben schicht? - if( $Temp[$Feld]["UID"] == 0 ) - $Temp[$Feld]["free"]++; - else - $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; - - $Temp_TID_old = $Temp[$Feld]["TID"]; - } // FOR - - - /////////////////////////////////////////////////////////////////// - // Aus gabe der Schicht - /////////////////////////////////////////////////////////////////// - if( isset($Temp) && count($Temp) ) - foreach( $Temp as $TempEntry => $TempValue ) - { - $Out.= "\t\t\t\n"; - - // ausgabe EngelType - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\t\n"; + $Out.= "\t\t\t\n"; + + } // FOREACH + + $Out.= "\t\t\t
    ". $EngelTypeID[ $TempValue["TID"] ]; - - // ausgabe Eingetragener Engel - if( count($TempValue["Engel"]) > 0 ) - { - if( count($TempValue["Engel"]) == 1 ) - $Out.= " ". trim(Get_Text("inc_schicht_ist")). ":"; - else - $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":"; - $Out.= ""; - - foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) - $Out.= UID2Nick( $TempEngelID ). ", "; -// $Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", "; - $Out = substr( $Out, 0, strlen($Out)-2 ); - } - else - { - $Out.= ":\n"; - } - - - // ausgabe benötigter Engel - //////////////////////////// - if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y") + global $EngelType, $EngelTypeID, $con; + //form Config + global $debug; + + $Out = ""; + + $Out.= "\n"; + + $Out.= "\t\t\t\n". + "\t\t\t\t\n". + "\t\t\t\t\n". + "\t\t\t\t\n"; + + /////////////////////////////////////////////////////////////////// + // SQL abfrage für die benötigten schichten + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; + $Erg = mysql_query($SQL, $con); + + $Anzahl = mysql_num_rows($Erg); + $Feld=-1; + for( $i = 0; $i < $Anzahl; $i++ ) + { + + $Temp_TID = mysql_result($Erg, $i, "TID"); + + // wenn sich der Type ändert wird zumnästen feld geweckselt + if( ($i==0) || ($Temp_TID_old != $Temp_TID) ) + { + $Feld++; + $Temp[$Feld]["free"]=0; + $Temp[$Feld]["Engel"]=array(); + } + + $Temp[$Feld]["TID"] = $Temp_TID; + $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); + + // ist es eine zu vergeben schicht? + if( $Temp[$Feld]["UID"] == 0 ) + $Temp[$Feld]["free"]++; + else + $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; + + $Temp_TID_old = $Temp[$Feld]["TID"]; + } // FOR + + + /////////////////////////////////////////////////////////////////// + // Aus gabe der Schicht + /////////////////////////////////////////////////////////////////// + if( isset($Temp) && count($Temp) ) + foreach( $Temp as $TempEntry => $TempValue ) + { + $Out.= "\t\t\t\n"; + + // ausgabe EngelType + $Out.= "\t\t\t\t\n"; + $Out.= "\t\t\t\t\n"; + $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\n"; - - } // FOREACH - - $Out.= "\t\t\t
    ". $EngelTypeID[ $TempValue["TID"] ]; + + // ausgabe Eingetragener Engel + if( count($TempValue["Engel"]) > 0 ) + { + if( count($TempValue["Engel"]) == 1 ) + $Out.= " ". trim(Get_Text("inc_schicht_ist")). ":"; + else + $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":"; + $Out.= ""; + + foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) + $Out.= UID2Nick( $TempEngelID ). ", "; +// $Out.= UID2Nick( $TempEngelID ). DisplayAvatar( $TempEngelID ). ", "; + $Out = substr( $Out, 0, strlen($Out)-2 ); + } + else + { + $Out.= ":\n"; + } + + + // ausgabe benötigter Engel + //////////////////////////// + if( $_SESSION['CVS']["nonpublic/schichtplan_add.php"] == "Y") { - if ( $TempValue["free"] > 0) - { - if( count($TempValue["Engel"]) > 0) - $Out.= ", "; - $Out.= $TempValue["free"]. "x free "; - } - } - $Out.= "
    \n\t"; - - return $Out; + if ( $TempValue["free"] > 0) + { + if( count($TempValue["Engel"]) > 0) + $Out.= ", "; + $Out.= $TempValue["free"]. "x free "; + } + } + $Out.= "
    \n\t"; + + return $Out; } // function Ausgabe_Feld_Inhalt /*####################################################### -# gibt die engelschischten für einen Ruam aus # +# gibt die engelschischten für einen Ruam aus # #######################################################*/ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) { - global $con; - - $SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ". - "WHERE ( (`RID` = '$RID') AND ". - "((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ". - " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;"; - - $ErgRoom = mysql_query($SQL, $con); - $Out= "\t"; - if( mysql_num_rows( $ErgRoom)>0 ) - for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ ) - { - $AnzahlEintraege++; - $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), - mysql_result( $ErgRoom, $i-1, "Man")); - if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) ) - $Out.= "
    "; -// $Out.= "
    \n\t\t\t\t"; - - } - else - $Out.= " "; - - $Out.= "\n"; - - return $Out; + global $con; + + $SQL = "SELECT `SID`, `Len`, `Man` FROM `Shifts` ". + "WHERE ( (`RID` = '$RID') AND ". + "((`DateE` like '". gmdate("Y-m-d H", $Time+3600). "%') OR ". + " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;"; + + $ErgRoom = mysql_query($SQL, $con); + $Out= "\t"; + if( mysql_num_rows( $ErgRoom)>0 ) + for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ ) + { + $AnzahlEintraege++; + $Out.= ausgabe_Feld_Inhalt( mysql_result( $ErgRoom, $i-1, "SID"), + mysql_result( $ErgRoom, $i-1, "Man")); + if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) ) + $Out.= "
    "; +// $Out.= "
    \n\t\t\t\t"; + + } + else + $Out.= " "; + + $Out.= "\n"; + + return $Out; } ?> diff --git a/includes/funktion_user.php b/includes/funktion_user.php old mode 100755 new mode 100644 index 0cdf8144..c015cb5a --- a/includes/funktion_user.php +++ b/includes/funktion_user.php @@ -1,132 +1,111 @@ 0) + $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; + else + $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'"; + + $Erg = mysql_query($SQL, $con); + + if(mysql_num_rows($Erg)) { + if($UID > 0) + return mysql_result($Erg, 0); + else + return "Group-".mysql_result($Erg, 0); + } else { + if($UID == -1) + return "logout User"; + else + return "UserID $UID not found"; + } + } -function UID2Nick($UID) -{ - global $con; + function TID2Type($TID) { + global $con; + + $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; + $Erg = mysql_query($SQL, $con); - if( $UID>0) { - $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; - } else { - $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'"; + if(mysql_num_rows($Erg)) + return mysql_result($Erg, 0); + else + return ""; } - $Erg = mysql_query($SQL, $con); - - //echo $UID."#"; - if( mysql_num_rows($Erg)) { - if( $UID>0 ) { - return mysql_result($Erg, 0); - } else { - return "Group-".mysql_result($Erg, 0); - } - } else { - if( $UID == -1) - return "logout User"; - else - return "UserID $UID not found"; + + function ReplaceSmilies($neueckig) { + global $url, $ENGEL_ROOT; + + $neueckig = str_replace(";o))", "", $neueckig); + $neueckig = str_replace(":-))", "", $neueckig); + $neueckig = str_replace(";o)", "", $neueckig); + $neueckig = str_replace(":)", "", $neueckig); + $neueckig = str_replace(":-)", "", $neueckig); + $neueckig = str_replace(":(", "", $neueckig); + $neueckig = str_replace(":-(", "", $neueckig); + $neueckig = str_replace(":o(", "", $neueckig); + $neueckig = str_replace(":o)", "", $neueckig); + $neueckig = str_replace(";o(", "", $neueckig); + $neueckig = str_replace(";(", "", $neueckig); + $neueckig = str_replace(";-(", "", $neueckig); + $neueckig = str_replace("8)", "", $neueckig); + $neueckig = str_replace("8o)", "", $neueckig); + $neueckig = str_replace(":P", "", $neueckig); + $neueckig = str_replace(":-P", "", $neueckig); + $neueckig = str_replace(":oP", "", $neueckig); + $neueckig = str_replace(";P", "", $neueckig); + $neueckig = str_replace(";oP", "", $neueckig); + $neueckig = str_replace("?)", "", $neueckig); + + return $neueckig; } -} + function GetPicturShow($UID) { + global $con; -function TID2Type($TID) -{ - global $con; - - $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; - $Erg = mysql_query($SQL, $con); - - if( mysql_num_rows($Erg)) - return mysql_result($Erg, 0); - else - return ""; -} - - -function ReplaceSmilies($eckig) -{ - global $url, $ENGEL_ROOT; - - $neueckig = $eckig; - $neueckig = str_replace(";o))", "",$neueckig); - $neueckig = str_replace(":-))", "",$neueckig); - $neueckig = str_replace(";o)", "",$neueckig); - $neueckig = str_replace(":)", "",$neueckig); - $neueckig = str_replace(":-)", "",$neueckig); - $neueckig = str_replace(":(", "",$neueckig); - $neueckig = str_replace(":-(", "",$neueckig); - $neueckig = str_replace(":o(", "",$neueckig); - $neueckig = str_replace(":o)", "",$neueckig); - $neueckig = str_replace(";o(", "",$neueckig); - $neueckig = str_replace(";(", "",$neueckig); - $neueckig = str_replace(";-(", "",$neueckig); - $neueckig = str_replace("8)", "",$neueckig); - $neueckig = str_replace("8o)", "",$neueckig); - $neueckig = str_replace(":P", "",$neueckig); - $neueckig = str_replace(":-P", "",$neueckig); - $neueckig = str_replace(":oP", "",$neueckig); - $neueckig = str_replace(";P", "",$neueckig); - $neueckig = str_replace(";oP", "",$neueckig); - $neueckig = str_replace("?)", "",$neueckig); - return $neueckig; -} - - -function GetPicturShow($UID) -{ - global $con; - - $SQL= "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; - $res = mysql_query( $SQL, $con); - if( mysql_num_rows($res) == 1) - return mysql_result( $res, 0, 0); - else - return ""; -} - - -/* Parameter: - - [] */ -function displayPictur($UID, $height="30") -{ - global $url, $ENGEL_ROOT; - if( $height > 0) - return( "\"picture"); - else - return( "\"picture"); -} - - -/* Parameter: - - [] */ -function displayavatar( $UID, $height="30") -{ - global $con, $url, $ENGEL_ROOT; - - if( GetPicturShow($UID) == 'Y') - return " ". displayPictur( $UID, $height); + $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; + $res = mysql_query( $SQL, $con); + + if(mysql_num_rows($res) == 1) + return mysql_result($res, 0, 0); + else + return ""; + } + + function displayPictur($UID, $height = "30") { + global $url, $ENGEL_ROOT; + + if($height > 0) + return( "\"picture"); + else + return( "\"picture"); + } + + function displayavatar($UID, $height="30") { + global $con, $url, $ENGEL_ROOT; + + if( GetPicturShow($UID) == 'Y') + return " ". displayPictur( $UID, $height); - // show avator - $asql = "select * from User where UID = $UID"; - $aerg = mysql_query ($asql, $con); - if( mysql_num_rows($aerg) ) - if( mysql_result($aerg, 0, "Avatar") > 0) - return (" "); - -} - -function UIDgekommen($UID) -{ - global $con; - - $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; - $Erg = mysql_query($SQL, $con); + // show avator + $asql = "select * from User where UID = $UID"; + $aerg = mysql_query ($asql, $con); - //echo $UID."#"; - if( mysql_num_rows($Erg)) - return mysql_result($Erg, 0); - else - return "0"; -} + if(mysql_num_rows($aerg)) + if(mysql_result($aerg, 0, "Avatar") > 0) + return (" "); + } + + function UIDgekommen($UID) { + global $con; + + $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; + $Erg = mysql_query($SQL, $con); + if(mysql_num_rows($Erg)) + return mysql_result($Erg, 0); + else + return "0"; + } ?> diff --git a/includes/funktion_xml.php b/includes/funktion_xml.php old mode 100755 new mode 100644 index 8e911a4f..60eb26fa --- a/includes/funktion_xml.php +++ b/includes/funktion_xml.php @@ -1,13 +1,10 @@ -sub[ $XMLpos[$Tiefe] ]->data .= convertValues($Data); - $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES); - - if( $XMLDEBUG) - echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???
    "; - } - else - dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); + $Data = utf8_decode($Data); + return $Data; } -function startXMLmain( $Data, &$Objekt, $Tiefe ) -{ - global $XMLpos, $depth, $XMLDEBUG; - - if( $XMLDEBUG) - if($Tiefe==1) - { print_r(array_values ($XMLpos)); echo "--".$Data->name; - echo " #$Tiefe/$depth#"; - } - - if( $depth==$Tiefe) - { - $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data; - if( $XMLDEBUG) - echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#
    "; - } - else - startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); +function dataXMLmain($Data, &$Objekt, $Tiefe) { + global $XMLmain, $XMLpos, $depth, $XMLDEBUG; + + if($XMLDEBUG) + echo "?$Tiefe$depth"; + + if(($depth-1) == $Tiefe) { + $Objekt->sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES); + + if($XMLDEBUG) + echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???
    "; + } else + dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); +} + +function startXMLmain( $Data, &$Objekt, $Tiefe ) { + global $XMLpos, $depth, $XMLDEBUG; + + if( $XMLDEBUG) + if($Tiefe==1) + { print_r(array_values ($XMLpos)); echo "--".$Data->name; + echo " #$Tiefe/$depth#"; + } + + if( $depth==$Tiefe) + { + $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data; + if( $XMLDEBUG) + echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#
    "; + } + else + startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); } function start_element_handler($parser, $name, $attribs) { - global $depth, $XMLmain, $XMLpos; + global $depth, $XMLmain, $XMLpos; - $Data = new element; - $Data->name = $name; - while(list($key, $value) = each($attribs)) - $Data->attributes[$key] = convertValues($value); - $Data->depth = $depth; - $XMLpos[$depth]++; + $Data = new element; + $Data->name = $name; + while(list($key, $value) = each($attribs)) + $Data->attributes[$key] = convertValues($value); + $Data->depth = $depth; + $XMLpos[$depth]++; - if( $depth==0) - $XMLmain= $Data; - else - startXMLmain( $Data, $XMLmain, 1); + if( $depth==0) + $XMLmain= $Data; + else + startXMLmain( $Data, $XMLmain, 1); - $depth++; + $depth++; } function end_element_handler($parser, $name) { - global $depth, $XMLpos; - $XMLpos[$depth]=0; - $depth--; + global $depth, $XMLpos; + $XMLpos[$depth]=0; + $depth--; } function character_data_handler($parser, $data) { - global $XMLmain; - if( strlen(trim($data)) ) - dataXMLmain( $data, $XMLmain, 1); + global $XMLmain; + if( strlen(trim($data)) ) + dataXMLmain( $data, $XMLmain, 1); } /*#######################################################################################*/ function readXMLfile( $file ) { - global $XMLDEBUG; - - //$xml_parser = xml_parser_create_ns(); - $xml_parser = xml_parser_create("UTF-8"); - xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler"); - xml_set_character_data_handler($xml_parser, "character_data_handler"); - - if (file_exists($file)) - { - if (!($fp = fopen($file, "r"))) - { - echo("

    could not open XML file \"$file\"

    "); - return -1; - } - } - else - { - echo("

    XML file \"$file\" not exist

    "); - return -1; - } - - if( $XMLDEBUG) echo "
    ";
-	while ($data = fread($fp, 4096)) 
-	{
-		if (!xml_parse($xml_parser, $data, feof($fp))) 
-		{
-			die(sprintf("XML error: %s at line %d",
-				    xml_error_string(xml_get_error_code($xml_parser)),
-				    xml_get_current_line_number($xml_parser)));
-		}
-	}
-	if( $XMLDEBUG)	echo "
    "; - xml_parser_free($xml_parser); - return 0; + global $XMLDEBUG; + + //$xml_parser = xml_parser_create_ns(); + $xml_parser = xml_parser_create("UTF-8"); + xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler"); + xml_set_character_data_handler($xml_parser, "character_data_handler"); + + if (file_exists($file)) + { + if (!($fp = fopen($file, "r"))) + { + echo("

    could not open XML file \"$file\"

    "); + return -1; + } + } + else + { + echo("

    XML file \"$file\" not exist

    "); + return -1; + } + + if( $XMLDEBUG) echo "
    ";
+  while ($data = fread($fp, 4096)) 
+  {
+    if (!xml_parse($xml_parser, $data, feof($fp))) 
+    {
+      die(sprintf("XML error: %s at line %d",
+            xml_error_string(xml_get_error_code($xml_parser)),
+            xml_get_current_line_number($xml_parser)));
+    }
+  }
+  if( $XMLDEBUG)  echo "
    "; + xml_parser_free($xml_parser); + return 0; } /*#######################################################################################*/ function getXMLsubPease( $Sourse, $Name ) { - foreach($Sourse->sub as $key => $value) { - if ($value->name == $Name) { - return $value; - } - } - - echo "

    Fehler: getXMLsubPease( $Sourse, $Name ) not found

    "; -// die; + foreach($Sourse->sub as $key => $value) { + if ($value->name == $Name) { + return $value; + } + } + + echo "

    Fehler: getXMLsubPease( $Sourse, $Name ) not found

    "; +// die; } /*#######################################################################################*/ function getXMLsubData( $Sourse, $Name ) { - $XML = getXMLsubPease( $Sourse, $Name); - return $XML->data; + $XML = getXMLsubPease( $Sourse, $Name); + return $XML->data; } ?> diff --git a/includes/funktion_xml_room.php b/includes/funktion_xml_room.php old mode 100755 new mode 100644 index a8f626d1..cb91af6f --- a/includes/funktion_xml_room.php +++ b/includes/funktion_xml_room.php @@ -1,69 +1,61 @@ -\n

    Rooms:

    \n"; - -function saveRoomData() -{ - global $con; - if( isset($_GET["NameXML"])) - { - $SQL= "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ". - "VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');"; - $Erg = mysql_query($SQL, $con); - if( $Erg ) - echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich
    "; - else - echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war nicht erfogreich.(". - mysql_error($con). ")
    [$SQL]
    "; - } - else - echo "Fehler in den Parametern!
    "; -} /*function saveRoomData*/ - -if( isset($_GET["RoomUpdate"])) - saveRoomData(); - -//INIT Status counter -$DS_KO = 0; - -//Ausgabe -echo "\n"; -echo "\n"; -if( $EnableSchudle) -foreach($XMLmain->sub as $EventKey => $Event) -{ - if( $Event->name == "VEVENT") - { - $NameXML = getXMLsubData( $Event, "LOCATION"); - if( !isset( $RoomName[$NameXML])) - { - $RoomName[$NameXML] = ""; - - if( isset($_GET["UpdateALL"])) - { - $_GET["NameXML"] = $NameXML; - saveRoomData(); - CreateRoomArrays(); - } - else - { - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - $DS_KO++; - echo "\t\n"; - echo "\n"; - echo "
    "; - } - } - } -} -echo "\n"; -echo "
    Namestate
    status: $DS_KO nicht vorhanden.
    \n"; - -?> +Rooms:\n"; + + function saveRoomData() { + global $con; + + if(isset($_GET["NameXML"])) { + $SQL = "INSERT INTO `Room` ( `Name`, `FromPentabarf` ) ". + "VALUES ('". mysql_escape_string($_GET["NameXML"]). "', 'Y');"; + $Erg = mysql_query($SQL, $con); + + if($Erg) + echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war erfogreich
    "; + else + echo "Aenderung, an Raum ". $_GET["NameXML"]. ", war nicht erfogreich.(". + + mysql_error($con). ")
    [$SQL]
    "; + } else + echo "Fehler in den Parametern!
    "; + } + + if(isset($_GET["RoomUpdate"])) + saveRoomData(); + + // INIT Status counter + $DS_KO = 0; + + // Ausgabe + echo "\n"; + echo "\n"; + + if($EnableSchudle) { + foreach($XMLmain->sub as $EventKey => $Event) { + if( $Event->name == "VEVENT") { + $NameXML = getXMLsubData( $Event, "LOCATION"); + + if( !isset( $RoomName[$NameXML])) { + $RoomName[$NameXML] = ""; + + if(isset($_GET["UpdateALL"])) { + $_GET["NameXML"] = $NameXML; + saveRoomData(); + CreateRoomArrays(); + } else { + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + $DS_KO++; + echo "\t\n"; + echo "\n"; + echo "
    "; + } + } + } + } + } + + echo "\n"; + echo "
    Namestate
    status: $DS_KO nicht vorhanden.
    \n"; +?> diff --git a/includes/funktion_xml_schudle.php b/includes/funktion_xml_schudle.php old mode 100755 new mode 100644 index 4ef0a42f..41efce04 --- a/includes/funktion_xml_schudle.php +++ b/includes/funktion_xml_schudle.php @@ -1,178 +1,178 @@ -Schedule:\n"; function SaveSchedule() { - global $RoomID, $RoomName; - global $con; + global $RoomID, $RoomName; + global $con; - if( isset($_GET["PSIDXML"]) && - isset($_GET["DateXML"]) && - isset($_GET["RIDXML"]) && - isset($_GET["LenXML"]) && - isset($_GET["ManXML"]) && - isset($_GET["URLXML"]) ) - { - //erzeuge von `DateE` - $TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60); - $TimeEnd = ($_GET["LenXML"] + $TimeStart) * 60; - $TimeM = $TimeEnd % 60; - $TimeH = ($TimeEnd - $TimeM)/60; - if( $TimeH>=24 ) - { - $TimeH -= 24; - $DateEnd = substr($_GET["DateXML"], 0, 8). - (substr($_GET["DateXML"], 8, 2)+1). " "; - } - else - $DateEnd = substr($_GET["DateXML"], 0, 11); - $DateEnd .= "$TimeH:$TimeM:00"; - - //Namen ermitteln - $_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]]; - - //Update OR insert ? - $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; - $Erg1 = mysql_query($SQL1, $con); - - if( mysql_num_rows($Erg1)==0) - { - echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'"; - $SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ". - "VALUES ('". $_GET["PSIDXML"]. "', ". - "'". $_GET["DateXML"]. "', ". - "'". $DateEnd. "', ". - "'". $_GET["LenXML"]. "', ". - "'". $_GET["RIDXML"]. "', ". - "'". mysql_escape_string($_GET["ManXML"]). "', ". - "'". $_GET["URLXML"]. "'". - ");"; - } - else - { - echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". - mysql_result( $Erg1, 0, "SID"). ")"; - $SQL= "UPDATE `Shifts` SET ". - "`DateS` = '". $_GET["DateXML"]. "', ". - "`DateE` = '". $DateEnd. "', ". - "`Len` = '". $_GET["LenXML"]. "', ". - "`RID` = '". $_GET["RIDXML"]. "', ". - "`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ". - "`URL`= '". $_GET["URLXML"]. "' ". - "WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;"; - } - $Erg = mysql_query($SQL, $con); - if( $Erg ) - { - echo ", war erfogreich
    \n"; + if( isset($_GET["PSIDXML"]) && + isset($_GET["DateXML"]) && + isset($_GET["RIDXML"]) && + isset($_GET["LenXML"]) && + isset($_GET["ManXML"]) && + isset($_GET["URLXML"]) ) + { + //erzeuge von `DateE` + $TimeStart = substr( $_GET["DateXML"], 11, 2) + (substr($_GET["DateXML"], 14, 2)/60); + $TimeEnd = ($_GET["LenXML"] + $TimeStart) * 60; + $TimeM = $TimeEnd % 60; + $TimeH = ($TimeEnd - $TimeM)/60; + if( $TimeH>=24 ) + { + $TimeH -= 24; + $DateEnd = substr($_GET["DateXML"], 0, 8). + (substr($_GET["DateXML"], 8, 2)+1). " "; + } + else + $DateEnd = substr($_GET["DateXML"], 0, 11); + $DateEnd .= "$TimeH:$TimeM:00"; + + //Namen ermitteln + $_GET["RIDXML"] = $RoomName[$_GET["RIDXML"]]; + + //Update OR insert ? + $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; + $Erg1 = mysql_query($SQL1, $con); + + if( mysql_num_rows($Erg1)==0) + { + echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "'"; + $SQL= "INSERT INTO `Shifts` (`PSID`, `DateS`, `DateE`, `Len`, `RID`, `Man`, `URL`) ". + "VALUES ('". $_GET["PSIDXML"]. "', ". + "'". $_GET["DateXML"]. "', ". + "'". $DateEnd. "', ". + "'". $_GET["LenXML"]. "', ". + "'". $_GET["RIDXML"]. "', ". + "'". mysql_escape_string($_GET["ManXML"]). "', ". + "'". $_GET["URLXML"]. "'". + ");"; + } + else + { + echo "Aenderung, am Schedule '". $_GET["PSIDXML"]. "' (SID ". + mysql_result( $Erg1, 0, "SID"). ")"; + $SQL= "UPDATE `Shifts` SET ". + "`DateS` = '". $_GET["DateXML"]. "', ". + "`DateE` = '". $DateEnd. "', ". + "`Len` = '". $_GET["LenXML"]. "', ". + "`RID` = '". $_GET["RIDXML"]. "', ". + "`Man` = '". mysql_escape_string($_GET["ManXML"]). "', ". + "`URL`= '". $_GET["URLXML"]. "' ". + "WHERE `PSID` = '". $_GET["PSIDXML"]. "' LIMIT 1;"; + } + $Erg = mysql_query($SQL, $con); + if( $Erg ) + { + echo ", war erfogreich
    \n"; - //SID auslesen - $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; - $Erg1 = mysql_query($SQL1, $con); - $newSID = mysql_result($Erg1, 0, 0); + //SID auslesen + $SQL1 = "Select `SID` FROM `Shifts` WHERE `PSID`='". $_GET["PSIDXML"]. "';"; + $Erg1 = mysql_query($SQL1, $con); + $newSID = mysql_result($Erg1, 0, 0); - // erstellt ein Array der Reume - $sql2 = "SELECT * FROM `Room` ". - "WHERE `RID`='".$_GET["RIDXML"]. "' ". - "ORDER BY `Number`, `Name`;"; - $Erg2 = mysql_query( $sql2, $con); - for( $j=0; $j $EngelNeeded_Exist) - { - echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ". - ($EngelNeeded-$EngelNeeded_Exist). "x
    \n------>\n"; - for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ ) - { - $SQL3 = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (". - "'". $newSID. "', ". - "'". $EngelTypeID. "');"; - $Erg3 = mysql_query($SQL3, $con); - if ($Erg3 == 1) - echo "pass "; - else - echo "fail ". mysql_error($con). - "($SQL3)
    \n"; - } - echo "
    \n"; - } - else if ($EngelNeeded < $EngelNeeded_Exist) - { - if( $EngelNeeded > $EngelNeeded_NotEmpty) - { - $EngelMin = $EngelNeeded; - } - else - { - $EngelMin = $EngelNeeded_NotEmpty; - echo "---> WARING ". $EngelNeeded_NotEmpty. - " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t"; - } + // chech exist shifts + $sqlShifts = "SELECT * FROM `ShiftEntry` ". + "WHERE `SID`='". $newSID. "' AND ". + "`TID` = '". $EngelTypeID. "';"; + $ErgShifts = mysql_query( $sqlShifts, $con); + $EngelNeeded_Exist = mysql_num_rows( $ErgShifts); + + // check for not empty shifts + $sqlShiftsNotEmpty = "SELECT * FROM `ShiftEntry` ". + "WHERE `SID`='". $newSID. "' AND ". + "`TID` = '". $EngelTypeID. "' AND ". + "`UID` != 0 ;"; + $ErgShiftsNotEmpty = mysql_query( $sqlShiftsNotEmpty, $con); + $EngelNeeded_NotEmpty = mysql_num_rows( $ErgShiftsNotEmpty); + + // Angel create/delte? + if( $EngelNeeded > $EngelNeeded_Exist) + { + echo "---->Create Shifts for engeltype: ". TID2Type($EngelTypeID). " ". + ($EngelNeeded-$EngelNeeded_Exist). "x
    \n------>\n"; + for( $i=0; $i < ($EngelNeeded-$EngelNeeded_Exist); $i++ ) + { + $SQL3 = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES (". + "'". $newSID. "', ". + "'". $EngelTypeID. "');"; + $Erg3 = mysql_query($SQL3, $con); + if ($Erg3 == 1) + echo "pass "; + else + echo "fail ". mysql_error($con). + "($SQL3)
    \n"; + } + echo "
    \n"; + } + else if ($EngelNeeded < $EngelNeeded_Exist) + { + if( $EngelNeeded > $EngelNeeded_NotEmpty) + { + $EngelMin = $EngelNeeded; + } + else + { + $EngelMin = $EngelNeeded_NotEmpty; + echo "---> WARING ". $EngelNeeded_NotEmpty. + " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t"; + } - echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ". - ($EngelNeeded_Exist-$EngelMin)."x
    \n------>\n"; - for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ ) - { - $SQL3 = "DELETE FROM `ShiftEntry` ". - "WHERE `SID` = ". $newSID. " AND ". - "`TID` = ". $EngelTypeID. " AND ". - "`UID` = 0 ". - "LIMIT 1;"; - $Erg3 = mysql_query($SQL3, $con); - if ($Erg3 == 1) - echo "pass "; - else - echo "fail ". mysql_error($con). - "($SQL3)
    \n"; - } - echo "
    \n"; - } - else - { -// echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "
    \n"; - } - } - } + echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ". + ($EngelNeeded_Exist-$EngelMin)."x
    \n------>\n"; + for( $i=$EngelMin; $i<$EngelNeeded_Exist; $i++ ) + { + $SQL3 = "DELETE FROM `ShiftEntry` ". + "WHERE `SID` = ". $newSID. " AND ". + "`TID` = ". $EngelTypeID. " AND ". + "`UID` = 0 ". + "LIMIT 1;"; + $Erg3 = mysql_query($SQL3, $con); + if ($Erg3 == 1) + echo "pass "; + else + echo "fail ". mysql_error($con). + "($SQL3)
    \n"; + } + echo "
    \n"; + } + else + { +// echo "---->Nothing to do, for engeltype: ". TID2Type($EngelTypeID). "
    \n"; + } + } + } - } - else - echo ", war nicht erfogreich.(". - mysql_error($con). ")
    [$SQL]
    \n"; - } - else - echo "Fehler in den Parametern!
    "; + } + else + echo ", war nicht erfogreich.(". + mysql_error($con). ")
    [$SQL]
    \n"; + } + else + echo "Fehler in den Parametern!
    "; } /*SaveSchedule*/ if( isset($_GET["ScheduleUpdate"])) - SaveSchedule(); + SaveSchedule(); //INIT Status counter $DS_OK = 0; @@ -182,127 +182,127 @@ $Where = ""; //ausgabe echo "\n"; echo "". - "\n"; + "\n"; echo "". - "\n"; + "\n"; if( $EnableSchudle) foreach($XMLmain->sub as $EventKey => $Event) { - if( $Event->name == "VEVENT") - { - echo "\n"; - echo "\t\n"; - - $PSIDXML = getXMLsubData( $Event, "UID"); - $DateXML = - substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-". - substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-". - substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ". - substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":". - substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00"; - $LenXML = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60); - $RIDXML = getXMLsubData( $Event, "LOCATION"); - $ManXML = getXMLsubData( $Event, "SUMMARY"); - $URLXML = getXMLsubData( $Event, "URL"); - - if( isset($_GET["UpdateALL"])) - { - $_GET["PSIDXML"] = $PSIDXML; - $_GET["DateXML"] = $DateXML; - $_GET["LenXML"] = $LenXML; - $_GET["RIDXML"] = $RIDXML; - $_GET["ManXML"] = $ManXML; - $_GET["URLXML"] = $URLXML; - SaveSchedule(); - } - - $SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'"; - $Erg = mysql_query($SQL, $con); - if(mysql_num_rows($Erg)>0) - { - $SIDDB = mysql_result($Erg, 0, "SID"); - $PSIDDB = mysql_result($Erg, 0, "PSID"); - $TimeDB = mysql_result($Erg, 0, "DateS"); - $LenDB = mysql_result($Erg, 0, "Len"); - if( isset($RoomID[mysql_result($Erg, 0, "RID")])) - $RIDDB = $RoomID[mysql_result($Erg, 0, "RID")]; - else - $RIDDB = "RID". mysql_result($Erg, 0, "RID"); - - $ManDB = mysql_result($Erg, 0, "Man"); - $URLDB = mysql_result($Erg, 0, "URL"); - } - else - $SIDDB = $PSIDDB = $TimeDB = $LenDB = $RIDDB = $ManDB = $URLDB = ""; + if( $Event->name == "VEVENT") + { + echo "\n"; + echo "\t\n"; + + $PSIDXML = getXMLsubData( $Event, "UID"); + $DateXML = + substr( getXMLsubData( $Event, "DTSTART"), 0, 4). "-". + substr( getXMLsubData( $Event, "DTSTART"), 4, 2). "-". + substr( getXMLsubData( $Event, "DTSTART"), 6, 2). " ". + substr( getXMLsubData( $Event, "DTSTART"), 9, 2). ":". + substr( getXMLsubData( $Event, "DTSTART"), 11,2). ":00"; + $LenXML = substr( getXMLsubData( $Event, "DURATION"), 0, 2) + ( substr( getXMLsubData( $Event, "DURATION"), 3, 2)/60); + $RIDXML = getXMLsubData( $Event, "LOCATION"); + $ManXML = getXMLsubData( $Event, "SUMMARY"); + $URLXML = getXMLsubData( $Event, "URL"); + + if( isset($_GET["UpdateALL"])) + { + $_GET["PSIDXML"] = $PSIDXML; + $_GET["DateXML"] = $DateXML; + $_GET["LenXML"] = $LenXML; + $_GET["RIDXML"] = $RIDXML; + $_GET["ManXML"] = $ManXML; + $_GET["URLXML"] = $URLXML; + SaveSchedule(); + } + + $SQL = "SELECT * FROM `Shifts` WHERE `PSID`='$PSIDXML'"; + $Erg = mysql_query($SQL, $con); + if(mysql_num_rows($Erg)>0) + { + $SIDDB = mysql_result($Erg, 0, "SID"); + $PSIDDB = mysql_result($Erg, 0, "PSID"); + $TimeDB = mysql_result($Erg, 0, "DateS"); + $LenDB = mysql_result($Erg, 0, "Len"); + if( isset($RoomID[mysql_result($Erg, 0, "RID")])) + $RIDDB = $RoomID[mysql_result($Erg, 0, "RID")]; + else + $RIDDB = "RID". mysql_result($Erg, 0, "RID"); + + $ManDB = mysql_result($Erg, 0, "Man"); + $URLDB = mysql_result($Erg, 0, "URL"); + } + else + $SIDDB = $PSIDDB = $TimeDB = $LenDB = $RIDDB = $ManDB = $URLDB = ""; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - if( !( $PSIDXML==$PSIDDB && - $DateXML==$TimeDB && - $RIDXML==$RIDDB && - $LenXML==$LenDB && - $ManXML==$ManDB && - $URLXML==$URLDB) ) - { - echo "\t\n"; - $DS_KO++; - } - else - { - echo "\t\n"; - $DS_OK++; - } - echo "\t\n"; - echo "\n"; - $Where.= " OR `PSID`='$PSIDXML'"; - } + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + if( !( $PSIDXML==$PSIDDB && + $DateXML==$TimeDB && + $RIDXML==$RIDDB && + $LenXML==$LenDB && + $ManXML==$ManDB && + $URLXML==$URLDB) ) + { + echo "\t\n"; + $DS_KO++; + } + else + { + echo "\t\n"; + $DS_OK++; + } + echo "\t\n"; + echo "\n"; + $Where.= " OR `PSID`='$PSIDXML'"; + } } echo "\n"; //Anzeige von nicht im XML File vorkommende entraege if( $Where =="") - $SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';"; + $SQL2 = "SELECT * FROM `Shifts` WHERE NOT `PSID`='';"; else - $SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';"; - + $SQL2 = "SELECT * FROM `Shifts` WHERE NOT (".substr( $Where, 4). ") AND NOT PSID = '';"; + $Erg2 = mysql_query($SQL2, $con); echo mysql_error($con); if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB ) - for( $i=0; $i\n"; - $SID = mysql_result($Erg2, $i, "SID"); - $Time = mysql_result($Erg2, $i, "DateS"); - $Len = mysql_result($Erg2, $i, "Len"); - if( isset($RoomID[ mysql_result($Erg2, $i, "RID")])) - $RID = $RoomID[ mysql_result($Erg2, $i, "RID")]; - else - $RID = "RID.". mysql_result($Erg2, $i, "RID"); - $Man = mysql_result($Erg2, $i, "Man"); - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - } + for( $i=0; $i\n"; + $SID = mysql_result($Erg2, $i, "SID"); + $Time = mysql_result($Erg2, $i, "DateS"); + $Len = mysql_result($Erg2, $i, "Len"); + if( isset($RoomID[ mysql_result($Erg2, $i, "RID")])) + $RID = $RoomID[ mysql_result($Erg2, $i, "RID")]; + else + $RID = "RID.". mysql_result($Erg2, $i, "RID"); + $Man = mysql_result($Erg2, $i, "Man"); + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + } echo "
    PSIDDateRoomLenNamestate
    RoomLenNamestate
    XML - DBXML - DBXML - DBXML - DBXML - DB
    XML - DBXML - DBXML - DB
    \n\t\t". - "\n\t\t". - "\n\t\t". - "\n\t\t". - "". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "
    \n\t\t". + "\n\t\t". + "\n\t\t". + "\n\t\t". + "". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "
    status: $DS_KO/$DS_OK nicht Aktuel.
    \n\t\t". - "\n\t\t". - "\n\t\t". - "\n\t\t". - "". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). - "
    \n\t\t". + "\n\t\t". + "\n\t\t". + "\n\t\t". + "". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). + "
    "; diff --git a/includes/funktionen.php b/includes/funktionen.php old mode 100755 new mode 100644 index d841e6ec..fb63b708 --- a/includes/funktionen.php +++ b/includes/funktionen.php @@ -1,26 +1,23 @@ diff --git a/includes/header.php b/includes/header.php old mode 100755 new mode 100644 index e5d97a0c..3b6a4c23 --- a/includes/header.php +++ b/includes/header.php @@ -1,61 +1,57 @@ -\n"; ?> - - ---- $title ---\n"; -?> - - - - - - - - -.css"> -\n"; + + + +<?php echo $title; ?> + + + + + + + + + +.css" /> + +\n"; } -if (isset($Page["AutoReload"])) -{ - echo "\n\n"; -} +if(isset($Page["AutoReload"])) + echo "\n\n"; -echo "\n"; +echo "\n"; ///////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////// B O D Y ///////////////////////////////////////////////////////////////////////////////////////////// -echo "\n"; +echo "\n"; -echo "
    \n\n"; +echo "
    \n\n"; if( isset($_SESSION['color']) && ($_SESSION['color']==6) ) { - echo "\t\"Unser\n"; + echo "\"Unser\n"; } else { - echo "\t\"Unser\n"; + echo "\"Unser\n"; } echo "
    \n\n"; @@ -65,73 +61,65 @@ 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 "
    ". Get_Text("pub_messages_new1"). - " ". mysql_num_rows( $erg ). " ". - Get_Text("pub_messages_new2"). "

    "; + $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'"; + $erg = mysql_query($SQL, $con); + if( mysql_num_rows( $erg ) > 0 ) + echo "
    ". Get_Text("pub_messages_new1"). + " ". mysql_num_rows( $erg ). " ". + Get_Text("pub_messages_new2"). "

    "; } } ?> - - + - + +
    + - - + - - - + + + - + - -
    -"; - if( strlen( $header) == 0 ) - echo "\n\t". Get_Text($Page["Name"]). "\n"; - else - echo "\n\t$header\n"; +
    +"; + if( strlen( $header) == 0 ) + echo "\n". Get_Text($Page["Name"]). "\n"; + else + echo "\n$header\n"; ?> -
    -
    +
    +
    \n"; - If (IsSet($_SESSION['oldurl'])) - echo "".Get_Text("back")." geht's zurück...\n"; - else - echo "".Get_Text("back")." geht's zurück...\n"; - exit (); +function SetHeaderGo2Back() { + global $BACKUP_SESSION_OLDURL; + $_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL; } -?> +if($Page["CVS"] != "Y") { + echo "Du besitzt kein Rechte für diesen Bereich.
    \n"; - - + if(isset($_SESSION['oldurl'])) + echo "" . Get_Text("back") . " geht's zurück...\n"; + else + echo "" . Get_Text("back") . " geht's zurück...\n"; + exit (); +} +?> + 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); + } ?> diff --git a/includes/login_eingabefeld.php b/includes/login_eingabefeld.php old mode 100755 new mode 100644 index bed1a2fd..e68639cf --- a/includes/login_eingabefeld.php +++ b/includes/login_eingabefeld.php @@ -1,18 +1,17 @@ -"; -echo "\n". - "\t". - "\t\t". - "\t\t". - "\t". - "\t". - "\t\t". - "\t\t". - "\t". - "
    ". Get_Text("index_lang_nick"). "
    ". Get_Text("index_lang_pass"). "
    ". - "
    "; -echo ""; - + +
    + + + + + + + + + +
    +
    "> +
    diff --git a/includes/menu.php b/includes/menu.php old mode 100755 new mode 100644 index 6133b856..799e6c75 --- a/includes/menu.php +++ b/includes/menu.php @@ -1,30 +1,30 @@ -     		- + -
    +
    "; -$MenueTableEnd=" -
    -

    +$MenueTableEnd=" +
    +

    "; 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; +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 ); @@ -33,15 +33,15 @@ if ($submenus >= 1 ) { for ($index_nummer=1; $index_nummer <= $submenus; $index_nummer++) { ?> - - - + + +
    - -
    + +
    -
    - + - - - + + +
    - -
    + +
    - - + diff --git a/includes/secure.php b/includes/secure.php old mode 100755 new mode 100644 index d6b5c512..1d1a9e46 --- a/includes/secure.php +++ b/includes/secure.php @@ -1,41 +1,25 @@ \n"; -if( $DEBUG) - echo "secure.php START
    \n"; + foreach ($_GET as $k => $v) { + $v = htmlentities($v, ENT_QUOTES); + preg_replace('/([\'"`\'])/', '', $v); + $_GET[$k] = $v; -foreach ($_GET as $k => $v) -{ -// $v = htmlspecialchars($v, ENT_QUOTES); -// $v = mysql_escape_string($v); - $v = htmlentities($v, ENT_QUOTES); - if (preg_match('/([\'"`\'])/', $v, $match)) - { - print "sorry get has illegal char '$match[1]'"; - exit; - } - $_GET[$k] = $v; - - if( $DEBUG) - echo "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; -foreach ($_POST as $k => $v) -{ -// $v = htmlspecialchars($v, ENT_QUOTES); -// $v = mysql_escape_string($v); - $v = htmlentities($v, ENT_QUOTES); - if (preg_match('/([\'"`\'])/', $v, $match)) { - print "sorry post has illegal char '$match[1]'"; - exit; - } - $_POST[$k] = $v; - - if( $DEBUG) - echo "POST $k=\"$v\"
    "; -} -if( $DEBUG) - echo "secure.php END
    \n"; + if($debug) + echo "POST $k=\"$v\"
    "; + } + if($debug) + echo "secure.php END
    \n"; ?> diff --git a/services/cron_dect.php b/services/cron_dect.php index b5e338c6..57d12e0f 100755 --- a/services/cron_dect.php +++ b/services/cron_dect.php @@ -1,61 +1,51 @@ -'2007-07-09 09:45:00' AND ". - "Shifts.DateS<='2007-07-09 11:00:00');"; -else - $SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ". - "(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );"; - -$Erg = mysql_query($SQL, $con); -echo mysql_error($con); - -$Z=0; -for( $i=0; $i0) - { - $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID")); - if( $DECTnumber!="") - { - echo "dial $DECTnumber\n"; - DialNumberIAX( $DECTnumber, - mysql_result($Erg, $i, "DateS"), - mysql_result($Erg, $i, "RID"), - mysql_result($Erg, $i, "TID")); - DialNumberModem( $DECTnumber, - mysql_result($Erg, $i, "DateS")); - if( $Z++>10) - { - $Z=0; - sleep(30); - } - } +'2007-07-09 09:45:00' AND ". + "Shifts.DateS<='2007-07-09 11:00:00');"; + else + $SQL .= "WHERE ((`Shifts`.`DateS`>'". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset). "') AND ". + "(`Shifts`.`DateS`<='". gmdate("Y-m-d H:i:s", time()+120+$gmdateOffset+$StartTimeBeforEvent). "') );"; + + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + $Z = 0; + + for($i = 0; $i < mysql_num_rows($Erg); $i++) { + if(mysql_result($Erg, $i, "UID") > 0) { + $DECTnumber = UID2DECT(mysql_result($Erg, $i, "UID")); + + if($DECTnumber != "") { + echo "dial $DECTnumber\n"; + DialNumberIAX( $DECTnumber, mysql_result($Erg, $i, "DateS"), mysql_result($Erg, $i, "RID"), mysql_result($Erg, $i, "TID")); + DialNumberModem( $DECTnumber, mysql_result($Erg, $i, "DateS")); + + if($Z++ > 10) { + $Z = 0; + sleep(30); + } + } + } } -} - -return 0; - + return 0; ?> - diff --git a/services/dect_clear.php b/services/dect_clear.php index 713cce36..b49b1e40 100755 --- a/services/dect_clear.php +++ b/services/dect_clear.php @@ -1,25 +1,19 @@ -) + - diff --git a/services/jabberserver.php b/services/jabberserver.php index 8a80b35c..94ef3a8b 100755 --- a/services/jabberserver.php +++ b/services/jabberserver.php @@ -1,113 +1,75 @@ -Connect() && $jabber->SendAuth())) - die("Couldn't connect to Jabber Server."); -} - - -/****************************************************************************************************/ -// INIT socked -/****************************************************************************************************/ -echo "INIT socked\n"; - //http://de3.php.net/manual/de/function.socket-listen.php -// Create a UDP socket -$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked ('.socket_strerror(socket_last_error()). ')'); -// Bind the socket to an address/port -socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address ('.socket_strerror(socket_last_error()). ')'); -// Setzt Nonbock Mode -socket_set_nonblock($sock); - - -/****************************************************************************************************/ -// Loop continuos -/****************************************************************************************************/ -$RUNNING = TRUE; -while( $RUNNING ) -{ - if( @socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) - { - //daten empfangen - $data = substr($data,0, strlen($data)-1); //ENTER entfernen - echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n"; - PackedAnalyser( $data); - } - - usleep(100000); // 100ms delay keeps the doctor away -} // end while - -//disconnect jabber -if( !DEBUG) - $jabber->Disconnect(); - -// Close the master sockets -socket_close($sock); - -/****************************************************************************************************/ -/****************************************** MAIN END ************************************************/ -/****************************************************************************************************/ - - -/****************************************************************************************************/ -//***** function PackedAnalyser -/****************************************************************************************************/ -function PackedAnalyser( $data ) -{ - GLOBAL $jabber, $RUNNING; - // init array - $matches = array(); - - //#message - if( preg_match( "/^#(message) ([^ ]+) (.+)/i", $data, $matches ) ) - { - if( $matches[2]=="" || $matches[3]=="") - { - // Wrong syntax - echo "\t\t\t\t#messaage parameter fail\n"; - } - else - { - // Whisper - if( !DEBUG) - $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL); - else - echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n"; - } - } - elseif( preg_match( "/^#quit/i", $data, $matches ) ) - { - if( DEBUG) - { - echo "\t\t\t\tSystem Shutdown\n\n"; - $RUNNING = FALSE; - } - } - else - { - echo "\t\t\t\tcommand not found\n\n"; - } -} - -?> +Connect() && $jabber->SendAuth())) + die("Couldn't connect to Jabber Server."); + } + + echo "INIT socked\n"; + + // Create a UDP socket + $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die('Could not create socked (' . socket_strerror(socket_last_error()) . ')'); + + // Bind the socket to an address/port + socket_bind($sock, SERVER_ADDRESS, SERVER_PORT) or die('Could not bind to address (' . socket_strerror(socket_last_error()) . ')'); + + // Setzt Nonbock Mode + socket_set_nonblock($sock); + + $RUNNING = true; + + while($RUNNING) { + if(@socket_recvfrom($sock, $data, 65535, 0, $ip, $port)) { + // daten empfangen + $data = substr($data, 0, strlen($data)-1); //ENTER entfernen + echo "\n". gmdate("Y-m-d H:i:s", time()). "\tresive from $ip:$port ". strlen($data). " byte data ($data)\n"; + PackedAnalyser( $data); + } + + usleep(100000); // 100ms delay keeps the doctor away + } // end while + + // disconnect jabber + if(!DEBUG) + $jabber->Disconnect(); + + // Close the master sockets + socket_close($sock); + + function PackedAnalyser($data) { + global $jabber, $RUNNING; + // init array + $matches = array(); + + //#message + if(preg_match("/^#(message) ([^ ]+) (.+)/i", $data, $matches)) { + if($matches[2]=="" || $matches[3]=="") + echo "\t\t\t\t#messaage parameter fail\n"; + else { + // Whisper + if(!DEBUG) + $jabber->SendMessage($value, "normal", NULL, array("body" => $message, "subject" => "Error in Pentabarf"), NULL); + else + echo "\t\t\t\tmessage to:\"". $matches[2]. "\" Text: \"". $matches[3]. "\"\n"; + } + } elseif(preg_match("/^#quit/i", $data, $matches)) { + if(DEBUG) { + echo "\t\t\t\tSystem Shutdown\n\n"; + $RUNNING = false; + } + } else + echo "\t\t\t\tcommand not found\n\n"; + } +?> diff --git a/txt/LICENSE b/txt/LICENSE old mode 100755 new mode 100644 diff --git a/txt/README b/txt/README index d516369a..4d8ca9bb 100644 --- a/txt/README +++ b/txt/README @@ -3,9 +3,9 @@ DIRS: ./DB Standart DB File ./www - daten für http verbindung + daten fuer http verbindung ./www-ssl - daten für https verbindung + daten fuer https verbindung Anfordeungen: ------------- diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index 793b5546..b6e95897 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,58 +1,51 @@ - diff --git a/www-ssl/admin/EngelType.php b/www-ssl/admin/EngelType.php old mode 100755 new mode 100644 index 6d640ae4..1aec80dc --- a/www-ssl/admin/EngelType.php +++ b/www-ssl/admin/EngelType.php @@ -6,42 +6,42 @@ include("../../../camp2011/includes/funktion_db.php"); function runSQL( $SQL) { - global $con; - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($SQL, $con); - if ($Erg) - { - echo "Änderung wurde gesichert...
    "; - echo "[$SQL]
    "; - return 1; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    "; - echo "[$SQL]
    "; - return 0; - } + global $con; + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($SQL, $con); + if ($Erg) + { + echo "Änderung wurde gesichert...
    "; + echo "[$SQL]
    "; + return 1; + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    "; + echo "[$SQL]
    "; + return 0; + } } function runSQL_log( $SQL, $commed) { - global $con; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, $commed); - if ($Erg) - { - echo "Änderung wurde gesichert...
    "; - echo "[$SQL]
    "; - return 1; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    "; - echo "[$SQL]
    "; - return 0; - } + global $con; + // hier muesste das SQL ausgefuehrt werden... + $Erg = db_query($SQL, $commed); + if ($Erg) + { + echo "Änderung wurde gesichert...
    "; + echo "[$SQL]
    "; + return 1; + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    "; + echo "[$SQL]
    "; + return 0; + } } @@ -51,33 +51,33 @@ $Erg = mysql_query($Sql, $con); if( !IsSet($_GET["action"]) ) { - echo "Hallo ".$_SESSION['Nick']. - ",
    \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen ". - "oder vorhandene abzuändern:

    \n"; - - echo "- Neuen EngelType eintragen
    \n"; - - echo "\n"; - echo "\n"; - - for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) - { - echo "\t"; - } - echo "\t"; - echo ""; - - for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) - { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) - { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
    ". mysql_field_name($Erg, $i). "Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; + echo "Hallo ".$_SESSION['Nick']. + ",
    \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen ". + "oder vorhandene abzuändern:

    \n"; + + echo "- Neuen EngelType eintragen
    \n"; + + echo "\n"; + echo "\n"; + + for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) + { + echo "\t"; + } + echo "\t"; + echo ""; + + for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) + { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) + { + echo "\t\t\n"; + } + echo "\t\t\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo "
    ". mysql_field_name($Erg, $i). "Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; } else { @@ -85,105 +85,105 @@ else switch ($_GET["action"]) { case 'new': - echo "Neuen EngelType einrichten:
    "; - echo "
    \n"; - echo "\n"; - - for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) - { - echo "". - "\n"; - } - echo "
    ".mysql_field_name($Erg, $Uj)."
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - break; + echo "Neuen EngelType einrichten:
    "; + echo "
    \n"; + echo "\n"; + + for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) + { + echo "". + "\n"; + } + echo "
    ".mysql_field_name($Erg, $Uj)."
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + break; case 'newsave': - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys=""; - $Values=""; - foreach($vars as $key => $value){ - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - - if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", - "save new EngelType") ) - { - SetHeaderGo2Back(); - - $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'"; - $ERG = mysql_query($SQL2, $con); - - if( mysql_num_rows($ERG) == 1) - runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). - "` INT DEFAULT '0' NOT NULL;", - "add new EngelType in Romm Table"); - } - break; + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys=""; + $Values=""; + foreach($vars as $key => $value){ + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + + if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", + "save new EngelType") ) + { + SetHeaderGo2Back(); + + $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'"; + $ERG = mysql_query($SQL2, $con); + + if( mysql_num_rows($ERG) == 1) + runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). + "` INT DEFAULT '0' NOT NULL;", + "add new EngelType in Romm Table"); + } + break; case 'change': - if (! IsSet($_GET["TID"])) - echo "Fehlerhafter Aufruf!"; - else - { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, den EngelType ändern."; - echo "
    \n"; - echo "\n"; - - $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'"; - $ERG = mysql_query($SQL2, $con); + if (! IsSet($_GET["TID"])) + echo "Fehlerhafter Aufruf!"; + else + { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, den EngelType ändern."; + echo "\n"; + echo "
    \n"; + + $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'"; + $ERG = mysql_query($SQL2, $con); - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - echo "". - "\n"; - - echo "
    ". mysql_field_name($ERG, $Uj). "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    "; - } - break; - + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) + echo "". mysql_field_name($ERG, $Uj). "". + "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    "; + } + break; + case 'changesave': $vars = $_GET; $count = count($vars) - 2; $vars = array_splice($vars, 0, $count); - $keys=""; - $sql=""; + $keys=""; + $sql=""; foreach($vars as $key => $value) - { - $keys = substr( $key, 1); - $sql .= ", `". $keys. "`='". $value. "'"; + { + $keys = substr( $key, 1); + $sql .= ", `". $keys. "`='". $value. "'"; } - runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", - "Save Change EngelType"); - SetHeaderGo2Back(); - break; + runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", + "Save Change EngelType"); + SetHeaderGo2Back(); + break; case 'delete': - if (IsSet($_GET["TID"])) - { - if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType")) - runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", - "delete EngelType in Room Table"); - } - else - echo "Fehlerhafter Aufruf"; - SetHeaderGo2Back(); - break; + if (IsSet($_GET["TID"])) + { + if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType")) + runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", + "delete EngelType in Room Table"); + } + else + echo "Fehlerhafter Aufruf"; + SetHeaderGo2Back(); + break; } } diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php old mode 100755 new mode 100644 index 38c659dd..6bb8f59d --- a/www-ssl/admin/Recentchanges.php +++ b/www-ssl/admin/Recentchanges.php @@ -1,4 +1,4 @@ -\n\tTime\n\tUser\n\tCommend\n\tSQL Comm for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) { - echo "\n"; - echo "\t". mysql_result( $Erg, $n, "Time"). "\n"; - echo "\t". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "\n"; - echo "\t". mysql_result( $Erg, $n, "Commend"). "\n"; - echo "\t". mysql_result( $Erg, $n, "SQLCommad"). "\n"; - echo "\n"; + echo "\n"; + echo "\t". mysql_result( $Erg, $n, "Time"). "\n"; + echo "\t". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "\n"; + echo "\t". mysql_result( $Erg, $n, "Commend"). "\n"; + echo "\t". mysql_result( $Erg, $n, "SQLCommad"). "\n"; + echo "\n"; } echo "\n"; diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php old mode 100755 new mode 100644 index 93e75bf1..00716329 --- a/www-ssl/admin/UserPicture.php +++ b/www-ssl/admin/UserPicture.php @@ -7,114 +7,114 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); if( IsSet($_GET["action"]) ) { - UnSet($SQL); + UnSet($SQL); - switch ($_GET["action"]) - { - case 'FormUpload': - echo "Hier kannst Du ein Foto hochladen för:"; - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; - echo "\t\n"; - echo "
    \n"; - break; - case 'sendPicture': - if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) ) - { - if( ($_FILES["file"]["type"] == "image/jpeg") || - ($_FILES["file"]["type"] == "image/png") || - ($_FILES["file"]["type"] == "image/gif") ) - { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + switch ($_GET["action"]) + { + case 'FormUpload': + echo "Hier kannst Du ein Foto hochladen för:"; + echo "
    \n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; + echo "\t\n"; + echo "
    \n"; + break; + case 'sendPicture': + if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) ) + { + if( ($_FILES["file"]["type"] == "image/jpeg") || + ($_FILES["file"]["type"] == "image/png") || + ($_FILES["file"]["type"] == "image/gif") ) + { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - if( GetPicturShow( $_POST['UID']) == "") - $SQL = "INSERT INTO `UserPicture` ". - "( `UID`,`Bild`, `ContentType`, `show`) ". - "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET ". - "`Bild`='$data', ". - "`ContentType`='". $_FILES["file"]["type"]. "' ". - "WHERE `UID`='". $_POST['UID']. "'"; + if( GetPicturShow( $_POST['UID']) == "") + $SQL = "INSERT INTO `UserPicture` ". + "( `UID`,`Bild`, `ContentType`, `show`) ". + "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET ". + "`Bild`='$data', ". + "`ContentType`='". $_FILES["file"]["type"]. "' ". + "WHERE `UID`='". $_POST['UID']. "'"; - echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ". - "MIME-Type: " . $_FILES["file"]["type"]. ", ". - $_FILES["file"]["size"]. " Byte ". - "for ". UID2Nick( $_POST["UID"]); - } - else - Print_Text("pub_einstellungen_send_KO"); - } - else - Print_Text("pub_einstellungen_send_KO"); - break; + echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ". + "MIME-Type: " . $_FILES["file"]["type"]. ", ". + $_FILES["file"]["size"]. " Byte ". + "for ". UID2Nick( $_POST["UID"]); + } + else + Print_Text("pub_einstellungen_send_KO"); + } + else + Print_Text("pub_einstellungen_send_KO"); + break; - case 'SetN': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:
    "; - $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'"; - } - else - echo "Fehlerhafter Aufruf"; - break; - case 'SetY': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:
    "; - $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'"; - } - else - echo "Fehlerhafter Aufruf"; - break; - case 'del': - echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich löschen? ". - "Yes"; - break; - case 'delYes': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gelöscht:
    "; - $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1"; - } - else - echo "Fehlerhafter Aufruf"; - break; - default: - echo "Fehlerhafter Aufruf"; - - } //switch + case 'SetN': + if (IsSet($_GET["UID"])) + { + echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:
    "; + $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'"; + } + else + echo "Fehlerhafter Aufruf"; + break; + case 'SetY': + if (IsSet($_GET["UID"])) + { + echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:
    "; + $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'"; + } + else + echo "Fehlerhafter Aufruf"; + break; + case 'del': + echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich löschen? ". + "Yes"; + break; + case 'delYes': + if (IsSet($_GET["UID"])) + { + echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gelöscht:
    "; + $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1"; + } + else + echo "Fehlerhafter Aufruf"; + break; + default: + echo "Fehlerhafter Aufruf"; + + } //switch - // Update ??? - if (IsSet($SQL)) - { - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo "Änderung wurde gesichert...
    "; - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; - } - } // Ende Update - echo "
    \n
    \n
    \n\n"; + // Update ??? + if (IsSet($SQL)) + { + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) + echo "Änderung wurde gesichert...
    "; + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; + } + } // Ende Update + echo "
    \n
    \n
    \n\n"; } //IF IsSet($action) //ausgabe der Liste $Sql = "SELECT * FROM `UserPicture` WHERE `UID`>0;"; $Erg = mysql_query($Sql, $con); - -echo "Hallo ". $_SESSION['Nick']. ",
    \nhier hast du die Möglichkeit, die Bilder der Engel freizugeben:

    \n"; + +echo "Hallo ". $_SESSION['Nick']. ",
    \nhier hast du die Möglichkeit, die Bilder der Engel freizugeben:

    \n"; echo "\n"; echo "\n"; @@ -125,25 +125,25 @@ echo "\t\n"; echo ""; for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) -{ - $UIDs = mysql_result($Erg, $t, "UID"); - echo "\t\n"; - - echo "\t\t\n"; - echo "\t\t\n"; - - if( GetPicturShow( $UIDs) == "Y") - echo "\t\t\n"; - elseif( GetPicturShow( $UIDs) == "N") - echo "\t\t\n"; - else - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; +{ + $UIDs = mysql_result($Erg, $t, "UID"); + echo "\t\n"; + + echo "\t\t\n"; + echo "\t\t\n"; + + if( GetPicturShow( $UIDs) == "Y") + echo "\t\t\n"; + elseif( GetPicturShow( $UIDs) == "N") + echo "\t\t\n"; + else + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } // ende Auflistung Raeume echo "
    Löschen
    ". UID2Nick(mysql_result($Erg, $t, "UID")). "". displayPictur( $UIDs, 0). "sperrenfreigebenERROR: show='". GetPicturShow( $UIDs). "'del
    ". UID2Nick(mysql_result($Erg, $t, "UID")). "". displayPictur( $UIDs, 0). "sperrenfreigebenERROR: show='". GetPicturShow( $UIDs). "'del
    "; -echo "
    picture upload\n"; +echo "
    picture upload\n"; include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php old mode 100755 new mode 100644 index f5e8c9c3..68199cfa --- a/www-ssl/admin/aktiv.php +++ b/www-ssl/admin/aktiv.php @@ -1,4 +1,4 @@ -"; -echo Get_Text("pub_aktive_Text1")."
    \n"; -echo Get_Text("pub_aktive_Text2")."

    \n"; - +echo Get_Text("pub_aktive_Text1")."
    \n"; +echo Get_Text("pub_aktive_Text2")."

    \n"; + // auswahlbox echo Get_Text("pub_aktive_Text31")."\n"; echo ""; -echo Get_Text("pub_aktive_Text32")."

    \n"; +echo Get_Text("pub_aktive_Text32")."

    \n"; echo "\n"; echo "\n"; echo "\n"; echo "
    \n"; - echo "\t
    \n"; + echo "\t
    \n"; echo "
    \n"; if( Isset($_POST["ResetActive"]) ) { - $SQLreset = "UPDATE `User` SET `Aktiv`='0'"; - $ErgReset = db_query($SQLreset, "Reset Active"); - if ($ErgReset != 1) - echo "Fehler beim zuruecksetzen der Activ\n"; - else - echo "Active wurde erfolgreich zurueckgesetzt\n"; + $SQLreset = "UPDATE `User` SET `Aktiv`='0'"; + $ErgReset = db_query($SQLreset, "Reset Active"); + if ($ErgReset != 1) + echo "Fehler beim zuruecksetzen der Activ\n"; + else + echo "Active wurde erfolgreich zurueckgesetzt\n"; } if( IsSet($_POST["Anzahl"]) ) - echo "
    \n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":"; + echo "
    \n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":"; -echo "

    \n\n"; +echo "

    \n\n"; //ausgabe tabelle echo "\n"; @@ -51,15 +51,15 @@ echo "\t\n"; echo "\t\n"; echo "\t\n"; echo "\n"; - + $SQL = " SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal - FROM - (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d - LEFT JOIN - (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f - USING(UID) - ORDER BY lenReal DESC, nr DESC, UID"; + FROM + (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d + LEFT JOIN + (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f + USING(UID) + ORDER BY lenReal DESC, nr DESC, UID"; $Erg = mysql_query($SQL, $con); echo mysql_error($con); @@ -68,42 +68,42 @@ $rowcount = mysql_num_rows($Erg); $aktivecount=0; for ($i=0; $i<$rowcount; $i++) { - echo "\n\n\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\n\n\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; - - echo "\t\t\n"; - echo "\t\n"; + + echo "\t\t\n"; + echo "\t\n"; } // ende Auflistung aktive Engel echo "
    Freeloader ". Get_Text("pub_aktive_Time"). "". Get_Text("pub_aktive_Time"). " result". Get_Text("pub_aktive_Active"). "
    ". UID2Nick(mysql_result($Erg, $i, "UID")). "". mysql_result($Erg, $i, "nr"). "x". mysql_result($Erg, $i, "len"). "h". mysql_result($Erg, $i, "lenWeight"). "h". mysql_result($Erg, $i, "nrFree"). "x". mysql_result($Erg, $i, "lenFree"). "h". mysql_result($Erg, $i, "lenReal"). "h
    ". UID2Nick(mysql_result($Erg, $i, "UID")). "". mysql_result($Erg, $i, "nr"). "x". mysql_result($Erg, $i, "len"). "h". mysql_result($Erg, $i, "lenWeight"). "h". mysql_result($Erg, $i, "nrFree"). "x". mysql_result($Erg, $i, "lenFree"). "h". mysql_result($Erg, $i, "lenReal"). "h"; - if (IsSet($_POST["Anzahl"])) - { - if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") ) - { - $aktivecount++; - if( $_POST["SendType"]=="Show..") - echo "show set"; - else - { - $SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1"; - $Erg2 = db_query($SQL2, "update Active State"); - if ($Erg2 != 1) - echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID")); - else - echo "write set"; - } - } - } - echo "
    "; + if (IsSet($_POST["Anzahl"])) + { + if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") ) + { + $aktivecount++; + if( $_POST["SendType"]=="Show..") + echo "show set"; + else + { + $SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1"; + $Erg2 = db_query($SQL2, "update Active State"); + if ($Erg2 != 1) + echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID")); + else + echo "write set"; + } + } + } + echo "
    "; -echo "
    Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

    "; +echo "
    Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

    "; include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php old mode 100755 new mode 100644 index 37612d7f..9a329355 --- a/www-ssl/admin/dbUpdateFromXLS.php +++ b/www-ssl/admin/dbUpdateFromXLS.php @@ -1,4 +1,4 @@ -\n

    XML File:

    \n"; +echo "\n\n
    \n

    XML File:

    \n"; if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"])) { - echo "Update XCAL-File from Pentabarf.."; - if($PentabarfGetWith=="fsockopen") - { + echo "Update XCAL-File from Pentabarf.."; + if($PentabarfGetWith=="fsockopen") + { - //backup error messeges and delate - $Backuperror_messages = $error_messages; - $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); -// $error_messages = $Backuperror_messages; - - if( !$fp) - { - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!". - "[$errstr ($errno)]

    "; - } - else - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". - 'Host: '. $PentabarfXMLhost. "\r\n". - 'User-Agent: Engelsystem'. "\r\n". - 'Authorization: Basic '. - base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n". - "\r\n"; - fputs( $fp, $head); - $Zeilen = -1; - while (!feof($fp)) - { - $Temp= fgets($fp,1024); - - // ende des headers - if( $Temp== "f20\r\n" ) - { - $Zeilen = 0; - $Temp=""; - } - - //file ende? - if( $Temp=="0\r\n") - break; + //backup error messeges and delate + $Backuperror_messages = $error_messages; + $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); +// $error_messages = $Backuperror_messages; + + if( !$fp) + { + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!". + "[$errstr ($errno)]

    "; + } + else + { + if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) + { + $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". + 'Host: '. $PentabarfXMLhost. "\r\n". + 'User-Agent: Engelsystem'. "\r\n". + 'Authorization: Basic '. + base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n". + "\r\n"; + fputs( $fp, $head); + $Zeilen = -1; + while (!feof($fp)) + { + $Temp= fgets($fp,1024); + + // ende des headers + if( $Temp== "f20\r\n" ) + { + $Zeilen = 0; + $Temp=""; + } + + //file ende? + if( $Temp=="0\r\n") + break; - if( ($Zeilen>-1) && ($Temp!="ffb\r\n") ) - { - //steuerzeichen ausfiltern - if( strpos( "#$Temp", "\r\n") > 0) - $Temp = substr($Temp, 0, strlen($Temp)-2); - if( strpos( "#$Temp", "1005") > 0) - $Temp = ""; - if( strpos( "#$Temp", "783") > 0) - $Temp = ""; - //schreiben in file - fputs( $fileOut, $Temp); - $Zeilen++; - } - } - fclose( $fileOut); - - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose($fp); - } - } - elseif($PentabarfGetWith=="fopen") - { - //user uns password in url einbauen - $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; + if( ($Zeilen>-1) && ($Temp!="ffb\r\n") ) + { + //steuerzeichen ausfiltern + if( strpos( "#$Temp", "\r\n") > 0) + $Temp = substr($Temp, 0, strlen($Temp)-2); + if( strpos( "#$Temp", "1005") > 0) + $Temp = ""; + if( strpos( "#$Temp", "783") > 0) + $Temp = ""; + //schreiben in file + fputs( $fileOut, $Temp); + $Zeilen++; + } + } + fclose( $fileOut); + + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } + else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose($fp); + } + } + elseif($PentabarfGetWith=="fopen") + { + //user uns password in url einbauen + $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". + $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; - if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $Zeilen = 0; - while (!feof($fileIn)) - { - $Zeilen++; - fputs( $fileOut, fgets( $fileIn)); - } - fclose( $fileOut); - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose( $fileIn); - } - else - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; - } - elseif( $PentabarfGetWith=="wget") - { - $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. - " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". - " --no-check-certificate"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif( $PentabarfGetWith=="lynx") - { - $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif($PentabarfGetWith=="fopen") - { - //user uns password in url einbauen - $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; + if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) + { + if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) + { + $Zeilen = 0; + while (!feof($fileIn)) + { + $Zeilen++; + fputs( $fileOut, fgets( $fileIn)); + } + fclose( $fileOut); + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } + else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose( $fileIn); + } + else + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; + } + elseif( $PentabarfGetWith=="wget") + { + $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". + " --no-check-certificate"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif( $PentabarfGetWith=="lynx") + { + $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif($PentabarfGetWith=="fopen") + { + //user uns password in url einbauen + $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". + $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; - if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $Zeilen = 0; - while (!feof($fileIn)) - { - $Zeilen++; - fputs( $fileOut, fgets( $fileIn)); - } - fclose( $fileOut); - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose( $fileIn); - } - else - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; - } - elseif( $PentabarfGetWith=="wget") - { - $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. - " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". - " --no-check-certificate"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif( $PentabarfGetWith=="lynx") - { - $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - else - echo "

    The PentabarfGetWith='$PentabarfGetWith' not supported

    "; + if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) + { + if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) + { + $Zeilen = 0; + while (!feof($fileIn)) + { + $Zeilen++; + fputs( $fileOut, fgets( $fileIn)); + } + fclose( $fileOut); + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } + else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose( $fileIn); + } + else + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; + } + elseif( $PentabarfGetWith=="wget") + { + $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". + " --no-check-certificate"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif( $PentabarfGetWith=="lynx") + { + $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". + "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; + echo system( $Command, $Status); + if( $Status==0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + else + echo "

    The PentabarfGetWith='$PentabarfGetWith' not supported

    "; } else { - echo "
    \n"; - echo "\n"; - echo "\t". - "\n"; - echo "\t". - "\n"; - echo "\t". - "\n"; - echo "\t\n"; - echo "
    XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
    Username:
    Password:
    \n"; - echo "
    \n"; + echo "
    \n"; + echo "\n"; + echo "\t". + "\n"; + echo "\t". + "\n"; + echo "\t". + "\n"; + echo "\t\n"; + echo "
    XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
    Username:
    Password:
    \n"; + echo "
    \n"; } @@ -235,52 +235,52 @@ $XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR"); if( $ShowDataStrukture) { - echo "

    ";
-	echo $XMLmain->name;
-	echo "
    ";
-	print_r(array_values ($XMLmain->sub));
-	echo "
    "; + echo "

    ";
+  echo $XMLmain->name;
+  echo "
    ";
+  print_r(array_values ($XMLmain->sub));
+  echo "
    "; } /* -echo "
    "; +echo "
    "; $Feld=7; -echo "$Feld#". $XMLmain->sub[$Feld]->name. "
    "; +echo "$Feld#". $XMLmain->sub[$Feld]->name. "
    "; echo "$Feld#". $XMLmain->sub[$Feld]->sub; //print_r(array_values ($XMLmain->sub[$Feld]->sub)); while(list($key, $value) = each($XMLmain->sub[$Feld]->sub)) - echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; + echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; echo ""; */ /*############################################################################################## - V e r s i o n + V e r s i o n ##############################################################################################*/ echo "
    \n"; $XMLrelease = getXMLsubPease( $XMLmain, "X-WR-CALDESC"); -echo "release: ". $XMLrelease->data. "
    \n"; +echo "release: ". $XMLrelease->data. "
    \n"; //$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE"); -//echo "release date: ". $XMLreleaseDate->data. "
    \n"; +//echo "release date: ". $XMLreleaseDate->data. "
    \n"; echo "
    \n"; /*############################################################################################## - V e r s i o n + V e r s i o n ##############################################################################################*/ if( $EnableRoomFunctions) - include("../../../camp2011/includes/funktion_xml_room.php"); + include("../../../camp2011/includes/funktion_xml_room.php"); if( $EnableSchudleFunctions) - include("../../../camp2011/includes/funktion_xml_schudle.php"); + include("../../../camp2011/includes/funktion_xml_schudle.php"); /*############################################################################################## - U P D A T E A L L + U P D A T E A L L ##############################################################################################*/ -echo "\n\n
    \n

    Update ALL:

    \n"; +echo "\n\n
    \n

    Update ALL:

    \n"; echo "
    \n"; echo "\t\n"; diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php old mode 100755 new mode 100644 index b01a8a6c..b2c6357f --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -1,4 +1,4 @@ -Web Counter"; funktion_db_list("Counter"); /* -echo "

    Raeume


    "; +echo "

    Raeume


    "; funktion_db_list("Raeume"); -echo "

    Schichtbelegung


    "; +echo "

    Schichtbelegung


    "; funktion_db_list("Schichtbelegung"); -echo "

    Schichtplan


    Hier findest du alle bisher eingetragenen Schichten:"; +echo "

    Schichtplan


    Hier findest du alle bisher eingetragenen Schichten:"; funktion_db_list("Schichtplan"); -echo "

    User


    "; +echo "

    User


    "; funktion_db_list("User"); -echo "

    News


    "; +echo "

    News


    "; funktion_db_list("News"); -echo "

    FAQ


    "; +echo "

    FAQ


    "; funktion_db_list("FAQ"); echo "Deaktiviert"; @@ -32,34 +32,34 @@ echo "Deaktiviert"; echo "
    \n"; funktion_db_element_list_2row( "Tshirt-Size aller engel", - "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); -echo "
    \n"; + "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); +echo "
    \n"; funktion_db_element_list_2row( "Tshirt ausgegeben", - "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); -echo "
    \n"; + "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); +echo "
    \n"; funktion_db_element_list_2row( "Tshirt nicht ausgegeben (Gekommen=1)", - "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); + "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); echo "
    \n"; funktion_db_element_list_2row( "Hometown", - "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); -echo "
    \n"; + "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); +echo "
    \n"; funktion_db_element_list_2row( "Engeltypen", - "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); echo "
    \n"; funktion_db_element_list_2row( "Gesamte Arbeit", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); -echo "
    \n"; + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); +echo "
    \n"; funktion_db_element_list_2row( "Geleisteter Arbeit", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); echo "
    \n"; funktion_db_element_list_2row( "Gesamte Arbeit (Ohne Raum aufabau (RID=7)", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); -echo "
    \n"; + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); +echo "
    \n"; funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php old mode 100755 new mode 100644 index e6096d27..76409cc6 --- a/www-ssl/admin/dect.php +++ b/www-ssl/admin/dect.php @@ -1,4 +1,4 @@ -\n"; - echo "\n"; + echo "\n"; + echo "
    \n"; - echo "\n"; + echo "\n"; - echo "\n"; + $usql="SELECT * FROM `User` WHERE NOT `DECT`='' ORDER BY `Nick`"; + $uErg = mysql_query($usql, $con); + $urowcount = mysql_num_rows($uErg); + for ($k=0; $k<$urowcount; $k++) + { + echo "\t\n"; + } + echo "\n"; + + echo "\n"; + echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    Numberh:m
    Numberh:m
    \n"; - // Listet alle Nicks auf - echo "
    \n"; + // Listet alle Nicks auf + echo "\n"; - - echo "\n"; - echo ":"; - echo "
    \n"; - - echo "
    "; + echo ":"; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; + + echo ""; include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php old mode 100755 new mode 100644 index c69efa17..58c7cfe1 --- a/www-ssl/admin/dect_call.php +++ b/www-ssl/admin/dect_call.php @@ -1,4 +1,4 @@ - Anfragen und FAQ
  • Alle Anfragen
    • -
  • Offene Anfragen ()
    • +
  • Offene Anfragen ()
  • FAQ-Liste editiern
    • diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php old mode 100755 new mode 100644 index 645c08cd..217e9188 --- a/www-ssl/admin/faq.php +++ b/www-ssl/admin/faq.php @@ -22,119 +22,119 @@ switch ($_GET["quest"]) // *--------------------------------------------------------------------------- case "all": - $SQL="SELECT * FROM `Questions` ORDER BY QID DESC"; + $SQL="SELECT * FROM `Questions` ORDER BY QID DESC"; ?> - Alle Anfragen:
    + Alle Anfragen:
    - - + + - + -\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - else - { - echo "Nein\n"; - echo "\n"; - echo "\n"; - } - echo ""; - echo "\n"; - } - echo "
    FrageAnfragenderFrageAnfragender Beantwortet? Antwort Antwort vonchangechange
    ".mysql_result($Erg, $n, "Question")."".UID2Nick(mysql_result($Erg, $n, "UID")).""; - if (mysql_result($Erg, $n, "AID")>0) - { - echo "Ja".mysql_result($Erg, $n, "Answer")."".UID2Nick(mysql_result($Erg, $n, "AID"))."  xxx
    \n"; - break; - + echo "\n"; + echo "".mysql_result($Erg, $n, "Question")."\n"; + echo "".UID2Nick(mysql_result($Erg, $n, "UID"))."\n"; + echo ""; + if (mysql_result($Erg, $n, "AID")>0) + { + echo "Ja\n"; + echo "".mysql_result($Erg, $n, "Answer")."\n"; + echo "".UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; + } + else + { + echo "Nein\n"; + echo " \n"; + echo " \n"; + } + echo "xxx"; + echo "\n"; + } + echo "\n"; + break; + case "open": - $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; - $quest_bearb=1; // Fragenliste anzeigen - echo "\t\tOffene Anfragen:
    \n"; - break; - + $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; + $quest_bearb=1; // Fragenliste anzeigen + echo "\t\tOffene Anfragen:
    \n"; + break; + case "edit": - if (!IsSet($_GET["QID"])) - echo "\t\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; - else - { - $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; - $Erg = mysql_query($SQL, $con); - echo "\t\t
    \n"; - echo "\t\tAnfrage von ". UID2NICK(mysql_result($Erg, 0, "UID")). ":
    \n"; - echo "\t\t\n"; - echo "

    Antwort der Erzengel:
    \n"; - if (mysql_result($Erg, 0, "Answer")=="") - echo "\t\t
    \n"; - else - echo "\t\t\n
    \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
    \n"; - if (mysql_result($Erg, 0, "AID")<>"0") - { - echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
    \n"; - echo "Als FAQ-Eintrag sichern...\n"; - } - } // Abfrage der QID - break; + if (!IsSet($_GET["QID"])) + echo "\t\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; + else + { + $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; + $Erg = mysql_query($SQL, $con); + echo "\t\t
    \n"; + echo "\t\tAnfrage von ". UID2NICK(mysql_result($Erg, 0, "UID")). ":
    \n"; + echo "\t\t\n"; + echo "

    Antwort der Erzengel:
    \n"; + if (mysql_result($Erg, 0, "Answer")=="") + echo "\t\t
    \n"; + else + echo "\t\t\n
    \n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t
    \n"; + if (mysql_result($Erg, 0, "AID")<>"0") + { + echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
    \n"; + echo "Als FAQ-Eintrag sichern...\n"; + } + } // Abfrage der QID + break; case "save": - if (!IsSet($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; + if (!IsSet($_GET["QID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; else - { - $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. - "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ". - "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1"; - $Erg = db_query($SQL, "save Question"); - if ($Erg == 1) - { - echo "\tDer Eintrag wurde geändert
    \n"; - SetHeaderGo2Back(); - } - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + { + $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. + "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ". + "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1"; + $Erg = db_query($SQL, "save Question"); + if ($Erg == 1) + { + echo "\tDer Eintrag wurde geändert
    \n"; + SetHeaderGo2Back(); + } + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; } - break; + break; case "transfer": - if (!IsSet($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; - else - { - $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; - $Erg = mysql_query($SQL1, $con); - $SQL2="INSERT INTO `FAQ` Values ('', '". - mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')"; - $Erg = db_query($SQL2, "trasfert to request to the FAQ"); - if ($Erg == 1) - echo "\tDer Eintrag wurde übertragen.
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - - break; + if (!IsSet($_GET["QID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + else + { + $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; + $Erg = mysql_query($SQL1, $con); + $SQL2="INSERT INTO `FAQ` Values ('', '". + mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')"; + $Erg = db_query($SQL2, "trasfert to request to the FAQ"); + if ($Erg == 1) + echo "\tDer Eintrag wurde übertragen.
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + } + + break; // *--------------------------------------------------------------------------- // * FAQ - Bearbeitung @@ -143,105 +143,105 @@ case "transfer": // * geaendert oder geloscht werden... // *--------------------------------------------------------------------------- case "faq": - $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren... - echo "\tFAQ-Liste:
    "; - echo "Neuen Eintrag"; - - $SQL = "SELECT * FROM `FAQ`"; - $Erg = mysql_query($SQL, $con); + $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren... + echo "\tFAQ-Liste:
    "; + echo "Neuen Eintrag"; + + $SQL = "SELECT * FROM `FAQ`"; + $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - for ($n = 0 ; $n < $Zeilen ; $n++) - if (mysql_result($Erg, $n, "Antwort")!="") - { - echo "\t

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

    \n"; - echo "\t

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

    \n"; - echo "\tBearbeiten\n
    ---
    \n"; - } - break; + for ($n = 0 ; $n < $Zeilen ; $n++) + if (mysql_result($Erg, $n, "Antwort")!="") + { + echo "\t

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

    \n"; + echo "\t

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

    \n"; + echo "\tBearbeiten\n
    ---
    \n"; + } + break; case "faqedit": if (!IsSet($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; - else - { - $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'"; - $Erg = mysql_query($SQL, $con); + echo "\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; + else + { + $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'"; + $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); ?> -
    - Frage:
    - -

    - Antwort:
    -
    - "> - - -
    -
    - "> + + Frage:
    + +

    + Antwort:
    +
    + "> + + +
    +
    + "> -
    + \n"; - else - echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; - } - break; + if (!IsSet($_GET["FAQID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + else + { + $SQL = "DELETE FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; + $Erg = db_query($SQL, "delate faq item"); + if ($Erg == 1) + echo "\tDer Eintrag wurde gelöscht
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; + } + break; case "faqsave"; if (!IsSet($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; else - { - $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. - "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; - $Erg = db_query($SQL, $con); - if ($Erg == 1) - echo "\tDer Eintrag wurde geändert
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + { + $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. + "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; + $Erg = db_query($SQL, $con); + if ($Erg == 1) + echo "\tDer Eintrag wurde geändert
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; } - break; + break; case "faqnew": ?> -
    - Frage:
    -

    - Antwort:
    -
    + + Frage:
    +

    + Antwort:
    +
    \n"; + echo "\tDer Eintrag wurde erfasst.
    \n"; else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; break; } //switch ($_GET["quest"]) @@ -251,32 +251,32 @@ case "faqnewsave"; // Fragenliste anzeigen??? if ($quest_bearb==1) { - $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + $Erg = mysql_query($SQL, $con); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - if ($Zeilen==0) - echo "\tkeine vorhanden...\n"; - else - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo "\t

    ". nl2br(mysql_result($Erg, $n, "Question"))."\n


    \n"; - echo "\tBearbeiten\n"; - echo "
    ---
    \n"; - } - + if ($Zeilen==0) + echo "\tkeine vorhanden...\n"; + else + for ($n = 0 ; $n < $Zeilen ; $n++) + { + echo "\t

    ". nl2br(mysql_result($Erg, $n, "Question"))."\n


    \n"; + echo "\tBearbeiten\n"; + echo "
    ---
    \n"; + } + } } //if (IsSet($_GET["quest"])) else { - echo "Bitte wähle aus, ob du:\n"; - echo "\n"; + echo "Bitte wähle aus, ob du:\n"; + echo "\n"; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php old mode 100755 new mode 100644 index 5ceaebb6..577ef7be --- a/www-ssl/admin/free.php +++ b/www-ssl/admin/free.php @@ -1,4 +1,4 @@ -\n"; +echo "Hallo ".$_SESSION['Nick'].",
    \n"; -echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:

    \n"; +echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:

    \n"; ####################################################### @@ -21,21 +21,21 @@ echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht /* geht nicht ??? unter stabel !! $SQL= "SELECT User.Nick, Schichtplan.*, Schichtbelegung.* ". - "FROM Schichtplan, User LEFT OUTER ". - "JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ". - "WHERE Schichtplan.SID = Schichtbelegung.SID AND ". - "Schichtplan.Date < now() and ". - "Schichtplan.EndDate > now() ". - "ORDER BY Nick"; - + "FROM Schichtplan, User LEFT OUTER ". + "JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID ". + "WHERE Schichtplan.SID = Schichtbelegung.SID AND ". + "Schichtplan.Date < now() and ". + "Schichtplan.EndDate > now() ". + "ORDER BY Nick"; + $SQL = "SELECT Shifts.*, ShiftEntry.*, User.Nick ". - "FROM User ". - "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ". - "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );"; + "FROM User ". + "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );"; */ $SQL = "SELECT Shifts.*, ShiftEntry.* ". - "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". - "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; + "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; //SELECT User.Nick, Schichtplan.*, Schichtbelegung. * FROM User LEFT JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID, Schichtplan LEFT JOIN Schichtbelegung ON Schichtplan.SID = Schichtbelegung.SID WHERE Schichtplan.Date < now() and Schichtplan.EndDate > now() ORDER BY Nick @@ -62,27 +62,27 @@ echo "\t\n"; $inuse=""; for ($i=0; $i < $Zeilen; $i++) { - echo "\n"; - echo "". - UID2Nick(mysql_result($Erg, $i, "UID")). "\n"; - echo "\n"; - echo "". mysql_result($Erg, $i, "RID"). "\n"; - echo "". mysql_result($Erg, $i, "DateS"). "\n"; - echo "". mysql_result($Erg, $i, "DateE"). "\n"; - echo "\n"; - - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")"; + echo "\n"; + echo "". + UID2Nick(mysql_result($Erg, $i, "UID")). "\n"; + echo "\n"; + echo "". mysql_result($Erg, $i, "RID"). "\n"; + echo "". mysql_result($Erg, $i, "DateS"). "\n"; + echo "". mysql_result($Erg, $i, "DateE"). "\n"; + echo "\n"; + + if ($inuse!="") + $inuse.= " OR "; + $inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")"; } if ($inuse!="") - $inuse=" WHERE NOT (".$inuse.")"; + $inuse=" WHERE NOT (".$inuse.")"; echo "\n"; //########################################################################################################## -echo "

    \n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:

    \n"; +echo "

    \n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:

    \n"; echo "\n"; echo "\t\n\t\t\n\t\t\n\t\n"; @@ -91,11 +91,11 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); for ($i=0; $i < $Zeilen; $i++) { - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\n\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\n\n"; } echo "
    NickDECT
    ". - mysql_result($Erg, $i, "Nick"). "". mysql_result($Erg, $i, "DECT"). "
    ". + mysql_result($Erg, $i, "Nick"). "". mysql_result($Erg, $i, "DECT"). "
    \n"; diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php old mode 100755 new mode 100644 index c28c78af..83a4123f --- a/www-ssl/admin/free_DECT.php +++ b/www-ssl/admin/free_DECT.php @@ -1,4 +1,4 @@ -=Now() AND ShiftEntry.UID>0);"; + "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". + "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); @@ -21,17 +21,17 @@ $Zeilen = mysql_num_rows($Erg); $inuse=""; for ($i=0; $i < $Zeilen; $i++) { - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; + if ($inuse!="") + $inuse.= " OR "; + $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; } if ($inuse!="") { - $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; + $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; } else { - $inuse=" WHERE (DECT!='')"; + $inuse=" WHERE (DECT!='')"; } @@ -42,36 +42,36 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); for ($i=0; $i < $Zeilen; $i++) { - // get DECT number - echo mysql_result($Erg, $i, "DECT"). "\t"; + // get DECT number + echo mysql_result($Erg, $i, "DECT"). "\t"; - // get all user rights - $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; - $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); - $UserRights = mysql_fetch_array($Erg_RIGHT); + // get all user rights + $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; + $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); + $UserRights = mysql_fetch_array($Erg_RIGHT); - foreach( $UserRights as $Var => $Value) - { - if( (strpos( $Var, ".php") === false) AND - (strpos( $Var, "/") === false) AND - (strpos( $Var, "UID") === false) AND - (is_numeric($Var) === false) ) - { - echo "\"".$Var. "\"=". $Value. "\t"; - } - } + foreach( $UserRights as $Var => $Value) + { + if( (strpos( $Var, ".php") === false) AND + (strpos( $Var, "/") === false) AND + (strpos( $Var, "UID") === false) AND + (is_numeric($Var) === false) ) + { + echo "\"".$Var. "\"=". $Value. "\t"; + } + } - // get shift types - $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; - $Erg_TYPES = mysql_query($SQL_TYPES, $con); - $Zeilen_Typen = mysql_num_rows($Erg_TYPES); - for ($j=0; $j < $Zeilen_Typen; $j++) - { - echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; - } + // get shift types + $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; + $Erg_TYPES = mysql_query($SQL_TYPES, $con); + $Zeilen_Typen = mysql_num_rows($Erg_TYPES); + for ($j=0; $j < $Zeilen_Typen; $j++) + { + echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; + } - echo "\n"; -// echo "
    "; + echo "\n"; +// echo "
    "; } ?> diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php old mode 100755 new mode 100644 index 57945d0d..f42fea97 --- a/www-ssl/admin/group.php +++ b/www-ssl/admin/group.php @@ -1,4 +1,4 @@ -\n"; - echo "\n"; - echo "\tGroupname\n"; - echo "\tLink\n"; - echo "\n"; - - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "\n"; - echo "\t".mysql_result($Erg, $n, "Name")."\n"; - - echo "change\n"; - echo "\n"; - } - - // new form - echo "\n"; - echo "\t
    \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
    \n"; - echo "\n"; - - echo "\t\n"; - // Ende Userliste + // Userliste, keine UID uebergeben... + + $SQL = "SELECT * FROM `UserGroups` ORDER BY `Name` ASC"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + echo "\n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + for ($n = 0 ; $n < $Zeilen ; $n++) { + echo "\n"; + echo "\t\n"; + + echo "\n"; + echo "\n"; + } + + // new form + echo "\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + echo "\n"; + + echo "\t
    GroupnameLink
    ".mysql_result($Erg, $n, "Name")."change
    \n"; + // Ende Userliste } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php old mode 100755 new mode 100644 index b89bdb93..e7be285c --- a/www-ssl/admin/index.php +++ b/www-ssl/admin/index.php @@ -1,19 +1,19 @@ -\n"; +echo "Hallo Erzengel ".$_SESSION['Nick'].",
    \n"; ?> -du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.

    +du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.

    Bitte melde dich hier nach getaner Arbeit immer ab, damit kein anderer hier Änderungen vornehmen kann. - diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php old mode 100755 new mode 100644 index 78f49ee2..f25eab93 --- a/www-ssl/admin/news.php +++ b/www-ssl/admin/news.php @@ -1,4 +1,4 @@ - -Hallo ,
    + $rowcount = mysql_num_rows($Erg); + ?> +Hallo ,
    hier kannst du die News säubern... falls jemand auf die Idee kommt, -hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)

    +hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)

    @@ -24,97 +24,97 @@ hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)
    - - -\n"; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t\n"; - } - echo "
    Text Erfasser EngeltreffÄnd.
    ".mysql_result($Erg, $i, "Datum")."".mysql_result($Erg, $i, "Betreff")."".mysql_result($Erg, $i, "Text")."".UID2Nick(mysql_result($Erg, $i, "UID"))."".mysql_result($Erg, $i, "Treffen")."XXX
    "; + Änd. + +\n"; + echo "\t ".mysql_result($Erg, $i, "Datum").""; + echo "\t ".mysql_result($Erg, $i, "Betreff").""; + echo "\t ".mysql_result($Erg, $i, "Text").""; + echo "\t ".UID2Nick(mysql_result($Erg, $i, "UID")).""; + echo "\t ".mysql_result($Erg, $i, "Treffen").""; + echo "\t XXX"; + echo "\t\n"; + } + echo ""; } else { - unSet($chsql); - - switch ($_GET["action"]) - { - case 'change': - if (isset($_GET["date"])) - { - $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')"; - $Erg = mysql_query($SQL, $con); - - if( mysql_num_rows( $Erg)>0) - { - echo "
    \n"; - - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
    Datum
    Betreff
    Text
    Engel
    Treffen
    "; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - } - else - echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden"; - } - else - echo "Fehler: \"date\" nicht übergeben"; - break; - - case 'change_save': - if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) ) - $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. - "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1"; - else - echo "Fehler: nicht genügend parameter übergeben"; - break; - - case 'delete': - if (isset($_POST["date"])) - $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1"; - else - echo "Fehler: \"date\" nicht übergeben"; - break; - } //SWITCH - - if (IsSet($chsql)) - { - // SQL-Statement ausführen... - $Erg = mysql_query($chsql, $con); - If ($Erg == 1) - echo "Änderung erfolgreich gesichert..."; - else - echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)

    \n". - mysql_error($con). "

    \n[$chsql]"; - SetHeaderGo2Back(); - } + unSet($chsql); + + switch ($_GET["action"]) + { + case 'change': + if (isset($_GET["date"])) + { + $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')"; + $Erg = mysql_query($SQL, $con); + + if( mysql_num_rows( $Erg)>0) + { + echo "
    \n"; + + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    Datum
    Betreff
    Text
    Engel
    Treffen
    "; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + } + else + echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden"; + } + else + echo "Fehler: \"date\" nicht übergeben"; + break; + + case 'change_save': + if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) ) + $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. + "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1"; + else + echo "Fehler: nicht genügend parameter übergeben"; + break; + + case 'delete': + if (isset($_POST["date"])) + $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1"; + else + echo "Fehler: \"date\" nicht übergeben"; + break; + } //SWITCH + + if (IsSet($chsql)) + { + // SQL-Statement ausführen... + $Erg = mysql_query($chsql, $con); + If ($Erg == 1) + echo "Änderung erfolgreich gesichert..."; + else + echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)

    \n". + mysql_error($con). "

    \n[$chsql]"; + SetHeaderGo2Back(); + } }// IF-ELSE include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php old mode 100755 new mode 100644 index ebbe1e36..09006675 --- a/www-ssl/admin/room.php +++ b/www-ssl/admin/room.php @@ -9,36 +9,36 @@ $Erg = mysql_query($Sql, $con); if( !IsSet($_GET["action"]) ) { - echo "Hallo ".$_SESSION['Nick']. - ",
    \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen ". - "oder vorhandene abzuändern:

    \n"; - - echo "- Neuen Raum/Ort eintragen
    \n"; - - echo "\n"; - echo "\n"; - - for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) - { - if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") - echo "\t"; - else - echo "\t"; - } - echo "\t"; - echo ""; - - for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) - { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) - { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
    Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "". mysql_field_name($Erg, $i)."Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; + echo "Hallo ".$_SESSION['Nick']. + ",
    \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen ". + "oder vorhandene abzuändern:

    \n"; + + echo "- Neuen Raum/Ort eintragen
    \n"; + + echo "\n"; + echo "\n"; + + for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) + { + if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") + echo "\t"; + else + echo "\t"; + } + echo "\t"; + echo ""; + + for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) + { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) + { + echo "\t\t\n"; + } + echo "\t\t\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo "
    Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "". mysql_field_name($Erg, $i)."Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; } else { @@ -48,132 +48,132 @@ UnSet($SQL); switch ($_GET["action"]) { case 'new': - echo "Neuen Raum einrichten:
    "; - echo "
    \n"; - echo "\n"; - - for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) - { - if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") ) - { - echo "". - "\n"; - } - else - { - //sonderfall fuer Default Engel - if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") - $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)]; - else - $FeldName = mysql_field_name($Erg, $Uj); - - echo "". - "\n"; - } - } - echo "
    ". mysql_field_name($Erg, $Uj). "". - "Yes". - "No". - "
    $FeldName"; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - break; + echo "Neuen Raum einrichten:
    "; + echo "
    \n"; + echo "\n"; + + for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) + { + if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") ) + { + echo "". + "\n"; + } + else + { + //sonderfall fuer Default Engel + if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") + $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)]; + else + $FeldName = mysql_field_name($Erg, $Uj); + + echo "". + "\n"; + } + } + echo "
    ". mysql_field_name($Erg, $Uj). "". + "Yes". + "No". + "
    $FeldName"; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + break; case 'newsave': - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys = ""; - $Values = ""; - foreach($vars as $key => $value) - { - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - $SQL = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")"; - SetHeaderGo2Back(); - break; + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys = ""; + $Values = ""; + foreach($vars as $key => $value) + { + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + $SQL = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")"; + SetHeaderGo2Back(); + break; case 'change': - if (! IsSet($_GET["RID"])) - echo "Fehlerhafter Aufruf!"; - else - { - $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; - $ERG = mysql_query($SQL2, $con); - - if( mysql_num_rows( $ERG)>0) - { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; - echo "
    \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - { - if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") ) - { - echo "". - "\n"; - } - else - { - if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") - //sonderfall fuer Default Engel - $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)]; - else - $FeldName = mysql_field_name($ERG, $Uj); - echo "". - "\n"; - } - } - echo "
    ". mysql_field_name($Erg, $Uj). "". - "Yes". - "No". - "
    $FeldName". - "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    "; - } - else - echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden"; - } - break; - + if (! IsSet($_GET["RID"])) + echo "Fehlerhafter Aufruf!"; + else + { + $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; + $ERG = mysql_query($SQL2, $con); + + if( mysql_num_rows( $ERG)>0) + { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; + echo "
    \n"; + echo "\n"; + + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) + { + if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") ) + { + echo "". + "\n"; + } + else + { + if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") + //sonderfall fuer Default Engel + $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)]; + else + $FeldName = mysql_field_name($ERG, $Uj); + echo "". + "\n"; + } + } + echo "
    ". mysql_field_name($Erg, $Uj). "". + "Yes". + "No". + "
    $FeldName". + "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    "; + } + else + echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden"; + } + break; + case 'changesave': - $sql=""; - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - foreach($vars as $key => $value) - { - $keys = substr($key,1); - $sql .= ", `".$keys."`='".$value."' "; - } - $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'"; - SetHeaderGo2Back(); - break; + $sql=""; + $vars = $_GET; + $count = count($vars) - 2; + $vars = array_splice($vars, 0, $count); + foreach($vars as $key => $value) + { + $keys = substr($key,1); + $sql .= ", `".$keys."`='".$value."' "; + } + $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'"; + SetHeaderGo2Back(); + break; case 'delete': - if (IsSet($_GET["RID"])) { - $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; - } else { - echo "Fehlerhafter Aufruf"; - } - SetHeaderGo2Back(); - break; + if (IsSet($_GET["RID"])) { + $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; + } else { + echo "Fehlerhafter Aufruf"; + } + SetHeaderGo2Back(); + break; } //switch @@ -181,17 +181,17 @@ case 'delete': // Update ??? if (IsSet($SQL)){ -// echo $SQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, "exec SQL"); - if ($Erg == 1) - echo "Änderung wurde gesichert...
    "; - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; - } -} // Ende Update +// echo $SQL; + // hier muesste das SQL ausgefuehrt werden... + $Erg = db_query($SQL, "exec SQL"); + if ($Erg == 1) + echo "Änderung wurde gesichert...
    "; + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; + } +} // Ende Update } //IF IsSet($action) diff --git a/www-ssl/admin/schichtplan.1.php b/www-ssl/admin/schichtplan.1.php old mode 100755 new mode 100644 diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php old mode 100755 new mode 100644 index ba2f8d66..af3cd7d4 --- a/www-ssl/admin/schichtplan.php +++ b/www-ssl/admin/schichtplan.php @@ -6,59 +6,59 @@ include ("../../../camp2011/includes/header.php"); function executeSQL( $SQL) { - global $DEBUG, $con; - - $Erg = mysql_query($SQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $SQL
    \n"; - if ($Erg == 1) - { - echo "SQL war erfolgreich"; - } - else - { - echo "SQL Fehler (". mysql_error($con).")" ; - } + global $debug, $con; + + $Erg = mysql_query($SQL, $con); + if( $debug ) + echo "DEBUG SQL: $SQL
    \n"; + if ($Erg == 1) + { + echo "SQL war erfolgreich"; + } + else + { + echo "SQL Fehler (". mysql_error($con).")" ; + } } if (!IsSet($_GET["action"])) { -echo "Hallo ".$_SESSION['Nick'].",
    \n"; -echo "hier kannst du Schichten anlegen, ändern oder löschen.

    "; -echo "Neue Schicht einplanen

    \n\n"; +echo "Hallo ".$_SESSION['Nick'].",
    \n"; +echo "hier kannst du Schichten anlegen, ändern oder löschen.

    "; +echo "Neue Schicht einplanen

    \n\n"; echo "
    \n"; ?> - - - - - - - - + + + + + + +\n"; - echo "\t\t\n"; - echo "\t\t\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; - $sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'"; - $Erg2 = mysql_query($sql2, $con); - if( mysql_num_rows($Erg2) > 0) - echo "\t\t\n"; - else - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; + $sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'"; + $Erg2 = mysql_query($sql2, $con); + if( mysql_num_rows($Erg2) > 0) + echo "\t\t\n"; + else + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } echo "
    DatumRaumDauerÄndern
    DatumRaumDauerÄndern
    ".mysql_result($Erg, $i, "DateS")."
    ".mysql_result($Erg, $i, "DateS")."".mysql_result($Erg2, 0, "Name")."Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")".mysql_result($Erg, $i, "Len")." Std. ####
    ".mysql_result($Erg2, 0, "Name")."Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")".mysql_result($Erg, $i, "Len")." Std. ####
    \n"; @@ -75,317 +75,317 @@ UnSet($chSQL); switch ($_GET["action"]){ case 'change': - if ( !IsSet($_GET["SID"]) ) - { - echo "Fehlerhafter Aufruf!\n"; - } - else - { - - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; - $Erg = mysql_query($sql, $con); + if ( !IsSet($_GET["SID"]) ) + { + echo "Fehlerhafter Aufruf!\n"; + } + else + { + + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; + $Erg = mysql_query($sql, $con); - echo "Schicht abändern:
    \n"; + echo "Schicht abändern:
    \n"; - // Anzeige Allgemeiner schaischt daten + // Anzeige Allgemeiner schaischt daten echo ""; echo "\n"; echo " ". - "\n"; - echo " \n"; + echo " \n"; - - echo " ". - "\n"; - echo " ". - "\n"; - echo " ". - "\n"; - if( $FromPentabarf == "Y") - { - echo " ". - "\n"; - } + $rowcount = mysql_num_rows($Erg2); + $FromPentabarf = "N"; + for( $i = 0; $i < $rowcount; $i++ ) + { + $RID=mysql_result($Erg2, $i, "RID"); + echo " \n"; + } + echo " \n\n"; + + echo " ". + "\n"; + echo " ". + "\n"; + echo " ". + "\n"; + if( $FromPentabarf == "Y") + { + echo " ". + "\n"; + } echo "
    Schichtbeginn
    Raum\n
    Raum\n\n
    Dauer in h
    Beschreibung
    URL

    !!! Imported from Pentabarf !!!

    Dauer in h
    Beschreibung
    URL

    !!! Imported from Pentabarf !!!

    \n"; - + echo "\n"; echo "\n"; echo "\n"; echo "
    \n\n"; - // Löschen - echo "
    \n"; + // Löschen + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "
    \n\n"; - - echo "ACHTUNG:
    \n"; - echo "Beim Löschen werden die bisher eingetragenen Engel für diese Schicht mitgelöscht.
    \n"; + + echo "ACHTUNG:
    \n"; + echo "Beim Löschen werden die bisher eingetragenen Engel für diese Schicht mitgelöscht.
    \n"; - echo "
    \n\n\n\n"; - - //Freie Engelschichten - $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'"; - $Erg3 = mysql_query($sql3, $con); - $rowcount = mysql_num_rows($Erg3); - - echo "Folgende Engelschichten sind noch nicht vergeben.\n"; - echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:
    \n"; - for ($j=0; $j < $rowcount; $j++) - { - $TID = mysql_result($Erg3, $j, 0); - echo "". - "freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen
    \n"; - } - echo "
    \n\n\n\n"; + echo "
    \n\n\n\n"; + + //Freie Engelschichten + $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'"; + $Erg3 = mysql_query($sql3, $con); + $rowcount = mysql_num_rows($Erg3); + + echo "Folgende Engelschichten sind noch nicht vergeben.\n"; + echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:
    \n"; + for ($j=0; $j < $rowcount; $j++) + { + $TID = mysql_result($Erg3, $j, 0); + echo "". + "freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen
    \n"; + } + echo "
    \n\n\n\n"; - //Ausgabe eingetragener schischten - $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'"; - $Erg3 = mysql_query($sql3, $con); - $rowcount = mysql_num_rows($Erg3); - - echo "Folgende Engel Sind fuer die Schicht eingetargen.\n"; - echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:
    \n"; - echo "\n". - "". - "". - "". - "". - "". - ""; - - for ($j=0; $j < $rowcount; $j++) - { - $userUID=mysql_result($Erg3, $j, "UID"); - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - } // FOR + //Ausgabe eingetragener schischten + $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'"; + $Erg3 = mysql_query($sql3, $con); + $rowcount = mysql_num_rows($Erg3); + + echo "Folgende Engel Sind fuer die Schicht eingetargen.\n"; + echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:
    \n"; + echo "
    nicktypenormalfreeloader :-(
    ". UID2Nick($userUID). "". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "###-austragen-######-austragen-freeloader-###
    \n". + "". + "". + "". + "". + "". + ""; + + for ($j=0; $j < $rowcount; $j++) + { + $userUID=mysql_result($Erg3, $j, "UID"); + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + } // FOR - echo "
    nicktypenormalfreeloader :-(
    ". UID2Nick($userUID). "". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "###-austragen-######-austragen-freeloader-###

    \n\n\n\n"; + echo "
    \n\n\n\n"; - //Nachtragen von Engeln - echo "Hat ein anderer Engel die Schicht übernommen, trage ihn bitte ein:"; - echo "
    \n"; - echo "\n"; + //Nachtragen von Engeln + echo "Hat ein anderer Engel die Schicht übernommen, trage ihn bitte ein:"; + echo "\n"; + echo "\n"; echo "\n"; - - // Listet alle Nicks auf - echo "\n"; - - echo " als \n"; - - // holt eine liste der benötigten Engel zu dieser Schischt - $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` "; - $sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') "; - $sql3.= "GROUP BY `SID`, `TID`, `UID` "; - $Erg3 = mysql_query($sql3, $con); - $i=-1; - while( ++$i < mysql_num_rows($Erg3)) - { - $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID"); - } - - // Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden - echo "\n"; + if( $FromPentabarf != "Y") + { + echo "\t\n"; + } + + $usql="SELECT * FROM `User` ORDER BY `Nick`"; + $uErg = mysql_query($usql, $con); + $urowcount = mysql_num_rows($uErg); + for ($k=0; $k<$urowcount; $k++) + { + echo "\t\n"; + } + echo "\n"; + + echo " als \n"; + + // holt eine liste der benötigten Engel zu dieser Schischt + $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` "; + $sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') "; + $sql3.= "GROUP BY `SID`, `TID`, `UID` "; + $Erg3 = mysql_query($sql3, $con); + $i=-1; + while( ++$i < mysql_num_rows($Erg3)) + { + $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID"); + } + + // Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden + echo "\n"; - - echo "\n"; - - echo "
    \n Anzahl New\n"; - - echo "
    "; + echo "\n"; + + echo "\n"; + + echo "
    \n Anzahl New\n"; + + echo ""; - } // IF ISSET( - break; + } // IF ISSET( + break; case 'engeladd': - if( $_GET["UIDs"]>0) - { - - $SQL = "SELECT * FROM `ShiftEntry` ". - "WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')"; - $ERG = mysql_query($SQL, $con); - if( mysql_num_rows($ERG) != 0 ) - { - $chSQL = "UPDATE `ShiftEntry` SET ". - "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ". - "WHERE (`SID`='". $_GET["SID"]. "' AND ". - "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1"; - } - else - { - $chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (". - "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ". - "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')"; - } - echo "Es wird folgende Schicht zusätzlich eingetragen:
    \n"; - echo "Engel: ".UID2Nick($_GET["UIDs"])."
    \n"; - echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."
    \n
    \n"; - } - else - { - echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zusätzlich eingetragen:
    \n"; - for( $i=0; $i<$_GET["eAnzahlNew"]; $i++) - { - echo "$i.
    \n"; - $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES ("; - $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)"; - $ERG = mysql_query($SQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $SQL
    \n"; - if ($ERG == 1) - { - echo "Änderung wurde gesichert...
    "; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; - echo mysql_error($con); - } - echo "Es wird eine weitere Schicht eingetragen:

    \n"; - } - } - break; + if( $_GET["UIDs"]>0) + { + + $SQL = "SELECT * FROM `ShiftEntry` ". + "WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')"; + $ERG = mysql_query($SQL, $con); + if( mysql_num_rows($ERG) != 0 ) + { + $chSQL = "UPDATE `ShiftEntry` SET ". + "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ". + "WHERE (`SID`='". $_GET["SID"]. "' AND ". + "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1"; + } + else + { + $chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (". + "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ". + "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')"; + } + echo "Es wird folgende Schicht zusätzlich eingetragen:
    \n"; + echo "Engel: ".UID2Nick($_GET["UIDs"])."
    \n"; + echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."
    \n
    \n"; + } + else + { + echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zusätzlich eingetragen:
    \n"; + for( $i=0; $i<$_GET["eAnzahlNew"]; $i++) + { + echo "$i.
    \n"; + $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES ("; + $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)"; + $ERG = mysql_query($SQL, $con); + if( $debug ) + echo "DEBUG SQL: $SQL
    \n"; + if ($ERG == 1) + { + echo "Änderung wurde gesichert...
    "; + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; + echo mysql_error($con); + } + echo "Es wird eine weitere Schicht eingetragen:

    \n"; + } + } + break; case 'engeldel': - $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. - "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; - if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1) - { - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; - $Erg = mysql_query($sql, $con); - if( mysql_num_rows( $Erg) == 1) - { - $UID = $_GET["UIDs"]; - $Length = mysql_result($Erg, 0, "Len"); - $Comment = "Start: ". mysql_result($Erg, 0, "DateS"). "; ". - "Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ". - "Removed by ". $_SESSION['Nick']; - $ch2SQL = - "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ". - "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');"; - } - } - break; + $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. + "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; + if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1) + { + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; + $Erg = mysql_query($sql, $con); + if( mysql_num_rows( $Erg) == 1) + { + $UID = $_GET["UIDs"]; + $Length = mysql_result($Erg, 0, "Len"); + $Comment = "Start: ". mysql_result($Erg, 0, "DateS"). "; ". + "Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ". + "Removed by ". $_SESSION['Nick']; + $ch2SQL = + "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ". + "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');"; + } + } + break; case 'engelshiftdel': - $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". - $_GET["TID"]. "' AND `UID`='0' LIMIT 1"; - break; + $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". + $_GET["TID"]. "' AND `UID`='0' LIMIT 1"; + break; case 'changesave': - $query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con); - $enddate = mysql_fetch_row($query); - - $chSQL = "UPDATE `Shifts` SET ". - "`DateS`='". $_GET["eDate"]. "', ". - "`DateE`='".$enddate[0]. "', ". - "`RID`='". $_GET["eRID"]. "', ". - "`Len`='". $_GET["eDauer"]. "', ". - "`Man`='". $_GET["eName"]. "', ". - "`URL`='". $_GET["eURL"]. "' ". - "WHERE `SID`='". $_GET["SID"]. "'"; - SetHeaderGo2Back(); - break; - + $query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con); + $enddate = mysql_fetch_row($query); + + $chSQL = "UPDATE `Shifts` SET ". + "`DateS`='". $_GET["eDate"]. "', ". + "`DateE`='".$enddate[0]. "', ". + "`RID`='". $_GET["eRID"]. "', ". + "`Len`='". $_GET["eDauer"]. "', ". + "`Man`='". $_GET["eName"]. "', ". + "`URL`='". $_GET["eURL"]. "' ". + "WHERE `SID`='". $_GET["SID"]. "'"; + SetHeaderGo2Back(); + break; + case 'delete': - $chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1"; - $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'"; - SetHeaderGo2Back(); - break; + $chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1"; + $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'"; + SetHeaderGo2Back(); + break; case 'deleteShifs': - foreach ($_GET as $k => $v) - if( strpos( " ".$k, "SID") == 1) - { - echo "Shifts $v wird gelöscht..."; - executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1"); - echo "
    \n"; - echo "ShiftEntry $v wird gelöscht..."; - executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'"); - echo "

    \n"; - } - break; + foreach ($_GET as $k => $v) + if( strpos( " ".$k, "SID") == 1) + { + echo "Shifts $v wird gelöscht..."; + executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1"); + echo "
    \n"; + echo "ShiftEntry $v wird gelöscht..."; + executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'"); + echo "

    \n"; + } + break; } // end switch if (IsSet($chSQL)){ // echo $chSQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($chSQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $chSQL
    \n"; - if ($Erg == 1) - { - echo "Änderung wurde gesichert...
    "; - if( $DEBUG ) - echo "DEBUG: ergebniss". $Erg. "
    \n"; - if (IsSet($ch2SQL)) - { - $Erg = mysql_query($ch2SQL, $con); - if( $DEBUG ) - echo "DEBUG SQL: $ch2SQL
    \n"; - if( $DEBUG ) echo "DEBUG: ergebniss". $Erg. "
    \n"; - } - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; - echo mysql_error($con); - } + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($chSQL, $con); + if( $debug ) + echo "DEBUG SQL: $chSQL
    \n"; + if ($Erg == 1) + { + echo "Änderung wurde gesichert...
    "; + if( $debug ) + echo "DEBUG: ergebniss". $Erg. "
    \n"; + if (IsSet($ch2SQL)) + { + $Erg = mysql_query($ch2SQL, $con); + if( $debug ) + echo "DEBUG SQL: $ch2SQL
    \n"; + if( $debug ) echo "DEBUG: ergebniss". $Erg. "
    \n"; + } + } + else + { + echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; + echo mysql_error($con); + } } // Ende Update } diff --git a/www-ssl/admin/schichtplan_druck.1.php b/www-ssl/admin/schichtplan_druck.1.php old mode 100755 new mode 100644 diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php old mode 100755 new mode 100644 index 23e65166..ef097043 --- a/www-ssl/admin/schichtplan_druck.php +++ b/www-ssl/admin/schichtplan_druck.php @@ -6,49 +6,49 @@ $submenus = 1; if (!IsSet($_GET["action"])) { - include ("../../../camp2011/includes/header.php"); - include ("../../../camp2011/includes/funktionen.php"); - include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); - include ("../../../camp2011/includes/funktion_schichtplan.php"); - - echo "Hallo ". $_SESSION['Nick']. "
    \n". - "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". - "
    \n"; - - foreach( $VeranstaltungsTage as $k => $v) - { - - $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con); - for ($i = 0; $i < mysql_num_rows($res); $i++) - { - $Tag = $VeranstaltungsTage[$k]; - $RID = mysql_result($res,$i,"RID"); - $Rname = mysql_result($res, $i, "Name"); - echo "\t$Tag $Rname
    \n"; - } - echo "
    \n"; - } - echo "

    "; - - include ("../../../camp2011/includes/footer.php"); + include ("../../../camp2011/includes/header.php"); + include ("../../../camp2011/includes/funktionen.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); + + echo "Hallo ". $_SESSION['Nick']. "
    \n". + "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". + "
    \n"; + + foreach( $VeranstaltungsTage as $k => $v) + { + + $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con); + for ($i = 0; $i < mysql_num_rows($res); $i++) + { + $Tag = $VeranstaltungsTage[$k]; + $RID = mysql_result($res,$i,"RID"); + $Rname = mysql_result($res, $i, "Name"); + echo "\t$Tag $Rname
    \n"; + } + echo "
    \n"; + } + echo "

    "; + + include ("../../../camp2011/includes/footer.php"); } -else //################################################################# +else //################################################################# { if (IsSet($_GET["Raum"]) AND IsSet($_GET["ausdatum"])) - { - $Raum = $_GET["Raum"]; - $ausdatum = $_GET["ausdatum"]; - - include ("../../../camp2011/includes/config_db.php"); - include ("../../../camp2011/includes/config.php"); - include ("../../../camp2011/includes/secure.php"); - //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! - $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; - include ("../../../camp2011/includes/funktion_lang.php"); - include ("../../../camp2011/includes/funktion_schichtplan.php"); - include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); - include ("../../../camp2011/includes/funktion_user.php"); - ?> + { + $Raum = $_GET["Raum"]; + $ausdatum = $_GET["ausdatum"]; + + include ("../../../camp2011/includes/config_db.php"); + include ("../../../camp2011/includes/config.php"); + include ("../../../camp2011/includes/secure.php"); + //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! + $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; + include ("../../../camp2011/includes/funktion_lang.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + include ("../../../camp2011/includes/funktion_user.php"); + ?> @@ -67,55 +67,55 @@ else //#################################################################

    Schichtplan

    - - - - + + + +
    - Datum: - - - Raum: - -
    + Datum: + + + Raum: + +
    - - - - - + + + +\n"; - if( $j==0) - { - $Spalten[$i * $GlobalZeileProStunde + $j].= - "\t\t\n"; - - } - } + for( $j = 0; $j < $GlobalZeileProStunde; $j++) + { + $Spalten[$i * $GlobalZeileProStunde + $j] = + "\t\n"; + if( $j==0) + { + $Spalten[$i * $GlobalZeileProStunde + $j].= + "\t\t\n"; + + } + } CreateRoomShifts( $Raum ); // Ausgabe Zeilen - for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i]; + for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i]; // Ende echo "
    UhrzeitSchichtplanbelegung
    UhrzeitSchichtplanbelegung
    "; - if( $i < 10 ) - $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; - $Spalten[$i * $GlobalZeileProStunde + $j].= "$i:"; - if( ( ($j*60) / $GlobalZeileProStunde) < 10 ) - $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; - $Spalten[$i * $GlobalZeileProStunde + $j].= - ( ($j*60) / $GlobalZeileProStunde). "
    "; + if( $i < 10 ) + $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; + $Spalten[$i * $GlobalZeileProStunde + $j].= "$i:"; + if( ( ($j*60) / $GlobalZeileProStunde) < 10 ) + $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; + $Spalten[$i * $GlobalZeileProStunde + $j].= + ( ($j*60) / $GlobalZeileProStunde). "
    \n"; diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php old mode 100755 new mode 100644 index 7c64543f..34c248fa --- a/www-ssl/admin/shiftadd.php +++ b/www-ssl/admin/shiftadd.php @@ -6,61 +6,61 @@ include ("../../../camp2011/includes/header.php"); $Time = time()+3600+3600; -echo "Hallo ".$_SESSION['Nick'].",
    \n"; +echo "Hallo ".$_SESSION['Nick'].",
    \n"; // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - } + for ($i=0; $i<$rowcount; $i++) + { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + } // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); + $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - } + for ($i=0; $i<$rowcount; $i++) + { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); + } // sesion mit stanadrt werten befüllen if( !isset( $_SESSION['shiftadd.php']['SchichtName'])) { - $_SESSION['shiftadd.php']['SchichtName'] = "--???--"; - $_SESSION['shiftadd.php']['RID'] = ""; - $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time); - $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time); - $_SESSION['shiftadd.php']['STime'] = "10"; - $_SESSION['shiftadd.php']['MoreThenOne'] = "ON"; - $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time); - $_SESSION['shiftadd.php']['ETime'] = "12"; - $_SESSION['shiftadd.php']['len'] = "2"; - $_SESSION['shiftadd.php']['NachtON'] = "OFF"; - $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24"; + $_SESSION['shiftadd.php']['SchichtName'] = "--???--"; + $_SESSION['shiftadd.php']['RID'] = ""; + $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time); + $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time); + $_SESSION['shiftadd.php']['STime'] = "10"; + $_SESSION['shiftadd.php']['MoreThenOne'] = "ON"; + $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time); + $_SESSION['shiftadd.php']['ETime'] = "12"; + $_SESSION['shiftadd.php']['len'] = "2"; + $_SESSION['shiftadd.php']['NachtON'] = "OFF"; + $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24"; } // wenn werte übergeben in sesion eintragen if( !isset($_GET["NachtON"])) - $_GET["NachtON"] = "OFF"; + $_GET["NachtON"] = "OFF"; if( !isset($_GET["MoreThenOne"])) - $_GET["MoreThenOne"] = "OFF"; + $_GET["MoreThenOne"] = "OFF"; if( isset( $_GET["SchichtName"])) { - foreach ($_GET as $k => $v) - { - $_SESSION['shiftadd.php'][$k] = $v; - } + foreach ($_GET as $k => $v) + { + $_SESSION['shiftadd.php'][$k] = $v; + } } if (!IsSet($_GET["action"])) - $_GET["action"] = "new"; + $_GET["action"] = "new"; switch( $_GET["action"]) { @@ -70,187 +70,187 @@ Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende d Über die Länge der Schichten errechnet sich dadurch die Anzahl dieser. Dadurch können gleich mehrere Schichten auf einmal erfasst werden: -
    + - + - + - + - + - + - + - + - + -\n"; - echo " \n"; - } +\n"; + echo " \n"; + } ?>
    Name:">">
    Ort:
    Zeit:
    Month.Jahr:">">
    Beginn:Date"> - Time">Date"> + Time">
    More then One>>
    End:Date"> - Time">Date"> + Time">
    Länge in h:">">
    Sonderschichten ein:>>
    Sonder in h (Time;Time):">">
    Anzahl Engel je Type:
    ". $TTemp["Name"]. ":". $TTemp["Name"]. ":
    -
    +
    - 0)) { - $lenOrg = $_GET["len"]; - if( $_GET["NachtON"] == "ON" ) - { - $lenArrayDummy = explode( "-", $_GET["len_night"]); + $lenOrg = $_GET["len"]; + if( $_GET["NachtON"] == "ON" ) + { + $lenArrayDummy = explode( "-", $_GET["len_night"]); foreach ( $lenArrayDummy as $Temp ) { - if( isset($Temp2) ) - $lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2); - $Temp2 = $Temp; - }//foreach - }//IF( $NachtON == "ON" ) - - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - $DateEnd = $_GET["SDatum"]; - $TimeEnd = intval($_GET["STime"]); - $len=0; - do - { - // define Start time - $Date = $DateEnd; - $Time = $TimeEnd; - $_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00"; - - // define End time - if( $_GET["NachtON"] == "ON" ) - { - if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert."); - $_GET["len"] = $lenArray[$Time]; - if( $_GET["len"]<1) die("len <1"); - } - $TimeEnd = $Time+ $_GET["len"]; - - //Tagesüberschreitung - while( $TimeEnd >= 24 ) - { - $TimeEnd -= 24; - $DateEnd += 1; - } - //ist schischt zu lang dan verkürzen - if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) - { - $_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; - $_GET["len"] -= ($TimeEnd- $_GET["ETime"]); // -(-) ->> + - $DateEnd = $_GET["EDatum"]; - $TimeEnd = $_GET["ETime"]; - } - $_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00"; - - if( $_DateS != $_DateE ) - CreateNewEntry(); - - if( $_GET["MoreThenOne"]!="ON" ) break; - if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break; - } while( true ); - echo "
    StartEndlenRIDBeschreibungEntry 'Shifts'SIDEntrys
    "; - - if( $_GET["OnlyShow"]=="ON" ) - { - echo "
    "; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - echo "\n\t"; - } - echo "\n\t"; - echo "\n\t"; - echo "\n
    "; - } //if + if( isset($Temp2) ) + $lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2); + $Temp2 = $Temp; + }//foreach + }//IF( $NachtON == "ON" ) + + echo "\n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + $DateEnd = $_GET["SDatum"]; + $TimeEnd = intval($_GET["STime"]); + $len=0; + do + { + // define Start time + $Date = $DateEnd; + $Time = $TimeEnd; + $_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00"; + + // define End time + if( $_GET["NachtON"] == "ON" ) + { + if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert."); + $_GET["len"] = $lenArray[$Time]; + if( $_GET["len"]<1) die("len <1"); + } + $TimeEnd = $Time+ $_GET["len"]; + + //Tagesüberschreitung + while( $TimeEnd >= 24 ) + { + $TimeEnd -= 24; + $DateEnd += 1; + } + //ist schischt zu lang dan verkürzen + if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) + { + $_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; + $_GET["len"] -= ($TimeEnd- $_GET["ETime"]); // -(-) ->> + + $DateEnd = $_GET["EDatum"]; + $TimeEnd = $_GET["ETime"]; + } + $_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00"; + + if( $_DateS != $_DateE ) + CreateNewEntry(); + + if( $_GET["MoreThenOne"]!="ON" ) break; + if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break; + } while( true ); + echo "
    StartEndlenRIDBeschreibungEntry 'Shifts'SIDEntrys
    "; + + if( $_GET["OnlyShow"]=="ON" ) + { + echo "
    "; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + foreach ($EngelType As $TTemp) + { + $Temp = "EngelType".$TTemp["TID"]; + echo "\n\t"; + } + echo "\n\t"; + echo "\n\t"; + echo "\n
    "; + } //if } //IF break; case 'engeldel': - break; + break; } // end switch @@ -258,100 +258,100 @@ case 'engeldel': function CreateNewEntry() { - global $con, $_DateS, $_DateE, $EngelType, $DEBUG; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - global $$Temp; - } - - echo "\n"; - - echo "\t$_DateS\n"; - echo "\t$_DateE\n"; - echo "\t". $_GET["len"]. "\n"; - echo "\t". $_GET["RID"]. "\n"; - echo "\t". $_GET["SchichtName"]. "\n"; - - - // Ist eintarg schon vorhanden? - $SQL = "SELECT `SID` FROM `Shifts` "; - $SQL .= "WHERE (". - "`DateS` = '". $_DateS. "' AND ". - "`DateE` = '". $_DateE. "' AND ". - "`RID` = '". $_GET["RID"]. "');"; - $Erg = mysql_query($SQL, $con); - - if( mysql_num_rows($Erg) != 0 ) - echo "\texists"; - elseif( $_GET["OnlyShow"] == "OFF" ) - { - // erstellt Eintrag in Shifts für die algemeine schicht - $SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( "; - $SQL .= "'". $_DateS. "', '". $_DateE. "', "; - $SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', "; - $SQL .= "'". $_GET["SchichtName"]. "');"; - $Erg = db_query($SQL, "create shift"); - - $SQLFail = "\n\t
    [".$SQL. "]"; - - if ($Erg == 1) echo "\tpass\n"; - else echo "\tfail
    \n". mysql_error($con). "$SQLFail\n"; - - } else - echo "\tonly show\n"; - - // sucht SID von eingetragennen schiten - $SQL = "SELECT SID FROM `Shifts` "; - $SQL .= "WHERE (". - "`DateS` = '". $_DateS. "' AND ". - "`DateE` = '". $_DateE. "' AND ". - "`Len` = '". $_GET["len"]. "' AND ". - "`RID` = '". $_GET["RID"]. "');"; - $Erg = mysql_query($SQL, $con); - if( mysql_num_rows($Erg) == 0 ) - echo "\t?"; - else - { - $SID = mysql_result($Erg, 0, "SID"); - echo "\t". $SID. ""; - } - - // erstellt für jeden Engeltypen die eintrage in 'ShiftEntry' - echo "\t"; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - - if( $_GET[$Temp] > 0 ) - { - $i = 0; - echo $_GET[$Temp]. " ".$TTemp["Name"]. "
    \t"; - while( $i++ < $_GET[$Temp] ) - { - if( $_GET["OnlyShow"] == "OFF" ) - { - $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES ("; - $SQL .= "'". $SID. "', "; - $SQL .= "'". $TTemp["TID"]. "');"; - - $Erg = mysql_query($SQL, $con); - - if( $DEBUG ) $SQLFail = "\n\t
    [".$SQL. "]"; - - if ($Erg == 1) echo "'pass' "; - else echo "'fail' ". mysql_error($con). "$SQLFail\n"; - - } - else - echo "+"; - } - echo "
    "; - } // IF $$TEMP - } // FOREACH - echo ""; - - echo "\n"; + global $con, $_DateS, $_DateE, $EngelType, $debug; + foreach ($EngelType As $TTemp) + { + $Temp = "EngelType".$TTemp["TID"]; + global $$Temp; + } + + echo "\n"; + + echo "\t$_DateS\n"; + echo "\t$_DateE\n"; + echo "\t". $_GET["len"]. "\n"; + echo "\t". $_GET["RID"]. "\n"; + echo "\t". $_GET["SchichtName"]. "\n"; + + + // Ist eintarg schon vorhanden? + $SQL = "SELECT `SID` FROM `Shifts` "; + $SQL .= "WHERE (". + "`DateS` = '". $_DateS. "' AND ". + "`DateE` = '". $_DateE. "' AND ". + "`RID` = '". $_GET["RID"]. "');"; + $Erg = mysql_query($SQL, $con); + + if( mysql_num_rows($Erg) != 0 ) + echo "\texists"; + elseif( $_GET["OnlyShow"] == "OFF" ) + { + // erstellt Eintrag in Shifts für die algemeine schicht + $SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( "; + $SQL .= "'". $_DateS. "', '". $_DateE. "', "; + $SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', "; + $SQL .= "'". $_GET["SchichtName"]. "');"; + $Erg = db_query($SQL, "create shift"); + + $SQLFail = "\n\t
    [".$SQL. "]"; + + if ($Erg == 1) echo "\tpass\n"; + else echo "\tfail
    \n". mysql_error($con). "$SQLFail\n"; + + } else + echo "\tonly show\n"; + + // sucht SID von eingetragennen schiten + $SQL = "SELECT SID FROM `Shifts` "; + $SQL .= "WHERE (". + "`DateS` = '". $_DateS. "' AND ". + "`DateE` = '". $_DateE. "' AND ". + "`Len` = '". $_GET["len"]. "' AND ". + "`RID` = '". $_GET["RID"]. "');"; + $Erg = mysql_query($SQL, $con); + if( mysql_num_rows($Erg) == 0 ) + echo "\t?"; + else + { + $SID = mysql_result($Erg, 0, "SID"); + echo "\t". $SID. ""; + } + + // erstellt für jeden Engeltypen die eintrage in 'ShiftEntry' + echo "\t"; + foreach ($EngelType As $TTemp) + { + $Temp = "EngelType".$TTemp["TID"]; + + if( $_GET[$Temp] > 0 ) + { + $i = 0; + echo $_GET[$Temp]. " ".$TTemp["Name"]. "
    \t"; + while( $i++ < $_GET[$Temp] ) + { + if( $_GET["OnlyShow"] == "OFF" ) + { + $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES ("; + $SQL .= "'". $SID. "', "; + $SQL .= "'". $TTemp["TID"]. "');"; + + $Erg = mysql_query($SQL, $con); + + if( $debug ) $SQLFail = "\n\t
    [".$SQL. "]"; + + if ($Erg == 1) echo "'pass' "; + else echo "'fail' ". mysql_error($con). "$SQLFail\n"; + + } + else + echo "+"; + } + echo "
    "; + } // IF $$TEMP + } // FOREACH + echo ""; + + echo "\n"; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php old mode 100755 new mode 100644 index 050b0736..ebf1db32 --- a/www-ssl/admin/sprache.php +++ b/www-ssl/admin/sprache.php @@ -1,4 +1,4 @@ -\n"; - echo Get_Text("pub_sprache_text1")."

    \n"; + echo Get_Text("Hello").$_SESSION['Nick'].",
    \n"; + echo Get_Text("pub_sprache_text1")."

    \n"; - echo "". Get_Text("pub_sprache_ShowEntry"). ""; - // ausgabe Tabellenueberschift - $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; - $erg_Sprachen = mysql_query($SQL_Sprachen, $con); - echo mysql_error($con); - - for( $i=0; $i". Get_Text("pub_sprache_ShowEntry"). ""; + // ausgabe Tabellenueberschift + $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; + $erg_Sprachen = mysql_query($SQL_Sprachen, $con); + echo mysql_error($con); + + for( $i=0; $i\n\t\t"; - echo "\t\t". Get_Text("pub_sprache_TextID"). ""; - foreach( $Sprachen as $Name => $Value ) - echo "". - Get_Text("pub_sprache_Sprache"). " ". $Name. - ""; - echo "\t\t". Get_Text("pub_sprache_Edit"). ""; - echo "\t\t"; + echo "\t\n\t\t"; + echo "\t\t"; + foreach( $Sprachen as $Name => $Value ) + echo ""; + echo "\t\t"; + echo "\t\t"; - if( isset($_GET["ShowEntry"])) - { - // ausgabe eintraege - $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; - $erg = mysql_query($SQL, $con); - echo mysql_error($con); + if( isset($_GET["ShowEntry"])) + { + // ausgabe eintraege + $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; + $erg = mysql_query($SQL, $con); + echo mysql_error($con); - $TextID_Old = mysql_result( $erg, 0, "TextID" ); - for( $i=0; $i"; - echo "\n"; - echo "\t\t\n"; - - foreach( $Sprachen as $Name => $Value ) - { - $Value = html_entity_decode( $Value, ENT_QUOTES); - echo "\t\t\n"; - $Sprachen[ $Name ] = ""; - } - - echo "\t\t\n"; - echo ""; - echo "\n"; - $TextID_Old = $TextID_New; - } - $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" ); - } /*FOR*/ - } - - //fuer neu eintraege - echo ""; - echo "\n"; - echo "\t\t\n"; - - foreach( $Sprachen as $Name => $Value ) - echo "\t\t\n"; + $TextID_Old = mysql_result( $erg, 0, "TextID" ); + for( $i=0; $i"; + echo "\n"; + echo "\t\t\n"; + + foreach( $Sprachen as $Name => $Value ) + { + $Value = html_entity_decode( $Value, ENT_QUOTES); + echo "\t\t\n"; + $Sprachen[ $Name ] = ""; + } + + echo "\t\t\n"; + echo ""; + echo "\n"; + $TextID_Old = $TextID_New; + } + $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" ); + } /*FOR*/ + } + + //fuer neu eintraege + echo ""; + echo "\n"; + echo "\t\t\n"; + + foreach( $Sprachen as $Name => $Value ) + echo "\t\t\n"; - echo "\t\t\n"; - echo ""; - echo "\n"; - - - echo "
    ". Get_Text("pub_sprache_TextID"). "". + Get_Text("pub_sprache_Sprache"). " ". $Name. + "". Get_Text("pub_sprache_Edit"). "
    $TextID_Old ". - "
    $TextID_Old ". + "
    \n"; + echo "\t\t\n"; + echo ""; + echo "\n"; + + + echo "\n"; } /*if( !isset( $TextID ) )*/ else { - echo "edit: ". $_GET["TextID"]. "

    "; - foreach ($_GET as $k => $v) { - if( $k != "TextID" ) - { - $sql_test = "SELECT * FROM `Sprache` ". - "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'"; - $erg_test = mysql_query($sql_test, $con); + echo "edit: ". $_GET["TextID"]. "

    "; + foreach ($_GET as $k => $v) { + if( $k != "TextID" ) + { + $sql_test = "SELECT * FROM `Sprache` ". + "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'"; + $erg_test = mysql_query($sql_test, $con); - if( mysql_num_rows($erg_test)==0 ) - { - $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ". - "VALUES ('". $_GET["TextID"]. "', '$k', '$v')"; - echo $sql_save."
    "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Save: OK
    \n"; - else - echo "\t $k Save: KO
    \n"; - } - else if( mysql_result($erg_test, 0, "Text")!=$v ) - { - $sql_save = "UPDATE `Sprache` SET `Text`='$v' ". - "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' "; - echo $sql_save."
    "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Update: OK
    \n"; - else - echo "\t $k Update: KO
    \n"; - } - else - echo "\t $k no changes
    \n"; - } - } - + if( mysql_num_rows($erg_test)==0 ) + { + $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ". + "VALUES ('". $_GET["TextID"]. "', '$k', '$v')"; + echo $sql_save."
    "; + $Erg = mysql_query($sql_save, $con); + if ($Erg == 1) + echo "\t $k Save: OK
    \n"; + else + echo "\t $k Save: KO
    \n"; + } + else if( mysql_result($erg_test, 0, "Text")!=$v ) + { + $sql_save = "UPDATE `Sprache` SET `Text`='$v' ". + "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' "; + echo $sql_save."
    "; + $Erg = mysql_query($sql_save, $con); + if ($Erg == 1) + echo "\t $k Update: OK
    \n"; + else + echo "\t $k Update: KO
    \n"; + } + else + echo "\t $k no changes
    \n"; + } + } + } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php old mode 100755 new mode 100644 index df33494d..6fc3551e --- a/www-ssl/admin/tshirt.php +++ b/www-ssl/admin/tshirt.php @@ -1,4 +1,4 @@ -"; + echo "Fehler beim speichern bei Engel ". UID2Nick($_GET["aktive"]). "
    "; } } ?> -Über die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.
    -Hinter diesem erscheint ein Link, über den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.

    +Über die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.
    +Hinter diesem erscheint ein Link, über den man eintragen kann, dass der Engel sein T-Shirt erhalten hat.

    Liste aller aktiven Engel: - - - - - - -Nick + + + + +\n"; $eUID=mysql_result($Erg, $i, "UID"); @@ -45,9 +45,9 @@ for ($i=0; $i<$rowcount; $i++){ echo "\t\t\n"; if (mysql_result($Erg, $i, "Tshirt") =="1") { - echo "\t\t"; + echo "\t\t"; } else { - echo "\t\t"; + echo "\t\t"; } echo "\t\n"; } diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php old mode 100755 new mode 100644 index b86c2382..7d7c3a62 --- a/www-ssl/admin/user.php +++ b/www-ssl/admin/user.php @@ -1,4 +1,4 @@ -Neuen Engel eintragen

    \n"; - - if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick"; - $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ". - "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ". - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". - "ORDER BY `". $_GET["OrderBy"]. "` ASC"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - echo "Anzahl Engel: $Zeilen

    \n"; - - ?>
    NickAktiv?GrösseT-Shirt ausgeben:Aktiv?GrösseT-Shirt ausgeben:".mysql_result($Erg, $i, "Size")."bereits erhaltenbereits erhaltenXXXXXXXXXXXXXXXX
    - - - - - - - - - - - - - - - - \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - $Gekommen += mysql_result($Erg, $n, "Gekommen"); - echo "\t\n"; - $Active += mysql_result($Erg, $n, "Aktiv"); - echo "\t\n"; - $Tshirt += mysql_result($Erg, $n, "Tshirt"); - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - echo "". - "". - "\n"; - echo "\t
    - ?OrderBy=Nick">Nick | - ?OrderBy=CreateDate">CreateDate - ?OrderBy=Name">Name?OrderBy=Vorname">Vorname?OrderBy=Alter">Alter - ?OrderBy=email">@ | - ?OrderBy=DECT">DECT | - ?OrderBy=Hometown">Hometown | - ?OrderBy=lastLogIn">lastLogIn | - ?OrderBy=Art">Type | - ?OrderBy=ICQ">ICQ | - ?OrderBy=jabber">jabber | - ?OrderBy=Group">Group - ?OrderBy=Size">Größe?OrderBy=Gekommen">G?OrderBy=Aktiv">A?OrderBy=Tshirt">TÄnd.Secure
    ".mysql_result($Erg, $n, "Nick"). "
    (Create: ". mysql_result($Erg, $n, "CreateDate"). ")    		".mysql_result($Erg, $n, "Name")."".mysql_result($Erg, $n, "Vorname")."".mysql_result($Erg, $n, "Alter").""; - if( strlen( mysql_result($Erg, $n, "Telefon"))>0) - echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "
    "; - if( strlen( mysql_result($Erg, $n, "Handy"))>0) - echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "
    "; - if( strlen( mysql_result($Erg, $n, "DECT"))>0) - echo "\n\t\tDECT: ". - mysql_result($Erg, $n, "DECT"). "
    "; - if( strlen( mysql_result($Erg, $n, "email"))>0) - echo "\n\t\temail: ". - mysql_result($Erg, $n, "email")."
    "; - if( strlen( mysql_result($Erg, $n, "Hometown"))>0) - echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "
    "; - if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0) - echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "
    "; - if( strlen( mysql_result($Erg, $n, "Art"))>0) - echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "
    "; - if( strlen( mysql_result($Erg, $n, "ICQ"))>0) - echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "
    "; - if( strlen( mysql_result($Erg, $n, "jabber"))>0) - echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "
    "; - echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "
    "; - echo "    		".mysql_result($Erg, $n, "Size")."".mysql_result($Erg, $n, "Gekommen")."".mysql_result($Erg, $n, "Aktiv")."".mysql_result($Erg, $n, "Tshirt")."". funktion_isLinkAllowed_addLink_OrEmpty( - "admin/userChangeNormal.php?enterUID=". - mysql_result($Erg, $n, "UID")."&Type=Normal", - "Änd."). - "". funktion_isLinkAllowed_addLink_OrEmpty( - "admin/userChangeSecure.php?enterUID=". - mysql_result($Erg, $n, "UID")."&Type=Secure", - "Secure"). - "
    $Gekommen$Active$Tshirt
    \n"; - // Ende Userliste - - echo "

    Statistics

    "; - funktion_db_element_list_2row( "Hometown", - "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); - - echo "
    \n"; - - funktion_db_element_list_2row( "Engeltypen", + // Userliste, keine UID uebergeben... + + echo "Neuen Engel eintragen

    \n"; + + if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick"; + $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ". + "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ". + "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". + "ORDER BY `". $_GET["OrderBy"]. "` ASC"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + echo "Anzahl Engel: $Zeilen

    \n"; + + ?> + + + + + + + + + + + + + + + + \n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + $Gekommen += mysql_result($Erg, $n, "Gekommen"); + echo "\t\n"; + $Active += mysql_result($Erg, $n, "Aktiv"); + echo "\t\n"; + $Tshirt += mysql_result($Erg, $n, "Tshirt"); + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + } + echo "". + "". + "\n"; + echo "\t
    + ?OrderBy=Nick">Nick | + ?OrderBy=CreateDate">CreateDate + ?OrderBy=Name">Name?OrderBy=Vorname">Vorname?OrderBy=Alter">Alter + ?OrderBy=email">@ | + ?OrderBy=DECT">DECT | + ?OrderBy=Hometown">Hometown | + ?OrderBy=lastLogIn">lastLogIn | + ?OrderBy=Art">Type | + ?OrderBy=ICQ">ICQ | + ?OrderBy=jabber">jabber | + ?OrderBy=Group">Group + ?OrderBy=Size">Größe?OrderBy=Gekommen">G?OrderBy=Aktiv">A?OrderBy=Tshirt">TÄnd.Secure
    ".mysql_result($Erg, $n, "Nick"). "
    (Create: ". mysql_result($Erg, $n, "CreateDate"). ")    		".mysql_result($Erg, $n, "Name")."".mysql_result($Erg, $n, "Vorname")."".mysql_result($Erg, $n, "Alter").""; + if( strlen( mysql_result($Erg, $n, "Telefon"))>0) + echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "
    "; + if( strlen( mysql_result($Erg, $n, "Handy"))>0) + echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "
    "; + if( strlen( mysql_result($Erg, $n, "DECT"))>0) + echo "\n\t\tDECT: ". + mysql_result($Erg, $n, "DECT"). "
    "; + if( strlen( mysql_result($Erg, $n, "email"))>0) + echo "\n\t\temail: ". + mysql_result($Erg, $n, "email")."
    "; + if( strlen( mysql_result($Erg, $n, "Hometown"))>0) + echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "
    "; + if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0) + echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "
    "; + if( strlen( mysql_result($Erg, $n, "Art"))>0) + echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "
    "; + if( strlen( mysql_result($Erg, $n, "ICQ"))>0) + echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "
    "; + if( strlen( mysql_result($Erg, $n, "jabber"))>0) + echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "
    "; + echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "
    "; + echo "    		".mysql_result($Erg, $n, "Size")."".mysql_result($Erg, $n, "Gekommen")."".mysql_result($Erg, $n, "Aktiv")."".mysql_result($Erg, $n, "Tshirt")."". funktion_isLinkAllowed_addLink_OrEmpty( + "admin/userChangeNormal.php?enterUID=". + mysql_result($Erg, $n, "UID")."&Type=Normal", + "Änd."). + "". funktion_isLinkAllowed_addLink_OrEmpty( + "admin/userChangeSecure.php?enterUID=". + mysql_result($Erg, $n, "UID")."&Type=Secure", + "Secure"). + "
    $Gekommen$Active$Tshirt
    \n"; + // Ende Userliste + + echo "

    Statistics

    "; + funktion_db_element_list_2row( "Hometown", + "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + + echo "
    \n"; + + funktion_db_element_list_2row( "Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); - echo "
    \n"; + echo "
    \n"; - funktion_db_element_list_2row( "Used Groups", - "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ". - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". - "WHERE (UserCVS.GroupID!='NULL') ". - "GROUP BY `GroupName` ". - ""); + funktion_db_element_list_2row( "Used Groups", + "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ". + "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". + "WHERE (UserCVS.GroupID!='NULL') ". + "GROUP BY `GroupName` ". + ""); } else { - echo "error"; + echo "error"; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php old mode 100755 new mode 100644 index da68a5da..a8fdb71e --- a/www-ssl/admin/userArrived.php +++ b/www-ssl/admin/userArrived.php @@ -1,4 +1,4 @@ -". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\""; + echo "

    ". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; } else { - echo "

    ". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; + echo "

    ". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; } } -echo Get_Text("pri_userArrived_Text1"). "
    "; -echo Get_Text("pri_userArrived_Text2"). "

    "; +echo Get_Text("pri_userArrived_Text1"). "
    "; +echo Get_Text("pri_userArrived_Text2"). "

    "; echo Get_Text("pri_userArrived_TableToppic"); $SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC"; @@ -34,18 +34,18 @@ echo "\t\t". Get_Text("pri_userArrived_TableTD_ArrivedSet"). "\n"; echo "\t\n"; for ($i=0; $i<$rowcount; $i++){ - echo "\t\n"; - $eUID=mysql_result($Erg, $i, "UID"); - echo "\t\t".UID2Nick($eUID)."\n"; - echo "\t\t".mysql_result($Erg, $i, "Gekommen")."\n"; - - if (mysql_result($Erg, $i, "Gekommen") =="1") - { - echo "\t\t". Get_Text("pri_userArrived_TableEntry_Arrived"). ""; - } else { - echo "\t\t". Get_Text("pri_userArrived_TableEntry_Set"). ""; - } - echo "\t\n"; + echo "\t\n"; + $eUID=mysql_result($Erg, $i, "UID"); + echo "\t\t".UID2Nick($eUID)."\n"; + echo "\t\t".mysql_result($Erg, $i, "Gekommen")."\n"; + + if (mysql_result($Erg, $i, "Gekommen") =="1") + { + echo "\t\t". Get_Text("pri_userArrived_TableEntry_Arrived"). ""; + } else { + echo "\t\t". Get_Text("pri_userArrived_TableEntry_Set"). ""; + } + echo "\t\n"; } echo ""; diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php old mode 100755 new mode 100644 index 51c49944..6785a030 --- a/www-ssl/admin/userChangeNormal.php +++ b/www-ssl/admin/userChangeNormal.php @@ -1,4 +1,4 @@ - Aendern... + // UserID wurde mit uebergeben --> Aendern... - echo "Hallo,
    ". - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". - "bereits sein T-Shirt erhalten hat.

    \n"; + echo "Hallo,
    ". + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". + "bereits sein T-Shirt erhalten hat.

    \n"; - echo "
    \n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "
    \n"; + echo "\n"; - $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'"; - $Erg = mysql_query($SQL, $con); - - if (mysql_num_rows($Erg) != 1) - echo ""; - else - { - echo ""; + } - echo "\n"; - echo "
    Sorry, der Engel (UID=". $_GET["enterUID"]. - ") wurde in der Liste nicht gefunden.
    \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 " \n"; + $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'"; + $Erg = mysql_query($SQL, $con); + + if (mysql_num_rows($Erg) != 1) + echo ""; + else + { + echo ""; - } + echo " \n"; + + echo "
    Nick". - "
    lastLogIn". - "
    Name". - "
    Vorname". - "
    Alter". - "
    Telefon". - "
    Handy". - "
    DECT". - "
    email". - "
    ICQ". - "
    jabber". - "
    Size". - "
    Passwort". - "neues Kennwort setzen
    Sorry, der Engel (UID=". $_GET["enterUID"]. + ") wurde in der Liste nicht gefunden.
    \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 " \n"; - // Gekommen? - echo " \n"; + // Gekommen? + echo " \n"; - // Aktiv? - echo " \n"; + // Aktiv? + echo " \n"; - // T-Shirt bekommen? - echo " \n"; + // T-Shirt bekommen? + echo " \n"; - echo " \n"; - - echo "
    Nick". + "
    lastLogIn". + "
    Name". + "
    Vorname". + "
    Alter". + "
    Telefon". + "
    Handy". + "
    DECT". + "
    email". + "
    ICQ". + "
    jabber". + "
    Size". + "
    Passwort". + "neues Kennwort setzen
    Gekommen\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    Gekommen\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    Aktiv\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    Aktiv\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    T-Shirt\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    T-Shirt\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    Hometown". - "
    \n    		". displayavatar($_GET["enterUID"], FALSE). "
    Hometown". + "
    \n    		". displayavatar($_GET["enterUID"], FALSE). "
    \n
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo "\n"; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo ""; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; - - echo "
    "; - funktion_db_element_list_2row( - "Freeloader Shifts", - "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); + + echo "
    "; + funktion_db_element_list_2row( + "Freeloader Shifts", + "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php old mode 100755 new mode 100644 index c1799fb8..2eb84b85 --- a/www-ssl/admin/userChangeSecure.php +++ b/www-ssl/admin/userChangeSecure.php @@ -1,4 +1,4 @@ - Aendern... + // UserID wurde mit uebergeben --> Aendern... - echo "Hallo,
    ". - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". - "bereits sein T-Shirt erhalten hat.

    \n"; + echo "Hallo,
    ". + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". + "bereits sein T-Shirt erhalten hat.

    \n"; - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - - if( mysql_num_rows($Erg_CVS) != 1) - echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden."; - else - { - // Rename if is an group - if( $_GET["enterUID"] < 0 ) { - $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'"; - $ErgName = mysql_query($SQLname, $con); - echo mysql_error($con); + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'"; + $Erg_CVS = mysql_query($SQL_CVS, $con); + + if( mysql_num_rows($Erg_CVS) != 1) + echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden."; + else + { + // Rename if is an group + if( $_GET["enterUID"] < 0 ) { + $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'"; + $ErgName = mysql_query($SQLname, $con); + echo mysql_error($con); - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - } + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + } - echo "
    \n"; - echo "\n"; - echo "\n"; - echo " \n"; + echo "\n"; + echo "

    Rights of \"". UID2Nick($_GET["enterUID"]). "\":
    \n"; + echo "\n"; + echo " \n"; - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) - { - $CVS_Data_i++; - //nur jeder zweiter sonst wird für jeden text noch die position (Zahl) ausgegeben - if( $CVS_Data_i%2 && $CVS_Data_Name!="UID") - { - if($CVS_Data_Name=="GroupID") { - if( $_GET["enterUID"] > 0 ) - { - echo "\n". - "\n". + ""; - } - } else { - echo "\n"; - } - } - } //IF - } //Foreach - echo "\n"; - - // Ende Formular - echo "\n"; - echo "

    Rights of \"". UID2Nick($_GET["enterUID"]). "\":
    Group
    Group
    $CVS_Data_Name"; - echo "allow \n"; - echo "denied \n"; - if( $_GET["enterUID"] > 0 ) - { - echo "group-setting \n"; - echo "
    \n
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + $SQL_Group = "SELECT * FROM `UserGroups`"; + $Erg_Group = mysql_query($SQL_Group, $con); + for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++) + { + $UID = mysql_result($Erg_Group, $n, "UID"); + echo "\t\n"; + } + echo ""; + } + } else { + echo "$CVS_Data_Name\n"; + echo "allow \n"; + echo "denied \n"; + if( $_GET["enterUID"] > 0 ) + { + echo "group-setting \n"; + echo ""; + } + } + } //IF + } //Foreach + echo "\n"; + + // Ende Formular + echo "\n"; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo ""; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - } + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php old mode 100755 new mode 100644 index d3564400..d4a230de --- a/www-ssl/admin/userDefaultSetting.php +++ b/www-ssl/admin/userDefaultSetting.php @@ -1,4 +1,4 @@ -\nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

    \n"; - + ",
    \nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

    \n"; + echo "\n"; echo "\t\n"; echo "\t\t\n\t\t\n\t\t\n"; @@ -15,55 +15,55 @@ echo "\t\n"; if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"])) { - switch( $_GET["Send"]) - { - case "New": - $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ". - "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL"; - $Erg = db_query( $SQL, "New user default setting"); - if( $Erg == 1) - echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; - else - echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - case "Del": - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - break; - case "Del sure": - $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` "; - $Erg = db_query( $SQL, "del user default setting"); - if( $Erg == 1) - echo "

    Delete ".$_GET["Field"]. " succesfull

    \n"; - else - echo "

    Delete ".$_GET["Field"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - case "SetForAllUser": - $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0"; - $Erg = db_query( $SQL, "Set new user default setting for all user"); - if( $Erg == 1) - echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull

    \n"; - else - echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...

    \n". - "[". mysql_error(). "]

    "; - case "Save": - $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ". - "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'"; - $Erg = db_query( $SQL, "Save user default setting"); - if( $Erg == 1) - echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; - else - echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - } //SWITCH + switch( $_GET["Send"]) + { + case "New": + $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ". + "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL"; + $Erg = db_query( $SQL, "New user default setting"); + if( $Erg == 1) + echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; + else + echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". + "[". mysql_error(). "]

    "; + break; + case "Del": + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + break; + case "Del sure": + $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` "; + $Erg = db_query( $SQL, "del user default setting"); + if( $Erg == 1) + echo "

    Delete ".$_GET["Field"]. " succesfull

    \n"; + else + echo "

    Delete ".$_GET["Field"]. " error...

    \n". + "[". mysql_error(). "]

    "; + break; + case "SetForAllUser": + $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0"; + $Erg = db_query( $SQL, "Set new user default setting for all user"); + if( $Erg == 1) + echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull

    \n"; + else + echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...

    \n". + "[". mysql_error(). "]

    "; + case "Save": + $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ". + "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'"; + $Erg = db_query( $SQL, "Save user default setting"); + if( $Erg == 1) + echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; + else + echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". + "[". mysql_error(). "]

    "; + break; + } //SWITCH } //IF( @@ -79,11 +79,11 @@ $SQL_Group = "SELECT * FROM `UserGroups`"; $Erg_Group = mysql_query($SQL_Group, $con); for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++) { - $UID = mysql_result($Erg_Group, $n, "UID"); - echo "\t\n"; + $UID = mysql_result($Erg_Group, $n, "UID"); + echo "\t\n"; } echo "\n"; echo "\t\t\t\n"; for( $i=2; $i\n"; - echo "\t\t
    \n"; - echo "\t\t\t\n"; - echo "\t\t\t    \n"; - echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } - + echo "\t\n"; echo "\t\t\n"; echo "\t\t\t\n"; diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php old mode 100755 new mode 100644 index 4a7f7126..b1b42f96 --- a/www-ssl/admin/userSaveNormal.php +++ b/www-ssl/admin/userSaveNormal.php @@ -1,4 +1,4 @@ -"; + SetHeaderGo2Back(); + echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; - switch ($_GET["action"]) - { - case "change": - if (IsSet($_POST["enterUID"])) - { - if ($_POST["Type"] == "Normal") - { - $SQL = "UPDATE `User` SET "; - $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ". - "`Vorname` = '". $_POST["eVorname"]. "', ". - "`Telefon` = '". $_POST["eTelefon"]. "', ". - "`Handy` = '". $_POST["eHandy"]. "', ". - "`DECT` = '". $_POST["eDECT"]. "', ". - "`email` = '". $_POST["eemail"]. "', ". - "`ICQ` = '". $_POST["eICQ"]. "', ". - "`jabber` = '". $_POST["ejabber"]. "', ". - "`Size` = '". $_POST["eSize"]. "', ". - "`Gekommen`= '". $_POST["eGekommen"]. "', ". - "`Aktiv`= '". $_POST["eAktiv"]. "', ". - "`Tshirt` = '". $_POST["eTshirt"]. "', ". - "`Hometown` = '". $_POST["Hometown"]. "' ". - "WHERE `UID` = '". $_POST["enterUID"]. - "' LIMIT 1;"; - echo "User-"; - $Erg = db_query($SQL, "change user details"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + switch ($_GET["action"]) + { + case "change": + if (IsSet($_POST["enterUID"])) + { + if ($_POST["Type"] == "Normal") + { + $SQL = "UPDATE `User` SET "; + $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ". + "`Vorname` = '". $_POST["eVorname"]. "', ". + "`Telefon` = '". $_POST["eTelefon"]. "', ". + "`Handy` = '". $_POST["eHandy"]. "', ". + "`DECT` = '". $_POST["eDECT"]. "', ". + "`email` = '". $_POST["eemail"]. "', ". + "`ICQ` = '". $_POST["eICQ"]. "', ". + "`jabber` = '". $_POST["ejabber"]. "', ". + "`Size` = '". $_POST["eSize"]. "', ". + "`Gekommen`= '". $_POST["eGekommen"]. "', ". + "`Aktiv`= '". $_POST["eAktiv"]. "', ". + "`Tshirt` = '". $_POST["eTshirt"]. "', ". + "`Hometown` = '". $_POST["Hometown"]. "' ". + "WHERE `UID` = '". $_POST["enterUID"]. + "' LIMIT 1;"; + echo "User-"; + $Erg = db_query($SQL, "change user details"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; + } + else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; + break; - case "delete": - if (IsSet($_POST["enterUID"])) - { - echo "delate User..."; - $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserEntry..."; - $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". - "WHERE `UID`='". $_POST["enterUID"]. "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - break; + case "delete": + if (IsSet($_POST["enterUID"])) + { + echo "delate User..."; + $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL, "User delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserEntry..."; + $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". + "WHERE `UID`='". $_POST["enterUID"]. "';"; + $Erg = db_query($SQL3, "delate UserEntry"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + break; - case "newpw": - echo "Bitte neues Kennwort für "; - // Get Nick - $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'"; - $Erg = mysql_query($USQL, $con); - echo mysql_result($Erg, 0, "Nick"); - echo " eingeben:
    "; - echo "\n"; - echo ""; - echo ""; - echo ""; - echo "\n"; - echo ""; - break; + case "newpw": + echo "Bitte neues Kennwort für "; + // Get Nick + $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'"; + $Erg = mysql_query($USQL, $con); + echo mysql_result($Erg, 0, "Nick"); + echo " eingeben:
    "; + echo "\n"; + echo ""; + echo ""; + echo ""; + echo "\n"; + echo ""; + break; - case "newpwsave": - if ($_POST["ePasswort"] == $_POST["ePasswort2"]) - { // beide Passwoerter passen... - $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); - $SQL = "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ". - "WHERE `UID`='". $_POST["eUID"]. "'"; - $Erg = db_query($SQL, "User new passwort"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; - break; - } // end switch + case "newpwsave": + if ($_POST["ePasswort"] == $_POST["ePasswort2"]) + { // beide Passwoerter passen... + $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); + $SQL = "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ". + "WHERE `UID`='". $_POST["eUID"]. "'"; + $Erg = db_query($SQL, "User new passwort"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; + break; + } // end switch // ende - Action ist gesetzt } else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; + // kein Action gesetzt -> abbruch + echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php old mode 100755 new mode 100644 index 277c7127..e9ad6135 --- a/www-ssl/admin/userSaveSecure.php +++ b/www-ssl/admin/userSaveSecure.php @@ -1,4 +1,4 @@ - 0 ) { - $Right = $_SESSION['CVS'][ "admin/user.php"]; + $Right = $_SESSION['CVS'][ "admin/user.php"]; } else { - $Right = $_SESSION['CVS'][ "admin/group.php"]; + $Right = $_SESSION['CVS'][ "admin/group.php"]; } if ( ($Right=="Y") && IsSet($_GET["action"])) { - SetHeaderGo2Back(); - echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; - - switch ($_GET["action"]) - { - case "change": - if (IsSet($_POST["enterUID"])) - { - if ($_POST["Type"] == "Secure") - { - $SQL2 = "UPDATE `UserCVS` SET "; - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) - { - if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") { - if( $CVS_Data_Name == "GroupID") - { - if( $_POST["enterUID"] > 0 ) - $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', "; - else - $SQL2.= "`$CVS_Data_Name` = NULL, "; - } else { - $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', "; - } - } - $CVS_Data_i++; - } - $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 ); - $SQL2.= " WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - echo "
    Secure-"; - $Erg = db_query($SQL2, "change user CVS"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + SetHeaderGo2Back(); + echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; + + switch ($_GET["action"]) + { + case "change": + if (IsSet($_POST["enterUID"])) + { + if ($_POST["Type"] == "Secure") + { + $SQL2 = "UPDATE `UserCVS` SET "; + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'"; + $Erg_CVS = mysql_query($SQL_CVS, $con); + $CVS_Data = mysql_fetch_array($Erg_CVS); + $CVS_Data_i = 1; + foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) + { + if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") { + if( $CVS_Data_Name == "GroupID") + { + if( $_POST["enterUID"] > 0 ) + $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', "; + else + $SQL2.= "`$CVS_Data_Name` = NULL, "; + } else { + $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', "; + } + } + $CVS_Data_i++; + } + $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 ); + $SQL2.= " WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + echo "
    Secure-"; + $Erg = db_query($SQL2, "change user CVS"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; + } + else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; + break; - case "changeGroupName": - if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) - { - $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;"; - $Erg = db_query($SQL, "Update Group Name"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + case "changeGroupName": + if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) + { + $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;"; + $Erg = db_query($SQL, "Update Group Name"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } + else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; + break; - case "delete": - if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) ) - { - echo "delate User..."; - $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserEntry..."; - $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". - "WHERE `UID`='". $_POST["enterUID"]. "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) { - echo "delate Group..."; - $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "Group delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - } - break; - } // end switch + case "delete": + if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) ) + { + echo "delate User..."; + $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL, "User delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserEntry..."; + $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". + "WHERE `UID`='". $_POST["enterUID"]. "';"; + $Erg = db_query($SQL3, "delate UserEntry"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) { + echo "delate Group..."; + $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL, "Group delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(". mysql_error($con). ")"; + } + + } + break; + } // end switch // ende - Action ist gesetzt } elseif ( IsSet($_GET["new"]) && ($_SESSION['CVS']["admin/group.php"]=="Y") ) { - echo "Gesendeter Befehl: ". $_GET["new"]. "
    "; - - switch ($_GET["new"]) - { - case "newGroup": - echo "\tGenerate new Group ID...\n"; - $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;"; - $Erg = mysql_query( $SQLid); - - if( mysql_num_rows($Erg) == 1) { - $NewId = mysql_result( $Erg, 0, 0)-1; - $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );"; - $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; - echo "\t
    Generate new UserGroup ...\n"; - $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); - if ($ErgNew1 == 1) - { - echo "\t
    Generate new User rights...\n"; - $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); - if ($ErgNew1 == 1) { - echo "\t
    New group was created.\n"; - } else { - echo "Error on creation\n(". mysql_error($con). ")"; - } - } else { - echo "Error on creation\n(". mysql_error($con). ")"; - } + echo "Gesendeter Befehl: ". $_GET["new"]. "
    "; + + switch ($_GET["new"]) + { + case "newGroup": + echo "\tGenerate new Group ID...\n"; + $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;"; + $Erg = mysql_query( $SQLid); + + if( mysql_num_rows($Erg) == 1) { + $NewId = mysql_result( $Erg, 0, 0)-1; + $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );"; + $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; + echo "\t
    Generate new UserGroup ...\n"; + $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); + if ($ErgNew1 == 1) + { + echo "\t
    Generate new User rights...\n"; + $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); + if ($ErgNew1 == 1) { + echo "\t
    New group was created.\n"; + } else { + echo "Error on creation\n(". mysql_error($con). ")"; + } + } else { + echo "Error on creation\n(". mysql_error($con). ")"; + } - } + } - - break; - } + + break; + } } else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; + // kein Action gesetzt -> abbruch + echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/css/grossbild.js b/www-ssl/css/grossbild.js old mode 100755 new mode 100644 diff --git a/www-ssl/css/style.css.old b/www-ssl/css/style.css.old old mode 100755 new mode 100644 diff --git a/www-ssl/css/style.css.old2 b/www-ssl/css/style.css.old2 old mode 100755 new mode 100644 diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style1.css.old b/www-ssl/css/style1.css.old old mode 100755 new mode 100644 diff --git a/www-ssl/css/style2.css b/www-ssl/css/style2.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style3.css b/www-ssl/css/style3.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style4.css b/www-ssl/css/style4.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style5.css b/www-ssl/css/style5.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style7.css b/www-ssl/css/style7.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style8.css b/www-ssl/css/style8.css old mode 100755 new mode 100644 diff --git a/www-ssl/css/style9.css b/www-ssl/css/style9.css old mode 100755 new mode 100644 diff --git a/www-ssl/faq.php b/www-ssl/faq.php old mode 100755 new mode 100644 index 5bb6824e..26c261da --- a/www-ssl/faq.php +++ b/www-ssl/faq.php @@ -1,22 +1,22 @@ ".mysql_result($Erg, $n, "Frage")."

    "; - echo "

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

    "; + for ($n = 0; $n < $Zeilen; $n++) { + if (mysql_result($Erg, $n, "Antwort") != "") { + echo "
    "; + echo "
    " . mysql_result($Erg, $n, "Frage") . "
    "; + echo "
    " . mysql_result($Erg, $n, "Antwort") . "
    "; + echo "
    "; + } } -} -include ("../../camp2011/includes/footer.php"); + include "../../camp2011/includes/footer.php"; ?> - diff --git a/www-ssl/index.php b/www-ssl/index.php old mode 100755 new mode 100644 index 56e7223b..e61db41a --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -1,19 +1,15 @@
    "; -echo Get_Text("index_text2")."
    "; -echo Get_Text("index_text3")."
    "; + echo "

    " . Get_Text("index_text1") . "

    \n"; + echo "

    " . Get_Text("index_text2") . "

    \n"; + echo "

    " . Get_Text("index_text3") . "

    \n"; -include ("../../camp2011/includes/login_eingabefeld.php"); + include "../../camp2011/includes/login_eingabefeld.php"; -echo "
    ".Get_Text("index_text4")."
    "; + echo "
    " . Get_Text("index_text4") . "
    "; -//echo Get_Text("index_text5"). "
    ". $show_SSLCERT; - -include ("../../camp2011/includes/footer.php"); + include "../../camp2011/includes/footer.php"; ?> - - diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php old mode 100755 new mode 100644 index 617eafe3..ca6ee4b0 --- a/www-ssl/lageplan.php +++ b/www-ssl/lageplan.php @@ -1,11 +1,10 @@ ". Get_Text("lageplan_text1"). "

    "; -echo "

    ."; + echo "

    " . Get_Text("lageplan_text1") . "

    "; + echo "

    \"\""; -include ("../../camp2011/includes/footer.php"); + include "../../camp2011/includes/footer.php"; ?> - diff --git a/www-ssl/logout.php b/www-ssl/logout.php old mode 100755 new mode 100644 index d413dfc7..c137f48c --- a/www-ssl/logout.php +++ b/www-ssl/logout.php @@ -1,13 +1,12 @@ diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php old mode 100755 new mode 100644 index 340d320c..ae205a62 --- a/www-ssl/makeuser.php +++ b/www-ssl/makeuser.php @@ -1,214 +1,181 @@ - 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")."

    ". "

    ". Get_Text("makeuser_text1"). "

    "; -echo "\t\n"; -echo "\t\t
    PageShow
    \n"; @@ -93,35 +93,35 @@ echo "\t
    ". mysql_result( $erg, $i, "Field"). "\n"; - - echo "\t\t\t\tallow\n"; + echo "\t
    ". mysql_result( $erg, $i, "Field"). "\n"; + + echo "\t\t\t\tallow\n"; - echo "\t\t\t\tdenied\n"; + echo "\t\t\t\tdenied\n"; - echo "\t\t\t\tgroup-setting\n"; + echo "\t\t\t\tgroup-setting\n"; - echo "\t\t\t\n"; - echo "\t\t\t \n"; - echo "\t\t\t
    \n"; + echo "\t\t\t \n"; + echo "\t\t\t
    \n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -if ( isset($SubscribeMailinglist) ) -{ - echo "\t\t\t\n"; -} -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t
    ". 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 "\t\t\t
    ". 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 "\t\t\t\n"; -echo "\t\t\t
    ". Get_Text("makeuser_Engelart"). - "\n"; -echo "\t\t\t\n"; -echo "\t\t\t
    ". Get_Text("makeuser_text2"). "
    ". Get_Text("makeuser_Hometown"). - "
    ". Get_Text("makeuser_Passwort"). - "*
    ". Get_Text("makeuser_Passwort2"). - "*
     
    \n"; -echo "\t\n"; -Print_Text("makeuser_text3"); -} - -include ("../../camp2011/includes/footer.php"); -?> + 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"). "
    ". Get_Text("makeuser_Hometown"). "
    ". Get_Text("makeuser_Passwort"). "*
    ". Get_Text("makeuser_Passwort2"). "*
     
    \n"; + echo "
    \n"; + Print_Text("makeuser_text3"); + } + + include "../../camp2011/includes/footer.php"; +?> diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php old mode 100755 new mode 100644 index 3356a81c..2bd6f86f --- a/www-ssl/nonpublic/auth.php +++ b/www-ssl/nonpublic/auth.php @@ -1,66 +1,32 @@ - 'success', - 'rights' => $CVS - ); - echo json_encode($msg); - - } - else - { - echo json_encode(array('status' => 'failed')); - } - } - else - { - echo json_encode(array('status' => 'failed')); - } -} -else -{ - echo json_encode(array('status' => 'failed')); -} - - + 'success', 'rights' => $CVS); + echo json_encode($msg); + } else + echo json_encode(array('status' => 'failed')); + } else + echo json_encode(array('status' => 'failed')); + } else + echo json_encode(array('status' => 'failed')); ?> - - diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php old mode 100755 new mode 100644 index 5bbd63ce..6ddb093a --- a/www-ssl/nonpublic/einstellungen.php +++ b/www-ssl/nonpublic/einstellungen.php @@ -1,360 +1,377 @@ -\n\n"; - Print_Text(13); +\n\n"; + Print_Text(13); ?> -
    - +
    +
    - - - - + +
    ">
    + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - - + + + + + - - - + + + + -
    ">
    ICQ
    ICQ
    jabber
    jabber
    - "> + + ">
    -
    - +
    -
    - +
    +
    - - - - - -
    - "> + + + + + +
    + ">
    -
    - +
    -
    - +
    +
    - - - - - - -
    - -
    Menu>L - >R -
    - "> + + + + + + + + + + +
    + +
    Menu>L + >R +
    + ">
    -
    +
    -
    - +
    +
    - - - - -
    - -
    - "> + + + + + +
    + +
    + ">
    -\n
    \n
    \n\n"; - echo Get_Text('pub_einstellungen_PictureUpload')."
    "; - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; - echo "\t\n"; - echo "
    \n"; - } - - switch( GetPicturShow( $_SESSION['UID'])) - { - case 'Y': - echo Get_Text('pub_einstellungen_PictureShow'). "
    "; - echo displayPictur($_SESSION['UID'], 0); - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "
    \n"; - break; - case 'N': - echo Get_Text('pub_einstellungen_PictureNoShow'). "
    "; - echo displayPictur($_SESSION['UID'], 0); - echo "
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "
    \n"; - echo "
    \n
    \n
    \n\n"; - case '': - echo "
    \n
    \n
    \n\n"; - echo Get_Text(22). "
    "; - echo "\n
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n\t\t\t\n\t\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n\t\t\n"; - echo "\t
    ". Get_Text(23). "
    \n"; - echo "\t\t\t\t  \n"; - echo "\t\t\t\t\n"; - echo "\t\t\t
    \n"; - echo "\t\n"; - echo "
    \n"; - break; - } //CASE - -} else { - -switch ($_POST["action"]) { - -case 'set': - if ($_POST["new1"]==$_POST["new2"]){ - Print_Text(25); - $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'"; - $Erg = mysql_query($sql, $con); - if (PassCrypt($_POST["old"])==mysql_result($Erg, 0, "Passwort")) { - Print_Text(26); - Print_Text(27); - $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' ". - " WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($usql, $con); - if ($Erg==1) { - Print_Text(28); - } else { - Print_Text(29); - } - } else { - Print_Text(30); - } + +\n
    \n
    \n\n"; + echo Get_Text('pub_einstellungen_PictureUpload') . "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; + echo "\n"; + echo "
    \n"; + } + + switch( GetPicturShow( $_SESSION['UID'])) { + case 'Y': + echo Get_Text('pub_einstellungen_PictureShow'). "
    "; + echo displayPictur($_SESSION['UID'], 0); + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    \n"; + break; + case 'N': + echo Get_Text('pub_einstellungen_PictureNoShow'). "
    "; + echo displayPictur($_SESSION['UID'], 0); + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    \n"; + echo "
    \n
    \n
    \n\n"; + case '': + echo "
    \n
    \n
    \n\n"; + echo Get_Text(22). "
    "; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo "\n\n\n"; + echo "\n"; + echo "\n\n"; + echo "
    ". Get_Text(23). "
    \n"; + echo "  \n"; + echo "\n"; + echo "
    \n"; + echo "\n"; + echo "
    \n"; + break; + } //CASE + } else { - Print_Text(31); + switch ($_POST["action"]) { + case 'set': + if($_POST["new1"] == $_POST["new2"]) { + Print_Text(25); + $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'"; + $Erg = mysql_query($sql, $con); + + if(PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) { + Print_Text(26); + Print_Text(27); + $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($usql, $con); + + if ($Erg==1) { + Print_Text(28); + } else { + Print_Text(29); + } + } else { + Print_Text(30); + } + } else { + Print_Text(31); + } + break; + + case 'colour': + + $chsql="UPDATE `User` SET ". + "`color`= '". $_POST["colourid"]. "', ". + "`Menu`= '". $_POST["eMenu"]. "' ". + "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + echo mysql_error($con); + $_SESSION['color']=$_POST["colourid"]; + $_SESSION['Menu']=$_POST["eMenu"]; + if ($Erg==1) { + Print_Text(32); + } else { + Print_Text(29); } - break; - -case 'colour': - - $chsql="UPDATE `User` SET ". - "`color`= '". $_POST["colourid"]. "', ". - "`Menu`= '". $_POST["eMenu"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - echo mysql_error($con); - $_SESSION['color']=$_POST["colourid"]; - $_SESSION['Menu']=$_POST["eMenu"]; - if ($Erg==1) { - Print_Text(32); - } else { - Print_Text(29); - } - break; + break; case 'sprache': - $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - $_SESSION['Sprache']=$_POST["language"]; - if ($Erg==1) { - Print_Text(33); - } else { - Print_Text(29); - } - break; + $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + $_SESSION['Sprache']=$_POST["language"]; + if ($Erg==1) { + Print_Text(33); + } else { + Print_Text(29); + } + break; case 'avatar': - $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; $Erg = mysql_query($chsql, $con); - $_SESSION['Avatar']=$_POST["eAvatar"]; - if ($Erg==1) - Print_Text(34); + $_SESSION['Avatar']=$_POST["eAvatar"]; + if ($Erg==1) + Print_Text(34); else - Print_Text(29); + Print_Text(29); break; case 'setUserData': - if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) - { - $chsql= "UPDATE `User` SET ". - "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". - "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". - "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". - "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". - "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". - "`Hometown`='". $_POST["Hometown"]. "', `Size`='". $_POST["Sizeid"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - } - else - { - $chsql= "UPDATE `User` SET ". - "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". - "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". - "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". - "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". - "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". - "`Hometown`='". $_POST["Hometown"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - } + if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) + { + $chsql= "UPDATE `User` SET ". + "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". + "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". + "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". + "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". + "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". + "`Hometown`='". $_POST["Hometown"]. "', `Size`='". $_POST["Sizeid"]. "' ". + "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; + } + else + { + $chsql= "UPDATE `User` SET ". + "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". + "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". + "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". + "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". + "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". + "`Hometown`='". $_POST["Hometown"]. "' ". + "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; + } $Erg = mysql_query($chsql, $con); - if ($Erg==1) - { - $_SESSION['Nick'] = $_POST["eNick"]; - $_SESSION['Name'] = $_POST["eName"]; - $_SESSION['Vorname'] = $_POST["eVorname"]; - $_SESSION['Alter'] = $_POST["eAlter"]; - $_SESSION['Telefon'] = $_POST["eTelefon"]; - $_SESSION['Handy'] = $_POST["eHandy"]; - $_SESSION['DECT'] = $_POST["eDECT"]; - $_SESSION['email'] = $_POST["eemail"]; - $_SESSION['ICQ'] = $_POST["eICQ"]; - $_SESSION['jabber'] = $_POST["ejabber"]; - $_SESSION['Hometown'] = $_POST["Hometown"]; - if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) - { - $_SESSION['Size']=$_POST["Sizeid"]; - } - else if( $_SESSION['Size'] != $_POST["Sizeid"]) - { - array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); - } - - - Print_Text("pub_einstellungen_UserDateSaved"); + if ($Erg==1) + { + $_SESSION['Nick'] = $_POST["eNick"]; + $_SESSION['Name'] = $_POST["eName"]; + $_SESSION['Vorname'] = $_POST["eVorname"]; + $_SESSION['Alter'] = $_POST["eAlter"]; + $_SESSION['Telefon'] = $_POST["eTelefon"]; + $_SESSION['Handy'] = $_POST["eHandy"]; + $_SESSION['DECT'] = $_POST["eDECT"]; + $_SESSION['email'] = $_POST["eemail"]; + $_SESSION['ICQ'] = $_POST["eICQ"]; + $_SESSION['jabber'] = $_POST["ejabber"]; + $_SESSION['Hometown'] = $_POST["Hometown"]; + if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) + { + $_SESSION['Size']=$_POST["Sizeid"]; + } + else if( $_SESSION['Size'] != $_POST["Sizeid"]) + { + array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); + } + + + Print_Text("pub_einstellungen_UserDateSaved"); } - else - { - Print_Text(29); - echo mysql_error( $con); - } - break; + else + { + Print_Text(29); + echo mysql_error( $con); + } + break; case 'sendPicture': - if( $_FILES["file"]["size"] > 0) - { - if( ($_FILES["file"]["type"] == "image/jpeg") || - ($_FILES["file"]["type"] == "image/png") || - ($_FILES["file"]["type"] == "image/gif") ) - { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - - if( GetPicturShow( $_SESSION['UID']) == "") - $SQL = "INSERT INTO `UserPicture` ". - "( `UID`,`Bild`, `ContentType`, `show`) ". - "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET ". - "`Bild`='$data', ". - "`ContentType`='". $_FILES["file"]["type"]. "', ". - "`show`='N' ". - "WHERE `UID`='". $_SESSION['UID']. "'"; - - $res = mysql_query( $SQL, $con); - if( $res) - Print_Text("pub_einstellungen_send_OK"); - else - Print_Text("pub_einstellungen_send_KO"); - - echo "
    ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)
    "; - } - else - Print_Text("pub_einstellungen_send_KO"); - } - else - Print_Text("pub_einstellungen_send_KO"); - break; + if( $_FILES["file"]["size"] > 0) + { + if( ($_FILES["file"]["type"] == "image/jpeg") || + ($_FILES["file"]["type"] == "image/png") || + ($_FILES["file"]["type"] == "image/gif") ) + { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + + if( GetPicturShow( $_SESSION['UID']) == "") + $SQL = "INSERT INTO `UserPicture` ". + "( `UID`,`Bild`, `ContentType`, `show`) ". + "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET ". + "`Bild`='$data', ". + "`ContentType`='". $_FILES["file"]["type"]. "', ". + "`show`='N' ". + "WHERE `UID`='". $_SESSION['UID']. "'"; + + $res = mysql_query( $SQL, $con); + if( $res) + Print_Text("pub_einstellungen_send_OK"); + else + Print_Text("pub_einstellungen_send_KO"); + + echo "
    ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)
    "; + } + else + Print_Text("pub_einstellungen_send_KO"); + } + else + Print_Text("pub_einstellungen_send_KO"); + break; case 'delPicture': - $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; + $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; $Erg = mysql_query($chsql, $con); - if ($Erg==1) - Print_Text("pub_einstellungen_del_OK"); + if ($Erg==1) + Print_Text("pub_einstellungen_del_OK"); else - Print_Text("pub_einstellungen_del_KO"); - Break; + Print_Text("pub_einstellungen_del_KO"); + Break; } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php old mode 100755 new mode 100644 index ea5c6e3c..0f2892b7 --- a/www-ssl/nonpublic/engelbesprechung.php +++ b/www-ssl/nonpublic/engelbesprechung.php @@ -1,37 +1,27 @@ - -
    - -".mysql_result($Erg, $n, "Betreff").""; - - // Schow Admin Page - if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" ) - echo " [edit]"; + for ($n = 0 ; $n < $Zeilen ; $n++) { + if (mysql_result($Erg, $n, "Treffen") == "1") { + echo "

    " . mysql_result($Erg, $n, "Betreff") . ""; - echo "
       ".mysql_result($Erg, $n, "Datum").", "; - echo UID2Nick(mysql_result($Erg, $n, "UID"))."

    \n"; + // Show Admin Page + if($_SESSION['CVS']["admin/news.php"] == "Y") + echo " [edit]"; - - echo "

    ".nl2br(mysql_result($Erg, $n, "Text"))."

    \n"; + echo "
       ".mysql_result($Erg, $n, "Datum").", "; + echo UID2Nick(mysql_result($Erg, $n, "UID"))."

    \n"; + echo "

    ".nl2br(mysql_result($Erg, $n, "Text"))."

    \n"; + } } -} - -include ("../../../camp2011/includes/footer.php"); + include ("../../../camp2011/includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php old mode 100755 new mode 100644 index 79044c2c..7f768282 --- a/www-ssl/nonpublic/faq.php +++ b/www-ssl/nonpublic/faq.php @@ -1,35 +1,32 @@ -

    +

    - -

    - "> + +

    + ">
    -".Get_Text(37)."

    \n".nl2br($_POST["frage"])."

    \n".Get_Text(38)."
    \n"; +echo "".Get_Text(37)."

    \n".nl2br($_POST["frage"])."

    \n".Get_Text(38)."
    \n"; $SQL = "INSERT INTO `Questions` VALUES ('', '".$_SESSION['UID']."', '". $_POST["frage"]. "', '', '')"; $Erg = mysql_query($SQL, $con); } // Bisherige Anfragen: -echo "
    \n".Get_Text(39)."
    \n"; +echo "
    \n".Get_Text(39)."
    \n"; echo "
    \n"; -echo "
    ".Get_Text(40)."
    \n"; +echo "
    ".Get_Text(40)."
    \n"; $SQL = "SELECT * FROM `Questions` WHERE `UID` = ". $_SESSION['UID']. " AND `AID`='0' ORDER BY 'QID' DESC"; $Erg = mysql_query($SQL, $con); @@ -38,19 +35,19 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); if ($Zeilen==0){ - Print_Text(41); + Print_Text(41); } else { - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; + for ($n = 0 ; $n < $Zeilen ; $n++) { + echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; // Es gibt ja noch keine Antwort: -// echo "

    ".nl2br(mysql_result($Erg, $n, "Answer"))."

    \n"; - echo "\n
    ---
    "; - } +// echo "

    ".nl2br(mysql_result($Erg, $n, "Answer"))."

    \n"; + echo "\n
    ---
    "; + } } echo "
    \n"; -echo "
    ".Get_Text(42)."
    \n"; +echo "
    ".Get_Text(42)."
    \n"; $SQL = "SELECT * FROM `Questions` WHERE `UID`='".$_SESSION['UID']."' and `AID`<>'0' ORDER BY 'QID' DESC"; $Erg = mysql_query($SQL, $con); @@ -58,14 +55,14 @@ $Erg = mysql_query($SQL, $con); $Zeilen = mysql_num_rows($Erg); if ($Zeilen==0){ - Print_Text(41); + Print_Text(41); } else { - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; - echo "

    ".nl2br(mysql_result($Erg, $n, "Answer")). - "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; - echo "\n
    ---
    "; - } + for ($n = 0 ; $n < $Zeilen ; $n++) { + echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; + echo "

    ".nl2br(mysql_result($Erg, $n, "Answer")). + "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; + echo "\n
    ---
    "; + } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php old mode 100755 new mode 100644 index 1072e2d6..a4b2e975 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -9,73 +9,73 @@ session_start(); // alte Session - falls vorhanden - wiederherstellen... function LoginOK() { - include ("../../../camp2011/includes/config.php"); - header("HTTP/1.1 302 Moved Temporarily"); - header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php"); + include ("../../../camp2011/includes/config.php"); + header("HTTP/1.1 302 Moved Temporarily"); + header("Location: ". $url. $ENGEL_ROOT. "nonpublic/news.php"); } if ( !IsSet($_POST["user"])) { // User ist bereits angemeldet... normaler Inhalt... - LoginOK(); + LoginOK(); } else { // User ist noch nicht angemeldet - $sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'"; - $userstring = mysql_query($sql, $con); + $sql = "SELECT * FROM `User` WHERE `Nick`='". $_POST["user"]. "'"; + $userstring = mysql_query($sql, $con); - // anzahl zeilen - $user_anz = mysql_num_rows($userstring); + // anzahl zeilen + $user_anz = mysql_num_rows($userstring); - if ($user_anz == 1) { // Check, ob User angemeldet wird... - if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok... - // Session wird eingeleitet und Session-Variablen gesetzt.. - // session_start(); - session_name("Himmel"); - $_SESSION['UID'] = mysql_result($userstring, 0, "UID"); - $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick"); - $_SESSION['Name'] = mysql_result($userstring, 0, "Name"); - $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname"); - $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter"); - $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon"); - $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy"); - $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT"); - $_SESSION['email'] = mysql_result($userstring, 0, "email"); - $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ"); - $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber"); - $_SESSION['Size'] = mysql_result($userstring, 0, "Size"); - $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen"); - $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv"); - $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt"); - $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu"); - $_SESSION['color'] = mysql_result($userstring, 0, "color"); - $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar"); - $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache"); - $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown"); - $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; - - // 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 + if ($user_anz == 1) { // Check, ob User angemeldet wird... + if (mysql_result($userstring, 0, "Passwort") == PassCrypt($_POST["password"])) { // Passwort ok... + // Session wird eingeleitet und Session-Variablen gesetzt.. + // session_start(); + session_name("Himmel"); + $_SESSION['UID'] = mysql_result($userstring, 0, "UID"); + $_SESSION['Nick'] = mysql_result($userstring, 0, "Nick"); + $_SESSION['Name'] = mysql_result($userstring, 0, "Name"); + $_SESSION['Vorname'] = mysql_result($userstring, 0, "Vorname"); + $_SESSION['Alter'] = mysql_result($userstring, 0, "Alter"); + $_SESSION['Telefon'] = mysql_result($userstring, 0, "Telefon"); + $_SESSION['Handy'] = mysql_result($userstring, 0, "Handy"); + $_SESSION['DECT'] = mysql_result($userstring, 0, "DECT"); + $_SESSION['email'] = mysql_result($userstring, 0, "email"); + $_SESSION['ICQ'] = mysql_result($userstring, 0, "ICQ"); + $_SESSION['jabber'] = mysql_result($userstring, 0, "jabber"); + $_SESSION['Size'] = mysql_result($userstring, 0, "Size"); + $_SESSION['Gekommen'] = mysql_result($userstring, 0, "Gekommen"); + $_SESSION['Aktiv'] = mysql_result($userstring, 0, "Aktiv"); + $_SESSION['Tshirt'] = mysql_result($userstring, 0, "Tshirt"); + $_SESSION['Menu'] = mysql_result($userstring, 0, "Menu"); + $_SESSION['color'] = mysql_result($userstring, 0, "color"); + $_SESSION['Avatar'] = mysql_result($userstring, 0, "Avatar"); + $_SESSION['Sprache'] = mysql_result($userstring, 0, "Sprache"); + $_SESSION['Hometown'] = mysql_result($userstring, 0, "Hometown"); + $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; + + // CVS import Data + $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='".$_SESSION['UID']."'"; + $Erg_CVS = mysql_query($SQL, $con); + $_SESSION['CVS'] = mysql_fetch_array($Erg_CVS); + + LoginOK(); + } + else + { // Passwort nicht ok... + $ErrorText = "pub_index_pass_no_ok"; + } // Ende Passwort-Check + } + else + { // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung + if ($user_anz == 0) + $ErrorText = "pub_index_User_unset"; + else + $ErrorText = "pub_index_User_more_as_one"; + } // Ende Check, ob User angemeldet wurde } include ("../../../camp2011/includes/header.php"); if( isset($ErrorText)) - echo "

    ". Get_Text($ErrorText). "


    \n"; + echo "

    ". Get_Text($ErrorText). "


    \n"; include ("../../../camp2011/includes/login_eingabefeld.php"); include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php old mode 100755 new mode 100644 index 2ba852d4..c85bf669 --- a/www-ssl/nonpublic/messages.php +++ b/www-ssl/nonpublic/messages.php @@ -1,127 +1,122 @@ \n"; - echo Get_Text("pub_messages_text1"). "

    \n"; - - //##################### - //show exist Messages - //##################### - $SQL = "SELECT * FROM `Messages` WHERE `SUID`='". $_SESSION["UID"]. "' OR `RUID`='". $_SESSION["UID"]. "'"; - $erg = mysql_query($SQL, $con); - - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - for( $i=0; $i\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - - //##################### - //send Messeges - //##################### - echo ""; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - // Listet alle Nicks auf - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - echo ""; - - echo "
    ". Get_Text("pub_messages_Datum"). "". Get_Text("pub_messages_Von"). "". Get_Text("pub_messages_An"). "". Get_Text("pub_messages_Text"). "
    ". mysql_result( $erg, $i, "Datum" ). "". UID2Nick( mysql_result( $erg, $i, "SUID" )). "". UID2Nick( mysql_result( $erg, $i, "RUID" )). "". mysql_result( $erg, $i, "Text" ). ""; - - if( mysql_result( $erg, $i, "RUID")==$_SESSION["UID"]) - { - echo "". Get_Text("pub_messages_DelMsg"). ""; - if( mysql_result( $erg, $i, "isRead")=="N") - echo "

    ". Get_Text("pub_messages_MarkRead"). ""; - } - else - { - if( mysql_result( $erg, $i, "isRead")=="N") - echo Get_Text("pub_messages_NotRead"); - } - - echo "
    \n"; - break; - - case "SendMsg": - echo Get_Text("pub_messages_Send1"). "...
    \n"; - - $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (". - "'". gmdate("Y-m-j H:i:s", time()). "', ". - "'". $_SESSION["UID"]. "', ". - "'". $_POST["RUID"]."', ". - "'". $_POST["Text"]. "');"; - - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo Get_Text("pub_messages_Send_OK"). "\n"; - else - echo Get_Text("pub_messages_Send_Error"). "...\n(". mysql_error($con). ")"; - break; - - case "MarkRead": - $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ". - "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ". - "LIMIT 1 ;"; - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo Get_Text("pub_messages_MarkRead_OK"). "\n"; - else - echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")"; - break; - - case "DelMsg": - $SQL = "DELETE FROM `Messages` ". - "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ". - "LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo Get_Text("pub_messages_DelMsg_OK"). "\n"; - else - echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")"; - break; - - default: - echo Get_Text("pub_messages_NoCommand"); -} - -include ("../../../camp2011/includes/footer.php"); + $title = "Himmel"; + $header = ""; + + include "../../../camp2011/includes/header.php"; + + if(!isset($_GET["action"])) + $_GET["action"] = "start"; + + switch( $_GET["action"]) { + case "start": + echo Get_Text("Hello"). $_SESSION['Nick']. ",
    \n"; + echo Get_Text("pub_messages_text1"). "

    \n"; + + //show exist Messages + $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; + $erg = mysql_query($SQL, $con); + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + for($i = 0; $i < mysql_num_rows($erg); $i++) { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + + // send Messeges + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + + // Listet alle Nicks auf + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + + echo "
    ". Get_Text("pub_messages_Datum"). "". Get_Text("pub_messages_Von"). "". Get_Text("pub_messages_An"). "". Get_Text("pub_messages_Text"). "
    " . mysql_result($erg, $i, "Datum") . "" . UID2Nick(mysql_result($erg, $i, "SUID")) . "" . UID2Nick(mysql_result($erg, $i, "RUID")) . "" . mysql_result($erg, $i, "Text") . ""; + + if(mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { + echo "" . Get_Text("pub_messages_DelMsg") . ""; + + if(mysql_result($erg, $i, "isRead") == "N") + echo "" . Get_Text("pub_messages_MarkRead") . ""; + } else { + if(mysql_result($erg, $i, "isRead") == "N") + echo Get_Text("pub_messages_NotRead"); + } + + echo "
    \n"; + break; + + case "SendMsg": + echo Get_Text("pub_messages_Send1") . "...
    \n"; + + $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (". + "'" . gmdate("Y-m-j H:i:s", time()) . "', ". + "'" . $_SESSION["UID"]. "', ". + "'" . $_POST["RUID"]."', ". + "'" . $_POST["Text"]. "');"; + + $Erg = mysql_query($SQL, $con); + + if($Erg == 1) + echo Get_Text("pub_messages_Send_OK") . "\n"; + else + echo Get_Text("pub_messages_Send_Error") . "...\n(". mysql_error($con). ")"; + break; + + case "MarkRead": + $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ". + "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ". + "LIMIT 1 ;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_MarkRead_OK"). "\n"; + else + echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")"; + break; + + case "DelMsg": + $SQL = "DELETE FROM `Messages` ". + "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ". + "LIMIT 1;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_DelMsg_OK"). "\n"; + else + echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")"; + break; + + default: + echo Get_Text("pub_messages_NoCommand"); + } + + include "../../../camp2011/includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php old mode 100755 new mode 100644 index e11453c4..6bbabbb6 --- a/www-ssl/nonpublic/myschichtplan.php +++ b/www-ssl/nonpublic/myschichtplan.php @@ -1,118 +1,116 @@ \n"; + echo Get_Text("pub_mywake_beschreibung1")."
    \n"; + echo Get_Text("pub_mywake_beschreibung2")."

    \n"; + echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN). + Get_Text("pub_mywake_beschreibung4")."

    \n"; + + $USER_ID = $_SESSION['UID']; + + if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" ) { + if( !isset( $_GET["UIDs"]) ) + $_GET["UIDs"] = $_SESSION['UID']; + else + $USER_ID = $_GET["UIDs"]; + + echo "
    "; + + echo "Liste von \n"; - $usql="SELECT * FROM `User` ORDER BY `Nick`"; - $uErg = mysql_query($usql, $con); - $urowcount = mysql_num_rows($uErg); - for ($k=0; $k<$urowcount; $k++) - { - echo "\t\n"; - } - echo " anzeigen.\n"; - echo mysql_error($con); - - echo "\n"; - - echo "
    "; - - } - - $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ". - "INNER JOIN `ShiftEntry` ". - "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ". - "WHERE `ShiftEntry`.`UID`='$USER_ID' ". - "ORDER BY `DateS`"; - $erg = mysql_query($SQL, $con); - - ?> - - - - - - - - - - - "; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten - //// selber noch austragen zu koennen... - $schichtdate = mysql_result( $erg, $i, "DateS" ); - ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); - $info["year"] = $res[1]; - $info["month"] = $res[2]; - $info["day"] = $res[3]; - $info["hour"] = $res[4]; - $info["min"] = $res[5]; - $info["sec"] = $res[6]; - $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); - $lastAustragen = $LETZTES_AUSTRAGEN*3600; - $nowdate = time(); - // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen - // noch möglich sein - if( $schichtdatum > ($lastAustragen + $nowdate) ) - echo "\n"; - else - echo "\n"; - - echo "\n"; - } + echo " anzeigen.\n"; + echo mysql_error($con); + + echo "\n"; + + echo ""; + } + + $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ". + "INNER JOIN `ShiftEntry` ". + "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ". + "WHERE `ShiftEntry`.`UID`='$USER_ID' ". + "ORDER BY `DateS`"; + $erg = mysql_query($SQL, $con); + + ?> +
    ". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "". substr(mysql_result( $erg, $i, "DateS" ), 11). "". mysql_result( $erg, $i, "Len" ). " h". mysql_result( $erg, $i, "Man" ). "". $RoomID[mysql_result( $erg, $i, "RID" )]. "
    \n". - "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")". - "
    \n". 
-		     mysql_result( $erg, $i, "Comment" ). 
-		     "\n
    \n"; - echo "
    # vi #    		 ". - Get_Text("pub_mywake_austragen")."". Get_Text("pub_mywake_austragen_n_c"). "
    + + + + + + + + + + "; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten + //// selber noch austragen zu koennen... + $schichtdate = mysql_result( $erg, $i, "DateS" ); + ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); + $info["year"] = $res[1]; + $info["month"] = $res[2]; + $info["day"] = $res[3]; + $info["hour"] = $res[4]; + $info["min"] = $res[5]; + $info["sec"] = $res[6]; + $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); + $lastAustragen = $LETZTES_AUSTRAGEN*3600; + $nowdate = time(); + // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen + // noch möglich sein + if( $schichtdatum > ($lastAustragen + $nowdate) ) + echo "\n"; + else + echo "\n"; + + echo "\n"; + } echo "
    ". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "". substr(mysql_result( $erg, $i, "DateS" ), 11). "". mysql_result( $erg, $i, "Len" ). " h". mysql_result( $erg, $i, "Man" ). "". $RoomID[mysql_result( $erg, $i, "RID" )]. "
    \n". + "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")". + "
    \n". 
+         mysql_result( $erg, $i, "Comment" ). 
+         "\n
    \n"; + echo "
    # vi #    		 ". + Get_Text("pub_mywake_austragen")."". Get_Text("pub_mywake_austragen_n_c"). "
    \n\n"; if( $_SESSION['CVS'][ "nonpublic/myschichtplan_ical.php" ] == "Y" ) { - echo "
    ". Get_Text("pub_myschichtplan_ical"). "\n"; + echo "
    ". Get_Text("pub_myschichtplan_ical"). "\n"; } } @@ -120,65 +118,65 @@ else { If( $_GET["action"] == "austragen" ) { - echo Get_Text("pub_mywake_delate1")."
    \n"; - - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')"; - $Erg = mysql_query($sql, $con); - - $schichtdate = mysql_result( $Erg, 0, "DateS" ); - ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); - $info["year"] = $res[1]; - $info["month"] = $res[2]; - $info["day"] = $res[3]; - $info["hour"] = $res[4]; - $info["min"] = $res[5]; - $info["sec"] = $res[6]; - $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); - $lastAustragen = $LETZTES_AUSTRAGEN*3600; - $nowdate = time(); - // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen - // noch möglich sein - if( $schichtdatum > ($lastAustragen + $nowdate) ) - { - $sql2 = "UPDATE `ShiftEntry` ". - "SET `UID` = '0', `Comment` = NULL ". - "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;"; - $Erg2 = mysql_query($sql2, $con); - if ($Erg2 == 1) - echo Get_Text("pub_mywake_add_ok"). "\n"; - else - echo Get_Text("pub_mywake_add_ko"). "\n"; - } - else - echo Get_Text("pub_mywake_after"). "\n"; + echo Get_Text("pub_mywake_delate1")."
    \n"; + + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')"; + $Erg = mysql_query($sql, $con); + + $schichtdate = mysql_result( $Erg, 0, "DateS" ); + ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); + $info["year"] = $res[1]; + $info["month"] = $res[2]; + $info["day"] = $res[3]; + $info["hour"] = $res[4]; + $info["min"] = $res[5]; + $info["sec"] = $res[6]; + $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); + $lastAustragen = $LETZTES_AUSTRAGEN*3600; + $nowdate = time(); + // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen + // noch möglich sein + if( $schichtdatum > ($lastAustragen + $nowdate) ) + { + $sql2 = "UPDATE `ShiftEntry` ". + "SET `UID` = '0', `Comment` = NULL ". + "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;"; + $Erg2 = mysql_query($sql2, $con); + if ($Erg2 == 1) + echo Get_Text("pub_mywake_add_ok"). "\n"; + else + echo Get_Text("pub_mywake_add_ko"). "\n"; + } + else + echo Get_Text("pub_mywake_after"). "\n"; } elseif( $_GET["action"] == "edit" ) { - echo Get_Text("pub_myshift_Edit_Text1"). "\n"; - - $sql = "SELECT * FROM `ShiftEntry` WHERE "; - $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')"; - $Erg = mysql_query($sql, $con); - - echo "
    \n"; - echo "

    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; + echo Get_Text("pub_myshift_Edit_Text1"). "\n"; + + $sql = "SELECT * FROM `ShiftEntry` WHERE "; + $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')"; + $Erg = mysql_query($sql, $con); + + echo "
    \n"; + echo "

    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; } elseif( $_GET["action"] == "editSave" ) { - echo Get_Text("pub_myshift_EditSave_Text1"). "
    \n"; - $sql = "UPDATE `ShiftEntry` ". - "SET `Comment` = '". $_GET["newtext"]. "' ". - "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - $Erg = mysql_query($sql, $con); - if ($Erg == 1) - echo "\t ...". Get_Text("pub_myshift_EditSave_OK"). "\n"; - else - echo "\t ...". Get_Text("pub_myshift_EditSave_KO"). "\n"; - SetHeaderGo2Back(); + echo Get_Text("pub_myshift_EditSave_Text1"). "
    \n"; + $sql = "UPDATE `ShiftEntry` ". + "SET `Comment` = '". $_GET["newtext"]. "' ". + "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;"; + $Erg = mysql_query($sql, $con); + if ($Erg == 1) + echo " ...". Get_Text("pub_myshift_EditSave_OK"). "\n"; + else + echo " ...". Get_Text("pub_myshift_EditSave_KO"). "\n"; + SetHeaderGo2Back(); } } include ("../../../camp2011/includes/footer.php"); diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php old mode 100755 new mode 100644 index bcb9eb6f..928f0c86 --- a/www-ssl/nonpublic/myschichtplan_ical.php +++ b/www-ssl/nonpublic/myschichtplan_ical.php @@ -27,22 +27,22 @@ echo "X-WR-CALNAME;VALUE=TEXT:". "Himmel - Schichtplan\n"; for( $i=0; $i" . Get_Text(3) . ""; + include "news_output.php"; -echo "".Get_Text(3).""; -include ("news_output.php"); - -include ("../../../camp2011/includes/footer.php"); + include "../../../camp2011/includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php old mode 100755 new mode 100644 index 826733c1..b90d5a82 --- a/www-ssl/nonpublic/news_comments.php +++ b/www-ssl/nonpublic/news_comments.php @@ -3,54 +3,50 @@ $title = "Kommentare zu den News"; $header = "Kommentar"; include ("../../../camp2011/includes/header.php"); +if(isset($_GET["nid"])) { + if(isset( $_GET["text"])) { + $ch_sql = "INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ". + "VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')"; + $Erg = mysql_query($ch_sql, $con); -if( IsSet( $_GET["nid"])) -{ - - -if( IsSet( $_GET["text"])) -{ - $ch_sql="INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) ". - "VALUES ('". $_GET["nid"]. "', '". date("Y-m-d H:i:s"). "', '". $_GET["text"]. "', '". $_SESSION["UID"]. "')"; - $Erg = mysql_query($ch_sql, $con); - if ($Erg == 1) - { - echo "Eintrag wurde gespeichert

    "; - SetHeaderGo2Back(); - } -} + if ($Erg == 1) { + echo "Eintrag wurde gespeichert

    "; + SetHeaderGo2Back(); + } + } -$SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'"; -$Erg = mysql_query($SQL, $con); -echo mysql_error( $con); -// anzahl zeilen -$news_rows = mysql_num_rows($Erg); + $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'"; + $Erg = mysql_query($SQL, $con); + echo mysql_error( $con); + // anzahl zeilen + $news_rows = mysql_num_rows($Erg); ?> + - - - - - - - + + + + + + + -"; echo "\t\t"; echo "\t\t"; echo ""; echo "\t"; echo "\t\t"; echo ""; } @@ -59,24 +55,24 @@ echo "
    DatumNick
    Kommentar
    DatumNick
    Kommentar
    "; - echo mysql_result($Erg, $n, "Datum"); + echo mysql_result($Erg, $n, "Datum"); echo "\t\t"; - echo UID2Nick(mysql_result($Erg, $n, "UID")); - // avatar anzeigen? - echo DisplayAvatar (mysql_result($Erg, $n, "UID")); + echo UID2Nick(mysql_result($Erg, $n, "UID")); + // avatar anzeigen? + echo DisplayAvatar (mysql_result($Erg, $n, "UID")); echo "\t\t
    "; - echo nl2br(mysql_result($Erg, $n, "Text"))."\n"; + echo nl2br(mysql_result($Erg, $n, "Text"))."\n"; echo "\t\t
    "; ?> -
    +

    Neuer Kommentar:

     
    -"> +">
    Text:
    -
    +
    -"; + echo "

    "; else - echo "

    "; + echo "

    "; echo "". ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) ."\n"; // Schow Admin Page if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" ) - echo " [edit]
    \n\t\t"; + echo " [edit]
    \n\t\t"; - echo "
       ".mysql_result($Erg, $n, "Datum").", "; + echo "
       ".mysql_result($Erg, $n, "Datum").", "; echo UID2Nick(mysql_result($Erg, $n, "UID")).""; // avatar anzeigen? echo DisplayAvatar (mysql_result($Erg, $n, "UID")); @@ -59,17 +59,17 @@ $dis_rows = round (($rows / $DISPLAY_NEWS)+0.5); Print_Text(5); for ($i=1; $i <= $dis_rows; $i++) { - if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { - echo "$i  "; - } else { - echo "$i  "; - } + if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { + echo "$i  "; + } else { + echo "$i  "; + } } echo "

    "; ?> -
    +

      @@ -101,6 +101,6 @@ if ($_SESSION['CVS']["nonpublic/newsAddMeting"] == "Y") { } ?> -
    +
    "> diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php old mode 100755 new mode 100644 index 490167a0..1ed4d32f --- a/www-ssl/nonpublic/schichtplan.1.php +++ b/www-ssl/nonpublic/schichtplan.1.php @@ -5,17 +5,17 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); function Printlink( $Datum) { - GLOBAL $raum; - echo "\t
  • $Datum
    • \n"; + GLOBAL $raum; + echo "\t
  • $Datum
    • \n"; } //function Printlink( if( isset ($VeranstaltungsTage)) - foreach( $VeranstaltungsTage as $k => $v) - Printlink( $v); + foreach( $VeranstaltungsTage as $k => $v) + Printlink( $v); ?> diff --git a/www-ssl/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php old mode 100755 new mode 100644 index 59e58852..d0193178 --- a/www-ssl/nonpublic/schichtplan.2.php +++ b/www-ssl/nonpublic/schichtplan.2.php @@ -6,17 +6,17 @@ include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); if( isset ($Room)) foreach( $Room as $RoomEntry ) { - if(isset($ausdatum)) - echo "\t
  • ". - $RoomEntry["Name"]. "
    • \n"; - else - echo "\t
  • ". - $RoomEntry["Name"]. "
    • \n"; + if(isset($ausdatum)) + echo "\t
  • ". + $RoomEntry["Name"]. "
    • \n"; + else + echo "\t
  • ". + $RoomEntry["Name"]. "
    • \n"; } -echo "
    "; +echo "
    "; if(isset($ausdatum)) - echo "
  • alle
    • "; + echo "
  • alle
    • "; else - echo "
  • alle
    • "; + echo "
  • alle
    • "; ?> diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php old mode 100755 new mode 100644 index 65907863..e8f8f02a --- a/www-ssl/nonpublic/schichtplan.php +++ b/www-ssl/nonpublic/schichtplan.php @@ -1,73 +1,68 @@ $v) - { - if( substr($k, 0, 5) == "raum_") - { - $raum = $raum. ";". $v; - } - } - } -} - -include ("../../../camp2011/includes/header.php"); -include ("../../../camp2011/includes/funktionen.php"); -include ("../../../camp2011/includes/funktion_schichtplan.php"); -include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); -?> - -". - Get_Text("pub_schicht_beschreibung"). "

    "; - -function ShowSwitchDay() -{ - GLOBAL $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum; - - echo "\n\n\n"; - - if( isset($VeranstaltungsTage)) - foreach( $VeranstaltungsTage as $k => $v) - if( $ausdatum == $v) - { - if( $k > 0) - echo "\t\t\t\n"; - if( $k < $VeranstaltungsTageMax) - echo "\t\t\t\n"; - } - echo "\n\n
    ". - "". $VeranstaltungsTage[$k-1]. "". - "". $VeranstaltungsTage[$k+1]. "
    "; + $title = "Himmel"; + $header = "Schichtpläne"; + $submenus = 2; + + if(isset($_GET["ausdatum"])) + $ausdatum = $_GET["ausdatum"]; + if(isset($_GET["raum"])) { + $raum = $_GET["raum"]; + + if($raum==-1 && isset($_GET["show"])) { + $raum = ""; + foreach ($_GET as $k => $v) { + if(substr($k, 0, 5) == "raum_") { + $raum = $raum. ";". $v; + } + } + } + } + + include ("../../../camp2011/includes/header.php"); + include ("../../../camp2011/includes/funktionen.php"); + include ("../../../camp2011/includes/funktion_schichtplan.php"); + include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); + + echo Get_Text("Hello").$_SESSION['Nick'].",
    ". + Get_Text("pub_schicht_beschreibung"). "

    "; + + function ShowSwitchDay() { + global $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum; + + echo "\n\n\n"; + + if( isset($VeranstaltungsTage)) + foreach( $VeranstaltungsTage as $k => $v) + if( $ausdatum == $v) + { + if( $k > 0) + echo "\t\t\t\n"; + if( $k < $VeranstaltungsTageMax) + echo "\t\t\t\n"; + } + echo "\n\n
    ". + "". $VeranstaltungsTage[$k-1]. "". + "". $VeranstaltungsTage[$k+1]. "
    "; } // wenn kein Datum gesetzt ist (die Seite zum ersten mal aufgerufen wird), // das Datum auf den ersten Tag setzen... if( !isset($ausdatum) ) { - $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '". gmdate("Y-m-d", time()+$gmdateOffset). "%' ORDER BY `DateS`"; -// $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`"; - $Erg = mysql_query($sql, $con); - if( mysql_num_rows( $Erg ) == 0 ) - { - $sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1"; - $Erg = mysql_query($sql, $con); - } - if( mysql_num_rows( $Erg ) > 0 ) - $ausdatum = substr(mysql_result($Erg,0,"DateS"),0,10); - else - $ausdatum = gmdate("Y-m-d", time()+$gmdateOffset); + $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '". gmdate("Y-m-d", time()+$gmdateOffset). "%' ORDER BY `DateS`"; +// $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`"; + $Erg = mysql_query($sql, $con); + if( mysql_num_rows( $Erg ) == 0 ) + { + $sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1"; + $Erg = mysql_query($sql, $con); + } + if( mysql_num_rows( $Erg ) > 0 ) + $ausdatum = substr(mysql_result($Erg,0,"DateS"),0,10); + else + $ausdatum = gmdate("Y-m-d", time()+$gmdateOffset); } @@ -75,127 +70,127 @@ if( !isset($ausdatum) ) if ( !isset($raum) ) { - // Ausgabe wenn kein Raum Ausgewählt: - echo Get_Text("pub_schicht_auswahl_raeume"). "

    \n"; - - if( isset($Room)) - { - echo "
    \n"; - foreach( $Room as $RoomEntry ) - { - echo "\t
  • "; - echo "". $RoomEntry["Name"]. ""; - echo "
    • \n"; - } - echo ""; - echo ""; - echo "\n"; - echo "
    \n"; - } - - echo "

    "; - echo Get_Text("pub_schicht_alles_1"). " ". - Get_Text("pub_schicht_alles_2"). " ".Get_Text("pub_schicht_alles_3"); - echo "\n

    \n\n"; - echo "
    \n\n"; - echo Get_Text("pub_schicht_EmptyShifts"). "\n"; - - - // zeit die naesten freien schichten - showEmptyShifts(); + // Ausgabe wenn kein Raum Ausgewählt: + echo Get_Text("pub_schicht_auswahl_raeume"). "

    \n"; + + if( isset($Room)) + { + echo "
    \n"; + foreach( $Room as $RoomEntry ) + { + echo "\t
  • "; + echo "". $RoomEntry["Name"]. ""; + echo "
    • \n"; + } + echo ""; + echo ""; + echo "\n"; + echo "
    \n"; + } + + echo "

    "; + echo Get_Text("pub_schicht_alles_1"). " ". + Get_Text("pub_schicht_alles_2"). " ".Get_Text("pub_schicht_alles_3"); + echo "\n

    \n\n"; + echo "
    \n\n"; + echo Get_Text("pub_schicht_EmptyShifts"). "\n"; + + + // zeit die naesten freien schichten + showEmptyShifts(); } else -{ // Wenn einraum Ausgewählt ist: - if( $raum == -1 ) - echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; - elseif( substr( $raum, 0, 1) == ";" ) - echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; - else - echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. - Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "

    "; - - ShowSwitchDay(); - - echo "\n\n\n"; - echo "\t\n"; - echo "\t\t\n"; - - //Ausgabe Spalten überschrift - if( $raum == -1 ) - { - if( isset($Room)) - foreach( $Room as $RoomEntry ) - if (SummRoomShifts($RoomEntry["RID"]) > 0) - echo "\t\t\n"; - } - elseif( substr( $raum, 0, 1) == ";" ) - { - $words = preg_split("/;/", $raum); - foreach ($words as $word) - { - if( strlen(trim($word)) > 0) - echo "\t\t\n"; - } - } - else - echo "\t\t\n"; - echo "\t\n"; - - //Zeit Ausgeben - for( $i = 0; $i < 24; $i++ ) - for( $j = 0; $j < $GlobalZeileProStunde; $j++) - { - $Spalten[$i * $GlobalZeileProStunde + $j] = - "\t\n\t\t"; - - //Stunde: - $SpaltenTemp=""; - $SpaltenTemp.= ($i<10)? "0$i:": "$i:"; - - //Minute - $TempMinuten = (($j*60) / $GlobalZeileProStunde); - $SpaltenTemp.= ($TempMinuten<10)? "0$TempMinuten": "$TempMinuten"; - - //aktuelle stunde markieren - if( ($j==0) && ($i == gmdate("H", time()+$gmdateOffset)) && (gmdate("Y-m-d", time()+ $gmdateOffset) == $ausdatum) ) - $SpaltenTemp = "

    $SpaltenTemp

    "; - - $SpaltenTemp = "\n"; - $Spalten[$i * $GlobalZeileProStunde + $j].= $SpaltenTemp; - } - - if( $raum == -1 ) - { - if( isset($Room)) - foreach( $Room as $RoomEntry ) - if (SummRoomShifts($RoomEntry["RID"]) > 0) - CreateRoomShifts( $RoomEntry["RID"] ); - } - elseif( substr( $raum, 0, 1) == ";" ) - { - if( isset($Room)) - { - $words = preg_split("/;/", $raum); - foreach ($words as $word) - { - if( strlen(trim($word)) > 0) - if (SummRoomShifts($word) > 0) - CreateRoomShifts( $word ); - } - } - } - else - CreateRoomShifts( $raum ); - - //Ausageb Zeilen - for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) - { - echo $Spalten[$i]."\t\n"; - } - - echo "
    start". $RoomEntry["Name"]. "". $RoomID[trim($word)]. "". $RoomID[$raum]. "
    $SpaltenTemp
    \n"; - - ShowSwitchDay(); +{ // Wenn einraum Ausgewählt ist: + if( $raum == -1 ) + echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; + elseif( substr( $raum, 0, 1) == ";" ) + echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; + else + echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. + Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "

    "; + + ShowSwitchDay(); + + echo "\n\n\n"; + echo "\t\n"; + echo "\t\t\n"; + + //Ausgabe Spalten überschrift + if( $raum == -1 ) + { + if( isset($Room)) + foreach( $Room as $RoomEntry ) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + echo "\t\t\n"; + } + elseif( substr( $raum, 0, 1) == ";" ) + { + $words = preg_split("/;/", $raum); + foreach ($words as $word) + { + if( strlen(trim($word)) > 0) + echo "\t\t\n"; + } + } + else + echo "\t\t\n"; + echo "\t\n"; + + //Zeit Ausgeben + for( $i = 0; $i < 24; $i++ ) + for( $j = 0; $j < $GlobalZeileProStunde; $j++) + { + $Spalten[$i * $GlobalZeileProStunde + $j] = + "\t\n\t\t"; + + //Stunde: + $SpaltenTemp=""; + $SpaltenTemp.= ($i<10)? "0$i:": "$i:"; + + //Minute + $TempMinuten = (($j*60) / $GlobalZeileProStunde); + $SpaltenTemp.= ($TempMinuten<10)? "0$TempMinuten": "$TempMinuten"; + + //aktuelle stunde markieren + if( ($j==0) && ($i == gmdate("H", time()+$gmdateOffset)) && (gmdate("Y-m-d", time()+ $gmdateOffset) == $ausdatum) ) + $SpaltenTemp = "

    $SpaltenTemp

    "; + + $SpaltenTemp = "\n"; + $Spalten[$i * $GlobalZeileProStunde + $j].= $SpaltenTemp; + } + + if( $raum == -1 ) + { + if( isset($Room)) + foreach( $Room as $RoomEntry ) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + CreateRoomShifts( $RoomEntry["RID"] ); + } + elseif( substr( $raum, 0, 1) == ";" ) + { + if( isset($Room)) + { + $words = preg_split("/;/", $raum); + foreach ($words as $word) + { + if( strlen(trim($word)) > 0) + if (SummRoomShifts($word) > 0) + CreateRoomShifts( $word ); + } + } + } + else + CreateRoomShifts( $raum ); + + //Ausageb Zeilen + for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) + { + echo $Spalten[$i]."\t\n"; + } + + echo "
    start". $RoomEntry["Name"]. "". $RoomID[trim($word)]. "". $RoomID[$raum]. "
    $SpaltenTemp
    \n"; + + ShowSwitchDay(); }//if (isset($raum)) diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php old mode 100755 new mode 100644 index 359425bf..621cd97e --- a/www-ssl/nonpublic/schichtplan_add.php +++ b/www-ssl/nonpublic/schichtplan_add.php @@ -1,126 +1,111 @@ = '$beginSchicht') and ". - " (`Shifts`.`DateS` < '$endSchicht'))". - " OR ". - " ((`Shifts`.`DateE` > '$beginSchicht') and ". - " (`Shifts`.`DateE` <= '$endSchicht')) ". - ") and ". - "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));"; - $bErg = mysql_query($SSQL, $con); - - if( mysql_num_rows($bErg) != 0 ) - echo Get_Text("pub_schichtplan_add_AllreadyinShift"); - else - { - //ermitteln der noch gesuchten - $SQL3 = "SELECT * FROM `ShiftEntry`". - " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));"; - $Erg3 = mysql_query($SQL3, $con); - - if( mysql_num_rows($Erg3) <= 0 ) - echo Get_Text("pub_schichtplan_add_ToManyYousers"); - else - { - //write shift - $SQL = "UPDATE `ShiftEntry` SET ". - "`UID` = '". $_SESSION['UID']. "', ". - "`Comment` = '". $_POST["newtext"]. "' ". - "WHERE ( (`SID` = '". $_POST["SID"]. "') and ". - "(`TID` = '". $_POST["TID"]. "') and ". - "(`UID` = '0')) LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg != 1) - echo Get_Text("pub_schichtplan_add_Error"); - else - echo Get_Text("pub_schichtplan_add_WriteOK"); - - }//TO Many USERS - }//Allready in Shift - } - else - { - echo "

    :-(

    "; - array_push($error_messages, "Hack atteck\n"); - } -} -elseif (isset($_GET["SID"]) && isset($_GET["TID"])) -{ - //wenn keien rechte definiert sind - if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ])) - $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y"; - - - - if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") - { - - echo Get_Text("pub_schichtplan_add_Text1"). "

    \n\n". - "
    \n". - "\n"; - - $SQL = "SELECT * FROM `Shifts` WHERE "; - $SQL .="(`SID` = '". $_GET["SID"]. "')"; - $Erg = mysql_query($SQL, $con); - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n \n"; - - echo "\n". - "\n". - "
    ". Get_Text("pub_schichtplan_add_Date"). ": ". - mysql_result($Erg, 0, "DateS"). "
    ". Get_Text("pub_schichtplan_add_Place"). ": ". - $RoomID[ mysql_result($Erg, 0, "RID") ]. "
    ". Get_Text("pub_schichtplan_add_Job"). ": ". - $EngelTypeID[$_GET["TID"]]. "
    ". Get_Text("pub_schichtplan_add_Len"). ": ". - mysql_result($Erg, 0, "Len"). "h
    ". Get_Text("pub_schichtplan_add_TextFor"). ": ". - mysql_result($Erg, 0, "Man"). "
    ". Get_Text("pub_schichtplan_add_Comment"). ":". - "
     
    \n". - "\n". - "\n". - "
    "; - } - else - { - echo "

    :-(

    "; - array_push($error_messages, "Hack atteck\n"); - } - -} - -include ("../../../camp2011/includes/footer.php"); + // datum der einzutragenden Schicht heraussuhen... + $ShiftSQL = "SELECT `DateS`, `DateE` FROM `Shifts` WHERE `SID`='" . $_POST["SID"] . ".'"; + $ShiftErg = mysql_query ($ShiftSQL, $con); + $beginSchicht = mysql_result($ShiftErg, 0, "DateS"); + $endSchicht = mysql_result($ShiftErg, 0, "DateE"); + + // wenn keien rechte definiert sind + if(!isset($_SESSION['CVS'][$TID2Name[$_POST["TID"]]])) + $_SESSION['CVS'][$TID2Name[$_POST["TID"]]] = "Y"; + + if($_SESSION['CVS'][$TID2Name[$_POST["TID"]]] == "Y") { + // Ueberpruefung, ob der Engel bereits fuer eine Schicht zu dieser Zeit eingetragen ist + $SSQL = "SELECT * FROM `Shifts`". + " INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`". + " WHERE ((". + " ((`Shifts`.`DateS` >= '$beginSchicht') and ". + " (`Shifts`.`DateS` < '$endSchicht'))". + " OR ". + " ((`Shifts`.`DateE` > '$beginSchicht') and ". + " (`Shifts`.`DateE` <= '$endSchicht')) ". + ") and ". + "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));"; + $bErg = mysql_query($SSQL, $con); + + if(mysql_num_rows($bErg) != 0) + echo Get_Text("pub_schichtplan_add_AllreadyinShift"); + else { + // ermitteln der noch gesuchten + $SQL3 = "SELECT * FROM `ShiftEntry`". + " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));"; + $Erg3 = mysql_query($SQL3, $con); + + if(mysql_num_rows($Erg3) <= 0) + echo Get_Text("pub_schichtplan_add_ToManyYousers"); + else { + //write shift + $SQL = "UPDATE `ShiftEntry` SET ". + "`UID` = '". $_SESSION['UID']. "', ". + "`Comment` = '". $_POST["newtext"]. "' ". + "WHERE ( (`SID` = '". $_POST["SID"]. "') and ". + "(`TID` = '". $_POST["TID"]. "') and ". + "(`UID` = '0')) LIMIT 1;"; + $Erg = mysql_query($SQL, $con); + + if($Erg != 1) + echo Get_Text("pub_schichtplan_add_Error"); + else + echo Get_Text("pub_schichtplan_add_WriteOK"); + } + } + } else { + echo "

    :-(

    "; + array_push($error_messages, "Hack atteck\n"); + } + } elseif (isset($_GET["SID"]) && isset($_GET["TID"])) { + //wenn keine Rechte definiert sind + if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ])) + $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y"; + + if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") { + echo Get_Text("pub_schichtplan_add_Text1"). "

    \n\n". + "
    \n". + "\n"; + + $SQL = "SELECT * FROM `Shifts` WHERE "; + $SQL .="(`SID` = '". $_GET["SID"]. "')"; + $Erg = mysql_query($SQL, $con); + + echo "\n"; + + echo "\n"; + + echo "\n"; + + echo "\n"; + + echo "\n"; + + echo "\n \n"; + + echo "\n". + "\n". + "
    ". Get_Text("pub_schichtplan_add_Date"). ": ". + mysql_result($Erg, 0, "DateS"). "
    ". Get_Text("pub_schichtplan_add_Place"). ": ". + $RoomID[ mysql_result($Erg, 0, "RID") ]. "
    ". Get_Text("pub_schichtplan_add_Job"). ": ". + $EngelTypeID[$_GET["TID"]]. "
    ". Get_Text("pub_schichtplan_add_Len"). ": ". + mysql_result($Erg, 0, "Len"). "h
    ". Get_Text("pub_schichtplan_add_TextFor"). ": ". + mysql_result($Erg, 0, "Man"). "
    ". Get_Text("pub_schichtplan_add_Comment"). ":". + "
     
    \n". + "\n". + "\n". + "
    "; + } else { + echo "

    :-(

    "; + array_push($error_messages, "Hack atteck\n"); + } + } + + include "../../../camp2011/includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php old mode 100755 new mode 100644 index cc2a48e7..2e4e78c2 --- a/www-ssl/nonpublic/schichtplan_beamer.php +++ b/www-ssl/nonpublic/schichtplan_beamer.php @@ -1,61 +1,55 @@ + - - -Schichtpläne für Beamer - - - - - + +Schichtpläne für Beamer + + + + -echo "\n"; +\n"; echo "- - - - - \n"; - -echo "\n". -// "\t\n". - "\t\n". - "\t\n". - "\t\n". - "\t\n". - "\n"; - -foreach( $Room as $RoomEntry ) -{ - - //var-init - $AnzahlEintraege = 0; - - $Out = ausgabe_Zeile( $RoomEntry["RID"], $Time-3600, $AnzahlEintraege); - $Out.= ausgabe_Zeile( $RoomEntry["RID"], $Time, $AnzahlEintraege); - $Out.= ausgabe_Zeile( $RoomEntry["RID"], $Time+3600, $AnzahlEintraege); - - - //entfernt leere zeilen - if( $AnzahlEintraege==0 ) - $Out = ""; - else - $Out = "\n\t\n". $Out . "\n"; - - echo $Out; + + + + + \n"; + +echo "\n" . + "\n". + "\n". + "\n". + "\n". + "\n"; + +foreach($Room as $RoomEntry) { + // var-init + $AnzahlEintraege = 0; + + $Out = ausgabe_Zeile($RoomEntry["RID"], $Time - 3600, $AnzahlEintraege); + $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time, $AnzahlEintraege); + $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time + 3600, $AnzahlEintraege); + + if($AnzahlEintraege == 0) + $Out = ""; + else + $Out = "\n\n" . $Out . "\n"; + + echo $Out; } +?> -echo "
     ". gmdate("d.m.y", $Time). "". gmdate("H", $Time-3600). ":00". gmdate("H", $Time+0). ":00". gmdate("H", $Time+3600). ":00
    _". $RoomEntry["Name"]. "_
    ". gmdate("d.m.y", $Time) ."". gmdate("H", $Time - 3600) . ":00". gmdate("H", $Time + 0) . ":00". gmdate("H", $Time + 3600) .":00
    _" . $RoomEntry["Name"] . "_
    \n"; + -?> - - + + diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php old mode 100755 new mode 100644 index c14505ab..bb9a0668 --- a/www-ssl/nonpublic/waeckliste.php +++ b/www-ssl/nonpublic/waeckliste.php @@ -1,40 +1,38 @@ -\n". - Get_Text("pub_waeckliste_Text1")?> -

    +

    \n" . Get_Text("pub_waeckliste_Text1"); ?>

    - - - - - - - - + + + + + + + - - - - - - - + + + + + +
    - diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php old mode 100755 new mode 100644 index 67e32e28..164a4bb0 --- a/www-ssl/nonpublic/wecken.php +++ b/www-ssl/nonpublic/wecken.php @@ -1,81 +1,81 @@ ".Get_Text("pub_wake_beschreibung"). "

    \n\n"; + if($Erg == 1) + Print_Text(4); + } + } + + if(isset($_GET["eintragen"])) { + if ($_GET["eintragen"] == "loeschen") { + $SQL = "DELETE FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' AND `ID`='" . $_GET["weckID"] . "' LIMIT 1"; + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) + Print_Text(4); + } + } + echo "

    " . Get_Text("Hello") . $_SESSION['Nick'] . ",
    " . Get_Text("pub_wake_beschreibung") . "

    \n\n"; + echo Get_Text("pub_wake_beschreibung2"); +?> -echo Get_Text("pub_wake_beschreibung2"); ?> -

    - - - - - + + + + + - - - - - - - - - + + + + + +
    ".Get_Text("pub_wake_del"); ?>
    " . Get_Text("pub_wake_del"); ?>
    -

    +

    -

    +

    - - + + - - + + - - + +
    ::
    -"> +" />
    - diff --git a/www-ssl/pic/avatar/avatar1.gif b/www-ssl/pic/avatar/avatar1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar10.gif b/www-ssl/pic/avatar/avatar10.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar100.gif b/www-ssl/pic/avatar/avatar100.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar101.gif b/www-ssl/pic/avatar/avatar101.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar102.gif b/www-ssl/pic/avatar/avatar102.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar103.gif b/www-ssl/pic/avatar/avatar103.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar104.gif b/www-ssl/pic/avatar/avatar104.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar105.gif b/www-ssl/pic/avatar/avatar105.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar106.gif b/www-ssl/pic/avatar/avatar106.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar107.gif b/www-ssl/pic/avatar/avatar107.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar108.gif b/www-ssl/pic/avatar/avatar108.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar109.gif b/www-ssl/pic/avatar/avatar109.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar11.gif b/www-ssl/pic/avatar/avatar11.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar110.gif b/www-ssl/pic/avatar/avatar110.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar111.gif b/www-ssl/pic/avatar/avatar111.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar112.gif b/www-ssl/pic/avatar/avatar112.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar113.gif b/www-ssl/pic/avatar/avatar113.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar114.gif b/www-ssl/pic/avatar/avatar114.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar115.gif b/www-ssl/pic/avatar/avatar115.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar116.gif b/www-ssl/pic/avatar/avatar116.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar117.gif b/www-ssl/pic/avatar/avatar117.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar118.gif b/www-ssl/pic/avatar/avatar118.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar119.gif b/www-ssl/pic/avatar/avatar119.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar12.gif b/www-ssl/pic/avatar/avatar12.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar120.gif b/www-ssl/pic/avatar/avatar120.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar121.gif b/www-ssl/pic/avatar/avatar121.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar122.gif b/www-ssl/pic/avatar/avatar122.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar123.gif b/www-ssl/pic/avatar/avatar123.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar124.gif b/www-ssl/pic/avatar/avatar124.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar125.gif b/www-ssl/pic/avatar/avatar125.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar126.gif b/www-ssl/pic/avatar/avatar126.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar127.gif b/www-ssl/pic/avatar/avatar127.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar128.gif b/www-ssl/pic/avatar/avatar128.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar129.gif b/www-ssl/pic/avatar/avatar129.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar13.gif b/www-ssl/pic/avatar/avatar13.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar130.gif b/www-ssl/pic/avatar/avatar130.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar131.gif b/www-ssl/pic/avatar/avatar131.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar132.gif b/www-ssl/pic/avatar/avatar132.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar133.gif b/www-ssl/pic/avatar/avatar133.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar134.gif b/www-ssl/pic/avatar/avatar134.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar135.gif b/www-ssl/pic/avatar/avatar135.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar136.gif b/www-ssl/pic/avatar/avatar136.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar137.gif b/www-ssl/pic/avatar/avatar137.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar138.gif b/www-ssl/pic/avatar/avatar138.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar139.gif b/www-ssl/pic/avatar/avatar139.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar14.gif b/www-ssl/pic/avatar/avatar14.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar140.gif b/www-ssl/pic/avatar/avatar140.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar141.gif b/www-ssl/pic/avatar/avatar141.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar142.gif b/www-ssl/pic/avatar/avatar142.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar143.gif b/www-ssl/pic/avatar/avatar143.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar144.gif b/www-ssl/pic/avatar/avatar144.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar145.gif b/www-ssl/pic/avatar/avatar145.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar146.gif b/www-ssl/pic/avatar/avatar146.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar147.gif b/www-ssl/pic/avatar/avatar147.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar148.gif b/www-ssl/pic/avatar/avatar148.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar149.gif b/www-ssl/pic/avatar/avatar149.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar15.gif b/www-ssl/pic/avatar/avatar15.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar150.gif b/www-ssl/pic/avatar/avatar150.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar151.gif b/www-ssl/pic/avatar/avatar151.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar152.gif b/www-ssl/pic/avatar/avatar152.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar153.gif b/www-ssl/pic/avatar/avatar153.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar154.gif b/www-ssl/pic/avatar/avatar154.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar155.gif b/www-ssl/pic/avatar/avatar155.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar156.gif b/www-ssl/pic/avatar/avatar156.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar157.gif b/www-ssl/pic/avatar/avatar157.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar158.gif b/www-ssl/pic/avatar/avatar158.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar159.gif b/www-ssl/pic/avatar/avatar159.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar16.gif b/www-ssl/pic/avatar/avatar16.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar160.gif b/www-ssl/pic/avatar/avatar160.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar161.gif b/www-ssl/pic/avatar/avatar161.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar162.gif b/www-ssl/pic/avatar/avatar162.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar163.gif b/www-ssl/pic/avatar/avatar163.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar164.gif b/www-ssl/pic/avatar/avatar164.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar165.gif b/www-ssl/pic/avatar/avatar165.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar166.gif b/www-ssl/pic/avatar/avatar166.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar167.gif b/www-ssl/pic/avatar/avatar167.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar168.gif b/www-ssl/pic/avatar/avatar168.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar169.gif b/www-ssl/pic/avatar/avatar169.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar17.gif b/www-ssl/pic/avatar/avatar17.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar170.gif b/www-ssl/pic/avatar/avatar170.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar171.gif b/www-ssl/pic/avatar/avatar171.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar172.gif b/www-ssl/pic/avatar/avatar172.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar173.gif b/www-ssl/pic/avatar/avatar173.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar174.gif b/www-ssl/pic/avatar/avatar174.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar175.gif b/www-ssl/pic/avatar/avatar175.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar176.gif b/www-ssl/pic/avatar/avatar176.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar177.gif b/www-ssl/pic/avatar/avatar177.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar178.gif b/www-ssl/pic/avatar/avatar178.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar179.gif b/www-ssl/pic/avatar/avatar179.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar18.gif b/www-ssl/pic/avatar/avatar18.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar180.gif b/www-ssl/pic/avatar/avatar180.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar181.gif b/www-ssl/pic/avatar/avatar181.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar182.gif b/www-ssl/pic/avatar/avatar182.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar183.gif b/www-ssl/pic/avatar/avatar183.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar184.gif b/www-ssl/pic/avatar/avatar184.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar185.gif b/www-ssl/pic/avatar/avatar185.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar186.gif b/www-ssl/pic/avatar/avatar186.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar187.gif b/www-ssl/pic/avatar/avatar187.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar188.gif b/www-ssl/pic/avatar/avatar188.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar189.gif b/www-ssl/pic/avatar/avatar189.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar19.gif b/www-ssl/pic/avatar/avatar19.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar190.gif b/www-ssl/pic/avatar/avatar190.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar191.gif b/www-ssl/pic/avatar/avatar191.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar192.gif b/www-ssl/pic/avatar/avatar192.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar193.gif b/www-ssl/pic/avatar/avatar193.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar194.gif b/www-ssl/pic/avatar/avatar194.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar195.gif b/www-ssl/pic/avatar/avatar195.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar196.gif b/www-ssl/pic/avatar/avatar196.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar197.gif b/www-ssl/pic/avatar/avatar197.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar198.gif b/www-ssl/pic/avatar/avatar198.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar199.gif b/www-ssl/pic/avatar/avatar199.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar2.gif b/www-ssl/pic/avatar/avatar2.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar20.gif b/www-ssl/pic/avatar/avatar20.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar200.gif b/www-ssl/pic/avatar/avatar200.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar201.gif b/www-ssl/pic/avatar/avatar201.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar202.gif b/www-ssl/pic/avatar/avatar202.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar203.gif b/www-ssl/pic/avatar/avatar203.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar204.gif b/www-ssl/pic/avatar/avatar204.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar205.gif b/www-ssl/pic/avatar/avatar205.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar206.gif b/www-ssl/pic/avatar/avatar206.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar207.gif b/www-ssl/pic/avatar/avatar207.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar208.gif b/www-ssl/pic/avatar/avatar208.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar209.gif b/www-ssl/pic/avatar/avatar209.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar21.gif b/www-ssl/pic/avatar/avatar21.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar210.gif b/www-ssl/pic/avatar/avatar210.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar211.gif b/www-ssl/pic/avatar/avatar211.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar212.gif b/www-ssl/pic/avatar/avatar212.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar213.gif b/www-ssl/pic/avatar/avatar213.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar214.gif b/www-ssl/pic/avatar/avatar214.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar215.gif b/www-ssl/pic/avatar/avatar215.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar216.gif b/www-ssl/pic/avatar/avatar216.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar217.gif b/www-ssl/pic/avatar/avatar217.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar218.gif b/www-ssl/pic/avatar/avatar218.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar219.gif b/www-ssl/pic/avatar/avatar219.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar22.gif b/www-ssl/pic/avatar/avatar22.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar220.gif b/www-ssl/pic/avatar/avatar220.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar221.gif b/www-ssl/pic/avatar/avatar221.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar222.gif b/www-ssl/pic/avatar/avatar222.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar223.gif b/www-ssl/pic/avatar/avatar223.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar224.gif b/www-ssl/pic/avatar/avatar224.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar225.gif b/www-ssl/pic/avatar/avatar225.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar226.gif b/www-ssl/pic/avatar/avatar226.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar227.gif b/www-ssl/pic/avatar/avatar227.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar228.gif b/www-ssl/pic/avatar/avatar228.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar229.gif b/www-ssl/pic/avatar/avatar229.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar23.gif b/www-ssl/pic/avatar/avatar23.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar230.gif b/www-ssl/pic/avatar/avatar230.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar231.gif b/www-ssl/pic/avatar/avatar231.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar232.gif b/www-ssl/pic/avatar/avatar232.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar233.gif b/www-ssl/pic/avatar/avatar233.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar234.gif b/www-ssl/pic/avatar/avatar234.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar235.gif b/www-ssl/pic/avatar/avatar235.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar236.gif b/www-ssl/pic/avatar/avatar236.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar237.gif b/www-ssl/pic/avatar/avatar237.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar238.gif b/www-ssl/pic/avatar/avatar238.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar239.gif b/www-ssl/pic/avatar/avatar239.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar24.gif b/www-ssl/pic/avatar/avatar24.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar240.gif b/www-ssl/pic/avatar/avatar240.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar241.gif b/www-ssl/pic/avatar/avatar241.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar242.gif b/www-ssl/pic/avatar/avatar242.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar243.gif b/www-ssl/pic/avatar/avatar243.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar244.gif b/www-ssl/pic/avatar/avatar244.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar245.gif b/www-ssl/pic/avatar/avatar245.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar246.gif b/www-ssl/pic/avatar/avatar246.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar247.gif b/www-ssl/pic/avatar/avatar247.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar248.gif b/www-ssl/pic/avatar/avatar248.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar249.gif b/www-ssl/pic/avatar/avatar249.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar25.gif b/www-ssl/pic/avatar/avatar25.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar250.gif b/www-ssl/pic/avatar/avatar250.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar251.gif b/www-ssl/pic/avatar/avatar251.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar252.gif b/www-ssl/pic/avatar/avatar252.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar253.gif b/www-ssl/pic/avatar/avatar253.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar254.gif b/www-ssl/pic/avatar/avatar254.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar255.gif b/www-ssl/pic/avatar/avatar255.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar256.gif b/www-ssl/pic/avatar/avatar256.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar257.gif b/www-ssl/pic/avatar/avatar257.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar258.gif b/www-ssl/pic/avatar/avatar258.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar259.gif b/www-ssl/pic/avatar/avatar259.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar26.gif b/www-ssl/pic/avatar/avatar26.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar260.gif b/www-ssl/pic/avatar/avatar260.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar261.gif b/www-ssl/pic/avatar/avatar261.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar262.gif b/www-ssl/pic/avatar/avatar262.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar263.gif b/www-ssl/pic/avatar/avatar263.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar264.gif b/www-ssl/pic/avatar/avatar264.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar265.gif b/www-ssl/pic/avatar/avatar265.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar266.gif b/www-ssl/pic/avatar/avatar266.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar267.gif b/www-ssl/pic/avatar/avatar267.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar268.gif b/www-ssl/pic/avatar/avatar268.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar269.gif b/www-ssl/pic/avatar/avatar269.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar27.gif b/www-ssl/pic/avatar/avatar27.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar270.gif b/www-ssl/pic/avatar/avatar270.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar271.gif b/www-ssl/pic/avatar/avatar271.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar272.gif b/www-ssl/pic/avatar/avatar272.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar273.gif b/www-ssl/pic/avatar/avatar273.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar274.gif b/www-ssl/pic/avatar/avatar274.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar275.gif b/www-ssl/pic/avatar/avatar275.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar276.gif b/www-ssl/pic/avatar/avatar276.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar277.gif b/www-ssl/pic/avatar/avatar277.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar278.gif b/www-ssl/pic/avatar/avatar278.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar279.gif b/www-ssl/pic/avatar/avatar279.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar28.gif b/www-ssl/pic/avatar/avatar28.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar280.gif b/www-ssl/pic/avatar/avatar280.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar281.gif b/www-ssl/pic/avatar/avatar281.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar282.gif b/www-ssl/pic/avatar/avatar282.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar283.gif b/www-ssl/pic/avatar/avatar283.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar284.gif b/www-ssl/pic/avatar/avatar284.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar285.gif b/www-ssl/pic/avatar/avatar285.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar286.gif b/www-ssl/pic/avatar/avatar286.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar287.gif b/www-ssl/pic/avatar/avatar287.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar288.gif b/www-ssl/pic/avatar/avatar288.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar289.gif b/www-ssl/pic/avatar/avatar289.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar29.gif b/www-ssl/pic/avatar/avatar29.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar290.gif b/www-ssl/pic/avatar/avatar290.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar291.gif b/www-ssl/pic/avatar/avatar291.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar292.gif b/www-ssl/pic/avatar/avatar292.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar293.gif b/www-ssl/pic/avatar/avatar293.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar294.gif b/www-ssl/pic/avatar/avatar294.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar295.gif b/www-ssl/pic/avatar/avatar295.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar296.gif b/www-ssl/pic/avatar/avatar296.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar297.gif b/www-ssl/pic/avatar/avatar297.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar298.gif b/www-ssl/pic/avatar/avatar298.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar299.gif b/www-ssl/pic/avatar/avatar299.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar3.gif b/www-ssl/pic/avatar/avatar3.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar30.gif b/www-ssl/pic/avatar/avatar30.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar300.gif b/www-ssl/pic/avatar/avatar300.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar301.gif b/www-ssl/pic/avatar/avatar301.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar302.gif b/www-ssl/pic/avatar/avatar302.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar303.gif b/www-ssl/pic/avatar/avatar303.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar304.gif b/www-ssl/pic/avatar/avatar304.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar305.gif b/www-ssl/pic/avatar/avatar305.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar306.gif b/www-ssl/pic/avatar/avatar306.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar307.gif b/www-ssl/pic/avatar/avatar307.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar308.gif b/www-ssl/pic/avatar/avatar308.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar309.gif b/www-ssl/pic/avatar/avatar309.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar31.gif b/www-ssl/pic/avatar/avatar31.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar310.gif b/www-ssl/pic/avatar/avatar310.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar311.gif b/www-ssl/pic/avatar/avatar311.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar312.gif b/www-ssl/pic/avatar/avatar312.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar313.gif b/www-ssl/pic/avatar/avatar313.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar314.gif b/www-ssl/pic/avatar/avatar314.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar315.gif b/www-ssl/pic/avatar/avatar315.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar316.gif b/www-ssl/pic/avatar/avatar316.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar317.gif b/www-ssl/pic/avatar/avatar317.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar318.gif b/www-ssl/pic/avatar/avatar318.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar319.gif b/www-ssl/pic/avatar/avatar319.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar32.gif b/www-ssl/pic/avatar/avatar32.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar320.gif b/www-ssl/pic/avatar/avatar320.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar321.gif b/www-ssl/pic/avatar/avatar321.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar322.gif b/www-ssl/pic/avatar/avatar322.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar323.gif b/www-ssl/pic/avatar/avatar323.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar324.gif b/www-ssl/pic/avatar/avatar324.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar325.gif b/www-ssl/pic/avatar/avatar325.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar326.gif b/www-ssl/pic/avatar/avatar326.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar327.gif b/www-ssl/pic/avatar/avatar327.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar328.gif b/www-ssl/pic/avatar/avatar328.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar329.gif b/www-ssl/pic/avatar/avatar329.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar33.gif b/www-ssl/pic/avatar/avatar33.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar330.gif b/www-ssl/pic/avatar/avatar330.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar331.gif b/www-ssl/pic/avatar/avatar331.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar332.gif b/www-ssl/pic/avatar/avatar332.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar333.gif b/www-ssl/pic/avatar/avatar333.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar334.gif b/www-ssl/pic/avatar/avatar334.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar335.gif b/www-ssl/pic/avatar/avatar335.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar336.gif b/www-ssl/pic/avatar/avatar336.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar337.gif b/www-ssl/pic/avatar/avatar337.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar338.gif b/www-ssl/pic/avatar/avatar338.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar339.gif b/www-ssl/pic/avatar/avatar339.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar34.gif b/www-ssl/pic/avatar/avatar34.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar340.gif b/www-ssl/pic/avatar/avatar340.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar341.gif b/www-ssl/pic/avatar/avatar341.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar342.gif b/www-ssl/pic/avatar/avatar342.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar343.gif b/www-ssl/pic/avatar/avatar343.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar344.gif b/www-ssl/pic/avatar/avatar344.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar345.gif b/www-ssl/pic/avatar/avatar345.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar346.gif b/www-ssl/pic/avatar/avatar346.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar347.gif b/www-ssl/pic/avatar/avatar347.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar348.gif b/www-ssl/pic/avatar/avatar348.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar349.gif b/www-ssl/pic/avatar/avatar349.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar35.gif b/www-ssl/pic/avatar/avatar35.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar350.gif b/www-ssl/pic/avatar/avatar350.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar351.gif b/www-ssl/pic/avatar/avatar351.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar352.gif b/www-ssl/pic/avatar/avatar352.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar353.gif b/www-ssl/pic/avatar/avatar353.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar354.gif b/www-ssl/pic/avatar/avatar354.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar355.gif b/www-ssl/pic/avatar/avatar355.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar356.gif b/www-ssl/pic/avatar/avatar356.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar357.gif b/www-ssl/pic/avatar/avatar357.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar358.gif b/www-ssl/pic/avatar/avatar358.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar359.gif b/www-ssl/pic/avatar/avatar359.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar36.gif b/www-ssl/pic/avatar/avatar36.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar360.gif b/www-ssl/pic/avatar/avatar360.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar361.gif b/www-ssl/pic/avatar/avatar361.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar362.gif b/www-ssl/pic/avatar/avatar362.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar363.gif b/www-ssl/pic/avatar/avatar363.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar364.gif b/www-ssl/pic/avatar/avatar364.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar365.gif b/www-ssl/pic/avatar/avatar365.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar366.gif b/www-ssl/pic/avatar/avatar366.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar367.gif b/www-ssl/pic/avatar/avatar367.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar368.gif b/www-ssl/pic/avatar/avatar368.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar369.gif b/www-ssl/pic/avatar/avatar369.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar37.gif b/www-ssl/pic/avatar/avatar37.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar370.gif b/www-ssl/pic/avatar/avatar370.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar371.gif b/www-ssl/pic/avatar/avatar371.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar372.gif b/www-ssl/pic/avatar/avatar372.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar373.gif b/www-ssl/pic/avatar/avatar373.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar374.gif b/www-ssl/pic/avatar/avatar374.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar375.gif b/www-ssl/pic/avatar/avatar375.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar376.gif b/www-ssl/pic/avatar/avatar376.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar377.gif b/www-ssl/pic/avatar/avatar377.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar378.gif b/www-ssl/pic/avatar/avatar378.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar379.gif b/www-ssl/pic/avatar/avatar379.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar38.gif b/www-ssl/pic/avatar/avatar38.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar380.gif b/www-ssl/pic/avatar/avatar380.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar381.gif b/www-ssl/pic/avatar/avatar381.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar382.gif b/www-ssl/pic/avatar/avatar382.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar383.gif b/www-ssl/pic/avatar/avatar383.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar384.gif b/www-ssl/pic/avatar/avatar384.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar385.gif b/www-ssl/pic/avatar/avatar385.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar386.gif b/www-ssl/pic/avatar/avatar386.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar387.gif b/www-ssl/pic/avatar/avatar387.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar388.gif b/www-ssl/pic/avatar/avatar388.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar389.gif b/www-ssl/pic/avatar/avatar389.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar39.gif b/www-ssl/pic/avatar/avatar39.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar390.gif b/www-ssl/pic/avatar/avatar390.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar391.gif b/www-ssl/pic/avatar/avatar391.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar392.gif b/www-ssl/pic/avatar/avatar392.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar393.gif b/www-ssl/pic/avatar/avatar393.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar394.gif b/www-ssl/pic/avatar/avatar394.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar395.gif b/www-ssl/pic/avatar/avatar395.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar396.gif b/www-ssl/pic/avatar/avatar396.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar397.gif b/www-ssl/pic/avatar/avatar397.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar398.gif b/www-ssl/pic/avatar/avatar398.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar399.gif b/www-ssl/pic/avatar/avatar399.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar4.gif b/www-ssl/pic/avatar/avatar4.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar40.gif b/www-ssl/pic/avatar/avatar40.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar400.gif b/www-ssl/pic/avatar/avatar400.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar401.gif b/www-ssl/pic/avatar/avatar401.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar402.gif b/www-ssl/pic/avatar/avatar402.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar403.gif b/www-ssl/pic/avatar/avatar403.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar404.gif b/www-ssl/pic/avatar/avatar404.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar405.gif b/www-ssl/pic/avatar/avatar405.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar406.gif b/www-ssl/pic/avatar/avatar406.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar407.gif b/www-ssl/pic/avatar/avatar407.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar408.gif b/www-ssl/pic/avatar/avatar408.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar409.gif b/www-ssl/pic/avatar/avatar409.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar41.gif b/www-ssl/pic/avatar/avatar41.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar410.gif b/www-ssl/pic/avatar/avatar410.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar411.gif b/www-ssl/pic/avatar/avatar411.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar412.gif b/www-ssl/pic/avatar/avatar412.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar413.gif b/www-ssl/pic/avatar/avatar413.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar414.gif b/www-ssl/pic/avatar/avatar414.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar415.gif b/www-ssl/pic/avatar/avatar415.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar416.gif b/www-ssl/pic/avatar/avatar416.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar417.gif b/www-ssl/pic/avatar/avatar417.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar418.gif b/www-ssl/pic/avatar/avatar418.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar419.gif b/www-ssl/pic/avatar/avatar419.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar42.gif b/www-ssl/pic/avatar/avatar42.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar420.gif b/www-ssl/pic/avatar/avatar420.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar421.gif b/www-ssl/pic/avatar/avatar421.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar422.gif b/www-ssl/pic/avatar/avatar422.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar423.gif b/www-ssl/pic/avatar/avatar423.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar424.gif b/www-ssl/pic/avatar/avatar424.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar425.gif b/www-ssl/pic/avatar/avatar425.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar426.gif b/www-ssl/pic/avatar/avatar426.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar427.gif b/www-ssl/pic/avatar/avatar427.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar428.gif b/www-ssl/pic/avatar/avatar428.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar429.gif b/www-ssl/pic/avatar/avatar429.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar43.gif b/www-ssl/pic/avatar/avatar43.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar430.gif b/www-ssl/pic/avatar/avatar430.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar431.gif b/www-ssl/pic/avatar/avatar431.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar432.gif b/www-ssl/pic/avatar/avatar432.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar433.gif b/www-ssl/pic/avatar/avatar433.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar434.gif b/www-ssl/pic/avatar/avatar434.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar435.gif b/www-ssl/pic/avatar/avatar435.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar436.gif b/www-ssl/pic/avatar/avatar436.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar437.gif b/www-ssl/pic/avatar/avatar437.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar438.gif b/www-ssl/pic/avatar/avatar438.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar439.gif b/www-ssl/pic/avatar/avatar439.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar44.gif b/www-ssl/pic/avatar/avatar44.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar440.gif b/www-ssl/pic/avatar/avatar440.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar441.gif b/www-ssl/pic/avatar/avatar441.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar442.gif b/www-ssl/pic/avatar/avatar442.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar443.gif b/www-ssl/pic/avatar/avatar443.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar444.gif b/www-ssl/pic/avatar/avatar444.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar445.gif b/www-ssl/pic/avatar/avatar445.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar446.gif b/www-ssl/pic/avatar/avatar446.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar447.gif b/www-ssl/pic/avatar/avatar447.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar448.gif b/www-ssl/pic/avatar/avatar448.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar449.gif b/www-ssl/pic/avatar/avatar449.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar45.gif b/www-ssl/pic/avatar/avatar45.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar450.gif b/www-ssl/pic/avatar/avatar450.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar451.gif b/www-ssl/pic/avatar/avatar451.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar452.gif b/www-ssl/pic/avatar/avatar452.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar453.gif b/www-ssl/pic/avatar/avatar453.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar454.gif b/www-ssl/pic/avatar/avatar454.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar455.gif b/www-ssl/pic/avatar/avatar455.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar456.gif b/www-ssl/pic/avatar/avatar456.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar457.gif b/www-ssl/pic/avatar/avatar457.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar458.gif b/www-ssl/pic/avatar/avatar458.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar459.gif b/www-ssl/pic/avatar/avatar459.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar46.gif b/www-ssl/pic/avatar/avatar46.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar460.gif b/www-ssl/pic/avatar/avatar460.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar461.gif b/www-ssl/pic/avatar/avatar461.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar462.gif b/www-ssl/pic/avatar/avatar462.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar463.gif b/www-ssl/pic/avatar/avatar463.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar464.gif b/www-ssl/pic/avatar/avatar464.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar465.gif b/www-ssl/pic/avatar/avatar465.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar466.gif b/www-ssl/pic/avatar/avatar466.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar467.gif b/www-ssl/pic/avatar/avatar467.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar468.gif b/www-ssl/pic/avatar/avatar468.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar469.gif b/www-ssl/pic/avatar/avatar469.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar47.gif b/www-ssl/pic/avatar/avatar47.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar470.gif b/www-ssl/pic/avatar/avatar470.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar471.gif b/www-ssl/pic/avatar/avatar471.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar472.gif b/www-ssl/pic/avatar/avatar472.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar473.gif b/www-ssl/pic/avatar/avatar473.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar474.gif b/www-ssl/pic/avatar/avatar474.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar475.gif b/www-ssl/pic/avatar/avatar475.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar476.gif b/www-ssl/pic/avatar/avatar476.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar477.gif b/www-ssl/pic/avatar/avatar477.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar478.gif b/www-ssl/pic/avatar/avatar478.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar479.gif b/www-ssl/pic/avatar/avatar479.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar48.gif b/www-ssl/pic/avatar/avatar48.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar480.gif b/www-ssl/pic/avatar/avatar480.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar481.gif b/www-ssl/pic/avatar/avatar481.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar482.gif b/www-ssl/pic/avatar/avatar482.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar483.gif b/www-ssl/pic/avatar/avatar483.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar484.gif b/www-ssl/pic/avatar/avatar484.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar485.gif b/www-ssl/pic/avatar/avatar485.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar486.gif b/www-ssl/pic/avatar/avatar486.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar487.gif b/www-ssl/pic/avatar/avatar487.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar488.gif b/www-ssl/pic/avatar/avatar488.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar489.gif b/www-ssl/pic/avatar/avatar489.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar49.gif b/www-ssl/pic/avatar/avatar49.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar490.gif b/www-ssl/pic/avatar/avatar490.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar491.gif b/www-ssl/pic/avatar/avatar491.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar492.gif b/www-ssl/pic/avatar/avatar492.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar493.gif b/www-ssl/pic/avatar/avatar493.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar494.gif b/www-ssl/pic/avatar/avatar494.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar495.gif b/www-ssl/pic/avatar/avatar495.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar496.gif b/www-ssl/pic/avatar/avatar496.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar497.gif b/www-ssl/pic/avatar/avatar497.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar498.gif b/www-ssl/pic/avatar/avatar498.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar499.gif b/www-ssl/pic/avatar/avatar499.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar5.gif b/www-ssl/pic/avatar/avatar5.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar50.gif b/www-ssl/pic/avatar/avatar50.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar51.gif b/www-ssl/pic/avatar/avatar51.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar52.gif b/www-ssl/pic/avatar/avatar52.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar53.gif b/www-ssl/pic/avatar/avatar53.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar54.gif b/www-ssl/pic/avatar/avatar54.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar55.gif b/www-ssl/pic/avatar/avatar55.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar56.gif b/www-ssl/pic/avatar/avatar56.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar57.gif b/www-ssl/pic/avatar/avatar57.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar58.gif b/www-ssl/pic/avatar/avatar58.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar59.gif b/www-ssl/pic/avatar/avatar59.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar6.gif b/www-ssl/pic/avatar/avatar6.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar60.gif b/www-ssl/pic/avatar/avatar60.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar61.gif b/www-ssl/pic/avatar/avatar61.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar62.gif b/www-ssl/pic/avatar/avatar62.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar63.gif b/www-ssl/pic/avatar/avatar63.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar64.gif b/www-ssl/pic/avatar/avatar64.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar65.gif b/www-ssl/pic/avatar/avatar65.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar66.gif b/www-ssl/pic/avatar/avatar66.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar67.gif b/www-ssl/pic/avatar/avatar67.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar68.gif b/www-ssl/pic/avatar/avatar68.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar69.gif b/www-ssl/pic/avatar/avatar69.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar7.gif b/www-ssl/pic/avatar/avatar7.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar70.gif b/www-ssl/pic/avatar/avatar70.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar71.gif b/www-ssl/pic/avatar/avatar71.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar72.gif b/www-ssl/pic/avatar/avatar72.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar73.gif b/www-ssl/pic/avatar/avatar73.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar74.gif b/www-ssl/pic/avatar/avatar74.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar75.gif b/www-ssl/pic/avatar/avatar75.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar76.gif b/www-ssl/pic/avatar/avatar76.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar77.gif b/www-ssl/pic/avatar/avatar77.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar78.gif b/www-ssl/pic/avatar/avatar78.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar79.gif b/www-ssl/pic/avatar/avatar79.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar8.gif b/www-ssl/pic/avatar/avatar8.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar80.gif b/www-ssl/pic/avatar/avatar80.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar81.gif b/www-ssl/pic/avatar/avatar81.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar82.gif b/www-ssl/pic/avatar/avatar82.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar83.gif b/www-ssl/pic/avatar/avatar83.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar84.gif b/www-ssl/pic/avatar/avatar84.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar85.gif b/www-ssl/pic/avatar/avatar85.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar86.gif b/www-ssl/pic/avatar/avatar86.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar87.gif b/www-ssl/pic/avatar/avatar87.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar88.gif b/www-ssl/pic/avatar/avatar88.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar89.gif b/www-ssl/pic/avatar/avatar89.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar9.gif b/www-ssl/pic/avatar/avatar9.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar90.gif b/www-ssl/pic/avatar/avatar90.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar91.gif b/www-ssl/pic/avatar/avatar91.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar92.gif b/www-ssl/pic/avatar/avatar92.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar93.gif b/www-ssl/pic/avatar/avatar93.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar94.gif b/www-ssl/pic/avatar/avatar94.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar95.gif b/www-ssl/pic/avatar/avatar95.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar96.gif b/www-ssl/pic/avatar/avatar96.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar97.gif b/www-ssl/pic/avatar/avatar97.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar98.gif b/www-ssl/pic/avatar/avatar98.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/avatar/avatar99.gif b/www-ssl/pic/avatar/avatar99.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/external.png b/www-ssl/pic/external.png old mode 100755 new mode 100644 diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/himmel.png b/www-ssl/pic/himmel.png old mode 100755 new mode 100644 diff --git a/www-ssl/pic/himmel_w.png b/www-ssl/pic/himmel_w.png old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/aerger2.gif b/www-ssl/pic/smiles/aerger2.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/alien.gif b/www-ssl/pic/smiles/alien.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/blush.gif b/www-ssl/pic/smiles/blush.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/boggle.gif b/www-ssl/pic/smiles/boggle.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/bounce.gif b/www-ssl/pic/smiles/bounce.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/bun.gif b/www-ssl/pic/smiles/bun.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/candycane.gif b/www-ssl/pic/smiles/candycane.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/cheesy.gif b/www-ssl/pic/smiles/cheesy.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/dead.gif b/www-ssl/pic/smiles/dead.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/depressed.gif b/www-ssl/pic/smiles/depressed.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/ginger.gif b/www-ssl/pic/smiles/ginger.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/hirsch1.gif b/www-ssl/pic/smiles/hirsch1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/huh.gif b/www-ssl/pic/smiles/huh.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_arrow.gif b/www-ssl/pic/smiles/icon_arrow.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_biggrin.gif b/www-ssl/pic/smiles/icon_biggrin.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_confused.gif b/www-ssl/pic/smiles/icon_confused.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_cool.gif b/www-ssl/pic/smiles/icon_cool.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_cry.gif b/www-ssl/pic/smiles/icon_cry.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_eek.gif b/www-ssl/pic/smiles/icon_eek.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_evil.gif b/www-ssl/pic/smiles/icon_evil.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_exclaim.gif b/www-ssl/pic/smiles/icon_exclaim.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_frown.gif b/www-ssl/pic/smiles/icon_frown.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_idea.gif b/www-ssl/pic/smiles/icon_idea.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_lol.gif b/www-ssl/pic/smiles/icon_lol.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_mad.gif b/www-ssl/pic/smiles/icon_mad.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_mrgreen.gif b/www-ssl/pic/smiles/icon_mrgreen.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_neutral.gif b/www-ssl/pic/smiles/icon_neutral.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_question.gif b/www-ssl/pic/smiles/icon_question.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_razz.gif b/www-ssl/pic/smiles/icon_razz.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_redface.gif b/www-ssl/pic/smiles/icon_redface.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_rolleyes.gif b/www-ssl/pic/smiles/icon_rolleyes.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_sad.gif b/www-ssl/pic/smiles/icon_sad.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_smile.gif b/www-ssl/pic/smiles/icon_smile.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_surprised.gif b/www-ssl/pic/smiles/icon_surprised.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_twisted.gif b/www-ssl/pic/smiles/icon_twisted.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/icon_wind.gif b/www-ssl/pic/smiles/icon_wind.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/koenig1.gif b/www-ssl/pic/smiles/koenig1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/laser1.gif b/www-ssl/pic/smiles/laser1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/love1.gif b/www-ssl/pic/smiles/love1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/moo.gif b/www-ssl/pic/smiles/moo.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/nuts.gif b/www-ssl/pic/smiles/nuts.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/robin.gif b/www-ssl/pic/smiles/robin.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sheep.gif b/www-ssl/pic/smiles/sheep.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sick.gif b/www-ssl/pic/smiles/sick.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sleep.gif b/www-ssl/pic/smiles/sleep.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/soppy.gif b/www-ssl/pic/smiles/soppy.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/stress.gif b/www-ssl/pic/smiles/stress.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/sweet.gif b/www-ssl/pic/smiles/sweet.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/tired.gif b/www-ssl/pic/smiles/tired.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/urgh.gif b/www-ssl/pic/smiles/urgh.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/winken1.gif b/www-ssl/pic/smiles/winken1.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/worm.gif b/www-ssl/pic/smiles/worm.gif old mode 100755 new mode 100644 diff --git a/www-ssl/pic/smiles/worry.gif b/www-ssl/pic/smiles/worry.gif old mode 100755 new mode 100644 diff --git a/www/404.php b/www/404.php index b9e5ed58..dc19cd26 100644 --- a/www/404.php +++ b/www/404.php @@ -1,3 +1,3 @@ - diff --git a/www/index.php b/www/index.php index 2e218040..9105555e 100644 --- a/www/index.php +++ b/www/index.php @@ -1,4 +1,3 @@ - - -- cgit v1.2.3-54-g00ecf From 550467697f8b3ae0b5d15d1d3a2bc3f83b003ff8 Mon Sep 17 00:00:00 2001 From: Philip Häusler 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 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 @@

    - " . Get_Text("back") . " "; - ?> + " . Get_Text("back") . " "; +?>

    @@ -13,27 +14,27 @@ - - - - -
    © copyleft - Kontakt -
    - - +
    +

    + © copyleft - Kontakt
    + This is hell. Really. +

    +
    + + --> - - + +include ("funktion_counter.php"); +mysql_close($con); +?> 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 @@ \n"; +echo "\n"; ?> - + -<?php echo $title; ?> - +<?php echo $title; ?> - Engelsystem + + + - - - -.css" /> + + +.css" /> \n"; + +if (isset ($reload)) { + if ($reload == "") + $reload = 3330; + + echo "\n\n"; } -if(isset($Page["AutoReload"])) - echo "\n\n"; +if (isset ($Page["AutoReload"])) + echo "\n\n"; echo "\n"; @@ -43,40 +40,31 @@ echo "\n"; ///////////////////////////////////////////////////////////////////////////////////////////// echo "\n"; -echo "
    \n\n"; - -if( isset($_SESSION['color']) && ($_SESSION['color']==6) ) -{ - echo "\"Unser\n"; -} -else -{ - echo "\"Unser\n"; -} -echo "
    \n\n"; - +echo '
    '; //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 "
    ". Get_Text("pub_messages_new1"). - " ". mysql_num_rows( $erg ). " ". - Get_Text("pub_messages_new2"). "

    "; - } +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 "
    " . Get_Text("pub_messages_new1") . + " " . mysql_num_rows($erg) . " " . + Get_Text("pub_messages_new2") . "

    "; + } } ?> - +
    @@ -84,41 +72,44 @@ if( $_SESSION['Menu'] =="L") include("menu.php");
    "; - if( strlen( $header) == 0 ) - echo "\n". Get_Text($Page["Name"]). "\n"; - else - echo "\n$header\n"; + +echo ""; +if (strlen($header) == 0) + echo "\n" . Get_Text($Page["Name"]) . "\n"; +else + echo "\n$header\n"; ?>

    -\n"; +if ($Page["CVS"] != "Y") { + echo "Du besitzt kein Rechte für diesen Bereich.
    \n"; - if(isset($_SESSION['oldurl'])) - echo "" . Get_Text("back") . " geht's zurück...\n"; - else - echo "" . Get_Text("back") . " geht's zurück...\n"; + if (isset ($_SESSION['oldurl'])) + echo "" . Get_Text("back") . " geht's zurück...\n"; + else + echo "" . Get_Text("back") . " geht's zurü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']))
    + + 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 @@ " . Get_Text("index_text1") . "

    \n"; echo "

    " . Get_Text("index_text2") . "

    \n"; echo "

    " . Get_Text("index_text3") . "

    \n"; - include "../../camp2011/includes/login_eingabefeld.php"; + include "../includes/login_eingabefeld.php"; echo "
    " . Get_Text("index_text4") . "
    "; - include "../../camp2011/includes/footer.php"; + include "../includes/footer.php"; ?> -- cgit v1.2.3-54-g00ecf 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 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 "
    "; + echo "
    " . mysql_result($Erg, $n, "Frage") . "
    "; + echo "
    " . mysql_result($Erg, $n, "Antwort") . "
    "; + echo "
    "; + } +} + +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-54-g00ecf From a537f4bf73101c467af3b01db32fcdb9fd0a91ce Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 14:48:31 +0200 Subject: bootstrapping --- www-ssl/admin/news.php | 15 +- www-ssl/css/base.css | 2 +- www-ssl/makeuser.php | 391 ++++++++++++++------------ www-ssl/nonpublic/auth.php | 59 ++-- www-ssl/nonpublic/einstellungen.php | 457 +++++++++++++++---------------- www-ssl/nonpublic/engelbesprechung.php | 40 +-- www-ssl/nonpublic/faq.php | 72 ++--- www-ssl/nonpublic/messages.php | 242 ++++++++-------- www-ssl/nonpublic/myschichtplan.php | 329 +++++++++++----------- www-ssl/nonpublic/myschichtplan_ical.php | 63 +++-- www-ssl/nonpublic/news_comments.php | 87 +++--- www-ssl/nonpublic/schichtplan.1.php | 27 +- www-ssl/nonpublic/schichtplan.2.php | 28 +- www-ssl/nonpublic/schichtplan.php | 360 ++++++++++++------------ www-ssl/nonpublic/schichtplan_add.php | 221 +++++++-------- www-ssl/nonpublic/schichtplan_beamer.php | 56 ++-- www-ssl/nonpublic/waeckliste.php | 28 +- www-ssl/nonpublic/wecken.php | 65 +++-- 18 files changed, 1292 insertions(+), 1250 deletions(-) diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php index f25eab93..b6d9dc69 100644 --- a/www-ssl/admin/news.php +++ b/www-ssl/admin/news.php @@ -1,9 +1,10 @@ diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index b6017ad2..0fe3e5a9 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -33,7 +33,7 @@ footer p { margin: 0 5%; } -td { +td, dt, dd { padding: 4px; } diff --git a/www-ssl/makeuser.php b/www-ssl/makeuser.php index 785de1e8..a67f4bd5 100644 --- a/www-ssl/makeuser.php +++ b/www-ssl/makeuser.php @@ -1,181 +1,214 @@ 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"). "
    ". Get_Text("makeuser_Hometown"). "
    ". Get_Text("makeuser_Passwort"). "*
    ". Get_Text("makeuser_Passwort2"). "*
     
    \n"; - echo "\n"; - Print_Text("makeuser_text3"); - } - - include "../includes/footer.php"; +require_once ('bootstrap.php'); + +$title = "Anmeldung zum Chaos-Engel"; +$header = ""; +$success = "none"; + +include "config/config.php"; +include "includes/header.php"; +include "config/config_db.php"; +include "includes/crypt.php"; + +if (isset ($_POST["send"])) { + $eNick = trim($_POST["Nick"]); + + if ($_POST["Alter"] == "") + $_POST["Alter"] = 0; + + // user vorhanden? + $SQLans = "SELECT UID FROM `User` WHERE `Nick`='" . $_POST["Nick"] . "'"; + $Ergans = mysql_query($SQLans, $con); + + if (strlen($_POST["Nick"]) < 2) + $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick2"); + elseif (mysql_num_rows($Ergans) > 0) $error = Get_Text("makeuser_error_nick1") . $_POST["Nick"] . Get_Text("makeuser_error_nick3"); + elseif (strlen($_POST["email"]) <= 6 && strstr($_POST["email"], "@") == FALSE && strstr($_POST["email"], ".") == false) $error = Get_Text("makeuser_error_mail"); + elseif (!is_numeric($_POST["Alter"])) $error = Get_Text("makeuser_error_Alter"); + elseif ($_POST["Passwort"] != $_POST["Passwort2"]) $error = Get_Text("makeuser_error_password1"); + elseif (strlen($_POST["Passwort"]) < 6) $error = Get_Text("makeuser_error_password2"); + else { + $_POST["Passwort"] = PassCrypt($_POST["Passwort"]); + unset ($_POST["Passwort2"]); + + $SQL = "INSERT INTO `User` (" . + "`Nick` , " . "`Name` , " . + "`Vorname`, " . "`Alter` , " . + "`Telefon`, " . "`DECT`, " . + "`Handy`, " . "`email`, " . + "`ICQ`, " . "`jabber`, " . + "`Size`, " . "`Passwort`, " . + "`Art` , " . "`kommentar`, " . + "`Hometown`," . "`CreateDate` ) " . + "VALUES ( " . + "'" . $_POST["Nick"] . "', " . "'" . $_POST["Name"] . "', " . + "'" . $_POST["Vorname"] . "', " . "'" . $_POST["Alter"] . "', " . + "'" . $_POST["Telefon"] . "', " . "'" . $_POST["DECT"] . "', " . + "'" . $_POST["Handy"] . "', " . "'" . $_POST["email"] . "', " . + "'" . $_POST["ICQ"] . "', " . "'" . $_POST["jabber"] . "', " . + "'" . $_POST["Size"] . "', " . "'" . $_POST["Passwort"] . "', " . + "'" . $_POST["Art"] . "', " . "'" . $_POST["kommentar"] . "', " . + "'" . $_POST["Hometown"] . "'," . "NOW());"; + $Erg = mysql_query($SQL, $con); + + if ($Erg != 1) { + echo Get_Text("makeuser_error_write1") . "
    \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") . "
    " . Get_Text("makeuser_Hometown") . "
    " . Get_Text("makeuser_Passwort") . "*
    " . Get_Text("makeuser_Passwort2") . "*
     
    \n"; + echo "
    \n"; + Print_Text("makeuser_text3"); +} + +include "includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php index 2bd6f86f..7d58988c 100644 --- a/www-ssl/nonpublic/auth.php +++ b/www-ssl/nonpublic/auth.php @@ -1,32 +1,43 @@ 'success', 'rights' => $CVS); - echo json_encode($msg); - } else - echo json_encode(array('status' => 'failed')); - } else - echo json_encode(array('status' => 'failed')); - } else - echo json_encode(array('status' => 'failed')); + // get CVS import Data + $SQL = "SELECT * FROM `UserCVS` WHERE `UID`='" . $UID . "'"; + $Erg_CVS = mysql_query($SQL, $con); + $CVS = mysql_fetch_array($Erg_CVS); + + $msg = array ( + 'status' => 'success', + 'rights' => $CVS + ); + echo json_encode($msg); + } else + echo json_encode(array ( + 'status' => 'failed' + )); + } else + echo json_encode(array ( + 'status' => 'failed' + )); +} else + echo json_encode(array ( + 'status' => 'failed' + )); ?> diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php index 6ddb093a..81dda869 100644 --- a/www-ssl/nonpublic/einstellungen.php +++ b/www-ssl/nonpublic/einstellungen.php @@ -1,12 +1,14 @@ \n\n"; - Print_Text(13); +require_once ('../bootstrap.php'); + +$title = "Himmel"; +$header = "Deine persönlichen Einstellungen"; +include "includes/header.php"; +include "includes/crypt.php"; + +if (!isset ($_POST["action"])) { + echo Get_Text("Hallo") . $_SESSION['Nick'] . ",
    \n\n"; + Print_Text(13); ?>
    @@ -69,7 +71,9 @@ @@ -83,7 +87,9 @@ if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { "> @@ -147,7 +153,11 @@ if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { @@ -155,224 +165,211 @@ if($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { \n
    \n
    \n\n"; - echo Get_Text('pub_einstellungen_PictureUpload') . "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; - echo "\n"; - echo "
    \n"; - } - - switch( GetPicturShow( $_SESSION['UID'])) { - case 'Y': - echo Get_Text('pub_einstellungen_PictureShow'). "
    "; - echo displayPictur($_SESSION['UID'], 0); - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    \n"; - break; - case 'N': - echo Get_Text('pub_einstellungen_PictureNoShow'). "
    "; - echo displayPictur($_SESSION['UID'], 0); - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    \n"; - echo "
    \n
    \n
    \n\n"; - case '': - echo "
    \n
    \n
    \n\n"; - echo Get_Text(22). "
    "; - echo "\n
    \n"; - echo "\n"; - echo "\n"; - echo "\n\n\n"; - echo "\n"; - echo "\n\n"; - echo "
    ". Get_Text(23). "
    \n"; - echo "  \n"; - echo "\n"; - echo "
    \n"; - echo "\n"; - echo "
    \n"; - break; - } //CASE - - } else { - switch ($_POST["action"]) { - case 'set': - if($_POST["new1"] == $_POST["new2"]) { - Print_Text(25); - $sql = "SELECT * FROM `User` WHERE `UID`='".$_SESSION['UID']. "'"; - $Erg = mysql_query($sql, $con); - - if(PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) { - Print_Text(26); - Print_Text(27); - $usql = "UPDATE `User` SET `Passwort`='". PassCrypt($_POST["new1"]). "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; - $Erg = mysql_query($usql, $con); - - if ($Erg==1) { - Print_Text(28); - } else { - Print_Text(29); - } - } else { - Print_Text(30); - } - } else { - Print_Text(31); - } - break; - - case 'colour': - - $chsql="UPDATE `User` SET ". - "`color`= '". $_POST["colourid"]. "', ". - "`Menu`= '". $_POST["eMenu"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - echo mysql_error($con); - $_SESSION['color']=$_POST["colourid"]; - $_SESSION['Menu']=$_POST["eMenu"]; - if ($Erg==1) { - Print_Text(32); - } else { - Print_Text(29); - } - break; - -case 'sprache': - - $chsql="UPDATE `User` SET `Sprache` = '". $_POST["language"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - $_SESSION['Sprache']=$_POST["language"]; - if ($Erg==1) { - Print_Text(33); - } else { - Print_Text(29); - } - break; - -case 'avatar': - $chsql="UPDATE `User` SET `Avatar`='". $_POST["eAvatar"]. "' WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - $_SESSION['Avatar']=$_POST["eAvatar"]; - if ($Erg==1) - Print_Text(34); - else - Print_Text(29); - break; - -case 'setUserData': - if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) - { - $chsql= "UPDATE `User` SET ". - "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". - "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". - "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". - "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". - "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". - "`Hometown`='". $_POST["Hometown"]. "', `Size`='". $_POST["Sizeid"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - } - else - { - $chsql= "UPDATE `User` SET ". - "`Nick`='". $_POST["eNick"]. "', `Name`='". $_POST["eName"]. "', ". - "`Vorname`='". $_POST["eVorname"]. "', `Alter`='". $_POST["eAlter"]. "', ". - "`Telefon`='". $_POST["eTelefon"]. "', `Handy`='". $_POST["eHandy"]. "', ". - "`DECT`='". $_POST["eDECT"]. "', `email`='". $_POST["eemail"]. "', ". - "`ICQ`='". $_POST["eICQ"]. "', `jabber`='". $_POST["ejabber"]."', ". - "`Hometown`='". $_POST["Hometown"]. "' ". - "WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - } - $Erg = mysql_query($chsql, $con); - - if ($Erg==1) - { - $_SESSION['Nick'] = $_POST["eNick"]; - $_SESSION['Name'] = $_POST["eName"]; - $_SESSION['Vorname'] = $_POST["eVorname"]; - $_SESSION['Alter'] = $_POST["eAlter"]; - $_SESSION['Telefon'] = $_POST["eTelefon"]; - $_SESSION['Handy'] = $_POST["eHandy"]; - $_SESSION['DECT'] = $_POST["eDECT"]; - $_SESSION['email'] = $_POST["eemail"]; - $_SESSION['ICQ'] = $_POST["eICQ"]; - $_SESSION['jabber'] = $_POST["ejabber"]; - $_SESSION['Hometown'] = $_POST["Hometown"]; - if( $_SESSION['CVS'][ "Change T_Shirt Size" ] == "Y" ) - { - $_SESSION['Size']=$_POST["Sizeid"]; - } - else if( $_SESSION['Size'] != $_POST["Sizeid"]) - { - array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); - } - - - Print_Text("pub_einstellungen_UserDateSaved"); - } - else - { - Print_Text(29); - echo mysql_error( $con); - } - break; - -case 'sendPicture': - if( $_FILES["file"]["size"] > 0) - { - if( ($_FILES["file"]["type"] == "image/jpeg") || - ($_FILES["file"]["type"] == "image/png") || - ($_FILES["file"]["type"] == "image/gif") ) - { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - - if( GetPicturShow( $_SESSION['UID']) == "") - $SQL = "INSERT INTO `UserPicture` ". - "( `UID`,`Bild`, `ContentType`, `show`) ". - "VALUES ('". $_SESSION['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET ". - "`Bild`='$data', ". - "`ContentType`='". $_FILES["file"]["type"]. "', ". - "`show`='N' ". - "WHERE `UID`='". $_SESSION['UID']. "'"; - - $res = mysql_query( $SQL, $con); - if( $res) - Print_Text("pub_einstellungen_send_OK"); - else - Print_Text("pub_einstellungen_send_KO"); - - echo "
    ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"]. ", " . $_FILES["file"]["size"]. " Byte)
    "; - } - else - Print_Text("pub_einstellungen_send_KO"); - } - else - Print_Text("pub_einstellungen_send_KO"); - break; - -case 'delPicture': - $chsql="DELETE FROM `UserPicture` WHERE `UID`='". $_SESSION['UID']. "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - if ($Erg==1) - Print_Text("pub_einstellungen_del_OK"); - else - Print_Text("pub_einstellungen_del_KO"); - Break; -} + + + if (get_cfg_var("file_uploads")) { + echo "
    \n
    \n
    \n\n"; + echo Get_Text('pub_einstellungen_PictureUpload') . "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "(max " . get_cfg_var("post_max_size") . "Byte)
    \n"; + echo "\n"; + echo "
    \n"; + } + + switch (GetPicturShow($_SESSION['UID'])) { + case 'Y' : + echo Get_Text('pub_einstellungen_PictureShow') . "
    "; + echo displayPictur($_SESSION['UID'], 0); + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    \n"; + break; + case 'N' : + echo Get_Text('pub_einstellungen_PictureNoShow') . "
    "; + echo displayPictur($_SESSION['UID'], 0); + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    \n"; + echo "
    \n
    \n
    \n\n"; + case '' : + echo "
    \n
    \n
    \n\n"; + echo Get_Text(22) . "
    "; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo "\n\n\n"; + echo "\n"; + echo "\n\n"; + echo "
    " . Get_Text(23) . "
    \n"; + echo "  \n"; + echo "\n"; + echo "
    \n"; + echo "\n"; + echo "
    \n"; + break; + } //CASE + +} else { + switch ($_POST["action"]) { + case 'set' : + if ($_POST["new1"] == $_POST["new2"]) { + Print_Text(25); + $sql = "SELECT * FROM `User` WHERE `UID`='" . $_SESSION['UID'] . "'"; + $Erg = mysql_query($sql, $con); + + if (PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) { + Print_Text(26); + Print_Text(27); + $usql = "UPDATE `User` SET `Passwort`='" . PassCrypt($_POST["new1"]) . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($usql, $con); + + if ($Erg == 1) { + Print_Text(28); + } else { + Print_Text(29); + } + } else { + Print_Text(30); + } + } else { + Print_Text(31); + } + break; + + case 'colour' : + + $chsql = "UPDATE `User` SET " . + "`color`= '" . $_POST["colourid"] . "', " . + "`Menu`= '" . $_POST["eMenu"] . "' " . + "WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + echo mysql_error($con); + $_SESSION['color'] = $_POST["colourid"]; + $_SESSION['Menu'] = $_POST["eMenu"]; + if ($Erg == 1) { + Print_Text(32); + } else { + Print_Text(29); + } + break; + + case 'sprache' : + + $chsql = "UPDATE `User` SET `Sprache` = '" . $_POST["language"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + $_SESSION['Sprache'] = $_POST["language"]; + if ($Erg == 1) { + Print_Text(33); + } else { + Print_Text(29); + } + break; + + case 'avatar' : + $chsql = "UPDATE `User` SET `Avatar`='" . $_POST["eAvatar"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + $_SESSION['Avatar'] = $_POST["eAvatar"]; + if ($Erg == 1) + Print_Text(34); + else + Print_Text(29); + break; + + case 'setUserData' : + if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { + $chsql = "UPDATE `User` SET " . + "`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " . + "`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " . + "`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " . + "`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " . + "`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " . + "`Hometown`='" . $_POST["Hometown"] . "', `Size`='" . $_POST["Sizeid"] . "' " . + "WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;"; + } else { + $chsql = "UPDATE `User` SET " . + "`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " . + "`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " . + "`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " . + "`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " . + "`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " . + "`Hometown`='" . $_POST["Hometown"] . "' " . + "WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;"; + } + $Erg = mysql_query($chsql, $con); + + if ($Erg == 1) { + $_SESSION['Nick'] = $_POST["eNick"]; + $_SESSION['Name'] = $_POST["eName"]; + $_SESSION['Vorname'] = $_POST["eVorname"]; + $_SESSION['Alter'] = $_POST["eAlter"]; + $_SESSION['Telefon'] = $_POST["eTelefon"]; + $_SESSION['Handy'] = $_POST["eHandy"]; + $_SESSION['DECT'] = $_POST["eDECT"]; + $_SESSION['email'] = $_POST["eemail"]; + $_SESSION['ICQ'] = $_POST["eICQ"]; + $_SESSION['jabber'] = $_POST["ejabber"]; + $_SESSION['Hometown'] = $_POST["Hometown"]; + if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { + $_SESSION['Size'] = $_POST["Sizeid"]; + } else + if ($_SESSION['Size'] != $_POST["Sizeid"]) { + array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); + } + + Print_Text("pub_einstellungen_UserDateSaved"); + } else { + Print_Text(29); + echo mysql_error($con); + } + break; + + case 'sendPicture' : + if ($_FILES["file"]["size"] > 0) { + if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + + if (GetPicturShow($_SESSION['UID']) == "") + $SQL = "INSERT INTO `UserPicture` " . + "( `UID`,`Bild`, `ContentType`, `show`) " . + "VALUES ('" . $_SESSION['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET " . + "`Bild`='$data', " . + "`ContentType`='" . $_FILES["file"]["type"] . "', " . + "`show`='N' " . + "WHERE `UID`='" . $_SESSION['UID'] . "'"; + + $res = mysql_query($SQL, $con); + if ($res) + Print_Text("pub_einstellungen_send_OK"); + else + Print_Text("pub_einstellungen_send_KO"); + + echo "
    ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"] . ", " . $_FILES["file"]["size"] . " Byte)
    "; + } else + Print_Text("pub_einstellungen_send_KO"); + } else + Print_Text("pub_einstellungen_send_KO"); + break; + + case 'delPicture' : + $chsql = "DELETE FROM `UserPicture` WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + if ($Erg == 1) + Print_Text("pub_einstellungen_del_OK"); + else + Print_Text("pub_einstellungen_del_KO"); + Break; + } } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php index 0f2892b7..7ff684d4 100644 --- a/www-ssl/nonpublic/engelbesprechung.php +++ b/www-ssl/nonpublic/engelbesprechung.php @@ -1,27 +1,29 @@ " . mysql_result($Erg, $n, "Betreff") . ""; +// anzahl zeilen +$Zeilen = mysql_num_rows($Erg); - // Show Admin Page - if($_SESSION['CVS']["admin/news.php"] == "Y") - echo " [edit]"; +for ($n = 0; $n < $Zeilen; $n++) { + if (mysql_result($Erg, $n, "Treffen") == "1") { + echo "

    " . mysql_result($Erg, $n, "Betreff") . ""; - echo "
       ".mysql_result($Erg, $n, "Datum").", "; - echo UID2Nick(mysql_result($Erg, $n, "UID"))."

    \n"; - echo "

    ".nl2br(mysql_result($Erg, $n, "Text"))."

    \n"; - } - } + // Show Admin Page + if ($_SESSION['CVS']["admin/news.php"] == "Y") + echo " [edit]"; - include ("../../../camp2011/includes/footer.php"); + echo "
       " . mysql_result($Erg, $n, "Datum") . ", "; + echo UID2Nick(mysql_result($Erg, $n, "UID")) . "

    \n"; + echo "

    " . nl2br(mysql_result($Erg, $n, "Text")) . "

    \n"; + } +} + +include ("includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php index 7f768282..fcc17158 100644 --- a/www-ssl/nonpublic/faq.php +++ b/www-ssl/nonpublic/faq.php @@ -1,11 +1,13 @@

    @@ -14,56 +16,58 @@ ">
    ".Get_Text(37)."

    \n".nl2br($_POST["frage"])."

    \n".Get_Text(38)."
    \n"; + echo "" . Get_Text(37) . "

    \n" . nl2br($_POST["frage"]) . "

    \n" . Get_Text(38) . "
    \n"; -$SQL = "INSERT INTO `Questions` VALUES ('', '".$_SESSION['UID']."', '". $_POST["frage"]. "', '', '')"; -$Erg = mysql_query($SQL, $con); + $SQL = "INSERT INTO `Questions` VALUES ('', '" . $_SESSION['UID'] . "', '" . $_POST["frage"] . "', '', '')"; + $Erg = mysql_query($SQL, $con); } // Bisherige Anfragen: -echo "
    \n".Get_Text(39)."
    \n"; +echo "
    \n" . Get_Text(39) . "
    \n"; echo "
    \n"; -echo "
    ".Get_Text(40)."
    \n"; +echo "
    " . Get_Text(40) . "
    \n"; -$SQL = "SELECT * FROM `Questions` WHERE `UID` = ". $_SESSION['UID']. " AND `AID`='0' ORDER BY 'QID' DESC"; +$SQL = "SELECT * FROM `Questions` WHERE `UID` = " . $_SESSION['UID'] . " AND `AID`='0' ORDER BY 'QID' DESC"; $Erg = mysql_query($SQL, $con); // anzahl zeilen -$Zeilen = mysql_num_rows($Erg); +$Zeilen = mysql_num_rows($Erg); -if ($Zeilen==0){ - Print_Text(41); +if ($Zeilen == 0) { + Print_Text(41); } else { - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; -// Es gibt ja noch keine Antwort: -// echo "

    ".nl2br(mysql_result($Erg, $n, "Answer"))."

    \n"; - echo "\n
    ---
    "; - } + for ($n = 0; $n < $Zeilen; $n++) { + echo "

    " . nl2br(mysql_result($Erg, $n, "Question")) . "
    \n"; + // Es gibt ja noch keine Antwort: + // echo "

    ".nl2br(mysql_result($Erg, $n, "Answer"))."

    \n"; + echo "\n
    ---
    "; + } } echo "
    \n"; -echo "
    ".Get_Text(42)."
    \n"; -$SQL = "SELECT * FROM `Questions` WHERE `UID`='".$_SESSION['UID']."' and `AID`<>'0' ORDER BY 'QID' DESC"; +echo "
    " . Get_Text(42) . "
    \n"; +$SQL = "SELECT * FROM `Questions` WHERE `UID`='" . $_SESSION['UID'] . "' and `AID`<>'0' ORDER BY 'QID' DESC"; $Erg = mysql_query($SQL, $con); // anzahl zeilen -$Zeilen = mysql_num_rows($Erg); +$Zeilen = mysql_num_rows($Erg); -if ($Zeilen==0){ - Print_Text(41); +if ($Zeilen == 0) { + Print_Text(41); } else { - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "

    ".nl2br(mysql_result($Erg, $n, "Question"))."
    \n"; - echo "

    ".nl2br(mysql_result($Erg, $n, "Answer")). - "@". UID2Nick(mysql_result($Erg, $n, "AID"))."\n"; - echo "\n
    ---
    "; - } + for ($n = 0; $n < $Zeilen; $n++) { + echo "

    " . nl2br(mysql_result($Erg, $n, "Question")) . "
    \n"; + echo "

    " . nl2br(mysql_result($Erg, $n, "Answer")) . + "@" . UID2Nick(mysql_result($Erg, $n, "AID")) . "\n"; + echo "\n
    ---
    "; + } } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php index c85bf669..4868136d 100644 --- a/www-ssl/nonpublic/messages.php +++ b/www-ssl/nonpublic/messages.php @@ -1,122 +1,124 @@ \n"; - echo Get_Text("pub_messages_text1"). "

    \n"; - - //show exist Messages - $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; - $erg = mysql_query($SQL, $con); - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - for($i = 0; $i < mysql_num_rows($erg); $i++) { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - - // send Messeges - echo ""; - echo "\n"; - echo "\n"; - echo "\n"; - - // Listet alle Nicks auf - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - - echo "
    ". Get_Text("pub_messages_Datum"). "". Get_Text("pub_messages_Von"). "". Get_Text("pub_messages_An"). "". Get_Text("pub_messages_Text"). "
    " . mysql_result($erg, $i, "Datum") . "" . UID2Nick(mysql_result($erg, $i, "SUID")) . "" . UID2Nick(mysql_result($erg, $i, "RUID")) . "" . mysql_result($erg, $i, "Text") . ""; - - if(mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { - echo "" . Get_Text("pub_messages_DelMsg") . ""; - - if(mysql_result($erg, $i, "isRead") == "N") - echo "" . Get_Text("pub_messages_MarkRead") . ""; - } else { - if(mysql_result($erg, $i, "isRead") == "N") - echo Get_Text("pub_messages_NotRead"); - } - - echo "
    \n"; - break; - - case "SendMsg": - echo Get_Text("pub_messages_Send1") . "...
    \n"; - - $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (". - "'" . gmdate("Y-m-j H:i:s", time()) . "', ". - "'" . $_SESSION["UID"]. "', ". - "'" . $_POST["RUID"]."', ". - "'" . $_POST["Text"]. "');"; - - $Erg = mysql_query($SQL, $con); - - if($Erg == 1) - echo Get_Text("pub_messages_Send_OK") . "\n"; - else - echo Get_Text("pub_messages_Send_Error") . "...\n(". mysql_error($con). ")"; - break; - - case "MarkRead": - $SQL = "UPDATE `Messages` SET `isRead` = 'Y' ". - "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID`='". $_SESSION["UID"]. "' ". - "LIMIT 1 ;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_MarkRead_OK"). "\n"; - else - echo Get_Text("pub_messages_MarkRead_KO"). "...\n(". mysql_error($con). ")"; - break; - - case "DelMsg": - $SQL = "DELETE FROM `Messages` ". - "WHERE `Datum` = '". $_GET["Datum"]. "' AND `RUID` ='". $_SESSION["UID"]. "' ". - "LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_DelMsg_OK"). "\n"; - else - echo Get_Text("pub_messages_DelMsg_KO"). "...\n(". mysql_error($con). ")"; - break; - - default: - echo Get_Text("pub_messages_NoCommand"); - } - - include "../../../camp2011/includes/footer.php"; +require_once ('../bootstrap.php'); + +$title = "Himmel"; +$header = ""; + +include "includes/header.php"; + +if (!isset ($_GET["action"])) + $_GET["action"] = "start"; + +switch ($_GET["action"]) { + case "start" : + echo Get_Text("Hello") . $_SESSION['Nick'] . ",
    \n"; + echo Get_Text("pub_messages_text1") . "

    \n"; + + //show exist Messages + $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; + $erg = mysql_query($SQL, $con); + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + for ($i = 0; $i < mysql_num_rows($erg); $i++) { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + + // send Messeges + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + + // Listet alle Nicks auf + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + + echo "
    " . Get_Text("pub_messages_Datum") . "" . Get_Text("pub_messages_Von") . "" . Get_Text("pub_messages_An") . "" . Get_Text("pub_messages_Text") . "
    " . mysql_result($erg, $i, "Datum") . "" . UID2Nick(mysql_result($erg, $i, "SUID")) . "" . UID2Nick(mysql_result($erg, $i, "RUID")) . "" . mysql_result($erg, $i, "Text") . ""; + + if (mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { + echo "" . Get_Text("pub_messages_DelMsg") . ""; + + if (mysql_result($erg, $i, "isRead") == "N") + echo "" . Get_Text("pub_messages_MarkRead") . ""; + } else { + if (mysql_result($erg, $i, "isRead") == "N") + echo Get_Text("pub_messages_NotRead"); + } + + echo "
    \n"; + break; + + case "SendMsg" : + echo Get_Text("pub_messages_Send1") . "...
    \n"; + + $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (" . + "'" . gmdate("Y-m-j H:i:s", time()) . "', " . + "'" . $_SESSION["UID"] . "', " . + "'" . $_POST["RUID"] . "', " . + "'" . $_POST["Text"] . "');"; + + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_Send_OK") . "\n"; + else + echo Get_Text("pub_messages_Send_Error") . "...\n(" . mysql_error($con) . ")"; + break; + + case "MarkRead" : + $SQL = "UPDATE `Messages` SET `isRead` = 'Y' " . + "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID`='" . $_SESSION["UID"] . "' " . + "LIMIT 1 ;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_MarkRead_OK") . "\n"; + else + echo Get_Text("pub_messages_MarkRead_KO") . "...\n(" . mysql_error($con) . ")"; + break; + + case "DelMsg" : + $SQL = "DELETE FROM `Messages` " . + "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID` ='" . $_SESSION["UID"] . "' " . + "LIMIT 1;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_DelMsg_OK") . "\n"; + else + echo Get_Text("pub_messages_DelMsg_KO") . "...\n(" . mysql_error($con) . ")"; + break; + + default : + echo Get_Text("pub_messages_NoCommand"); +} + +include "includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/myschichtplan.php b/www-ssl/nonpublic/myschichtplan.php index 6bbabbb6..5d7b5da3 100644 --- a/www-ssl/nonpublic/myschichtplan.php +++ b/www-ssl/nonpublic/myschichtplan.php @@ -1,58 +1,61 @@ \n"; - echo Get_Text("pub_mywake_beschreibung1")."
    \n"; - echo Get_Text("pub_mywake_beschreibung2")."

    \n"; - echo Get_Text("pub_mywake_beschreibung3").($LETZTES_AUSTRAGEN). - Get_Text("pub_mywake_beschreibung4")."

    \n"; - - $USER_ID = $_SESSION['UID']; - - if( $_SESSION['CVS'][ "admin/schichtplan.php" ] == "Y" ) { - if( !isset( $_GET["UIDs"]) ) - $_GET["UIDs"] = $_SESSION['UID']; - else - $USER_ID = $_GET["UIDs"]; - - echo "

    "; - - echo "Liste von anzeigen.\n"; - echo mysql_error($con); - - echo "\n"; - - echo "
    "; - } - - $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` ". - "INNER JOIN `ShiftEntry` ". - "ON `Shifts`.`SID`=`ShiftEntry`.`SID` ". - "WHERE `ShiftEntry`.`UID`='$USER_ID' ". - "ORDER BY `DateS`"; - $erg = mysql_query($SQL, $con); - - ?> + +// Eigener Schichtplan +require_once ('../bootstrap.php'); + +$title = "Himmel"; +$header = "Mein Schichtplan"; + +include ("includes/header.php"); +include ("includes/funktionen.php"); +include ("includes/funktion_schichtplan.php"); +include ("includes/funktion_schichtplan_aray.php"); + +if (!isset ($_GET["action"])) { + echo Get_Text("Hello") . $_SESSION['Nick'] . ",
    \n"; + echo Get_Text("pub_mywake_beschreibung1") . "
    \n"; + echo Get_Text("pub_mywake_beschreibung2") . "

    \n"; + echo Get_Text("pub_mywake_beschreibung3") . ($LETZTES_AUSTRAGEN) . + Get_Text("pub_mywake_beschreibung4") . "

    \n"; + + $USER_ID = $_SESSION['UID']; + + if ($_SESSION['CVS']["admin/schichtplan.php"] == "Y") { + if (!isset ($_GET["UIDs"])) + $_GET["UIDs"] = $_SESSION['UID']; + else + $USER_ID = $_GET["UIDs"]; + + echo "
    "; + + echo "Liste von anzeigen.\n"; + echo mysql_error($con); + + echo "\n"; + + echo "
    "; + } + + $SQL = "SELECT *, `ShiftEntry`.`Comment`, `ShiftEntry`.`TID` FROM `Shifts` " . + "INNER JOIN `ShiftEntry` " . + "ON `Shifts`.`SID`=`ShiftEntry`.`SID` " . + "WHERE `ShiftEntry`.`UID`='$USER_ID' " . + "ORDER BY `DateS`"; + $erg = mysql_query($SQL, $con); +?> @@ -65,119 +68,111 @@ "; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten - //// selber noch austragen zu koennen... - $schichtdate = mysql_result( $erg, $i, "DateS" ); - ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); - $info["year"] = $res[1]; - $info["month"] = $res[2]; - $info["day"] = $res[3]; - $info["hour"] = $res[4]; - $info["min"] = $res[5]; - $info["sec"] = $res[6]; - $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); - $lastAustragen = $LETZTES_AUSTRAGEN*3600; - $nowdate = time(); - // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen - // noch möglich sein - if( $schichtdatum > ($lastAustragen + $nowdate) ) - echo "\n"; - else - echo "\n"; - - echo "\n"; - } -echo "
    ". substr(mysql_result( $erg, $i, "DateS" ), 0, 10). "". substr(mysql_result( $erg, $i, "DateS" ), 11). "". mysql_result( $erg, $i, "Len" ). " h". mysql_result( $erg, $i, "Man" ). "". $RoomID[mysql_result( $erg, $i, "RID" )]. "
    \n". - "(". TID2Type(mysql_result( $erg, $i, "TID" )).Get_Text("inc_schicht_engel"). ")". - "
    \n". 
-         mysql_result( $erg, $i, "Comment" ). 
-         "\n
    \n"; - echo "
    # vi #    		 ". - Get_Text("pub_mywake_austragen")."". Get_Text("pub_mywake_austragen_n_c"). "
    \n\n"; - -if( $_SESSION['CVS'][ "nonpublic/myschichtplan_ical.php" ] == "Y" ) -{ - echo "
    ". Get_Text("pub_myschichtplan_ical"). "\n"; -} -} -else -{ - If( $_GET["action"] == "austragen" ) - { - echo Get_Text("pub_mywake_delate1")."
    \n"; - - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "')"; - $Erg = mysql_query($sql, $con); - - $schichtdate = mysql_result( $Erg, 0, "DateS" ); - ereg( "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res ); - $info["year"] = $res[1]; - $info["month"] = $res[2]; - $info["day"] = $res[3]; - $info["hour"] = $res[4]; - $info["min"] = $res[5]; - $info["sec"] = $res[6]; - $schichtdatum = (mktime($info["hour"],$info["min"],$info["sec"],$info["month"],$info["day"],$info["year"])); - $lastAustragen = $LETZTES_AUSTRAGEN*3600; - $nowdate = time(); - // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen - // noch möglich sein - if( $schichtdatum > ($lastAustragen + $nowdate) ) - { - $sql2 = "UPDATE `ShiftEntry` ". - "SET `UID` = '0', `Comment` = NULL ". - "WHERE `SID` = '". $_GET["SID"]. "' AND `UID` = '". $_SESSION['UID']. "' LIMIT 1;"; - $Erg2 = mysql_query($sql2, $con); - if ($Erg2 == 1) - echo Get_Text("pub_mywake_add_ok"). "\n"; - else - echo Get_Text("pub_mywake_add_ko"). "\n"; - } - else - echo Get_Text("pub_mywake_after"). "\n"; - } - elseif( $_GET["action"] == "edit" ) - { - echo Get_Text("pub_myshift_Edit_Text1"). "\n"; - - $sql = "SELECT * FROM `ShiftEntry` WHERE "; - $sql.= "(`SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "')"; - $Erg = mysql_query($sql, $con); - - echo "
    \n"; - echo "

    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - } - elseif( $_GET["action"] == "editSave" ) - { - echo Get_Text("pub_myshift_EditSave_Text1"). "
    \n"; - $sql = "UPDATE `ShiftEntry` ". - "SET `Comment` = '". $_GET["newtext"]. "' ". - "WHERE `SID`='". $_GET["SID"]. "' AND `UID`='". $_SESSION['UID']. "' LIMIT 1;"; - $Erg = mysql_query($sql, $con); - if ($Erg == 1) - echo " ...". Get_Text("pub_myshift_EditSave_OK"). "\n"; - else - echo " ...". Get_Text("pub_myshift_EditSave_KO"). "\n"; - SetHeaderGo2Back(); - } + for ($i = 0; $i < mysql_num_rows($erg); $i++) { + echo ""; + + echo "" . substr(mysql_result($erg, $i, "DateS"), 0, 10) . "\n"; + echo "" . substr(mysql_result($erg, $i, "DateS"), 11) . "\n"; + echo "" . mysql_result($erg, $i, "Len") . " h\n"; + echo "" . mysql_result($erg, $i, "Man") . "\n"; + echo "" . $RoomID[mysql_result($erg, $i, "RID")] . "
    \n" . + "(" . TID2Type(mysql_result($erg, $i, "TID")) . Get_Text("inc_schicht_engel") . ")" . + "\n"; + echo "
    \n" .
+		mysql_result($erg, $i, "Comment") .
+		"\n
    \n"; + echo "
    # vi #\n"; + + // bis $LETZTES_AUSTRAGEN (aus dem config-file) soll es moeglich sein, seine Schichten + //// selber noch austragen zu koennen... + $schichtdate = mysql_result($erg, $i, "DateS"); + ereg("^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res); + $info["year"] = $res[1]; + $info["month"] = $res[2]; + $info["day"] = $res[3]; + $info["hour"] = $res[4]; + $info["min"] = $res[5]; + $info["sec"] = $res[6]; + $schichtdatum = (mktime($info["hour"], $info["min"], $info["sec"], $info["month"], $info["day"], $info["year"])); + $lastAustragen = $LETZTES_AUSTRAGEN * 3600; + $nowdate = time(); + // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen + // noch m�glich sein + if ($schichtdatum > ($lastAustragen + $nowdate)) + echo " " . + Get_Text("pub_mywake_austragen") . "\n"; + else + echo "" . Get_Text("pub_mywake_austragen_n_c") . "\n"; + + echo "\n"; + } + echo "\n\n"; + + if ($_SESSION['CVS']["nonpublic/myschichtplan_ical.php"] == "Y") { + echo "
    " . Get_Text("pub_myschichtplan_ical") . "\n"; + } + +} else { + If ($_GET["action"] == "austragen") { + echo Get_Text("pub_mywake_delate1") . "
    \n"; + + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "')"; + $Erg = mysql_query($sql, $con); + + $schichtdate = mysql_result($Erg, 0, "DateS"); + ereg("^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})", $schichtdate, $res); + $info["year"] = $res[1]; + $info["month"] = $res[2]; + $info["day"] = $res[3]; + $info["hour"] = $res[4]; + $info["min"] = $res[5]; + $info["sec"] = $res[6]; + $schichtdatum = (mktime($info["hour"], $info["min"], $info["sec"], $info["month"], $info["day"], $info["year"])); + $lastAustragen = $LETZTES_AUSTRAGEN * 3600; + $nowdate = time(); + // wenn Schichtbeginn > jetziges Datum + $LETZTES_AUSTRAGEN - Stunden soll ein Austragen + // noch m�glich sein + if ($schichtdatum > ($lastAustragen + $nowdate)) { + $sql2 = "UPDATE `ShiftEntry` " . + "SET `UID` = '0', `Comment` = NULL " . + "WHERE `SID` = '" . $_GET["SID"] . "' AND `UID` = '" . $_SESSION['UID'] . "' LIMIT 1;"; + $Erg2 = mysql_query($sql2, $con); + if ($Erg2 == 1) + echo Get_Text("pub_mywake_add_ok") . "\n"; + else + echo Get_Text("pub_mywake_add_ko") . "\n"; + } else + echo Get_Text("pub_mywake_after") . "\n"; + } + elseif ($_GET["action"] == "edit") { + echo Get_Text("pub_myshift_Edit_Text1") . "\n"; + + $sql = "SELECT * FROM `ShiftEntry` WHERE "; + $sql .= "(`SID`='" . $_GET["SID"] . "' AND `UID`='" . $_SESSION['UID'] . "')"; + $Erg = mysql_query($sql, $con); + + echo "
    \n"; + echo "

    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + } + elseif ($_GET["action"] == "editSave") { + echo Get_Text("pub_myshift_EditSave_Text1") . "
    \n"; + $sql = "UPDATE `ShiftEntry` " . + "SET `Comment` = '" . $_GET["newtext"] . "' " . + "WHERE `SID`='" . $_GET["SID"] . "' AND `UID`='" . $_SESSION['UID'] . "' LIMIT 1;"; + $Erg = mysql_query($sql, $con); + if ($Erg == 1) + echo " ..." . Get_Text("pub_myshift_EditSave_OK") . "\n"; + else + echo " ..." . Get_Text("pub_myshift_EditSave_KO") . "\n"; + SetHeaderGo2Back(); + } } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/myschichtplan_ical.php b/www-ssl/nonpublic/myschichtplan_ical.php index 928f0c86..ff74fef0 100644 --- a/www-ssl/nonpublic/myschichtplan_ical.php +++ b/www-ssl/nonpublic/myschichtplan_ical.php @@ -1,52 +1,51 @@ diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php index b90d5a82..db95ec8c 100644 --- a/www-ssl/nonpublic/news_comments.php +++ b/www-ssl/nonpublic/news_comments.php @@ -1,26 +1,28 @@
    "; - SetHeaderGo2Back(); - } - } - - $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='". $_GET["nid"]. "' ORDER BY 'ID'"; - $Erg = mysql_query($SQL, $con); - echo mysql_error( $con); - - // anzahl zeilen - $news_rows = mysql_num_rows($Erg); +include ("includes/header.php"); + +if (isset ($_GET["nid"])) { + if (isset ($_GET["text"])) { + $ch_sql = "INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) " . + "VALUES ('" . $_GET["nid"] . "', '" . date("Y-m-d H:i:s") . "', '" . $_GET["text"] . "', '" . $_SESSION["UID"] . "')"; + $Erg = mysql_query($ch_sql, $con); + + if ($Erg == 1) { + echo "Eintrag wurde gespeichert

    "; + SetHeaderGo2Back(); + } + } + + $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='" . $_GET["nid"] . "' ORDER BY 'ID'"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + // anzahl zeilen + $news_rows = mysql_num_rows($Erg); ?> @@ -33,26 +35,27 @@ if(isset($_GET["nid"])) { "; - echo "\t\t"; - echo "\t\t"; - echo ""; - echo "\t"; - echo "\t\t"; - echo ""; -} -echo "
    "; - echo mysql_result($Erg, $n, "Datum"); - echo "\t\t"; - echo UID2Nick(mysql_result($Erg, $n, "UID")); - // avatar anzeigen? - echo DisplayAvatar (mysql_result($Erg, $n, "UID")); - echo "\t\t
    "; - echo nl2br(mysql_result($Erg, $n, "Text"))."\n"; - echo "\t\t
    "; + for ($n = 0; $n < $news_rows; $n++) { + echo "\t"; + echo "\t\t"; + echo mysql_result($Erg, $n, "Datum"); + echo "\t\t"; + echo "\t\t"; + echo UID2Nick(mysql_result($Erg, $n, "UID")); + // avatar anzeigen? + echo DisplayAvatar(mysql_result($Erg, $n, "UID")); + echo "\t\t"; + echo ""; + echo "\t"; + echo "\t\t"; + echo nl2br(mysql_result($Erg, $n, "Text")) . "\n"; + echo "\t\t"; + echo ""; + } + + echo ""; ?>
    @@ -75,11 +78,9 @@ echo ""; diff --git a/www-ssl/nonpublic/schichtplan.1.php b/www-ssl/nonpublic/schichtplan.1.php index 1ed4d32f..9c99c6ca 100644 --- a/www-ssl/nonpublic/schichtplan.1.php +++ b/www-ssl/nonpublic/schichtplan.1.php @@ -1,21 +1,20 @@

     Tage

    $Datum\n"; -} //function Printlink( - -if( isset ($VeranstaltungsTage)) - foreach( $VeranstaltungsTage as $k => $v) - Printlink( $v); +include ("includes/funktion_schichtplan_aray.php"); +function Printlink($Datum) { + GLOBAL $raum; + echo "\t
  • $Datum
    • \n"; +} //function Printlink( +if (isset ($VeranstaltungsTage)) + foreach ($VeranstaltungsTage as $k => $v) + Printlink($v); ?> diff --git a/www-ssl/nonpublic/schichtplan.2.php b/www-ssl/nonpublic/schichtplan.2.php index d0193178..92443e13 100644 --- a/www-ssl/nonpublic/schichtplan.2.php +++ b/www-ssl/nonpublic/schichtplan.2.php @@ -1,22 +1,22 @@

     Raumübersicht

    ". - $RoomEntry["Name"]. "\n"; - else - echo "\t
  • ". - $RoomEntry["Name"]. "
    • \n"; - } +if (isset ($Room)) + foreach ($Room as $RoomEntry) { + if (isset ($ausdatum)) + echo "\t
  • " . + $RoomEntry["Name"] . "
    • \n"; + else + echo "\t
  • " . + $RoomEntry["Name"] . "
    • \n"; + } echo "
    "; -if(isset($ausdatum)) - echo "
  • alle
    • "; +if (isset ($ausdatum)) + echo "
  • alle
    • "; else - echo "
  • alle
    • "; + echo "
  • alle
    • "; ?> diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php index e8f8f02a..766d6996 100644 --- a/www-ssl/nonpublic/schichtplan.php +++ b/www-ssl/nonpublic/schichtplan.php @@ -1,200 +1,178 @@ $v) { - if(substr($k, 0, 5) == "raum_") { - $raum = $raum. ";". $v; - } - } - } - } - - include ("../../../camp2011/includes/header.php"); - include ("../../../camp2011/includes/funktionen.php"); - include ("../../../camp2011/includes/funktion_schichtplan.php"); - include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); - - echo Get_Text("Hello").$_SESSION['Nick'].",
    ". - Get_Text("pub_schicht_beschreibung"). "

    "; - - function ShowSwitchDay() { - global $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum; - - echo "\n\n\n"; - - if( isset($VeranstaltungsTage)) - foreach( $VeranstaltungsTage as $k => $v) - if( $ausdatum == $v) - { - if( $k > 0) - echo "\t\t\t\n"; - if( $k < $VeranstaltungsTageMax) - echo "\t\t\t\n"; - } - echo "\n\n
    ". - "". $VeranstaltungsTage[$k-1]. "". - "". $VeranstaltungsTage[$k+1]. "
    "; +require_once ('../bootstrap.php'); + +$title = "Himmel"; +$header = "Schichtpläne"; +$submenus = 2; + +if (isset ($_GET["ausdatum"])) + $ausdatum = $_GET["ausdatum"]; +if (isset ($_GET["raum"])) { + $raum = $_GET["raum"]; + + if ($raum == -1 && isset ($_GET["show"])) { + $raum = ""; + foreach ($_GET as $k => $v) { + if (substr($k, 0, 5) == "raum_") { + $raum = $raum . ";" . $v; + } + } + } +} + +include ("includes/header.php"); +include ("includes/funktionen.php"); +include ("includes/funktion_schichtplan.php"); +include ("includes/funktion_schichtplan_aray.php"); + +echo Get_Text("Hello") . $_SESSION['Nick'] . ",
    " . +Get_Text("pub_schicht_beschreibung") . "

    "; + +function ShowSwitchDay() { + global $VeranstaltungsTage, $VeranstaltungsTageMax, $ausdatum, $raum; + + echo "\n\n\n"; + + if (isset ($VeranstaltungsTage)) + foreach ($VeranstaltungsTage as $k => $v) + if ($ausdatum == $v) { + if ($k > 0) + echo "\t\t\t\n"; + if ($k < $VeranstaltungsTageMax) + echo "\t\t\t\n"; + } + echo "\n\n
    " . + "" . $VeranstaltungsTage[$k -1] . "" . + "" . $VeranstaltungsTage[$k +1] . "
    "; } // wenn kein Datum gesetzt ist (die Seite zum ersten mal aufgerufen wird), // das Datum auf den ersten Tag setzen... -if( !isset($ausdatum) ) -{ - $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '". gmdate("Y-m-d", time()+$gmdateOffset). "%' ORDER BY `DateS`"; -// $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`"; - $Erg = mysql_query($sql, $con); - if( mysql_num_rows( $Erg ) == 0 ) - { - $sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1"; - $Erg = mysql_query($sql, $con); - } - if( mysql_num_rows( $Erg ) > 0 ) - $ausdatum = substr(mysql_result($Erg,0,"DateS"),0,10); - else - $ausdatum = gmdate("Y-m-d", time()+$gmdateOffset); +if (!isset ($ausdatum)) { + $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '" . gmdate("Y-m-d", time() + $gmdateOffset) . "%' ORDER BY `DateS`"; + // $sql = "SELECT `DateS` FROM `Shifts` WHERE `DateS` like '2004-12-29%' ORDER BY `DateS`"; + $Erg = mysql_query($sql, $con); + if (mysql_num_rows($Erg) == 0) { + $sql = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` ASC LIMIT 0, 1"; + $Erg = mysql_query($sql, $con); + } + if (mysql_num_rows($Erg) > 0) + $ausdatum = substr(mysql_result($Erg, 0, "DateS"), 0, 10); + else + $ausdatum = gmdate("Y-m-d", time() + $gmdateOffset); } - - -if ( !isset($raum) ) -{ - // Ausgabe wenn kein Raum Ausgewählt: - echo Get_Text("pub_schicht_auswahl_raeume"). "

    \n"; - - if( isset($Room)) - { - echo "
    \n"; - foreach( $Room as $RoomEntry ) - { - echo "\t
  • "; - echo "". $RoomEntry["Name"]. ""; - echo "
    • \n"; - } - echo ""; - echo ""; - echo "\n"; - echo "
    \n"; - } - - echo "

    "; - echo Get_Text("pub_schicht_alles_1"). " ". - Get_Text("pub_schicht_alles_2"). " ".Get_Text("pub_schicht_alles_3"); - echo "\n

    \n\n"; - echo "
    \n\n"; - echo Get_Text("pub_schicht_EmptyShifts"). "\n"; - - - // zeit die naesten freien schichten - showEmptyShifts(); -} -else -{ // Wenn einraum Ausgewählt ist: - if( $raum == -1 ) - echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; - elseif( substr( $raum, 0, 1) == ";" ) - echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":

    "; - else - echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. - Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "

    "; - - ShowSwitchDay(); - - echo "\n\n\n"; - echo "\t\n"; - echo "\t\t\n"; - - //Ausgabe Spalten überschrift - if( $raum == -1 ) - { - if( isset($Room)) - foreach( $Room as $RoomEntry ) - if (SummRoomShifts($RoomEntry["RID"]) > 0) - echo "\t\t\n"; - } - elseif( substr( $raum, 0, 1) == ";" ) - { - $words = preg_split("/;/", $raum); - foreach ($words as $word) - { - if( strlen(trim($word)) > 0) - echo "\t\t\n"; - } - } - else - echo "\t\t\n"; - echo "\t\n"; - - //Zeit Ausgeben - for( $i = 0; $i < 24; $i++ ) - for( $j = 0; $j < $GlobalZeileProStunde; $j++) - { - $Spalten[$i * $GlobalZeileProStunde + $j] = - "\t\n\t\t"; - - //Stunde: - $SpaltenTemp=""; - $SpaltenTemp.= ($i<10)? "0$i:": "$i:"; - - //Minute - $TempMinuten = (($j*60) / $GlobalZeileProStunde); - $SpaltenTemp.= ($TempMinuten<10)? "0$TempMinuten": "$TempMinuten"; - - //aktuelle stunde markieren - if( ($j==0) && ($i == gmdate("H", time()+$gmdateOffset)) && (gmdate("Y-m-d", time()+ $gmdateOffset) == $ausdatum) ) - $SpaltenTemp = "

    $SpaltenTemp

    "; - - $SpaltenTemp = "\n"; - $Spalten[$i * $GlobalZeileProStunde + $j].= $SpaltenTemp; - } - - if( $raum == -1 ) - { - if( isset($Room)) - foreach( $Room as $RoomEntry ) - if (SummRoomShifts($RoomEntry["RID"]) > 0) - CreateRoomShifts( $RoomEntry["RID"] ); - } - elseif( substr( $raum, 0, 1) == ";" ) - { - if( isset($Room)) - { - $words = preg_split("/;/", $raum); - foreach ($words as $word) - { - if( strlen(trim($word)) > 0) - if (SummRoomShifts($word) > 0) - CreateRoomShifts( $word ); - } - } - } - else - CreateRoomShifts( $raum ); - - //Ausageb Zeilen - for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) - { - echo $Spalten[$i]."\t\n"; - } - - echo "
    start". $RoomEntry["Name"]. "". $RoomID[trim($word)]. "". $RoomID[$raum]. "
    $SpaltenTemp
    \n"; - - ShowSwitchDay(); - -}//if (isset($raum)) - -echo "@"; - -include ("../../../camp2011/includes/footer.php"); +if (!isset ($raum)) { + // Ausgabe wenn kein Raum Ausgew�hlt: + echo Get_Text("pub_schicht_auswahl_raeume") . "

    \n"; + + if (isset ($Room)) { + echo "
    \n"; + foreach ($Room as $RoomEntry) { + echo "\t
  • "; + echo "" . $RoomEntry["Name"] . ""; + echo "
    • \n"; + } + echo ""; + echo ""; + echo "\n"; + echo "
    \n"; + } + + echo "

    "; + echo Get_Text("pub_schicht_alles_1") . " " . + Get_Text("pub_schicht_alles_2") . " " . Get_Text("pub_schicht_alles_3"); + echo "\n

    \n\n"; + echo "
    \n\n"; + echo Get_Text("pub_schicht_EmptyShifts") . "\n"; + + // zeit die naesten freien schichten + showEmptyShifts(); +} else { // Wenn einraum Ausgew�hlt ist: + if ($raum == -1) + echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . ":

    "; + elseif (substr($raum, 0, 1) == ";") echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . ":

    "; + else + echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . + Get_Text("pub_schicht_Anzeige_2") . $RoomID[$raum] . "

    "; + + ShowSwitchDay(); + + echo "\n\n\n"; + echo "\t\n"; + echo "\t\t\n"; + + //Ausgabe Spalten �berschrift + if ($raum == -1) { + if (isset ($Room)) + foreach ($Room as $RoomEntry) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + echo "\t\t\n"; + } + elseif (substr($raum, 0, 1) == ";") { + $words = preg_split("/;/", $raum); + foreach ($words as $word) { + if (strlen(trim($word)) > 0) + echo "\t\t\n"; + } + } else + echo "\t\t\n"; + echo "\t\n"; + + //Zeit Ausgeben + for ($i = 0; $i < 24; $i++) + for ($j = 0; $j < $GlobalZeileProStunde; $j++) { + $Spalten[$i * $GlobalZeileProStunde + $j] = "\t\n\t\t"; + + //Stunde: + $SpaltenTemp = ""; + $SpaltenTemp .= ($i < 10) ? "0$i:" : "$i:"; + + //Minute + $TempMinuten = (($j * 60) / $GlobalZeileProStunde); + $SpaltenTemp .= ($TempMinuten < 10) ? "0$TempMinuten" : "$TempMinuten"; + + //aktuelle stunde markieren + if (($j == 0) && ($i == gmdate("H", time() + $gmdateOffset)) && (gmdate("Y-m-d", time() + $gmdateOffset) == $ausdatum)) + $SpaltenTemp = "

    $SpaltenTemp

    "; + + $SpaltenTemp = "\n"; + $Spalten[$i * $GlobalZeileProStunde + $j] .= $SpaltenTemp; + } + + if ($raum == -1) { + if (isset ($Room)) + foreach ($Room as $RoomEntry) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + CreateRoomShifts($RoomEntry["RID"]); + } + elseif (substr($raum, 0, 1) == ";") { + if (isset ($Room)) { + $words = preg_split("/;/", $raum); + foreach ($words as $word) { + if (strlen(trim($word)) > 0) + if (SummRoomShifts($word) > 0) + CreateRoomShifts($word); + } + } + } else + CreateRoomShifts($raum); + + //Ausageb Zeilen + for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) { + echo $Spalten[$i] . "\t\n"; + } + + echo "
    start" . $RoomEntry["Name"] . "" . $RoomID[trim($word)] . "" . $RoomID[$raum] . "
    $SpaltenTemp
    \n"; + + ShowSwitchDay(); + +} //if (isset($raum)) + +echo "@"; + +include ("includes/footer.php"); ?> diff --git a/www-ssl/nonpublic/schichtplan_add.php b/www-ssl/nonpublic/schichtplan_add.php index 621cd97e..1bbcdc4b 100644 --- a/www-ssl/nonpublic/schichtplan_add.php +++ b/www-ssl/nonpublic/schichtplan_add.php @@ -1,111 +1,114 @@ = '$beginSchicht') and ". - " (`Shifts`.`DateS` < '$endSchicht'))". - " OR ". - " ((`Shifts`.`DateE` > '$beginSchicht') and ". - " (`Shifts`.`DateE` <= '$endSchicht')) ". - ") and ". - "(`ShiftEntry`.`UID` = '". $_SESSION['UID']. "'));"; - $bErg = mysql_query($SSQL, $con); - - if(mysql_num_rows($bErg) != 0) - echo Get_Text("pub_schichtplan_add_AllreadyinShift"); - else { - // ermitteln der noch gesuchten - $SQL3 = "SELECT * FROM `ShiftEntry`". - " WHERE ((`SID` = '". $_POST["SID"]. "') AND (`TID` = '". $_POST["TID"]. "') AND (`UID` = '0'));"; - $Erg3 = mysql_query($SQL3, $con); - - if(mysql_num_rows($Erg3) <= 0) - echo Get_Text("pub_schichtplan_add_ToManyYousers"); - else { - //write shift - $SQL = "UPDATE `ShiftEntry` SET ". - "`UID` = '". $_SESSION['UID']. "', ". - "`Comment` = '". $_POST["newtext"]. "' ". - "WHERE ( (`SID` = '". $_POST["SID"]. "') and ". - "(`TID` = '". $_POST["TID"]. "') and ". - "(`UID` = '0')) LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - - if($Erg != 1) - echo Get_Text("pub_schichtplan_add_Error"); - else - echo Get_Text("pub_schichtplan_add_WriteOK"); - } - } - } else { - echo "

    :-(

    "; - array_push($error_messages, "Hack atteck\n"); - } - } elseif (isset($_GET["SID"]) && isset($_GET["TID"])) { - //wenn keine Rechte definiert sind - if( !isset($_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ])) - $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] = "Y"; - - if( $_SESSION['CVS'][ $TID2Name[$_GET["TID"]] ] == "Y") { - echo Get_Text("pub_schichtplan_add_Text1"). "

    \n\n". - "
    \n". - "\n"; - - $SQL = "SELECT * FROM `Shifts` WHERE "; - $SQL .="(`SID` = '". $_GET["SID"]. "')"; - $Erg = mysql_query($SQL, $con); - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n \n"; - - echo "\n". - "\n". - "
    ". Get_Text("pub_schichtplan_add_Date"). ": ". - mysql_result($Erg, 0, "DateS"). "
    ". Get_Text("pub_schichtplan_add_Place"). ": ". - $RoomID[ mysql_result($Erg, 0, "RID") ]. "
    ". Get_Text("pub_schichtplan_add_Job"). ": ". - $EngelTypeID[$_GET["TID"]]. "
    ". Get_Text("pub_schichtplan_add_Len"). ": ". - mysql_result($Erg, 0, "Len"). "h
    ". Get_Text("pub_schichtplan_add_TextFor"). ": ". - mysql_result($Erg, 0, "Man"). "
    ". Get_Text("pub_schichtplan_add_Comment"). ":". - "
     
    \n". - "\n". - "\n". - "
    "; - } else { - echo "

    :-(

    "; - array_push($error_messages, "Hack atteck\n"); - } - } - - include "../../../camp2011/includes/footer.php"; +require_once ('../bootstrap.php'); + +$title = "Himmel"; +$header = "Schichtpläne"; +include "includes/header.php"; +include "includes/funktion_schichtplan.php"; +include "includes/funktion_schichtplan_aray.php"; +include "includes/funktionen.php"; + +if (isset ($_POST["newtext"]) && isset ($_POST["SID"]) && isset ($_POST["TID"])) { + SetHeaderGo2Back(); + + // datum der einzutragenden Schicht heraussuhen... + $ShiftSQL = "SELECT `DateS`, `DateE` FROM `Shifts` WHERE `SID`='" . $_POST["SID"] . ".'"; + $ShiftErg = mysql_query($ShiftSQL, $con); + $beginSchicht = mysql_result($ShiftErg, 0, "DateS"); + $endSchicht = mysql_result($ShiftErg, 0, "DateE"); + + // wenn keien rechte definiert sind + if (!isset ($_SESSION['CVS'][$TID2Name[$_POST["TID"]]])) + $_SESSION['CVS'][$TID2Name[$_POST["TID"]]] = "Y"; + + if ($_SESSION['CVS'][$TID2Name[$_POST["TID"]]] == "Y") { + // Ueberpruefung, ob der Engel bereits fuer eine Schicht zu dieser Zeit eingetragen ist + $SSQL = "SELECT * FROM `Shifts`" . + " INNER JOIN `ShiftEntry` ON `ShiftEntry`.`SID` = `Shifts`.`SID`" . + " WHERE ((" . + " ((`Shifts`.`DateS` >= '$beginSchicht') and " . + " (`Shifts`.`DateS` < '$endSchicht'))" . + " OR " . + " ((`Shifts`.`DateE` > '$beginSchicht') and " . + " (`Shifts`.`DateE` <= '$endSchicht')) " . + ") and " . + "(`ShiftEntry`.`UID` = '" . $_SESSION['UID'] . "'));"; + $bErg = mysql_query($SSQL, $con); + + if (mysql_num_rows($bErg) != 0) + echo Get_Text("pub_schichtplan_add_AllreadyinShift"); + else { + // ermitteln der noch gesuchten + $SQL3 = "SELECT * FROM `ShiftEntry`" . + " WHERE ((`SID` = '" . $_POST["SID"] . "') AND (`TID` = '" . $_POST["TID"] . "') AND (`UID` = '0'));"; + $Erg3 = mysql_query($SQL3, $con); + + if (mysql_num_rows($Erg3) <= 0) + echo Get_Text("pub_schichtplan_add_ToManyYousers"); + else { + //write shift + $SQL = "UPDATE `ShiftEntry` SET " . + "`UID` = '" . $_SESSION['UID'] . "', " . + "`Comment` = '" . $_POST["newtext"] . "' " . + "WHERE ( (`SID` = '" . $_POST["SID"] . "') and " . + "(`TID` = '" . $_POST["TID"] . "') and " . + "(`UID` = '0')) LIMIT 1;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg != 1) + echo Get_Text("pub_schichtplan_add_Error"); + else + echo Get_Text("pub_schichtplan_add_WriteOK"); + } + } + } else { + echo "

    :-(

    "; + array_push($error_messages, "Hack atteck\n"); + } +} +elseif (isset ($_GET["SID"]) && isset ($_GET["TID"])) { + //wenn keine Rechte definiert sind + if (!isset ($_SESSION['CVS'][$TID2Name[$_GET["TID"]]])) + $_SESSION['CVS'][$TID2Name[$_GET["TID"]]] = "Y"; + + if ($_SESSION['CVS'][$TID2Name[$_GET["TID"]]] == "Y") { + echo Get_Text("pub_schichtplan_add_Text1") . "

    \n\n" . + "
    \n" . + "\n"; + + $SQL = "SELECT * FROM `Shifts` WHERE "; + $SQL .= "(`SID` = '" . $_GET["SID"] . "')"; + $Erg = mysql_query($SQL, $con); + + echo "\n"; + + echo "\n"; + + echo "\n"; + + echo "\n"; + + echo "\n"; + + echo "\n \n"; + + echo "\n" . + "\n" . + "
    " . Get_Text("pub_schichtplan_add_Date") . ": " . + mysql_result($Erg, 0, "DateS") . "
    " . Get_Text("pub_schichtplan_add_Place") . ": " . + $RoomID[mysql_result($Erg, 0, "RID")] . "
    " . Get_Text("pub_schichtplan_add_Job") . ": " . + $EngelTypeID[$_GET["TID"]] . "
    " . Get_Text("pub_schichtplan_add_Len") . ": " . + mysql_result($Erg, 0, "Len") . "h
    " . Get_Text("pub_schichtplan_add_TextFor") . ": " . + mysql_result($Erg, 0, "Man") . "
    " . Get_Text("pub_schichtplan_add_Comment") . ":" . + "
     
    \n" . + "\n" . + "\n" . + "
    "; + } else { + echo "

    :-(

    "; + array_push($error_messages, "Hack atteck\n"); + } +} + +include "includes/footer.php"; ?> diff --git a/www-ssl/nonpublic/schichtplan_beamer.php b/www-ssl/nonpublic/schichtplan_beamer.php index 2e4e78c2..269660e1 100644 --- a/www-ssl/nonpublic/schichtplan_beamer.php +++ b/www-ssl/nonpublic/schichtplan_beamer.php @@ -1,9 +1,11 @@ @@ -16,7 +18,9 @@ \n"; + + +echo "\n"; echo "@@ -25,27 +29,27 @@ echo "\n"; -echo "\n" . - "\n". - "\n". - "\n". - "\n". - "\n"; - -foreach($Room as $RoomEntry) { - // var-init - $AnzahlEintraege = 0; - - $Out = ausgabe_Zeile($RoomEntry["RID"], $Time - 3600, $AnzahlEintraege); - $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time, $AnzahlEintraege); - $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time + 3600, $AnzahlEintraege); - - if($AnzahlEintraege == 0) - $Out = ""; - else - $Out = "\n\n" . $Out . "\n"; - - echo $Out; +echo "\n" . +"\n" . +"\n" . +"\n" . +"\n" . +"\n"; + +foreach ($Room as $RoomEntry) { + // var-init + $AnzahlEintraege = 0; + + $Out = ausgabe_Zeile($RoomEntry["RID"], $Time -3600, $AnzahlEintraege); + $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time, $AnzahlEintraege); + $Out .= ausgabe_Zeile($RoomEntry["RID"], $Time +3600, $AnzahlEintraege); + + if ($AnzahlEintraege == 0) + $Out = ""; + else + $Out = "\n\n" . $Out . "\n"; + + echo $Out; } ?> diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php index bb9a0668..d98dd455 100644 --- a/www-ssl/nonpublic/waeckliste.php +++ b/www-ssl/nonpublic/waeckliste.php @@ -1,8 +1,10 @@

    \n" . Get_Text("pub_waeckliste_Text1"); ?>

    @@ -15,12 +17,14 @@ @@ -29,10 +33,14 @@
    ". gmdate("d.m.y", $Time) ."". gmdate("H", $Time - 3600) . ":00". gmdate("H", $Time + 0) . ":00". gmdate("H", $Time + 3600) .":00
    _" . $RoomEntry["Name"] . "_
    " . gmdate("d.m.y", $Time) . "" . gmdate("H", $Time -3600) . ":00" . gmdate("H", $Time +0) . ":00" . gmdate("H", $Time +3600) . ":00
    _" . $RoomEntry["Name"] . "_
    diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php index 164a4bb0..0d44b48d 100644 --- a/www-ssl/nonpublic/wecken.php +++ b/www-ssl/nonpublic/wecken.php @@ -1,32 +1,34 @@ " . Get_Text("Hello") . $_SESSION['Nick'] . ",
    " . Get_Text("pub_wake_beschreibung") . "

    \n\n"; - echo Get_Text("pub_wake_beschreibung2"); +if (isset ($_GET["eintragen"])) { + if ($_GET["eintragen"] == "loeschen") { + $SQL = "DELETE FROM `Wecken` WHERE `UID`='" . $_SESSION['UID'] . "' AND `ID`='" . $_GET["weckID"] . "' LIMIT 1"; + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) + Print_Text(4); + } +} + +echo "

    " . Get_Text("Hello") . $_SESSION['Nick'] . ",
    " . Get_Text("pub_wake_beschreibung") . "

    \n\n"; +echo Get_Text("pub_wake_beschreibung2"); ?> @@ -38,12 +40,13 @@ @@ -52,7 +55,8 @@
    " . Get_Text("pub_wake_del"); ?>


    @@ -77,5 +81,6 @@ " /> -- cgit v1.2.3-54-g00ecf From e050c0dc7f4c70b13596f8e940a31a9678bb3b52 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 15:02:00 +0200 Subject: bootstrapping --- config/.gitignore | 1 + www-ssl/admin/EngelType.php | 332 ++++++++--------- www-ssl/admin/Recentchanges.php | 20 +- www-ssl/admin/UserPicture.php | 234 ++++++------ www-ssl/admin/aktiv.php | 123 +++--- www-ssl/admin/dbUpdateFromXLS.php | 481 +++++++++++------------- www-ssl/admin/debug.php | 37 +- www-ssl/admin/dect.php | 117 +++--- www-ssl/admin/dect_call.php | 5 +- www-ssl/admin/faq.php | 444 +++++++++++----------- www-ssl/admin/free.php | 74 ++-- www-ssl/admin/free_DECT.php | 93 ++--- www-ssl/admin/group.php | 84 ++--- www-ssl/admin/index.php | 12 +- www-ssl/admin/room.php | 357 +++++++++--------- www-ssl/admin/schichtplan.php | 703 +++++++++++++++++------------------ www-ssl/admin/schichtplan_druck.php | 156 ++++---- www-ssl/admin/shiftadd.php | 548 ++++++++++++++------------- www-ssl/admin/sprache.php | 214 +++++------ www-ssl/admin/tshirt.php | 55 +-- www-ssl/admin/user.php | 189 +++++----- www-ssl/admin/userArrived.php | 65 ++-- www-ssl/admin/userChangeNormal.php | 252 ++++++------- www-ssl/admin/userChangeSecure.php | 178 +++++---- www-ssl/admin/userDefaultSetting.php | 184 +++++---- www-ssl/admin/userSaveNormal.php | 219 ++++++----- www-ssl/admin/userSaveSecure.php | 321 ++++++++-------- 27 files changed, 2622 insertions(+), 2876 deletions(-) diff --git a/config/.gitignore b/config/.gitignore index 9b65d8f4..a99da95f 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -2,3 +2,4 @@ config_db.php config_jabber.php config_modem.php config.php +config_IAX.php diff --git a/www-ssl/admin/EngelType.php b/www-ssl/admin/EngelType.php index 1aec80dc..5d1a6cdc 100644 --- a/www-ssl/admin/EngelType.php +++ b/www-ssl/admin/EngelType.php @@ -1,191 +1,167 @@ "; - echo "[$SQL]
    "; - return 1; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    "; - echo "[$SQL]
    "; - return 0; - } +include ("includes/header.php"); +include ("includes/funktion_db.php"); + +function runSQL($SQL) { + global $con; + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($SQL, $con); + if ($Erg) { + echo "Änderung wurde gesichert...
    "; + echo "[$SQL]
    "; + return 1; + } else { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    " . mysql_error($con) . "
    "; + echo "[$SQL]
    "; + return 0; + } } -function runSQL_log( $SQL, $commed) -{ - global $con; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, $commed); - if ($Erg) - { - echo "Änderung wurde gesichert...
    "; - echo "[$SQL]
    "; - return 1; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    "; - echo "[$SQL]
    "; - return 0; - } +function runSQL_log($SQL, $commed) { + global $con; + // hier muesste das SQL ausgefuehrt werden... + $Erg = db_query($SQL, $commed); + if ($Erg) { + echo "Änderung wurde gesichert...
    "; + echo "[$SQL]
    "; + return 1; + } else { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    " . mysql_error($con) . "
    "; + echo "[$SQL]
    "; + return 0; + } } - - $Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`"; $Erg = mysql_query($Sql, $con); -if( !IsSet($_GET["action"]) ) -{ - echo "Hallo ".$_SESSION['Nick']. - ",
    \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen ". - "oder vorhandene abzuändern:

    \n"; - - echo "- Neuen EngelType eintragen
    \n"; - - echo "\n"; - echo "\n"; - - for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) - { - echo "\t"; - } - echo "\t"; - echo ""; - - for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) - { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) - { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
    ". mysql_field_name($Erg, $i). "Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; -} -else -{ - -switch ($_GET["action"]) { - -case 'new': - echo "Neuen EngelType einrichten:
    "; - echo "
    \n"; - echo "\n"; - - for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) - { - echo "". - "\n"; - } - echo "
    ".mysql_field_name($Erg, $Uj)."
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - break; - -case 'newsave': - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys=""; - $Values=""; - foreach($vars as $key => $value){ - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - - if( runSQL_log( "INSERT INTO `EngelType` (". substr($Keys, 2). ") VALUES (". substr($Values, 2). ")", - "save new EngelType") ) - { - SetHeaderGo2Back(); - - $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='". $_GET["Name"]. "'"; - $ERG = mysql_query($SQL2, $con); - - if( mysql_num_rows($ERG) == 1) - runSQL_log( "ALTER TABLE `Room` ADD `DEFAULT_EID_". mysql_result( $ERG, 0, 0). - "` INT DEFAULT '0' NOT NULL;", - "add new EngelType in Romm Table"); - } - break; - -case 'change': - if (! IsSet($_GET["TID"])) - echo "Fehlerhafter Aufruf!"; - else - { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, den EngelType ändern."; - echo "
    \n"; - echo "\n"; - - $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'"; - $ERG = mysql_query($SQL2, $con); - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - echo "". - "\n"; - - echo "
    ". mysql_field_name($ERG, $Uj). "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    "; - } - break; - -case 'changesave': - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - $keys=""; - $sql=""; - foreach($vars as $key => $value) - { - $keys = substr( $key, 1); - $sql .= ", `". $keys. "`='". $value. "'"; - } - runSQL_log( "UPDATE `EngelType` SET ". substr($sql, 2). " WHERE `TID`='". $_GET["eTID"]. "'", - "Save Change EngelType"); - SetHeaderGo2Back(); - break; - -case 'delete': - if (IsSet($_GET["TID"])) - { - if( runSQL_log( "DELETE FROM `EngelType` WHERE `TID`='". $_GET["TID"]. "'", "delete EngelType")) - runSQL_log( "ALTER TABLE `Room` DROP `DEFAULT_EID_". $_GET["TID"]. "`;", - "delete EngelType in Room Table"); - } - else - echo "Fehlerhafter Aufruf"; - SetHeaderGo2Back(); - break; -} +if (!IsSet ($_GET["action"])) { + echo "Hallo " . $_SESSION['Nick'] . + ",
    \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen " . + "oder vorhandene abzuändern:

    \n"; + + echo "- Neuen EngelType eintragen
    \n"; + + echo "\n"; + echo "\n"; + + for ($i = 1; $i < mysql_num_fields($Erg); $i++) { + echo "\t"; + } + echo "\t"; + echo ""; + + for ($t = 0; $t < mysql_num_rows($Erg); $t++) { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) { + echo "\t\t\n"; + } + echo "\t\t\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo "
    " . mysql_field_name($Erg, $i) . "Ändern
    " . mysql_result($Erg, $t, $j) . "###
    "; +} else { + + switch ($_GET["action"]) { + + case 'new' : + echo "Neuen EngelType einrichten:
    "; + echo "
    \n"; + echo "\n"; + + for ($Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++) { + echo "" . + "\n"; + } + echo "
    " . mysql_field_name($Erg, $Uj) . "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + break; + + case 'newsave' : + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys = ""; + $Values = ""; + foreach ($vars as $key => $value) { + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + + if (runSQL_log("INSERT INTO `EngelType` (" . substr($Keys, 2) . ") VALUES (" . substr($Values, 2) . ")", "save new EngelType")) { + SetHeaderGo2Back(); + + $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='" . $_GET["Name"] . "'"; + $ERG = mysql_query($SQL2, $con); + + if (mysql_num_rows($ERG) == 1) + runSQL_log("ALTER TABLE `Room` ADD `DEFAULT_EID_" . mysql_result($ERG, 0, 0) . + "` INT DEFAULT '0' NOT NULL;", "add new EngelType in Romm Table"); + } + break; + + case 'change' : + if (!IsSet ($_GET["TID"])) + echo "Fehlerhafter Aufruf!"; + else { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, den EngelType ändern."; + echo "
    \n"; + echo "\n"; + + $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'"; + $ERG = mysql_query($SQL2, $con); + + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) + echo "" . + "\n"; + + echo "
    " . mysql_field_name($ERG, $Uj) . "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    "; + } + break; + + case 'changesave' : + $vars = $_GET; + $count = count($vars) - 2; + $vars = array_splice($vars, 0, $count); + $keys = ""; + $sql = ""; + foreach ($vars as $key => $value) { + $keys = substr($key, 1); + $sql .= ", `" . $keys . "`='" . $value . "'"; + } + runSQL_log("UPDATE `EngelType` SET " . substr($sql, 2) . " WHERE `TID`='" . $_GET["eTID"] . "'", "Save Change EngelType"); + SetHeaderGo2Back(); + break; + + case 'delete' : + if (IsSet ($_GET["TID"])) { + if (runSQL_log("DELETE FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'", "delete EngelType")) + runSQL_log("ALTER TABLE `Room` DROP `DEFAULT_EID_" . $_GET["TID"] . "`;", "delete EngelType in Room Table"); + } else + echo "Fehlerhafter Aufruf"; + SetHeaderGo2Back(); + break; + } } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php index 6bb8f59d..26324406 100644 --- a/www-ssl/admin/Recentchanges.php +++ b/www-ssl/admin/Recentchanges.php @@ -1,8 +1,9 @@ \n"; echo "\n\tTime\n\tUser\n\tCommend\n\tSQL Commad\n\n"; -for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) -{ - echo "\n"; - echo "\t". mysql_result( $Erg, $n, "Time"). "\n"; - echo "\t". UID2Nick(mysql_result( $Erg, $n, "UID")). displayavatar(mysql_result( $Erg, $n, "UID")). "\n"; - echo "\t". mysql_result( $Erg, $n, "Commend"). "\n"; - echo "\t". mysql_result( $Erg, $n, "SQLCommad"). "\n"; - echo "\n"; +for ($n = 0; $n < mysql_num_rows($Erg); $n++) { + echo "\n"; + echo "\t" . mysql_result($Erg, $n, "Time") . "\n"; + echo "\t" . UID2Nick(mysql_result($Erg, $n, "UID")) . displayavatar(mysql_result($Erg, $n, "UID")) . "\n"; + echo "\t" . mysql_result($Erg, $n, "Commend") . "\n"; + echo "\t" . mysql_result($Erg, $n, "SQLCommad") . "\n"; + echo "\n"; } echo "\n"; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php index 00716329..102d551d 100644 --- a/www-ssl/admin/UserPicture.php +++ b/www-ssl/admin/UserPicture.php @@ -1,120 +1,104 @@ \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t(max ". get_cfg_var("post_max_size"). "Byte)
    \n"; - echo "\t\n"; - echo "\n"; - break; - case 'sendPicture': - if( ($_FILES["file"]["size"] > 0) && (isset( $_POST["UID"])) ) - { - if( ($_FILES["file"]["type"] == "image/jpeg") || - ($_FILES["file"]["type"] == "image/png") || - ($_FILES["file"]["type"] == "image/gif") ) - { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - - if( GetPicturShow( $_POST['UID']) == "") - $SQL = "INSERT INTO `UserPicture` ". - "( `UID`,`Bild`, `ContentType`, `show`) ". - "VALUES ('". $_POST['UID']. "', '$data', '". $_FILES["file"]["type"]. "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET ". - "`Bild`='$data', ". - "`ContentType`='". $_FILES["file"]["type"]. "' ". - "WHERE `UID`='". $_POST['UID']. "'"; - - echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', ". - "MIME-Type: " . $_FILES["file"]["type"]. ", ". - $_FILES["file"]["size"]. " Byte ". - "for ". UID2Nick( $_POST["UID"]); - } - else - Print_Text("pub_einstellungen_send_KO"); - } - else - Print_Text("pub_einstellungen_send_KO"); - break; - - case 'SetN': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gesperrt:
    "; - $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='". $_GET["UID"]. "'"; - } - else - echo "Fehlerhafter Aufruf"; - break; - case 'SetY': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde Freigegeben:
    "; - $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='". $_GET["UID"]. "'"; - } - else - echo "Fehlerhafter Aufruf"; - break; - case 'del': - echo "Wollen Sie das Bild von '". UID2Nick( $_GET["UID"]). "' wirklich löschen? ". - "Yes"; - break; - case 'delYes': - if (IsSet($_GET["UID"])) - { - echo "Bild von '". UID2Nick( $_GET["UID"]). "' wurde gelöscht:
    "; - $SQL = "DELETE FROM `UserPicture` WHERE `UID`='". $_GET["UID"]. "' LIMIT 1"; - } - else - echo "Fehlerhafter Aufruf"; - break; - default: - echo "Fehlerhafter Aufruf"; - - } //switch - - // Update ??? - if (IsSet($SQL)) - { - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($SQL, $con); - if ($Erg == 1) - echo "Änderung wurde gesichert...
    "; - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; - } - } // Ende Update - echo "
    \n
    \n
    \n\n"; -} //IF IsSet($action) +include ("includes/header.php"); +include ("includes/funktion_schichtplan_aray.php"); + +if (IsSet ($_GET["action"])) { + UnSet ($SQL); + + switch ($_GET["action"]) { + case 'FormUpload' : + echo "Hier kannst Du ein Foto hochladen för:"; + echo "
    \n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t(max " . get_cfg_var("post_max_size") . "Byte)
    \n"; + echo "\t\n"; + echo "
    \n"; + break; + case 'sendPicture' : + if (($_FILES["file"]["size"] > 0) && (isset ($_POST["UID"]))) { + if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + + if (GetPicturShow($_POST['UID']) == "") + $SQL = "INSERT INTO `UserPicture` " . + "( `UID`,`Bild`, `ContentType`, `show`) " . + "VALUES ('" . $_POST['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET " . + "`Bild`='$data', " . + "`ContentType`='" . $_FILES["file"]["type"] . "' " . + "WHERE `UID`='" . $_POST['UID'] . "'"; + + echo "Upload Pictur:'" . $_FILES["file"]["name"] . "', " . + "MIME-Type: " . $_FILES["file"]["type"] . ", " . + $_FILES["file"]["size"] . " Byte " . + "for " . UID2Nick($_POST["UID"]); + } else + Print_Text("pub_einstellungen_send_KO"); + } else + Print_Text("pub_einstellungen_send_KO"); + break; + case 'SetN' : + if (IsSet ($_GET["UID"])) { + echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde gesperrt:
    "; + $SQL = "UPDATE `UserPicture` SET `show`='N' WHERE `UID`='" . $_GET["UID"] . "'"; + } else + echo "Fehlerhafter Aufruf"; + break; + case 'SetY' : + if (IsSet ($_GET["UID"])) { + echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde Freigegeben:
    "; + $SQL = "UPDATE `UserPicture` SET `show`='Y' WHERE `UID`='" . $_GET["UID"] . "'"; + } else + echo "Fehlerhafter Aufruf"; + break; + case 'del' : + echo "Wollen Sie das Bild von '" . UID2Nick($_GET["UID"]) . "' wirklich löschen? " . + "Yes"; + break; + case 'delYes' : + if (IsSet ($_GET["UID"])) { + echo "Bild von '" . UID2Nick($_GET["UID"]) . "' wurde gelöscht:
    "; + $SQL = "DELETE FROM `UserPicture` WHERE `UID`='" . $_GET["UID"] . "' LIMIT 1"; + } else + echo "Fehlerhafter Aufruf"; + break; + default : + echo "Fehlerhafter Aufruf"; + + } //switch + + // Update ??? + if (IsSet ($SQL)) { + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) + echo "Änderung wurde gesichert...
    "; + else { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    " . mysql_error($con) . "
    ($SQL)
    "; + } + } // Ende Update + echo "
    \n
    \n
    \n\n"; +} //IF IsSet($action) //ausgabe der Liste $Sql = "SELECT * FROM `UserPicture` WHERE `UID`>0;"; $Erg = mysql_query($Sql, $con); - -echo "Hallo ". $_SESSION['Nick']. ",
    \nhier hast du die Möglichkeit, die Bilder der Engel freizugeben:

    \n"; + +echo "Hallo " . $_SESSION['Nick'] . ",
    \nhier hast du die Möglichkeit, die Bilder der Engel freizugeben:

    \n"; echo "\n"; echo "\n"; @@ -124,26 +108,24 @@ echo "\t\n"; echo "\t\n"; echo ""; -for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) -{ - $UIDs = mysql_result($Erg, $t, "UID"); - echo "\t\n"; - - echo "\t\t\n"; - echo "\t\t\n"; - - if( GetPicturShow( $UIDs) == "Y") - echo "\t\t\n"; - elseif( GetPicturShow( $UIDs) == "N") - echo "\t\t\n"; - else - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; +for ($t = 0; $t < mysql_num_rows($Erg); $t++) { + $UIDs = mysql_result($Erg, $t, "UID"); + echo "\t\n"; + + echo "\t\t\n"; + echo "\t\t\n"; + + if (GetPicturShow($UIDs) == "Y") + echo "\t\t\n"; + elseif (GetPicturShow($UIDs) == "N") echo "\t\t\n"; + else + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } // ende Auflistung Raeume echo "
    StatusLöschen
    ". UID2Nick(mysql_result($Erg, $t, "UID")). "". displayPictur( $UIDs, 0). "sperrenfreigebenERROR: show='". GetPicturShow( $UIDs). "'del
    " . UID2Nick(mysql_result($Erg, $t, "UID")) . "" . displayPictur($UIDs, 0) . "sperrenfreigebenERROR: show='" . GetPicturShow($UIDs) . "'del
    "; echo "
    picture upload\n"; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php index 68199cfa..8db62f98 100644 --- a/www-ssl/admin/aktiv.php +++ b/www-ssl/admin/aktiv.php @@ -1,57 +1,57 @@ "; -echo Get_Text("pub_aktive_Text1")."
    \n"; -echo Get_Text("pub_aktive_Text2")."

    \n"; - +echo Get_Text("pub_aktive_Text1") . "
    \n"; +echo Get_Text("pub_aktive_Text2") . "

    \n"; + // auswahlbox -echo Get_Text("pub_aktive_Text31")."\n"; +echo Get_Text("pub_aktive_Text31") . "\n"; echo ""; -echo Get_Text("pub_aktive_Text32")."

    \n"; +echo Get_Text("pub_aktive_Text32") . "

    \n"; echo "\n"; echo "\n"; echo "\n"; echo "
    \n"; - echo "\t
    \n"; +echo "\t
    \n"; echo "
    \n"; -if( Isset($_POST["ResetActive"]) ) -{ - $SQLreset = "UPDATE `User` SET `Aktiv`='0'"; - $ErgReset = db_query($SQLreset, "Reset Active"); - if ($ErgReset != 1) - echo "Fehler beim zuruecksetzen der Activ\n"; - else - echo "Active wurde erfolgreich zurueckgesetzt\n"; +if (Isset ($_POST["ResetActive"])) { + $SQLreset = "UPDATE `User` SET `Aktiv`='0'"; + $ErgReset = db_query($SQLreset, "Reset Active"); + if ($ErgReset != 1) + echo "Fehler beim zuruecksetzen der Activ\n"; + else + echo "Active wurde erfolgreich zurueckgesetzt\n"; } -if( IsSet($_POST["Anzahl"]) ) - echo "
    \n\n".Get_Text("pub_aktive_Text5_1"). $_POST["Anzahl"]. Get_Text("pub_aktive_Text5_2"). ":"; +if (IsSet ($_POST["Anzahl"])) + echo "
    \n\n" . Get_Text("pub_aktive_Text5_1") . $_POST["Anzahl"] . Get_Text("pub_aktive_Text5_2") . ":"; echo "

    \n\n"; //ausgabe tabelle echo "\n"; echo "\n"; -echo "\t\n"; -echo "\t\n"; -echo "\t\n"; -echo "\t\n"; -echo "\t\n"; -echo "\t\n"; -echo "\t\n"; -echo "\t\n"; +echo "\t\n"; +echo "\t\n"; +echo "\t\n"; +echo "\t\n"; +echo "\t\n"; +echo "\t\n"; +echo "\t\n"; +echo "\t\n"; echo "\n"; - + $SQL = " SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal FROM @@ -65,46 +65,41 @@ $Erg = mysql_query($SQL, $con); echo mysql_error($con); $rowcount = mysql_num_rows($Erg); -$aktivecount=0; -for ($i=0; $i<$rowcount; $i++) -{ - echo "\n\n\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - - - echo "\t\t\n"; - echo "\t\n"; +$aktivecount = 0; +for ($i = 0; $i < $rowcount; $i++) { + echo "\n\n\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + + echo "\t\t\n"; + echo "\t\n"; } // ende Auflistung aktive Engel echo "
    ". Get_Text("pub_aktive_Nick"). "". Get_Text("pub_aktive_Anzahl"). "". Get_Text("pub_aktive_Time"). "". Get_Text("pub_aktive_Time"). " WeightFreeloader ". Get_Text("pub_aktive_Anzahl"). "Freeloader ". Get_Text("pub_aktive_Time"). "". Get_Text("pub_aktive_Time"). " result". Get_Text("pub_aktive_Active"). "" . Get_Text("pub_aktive_Nick") . "" . Get_Text("pub_aktive_Anzahl") . "" . Get_Text("pub_aktive_Time") . "" . Get_Text("pub_aktive_Time") . " WeightFreeloader " . Get_Text("pub_aktive_Anzahl") . "Freeloader " . Get_Text("pub_aktive_Time") . "" . Get_Text("pub_aktive_Time") . " result" . Get_Text("pub_aktive_Active") . "
    ". UID2Nick(mysql_result($Erg, $i, "UID")). "". mysql_result($Erg, $i, "nr"). "x". mysql_result($Erg, $i, "len"). "h". mysql_result($Erg, $i, "lenWeight"). "h". mysql_result($Erg, $i, "nrFree"). "x". mysql_result($Erg, $i, "lenFree"). "h". mysql_result($Erg, $i, "lenReal"). "h"; - if (IsSet($_POST["Anzahl"])) - { - if( $_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal") ) - { - $aktivecount++; - if( $_POST["SendType"]=="Show..") - echo "show set"; - else - { - $SQL2="UPDATE `User` SET `Aktiv`='1' WHERE `UID`='". mysql_result($Erg, $i, "UID"). "' LIMIT 1"; - $Erg2 = db_query($SQL2, "update Active State"); - if ($Erg2 != 1) - echo "Fehler beim speichern bei Engel ".UID2Nick(mysql_result($Erg, $i, "UID")); - else - echo "write set"; - } - } - } - echo "
    " . UID2Nick(mysql_result($Erg, $i, "UID")) . "" . mysql_result($Erg, $i, "nr") . "x" . mysql_result($Erg, $i, "len") . "h" . mysql_result($Erg, $i, "lenWeight") . "h" . mysql_result($Erg, $i, "nrFree") . "x" . mysql_result($Erg, $i, "lenFree") . "h" . mysql_result($Erg, $i, "lenReal") . "h"; + if (IsSet ($_POST["Anzahl"])) { + if ($_POST["Anzahl"] < mysql_result($Erg, $i, "lenReal")) { + $aktivecount++; + if ($_POST["SendType"] == "Show..") + echo "show set"; + else { + $SQL2 = "UPDATE `User` SET `Aktiv`='1' WHERE `UID`='" . mysql_result($Erg, $i, "UID") . "' LIMIT 1"; + $Erg2 = db_query($SQL2, "update Active State"); + if ($Erg2 != 1) + echo "Fehler beim speichern bei Engel " . UID2Nick(mysql_result($Erg, $i, "UID")); + else + echo "write set"; + } + } + } + echo "
    "; echo "
    Anzahl eintraege: $aktivecount / $rowcount (Aktive/Mitschichten)

    "; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/dbUpdateFromXLS.php b/www-ssl/admin/dbUpdateFromXLS.php index 9a329355..88879de7 100644 --- a/www-ssl/admin/dbUpdateFromXLS.php +++ b/www-ssl/admin/dbUpdateFromXLS.php @@ -1,8 +1,10 @@ \n

    XML File:

    \n"; -if( isset($_POST["PentabarfUser"]) && isset($_POST["password"]) && isset($_POST["PentabarfURL"])) -{ - echo "Update XCAL-File from Pentabarf.."; - if($PentabarfGetWith=="fsockopen") - { - - //backup error messeges and delate - $Backuperror_messages = $error_messages; - $fp = fsockopen( "ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); -// $error_messages = $Backuperror_messages; - - if( !$fp) - { - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!". - "[$errstr ($errno)]

    "; - } - else - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $head = 'GET /'. $PentabarfXMLpath. $_POST["PentabarfURL"]. ' HTTP/1.1'."\r\n". - 'Host: '. $PentabarfXMLhost. "\r\n". - 'User-Agent: Engelsystem'. "\r\n". - 'Authorization: Basic '. - base64_encode($_POST["PentabarfUser"]. ':'. $_POST["password"])."\r\n". - "\r\n"; - fputs( $fp, $head); - $Zeilen = -1; - while (!feof($fp)) - { - $Temp= fgets($fp,1024); - - // ende des headers - if( $Temp== "f20\r\n" ) - { - $Zeilen = 0; - $Temp=""; - } - - //file ende? - if( $Temp=="0\r\n") - break; - - if( ($Zeilen>-1) && ($Temp!="ffb\r\n") ) - { - //steuerzeichen ausfiltern - if( strpos( "#$Temp", "\r\n") > 0) - $Temp = substr($Temp, 0, strlen($Temp)-2); - if( strpos( "#$Temp", "1005") > 0) - $Temp = ""; - if( strpos( "#$Temp", "783") > 0) - $Temp = ""; - //schreiben in file - fputs( $fileOut, $Temp); - $Zeilen++; - } - } - fclose( $fileOut); - - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose($fp); - } - } - elseif($PentabarfGetWith=="fopen") - { - //user uns password in url einbauen - $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; - - - if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $Zeilen = 0; - while (!feof($fileIn)) - { - $Zeilen++; - fputs( $fileOut, fgets( $fileIn)); - } - fclose( $fileOut); - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose( $fileIn); - } - else - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; - } - elseif( $PentabarfGetWith=="wget") - { - $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. - " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". - " --no-check-certificate"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif( $PentabarfGetWith=="lynx") - { - $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif($PentabarfGetWith=="fopen") - { - //user uns password in url einbauen - $FileNameIn = "https://". $_POST["PentabarfUser"]. ':'. $_POST["password"]. "@". - $PentabarfXMLhost. "/". $PentabarfXMLpath. $_POST["PentabarfURL"]; - - - if( ($fileIn = fopen( $FileNameIn, "r")) != FALSE) - { - if( ($fileOut = fopen( "$Tempdir/engelXML", "w")) != FALSE) - { - $Zeilen = 0; - while (!feof($fileIn)) - { - $Zeilen++; - fputs( $fileOut, fgets( $fileIn)); - } - fclose( $fileOut); - echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; - } - else - echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; - fclose( $fileIn); - } - else - echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. "' not readable!

    "; - } - elseif( $PentabarfGetWith=="wget") - { - $Command = "wget --http-user=". $_POST["PentabarfUser"]. " --http-passwd=".$_POST["password"]. " ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. - " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML". - " --no-check-certificate"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - elseif( $PentabarfGetWith=="lynx") - { - $Command = "lynx -auth=". $_POST["PentabarfUser"]. ":".$_POST["password"]. " -dump ". - "https://$PentabarfXMLhost/$PentabarfXMLpath". $_POST["PentabarfURL"]. " > $Tempdir/engelXML"; - echo system( $Command, $Status); - if( $Status==0) - echo "OK.
    "; - else - echo "fail ($Status)($Command).
    "; - } - else - echo "

    The PentabarfGetWith='$PentabarfGetWith' not supported

    "; -} -else -{ - echo "
    \n"; - echo "\n"; - echo "\t". - "\n"; - echo "\t". - "\n"; - echo "\t". - "\n"; - echo "\t\n"; - echo "
    XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
    Username:
    Password:
    \n"; - echo "
    \n"; +if (isset ($_POST["PentabarfUser"]) && isset ($_POST["password"]) && isset ($_POST["PentabarfURL"])) { + echo "Update XCAL-File from Pentabarf.."; + if ($PentabarfGetWith == "fsockopen") { + + //backup error messeges and delate + $Backuperror_messages = $error_messages; + $fp = fsockopen("ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); + // $error_messages = $Backuperror_messages; + + if (!$fp) { + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!" . + "[$errstr ($errno)]

    "; + } else { + if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) { + $head = 'GET /' . $PentabarfXMLpath . $_POST["PentabarfURL"] . ' HTTP/1.1' . "\r\n" . + 'Host: ' . $PentabarfXMLhost . "\r\n" . + 'User-Agent: Engelsystem' . "\r\n" . + 'Authorization: Basic ' . + base64_encode($_POST["PentabarfUser"] . ':' . $_POST["password"]) . "\r\n" . + "\r\n"; + fputs($fp, $head); + $Zeilen = -1; + while (!feof($fp)) { + $Temp = fgets($fp, 1024); + + // ende des headers + if ($Temp == "f20\r\n") { + $Zeilen = 0; + $Temp = ""; + } + + //file ende? + if ($Temp == "0\r\n") + break; + + if (($Zeilen > -1) && ($Temp != "ffb\r\n")) { + //steuerzeichen ausfiltern + if (strpos("#$Temp", "\r\n") > 0) + $Temp = substr($Temp, 0, strlen($Temp) - 2); + if (strpos("#$Temp", "1005") > 0) + $Temp = ""; + if (strpos("#$Temp", "783") > 0) + $Temp = ""; + //schreiben in file + fputs($fileOut, $Temp); + $Zeilen++; + } + } + fclose($fileOut); + + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose($fp); + } + } + elseif ($PentabarfGetWith == "fopen") { + //user uns password in url einbauen + $FileNameIn = "https://" . $_POST["PentabarfUser"] . ':' . $_POST["password"] . "@" . + $PentabarfXMLhost . "/" . $PentabarfXMLpath . $_POST["PentabarfURL"]; + + if (($fileIn = fopen($FileNameIn, "r")) != FALSE) { + if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) { + $Zeilen = 0; + while (!feof($fileIn)) { + $Zeilen++; + fputs($fileOut, fgets($fileIn)); + } + fclose($fileOut); + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose($fileIn); + } else + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!

    "; + } + elseif ($PentabarfGetWith == "wget") { + $Command = "wget --http-user=" . $_POST["PentabarfUser"] . " --http-passwd=" . $_POST["password"] . " " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML" . + " --no-check-certificate"; + echo system($Command, $Status); + if ($Status == 0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif ($PentabarfGetWith == "lynx") { + $Command = "lynx -auth=" . $_POST["PentabarfUser"] . ":" . $_POST["password"] . " -dump " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . " > $Tempdir/engelXML"; + echo system($Command, $Status); + if ($Status == 0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif ($PentabarfGetWith == "fopen") { + //user uns password in url einbauen + $FileNameIn = "https://" . $_POST["PentabarfUser"] . ':' . $_POST["password"] . "@" . + $PentabarfXMLhost . "/" . $PentabarfXMLpath . $_POST["PentabarfURL"]; + + if (($fileIn = fopen($FileNameIn, "r")) != FALSE) { + if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) { + $Zeilen = 0; + while (!feof($fileIn)) { + $Zeilen++; + fputs($fileOut, fgets($fileIn)); + } + fclose($fileOut); + echo "
    Es wurden $Zeilen Zeilen eingelesen
    "; + } else + echo "

    fail: File '$Tempdir/engelXML' not writeable!

    "; + fclose($fileIn); + } else + echo "

    fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!

    "; + } + elseif ($PentabarfGetWith == "wget") { + $Command = "wget --http-user=" . $_POST["PentabarfUser"] . " --http-passwd=" . $_POST["password"] . " " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML" . + " --no-check-certificate"; + echo system($Command, $Status); + if ($Status == 0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } + elseif ($PentabarfGetWith == "lynx") { + $Command = "lynx -auth=" . $_POST["PentabarfUser"] . ":" . $_POST["password"] . " -dump " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . " > $Tempdir/engelXML"; + echo system($Command, $Status); + if ($Status == 0) + echo "OK.
    "; + else + echo "fail ($Status)($Command).
    "; + } else + echo "

    The PentabarfGetWith='$PentabarfGetWith' not supported

    "; +} else { + echo "
    \n"; + echo "\n"; + echo "\t" . + "\n"; + echo "\t" . + "\n"; + echo "\t" . + "\n"; + echo "\t\n"; + echo "
    XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
    Username:
    Password:
    \n"; + echo "
    \n"; } - - //readXMLfile("xml.php.xml"); -if( readXMLfile("$Tempdir/engelXML") == 0) -{ -$XMLmain = getXMLsubPease( $XMLmain, "VCALENDAR"); - - -if( $ShowDataStrukture) -{ - echo "

    ";
-  echo $XMLmain->name;
-  echo "
    ";
-  print_r(array_values ($XMLmain->sub));
-  echo "
    "; -} - -/* -echo "
    "; -$Feld=7; -echo "$Feld#". $XMLmain->sub[$Feld]->name. "
    "; -echo "$Feld#". $XMLmain->sub[$Feld]->sub; -//print_r(array_values ($XMLmain->sub[$Feld]->sub)); -while(list($key, $value) = each($XMLmain->sub[$Feld]->sub)) - echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; -echo ""; -*/ - - -/*############################################################################################## - V e r s i o n - ##############################################################################################*/ - -echo "
    \n"; -$XMLrelease = getXMLsubPease( $XMLmain, "X-WR-CALDESC"); -echo "release: ". $XMLrelease->data. "
    \n"; -//$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE"); -//echo "release date: ". $XMLreleaseDate->data. "
    \n"; -echo "
    \n"; - - - -/*############################################################################################## - V e r s i o n - ##############################################################################################*/ -if( $EnableRoomFunctions) - include("../../../camp2011/includes/funktion_xml_room.php"); - -if( $EnableSchudleFunctions) - include("../../../camp2011/includes/funktion_xml_schudle.php"); - - -/*############################################################################################## - U P D A T E A L L - ##############################################################################################*/ -echo "\n\n
    \n

    Update ALL:

    \n"; - -echo "
    \n"; -echo "\t\n"; -echo "
    \n"; +if (readXMLfile("$Tempdir/engelXML") == 0) { + $XMLmain = getXMLsubPease($XMLmain, "VCALENDAR"); + + if ($ShowDataStrukture) { + echo "

    ";
+		echo $XMLmain->name;
+		echo "
    ";
+		print_r(array_values($XMLmain->sub));
+		echo "
    "; + } + + /* + echo "
    "; + $Feld=7; + echo "$Feld#". $XMLmain->sub[$Feld]->name. "
    "; + echo "$Feld#". $XMLmain->sub[$Feld]->sub; + //print_r(array_values ($XMLmain->sub[$Feld]->sub)); + while(list($key, $value) = each($XMLmain->sub[$Feld]->sub)) + echo "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; + echo ""; + */ + + /*############################################################################################## + V e r s i o n + ##############################################################################################*/ + + echo "
    \n"; + $XMLrelease = getXMLsubPease($XMLmain, "X-WR-CALDESC"); + echo "release: " . $XMLrelease->data . "
    \n"; + //$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE"); + //echo "release date: ". $XMLreleaseDate->data. "
    \n"; + echo "
    \n"; + + /*############################################################################################## + V e r s i o n + ##############################################################################################*/ + if ($EnableRoomFunctions) + include ("includes/funktion_xml_room.php"); + + if ($EnableSchudleFunctions) + include ("includes/funktion_xml_schudle.php"); + + /*############################################################################################## + U P D A T E A L L + ##############################################################################################*/ + echo "\n\n
    \n

    Update ALL:

    \n"; + + echo "
    \n"; + echo "\t\n"; + echo "
    \n"; } //if XMLopenOOK -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php index b2c6357f..ec1b2c9f 100644 --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -1,9 +1,10 @@ Web Counter"; funktion_db_list("Counter"); @@ -31,39 +32,27 @@ echo "Deaktiviert"; */ echo "
    \n"; -funktion_db_element_list_2row( "Tshirt-Size aller engel", - "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); +funktion_db_element_list_2row("Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); echo "
    \n"; -funktion_db_element_list_2row( "Tshirt ausgegeben", - "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); +funktion_db_element_list_2row("Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); echo "
    \n"; -funktion_db_element_list_2row( "Tshirt nicht ausgegeben (Gekommen=1)", - "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); +funktion_db_element_list_2row("Tshirt nicht ausgegeben (Gekommen=1)", "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); echo "
    \n"; -funktion_db_element_list_2row( "Hometown", - "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); +funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); echo "
    \n"; -funktion_db_element_list_2row( "Engeltypen", - "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); +funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); echo "
    \n"; -funktion_db_element_list_2row( "Gesamte Arbeit", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); +funktion_db_element_list_2row("Gesamte Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); echo "
    \n"; -funktion_db_element_list_2row( "Geleisteter Arbeit", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); +funktion_db_element_list_2row("Geleisteter Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); echo "
    \n"; -funktion_db_element_list_2row( "Gesamte Arbeit (Ohne Raum aufabau (RID=7)", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); +funktion_db_element_list_2row("Gesamte Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); echo "
    \n"; -funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", - "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); +funktion_db_element_list_2row("Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); - - - -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php index 76409cc6..6ad98c81 100644 --- a/www-ssl/admin/dect.php +++ b/www-ssl/admin/dect.php @@ -1,70 +1,69 @@ \n"; +echo "\n"; + +echo "\n"; + +echo "\n"; + +echo "\n"; +echo "\n"; +echo ""; +echo "
    Numberh:m
    \n"; +// Listet alle Nicks auf +echo "\n"; + +echo "\n"; +echo ":"; +echo "
    \n"; + +echo ""; - echo "
    \n"; - echo "\n"; - - echo "\n"; - - echo "\n"; - - echo "\n"; - echo "\n"; - echo ""; - echo "
    Numberh:m
    \n"; - // Listet alle Nicks auf - echo "\n"; - - echo "\n"; - echo ":"; - echo "
    \n"; - - echo "
    "; - - -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php index 58c7cfe1..0799c2be 100644 --- a/www-ssl/admin/dect_call.php +++ b/www-ssl/admin/dect_call.php @@ -1,7 +1,8 @@ diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php index 217e9188..779d8822 100644 --- a/www-ssl/admin/faq.php +++ b/www-ssl/admin/faq.php @@ -1,28 +1,28 @@ Alle Anfragen:
    @@ -37,142 +37,132 @@ case "all": \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - else - { - echo "Nein\n"; - echo "\n"; - echo "\n"; - } - echo ""; - echo "\n"; - } - echo "
    ".mysql_result($Erg, $n, "Question")."".UID2Nick(mysql_result($Erg, $n, "UID")).""; - if (mysql_result($Erg, $n, "AID")>0) - { - echo "Ja".mysql_result($Erg, $n, "Answer")."".UID2Nick(mysql_result($Erg, $n, "AID"))."  xxx
    \n"; - break; - -case "open": - $SQL="SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; - $quest_bearb=1; // Fragenliste anzeigen - echo "\t\tOffene Anfragen:
    \n"; - break; - -case "edit": - if (!IsSet($_GET["QID"])) - echo "\t\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; - else - { - $SQL = "SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; - $Erg = mysql_query($SQL, $con); - echo "\t\t
    \n"; - echo "\t\tAnfrage von ". UID2NICK(mysql_result($Erg, 0, "UID")). ":
    \n"; - echo "\t\t\n"; - echo "

    Antwort der Erzengel:
    \n"; - if (mysql_result($Erg, 0, "Answer")=="") - echo "\t\t
    \n"; - else - echo "\t\t\n
    \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
    \n"; - if (mysql_result($Erg, 0, "AID")<>"0") - { - echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
    \n"; - echo "Als FAQ-Eintrag sichern...\n"; - } - } // Abfrage der QID - break; - -case "save": - if (!IsSet($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; - else - { - $SQL = "UPDATE `Questions` SET `Question`='". $_GET["Question"]. - "', `AID`='". $_SESSION['UID']. "' , `Answer`='". $_GET["Answer"]. "' ". - "WHERE `QID`='". $_GET["QID"]. "' LIMIT 1"; - $Erg = db_query($SQL, "save Question"); - if ($Erg == 1) - { - echo "\tDer Eintrag wurde geändert
    \n"; - SetHeaderGo2Back(); - } - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - break; - -case "transfer": - if (!IsSet($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; - else - { - $SQL1="SELECT * FROM `Questions` WHERE `QID`='". $_GET["QID"]. "'"; - $Erg = mysql_query($SQL1, $con); - $SQL2="INSERT INTO `FAQ` Values ('', '". - mysql_result($Erg, 0, "Question")."', '".mysql_result($Erg, 0, "Answer")."')"; - $Erg = db_query($SQL2, "trasfert to request to the FAQ"); - if ($Erg == 1) - echo "\tDer Eintrag wurde übertragen.
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - - break; - -// *--------------------------------------------------------------------------- -// * FAQ - Bearbeitung -// *--------------------------------------------------------------------------- -// * je nach Übergabeoption ($quest) koennen FAQ's erfasst werden, -// * geaendert oder geloscht werden... -// *--------------------------------------------------------------------------- -case "faq": - $quest_bearb=0; // keine Fragenliste anzeigen, FAQ editieren... - echo "\tFAQ-Liste:
    "; - echo "Neuen Eintrag"; - - $SQL = "SELECT * FROM `FAQ`"; - $Erg = mysql_query($SQL, $con); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - for ($n = 0 ; $n < $Zeilen ; $n++) - if (mysql_result($Erg, $n, "Antwort")!="") - { - echo "\t

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

    \n"; - echo "\t

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

    \n"; - echo "\tBearbeiten\n
    ---
    \n"; - } - break; - -case "faqedit": - if (!IsSet($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; - else - { - $SQL = "SELECT * FROM `FAQ` WHERE `FID`='". $_GET["FAQID"]. "'"; - $Erg = mysql_query($SQL, $con); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + + $Erg = mysql_query($SQL, $con); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + for ($n = 0; $n < $Zeilen; $n++) { + echo "\n"; + echo "" . mysql_result($Erg, $n, "Question") . "\n"; + echo "" . UID2Nick(mysql_result($Erg, $n, "UID")) . "\n"; + echo ""; + if (mysql_result($Erg, $n, "AID") > 0) { + echo "Ja\n"; + echo "" . mysql_result($Erg, $n, "Answer") . "\n"; + echo "" . UID2Nick(mysql_result($Erg, $n, "AID")) . "\n"; + } else { + echo "Nein\n"; + echo " \n"; + echo " \n"; + } + echo "xxx"; + echo "\n"; + } + echo "\n"; + break; + + case "open" : + $SQL = "SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; + $quest_bearb = 1; // Fragenliste anzeigen + echo "\t\tOffene Anfragen:
    \n"; + break; + + case "edit" : + if (!IsSet ($_GET["QID"])) + echo "\t\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; + else { + $SQL = "SELECT * FROM `Questions` WHERE `QID`='" . $_GET["QID"] . "'"; + $Erg = mysql_query($SQL, $con); + echo "\t\t
    \n"; + echo "\t\tAnfrage von " . UID2NICK(mysql_result($Erg, 0, "UID")) . ":
    \n"; + echo "\t\t\n"; + echo "

    Antwort der Erzengel:
    \n"; + if (mysql_result($Erg, 0, "Answer") == "") + echo "\t\t
    \n"; + else + echo "\t\t\n
    \n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t
    \n"; + if (mysql_result($Erg, 0, "AID") <> "0") { + echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
    \n"; + echo "Als FAQ-Eintrag sichern...\n"; + } + } // Abfrage der QID + break; + + case "save" : + if (!IsSet ($_GET["QID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; + else { + $SQL = "UPDATE `Questions` SET `Question`='" . $_GET["Question"] . + "', `AID`='" . $_SESSION['UID'] . "' , `Answer`='" . $_GET["Answer"] . "' " . + "WHERE `QID`='" . $_GET["QID"] . "' LIMIT 1"; + $Erg = db_query($SQL, "save Question"); + if ($Erg == 1) { + echo "\tDer Eintrag wurde geändert
    \n"; + SetHeaderGo2Back(); + } else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + } + break; + + case "transfer" : + if (!IsSet ($_GET["QID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + else { + $SQL1 = "SELECT * FROM `Questions` WHERE `QID`='" . $_GET["QID"] . "'"; + $Erg = mysql_query($SQL1, $con); + $SQL2 = "INSERT INTO `FAQ` Values ('', '" . + mysql_result($Erg, 0, "Question") . "', '" . mysql_result($Erg, 0, "Answer") . "')"; + $Erg = db_query($SQL2, "trasfert to request to the FAQ"); + if ($Erg == 1) + echo "\tDer Eintrag wurde übertragen.
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + } + + break; + + // *--------------------------------------------------------------------------- + // * FAQ - Bearbeitung + // *--------------------------------------------------------------------------- + // * je nach �bergabeoption ($quest) koennen FAQ's erfasst werden, + // * geaendert oder geloscht werden... + // *--------------------------------------------------------------------------- + case "faq" : + $quest_bearb = 0; // keine Fragenliste anzeigen, FAQ editieren... + echo "\tFAQ-Liste:
    "; + echo "Neuen Eintrag"; + + $SQL = "SELECT * FROM `FAQ`"; + $Erg = mysql_query($SQL, $con); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + for ($n = 0; $n < $Zeilen; $n++) + if (mysql_result($Erg, $n, "Antwort") != "") { + echo "\t

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

    \n"; + echo "\t

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

    \n"; + echo "\tBearbeiten\n
    ---
    \n"; + } + break; + + case "faqedit" : + if (!IsSet ($_GET["FAQID"])) + echo "\tFehlerhafter Aufruf...
    Bitte die Bearbeitung nochmals beginnen :)\n"; + else { + $SQL = "SELECT * FROM `FAQ` WHERE `FID`='" . $_GET["FAQID"] . "'"; + $Erg = mysql_query($SQL, $con); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); ?>
    Frage:
    @@ -189,40 +179,40 @@ case "faqedit":
    -\n"; - else - echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; - } - break; - -case "faqsave"; - if (!IsSet($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; - else - { - $SQL = "UPDATE `FAQ` SET `Frage`='". $_GET["Frage"]. "', `Antwort`='". $_GET["Antwort"]. - "' WHERE `FID`='". $_GET["FAQID"]. "' LIMIT 1"; - $Erg = db_query($SQL, $con); - if ($Erg == 1) - echo "\tDer Eintrag wurde geändert
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - break; - -case "faqnew": +\n"; + else + echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; + } + break; + + case "faqsave"; + if (!IsSet ($_GET["FAQID"])) + echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; + else { + $SQL = "UPDATE `FAQ` SET `Frage`='" . $_GET["Frage"] . "', `Antwort`='" . $_GET["Antwort"] . + "' WHERE `FID`='" . $_GET["FAQID"] . "' LIMIT 1"; + $Erg = db_query($SQL, $con); + if ($Erg == 1) + echo "\tDer Eintrag wurde geändert
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + } + break; + + case "faqnew" : ?>
    Frage:
    @@ -233,51 +223,49 @@ case "faqnew":
    \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - break; - -} //switch ($_GET["quest"]) - - -// Hilfsroutine für die Anfragen: -// Fragenliste anzeigen??? -if ($quest_bearb==1) -{ - $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - if ($Zeilen==0) - echo "\tkeine vorhanden...\n"; - else - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo "\t

    ". nl2br(mysql_result($Erg, $n, "Question"))."\n


    \n"; - echo "\tBearbeiten\n"; - echo "
    ---
    \n"; - } - -} + + + break; + + case "faqnewsave"; + $SQL = "INSERT INTO `FAQ` VALUES ('', '" . $_GET["Frage"] . "', '" . $_GET["Antwort"] . "')"; + $Erg = db_query($SQL, "Save new FAQ entry"); + if ($Erg == 1) + echo "\tDer Eintrag wurde erfasst.
    \n"; + else + echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; + break; + + } //switch ($_GET["quest"]) + + // Hilfsroutine f�r die Anfragen: + // Fragenliste anzeigen??? + if ($quest_bearb == 1) { + $Erg = mysql_query($SQL, $con); + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + if ($Zeilen == 0) + echo "\tkeine vorhanden...\n"; + else + for ($n = 0; $n < $Zeilen; $n++) { + echo "\t

    " . nl2br(mysql_result($Erg, $n, "Question")) . "\n


    \n"; + echo "\tBearbeiten\n"; + echo "
    ---
    \n"; + } + + } } //if (IsSet($_GET["quest"])) -else -{ - echo "Bitte wähle aus, ob du:\n"; - echo "\n"; +else { + echo "Bitte wähle aus, ob du:\n"; + echo "\n"; } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/free.php b/www-ssl/admin/free.php index 577ef7be..b45fadcf 100644 --- a/www-ssl/admin/free.php +++ b/www-ssl/admin/free.php @@ -1,16 +1,15 @@ \n"; +echo "Hallo " . $_SESSION['Nick'] . ",
    \n"; echo "

    \n\nHier findest du alle Engel, welche zur Zeit in keiner Schicht verplant sind:

    \n"; - ####################################################### # Ermitteln freier Engel # @@ -33,22 +32,20 @@ $SQL = "SELECT Shifts.*, ShiftEntry.*, User.Nick ". "INNER JOIN (Shifts INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID) ON User.UID = ShiftEntry.UID ". "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() );"; */ -$SQL = "SELECT Shifts.*, ShiftEntry.* ". - "FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID ". - "WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; +$SQL = "SELECT Shifts.*, ShiftEntry.* " . +"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID " . +"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; //SELECT User.Nick, Schichtplan.*, Schichtbelegung. * FROM User LEFT JOIN Schichtbelegung ON User.UID=Schichtbelegung.UID, Schichtplan LEFT JOIN Schichtbelegung ON Schichtplan.SID = Schichtbelegung.SID WHERE Schichtplan.Date < now() and Schichtplan.EndDate > now() ORDER BY Nick //echo "
    $SQL
    "; $Erg = mysql_query($SQL, $con); -$Zeilen = mysql_num_rows($Erg); +$Zeilen = mysql_num_rows($Erg); // for ($i = 1; $i < mysql_num_fields($Erg); $i++) // echo "|".mysql_field_name($Erg, $i); - - echo "\n"; echo "\t\n"; echo "\t\t\n"; @@ -58,47 +55,44 @@ echo "\t\t\n"; echo "\t\t\n"; echo "\t\n"; - -$inuse=""; -for ($i=0; $i < $Zeilen; $i++) -{ - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(Nick = \"". UID2Nick(mysql_result($Erg, $i, "UID")). "\")"; +$inuse = ""; +for ($i = 0; $i < $Zeilen; $i++) { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + if ($inuse != "") + $inuse .= " OR "; + $inuse .= "(Nick = \"" . UID2Nick(mysql_result($Erg, $i, "UID")) . "\")"; } -if ($inuse!="") - $inuse=" WHERE NOT (".$inuse.")"; +if ($inuse != "") + $inuse = " WHERE NOT (" . + $inuse . ")"; echo "
    NickVonBis
    ". - UID2Nick(mysql_result($Erg, $i, "UID")). "". mysql_result($Erg, $i, "RID"). "". mysql_result($Erg, $i, "DateS"). "". mysql_result($Erg, $i, "DateE"). "
    " . + UID2Nick(mysql_result($Erg, $i, "UID")) . "" . mysql_result($Erg, $i, "RID") . "" . mysql_result($Erg, $i, "DateS") . "" . mysql_result($Erg, $i, "DateE") . "
    \n"; - //########################################################################################################## echo "

    \n\nhier findest du alle Engel, welche zur Zeit in keiner Schichten verplant sind:

    \n"; echo "\n"; echo "\t\n\t\t\n\t\t\n\t\n"; -$SQL = "SELECT Nick, UID, DECT FROM User".$inuse.";"; +$SQL = "SELECT Nick, UID, DECT FROM User" . $inuse . ";"; $Erg = mysql_query($SQL, $con); -$Zeilen = mysql_num_rows($Erg); -for ($i=0; $i < $Zeilen; $i++) -{ - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\n\n"; +$Zeilen = mysql_num_rows($Erg); +for ($i = 0; $i < $Zeilen; $i++) { + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\n\n"; } echo "
    NickDECT
    ". - mysql_result($Erg, $i, "Nick"). "". mysql_result($Erg, $i, "DECT"). "
    " . + mysql_result($Erg, $i, "Nick") . "" . mysql_result($Erg, $i, "DECT") . "
    \n"; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/free_DECT.php b/www-ssl/admin/free_DECT.php index 83a4123f..4b4e3085 100644 --- a/www-ssl/admin/free_DECT.php +++ b/www-ssl/admin/free_DECT.php @@ -1,9 +1,9 @@ =Now() AND ShiftEntry.UID>0);"; +$SQL = "SELECT Shifts.*, ShiftEntry.* " . +"FROM `Shifts` INNER JOIN ShiftEntry ON Shifts.SID = ShiftEntry.SID " . +"WHERE (Shifts.DateS<=Now() AND Shifts.DateE>=Now() AND ShiftEntry.UID>0);"; $Erg = mysql_query($SQL, $con); -$Zeilen = mysql_num_rows($Erg); +$Zeilen = mysql_num_rows($Erg); -$inuse=""; -for ($i=0; $i < $Zeilen; $i++) -{ - if ($inuse!="") - $inuse.= " OR "; - $inuse.= "(UID = \"". mysql_result($Erg, $i, "UID"). "\")"; -} -if ($inuse!="") -{ - $inuse=" WHERE (NOT (".$inuse.")) AND (DECT!='')"; +$inuse = ""; +for ($i = 0; $i < $Zeilen; $i++) { + if ($inuse != "") + $inuse .= " OR "; + $inuse .= "(UID = \"" . mysql_result($Erg, $i, "UID") . "\")"; } -else -{ - $inuse=" WHERE (DECT!='')"; +if ($inuse != "") { + $inuse = " WHERE (NOT (" . $inuse . ")) AND (DECT!='')"; +} else { + $inuse = " WHERE (DECT!='')"; } - //########################################################################################################## -$SQL = "SELECT * FROM User".$inuse.";"; +$SQL = "SELECT * FROM User" . $inuse . ";"; $Erg = mysql_query($SQL, $con); -$Zeilen = mysql_num_rows($Erg); -for ($i=0; $i < $Zeilen; $i++) -{ - // get DECT number - echo mysql_result($Erg, $i, "DECT"). "\t"; +$Zeilen = mysql_num_rows($Erg); +for ($i = 0; $i < $Zeilen; $i++) { + // get DECT number + echo mysql_result($Erg, $i, "DECT") . "\t"; - // get all user rights - $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=". mysql_result($Erg, $i, "UID"). ";"; - $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); - $UserRights = mysql_fetch_array($Erg_RIGHT); + // get all user rights + $SQL_RIGHT = "SELECT * FROM UserCVS WHERE UID=" . mysql_result($Erg, $i, "UID") . ";"; + $Erg_RIGHT = mysql_query($SQL_RIGHT, $con); + $UserRights = mysql_fetch_array($Erg_RIGHT); - foreach( $UserRights as $Var => $Value) - { - if( (strpos( $Var, ".php") === false) AND - (strpos( $Var, "/") === false) AND - (strpos( $Var, "UID") === false) AND - (is_numeric($Var) === false) ) - { - echo "\"".$Var. "\"=". $Value. "\t"; - } - } + foreach ($UserRights as $Var => $Value) { + if ((strpos($Var, ".php") === false) AND (strpos($Var, "/") === false) AND (strpos($Var, "UID") === false) AND (is_numeric($Var) === false)) { + echo "\"" . $Var . "\"=" . $Value . "\t"; + } + } - // get shift types - $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=". mysql_result($Erg, $i, "UID"). " GROUP BY TID;"; - $Erg_TYPES = mysql_query($SQL_TYPES, $con); - $Zeilen_Typen = mysql_num_rows($Erg_TYPES); - for ($j=0; $j < $Zeilen_Typen; $j++) - { - echo "\"TID_". TID2Type( mysql_result($Erg_TYPES, $j, "TID")). "\"=Y\t"; - } + // get shift types + $SQL_TYPES = "SELECT TID FROM `ShiftEntry` WHERE UID=" . mysql_result($Erg, $i, "UID") . " GROUP BY TID;"; + $Erg_TYPES = mysql_query($SQL_TYPES, $con); + $Zeilen_Typen = mysql_num_rows($Erg_TYPES); + for ($j = 0; $j < $Zeilen_Typen; $j++) { + echo "\"TID_" . TID2Type(mysql_result($Erg_TYPES, $j, "TID")) . "\"=Y\t"; + } - echo "\n"; -// echo "
    "; + echo "\n"; + // echo "
    "; } - ?> diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php index f42fea97..b8a52ec2 100644 --- a/www-ssl/admin/group.php +++ b/www-ssl/admin/group.php @@ -1,49 +1,49 @@ \n"; - echo "\n"; - echo "\tGroupname\n"; - echo "\tLink\n"; - echo "\n"; - - for ($n = 0 ; $n < $Zeilen ; $n++) { - echo "\n"; - echo "\t".mysql_result($Erg, $n, "Name")."\n"; - - echo "change\n"; - echo "\n"; - } - - // new form - echo "\n"; - echo "\t
    \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
    \n"; - echo "\n"; - - echo "\t\n"; - // Ende Userliste -} - -include ("../../../camp2011/includes/footer.php"); +include ("includes/header.php"); +include ("includes/funktion_db_list.php"); + +if (!IsSet ($_GET["enterGID"])) { + // Userliste, keine UID uebergeben... + + $SQL = "SELECT * FROM `UserGroups` ORDER BY `Name` ASC"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + echo "\n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + for ($n = 0; $n < $Zeilen; $n++) { + echo "\n"; + echo "\t\n"; + + echo "\n"; + echo "\n"; + } + + // new form + echo "\n"; + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + echo "\n"; + + echo "\t
    GroupnameLink
    " . mysql_result($Erg, $n, "Name") . "change
    \n"; + // Ende Userliste +} + +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php index e7be285c..4e761078 100644 --- a/www-ssl/admin/index.php +++ b/www-ssl/admin/index.php @@ -1,12 +1,12 @@ \n"; +include ("includes/header.php"); +include ("includes/funktion_db_list.php"); +echo "Hallo Erzengel " . $_SESSION['Nick'] . ",
    \n"; ?> du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.

    @@ -14,6 +14,8 @@ du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen Bitte melde dich hier nach getaner Arbeit immer ab, damit kein anderer hier Änderungen vornehmen kann. diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php index 09006675..e3defb23 100644 --- a/www-ssl/admin/room.php +++ b/www-ssl/admin/room.php @@ -1,199 +1,180 @@ \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen ". - "oder vorhandene abzuändern:

    \n"; - - echo "- Neuen Raum/Ort eintragen
    \n"; - - echo "\n"; - echo "\n"; - - for( $i = 1; $i < mysql_num_fields($Erg); $i++ ) - { - if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") - echo "\t"; - else - echo "\t"; - } - echo "\t"; - echo ""; - - for( $t = 0; $t < mysql_num_rows($Erg); $t++ ) - { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) - { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
    Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "". mysql_field_name($Erg, $i)."Ändern
    ".mysql_result($Erg, $t, $j)."###
    "; -} -else -{ - -UnSet($SQL); - -switch ($_GET["action"]) { - -case 'new': - echo "Neuen Raum einrichten:
    "; - echo "
    \n"; - echo "\n"; - - for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ ) - { - if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") ) - { - echo "". - "\n"; - } - else - { - //sonderfall fuer Default Engel - if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") - $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)]; - else - $FeldName = mysql_field_name($Erg, $Uj); - - echo "". - "\n"; - } - } - echo "
    ". mysql_field_name($Erg, $Uj). "". - "Yes". - "No". - "
    $FeldName"; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - break; - -case 'newsave': - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys = ""; - $Values = ""; - foreach($vars as $key => $value) - { - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - $SQL = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")"; - SetHeaderGo2Back(); - break; - -case 'change': - if (! IsSet($_GET["RID"])) - echo "Fehlerhafter Aufruf!"; - else - { - $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; - $ERG = mysql_query($SQL2, $con); - - if( mysql_num_rows( $ERG)>0) - { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; - echo "
    \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - { - if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") ) - { - echo "". - "\n"; - } - else - { - if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") - //sonderfall fuer Default Engel - $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)]; - else - $FeldName = mysql_field_name($ERG, $Uj); - echo "". - "\n"; - } - } - echo "
    ". mysql_field_name($Erg, $Uj). "". - "Yes". - "No". - "
    $FeldName". - "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
    "; - } - else - echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden"; - } - break; - -case 'changesave': - $sql=""; - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - foreach($vars as $key => $value) - { - $keys = substr($key,1); - $sql .= ", `".$keys."`='".$value."' "; - } - $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'"; - SetHeaderGo2Back(); - break; - -case 'delete': - if (IsSet($_GET["RID"])) { - $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'"; - } else { - echo "Fehlerhafter Aufruf"; - } - SetHeaderGo2Back(); - break; - -} //switch - - -// Update ??? - -if (IsSet($SQL)){ -// echo $SQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, "exec SQL"); - if ($Erg == 1) - echo "Änderung wurde gesichert...
    "; - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

    ".mysql_error( $con ). "
    ($SQL)
    "; - } -} // Ende Update +if (!IsSet ($_GET["action"])) { + echo "Hallo " . $_SESSION['Nick'] . + ",
    \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen " . + "oder vorhandene abzuändern:

    \n"; + + echo "- Neuen Raum/Ort eintragen
    \n"; + + echo "\n"; + echo "\n"; + + for ($i = 1; $i < mysql_num_fields($Erg); $i++) { + if (substr(mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") + echo "\t"; + else + echo "\t"; + } + echo "\t"; + echo ""; + + for ($t = 0; $t < mysql_num_rows($Erg); $t++) { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) { + echo "\t\t\n"; + } + echo "\t\t\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo "
    Anzahl " . $EngelTypeID[substr(mysql_field_name($Erg, $i), 12)] . "" . mysql_field_name($Erg, $i) . "Ändern
    " . mysql_result($Erg, $t, $j) . "###
    "; +} else { + + UnSet ($SQL); + + switch ($_GET["action"]) { + + case 'new' : + echo "Neuen Raum einrichten:
    "; + echo "
    \n"; + echo "\n"; + + for ($Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++) { + if ((mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf")) { + echo "" . + "\n"; + } else { + //sonderfall fuer Default Engel + if (substr(mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") + $FeldName = "Anzahl " . $EngelTypeID[substr(mysql_field_name($Erg, $Uj), 12)]; + else + $FeldName = mysql_field_name($Erg, $Uj); + + echo "" . + "\n"; + } + } + echo "
    " . mysql_field_name($Erg, $Uj) . "" . + "Yes" . + "No" . + "
    $FeldName"; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + break; + + case 'newsave' : + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys = ""; + $Values = ""; + foreach ($vars as $key => $value) { + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + $SQL = "INSERT INTO `Room` (" . substr($Keys, 2) . ") VALUES (" . substr($Values, 2) . ")"; + SetHeaderGo2Back(); + break; + + case 'change' : + if (!IsSet ($_GET["RID"])) + echo "Fehlerhafter Aufruf!"; + else { + $SQL2 = "SELECT * FROM `Room` WHERE `RID`='" . $_GET["RID"] . "'"; + $ERG = mysql_query($SQL2, $con); + + if (mysql_num_rows($ERG) > 0) { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; + echo "
    \n"; + echo "\n"; + + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) { + if ((mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf")) { + echo "" . + "\n"; + } else { + if (substr(mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") + //sonderfall fuer Default Engel + $FeldName = "Anzahl " . $EngelTypeID[substr(mysql_field_name($ERG, $Uj), 12)]; + else + $FeldName = mysql_field_name($ERG, $Uj); + echo "" . + "\n"; + } + } + echo "
    " . mysql_field_name($Erg, $Uj) . "" . + "Yes" . + "No" . + "
    $FeldName" . + "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + echo "
    \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
    "; + } else + echo "FEHLER: Room ID " . $_GET["RID"] . " nicht gefunden"; + } + break; + + case 'changesave' : + $sql = ""; + $vars = $_GET; + $count = count($vars) - 2; + $vars = array_splice($vars, 0, $count); + foreach ($vars as $key => $value) { + $keys = substr($key, 1); + $sql .= ", `" . $keys . "`='" . $value . "' "; + } + $SQL = "UPDATE `Room` SET " . substr($sql, 2) . " WHERE `RID`='" . $_GET["eRID"] . "'"; + SetHeaderGo2Back(); + break; + + case 'delete' : + if (IsSet ($_GET["RID"])) { + $SQL = "DELETE FROM `Room` WHERE `RID`='" . $_GET["RID"] . "'"; + } else { + echo "Fehlerhafter Aufruf"; + } + SetHeaderGo2Back(); + break; + + } //switch + + // Update ??? + + if (IsSet ($SQL)) { + // echo $SQL; + // hier muesste das SQL ausgefuehrt werden... + $Erg = db_query($SQL, "exec SQL"); + if ($Erg == 1) + echo "Änderung wurde gesichert...
    "; + else { + echo "Fehler beim speichern... bitte noch ein mal probieren :)"; + echo "

    " . mysql_error($con) . "
    ($SQL)
    "; + } + } // Ende Update } //IF IsSet($action) -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/schichtplan.php b/www-ssl/admin/schichtplan.php index af3cd7d4..70ef5a6a 100644 --- a/www-ssl/admin/schichtplan.php +++ b/www-ssl/admin/schichtplan.php @@ -1,32 +1,30 @@ \n"; - if ($Erg == 1) - { - echo "SQL war erfolgreich"; - } - else - { - echo "SQL Fehler (". mysql_error($con).")" ; - } +include ("includes/header.php"); + +function executeSQL($SQL) { + global $debug, $con; + + $Erg = mysql_query($SQL, $con); + if ($debug) + echo "DEBUG SQL: $SQL
    \n"; + if ($Erg == 1) { + echo "SQL war erfolgreich"; + } else { + echo "SQL Fehler (" . mysql_error($con) . ")"; + } } -if (!IsSet($_GET["action"])) { -echo "Hallo ".$_SESSION['Nick'].",
    \n"; -echo "hier kannst du Schichten anlegen, ändern oder löschen.

    "; -echo "Neue Schicht einplanen

    \n\n"; +if (!IsSet ($_GET["action"])) { + echo "Hallo " . $_SESSION['Nick'] . ",
    \n"; + echo "hier kannst du Schichten anlegen, ändern oder löschen.

    "; + echo "Neue Schicht einplanen

    \n\n"; -echo "
    \n"; + echo "\n"; ?> @@ -38,358 +36,327 @@ echo "\n"; \n"; - echo "\t\t\n"; - echo "\t\t\n"; - - $sql2= "SELECT `Name` FROM `Room` WHERE `RID`='".mysql_result($Erg, $i, "RID")."'"; - $Erg2 = mysql_query($sql2, $con); - if( mysql_num_rows($Erg2) > 0) - echo "\t\t\n"; - else - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; -} -echo "
    ".mysql_result($Erg, $i, "DateS")."".mysql_result($Erg2, 0, "Name")."Unbenkannt (RID=". mysql_result($Erg, $i, "RID"). ")".mysql_result($Erg, $i, "Len")." Std. ####
    \n"; -echo "\n"; -echo "\n"; -echo "
    \n"; + $sql = "SELECT `SID`, `DateS`, `RID`, `Len` FROM `Shifts` " . + "ORDER BY `RID`, `DateS` "; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + for ($i = 0; $i < $rowcount; $i++) { + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t" . mysql_result($Erg, $i, "DateS") . "\n"; + + $sql2 = "SELECT `Name` FROM `Room` WHERE `RID`='" . mysql_result($Erg, $i, "RID") . "'"; + $Erg2 = mysql_query($sql2, $con); + if (mysql_num_rows($Erg2) > 0) + echo "\t\t" . mysql_result($Erg2, 0, "Name") . "\n"; + else + echo "\t\tUnbenkannt (RID=" . mysql_result($Erg, $i, "RID") . ")\n"; + echo "\t\t" . mysql_result($Erg, $i, "Len") . " Std. \n"; + echo "\t\t####\n"; + echo "\t\n"; + } + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; } else { -// aus sicherheitzgründen wegen späterer genuzung -UnSet($chSQL); - -switch ($_GET["action"]){ - -case 'change': - if ( !IsSet($_GET["SID"]) ) - { - echo "Fehlerhafter Aufruf!\n"; - } - else - { - - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; - $Erg = mysql_query($sql, $con); - - echo "Schicht abändern:
    \n"; - - // Anzeige Allgemeiner schaischt daten - echo "
    "; - echo "\n"; - echo " ". - "\n"; - echo " \n"; - - echo " ". - "\n"; - echo " ". - "\n"; - echo " ". - "\n"; - if( $FromPentabarf == "Y") - { - echo " ". - "\n"; - } - echo "
    Schichtbeginn
    Raum\n\n
    Dauer in h
    Beschreibung
    URL

    !!! Imported from Pentabarf !!!

    \n"; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    \n\n"; - - // Löschen - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    \n\n"; - - echo "ACHTUNG:
    \n"; - echo "Beim Löschen werden die bisher eingetragenen Engel für diese Schicht mitgelöscht.
    \n"; - - echo "
    \n\n\n\n"; - - //Freie Engelschichten - $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `UID`='0'"; - $Erg3 = mysql_query($sql3, $con); - $rowcount = mysql_num_rows($Erg3); - - echo "Folgende Engelschichten sind noch nicht vergeben.\n"; - echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:
    \n"; - for ($j=0; $j < $rowcount; $j++) - { - $TID = mysql_result($Erg3, $j, 0); - echo "". - "freie ". TID2Type($TID). Get_Text("inc_schicht_Engel"). "schicht loeschen
    \n"; - } - echo "
    \n\n\n\n"; - - //Ausgabe eingetragener schischten - $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND NOT `UID`='0'"; - $Erg3 = mysql_query($sql3, $con); - $rowcount = mysql_num_rows($Erg3); - - echo "Folgende Engel Sind fuer die Schicht eingetargen.\n"; - echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:
    \n"; - echo "\n". - "". - "". - "". - "". - "". - ""; - - for ($j=0; $j < $rowcount; $j++) - { - $userUID=mysql_result($Erg3, $j, "UID"); - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - } // FOR - - echo "
    nicktypenormalfreeloader :-(
    ". UID2Nick($userUID). "". TID2Type(mysql_result($Erg3, $j, "TID")). Get_Text("inc_schicht_Engel"). "###-austragen-######-austragen-freeloader-###

    \n\n\n\n"; - - //Nachtragen von Engeln - echo "Hat ein anderer Engel die Schicht übernommen, trage ihn bitte ein:"; - echo "
    \n"; - echo "\n"; - echo "\n"; - - // Listet alle Nicks auf - echo "\n"; - - echo " als \n"; - - // holt eine liste der benötigten Engel zu dieser Schischt - $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` "; - $sql3.= "WHERE (`SID`='". $_GET["SID"]. "' AND `UID`='0') "; - $sql3.= "GROUP BY `SID`, `TID`, `UID` "; - $Erg3 = mysql_query($sql3, $con); - $i=-1; - while( ++$i < mysql_num_rows($Erg3)) - { - $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID"); - } - - // Gibt dei möglich Engeltypen aus und zeigt wíefiel noch beötigt werden - echo "\n"; - - echo "\n"; - - echo "
    \n Anzahl New\n"; - - echo "
    "; - - } // IF ISSET( - break; - -case 'engeladd': - if( $_GET["UIDs"]>0) - { - - $SQL = "SELECT * FROM `ShiftEntry` ". - "WHERE (`SID`='". $_GET["SID"]. "' AND `TID`='". $_GET["TID"]. "' AND `UID`='0')"; - $ERG = mysql_query($SQL, $con); - if( mysql_num_rows($ERG) != 0 ) - { - $chSQL = "UPDATE `ShiftEntry` SET ". - "`UID`='". $_GET["UIDs"]. "', `Comment`='shift added by ".$_SESSION['Nick']."' ". - "WHERE (`SID`='". $_GET["SID"]. "' AND ". - "`TID`='". $_GET["TID"]. "' AND `UID`='0' ) LIMIT 1"; - } - else - { - $chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (". - "'". $_GET["SID"]. "', '". $_GET["TID"]. "', ". - "'". $_GET["UIDs"]. "', 'shift added by ".$_SESSION['Nick']."')"; - } - echo "Es wird folgende Schicht zusätzlich eingetragen:
    \n"; - echo "Engel: ".UID2Nick($_GET["UIDs"])."
    \n"; - echo "Bemerkung: Schicht eingetragen durch Erzengel ".$_SESSION['Nick']."
    \n
    \n"; - } - else - { - echo "Es wird folgende Schicht wurde ". $_GET["eAnzahlNew"]. "x zusätzlich eingetragen:
    \n"; - for( $i=0; $i<$_GET["eAnzahlNew"]; $i++) - { - echo "$i.
    \n"; - $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES ("; - $SQL .= "'". $_GET["SID"]. "', '". $_GET["TID"]. "', '0', NULL)"; - $ERG = mysql_query($SQL, $con); - if( $debug ) - echo "DEBUG SQL: $SQL
    \n"; - if ($ERG == 1) - { - echo "Änderung wurde gesichert...
    "; - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; - echo mysql_error($con); - } - echo "Es wird eine weitere Schicht eingetragen:

    \n"; - } - } - break; - -case 'engeldel': - $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='". $_GET["SID"]. - "' AND `UID`='". $_GET["UIDs"]. "') LIMIT 1"; - if( isset($_GET["freeloader"]) && $_GET["freeloader"]==1) - { - $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '". $_GET["SID"]. "' )"; - $Erg = mysql_query($sql, $con); - if( mysql_num_rows( $Erg) == 1) - { - $UID = $_GET["UIDs"]; - $Length = mysql_result($Erg, 0, "Len"); - $Comment = "Start: ". mysql_result($Erg, 0, "DateS"). "; ". - "Beschreibung: ". mysql_result($Erg, 0, "Man"). "; ". - "Removed by ". $_SESSION['Nick']; - $ch2SQL = - "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) ". - "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');"; - } - } - break; - -case 'engelshiftdel': - $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "' AND `TID`='". - $_GET["TID"]. "' AND `UID`='0' LIMIT 1"; - break; - -case 'changesave': - $query = mysql_query("SELECT DATE_ADD('". $_GET["eDate"]. "', INTERVAL '+0 ". $_GET["eDauer"]. "' DAY_HOUR)", $con); - $enddate = mysql_fetch_row($query); - - $chSQL = "UPDATE `Shifts` SET ". - "`DateS`='". $_GET["eDate"]. "', ". - "`DateE`='".$enddate[0]. "', ". - "`RID`='". $_GET["eRID"]. "', ". - "`Len`='". $_GET["eDauer"]. "', ". - "`Man`='". $_GET["eName"]. "', ". - "`URL`='". $_GET["eURL"]. "' ". - "WHERE `SID`='". $_GET["SID"]. "'"; - SetHeaderGo2Back(); - break; - -case 'delete': - $chSQL = "DELETE FROM `Shifts` WHERE `SID`='". $_GET["SID"]. "' LIMIT 1"; - $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='". $_GET["SID"]. "'"; - SetHeaderGo2Back(); - break; - -case 'deleteShifs': - foreach ($_GET as $k => $v) - if( strpos( " ".$k, "SID") == 1) - { - echo "Shifts $v wird gelöscht..."; - executeSQL( "DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1"); - echo "
    \n"; - echo "ShiftEntry $v wird gelöscht..."; - executeSQL( "DELETE FROM `ShiftEntry` WHERE `SID`='$v'"); - echo "

    \n"; - } - break; - -} // end switch - -if (IsSet($chSQL)){ -// echo $chSQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = mysql_query($chSQL, $con); - if( $debug ) - echo "DEBUG SQL: $chSQL
    \n"; - if ($Erg == 1) - { - echo "Änderung wurde gesichert...
    "; - if( $debug ) - echo "DEBUG: ergebniss". $Erg. "
    \n"; - if (IsSet($ch2SQL)) - { - $Erg = mysql_query($ch2SQL, $con); - if( $debug ) - echo "DEBUG SQL: $ch2SQL
    \n"; - if( $debug ) echo "DEBUG: ergebniss". $Erg. "
    \n"; - } - } - else - { - echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; - echo mysql_error($con); - } -} // Ende Update + // aus sicherheitzgr�nden wegen sp�terer genuzung + UnSet ($chSQL); -} + switch ($_GET["action"]) { + + case 'change' : + if (!IsSet ($_GET["SID"])) { + echo "Fehlerhafter Aufruf!\n"; + } else { + + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "' )"; + $Erg = mysql_query($sql, $con); + + echo "Schicht abändern:
    \n"; + + // Anzeige Allgemeiner schaischt daten + echo "
    "; + echo "\n"; + echo " " . + "\n"; + echo " \n"; + + echo " " . + "\n"; + echo " " . + "\n"; + echo " " . + "\n"; + if ($FromPentabarf == "Y") { + echo " " . + "\n"; + } + echo "
    Schichtbeginn
    Raum\n\n
    Dauer in h
    Beschreibung
    URL

    !!! Imported from Pentabarf !!!

    \n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    \n\n"; + + // L�schen + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    \n\n"; + + echo "ACHTUNG:
    \n"; + echo "Beim Löschen werden die bisher eingetragenen Engel für diese Schicht mitgelöscht.
    \n"; + + echo "
    \n\n\n\n"; + + //Freie Engelschichten + $sql3 = "SELECT `TID` FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND `UID`='0'"; + $Erg3 = mysql_query($sql3, $con); + $rowcount = mysql_num_rows($Erg3); + + echo "Folgende Engelschichten sind noch nicht vergeben.\n"; + echo "Und koenen, wenn diese nSchicht nicht benoetigt wird geloet werden:
    \n"; + for ($j = 0; $j < $rowcount; $j++) { + $TID = mysql_result($Erg3, $j, 0); + echo "" . + "freie " . TID2Type($TID) . Get_Text("inc_schicht_Engel") . "schicht loeschen
    \n"; + } + echo "
    \n\n\n\n"; + + //Ausgabe eingetragener schischten + $sql3 = "SELECT * FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND NOT `UID`='0'"; + $Erg3 = mysql_query($sql3, $con); + $rowcount = mysql_num_rows($Erg3); + + echo "Folgende Engel Sind fuer die Schicht eingetargen.\n"; + echo "Und koennen, wenn diese nicht zu Schicht erschienen sind ausgetragen werden:
    \n"; + echo "\n" . + "" . + "" . + "" . + "" . + "" . + ""; + + for ($j = 0; $j < $rowcount; $j++) { + $userUID = mysql_result($Erg3, $j, "UID"); + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + } // FOR + + echo "
    nicktypenormalfreeloader :-(
    " . UID2Nick($userUID) . "" . TID2Type(mysql_result($Erg3, $j, "TID")) . Get_Text("inc_schicht_Engel") . "###-austragen-######-austragen-freeloader-###

    \n\n\n\n"; + //Nachtragen von Engeln + echo "Hat ein anderer Engel die Schicht übernommen, trage ihn bitte ein:"; + echo "
    \n"; + echo "\n"; + echo "\n"; + + // Listet alle Nicks auf + echo "\n"; + + echo " als \n"; + + // holt eine liste der ben�tigten Engel zu dieser Schischt + $sql3 = "SELECT Count(`TID`) AS `CTID`, `TID` FROM `ShiftEntry` "; + $sql3 .= "WHERE (`SID`='" . $_GET["SID"] . "' AND `UID`='0') "; + $sql3 .= "GROUP BY `SID`, `TID`, `UID` "; + $Erg3 = mysql_query($sql3, $con); + $i = -1; + while (++ $i < mysql_num_rows($Erg3)) { + $EngelNeed[mysql_result($Erg3, $i, "TID")] = mysql_result($Erg3, $i, "CTID"); + } + + // Gibt dei m�glich Engeltypen aus und zeigt w�efiel noch be�tigt werden + echo "\n"; + + echo "\n"; + + echo "
    \n Anzahl New\n"; + + echo "
    "; + + } // IF ISSET( + break; + + case 'engeladd' : + if ($_GET["UIDs"] > 0) { + + $SQL = "SELECT * FROM `ShiftEntry` " . + "WHERE (`SID`='" . $_GET["SID"] . "' AND `TID`='" . $_GET["TID"] . "' AND `UID`='0')"; + $ERG = mysql_query($SQL, $con); + if (mysql_num_rows($ERG) != 0) { + $chSQL = "UPDATE `ShiftEntry` SET " . + "`UID`='" . $_GET["UIDs"] . "', `Comment`='shift added by " . $_SESSION['Nick'] . "' " . + "WHERE (`SID`='" . $_GET["SID"] . "' AND " . + "`TID`='" . $_GET["TID"] . "' AND `UID`='0' ) LIMIT 1"; + } else { + $chSQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES (" . + "'" . $_GET["SID"] . "', '" . $_GET["TID"] . "', " . + "'" . $_GET["UIDs"] . "', 'shift added by " . $_SESSION['Nick'] . "')"; + } + echo "Es wird folgende Schicht zusätzlich eingetragen:
    \n"; + echo "Engel: " . UID2Nick($_GET["UIDs"]) . "
    \n"; + echo "Bemerkung: Schicht eingetragen durch Erzengel " . $_SESSION['Nick'] . "
    \n
    \n"; + } else { + echo "Es wird folgende Schicht wurde " . $_GET["eAnzahlNew"] . "x zusätzlich eingetragen:
    \n"; + for ($i = 0; $i < $_GET["eAnzahlNew"]; $i++) { + echo "$i.
    \n"; + $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`, `UID`, `Comment`) VALUES ("; + $SQL .= "'" . $_GET["SID"] . "', '" . $_GET["TID"] . "', '0', NULL)"; + $ERG = mysql_query($SQL, $con); + if ($debug) + echo "DEBUG SQL: $SQL
    \n"; + if ($ERG == 1) { + echo "Änderung wurde gesichert...
    "; + } else { + echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; + echo mysql_error($con); + } + echo "Es wird eine weitere Schicht eingetragen:

    \n"; + } + } + break; + + case 'engeldel' : + $chSQL = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`= 'NULL' WHERE (`SID`='" . $_GET["SID"] . + "' AND `UID`='" . $_GET["UIDs"] . "') LIMIT 1"; + if (isset ($_GET["freeloader"]) && $_GET["freeloader"] == 1) { + $sql = "SELECT * FROM `Shifts` WHERE (`SID` = '" . $_GET["SID"] . "' )"; + $Erg = mysql_query($sql, $con); + if (mysql_num_rows($Erg) == 1) { + $UID = $_GET["UIDs"]; + $Length = mysql_result($Erg, 0, "Len"); + $Comment = "Start: " . mysql_result($Erg, 0, "DateS") . "; " . + "Beschreibung: " . mysql_result($Erg, 0, "Man") . "; " . + "Removed by " . $_SESSION['Nick']; + $ch2SQL = "INSERT INTO `ShiftFreeloader` (`Remove_Time`, `UID`, `Length`, `Comment`) " . + "VALUES ( CURRENT_TIMESTAMP, '$UID', '$Length', '$Comment');"; + } + } + break; + + case 'engelshiftdel' : + $chSQL = "DELETE FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "' AND `TID`='" . + $_GET["TID"] . "' AND `UID`='0' LIMIT 1"; + break; + + case 'changesave' : + $query = mysql_query("SELECT DATE_ADD('" . $_GET["eDate"] . "', INTERVAL '+0 " . $_GET["eDauer"] . "' DAY_HOUR)", $con); + $enddate = mysql_fetch_row($query); + + $chSQL = "UPDATE `Shifts` SET " . + "`DateS`='" . $_GET["eDate"] . "', " . + "`DateE`='" . $enddate[0] . "', " . + "`RID`='" . $_GET["eRID"] . "', " . + "`Len`='" . $_GET["eDauer"] . "', " . + "`Man`='" . $_GET["eName"] . "', " . + "`URL`='" . $_GET["eURL"] . "' " . + "WHERE `SID`='" . $_GET["SID"] . "'"; + SetHeaderGo2Back(); + break; + + case 'delete' : + $chSQL = "DELETE FROM `Shifts` WHERE `SID`='" . $_GET["SID"] . "' LIMIT 1"; + $ch2SQL = "DELETE FROM `ShiftEntry` WHERE `SID`='" . $_GET["SID"] . "'"; + SetHeaderGo2Back(); + break; + + case 'deleteShifs' : + foreach ($_GET as $k => $v) + if (strpos(" " . $k, "SID") == 1) { + echo "Shifts $v wird gel�scht..."; + executeSQL("DELETE FROM `Shifts` WHERE `SID`='$v' LIMIT 1"); + echo "
    \n"; + echo "ShiftEntry $v wird gel�scht..."; + executeSQL("DELETE FROM `ShiftEntry` WHERE `SID`='$v'"); + echo "

    \n"; + } + break; + + } // end switch + + if (IsSet ($chSQL)) { + // echo $chSQL; + // hier muesste das SQL ausgefuehrt werden... + $Erg = mysql_query($chSQL, $con); + if ($debug) + echo "DEBUG SQL: $chSQL
    \n"; + if ($Erg == 1) { + echo "Änderung wurde gesichert...
    "; + if ($debug) + echo "DEBUG: ergebniss" . $Erg . "
    \n"; + if (IsSet ($ch2SQL)) { + $Erg = mysql_query($ch2SQL, $con); + if ($debug) + echo "DEBUG SQL: $ch2SQL
    \n"; + if ($debug) + echo "DEBUG: ergebniss" . $Erg . "
    \n"; + } + } else { + echo "Fehler beim speichern... bitte noch ein mal probieren :)
    "; + echo mysql_error($con); + } + } // Ende Update + +} -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/schichtplan_druck.php b/www-ssl/admin/schichtplan_druck.php index ef097043..3e856c5e 100644 --- a/www-ssl/admin/schichtplan_druck.php +++ b/www-ssl/admin/schichtplan_druck.php @@ -1,54 +1,50 @@ \n". - "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n". - "
    \n"; - - foreach( $VeranstaltungsTage as $k => $v) - { - - $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;",$con); - for ($i = 0; $i < mysql_num_rows($res); $i++) - { - $Tag = $VeranstaltungsTage[$k]; - $RID = mysql_result($res,$i,"RID"); - $Rname = mysql_result($res, $i, "Name"); - echo "\t$Tag $Rname
    \n"; - } - echo "
    \n"; - } - echo "

    "; - - include ("../../../camp2011/includes/footer.php"); -} -else //################################################################# -{ - if (IsSet($_GET["Raum"]) AND IsSet($_GET["ausdatum"])) - { - $Raum = $_GET["Raum"]; - $ausdatum = $_GET["ausdatum"]; - - include ("../../../camp2011/includes/config_db.php"); - include ("../../../camp2011/includes/config.php"); - include ("../../../camp2011/includes/secure.php"); - //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! - $_SESSION['CVS'][ "admin/schichtplan.php" ] = "N"; - include ("../../../camp2011/includes/funktion_lang.php"); - include ("../../../camp2011/includes/funktion_schichtplan.php"); - include ("../../../camp2011/includes/funktion_schichtplan_aray.php"); - include ("../../../camp2011/includes/funktion_user.php"); - ?> +if (!IsSet ($_GET["action"])) { + include ("includes/header.php"); + include ("includes/funktionen.php"); + include ("includes/funktion_schichtplan_aray.php"); + include ("includes/funktion_schichtplan.php"); + + echo "Hallo " . $_SESSION['Nick'] . "
    \n" . + "auf dieser Seite kannst du dir den Schichtplan in einer Druckansicht generieren lassen. Wähle hierfür ein Datum und den Raum:\n" . + "
    \n"; + + foreach ($VeranstaltungsTage as $k => $v) { + + $res = mysql_query("SELECT Name, RID FROM `Room` WHERE `show`!='N' ORDER BY `Name`;", $con); + for ($i = 0; $i < mysql_num_rows($res); $i++) { + $Tag = $VeranstaltungsTage[$k]; + $RID = mysql_result($res, $i, "RID"); + $Rname = mysql_result($res, $i, "Name"); + echo "\t$Tag $Rname
    \n"; + } + echo "
    \n"; + } + echo "

    "; + + include ("includes/footer.php"); +} else //################################################################# + { + if (IsSet ($_GET["Raum"]) AND IsSet ($_GET["ausdatum"])) { + $Raum = $_GET["Raum"]; + $ausdatum = $_GET["ausdatum"]; + + include ("config/config_db.php"); + include ("config/config.php"); + include ("includes/secure.php"); + //var wird nur gesetzt immer edit auszublenden, achtung sesion darf nicht gestart sein !!! + $_SESSION['CVS']["admin/schichtplan.php"] = "N"; + include ("includes/funktion_lang.php"); + include ("includes/funktion_schichtplan.php"); + include ("includes/funktion_schichtplan_aray.php"); + include ("includes/funktion_user.php"); +?> @@ -81,7 +77,7 @@ else //################################################################# - + @@ -89,41 +85,35 @@ else //################################################################# \n"; - if( $j==0) - { - $Spalten[$i * $GlobalZeileProStunde + $j].= - "\t\t\n"; - - } - } - - -CreateRoomShifts( $Raum ); - - -// Ausgabe Zeilen - for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) echo $Spalten[$i]; -// Ende -echo "
    Uhrzeit
    "; - if( $i < 10 ) - $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; - $Spalten[$i * $GlobalZeileProStunde + $j].= "$i:"; - if( ( ($j*60) / $GlobalZeileProStunde) < 10 ) - $Spalten[$i * $GlobalZeileProStunde + $j].= "0"; - $Spalten[$i * $GlobalZeileProStunde + $j].= - ( ($j*60) / $GlobalZeileProStunde). "
    \n"; - -echo "Stand: ". gmdate("Y-m-d H:i"). "\n"; -echo "\n"; -echo "\n"; - -} //isset($Vars) -} //isset($Action) + //Zeit Ausgeben + for ($i = 0; $i < 24; $i++) + for ($j = 0; $j < $GlobalZeileProStunde; $j++) { + $Spalten[$i * $GlobalZeileProStunde + $j] = "\t\n"; + if ($j == 0) { + $Spalten[$i * $GlobalZeileProStunde + $j] .= "\t\t"; + if ($i < 10) + $Spalten[$i * $GlobalZeileProStunde + $j] .= "0"; + $Spalten[$i * $GlobalZeileProStunde + $j] .= "$i:"; + if ((($j * 60) / $GlobalZeileProStunde) < 10) + $Spalten[$i * $GlobalZeileProStunde + $j] .= "0"; + $Spalten[$i * $GlobalZeileProStunde + $j] .= (($j * 60) / $GlobalZeileProStunde) . "\n"; + + } + } + + CreateRoomShifts($Raum); + + // Ausgabe Zeilen + for ($i = 0; $i < (24 * $GlobalZeileProStunde); $i++) + echo $Spalten[$i]; + // Ende + echo "\n"; + + echo "Stand: " . gmdate("Y-m-d H:i") . "\n"; + echo "\n"; + echo "\n"; + + } //isset($Vars) +} //isset($Action) ?> diff --git a/www-ssl/admin/shiftadd.php b/www-ssl/admin/shiftadd.php index 34c248fa..d6b1f8ff 100644 --- a/www-ssl/admin/shiftadd.php +++ b/www-ssl/admin/shiftadd.php @@ -1,70 +1,65 @@ \n"; +echo "Hallo " . $_SESSION['Nick'] . ",
    \n"; // erstellt ein Array der Reume - $sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); +$sql = "SELECT `RID`, `Name` FROM `Room` ORDER BY `Name`"; +$Erg = mysql_query($sql, $con); +$rowcount = mysql_num_rows($Erg); - for ($i=0; $i<$rowcount; $i++) - { - $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); - $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); - } +for ($i = 0; $i < $rowcount; $i++) { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); +} // erstellt ein Aray der Engeltypen - $sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; - $Erg = mysql_query($sql, $con); - $rowcount = mysql_num_rows($Erg); - - for ($i=0; $i<$rowcount; $i++) - { - $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); - $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name").Get_Text("inc_schicht_engel"); - } - -// sesion mit stanadrt werten befüllen -if( !isset( $_SESSION['shiftadd.php']['SchichtName'])) -{ - $_SESSION['shiftadd.php']['SchichtName'] = "--???--"; - $_SESSION['shiftadd.php']['RID'] = ""; - $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time); - $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time); - $_SESSION['shiftadd.php']['STime'] = "10"; - $_SESSION['shiftadd.php']['MoreThenOne'] = "ON"; - $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time); - $_SESSION['shiftadd.php']['ETime'] = "12"; - $_SESSION['shiftadd.php']['len'] = "2"; - $_SESSION['shiftadd.php']['NachtON'] = "OFF"; - $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24"; -} -// wenn werte übergeben in sesion eintragen -if( !isset($_GET["NachtON"])) - $_GET["NachtON"] = "OFF"; -if( !isset($_GET["MoreThenOne"])) - $_GET["MoreThenOne"] = "OFF"; -if( isset( $_GET["SchichtName"])) -{ - foreach ($_GET as $k => $v) - { - $_SESSION['shiftadd.php'][$k] = $v; - } +$sql = "SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"; +$Erg = mysql_query($sql, $con); +$rowcount = mysql_num_rows($Erg); + +for ($i = 0; $i < $rowcount; $i++) { + $EngelType[$i]["TID"] = mysql_result($Erg, $i, "TID"); + $EngelType[$i]["Name"] = mysql_result($Erg, $i, "Name") . Get_Text("inc_schicht_engel"); } +// sesion mit stanadrt werten bef�llen +if (!isset ($_SESSION['shiftadd.php']['SchichtName'])) { + $_SESSION['shiftadd.php']['SchichtName'] = "--???--"; + $_SESSION['shiftadd.php']['RID'] = ""; + $_SESSION['shiftadd.php']['MonthJahr'] = gmdate("Y-m", $Time); + $_SESSION['shiftadd.php']['SDatum'] = gmdate("d", $Time); + $_SESSION['shiftadd.php']['STime'] = "10"; + $_SESSION['shiftadd.php']['MoreThenOne'] = "ON"; + $_SESSION['shiftadd.php']['EDatum'] = gmdate("d", $Time); + $_SESSION['shiftadd.php']['ETime'] = "12"; + $_SESSION['shiftadd.php']['len'] = "2"; + $_SESSION['shiftadd.php']['NachtON'] = "OFF"; + $_SESSION['shiftadd.php']['len_night'] = "00-04-08-10-12-14-16-18-20-22-24"; +} +// wenn werte �bergeben in sesion eintragen +if (!isset ($_GET["NachtON"])) + $_GET["NachtON"] = "OFF"; +if (!isset ($_GET["MoreThenOne"])) + $_GET["MoreThenOne"] = "OFF"; +if (isset ($_GET["SchichtName"])) { + foreach ($_GET as $k => $v) { + $_SESSION['shiftadd.php'][$k] = $v; + } +} -if (!IsSet($_GET["action"])) - $_GET["action"] = "new"; +if (!IsSet ($_GET["action"])) + $_GET["action"] = "new"; -switch( $_GET["action"]) -{ -case 'new': +switch ($_GET["action"]) { + case 'new' : ?> Hier kannst du neue Schichten eintragen. Dazu musst du den Anfang und das Ende der Schichten eintragen. Über die Länge der Schichten errechnet sich dadurch die Anzahl dieser. Dadurch können gleich @@ -80,14 +75,15 @@ mehrere Schichten auf einmal erfasst werden: Ort: @@ -103,10 +99,12 @@ mehrere Schichten auf einmal erfasst werden: More then One - > + > End: @@ -119,10 +117,12 @@ mehrere Schichten auf einmal erfasst werden: Sonderschichten ein: - > + > Sonder in h (Time;Time): @@ -131,16 +131,17 @@ mehrere Schichten auf einmal erfasst werden: Anzahl Engel je Type: ". $TTemp["Name"]. ":\n"; - echo " \n"; - } + + + foreach ($EngelType As $TTemp) { + echo " " . $TTemp["Name"] . ":\n"; + echo " \n"; + } ?>
    @@ -150,209 +151,200 @@ mehrere Schichten auf einmal erfasst werden: 0)) - { - $lenOrg = $_GET["len"]; - if( $_GET["NachtON"] == "ON" ) - { - $lenArrayDummy = explode( "-", $_GET["len_night"]); - foreach ( $lenArrayDummy as $Temp ) - { - if( isset($Temp2) ) - $lenArray[intval($Temp2)] = intval($Temp)-intval($Temp2); - $Temp2 = $Temp; - }//foreach - }//IF( $NachtON == "ON" ) - - echo "\n"; - echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - - $DateEnd = $_GET["SDatum"]; - $TimeEnd = intval($_GET["STime"]); - $len=0; - do - { - // define Start time - $Date = $DateEnd; - $Time = $TimeEnd; - $_DateS = $_GET["MonthJahr"]. "-". $Date. " ". $Time. ":00:00"; - - // define End time - if( $_GET["NachtON"] == "ON" ) - { - if( !isset($lenArray[$Time])) die("Zeit $Time h nicht definiert."); - $_GET["len"] = $lenArray[$Time]; - if( $_GET["len"]<1) die("len <1"); - } - $TimeEnd = $Time+ $_GET["len"]; - - //Tagesüberschreitung - while( $TimeEnd >= 24 ) - { - $TimeEnd -= 24; - $DateEnd += 1; - } - //ist schischt zu lang dan verkürzen - if( $DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"]) ) - { - $_GET["len"] -= ($DateEnd- $_GET["EDatum"])*24; - $_GET["len"] -= ($TimeEnd- $_GET["ETime"]); // -(-) ->> + - $DateEnd = $_GET["EDatum"]; - $TimeEnd = $_GET["ETime"]; - } - $_DateE = $_GET["MonthJahr"]. "-". $DateEnd. " ". $TimeEnd. ":00:00"; - - if( $_DateS != $_DateE ) - CreateNewEntry(); - - if( $_GET["MoreThenOne"]!="ON" ) break; - if( $DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"]) ) break; - } while( true ); - echo "
    StartEndlenRIDBeschreibungEntry 'Shifts'SIDEntrys
    "; - - if( $_GET["OnlyShow"]=="ON" ) - { - echo "
    "; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - echo "\n\t"; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - echo "\n\t"; - } - echo "\n\t"; - echo "\n\t"; - echo "\n
    "; - } //if - } //IF - break; - -case 'engeldel': - break; - -} // end switch + break; // Ende new + + case 'newsave' : + if (isset ($_GET["SDatum"]) && ($_GET["len"] > 0)) { + $lenOrg = $_GET["len"]; + if ($_GET["NachtON"] == "ON") { + $lenArrayDummy = explode("-", $_GET["len_night"]); + foreach ($lenArrayDummy as $Temp) { + if (isset ($Temp2)) + $lenArray[intval($Temp2)] = intval($Temp) - intval($Temp2); + $Temp2 = $Temp; + } //foreach + } //IF( $NachtON == "ON" ) + + echo "\n"; + echo "\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\t\n"; + echo "\n"; + + $DateEnd = $_GET["SDatum"]; + $TimeEnd = intval($_GET["STime"]); + $len = 0; + do { + // define Start time + $Date = $DateEnd; + $Time = $TimeEnd; + $_DateS = $_GET["MonthJahr"] . "-" . $Date . " " . $Time . ":00:00"; + + // define End time + if ($_GET["NachtON"] == "ON") { + if (!isset ($lenArray[$Time])) + die("Zeit $Time h nicht definiert."); + $_GET["len"] = $lenArray[$Time]; + if ($_GET["len"] < 1) + die("len <1"); + } + $TimeEnd = $Time + $_GET["len"]; + + //Tages�berschreitung + while ($TimeEnd >= 24) { + $TimeEnd -= 24; + $DateEnd += 1; + } + //ist schischt zu lang dan verk�rzen + if ($DateEnd > $_GET["EDatum"] || ($DateEnd == $_GET["EDatum"] && $TimeEnd >= $_GET["ETime"])) { + $_GET["len"] -= ($DateEnd - $_GET["EDatum"]) * 24; + $_GET["len"] -= ($TimeEnd - $_GET["ETime"]); // -(-) ->> + + $DateEnd = $_GET["EDatum"]; + $TimeEnd = $_GET["ETime"]; + } + $_DateE = $_GET["MonthJahr"] . "-" . $DateEnd . " " . $TimeEnd . ":00:00"; + + if ($_DateS != $_DateE) + CreateNewEntry(); + + if ($_GET["MoreThenOne"] != "ON") + break; + if ($DateEnd >= $_GET["EDatum"] && $TimeEnd >= intval($_GET["ETime"])) + break; + } + while (true); + echo "
    StartEndlenRIDBeschreibungEntry 'Shifts'SIDEntrys
    "; + + if ($_GET["OnlyShow"] == "ON") { + echo "
    "; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + echo "\n\t"; + foreach ($EngelType As $TTemp) { + $Temp = "EngelType" . $TTemp["TID"]; + echo "\n\t"; + } + echo "\n\t"; + echo "\n\t"; + echo "\n
    "; + } //if + } //IF + break; + + case 'engeldel' : + break; -function CreateNewEntry() -{ - global $con, $_DateS, $_DateE, $EngelType, $debug; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - global $$Temp; - } - - echo "\n"; +} // end switch - echo "\t$_DateS\n"; - echo "\t$_DateE\n"; - echo "\t". $_GET["len"]. "\n"; - echo "\t". $_GET["RID"]. "\n"; - echo "\t". $_GET["SchichtName"]. "\n"; - - - // Ist eintarg schon vorhanden? - $SQL = "SELECT `SID` FROM `Shifts` "; - $SQL .= "WHERE (". - "`DateS` = '". $_DateS. "' AND ". - "`DateE` = '". $_DateE. "' AND ". - "`RID` = '". $_GET["RID"]. "');"; - $Erg = mysql_query($SQL, $con); - - if( mysql_num_rows($Erg) != 0 ) - echo "\texists"; - elseif( $_GET["OnlyShow"] == "OFF" ) - { - // erstellt Eintrag in Shifts für die algemeine schicht - $SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( "; - $SQL .= "'". $_DateS. "', '". $_DateE. "', "; - $SQL .= "'". $_GET["len"]. "', '". $_GET["RID"]. "', "; - $SQL .= "'". $_GET["SchichtName"]. "');"; - $Erg = db_query($SQL, "create shift"); - - $SQLFail = "\n\t
    [".$SQL. "]"; - - if ($Erg == 1) echo "\tpass\n"; - else echo "\tfail
    \n". mysql_error($con). "$SQLFail\n"; - - } else - echo "\tonly show\n"; - - // sucht SID von eingetragennen schiten - $SQL = "SELECT SID FROM `Shifts` "; - $SQL .= "WHERE (". - "`DateS` = '". $_DateS. "' AND ". - "`DateE` = '". $_DateE. "' AND ". - "`Len` = '". $_GET["len"]. "' AND ". - "`RID` = '". $_GET["RID"]. "');"; - $Erg = mysql_query($SQL, $con); - if( mysql_num_rows($Erg) == 0 ) - echo "\t?"; - else - { - $SID = mysql_result($Erg, 0, "SID"); - echo "\t". $SID. ""; - } - - // erstellt für jeden Engeltypen die eintrage in 'ShiftEntry' - echo "\t"; - foreach ($EngelType As $TTemp) - { - $Temp = "EngelType".$TTemp["TID"]; - - if( $_GET[$Temp] > 0 ) - { - $i = 0; - echo $_GET[$Temp]. " ".$TTemp["Name"]. "
    \t"; - while( $i++ < $_GET[$Temp] ) - { - if( $_GET["OnlyShow"] == "OFF" ) - { - $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES ("; - $SQL .= "'". $SID. "', "; - $SQL .= "'". $TTemp["TID"]. "');"; - - $Erg = mysql_query($SQL, $con); - - if( $debug ) $SQLFail = "\n\t
    [".$SQL. "]"; - - if ($Erg == 1) echo "'pass' "; - else echo "'fail' ". mysql_error($con). "$SQLFail\n"; - - } - else - echo "+"; - } - echo "
    "; - } // IF $$TEMP - } // FOREACH - echo ""; - - echo "\n"; +function CreateNewEntry() { + global $con, $_DateS, $_DateE, $EngelType, $debug; + foreach ($EngelType As $TTemp) { + $Temp = "EngelType" . $TTemp["TID"]; + global $$Temp; + } + + echo "\n"; + + echo "\t$_DateS\n"; + echo "\t$_DateE\n"; + echo "\t" . $_GET["len"] . "\n"; + echo "\t" . $_GET["RID"] . "\n"; + echo "\t" . $_GET["SchichtName"] . "\n"; + + // Ist eintarg schon vorhanden? + $SQL = "SELECT `SID` FROM `Shifts` "; + $SQL .= "WHERE (" . + "`DateS` = '" . $_DateS . "' AND " . + "`DateE` = '" . $_DateE . "' AND " . + "`RID` = '" . $_GET["RID"] . "');"; + $Erg = mysql_query($SQL, $con); + + if (mysql_num_rows($Erg) != 0) + echo "\texists"; + elseif ($_GET["OnlyShow"] == "OFF") { + // erstellt Eintrag in Shifts f�r die algemeine schicht + $SQL = "INSERT INTO `Shifts` ( `DateS`, `DateE`, `Len`, `RID`, `Man`) VALUES ( "; + $SQL .= "'" . $_DateS . "', '" . $_DateE . "', "; + $SQL .= "'" . $_GET["len"] . "', '" . $_GET["RID"] . "', "; + $SQL .= "'" . $_GET["SchichtName"] . "');"; + $Erg = db_query($SQL, "create shift"); + + $SQLFail = "\n\t
    [" . $SQL . "]"; + + if ($Erg == 1) + echo "\tpass\n"; + else + echo "\tfail
    \n" . mysql_error($con) . "$SQLFail\n"; + + } else + echo "\tonly show\n"; + + // sucht SID von eingetragennen schiten + $SQL = "SELECT SID FROM `Shifts` "; + $SQL .= "WHERE (" . + "`DateS` = '" . $_DateS . "' AND " . + "`DateE` = '" . $_DateE . "' AND " . + "`Len` = '" . $_GET["len"] . "' AND " . + "`RID` = '" . $_GET["RID"] . "');"; + $Erg = mysql_query($SQL, $con); + if (mysql_num_rows($Erg) == 0) + echo "\t?"; + else { + $SID = mysql_result($Erg, 0, "SID"); + echo "\t" . $SID . ""; + } + + // erstellt f�r jeden Engeltypen die eintrage in 'ShiftEntry' + echo "\t"; + foreach ($EngelType As $TTemp) { + $Temp = "EngelType" . $TTemp["TID"]; + + if ($_GET[$Temp] > 0) { + $i = 0; + echo $_GET[$Temp] . " " . $TTemp["Name"] . "
    \t"; + while ($i++ < $_GET[$Temp]) { + if ($_GET["OnlyShow"] == "OFF") { + $SQL = "INSERT INTO `ShiftEntry` (`SID`, `TID`) VALUES ("; + $SQL .= "'" . $SID . "', "; + $SQL .= "'" . $TTemp["TID"] . "');"; + + $Erg = mysql_query($SQL, $con); + + if ($debug) + $SQLFail = "\n\t
    [" . $SQL . "]"; + + if ($Erg == 1) + echo "'pass' "; + else + echo "'fail' " . mysql_error($con) . "$SQLFail\n"; + + } else + echo "+"; + } + echo "
    "; + } // IF $$TEMP + } // FOREACH + echo ""; + + echo "\n"; } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php index ebf1db32..a36bf694 100644 --- a/www-ssl/admin/sprache.php +++ b/www-ssl/admin/sprache.php @@ -1,122 +1,110 @@ \n"; - echo Get_Text("pub_sprache_text1")."

    \n"; - - echo "". Get_Text("pub_sprache_ShowEntry"). ""; - // ausgabe Tabellenueberschift - $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; - $erg_Sprachen = mysql_query($SQL_Sprachen, $con); - echo mysql_error($con); - - for( $i=0; $i\n\t\t"; - echo "\t\t". Get_Text("pub_sprache_TextID"). ""; - foreach( $Sprachen as $Name => $Value ) - echo "". - Get_Text("pub_sprache_Sprache"). " ". $Name. - ""; - echo "\t\t". Get_Text("pub_sprache_Edit"). ""; - echo "\t\t"; - - - if( isset($_GET["ShowEntry"])) - { - // ausgabe eintraege - $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; - $erg = mysql_query($SQL, $con); - echo mysql_error($con); - - $TextID_Old = mysql_result( $erg, 0, "TextID" ); - for( $i=0; $i"; - echo "\n"; - echo "\t\t$TextID_Old ". - " \n"; - - foreach( $Sprachen as $Name => $Value ) - { - $Value = html_entity_decode( $Value, ENT_QUOTES); - echo "\t\t\n"; - $Sprachen[ $Name ] = ""; - } - - echo "\t\t\n"; - echo ""; - echo "\n"; - $TextID_Old = $TextID_New; - } - $Sprachen[ mysql_result( $erg, $i, "Sprache" ) ] = mysql_result( $erg, $i, "Text" ); - } /*FOR*/ - } - - //fuer neu eintraege - echo "
    "; - echo "\n"; - echo "\t\t \n"; - - foreach( $Sprachen as $Name => $Value ) - echo "\t\t\n"; - - echo "\t\t\n"; - echo ""; - echo "
    \n"; - - - echo "\n"; +include ("includes/header.php"); + +if (!isset ($_GET["TextID"])) { + echo Get_Text("Hello") . $_SESSION['Nick'] . ",
    \n"; + echo Get_Text("pub_sprache_text1") . "

    \n"; + + echo "" . Get_Text("pub_sprache_ShowEntry") . ""; + // ausgabe Tabellenueberschift + $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; + $erg_Sprachen = mysql_query($SQL_Sprachen, $con); + echo mysql_error($con); + + for ($i = 0; $i < mysql_num_rows($erg_Sprachen); $i++) + $Sprachen[mysql_result($erg_Sprachen, $i, "Sprache")] = $i; + + echo "\t\n\t\t"; + echo "\t\t"; + foreach ($Sprachen as $Name => $Value) + echo ""; + echo "\t\t"; + echo "\t\t"; + + if (isset ($_GET["ShowEntry"])) { + // ausgabe eintraege + $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; + $erg = mysql_query($SQL, $con); + echo mysql_error($con); + + $TextID_Old = mysql_result($erg, 0, "TextID"); + for ($i = 0; $i < mysql_num_rows($erg); $i++) { + $TextID_New = mysql_result($erg, $i, "TextID"); + if ($TextID_Old != $TextID_New) { + echo ""; + echo "\n"; + echo "\t\t\n"; + + foreach ($Sprachen as $Name => $Value) { + $Value = html_entity_decode($Value, ENT_QUOTES); + echo "\t\t\n"; + $Sprachen[$Name] = ""; + } + + echo "\t\t\n"; + echo ""; + echo "\n"; + $TextID_Old = $TextID_New; + } + $Sprachen[mysql_result($erg, $i, "Sprache")] = mysql_result($erg, $i, "Text"); + } /*FOR*/ + } + + //fuer neu eintraege + echo ""; + echo "\n"; + echo "\t\t\n"; + + foreach ($Sprachen as $Name => $Value) + echo "\t\t\n"; + + echo "\t\t\n"; + echo ""; + echo "\n"; + + echo "
    " . Get_Text("pub_sprache_TextID") . "" . + Get_Text("pub_sprache_Sprache") . " " . $Name . + "" . Get_Text("pub_sprache_Edit") . "
    $TextID_Old " . + "
    \n"; } /*if( !isset( $TextID ) )*/ -else -{ - echo "edit: ". $_GET["TextID"]. "

    "; - foreach ($_GET as $k => $v) { - if( $k != "TextID" ) - { - $sql_test = "SELECT * FROM `Sprache` ". - "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k'"; - $erg_test = mysql_query($sql_test, $con); - - if( mysql_num_rows($erg_test)==0 ) - { - $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) ". - "VALUES ('". $_GET["TextID"]. "', '$k', '$v')"; - echo $sql_save."
    "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Save: OK
    \n"; - else - echo "\t $k Save: KO
    \n"; - } - else if( mysql_result($erg_test, 0, "Text")!=$v ) - { - $sql_save = "UPDATE `Sprache` SET `Text`='$v' ". - "WHERE `TextID`='". $_GET["TextID"]. "' AND `Sprache`='$k' "; - echo $sql_save."
    "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Update: OK
    \n"; - else - echo "\t $k Update: KO
    \n"; - } - else - echo "\t $k no changes
    \n"; - } - } - +else { + echo "edit: " . $_GET["TextID"] . "

    "; + foreach ($_GET as $k => $v) { + if ($k != "TextID") { + $sql_test = "SELECT * FROM `Sprache` " . + "WHERE `TextID`='" . $_GET["TextID"] . "' AND `Sprache`='$k'"; + $erg_test = mysql_query($sql_test, $con); + + if (mysql_num_rows($erg_test) == 0) { + $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) " . + "VALUES ('" . $_GET["TextID"] . "', '$k', '$v')"; + echo $sql_save . "
    "; + $Erg = mysql_query($sql_save, $con); + if ($Erg == 1) + echo "\t $k Save: OK
    \n"; + else + echo "\t $k Save: KO
    \n"; + } else + if (mysql_result($erg_test, 0, "Text") != $v) { + $sql_save = "UPDATE `Sprache` SET `Text`='$v' " . + "WHERE `TextID`='" . $_GET["TextID"] . "' AND `Sprache`='$k' "; + echo $sql_save . "
    "; + $Erg = mysql_query($sql_save, $con); + if ($Erg == 1) + echo "\t $k Update: OK
    \n"; + else + echo "\t $k Update: KO
    \n"; + } else + echo "\t $k no changes
    \n"; + } + } + } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/tshirt.php b/www-ssl/admin/tshirt.php index 6fc3551e..9a8e7010 100644 --- a/www-ssl/admin/tshirt.php +++ b/www-ssl/admin/tshirt.php @@ -1,21 +1,20 @@ "; - } + $SQL = "UPDATE `User` SET `Tshirt`='1' WHERE `UID`='" . $_GET["aktiv"] . "' limit 1"; + $Erg = mysql_query($SQL, $con); + if ($Erg == 1) { + } else { + echo "Fehler beim speichern bei Engel " . UID2Nick($_GET["aktive"]) . "
    "; + } } - ?> Über die Suchen-Funktion des Browsers kann diese Liste schnell nach einem Nick abgesucht werden.
    @@ -24,7 +23,9 @@ Hinter diesem erscheint ein Link, über den man eintragen kann, dass der Eng Liste aller aktiven Engel: T-Shirt ausgeben: \n"; - $eUID=mysql_result($Erg, $i, "UID"); - echo "\t\t".UID2Nick($eUID)."\n"; - echo "\t\t".mysql_result($Erg, $i, "Aktiv")."\n"; - echo "\t\t".mysql_result($Erg, $i, "Size")."\n"; - - if (mysql_result($Erg, $i, "Tshirt") =="1") { - echo "\t\tbereits erhalten"; - } else { - echo "\t\tXXXXXXXX"; - } - echo "\t\n"; + + +for ($i = 0; $i < $rowcount; $i++) { + echo "\t\n"; + $eUID = mysql_result($Erg, $i, "UID"); + echo "\t\t" . UID2Nick($eUID) . "\n"; + echo "\t\t" . mysql_result($Erg, $i, "Aktiv") . "\n"; + echo "\t\t" . mysql_result($Erg, $i, "Size") . "\n"; + + if (mysql_result($Erg, $i, "Tshirt") == "1") { + echo "\t\tbereits erhalten"; + } else { + echo "\t\tXXXXXXXX"; + } + echo "\t\n"; } echo ""; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php index 7d7c3a62..0b31c97c 100644 --- a/www-ssl/admin/user.php +++ b/www-ssl/admin/user.php @@ -1,30 +1,30 @@ Neuen Engel eintragen

    \n"; - - if( !isset($_GET["OrderBy"]) ) $_GET["OrderBy"] = "Nick"; - $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` ". - "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID ". - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". - "ORDER BY `". $_GET["OrderBy"]. "` ASC"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); + echo "Neuen Engel eintragen

    \n"; - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); + if (!isset ($_GET["OrderBy"])) + $_GET["OrderBy"] = "Nick"; + $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` " . + "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID " . + "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID " . + "ORDER BY `" . $_GET["OrderBy"] . "` ASC"; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); - echo "Anzahl Engel: $Zeilen

    \n"; + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - ?> + echo "Anzahl Engel: $Zeilen

    \n"; +?>
    \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - $Gekommen += mysql_result($Erg, $n, "Gekommen"); - echo "\t\n"; - $Active += mysql_result($Erg, $n, "Aktiv"); - echo "\t\n"; - $Tshirt += mysql_result($Erg, $n, "Tshirt"); - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - echo "". - "". - "\n"; - echo "\t
    ?OrderBy=Nick">Nick | @@ -53,88 +53,81 @@ if (!IsSet($_GET["enterUID"])) \n"; - echo "\t".mysql_result($Erg, $n, "Nick"). "
    (Create: ". mysql_result($Erg, $n, "CreateDate"). ")    		".mysql_result($Erg, $n, "Name")."".mysql_result($Erg, $n, "Vorname")."".mysql_result($Erg, $n, "Alter").""; - if( strlen( mysql_result($Erg, $n, "Telefon"))>0) - echo "\n\t\tTel: ". mysql_result($Erg, $n, "Telefon"). "
    "; - if( strlen( mysql_result($Erg, $n, "Handy"))>0) - echo "\n\t\tHandy: ". mysql_result($Erg, $n, "Handy"). "
    "; - if( strlen( mysql_result($Erg, $n, "DECT"))>0) - echo "\n\t\tDECT: ". - mysql_result($Erg, $n, "DECT"). "
    "; - if( strlen( mysql_result($Erg, $n, "email"))>0) - echo "\n\t\temail: ". - mysql_result($Erg, $n, "email")."
    "; - if( strlen( mysql_result($Erg, $n, "Hometown"))>0) - echo "\n\t\tHometown: ". mysql_result($Erg, $n, "Hometown"). "
    "; - if( strlen( mysql_result($Erg, $n, "lastLogIn"))>0) - echo "\n\t\tlastLogIn: ". mysql_result($Erg, $n, "lastLogIn"). "
    "; - if( strlen( mysql_result($Erg, $n, "Art"))>0) - echo "\n\t\tType: ". mysql_result($Erg, $n, "Art"). "
    "; - if( strlen( mysql_result($Erg, $n, "ICQ"))>0) - echo "\n\t\tICQ: ". mysql_result($Erg, $n, "ICQ"). "
    "; - if( strlen( mysql_result($Erg, $n, "jabber"))>0) - echo "\n\t\tjabber: ". mysql_result($Erg, $n, "jabber"). "
    "; - echo "\n\t\tGroup: ". mysql_result($Erg, $n, "Group"). "
    "; - echo "    		".mysql_result($Erg, $n, "Size")."".mysql_result($Erg, $n, "Gekommen")."".mysql_result($Erg, $n, "Aktiv")."".mysql_result($Erg, $n, "Tshirt")."". funktion_isLinkAllowed_addLink_OrEmpty( - "admin/userChangeNormal.php?enterUID=". - mysql_result($Erg, $n, "UID")."&Type=Normal", - "Änd."). - "". funktion_isLinkAllowed_addLink_OrEmpty( - "admin/userChangeSecure.php?enterUID=". - mysql_result($Erg, $n, "UID")."&Type=Secure", - "Secure"). - "
    $Gekommen$Active$Tshirt
    \n"; - // Ende Userliste - - echo "

    Statistics

    "; - funktion_db_element_list_2row( "Hometown", - "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); - - echo "
    \n"; - - funktion_db_element_list_2row( "Engeltypen", - "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); - - echo "
    \n"; - - funktion_db_element_list_2row( "Used Groups", - "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` ". - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID ". - "WHERE (UserCVS.GroupID!='NULL') ". - "GROUP BY `GroupName` ". - ""); -} -else -{ - echo "error"; + + + $Gekommen = 0; + $Active = 0; + $Tshirt = 0; + + for ($n = 0; $n < $Zeilen; $n++) { + echo "\n"; + echo "\t" . mysql_result($Erg, $n, "Nick") . "
    (Create: " . mysql_result($Erg, $n, "CreateDate") . ")\n"; + echo "\t" . mysql_result($Erg, $n, "Name") . "\n"; + echo "\t" . mysql_result($Erg, $n, "Vorname") . "\n"; + echo "\t" . mysql_result($Erg, $n, "Alter") . "\n"; + echo "\t"; + if (strlen(mysql_result($Erg, $n, "Telefon")) > 0) + echo "\n\t\tTel: " . mysql_result($Erg, $n, "Telefon") . "
    "; + if (strlen(mysql_result($Erg, $n, "Handy")) > 0) + echo "\n\t\tHandy: " . mysql_result($Erg, $n, "Handy") . "
    "; + if (strlen(mysql_result($Erg, $n, "DECT")) > 0) + echo "\n\t\tDECT: " . + mysql_result($Erg, $n, "DECT") . "
    "; + if (strlen(mysql_result($Erg, $n, "email")) > 0) + echo "\n\t\temail: " . + mysql_result($Erg, $n, "email") . "
    "; + if (strlen(mysql_result($Erg, $n, "Hometown")) > 0) + echo "\n\t\tHometown: " . mysql_result($Erg, $n, "Hometown") . "
    "; + if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0) + echo "\n\t\tlastLogIn: " . mysql_result($Erg, $n, "lastLogIn") . "
    "; + if (strlen(mysql_result($Erg, $n, "Art")) > 0) + echo "\n\t\tType: " . mysql_result($Erg, $n, "Art") . "
    "; + if (strlen(mysql_result($Erg, $n, "ICQ")) > 0) + echo "\n\t\tICQ: " . mysql_result($Erg, $n, "ICQ") . "
    "; + if (strlen(mysql_result($Erg, $n, "jabber")) > 0) + echo "\n\t\tjabber: " . mysql_result($Erg, $n, "jabber") . "
    "; + echo "\n\t\tGroup: " . mysql_result($Erg, $n, "Group") . "
    "; + echo "\n"; + echo "\t" . mysql_result($Erg, $n, "Size") . "\n"; + $Gekommen += mysql_result($Erg, $n, "Gekommen"); + echo "\t" . mysql_result($Erg, $n, "Gekommen") . "\n"; + $Active += mysql_result($Erg, $n, "Aktiv"); + echo "\t" . mysql_result($Erg, $n, "Aktiv") . "\n"; + $Tshirt += mysql_result($Erg, $n, "Tshirt"); + echo "\t" . mysql_result($Erg, $n, "Tshirt") . "\n"; + echo "\t" . funktion_isLinkAllowed_addLink_OrEmpty("admin/userChangeNormal.php?enterUID=" . + mysql_result($Erg, $n, "UID") . "&Type=Normal", "Änd.") . + "\n"; + echo "\t" . funktion_isLinkAllowed_addLink_OrEmpty("admin/userChangeSecure.php?enterUID=" . + mysql_result($Erg, $n, "UID") . "&Type=Secure", "Secure") . + "\n"; + echo "\n"; + } + echo "" . + "" . + "$Gekommen$Active$Tshirt\n"; + echo "\t\n"; + // Ende Userliste + + echo "

    Statistics

    "; + funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + + echo "
    \n"; + + funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + + echo "
    \n"; + + funktion_db_element_list_2row("Used Groups", "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` " . + "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID " . + "WHERE (UserCVS.GroupID!='NULL') " . + "GROUP BY `GroupName` " . + ""); +} else { + echo "error"; } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/userArrived.php b/www-ssl/admin/userArrived.php index a8fdb71e..93857d2e 100644 --- a/www-ssl/admin/userArrived.php +++ b/www-ssl/admin/userArrived.php @@ -1,54 +1,53 @@ ". Get_Text("pri_userArrived_WriteOK"). " \"". UID2Nick($_GET["arrived"]). "\""; - } else { - echo "

    ". Get_Text("pri_userArrived_WriteError"). " \"". UID2Nick($_GET["arrived"]). "\"

    "; - } +include ("includes/header.php"); +include ("includes/funktion_db_list.php"); + +If (IsSet ($_GET["arrived"])) { + + $SQL = "UPDATE `User` SET `Gekommen`='1' WHERE `UID`='" . $_GET["arrived"] . "' limit 1"; + $Erg = db_query($SQL, "Set User as Gekommen"); + if ($Erg == 1) { + echo "

    " . Get_Text("pri_userArrived_WriteOK") . " \"" . UID2Nick($_GET["arrived"]) . "\"

    "; + } else { + echo "

    " . Get_Text("pri_userArrived_WriteError") . " \"" . UID2Nick($_GET["arrived"]) . "\"

    "; + } } -echo Get_Text("pri_userArrived_Text1"). "
    "; -echo Get_Text("pri_userArrived_Text2"). "

    "; +echo Get_Text("pri_userArrived_Text1") . "
    "; +echo Get_Text("pri_userArrived_Text2") . "

    "; echo Get_Text("pri_userArrived_TableToppic"); -$SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC"; +$SQL = "SELECT * FROM `User` ORDER BY `Nick` ASC"; $Erg = mysql_query($SQL, $con); $rowcount = mysql_num_rows($Erg); echo "\n"; echo "\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; -echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; +echo "\t\t\n"; echo "\t\n"; -for ($i=0; $i<$rowcount; $i++){ - echo "\t\n"; - $eUID=mysql_result($Erg, $i, "UID"); - echo "\t\t\n"; - echo "\t\t\n"; - - if (mysql_result($Erg, $i, "Gekommen") =="1") - { - echo "\t\t"; - } else { - echo "\t\t"; - } - echo "\t\n"; +for ($i = 0; $i < $rowcount; $i++) { + echo "\t\n"; + $eUID = mysql_result($Erg, $i, "UID"); + echo "\t\t\n"; + echo "\t\t\n"; + + if (mysql_result($Erg, $i, "Gekommen") == "1") { + echo "\t\t"; + } else { + echo "\t\t"; + } + echo "\t\n"; } echo "
    ". Get_Text("pri_userArrived_TableTD_Nick"). "". Get_Text("pri_userArrived_TableTD_ArrivedShow"). "". Get_Text("pri_userArrived_TableTD_ArrivedSet"). "" . Get_Text("pri_userArrived_TableTD_Nick") . "" . Get_Text("pri_userArrived_TableTD_ArrivedShow") . "" . Get_Text("pri_userArrived_TableTD_ArrivedSet") . "
    ".UID2Nick($eUID)."".mysql_result($Erg, $i, "Gekommen")."". Get_Text("pri_userArrived_TableEntry_Arrived"). "". Get_Text("pri_userArrived_TableEntry_Set"). "
    " . UID2Nick($eUID) . "" . mysql_result($Erg, $i, "Gekommen") . "" . Get_Text("pri_userArrived_TableEntry_Arrived") . "" . Get_Text("pri_userArrived_TableEntry_Set") . "
    "; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php index 6785a030..36eb4b6d 100644 --- a/www-ssl/admin/userChangeNormal.php +++ b/www-ssl/admin/userChangeNormal.php @@ -1,137 +1,133 @@ Aendern... - - echo "Hallo,
    ". - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". - "bereits sein T-Shirt erhalten hat.

    \n"; - - echo "
    \n"; - echo "\n"; - echo "\n"; - - $SQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["enterUID"]. "'"; - $Erg = mysql_query($SQL, $con); - - if (mysql_num_rows($Erg) != 1) - echo ""; - else - { - echo ""; - } - - echo "\n"; - echo "
    Sorry, der Engel (UID=". $_GET["enterUID"]. - ") wurde in der Liste nicht gefunden.
    \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 " \n"; - - // Gekommen? - echo " \n"; - - // Aktiv? - echo " \n"; - - // T-Shirt bekommen? - echo " \n"; - - echo " \n"; - - echo "
    Nick". - "
    lastLogIn". - "
    Name". - "
    Vorname". - "
    Alter". - "
    Telefon". - "
    Handy". - "
    DECT". - "
    email". - "
    ICQ". - "
    jabber". - "
    Size". - "
    Passwort". - "neues Kennwort setzen
    Gekommen\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    Aktiv\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    T-Shirt\n"; - echo " No \n"; - echo " Yes \n"; - echo "
    Hometown". - "
    \n    		". displayavatar($_GET["enterUID"], FALSE). "
    \n
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - - - echo "
    "; - funktion_db_element_list_2row( - "Freeloader Shifts", - "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=". $_GET["enterUID"]); +include ("includes/header.php"); +include ("includes/funktion_db_list.php"); + +if (IsSet ($_GET["enterUID"])) { + // UserID wurde mit uebergeben --> Aendern... + + echo "Hallo,
    " . + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . + "bereits sein T-Shirt erhalten hat.

    \n"; + + echo "
    \n"; + echo "\n"; + echo "\n"; + + $SQL = "SELECT * FROM `User` WHERE `UID`='" . $_GET["enterUID"] . "'"; + $Erg = mysql_query($SQL, $con); + + if (mysql_num_rows($Erg) != 1) + echo ""; + else { + echo ""; + } + + echo "\n"; + echo "
    Sorry, der Engel (UID=" . $_GET["enterUID"] . + ") wurde in der Liste nicht gefunden.
    \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 " \n"; + + // Gekommen? + echo " \n"; + + // Aktiv? + echo " \n"; + + // T-Shirt bekommen? + echo " \n"; + + echo " \n"; + + echo "
    Nick" . + "
    lastLogIn" . + "
    Name" . + "
    Vorname" . + "
    Alter" . + "
    Telefon" . + "
    Handy" . + "
    DECT" . + "
    email" . + "
    ICQ" . + "
    jabber" . + "
    Size" . + "
    Passwort" . + "neues Kennwort setzen
    Gekommen\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    Aktiv\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    T-Shirt\n"; + echo " No \n"; + echo " Yes \n"; + echo "
    Hometown" . + "
    \n    		" . displayavatar($_GET["enterUID"], FALSE) . "
    \n
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + + echo "
    "; + funktion_db_element_list_2row("Freeloader Shifts", "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=" . $_GET["enterUID"]); } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php index 2eb84b85..69c4601d 100644 --- a/www-ssl/admin/userChangeSecure.php +++ b/www-ssl/admin/userChangeSecure.php @@ -1,112 +1,104 @@ Aendern... +if (IsSet ($_GET["enterUID"])) { + // UserID wurde mit uebergeben --> Aendern... - echo "Hallo,
    ". - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' ". - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, ". - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. ". - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel ". - "bereits sein T-Shirt erhalten hat.

    \n"; + echo "Hallo,
    " . + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . + "bereits sein T-Shirt erhalten hat.

    \n"; + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_GET["enterUID"] . "'"; + $Erg_CVS = mysql_query($SQL_CVS, $con); - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_GET["enterUID"]. "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - - if( mysql_num_rows($Erg_CVS) != 1) - echo "Sorry, der Engel (UID=". $_GET["enterUID"]. ") wurde in der Liste nicht gefunden."; - else - { - // Rename if is an group - if( $_GET["enterUID"] < 0 ) { - $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='". $_GET["enterUID"]. "'"; - $ErgName = mysql_query($SQLname, $con); - echo mysql_error($con); + if (mysql_num_rows($Erg_CVS) != 1) + echo "Sorry, der Engel (UID=" . $_GET["enterUID"] . ") wurde in der Liste nicht gefunden."; + else { + // Rename if is an group + if ($_GET["enterUID"] < 0) { + $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='" . $_GET["enterUID"] . "'"; + $ErgName = mysql_query($SQLname, $con); + echo mysql_error($con); - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
    "; - } + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
    "; + } - echo "
    \n"; - echo "\n"; - echo "\n"; - echo " \n"; + echo "\n"; + echo "

    Rights of \"". UID2Nick($_GET["enterUID"]). "\":
    \n"; + echo "\n"; + echo " \n"; + $CVS_Data = mysql_fetch_array($Erg_CVS); + $CVS_Data_i = 1; + foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) { + $CVS_Data_i++; + //nur jeder zweiter sonst wird f�r jeden text noch die position (Zahl) ausgegeben + if ($CVS_Data_i % 2 && $CVS_Data_Name != "UID") { + if ($CVS_Data_Name == "GroupID") { + if ($_GET["enterUID"] > 0) { + echo "\n" . + "\n". - ""; + } + } else { + echo "\n"; + } + } + } //IF + } //Foreach + echo "\n"; - $SQL_Group = "SELECT * FROM `UserGroups`"; - $Erg_Group = mysql_query($SQL_Group, $con); - for ($n = 0 ; $n < mysql_num_rows($Erg_Group) ; $n++) - { - $UID = mysql_result($Erg_Group, $n, "UID"); - echo "\t\n"; - } - echo ""; - } - } else { - echo "\n"; - } - } - } //IF - } //Foreach - echo "\n"; - - // Ende Formular - echo "\n"; - echo "

    Rights of \"" . UID2Nick($_GET["enterUID"]) . "\":
    Group
    Group
    $CVS_Data_Name"; + echo "allow \n"; + echo "denied \n"; + if ($_GET["enterUID"] > 0) { + echo "group-setting \n"; + echo "
    $CVS_Data_Name"; - echo "allow \n"; - echo "denied \n"; - if( $_GET["enterUID"] > 0 ) - { - echo "group-setting \n"; - echo "
    \n
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; + // Ende Formular + echo "\n"; + echo "\n
    \n"; + echo "\n"; + echo "\n"; + echo ""; - echo "
    \n"; - echo "\n"; - echo "\n"; - echo "
    "; - } + echo "
    \n"; + echo "\n"; + echo "\n"; + echo "
    "; + } } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php index d4a230de..e7a69925 100644 --- a/www-ssl/admin/userDefaultSetting.php +++ b/www-ssl/admin/userDefaultSetting.php @@ -1,72 +1,70 @@ \nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

    \n"; -echo "Hallo ".$_SESSION['Nick']. - ",
    \nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

    \n"; - echo "\n"; echo "\t\n"; echo "\t\t\n\t\t\n\t\t\n"; echo "\t\n"; -if( isset( $_GET["Field"]) && isset( $_GET["Default"]) && isset( $_GET["Send"])) -{ - switch( $_GET["Send"]) - { - case "New": - $SQL = "ALTER TABLE `UserCVS` ADD `". $_GET["Field"]. "` ". - "CHAR( 1 ) DEFAULT '". $_GET["Default"]. "' NOT NULL"; - $Erg = db_query( $SQL, "New user default setting"); - if( $Erg == 1) - echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; - else - echo "

    Create ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - case "Del": - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - break; - case "Del sure": - $SQL = "ALTER TABLE `UserCVS` DROP `". $_GET["Field"]. "` "; - $Erg = db_query( $SQL, "del user default setting"); - if( $Erg == 1) - echo "

    Delete ".$_GET["Field"]. " succesfull

    \n"; - else - echo "

    Delete ".$_GET["Field"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - case "SetForAllUser": - $SQL = "UPDATE `UserCVS` SET `". $_GET["Field"]. "`='". $_GET["Default"]. "' WHERE UID>0"; - $Erg = db_query( $SQL, "Set new user default setting for all user"); - if( $Erg == 1) - echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users succesfull

    \n"; - else - echo "

    UPDATE ".$_GET["Field"]. " = ". $_GET["Default"]. " for all Users error...

    \n". - "[". mysql_error(). "]

    "; - case "Save": - $SQL = "ALTER TABLE `UserCVS` CHANGE `". $_GET["Field"]. "` ". - "`". $_GET["Field"]. "` CHAR( 1 ) NOT NULL DEFAULT '". $_GET["Default"]. "'"; - $Erg = db_query( $SQL, "Save user default setting"); - if( $Erg == 1) - echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " succesfull

    \n"; - else - echo "

    Write ".$_GET["Field"]. " = ". $_GET["Default"]. " error...

    \n". - "[". mysql_error(). "]

    "; - break; - } //SWITCH +if (isset ($_GET["Field"]) && isset ($_GET["Default"]) && isset ($_GET["Send"])) { + switch ($_GET["Send"]) { + case "New" : + $SQL = "ALTER TABLE `UserCVS` ADD `" . $_GET["Field"] . "` " . + "CHAR( 1 ) DEFAULT '" . $_GET["Default"] . "' NOT NULL"; + $Erg = db_query($SQL, "New user default setting"); + if ($Erg == 1) + echo "

    Create " . $_GET["Field"] . " = " . $_GET["Default"] . " succesfull

    \n"; + else + echo "

    Create " . $_GET["Field"] . " = " . $_GET["Default"] . " error...

    \n" . + "[" . mysql_error() . "]

    "; + break; + case "Del" : + echo "\t\n"; + echo "\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; + break; + case "Del sure" : + $SQL = "ALTER TABLE `UserCVS` DROP `" . $_GET["Field"] . "` "; + $Erg = db_query($SQL, "del user default setting"); + if ($Erg == 1) + echo "

    Delete " . $_GET["Field"] . " succesfull

    \n"; + else + echo "

    Delete " . $_GET["Field"] . " error...

    \n" . + "[" . mysql_error() . "]

    "; + break; + case "SetForAllUser" : + $SQL = "UPDATE `UserCVS` SET `" . $_GET["Field"] . "`='" . $_GET["Default"] . "' WHERE UID>0"; + $Erg = db_query($SQL, "Set new user default setting for all user"); + if ($Erg == 1) + echo "

    UPDATE " . $_GET["Field"] . " = " . $_GET["Default"] . " for all Users succesfull

    \n"; + else + echo "

    UPDATE " . $_GET["Field"] . " = " . $_GET["Default"] . " for all Users error...

    \n" . + "[" . mysql_error() . "]

    "; + case "Save" : + $SQL = "ALTER TABLE `UserCVS` CHANGE `" . $_GET["Field"] . "` " . + "`" . $_GET["Field"] . "` CHAR( 1 ) NOT NULL DEFAULT '" . $_GET["Default"] . "'"; + $Erg = db_query($SQL, "Save user default setting"); + if ($Erg == 1) + echo "

    Write " . $_GET["Field"] . " = " . $_GET["Default"] . " succesfull

    \n"; + else + echo "

    Write " . $_GET["Field"] . " = " . $_GET["Default"] . " error...

    \n" . + "[" . mysql_error() . "]

    "; + break; + } //SWITCH } //IF( - $erg = mysql_query("SHOW COLUMNS FROM `UserCVS`"); echo mysql_error(); echo "\t\n"; @@ -76,14 +74,13 @@ echo "\t\t\t\n"; echo "\t\t\t\n"; echo "\t\t\t\n"; -for( $i=2; $i\n"; - echo "\t\t
    \n"; - echo "\t\t\t\n"; - echo "\t\t\t    \n"; - echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; + echo "\t\t\t\n"; + echo "\t\t\t\n"; + echo "\t\t\n"; + echo "\t\n"; } - + echo "\t\n"; echo "\t\t\n"; echo "\t\t\t\n"; @@ -135,10 +131,8 @@ echo "\t\t\t\n"; echo "\t\t\n"; echo "\t\n"; - - echo "
    PageShow
    Group\n"; @@ -91,37 +88,36 @@ echo "\t\t\t \n"; echo "\t
    ". mysql_result( $erg, $i, "Field"). "\n"; - - echo "\t\t\t\tallow\n"; +for ($i = 2; $i < mysql_num_rows($erg); $i++) { + echo "\t
    " . mysql_result($erg, $i, "Field") . "\n"; + + echo "\t\t\t\tallow\n"; - echo "\t\t\t\tdenied\n"; + echo "\t\t\t\tdenied\n"; - echo "\t\t\t\tgroup-setting\n"; + echo "\t\t\t\tgroup-setting\n"; - echo "\t\t\t\n"; - echo "\t\t\t \n"; - echo "\t\t\t
    \n"; + echo "\t\t\t \n"; + echo "\t\t\t
    \n"; -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php index b1b42f96..deaf96d9 100644 --- a/www-ssl/admin/userSaveNormal.php +++ b/www-ssl/admin/userSaveNormal.php @@ -1,130 +1,119 @@ "; +if (IsSet ($_GET["action"])) { + SetHeaderGo2Back(); + echo "Gesendeter Befehl: " . $_GET["action"] . "
    "; - switch ($_GET["action"]) - { - case "change": - if (IsSet($_POST["enterUID"])) - { - if ($_POST["Type"] == "Normal") - { - $SQL = "UPDATE `User` SET "; - $SQL.= " `Nick` = '". $_POST["eNick"]. "', `Name` = '". $_POST["eName"]. "', ". - "`Vorname` = '". $_POST["eVorname"]. "', ". - "`Telefon` = '". $_POST["eTelefon"]. "', ". - "`Handy` = '". $_POST["eHandy"]. "', ". - "`DECT` = '". $_POST["eDECT"]. "', ". - "`email` = '". $_POST["eemail"]. "', ". - "`ICQ` = '". $_POST["eICQ"]. "', ". - "`jabber` = '". $_POST["ejabber"]. "', ". - "`Size` = '". $_POST["eSize"]. "', ". - "`Gekommen`= '". $_POST["eGekommen"]. "', ". - "`Aktiv`= '". $_POST["eAktiv"]. "', ". - "`Tshirt` = '". $_POST["eTshirt"]. "', ". - "`Hometown` = '". $_POST["Hometown"]. "' ". - "WHERE `UID` = '". $_POST["enterUID"]. - "' LIMIT 1;"; - echo "User-"; - $Erg = db_query($SQL, "change user details"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; + switch ($_GET["action"]) { + case "change" : + if (IsSet ($_POST["enterUID"])) { + if ($_POST["Type"] == "Normal") { + $SQL = "UPDATE `User` SET "; + $SQL .= " `Nick` = '" . $_POST["eNick"] . "', `Name` = '" . $_POST["eName"] . "', " . + "`Vorname` = '" . $_POST["eVorname"] . "', " . + "`Telefon` = '" . $_POST["eTelefon"] . "', " . + "`Handy` = '" . $_POST["eHandy"] . "', " . + "`DECT` = '" . $_POST["eDECT"] . "', " . + "`email` = '" . $_POST["eemail"] . "', " . + "`ICQ` = '" . $_POST["eICQ"] . "', " . + "`jabber` = '" . $_POST["ejabber"] . "', " . + "`Size` = '" . $_POST["eSize"] . "', " . + "`Gekommen`= '" . $_POST["eGekommen"] . "', " . + "`Aktiv`= '" . $_POST["eAktiv"] . "', " . + "`Tshirt` = '" . $_POST["eTshirt"] . "', " . + "`Hometown` = '" . $_POST["Hometown"] . "' " . + "WHERE `UID` = '" . $_POST["enterUID"] . + "' LIMIT 1;"; + echo "User-"; + $Erg = db_query($SQL, "change user details"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + } else + echo "

    Fehler: Unbekanter Type (" . $_POST["Type"] . ") �bergeben\n

    \n"; + } else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST �bergeben

    \n"; + break; - case "delete": - if (IsSet($_POST["enterUID"])) - { - echo "delate User..."; - $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserEntry..."; - $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". - "WHERE `UID`='". $_POST["enterUID"]. "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - break; + case "delete" : + if (IsSet ($_POST["enterUID"])) { + echo "delate User..."; + $SQL = "DELETE FROM `User` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + $Erg = db_query($SQL, "User delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + echo "
    \ndelate UserCVS..."; + $SQL2 = "DELETE FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } - case "newpw": - echo "Bitte neues Kennwort für "; - // Get Nick - $USQL = "SELECT * FROM `User` WHERE `UID`='". $_GET["eUID"]. "'"; - $Erg = mysql_query($USQL, $con); - echo mysql_result($Erg, 0, "Nick"); - echo " eingeben:
    "; - echo "
    \n"; - echo ""; - echo ""; - echo ""; - echo "\n"; - echo "
    "; - break; + echo "
    \ndelate UserEntry..."; + $SQL3 = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL " . + "WHERE `UID`='" . $_POST["enterUID"] . "';"; + $Erg = db_query($SQL3, "delate UserEntry"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + } + break; - case "newpwsave": - if ($_POST["ePasswort"] == $_POST["ePasswort2"]) - { // beide Passwoerter passen... - $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); - $SQL = "UPDATE `User` SET `Passwort`='". $_POST["ePasswort"]. "' ". - "WHERE `UID`='". $_POST["eUID"]. "'"; - $Erg = db_query($SQL, "User new passwort"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; - break; - } // end switch + case "newpw" : + echo "Bitte neues Kennwort für "; + // Get Nick + $USQL = "SELECT * FROM `User` WHERE `UID`='" . $_GET["eUID"] . "'"; + $Erg = mysql_query($USQL, $con); + echo mysql_result($Erg, 0, "Nick"); + echo " eingeben:
    "; + echo "
    \n"; + echo ""; + echo ""; + echo ""; + echo "\n"; + echo "
    "; + break; -// ende - Action ist gesetzt -} -else -{ - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; + case "newpwsave" : + if ($_POST["ePasswort"] == $_POST["ePasswort2"]) { // beide Passwoerter passen... + $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); + $SQL = "UPDATE `User` SET `Passwort`='" . $_POST["ePasswort"] . "' " . + "WHERE `UID`='" . $_POST["eUID"] . "'"; + $Erg = db_query($SQL, "User new passwort"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + } else + echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; + break; + } // end switch + + // ende - Action ist gesetzt +} else { + // kein Action gesetzt -> abbruch + echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php index e9ad6135..de4b47ff 100644 --- a/www-ssl/admin/userSaveSecure.php +++ b/www-ssl/admin/userSaveSecure.php @@ -1,178 +1,167 @@ 0 ) { - $Right = $_SESSION['CVS'][ "admin/user.php"]; +include ("includes/header.php"); +include ("includes/funktion_db_list.php"); +include ("includes/crypt.php"); +include ("includes/funktion_db.php"); + +if (!IsSet ($_POST["enterUID"])) { + $Right = "N"; +} +elseif ($_POST["enterUID"] > 0) { + $Right = $_SESSION['CVS']["admin/user.php"]; } else { - $Right = $_SESSION['CVS'][ "admin/group.php"]; + $Right = $_SESSION['CVS']["admin/group.php"]; } -if ( ($Right=="Y") && IsSet($_GET["action"])) -{ - SetHeaderGo2Back(); - echo "Gesendeter Befehl: ". $_GET["action"]. "
    "; - - switch ($_GET["action"]) - { - case "change": - if (IsSet($_POST["enterUID"])) - { - if ($_POST["Type"] == "Secure") - { - $SQL2 = "UPDATE `UserCVS` SET "; - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) - { - if( ($CVS_Data_i+1)%2 && $CVS_Data_Name!="UID") { - if( $CVS_Data_Name == "GroupID") - { - if( $_POST["enterUID"] > 0 ) - $SQL2.= "`$CVS_Data_Name` = '". $_POST["GroupID"]."', "; - else - $SQL2.= "`$CVS_Data_Name` = NULL, "; - } else { - $SQL2.= "`$CVS_Data_Name` = '". $_POST[$CVS_Data_i]."', "; - } - } - $CVS_Data_i++; - } - $SQL2 = substr( $SQL2, 0, strlen($SQL2)-2 ); - $SQL2.= " WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - echo "
    Secure-"; - $Erg = db_query($SQL2, "change user CVS"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: Unbekanter Type (". $_POST["Type"]. ") übergeben\n

    \n"; - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; - - case "changeGroupName": - if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) - { - $SQL = "UPDATE `UserGroups` SET `Name`='". $_POST["GroupName"]. "' WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1 ;"; - $Erg = db_query($SQL, "Update Group Name"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } - else - echo "

    Fehler: UserID (enterUID) wurde nicht per POST übergeben

    \n"; - break; - - case "delete": - if (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]>0) ) - { - echo "delate User..."; - $SQL="DELETE FROM `User` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserEntry..."; - $SQL3="UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL ". - "WHERE `UID`='". $_POST["enterUID"]. "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - } elseif (IsSet($_POST["enterUID"]) && ($_POST["enterUID"]<0) ) { - echo "delate Group..."; - $SQL="DELETE FROM `UserGroups` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL, "Group delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - echo "
    \ndelate UserCVS..."; - $SQL2="DELETE FROM `UserCVS` WHERE `UID`='". $_POST["enterUID"]. "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(". mysql_error($con). ")"; - } - - } - break; - } // end switch - -// ende - Action ist gesetzt -} elseif ( IsSet($_GET["new"]) && ($_SESSION['CVS']["admin/group.php"]=="Y") ) { - echo "Gesendeter Befehl: ". $_GET["new"]. "
    "; - - switch ($_GET["new"]) - { - case "newGroup": - echo "\tGenerate new Group ID...\n"; - $SQLid="SELECT MIN(`UID`) FROM `UserCVS`;"; - $Erg = mysql_query( $SQLid); - - if( mysql_num_rows($Erg) == 1) { - $NewId = mysql_result( $Erg, 0, 0)-1; - $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '". $_POST["GroupName"]. "' );"; - $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; - echo "\t
    Generate new UserGroup ...\n"; - $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); - if ($ErgNew1 == 1) - { - echo "\t
    Generate new User rights...\n"; - $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); - if ($ErgNew1 == 1) { - echo "\t
    New group was created.\n"; - } else { - echo "Error on creation\n(". mysql_error($con). ")"; - } - } else { - echo "Error on creation\n(". mysql_error($con). ")"; - } - - } - - - break; - } +if (($Right == "Y") && IsSet ($_GET["action"])) { + SetHeaderGo2Back(); + echo "Gesendeter Befehl: " . $_GET["action"] . "
    "; + + switch ($_GET["action"]) { + case "change" : + if (IsSet ($_POST["enterUID"])) { + if ($_POST["Type"] == "Secure") { + $SQL2 = "UPDATE `UserCVS` SET "; + $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "'"; + $Erg_CVS = mysql_query($SQL_CVS, $con); + $CVS_Data = mysql_fetch_array($Erg_CVS); + $CVS_Data_i = 1; + foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) { + if (($CVS_Data_i +1) % 2 && $CVS_Data_Name != "UID") { + if ($CVS_Data_Name == "GroupID") { + if ($_POST["enterUID"] > 0) + $SQL2 .= "`$CVS_Data_Name` = '" . $_POST["GroupID"] . "', "; + else + $SQL2 .= "`$CVS_Data_Name` = NULL, "; + } else { + $SQL2 .= "`$CVS_Data_Name` = '" . $_POST[$CVS_Data_i] . "', "; + } + } + $CVS_Data_i++; + } + $SQL2 = substr($SQL2, 0, strlen($SQL2) - 2); + $SQL2 .= " WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + echo "
    Secure-"; + $Erg = db_query($SQL2, "change user CVS"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + } else + echo "

    Fehler: Unbekanter Type (" . $_POST["Type"] . ") �bergeben\n

    \n"; + } else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST �bergeben

    \n"; + break; + + case "changeGroupName" : + if (IsSet ($_POST["enterUID"]) && ($_POST["enterUID"] < 0)) { + $SQL = "UPDATE `UserGroups` SET `Name`='" . $_POST["GroupName"] . "' WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1 ;"; + $Erg = db_query($SQL, "Update Group Name"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + } else + echo "

    Fehler: UserID (enterUID) wurde nicht per POST �bergeben

    \n"; + break; + + case "delete" : + if (IsSet ($_POST["enterUID"]) && ($_POST["enterUID"] > 0)) { + echo "delate User..."; + $SQL = "DELETE FROM `User` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + $Erg = db_query($SQL, "User delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2 = "DELETE FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + + echo "
    \ndelate UserEntry..."; + $SQL3 = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL " . + "WHERE `UID`='" . $_POST["enterUID"] . "';"; + $Erg = db_query($SQL3, "delate UserEntry"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + } + elseif (IsSet ($_POST["enterUID"]) && ($_POST["enterUID"] < 0)) { + echo "delate Group..."; + $SQL = "DELETE FROM `UserGroups` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + $Erg = db_query($SQL, "Group delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + + echo "
    \ndelate UserCVS..."; + $SQL2 = "DELETE FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; + $Erg = db_query($SQL2, "User CVS delete"); + if ($Erg == 1) { + echo "Änderung wurde gesichert...\n"; + } else { + echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; + } + + } + break; + } // end switch + + // ende - Action ist gesetzt +} +elseif (IsSet ($_GET["new"]) && ($_SESSION['CVS']["admin/group.php"] == "Y")) { + echo "Gesendeter Befehl: " . $_GET["new"] . "
    "; + + switch ($_GET["new"]) { + case "newGroup" : + echo "\tGenerate new Group ID...\n"; + $SQLid = "SELECT MIN(`UID`) FROM `UserCVS`;"; + $Erg = mysql_query($SQLid); + + if (mysql_num_rows($Erg) == 1) { + $NewId = mysql_result($Erg, 0, 0) - 1; + $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '" . $_POST["GroupName"] . "' );"; + $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; + echo "\t
    Generate new UserGroup ...\n"; + $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); + if ($ErgNew1 == 1) { + echo "\t
    Generate new User rights...\n"; + $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); + if ($ErgNew1 == 1) { + echo "\t
    New group was created.\n"; + } else { + echo "Error on creation\n(" . mysql_error($con) . ")"; + } + } else { + echo "Error on creation\n(" . mysql_error($con) . ")"; + } + + } + + break; + } } else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; + // kein Action gesetzt -> abbruch + echo "Unzulässiger Aufruf.
    Bitte neu editieren..."; } -include ("../../../camp2011/includes/footer.php"); +include ("includes/footer.php"); ?> -- cgit v1.2.3-54-g00ecf From 62762a936839f581fd3b64ae41751966cf08b891 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 15:03:10 +0200 Subject: bootstrapping finish --- www-ssl/ShowUserPicture.php | 100 ++++++++++++++++++++++---------------------- www-ssl/admin/dect.php | 2 +- www-ssl/lageplan.php | 14 ++++--- 3 files changed, 60 insertions(+), 56 deletions(-) diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index b6e95897..96b1092a 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,51 +1,53 @@ diff --git a/www-ssl/admin/dect.php b/www-ssl/admin/dect.php index 6ad98c81..4e9f472a 100644 --- a/www-ssl/admin/dect.php +++ b/www-ssl/admin/dect.php @@ -6,7 +6,7 @@ $header = "DECT send call"; include ("includes/header.php"); include ("config/config_IAX.php"); -//include ("../../../camp2011/includes/funktion_modem.php"); +//include ("includes/funktion_modem.php"); include ("includes/funktion_cron.php"); if (!isset ($_GET["dial"])) diff --git a/www-ssl/lageplan.php b/www-ssl/lageplan.php index ca6ee4b0..3d1260c1 100644 --- a/www-ssl/lageplan.php +++ b/www-ssl/lageplan.php @@ -1,10 +1,12 @@ " . Get_Text("lageplan_text1") . "

    "; - echo "

    \"\""; +$title = "Index"; +$header = "Lageplan"; +include "includes/header.php"; - include "../../camp2011/includes/footer.php"; +echo "

    " . Get_Text("lageplan_text1") . "

    "; +echo "

    \"\""; + +include "includes/footer.php"; ?> -- cgit v1.2.3-54-g00ecf From 9ee80208718277954a066be26e10c5be881cc50b Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 15:06:09 +0200 Subject: footer :) --- includes/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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")

    © copyleft - Kontakt
    - This is hell. Really. + This is hell. Temporarily.

    -- cgit v1.2.3-54-g00ecf From ee3080a861fb4ac95a7cd6ef5f666798ed63c0ab Mon Sep 17 00:00:00 2001 From: Philip Häusler 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 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") 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 @@ + +

    The angelsystem has been (re)done by:

    +
      +
    • ?
      • +
    • helios
      • +
    • msquare
      • +
    + 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 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(-) 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") 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 @@ ". Get_Text("$MenuName/"). "
      "; - // 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 = "

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

        "; - 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
      • $TempName
        • \n"; - $Gefunden = true; - } - } - elseif( $debug ) - { - $Gefunden = true; - $Text .= "\t\t\t
      • $TempName ($Key)
        • \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
      • $TempName
        • \n"; + $Gefunden = true; + } + } + elseif ($debug) { + $Gefunden = true; + $Text .= "\t\t\t
      • $TempName ($Key)
        • \n"; + } + } + if ($Gefunden) + echo $MenueTableStart . $Text . $MenueTableEnd; +} //function ShowMenue ?> -- cgit v1.2.3-54-g00ecf 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 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 "
          "; - - for($i = 0; $i < mysql_num_rows($Erg); $i++) { - 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 "
          • \n"; - } - - 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 "
          "; + +for ($i = 0; $i < mysql_num_rows($Erg); $i++) { + 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 "
          • \n"; +} + +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 'DE'; +echo 'EN'; ?> 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 = "

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

          "; + $Text = ""; // Eintraege foreach ($_SESSION['CVS'] as $Key => $Entry) @@ -37,6 +37,6 @@ function ShowMenu($MenuName) { } } if ($Gefunden) - echo $MenueTableStart . $Text . $MenueTableEnd; + echo ''; } //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 @@ 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); - } +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 "" . $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/menu.php b/includes/menu.php index 955de8b7..61a3ea73 100644 --- a/includes/menu.php +++ b/includes/menu.php @@ -2,35 +2,23 @@ - - -"; -$MenueTableEnd="
        -
        - - -
        -"; - 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 "
        "; - echo "
        " . mysql_result($Erg, $n, "Frage") . "
        "; - echo "
        " . mysql_result($Erg, $n, "Antwort") . "
        "; + if ($_SESSION['Sprache'] == "DE") { + echo "
        " . $frage_de . "
        "; + echo "
        " . $antwort_de . "
        "; + } else { + echo "
        " . $frage_en . "
        "; + echo "
        " . $antwort_en . "
        "; + } echo "
        "; } } diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php index add0fdd3..b53f8088 100644 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -10,7 +10,7 @@ include ("includes/crypt.php"); session_start(); // alte Session - falls vorhanden - wiederherstellen... function LoginOK() { - include ("../../config/config.php"); + include ("config/config.php"); header("HTTP/1.1 302 Moved Temporarily"); header("Location: " . $url . $ENGEL_ROOT . "nonpublic/news.php"); } diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif deleted file mode 100644 index 15739e2e..00000000 Binary files a/www-ssl/pic/flag/de.gif and /dev/null differ diff --git a/www-ssl/pic/flag/de.png b/www-ssl/pic/flag/de.png new file mode 100644 index 00000000..ac4a9773 Binary files /dev/null and b/www-ssl/pic/flag/de.png differ diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif deleted file mode 100644 index 34936ee3..00000000 Binary files a/www-ssl/pic/flag/en.gif and /dev/null differ diff --git a/www-ssl/pic/flag/en.png b/www-ssl/pic/flag/en.png new file mode 100644 index 00000000..ff701e19 Binary files /dev/null and b/www-ssl/pic/flag/en.png differ -- cgit v1.2.3-54-g00ecf From ac8dbe835e368b9c7d97584c3722206b134db890 Mon Sep 17 00:00:00 2001 From: Philip Häusler 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(-) 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 @@ - -
        -

        - " . Get_Text("back") . " "; -?> - -

        - - - - - - - + + -if ($_SESSION['Menu'] == "R") - include ("menu.php"); -?> - - -

        © copyleft | Kontakt | Credits
        @@ -30,8 +10,6 @@ if ($_SESSION['Menu'] == "R")

        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 'DE'; -echo 'EN'; +echo '

        DE'; +echo 'EN

        '; ?> 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"])) { } } ?> - - +
        +
        -- cgit v1.2.3-54-g00ecf From 0ee418ffa2e47f17ab7d4f7d74192e091eef4d50 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 18:23:01 +0200 Subject: mysql utf-8 --- default-conf/var_www_includes/config_db.php | 4 +-- includes/funktion_lang.php | 43 ++++++++++++++--------------- includes/funktion_menu.php | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php index 428a9339..a90e012e 100644 --- a/default-conf/var_www_includes/config_db.php +++ b/default-conf/var_www_includes/config_db.php @@ -3,6 +3,6 @@ include ("../include/funktion_db.php"); $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); +mysql_query("SET CHARACTER SET utf8;", $con); +mysql_query("SET NAMES 'utf8'", $con); ?> diff --git a/includes/funktion_lang.php b/includes/funktion_lang.php index e04dd8eb..3e26ea33 100644 --- a/includes/funktion_lang.php +++ b/includes/funktion_lang.php @@ -1,28 +1,27 @@ diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php index 8246dcc5..e62ff37c 100644 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -15,7 +15,7 @@ function ShowMenu($MenuName) { if ((strpos("00$Key", "0$MenuName") > 0) || ((strlen($MenuName) == 0) && (strpos("0$Key", "/") == 0))) { $TempName = Get_Text($Key, true); - if ((true || $debug) && (strlen($TempName) == 0)) + if ((true || $debug) && ($TempName == "")) $TempName = "not found: \"$Key\""; if ($Entry == "Y") { -- cgit v1.2.3-54-g00ecf From d85d11276b464052e442297fe93cd5f628b979e2 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 18:51:01 +0200 Subject: html5, css rewrite --- www-ssl/css/style10.css | 7 +++++++ www-ssl/css/style6.css | 8 ++++++-- www-ssl/pic/engelsystem_logo.png | Bin 0 -> 8736 bytes 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 www-ssl/pic/engelsystem_logo.png diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css index e69de29b..311097c7 100644 --- a/www-ssl/css/style10.css +++ b/www-ssl/css/style10.css @@ -0,0 +1,7 @@ +#logo { + background: url('../pic/engelsystem_logo.png') top left no-repeat; + display: block; + height: 69px; + margin: 10px auto; + width: 523px; +} diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css index eaca462f..2272f598 100644 --- a/www-ssl/css/style6.css +++ b/www-ssl/css/style6.css @@ -1,5 +1,5 @@ -body { +body, .background { font-family: Arial, Helvetica, sans-serif; background-color: #121327; color: #FFFFFF; @@ -39,7 +39,7 @@ li { background-color: #333e47 } -.border { +.border, .container { background-color: #000000 } @@ -70,3 +70,7 @@ h4.menu { .comment { font-size : 6pt; } + +h4, h1 { + background: #333E47; +} diff --git a/www-ssl/pic/engelsystem_logo.png b/www-ssl/pic/engelsystem_logo.png new file mode 100644 index 00000000..b017302e Binary files /dev/null and b/www-ssl/pic/engelsystem_logo.png differ -- cgit v1.2.3-54-g00ecf From 841bf6a1ca80c14e2ff0ff60a6cb7794527a7ddf Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 19:42:57 +0200 Subject: i love this system --- config/.gitignore | 1 + config/config_MessegeServer.php | 7 ---- includes/UserCVS.php | 4 +-- includes/funktion_db.php | 6 ++-- includes/funktion_db_list.php | 2 +- includes/funktion_menu.php | 8 ++--- includes/funktion_schichtplan.php | 60 ++++++++++++++++---------------- includes/funktion_schichtplan_beamer.php | 24 ++++++------- includes/funktion_xml_room.php | 8 ++--- includes/funktion_xml_schudle.php | 40 ++++++++++----------- includes/header.php | 8 ++--- www-ssl/bootstrap.php | 2 -- 12 files changed, 79 insertions(+), 91 deletions(-) delete mode 100644 config/config_MessegeServer.php diff --git a/config/.gitignore b/config/.gitignore index a99da95f..cb667ea2 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -3,3 +3,4 @@ config_jabber.php config_modem.php config.php config_IAX.php +config_MessegeServer.php diff --git a/config/config_MessegeServer.php b/config/config_MessegeServer.php deleted file mode 100644 index ce7c7c3a..00000000 --- a/config/config_MessegeServer.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/includes/UserCVS.php b/includes/UserCVS.php index c062106f..98a4fec7 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/funktion_db.php b/includes/funktion_db.php index 160a9c59..ffd7d6a2 100644 --- a/includes/funktion_db.php +++ b/includes/funktion_db.php @@ -48,7 +48,7 @@ $Gefunden = false; $Diff = "\n
        - - - - - - diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 27e20788..6c0bc298 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -4,7 +4,6 @@ } body { - background: #f0f0f0; font-family: Arial; sans-serif; font-size: @@ -78,18 +77,22 @@ nav { margin: 0 10px 10px 0; } -nav, #content { - border: 1px solid #888; -} - #content article { padding: 10px; } -nav ul, nav p, #content article { - background: #fff; -} - a.sprache img { margin: 5px; } + +.background { + background: #f0f0f0; +} + +.container { + border: 1px solid #888; +} + +.content { + background: #fff; +} diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css index 8fec5db0..fd8426f1 100644 --- a/www-ssl/css/style1.css +++ b/www-ssl/css/style1.css @@ -1,84 +1,83 @@ -body { - background-color: #131313; - - color: #424242; - - line-height: 150%; - font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif; - - margin-bottom: 20px; +body, .background { + background-color: #131313; + color: #424242; + line-height: 150%; + font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif; } a { - text-decoration: none; - color: #424242 + text-decoration: none; + color: #424242 } td { - font-size: small + font-size: small } a:active, a:hover { - font-weight: bold + font-weight: bold } - + li { - font-size: small + font-size: small } .content { - background-color: #131313; - color: #424242; + background-color: #131313; + color: #424242; } -.contenttopic { - font-weight: bold; - font-size: small; - color: #000000; - background-color: #333333 +.contenttopic, h1 { + font-weight: bold; + font-size: small; + color: #000000; + background-color: #333333 } -.border { - background-color: #333333 +.border, .container { + background-color: #333333; + border: 1px solid #424242; } .menu { - background-color: #131313; - color: #424242; - font-size: small + background-color: #131313; + color: #424242; + font-size: small } -h4.menu { - background-color: #333333; - font-weight: bold; - font-size: small; - color: #000000 + +h4 { + background-color: #333333; + font-weight: bold; + font-size: small; + color: #000000 } .linkbox { - background-color: #ffffff + background-color: #ffffff } .linkboxtitle { - font-weight: bold; - background-color: #000000; - color: #ffffff + font-weight: bold; + background-color: #000000; + color: #ffffff } .question { - font-weight: bold; - font-size: 9pt + font-weight: bold; + font-size: 9pt } .engeltreffen { - font-weight: bold; - font-size: 9pt; - color: #ff0000; + font-weight: bold; + font-size: 9pt; + color: #ff0000; } .answer { - font-size: 9pt; + font-size: 9pt; } + .comment { - font-size : 6pt; + font-size: 6pt; } -- cgit v1.2.3-54-g00ecf From 208c76fcb2f597d22d4339227b88099f91305522 Mon Sep 17 00:00:00 2001 From: Philip Häusler 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(-) 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 @@ 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 '

        DE'; +echo '

        DE'; echo 'EN

        '; ?> 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++) { ?> -
        + +
        "; -if (strlen($header) == 0) - echo "\n" . Get_Text($Page["Name"]) . "\n"; -else - echo "\n$header\n"; -?> -
        -
        -' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . ''; +echo '
        '; if (isset ($_SESSION['UID'])) { if (isset ($_SESSION['oldurl'])) diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index b285c40d..27e20788 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -4,57 +4,92 @@ } body { - font-size: 14px; + background: #f0f0f0; + font-family: Arial; + sans-serif; + font-size: + 14px; } header { - display: block; - width: 100%; + display: block; + width: 100%; } footer { - display: block; - font-size: 12px; - text-align: center; - width: 100%; + clear: both; + display: block; + font-size: 12px; + text-align: center; + width: 100%; } footer p { - margin: 10px auto; + margin: 10px auto; } #logo { background: url('../pic/himmel.png') top left no-repeat; display: block; - height: 32px; - margin: 10px auto; + height: 32px; + margin: 10px auto; width: 380px; } #body { - margin: 0 5%; + margin: 0 5%; +} + +#menu { + float: left; + width: 200px; +} + +#content { + margin-left: 200px; +} + +a { + color: #000; } td, dt, dd { - padding: 4px; + padding: 4px; } dt { - font-weight: bold; + font-weight: bold; } dd { - margin-left: 20px; + margin-left: 20px; } -h4 { - padding: 0 4px; +h1, h4 { + font-size: 16px; + padding: 0 4px; } ul { - margin: 0 0 0 20px; + padding: 5px 0 5px 20px; +} + +nav { + margin: 0 10px 10px 0; +} + +nav, #content { + border: 1px solid #888; +} + +#content article { + padding: 10px; +} + +nav ul, nav p, #content article { + background: #fff; } a.sprache img { - margin: 5px; + margin: 5px; } -- cgit v1.2.3-54-g00ecf From 54aa90e6414b2e23d02915495b66d64e8ba6e286 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 17:51:39 +0200 Subject: html5, css rewrite --- includes/funktion_activeUser.php | 2 +- includes/funktion_menu.php | 2 +- includes/header.php | 6 +-- includes/menu.php | 8 ++-- www-ssl/css/base.css | 21 +++++----- www-ssl/css/style1.css | 85 ++++++++++++++++++++-------------------- 6 files changed, 64 insertions(+), 60 deletions(-) diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php index ca6e3aaa..631ec2d1 100644 --- a/includes/funktion_activeUser.php +++ b/includes/funktion_activeUser.php @@ -11,7 +11,7 @@ $SQL = "SELECT UID, Nick, lastLogIn " . $Erg = mysql_query($SQL, $con); -echo "
          "; +echo "
            "; for ($i = 0; $i < mysql_num_rows($Erg); $i++) { echo "
          • "; diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php index 3d20420b..8246dcc5 100644 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -37,6 +37,6 @@ function ShowMenu($MenuName) { } } if ($Gefunden) - echo ''; + echo ''; } //function ShowMenue ?> diff --git a/includes/header.php b/includes/header.php index 750c82fb..d4f212d9 100644 --- a/includes/header.php +++ b/includes/header.php @@ -40,7 +40,7 @@ echo "\n"; ///////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////// B O D Y ///////////////////////////////////////////////////////////////////////////////////////////// -echo "\n"; +echo "\n"; echo '
            '; @@ -69,12 +69,12 @@ if ($_SESSION['Menu'] == "L") include ("menu.php"); ?> -
            +
            ' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . ''; -echo '
            '; +echo '
            '; if (isset ($_SESSION['UID'])) { if (isset ($_SESSION['oldurl'])) diff --git a/includes/menu.php b/includes/menu.php index 61a3ea73..3ca5e8ae 100644 --- a/includes/menu.php +++ b/includes/menu.php @@ -31,26 +31,28 @@ if ($submenus >= 1) {
            -
        - - - -
        +
        - -
        + Schichtplan - +

        Schichtplan

        + \ 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"])) { +
        \n"; - $Diff .= "\n\t\n\t\n\t\n"; + $Diff .= "\n\n\n\n"; $Diff .= "\n"; foreach($Daten1 as $DataKey => $Data1) { @@ -58,12 +58,12 @@ foreach($Data1 as $key => $value) if( $value != $Data2[$key]) { $Gefunden = true; - $Diff .= "\n\t\n\t\n\t"; + $Diff .= "\n\n\n"; } } else foreach($Data1 as $key => $value) { $Gefunden = true; - $Diff .= "\n\t\n\t\n\t"; + $Diff .= "\n\n\n"; } } diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php index 1131ffd3..44e3d865 100644 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -38,7 +38,7 @@ function funktion_db_element_list_2row( $TopicName, $SQL) echo "
        Feldnameold Valuenew Value
        Feldnameold Valuenew Value
        $key$value" . $Data2[$key] . "\n
        $key$value" . $Data2[$key] . "\n
        $key$value\n
        $key$value\n
        \n"; echo ""; -# echo "\t\n"; +# echo "\n"; $Erg = mysql_query($SQL, $con); echo mysql_error($con); diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php index e62ff37c..0a324758 100644 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -1,7 +1,5 @@ $TempName\n"; + $Text .= "
      • $TempName
        • \n"; $Gefunden = true; } } elseif ($debug) { $Gefunden = true; - $Text .= "\t\t\t
      • $TempName ($Key)
        • \n"; + $Text .= "
      • $TempName ($Key)
        • \n"; } } if ($Gefunden) diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php index afa79144..6d6c3553 100644 --- a/includes/funktion_schichtplan.php +++ b/includes/funktion_schichtplan.php @@ -20,7 +20,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) /////////////////////////////////////////////////////////////////// $Spalten.=funktion_isLinkAllowed_addLink_OrEmpty( "admin/schichtplan.php?action=change&SID=$SID", - "edit
        \n\t\t"); + "edit
        \n"); /////////////////////////////////////////////////////////////////// // Ausgabe des Schischtnamens @@ -96,9 +96,9 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) if( count($TempValue["Engel"]) > 0 ) { if( count($TempValue["Engel"]) == 1 ) - $Spalten.= Get_Text("inc_schicht_ist"). ":
        \n\t\t"; + $Spalten.= Get_Text("inc_schicht_ist"). ":
        \n"; else - $Spalten.= Get_Text("inc_schicht_sind"). ":
        \n\t\t"; + $Spalten.= Get_Text("inc_schicht_sind"). ":
        \n"; foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) { @@ -123,7 +123,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) $Spalten.= "  ". $TempText. ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): ""). - "
        \n\t\t"; + "
        \n"; } @@ -145,7 +145,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y") if( $TempValue["free"] > 0 ) { - $Spalten.= "
        \n\t\t  "; $Spalten.= $TempValue["free"]; if( $TempValue["free"] != 1 ) @@ -164,10 +164,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) { if( isset($TempValue["free"])) if( $TempValue["free"] > 0 ) - $Spalten.= "
        \n\t\t  

        Fehlen noch: ". + $Spalten.= "
        \n  

        Fehlen noch: ". $TempValue["free"]. "

        "; } - $Spalten.= "
        \n\t\t"; + $Spalten.= "
        \n"; } // FOREACH return $Spalten; @@ -214,18 +214,18 @@ function CreateRoomShifts( $raum ) mysql_result($ErgSonder, $i, "SID"). "\">". mysql_result($ErgSonder, $i, "DateS"). " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)". - "
        \n\t\t"; + "
        \n"; } } } elseif( (mysql_num_rows( $ErgSonder) == 1) ) { - $Spalten[0].= "\t\t

        \n"; + "

        ↓↓↓

        ". + "\n\n"; return; } @@ -249,7 +249,7 @@ function CreateRoomShifts( $raum ) mysql_result($ErgSonder, $i, "SID"). "\">". mysql_result($ErgSonder, $i, "DateS"). " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)". - "
        \n\t\t"; + "
        \n"; } } } @@ -257,11 +257,11 @@ function CreateRoomShifts( $raum ) { $ZeitZeiger = substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+ (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60); - $Spalten[0].= "\t\t\n"; + "\n\n"; } ///////////////////////////////////////////////////////////// @@ -284,7 +284,7 @@ function CreateRoomShifts( $raum ) if( $ZeitZeiger < $ZeitPos ) { $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\t\t\n"; + "\n"; $ZeitZeiger += $ZeitPos - $ZeitZeiger; } @@ -293,14 +293,14 @@ function CreateRoomShifts( $raum ) //sonderfall wenn die schicht über dei 24 stunden hinaus geht // (eintrag abkürzen, pfeiel ausgeben) $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\t\t\n"; + (( ($ZeitZeiger+$len) > 24)? "

        ↓↓↓

        " : ""). + "\n\n"; $ZeitZeiger += $len; } else @@ -315,7 +315,7 @@ function CreateRoomShifts( $raum ) } if( $ZeitZeiger < 24 ) $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].= - "\t\t\n"; } // function CreateRoomShifts @@ -330,10 +330,10 @@ function showEmptyShifts( ) echo "
        $TopicName

        $TopicName

        $TopicName
        \n". - "\t\t\t

        ↑↑↑

        ". + $Spalten[0].= "        		\n". + "

        ↑↑↑

        ". Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), mysql_result($ErgSonder, 0, "Man") ). - "\t\t\t

        ↓↓↓

        ". - "\n\t\t        		\n". - "\t\t\t

        ↑↑↑

        ". + $Spalten[0].= "        		\n". + "

        ↑↑↑

        ". Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), mysql_result($ErgSonder, 0, "Man") ). - "\n\t\t        		  \n". - "\t\t\t". + "". Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), mysql_result($Erg, $i, "Man") ). - (( ($ZeitZeiger+$len) > 24)? "\t\t\t

        ↓↓↓

        " : ""). - "\n\t\t        		 
        \n"; echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ". @@ -355,10 +355,10 @@ function showEmptyShifts( ) { $angezeigt++; echo "\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; diff --git a/includes/funktion_schichtplan_beamer.php b/includes/funktion_schichtplan_beamer.php index 177b6cb3..85c5ffe8 100644 --- a/includes/funktion_schichtplan_beamer.php +++ b/includes/funktion_schichtplan_beamer.php @@ -49,10 +49,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) $Out.= "
        ". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "
        ". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "". substr(mysql_result( $Erg, $i, "DateS"), 11). "". $RoomID[mysql_result( $Erg, $i, "RID")]. "". + echo "". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "". substr(mysql_result( $Erg, $i, "DateS"), 11). "". $RoomID[mysql_result( $Erg, $i, "RID")]. "". ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")). "
        \n"; - $Out.= "\t\t\t\n". - "\t\t\t\t\n". - "\t\t\t\t\n". - "\t\t\t\t\n"; + $Out.= "\n". + "\n". + "\n". + "\n"; /////////////////////////////////////////////////////////////////// // SQL abfrage für die benötigten schichten @@ -94,10 +94,10 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) if( isset($Temp) && count($Temp) ) foreach( $Temp as $TempEntry => $TempValue ) { - $Out.= "\t\t\t\n"; + $Out.= "\n"; // ausgabe EngelType - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\t\n"; - $Out.= "\t\t\t\n"; + $Out.= "\n"; } // FOREACH - $Out.= "\t\t\t
        ". $EngelTypeID[ $TempValue["TID"] ]; + $Out.= "". $EngelTypeID[ $TempValue["TID"] ]; // ausgabe Eingetragener Engel if( count($TempValue["Engel"]) > 0 ) @@ -107,7 +107,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) else $Out.= " ". trim(Get_Text("inc_schicht_sind")). ":"; $Out.= ""; + $Out.= ""; foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) $Out.= UID2Nick( $TempEngelID ). ", "; @@ -117,7 +117,7 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) else { $Out.= ":\n"; + $Out.= "\n"; } @@ -133,11 +133,11 @@ function ausgabe_Feld_Inhalt( $SID, $Man ) } } $Out.= "
        \n\t"; + $Out.= "\n"; return $Out; } // function Ausgabe_Feld_Inhalt @@ -157,7 +157,7 @@ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) " (`DateS` like '". gmdate("Y-m-d H", $Time). "%')) ) ORDER BY `DateS`;"; $ErgRoom = mysql_query($SQL, $con); - $Out= "\t"; + $Out= ""; if( mysql_num_rows( $ErgRoom)>0 ) for( $i=1; $i<=mysql_num_rows( $ErgRoom); $i++ ) { @@ -166,7 +166,7 @@ function ausgabe_Zeile( $RID, $Time, &$AnzahlEintraege ) mysql_result( $ErgRoom, $i-1, "Man")); if( (mysql_num_rows( $ErgRoom) > 1) && !($i==mysql_num_rows( $ErgRoom)) ) $Out.= "
        "; -// $Out.= "
        \n\t\t\t\t"; +// $Out.= "
        \n"; } else diff --git a/includes/funktion_xml_room.php b/includes/funktion_xml_room.php index cb91af6f..f31d5661 100644 --- a/includes/funktion_xml_room.php +++ b/includes/funktion_xml_room.php @@ -43,11 +43,11 @@ CreateRoomArrays(); } else { echo "
        \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; + echo "\n"; + echo "\n"; + echo "\n"; $DS_KO++; - echo "\t\n"; + echo "\n"; echo "
        \n"; echo "
        "; } diff --git a/includes/funktion_xml_schudle.php b/includes/funktion_xml_schudle.php index 41efce04..f73f11ad 100644 --- a/includes/funktion_xml_schudle.php +++ b/includes/funktion_xml_schudle.php @@ -134,7 +134,7 @@ function SaveSchedule() { $EngelMin = $EngelNeeded_NotEmpty; echo "---> WARING ". $EngelNeeded_NotEmpty. - " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t"; + " shift is used, can't del ". TID2Type($EngelTypeID). " shifts"; } echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ". @@ -192,7 +192,7 @@ foreach($XMLmain->sub as $EventKey => $Event) if( $Event->name == "VEVENT") { echo "
        \n"; - echo "\t\n"; + echo "\n"; $PSIDXML = getXMLsubData( $Event, "UID"); $DateXML = @@ -236,17 +236,17 @@ foreach($XMLmain->sub as $EventKey => $Event) else $SIDDB = $PSIDDB = $TimeDB = $LenDB = $RIDDB = $ManDB = $URLDB = ""; - echo "\t\n"; - echo "\t\n\t\t". + echo "\n"; + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n"; - echo "\t\n"; + echo "\n"; + echo "\n"; if( !( $PSIDXML==$PSIDDB && $DateXML==$TimeDB && $RIDXML==$RIDDB && @@ -254,15 +254,15 @@ foreach($XMLmain->sub as $EventKey => $Event) $ManXML==$ManDB && $URLXML==$URLDB) ) { - echo "\t\n"; + echo "\n"; $DS_KO++; } else { - echo "\t". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "\n"; + echo "". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "\n"; $DS_OK++; } - echo "\t\n"; + echo "\n"; echo "
        \n"; $Where.= " OR `PSID`='$PSIDXML'"; } @@ -281,7 +281,7 @@ echo mysql_error($con); if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB ) for( $i=0; $i\n"; + echo "\n"; $SID = mysql_result($Erg2, $i, "SID"); $Time = mysql_result($Erg2, $i, "DateS"); $Len = mysql_result($Erg2, $i, "Len"); @@ -290,18 +290,18 @@ if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB ) else $RID = "RID.". mysql_result($Erg2, $i, "RID"); $Man = mysql_result($Erg2, $i, "Man"); - echo "\t\n"; - echo "\t\n\t\t". + echo "\n"; + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). + echo "". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). "\n"; - echo "\t\n"; + echo "\n"; } echo ""; diff --git a/includes/header.php b/includes/header.php index d4f212d9..9cd2e51d 100644 --- a/includes/header.php +++ b/includes/header.php @@ -3,7 +3,7 @@ include "header_start.php"; echo "\n"; ?> - + <?php echo $title; ?> - Engelsystem @@ -22,8 +22,6 @@ echo "\n"; \n"; if (isset ($_SESSION['oldurl'])) - echo "" . Get_Text("back") . " geht's zurück...\n"; + echo "hier gehts zurück...\n"; else - echo "" . Get_Text("back") . " geht's zurück...\n"; + echo "hier geht's zurück...\n"; exit (); } diff --git a/www-ssl/bootstrap.php b/www-ssl/bootstrap.php index 3189c89a..40a32578 100644 --- a/www-ssl/bootstrap.php +++ b/www-ssl/bootstrap.php @@ -1,6 +1,4 @@ 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 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 @@ 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 @@ - 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 @@ + \ 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 @@ +', $faq['Frage']); + list ($antwort_de, $antwort_en) = explode('
        ', $faq['Antwort']); + $html .= "
        "; + if ($_SESSION['Sprache'] == "DE") { + $html .= "
        " . $frage_de . "
        "; + $html .= "
        " . $antwort_de . "
        "; + } else { + $html .= "
        " . $frage_en . "
        "; + $html .= "
        " . $antwort_en . "
        "; + } + $html .= "
        "; + } + 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 @@ + 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") . "
        \n"; + $error = sql_error(); + } else { + $html .= "

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

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

        " . Get_Text("makeuser_writeOK3") . "

        \n"; + } + + $html .= 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)) + $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 .= "

        " . Get_Text("makeuser_text0") . "

        \n"; + $html .= "

        " . Get_Text("makeuser_text1") . "

        \n"; + $html .= "
        \n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + + if (isset ($SubscribeMailinglist)) + $html .= "\n"; + + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "\n"; + $html .= "
        " . 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"; + $html .= "
        " . 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"; + $html .= "\n"; + $html .= "
        " . Get_Text("makeuser_Hometown") . "
        " . Get_Text("makeuser_Passwort") . "*
        " . Get_Text("makeuser_Passwort2") . "*
         
        \n"; + $html .= "
        \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 @@ +" . Get_Text("index_text1") . "

        \n"; + $html .= "

        " . Get_Text("index_text2") . "

        \n"; + $html .= "

        " . Get_Text("index_text3") . "

        \n"; + + $html .= guest_login_form(); + + $html .= "
        " . Get_Text("index_text4") . "
        "; + 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 @@ + 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 @@ + 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 @@ +

        ' . Get_Text('/') . '

        '; + return $menu; +} + +function make_menu() { + return make_navigation() . make_onlineusers() . make_langselect(); +} + +function make_onlineusers() { + global $privileges, $user; + $html = ''; + return $html; +} + +function make_langselect() { + if (strpos($_SERVER["REQUEST_URI"], "?") > 0) + $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage="; + else + $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; + + $html = '

        DE'; + $html .= 'EN

        '; + return ''; +} +?> \ 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 @@ + 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 @@ +' . $msg . '

        '; +} + +function success($msg) { + return '

        ' . $msg . '

        '; +} +?> \ 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 @@ + $content) { + $template = str_replace("%" . $name . "%", $content, $template); + } + return $template; + } else { + die('Cannot find template file «' . $file . '».'); + } +} +?> \ 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 @@ +

        The angelsystem has been (re)done by:

        +
          +
        • + ? +
          • +
        • + helios +
          • +
        • + msquare +
          • +
        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 @@ +
        + + + + + + + + + +
        + %nick% + + +
        + %pass% + + +
        +
        + +
        \ 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 @@ + + + + %title% - Engelsystem + + + + + + + + + + + + + +
        + +
        +
        + +
        +

        %title%

        +
        + %content% +
        +
        +
        +
        +

        + © copyleft | Contact + | Credits +
        + This is hell. Temporarily. +

        +
        + + 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 @@ - -

        The angelsystem has been (re)done by:

        -
          -
        • ?
          • -
        • helios
          • -
        • msquare
          • -
        - 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 @@ " . Get_Text("index_text1") . "

        \n"; -echo "

        " . Get_Text("index_text2") . "

        \n"; -echo "

        " . Get_Text("index_text3") . "

        \n"; +session_start(); -include "includes/login_eingabefeld.php"; +sql_connect($config['host'], $config['user'], $config['pw'], $config['db']); -echo "
        " . Get_Text("index_text4") . "
        "; +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 c90fdf75a26e6abf2434068d4aa3cfcb190eb600 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 01:02:15 +0200 Subject: rewrite --- includes/pages/guest_login.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 76a473df..7fe081fc 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -34,7 +34,7 @@ function guest_register() { "`ICQ`, " . "`jabber`, " . "`Size`, " . "`Passwort`, " . "`Art` , " . "`kommentar`, " . - "`Hometown`," . "`CreateDate` ) " . + "`Hometown`," . "`CreateDate`, `Sprache` ) " . "VALUES ( " . "'" . $_POST["Nick"] . "', " . "'" . $_POST["Name"] . "', " . "'" . $_POST["Vorname"] . "', " . "'" . $_POST["Alter"] . "', " . @@ -43,7 +43,7 @@ function guest_register() { "'" . $_POST["ICQ"] . "', " . "'" . $_POST["jabber"] . "', " . "'" . $_POST["Size"] . "', " . "'" . $_POST["Passwort"] . "', " . "'" . $_POST["Art"] . "', " . "'" . $_POST["kommentar"] . "', " . - "'" . $_POST["Hometown"] . "'," . "NOW())"); + "'" . $_POST["Hometown"] . "'," . "NOW(), '" . $_SESSION['Sprache'] . "')"); if ($Erg != 1) { $html .= Get_Text("makeuser_error_write1") . "
        \n"; @@ -51,16 +51,11 @@ function guest_register() { } else { $html .= "

        " . 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); + $Erg3 = mysql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape(sql_id()) . ", `group_id`=-2"); if ($Erg3 != 1) { $html .= "

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

        " . Get_Text("makeuser_writeOK3") . "

        \n"; -- cgit v1.2.3-54-g00ecf From 10683c4759c2c3563ff7ed48b15d12e85cd0631b Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 01:09:03 +0200 Subject: counter --- includes/crypt.php | 12 ------------ includes/funktion_counter.php | 14 -------------- includes/sys_counter.php | 10 ++++++++++ includes/sys_menu.php | 4 ++-- www-ssl/index.php | 3 +++ 5 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 includes/crypt.php delete mode 100644 includes/funktion_counter.php create mode 100644 includes/sys_counter.php diff --git a/includes/crypt.php b/includes/crypt.php deleted file mode 100644 index 8de22030..00000000 --- a/includes/crypt.php +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/includes/funktion_counter.php b/includes/funktion_counter.php deleted file mode 100644 index 39d65a1f..00000000 --- a/includes/funktion_counter.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/includes/sys_counter.php b/includes/sys_counter.php new file mode 100644 index 00000000..abcb652b --- /dev/null +++ b/includes/sys_counter.php @@ -0,0 +1,10 @@ + diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 8c993d1b..6a24deaf 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -36,8 +36,8 @@ function make_onlineusers() { $html .= "
      • "; - if (isset ($user)) - $html .= DisplayAvatar($online_user['UID']); + //if (isset ($user)) + //$html .= DisplayAvatar($online_user['UID']); // Show Admin Page if (in_array("admin_user_edit", $privileges)) { diff --git a/www-ssl/index.php b/www-ssl/index.php index 5126981c..1e63ede7 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -1,6 +1,7 @@ make_menu(), 'content' => $content )); + +counter(); ?> -- cgit v1.2.3-54-g00ecf 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 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 "
          "; - -for ($i = 0; $i < mysql_num_rows($Erg); $i++) { - 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 "
          • \n"; -} - -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 '

        DE'; -echo 'EN

        '; -?> 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 "
        "; - if ($_SESSION['Sprache'] == "DE") { - echo "
        " . $frage_de . "
        "; - echo "
        " . $antwort_de . "
        "; - } else { - echo "
        " . $frage_en . "
        "; - echo "
        " . $antwort_en . "
        "; - } - echo "
        "; - } -} - -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") . "
        " . 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-54-g00ecf From 134272dd9376a1c43053e590799efb0ea508238c Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 01:45:19 +0200 Subject: news --- includes/funktion_user.php | 111 -------------------------------------- www-ssl/index.php | 5 +- www-ssl/nonpublic/news.php | 12 ----- www-ssl/nonpublic/news_output.php | 106 ------------------------------------ 4 files changed, 3 insertions(+), 231 deletions(-) delete mode 100644 includes/funktion_user.php delete mode 100644 www-ssl/nonpublic/news.php delete mode 100644 www-ssl/nonpublic/news_output.php diff --git a/includes/funktion_user.php b/includes/funktion_user.php deleted file mode 100644 index c015cb5a..00000000 --- a/includes/funktion_user.php +++ /dev/null @@ -1,111 +0,0 @@ - 0) - $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; - else - $SQL = "SELECT Name FROM `UserGroups` WHERE UID='$UID'"; - - $Erg = mysql_query($SQL, $con); - - if(mysql_num_rows($Erg)) { - if($UID > 0) - return mysql_result($Erg, 0); - else - return "Group-".mysql_result($Erg, 0); - } else { - if($UID == -1) - return "logout User"; - else - return "UserID $UID not found"; - } - } - - function TID2Type($TID) { - global $con; - - $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; - $Erg = mysql_query($SQL, $con); - - if(mysql_num_rows($Erg)) - return mysql_result($Erg, 0); - else - return ""; - } - - function ReplaceSmilies($neueckig) { - global $url, $ENGEL_ROOT; - - $neueckig = str_replace(";o))", "", $neueckig); - $neueckig = str_replace(":-))", "", $neueckig); - $neueckig = str_replace(";o)", "", $neueckig); - $neueckig = str_replace(":)", "", $neueckig); - $neueckig = str_replace(":-)", "", $neueckig); - $neueckig = str_replace(":(", "", $neueckig); - $neueckig = str_replace(":-(", "", $neueckig); - $neueckig = str_replace(":o(", "", $neueckig); - $neueckig = str_replace(":o)", "", $neueckig); - $neueckig = str_replace(";o(", "", $neueckig); - $neueckig = str_replace(";(", "", $neueckig); - $neueckig = str_replace(";-(", "", $neueckig); - $neueckig = str_replace("8)", "", $neueckig); - $neueckig = str_replace("8o)", "", $neueckig); - $neueckig = str_replace(":P", "", $neueckig); - $neueckig = str_replace(":-P", "", $neueckig); - $neueckig = str_replace(":oP", "", $neueckig); - $neueckig = str_replace(";P", "", $neueckig); - $neueckig = str_replace(";oP", "", $neueckig); - $neueckig = str_replace("?)", "", $neueckig); - - return $neueckig; - } - - function GetPicturShow($UID) { - global $con; - - $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; - $res = mysql_query( $SQL, $con); - - if(mysql_num_rows($res) == 1) - return mysql_result($res, 0, 0); - else - return ""; - } - - function displayPictur($UID, $height = "30") { - global $url, $ENGEL_ROOT; - - if($height > 0) - return( "\"picture"); - else - return( "\"picture"); - } - - function displayavatar($UID, $height="30") { - global $con, $url, $ENGEL_ROOT; - - if( GetPicturShow($UID) == 'Y') - return " ". displayPictur( $UID, $height); - - // show avator - $asql = "select * from User where UID = $UID"; - $aerg = mysql_query ($asql, $con); - - if(mysql_num_rows($aerg)) - if(mysql_result($aerg, 0, "Avatar") > 0) - return (" "); - } - - function UIDgekommen($UID) { - global $con; - - $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; - $Erg = mysql_query($SQL, $con); - - if(mysql_num_rows($Erg)) - return mysql_result($Erg, 0); - else - return "0"; - } -?> diff --git a/www-ssl/index.php b/www-ssl/index.php index 1e63ede7..98c7e439 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -7,6 +7,7 @@ require_once ('includes/sys_menu.php'); require_once ('includes/sys_mysql.php'); require_once ('includes/sys_page.php'); require_once ('includes/sys_template.php'); +require_once ('includes/sys_user.php'); require_once ('config/config.php'); require_once ('config/config_db.php'); @@ -28,8 +29,8 @@ $content = ""; // Recht dafür vorhanden? if (in_array($p, $privileges)) { if ($p == "news") { - //require_once ('includes/pages/user_news.php'); - $content = "news"; + require_once ('includes/pages/user_news.php'); + $content = user_news(); } elseif ($p == "login") { require_once ('includes/pages/guest_login.php'); diff --git a/www-ssl/nonpublic/news.php b/www-ssl/nonpublic/news.php deleted file mode 100644 index 16006c52..00000000 --- a/www-ssl/nonpublic/news.php +++ /dev/null @@ -1,12 +0,0 @@ -" . Get_Text(3) . ""; -include "news_output.php"; - -include "includes/footer.php"; -?> diff --git a/www-ssl/nonpublic/news_output.php b/www-ssl/nonpublic/news_output.php deleted file mode 100644 index 77bbad87..00000000 --- a/www-ssl/nonpublic/news_output.php +++ /dev/null @@ -1,106 +0,0 @@ -"; - else - echo "

        "; - - echo "". ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) ."\n"; - - // Schow Admin Page - if( $_SESSION['CVS'][ "admin/news.php" ] == "Y" ) - echo " [edit]
        \n\t\t"; - - echo "
           ".mysql_result($Erg, $n, "Datum").", "; - echo UID2Nick(mysql_result($Erg, $n, "UID")).""; - // avatar anzeigen? - echo DisplayAvatar (mysql_result($Erg, $n, "UID")); - echo "

        \n"; - echo "

        ". ReplaceSmilies(nl2br(mysql_result($Erg, $n, "Text"))) ."

        \n"; - $RefID=mysql_result($Erg, $n, "ID"); - $countSQL="SELECT COUNT(*) FROM `news_comments` WHERE `Refid`='$RefID'"; - $countErg = mysql_query($countSQL, $con); - $countcom = mysql_result($countErg, 0, "COUNT(*)"); - echo "

        $countcom comments

        \n\n"; -} - -echo "
        \n\n"; -$rowerg = mysql_query("SELECT * FROM `News`", $con); -$rows = mysql_num_rows($rowerg); -$dis_rows = round (($rows / $DISPLAY_NEWS)+0.5); - -Print_Text(5); - -for ($i=1; $i <= $dis_rows; $i++) { - if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { - echo "$i  "; - } else { - echo "$i  "; - } -} -echo "
        "; - -?> - -
        -
        -

        -  - -
        - -"> - - - - - - - - - - - - - - - - -
        -
        -"> -
        -- cgit v1.2.3-54-g00ecf From 5a935f413dd6dff69df736b437073d343aa8a6ec Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 01:45:46 +0200 Subject: news --- includes/pages/user_news.php | 106 +++++++++++++++++++++++++++++++++++++++++ includes/sys_user.php | 109 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+) create mode 100644 includes/pages/user_news.php create mode 100644 includes/sys_user.php diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php new file mode 100644 index 00000000..7012bb99 --- /dev/null +++ b/includes/pages/user_news.php @@ -0,0 +1,106 @@ +" . Get_Text(3) . "" . user_news_output(); +} + +function user_news_output() { + global $DISPLAY_NEWS, $privileges; + + if (isset ($_POST["text"]) && isset ($_POST["betreff"]) && IsSet ($_POST["date"])) { + if (!isset ($_POST["treffen"])) + $_POST["treffen"] = 0; + $SQL = "INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " . + "VALUES ('" . sql_escape($_POST["date"]) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($_SESSION['uid']) . + "', '" . sql_escape($_POST["treffen"]) . "');"; + $Erg = sql_query($SQL); + if ($Erg == 1) + $html .= Get_Text(4); + } + + if (!IsSet ($_GET["news_begin"])) + $_GET["news_begin"] = 0; + + if (!IsSet ($_GET["DISPLAY_NEWS"])) + $_GET["DISPLAY_NEWS"] = 5; + + $SQL = "SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . intval($_GET["news_begin"]) . ", " . intval($_GET["DISPLAY_NEWS"]); + $Erg = sql_query($SQL); + + // anzahl zeilen + $news_rows = mysql_num_rows($Erg); + + for ($n = 0; $n < $news_rows; $n++) { + + if (mysql_result($Erg, $n, "Treffen") == 0) + $html .= "

        "; + else + $html .= "

        "; + + $html .= "" . ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) . "\n"; + + // Schow Admin Page + if ($_SESSION['CVS']["admin/news.php"] == "Y") + $html .= " [edit]
        \n\t\t"; + + $html .= "
           " . mysql_result($Erg, $n, "Datum") . ", "; + $html .= UID2Nick(mysql_result($Erg, $n, "UID")) . ""; + // avatar anzeigen? + $html .= DisplayAvatar(mysql_result($Erg, $n, "UID")); + $html .= "

        \n"; + $html .= "

        " . ReplaceSmilies(nl2br(mysql_result($Erg, $n, "Text"))) . "

        \n"; + $RefID = mysql_result($Erg, $n, "ID"); + $countSQL = "SELECT COUNT(*) FROM `news_comments` WHERE `Refid`='$RefID'"; + $countErg = sql_query($countSQL); + $countcom = mysql_result($countErg, 0, "COUNT(*)"); + $html .= "

        $countcom comments

        \n\n"; + } + + $html .= "
        \n\n"; + $rowerg = sql_query("SELECT * FROM `News`"); + $rows = mysql_num_rows($rowerg); + $dis_rows = round(($rows / $DISPLAY_NEWS) + 0.5); + + $html .= Get_Text(5); + + for ($i = 1; $i <= $dis_rows; $i++) { + if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { + $html .= "$i  "; + } else { + $html .= "$i  "; + } + } + $html .= '
        +
        +

        ' . Get_Text(6) . '

        +   + +
        + + + + + + + + + + + '; + if (in_array('news_add_meeting', $privileges)) { + $html .= ' + + + '; + + } + $html .= '
        ' . Get_Text(7) . '
        ' . Get_Text(8) . '
        ' . Get_Text(9) . '
        +
        + +
        '; + return $html; +} +?> \ No newline at end of file diff --git a/includes/sys_user.php b/includes/sys_user.php new file mode 100644 index 00000000..6274003d --- /dev/null +++ b/includes/sys_user.php @@ -0,0 +1,109 @@ + 0) + $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; + else + $SQL = "SELECT Name FROM `Groups` WHERE UID='$UID'"; + + $Erg = sql_select($SQL); + + if (count($Erg) > 0) { + if ($UID > 0) + return $Erg[0]['Nick']; + else + return "Group-" . $Erg[0]['Name']; + } else { + if ($UID == -1) + return "Guest"; + else + return "UserID $UID not found"; + } +} + +function TID2Type($TID) { + global $con; + + $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; + $Erg = mysql_query($SQL, $con); + + if (mysql_num_rows($Erg)) + return mysql_result($Erg, 0); + else + return ""; +} + +function ReplaceSmilies($neueckig) { + global $url, $ENGEL_ROOT; + + $neueckig = str_replace(";o))", "", $neueckig); + $neueckig = str_replace(":-))", "", $neueckig); + $neueckig = str_replace(";o)", "", $neueckig); + $neueckig = str_replace(":)", "", $neueckig); + $neueckig = str_replace(":-)", "", $neueckig); + $neueckig = str_replace(":(", "", $neueckig); + $neueckig = str_replace(":-(", "", $neueckig); + $neueckig = str_replace(":o(", "", $neueckig); + $neueckig = str_replace(":o)", "", $neueckig); + $neueckig = str_replace(";o(", "", $neueckig); + $neueckig = str_replace(";(", "", $neueckig); + $neueckig = str_replace(";-(", "", $neueckig); + $neueckig = str_replace("8)", "", $neueckig); + $neueckig = str_replace("8o)", "", $neueckig); + $neueckig = str_replace(":P", "", $neueckig); + $neueckig = str_replace(":-P", "", $neueckig); + $neueckig = str_replace(":oP", "", $neueckig); + $neueckig = str_replace(";P", "", $neueckig); + $neueckig = str_replace(";oP", "", $neueckig); + $neueckig = str_replace("?)", "", $neueckig); + + return $neueckig; +} + +function GetPicturShow($UID) { + global $con; + + $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; + $res = mysql_query($SQL, $con); + + if (mysql_num_rows($res) == 1) + return mysql_result($res, 0, 0); + else + return ""; +} + +function displayPictur($UID, $height = "30") { + global $url, $ENGEL_ROOT; + + if ($height > 0) + return ("\"picture"); + else + return ("\"picture"); +} + +function displayavatar($UID, $height = "30") { + global $con, $url, $ENGEL_ROOT; + + if (GetPicturShow($UID) == 'Y') + return " " . displayPictur($UID, $height); + + // show avator + $asql = "select * from User where UID = $UID"; + $aerg = mysql_query($asql, $con); + + if (mysql_num_rows($aerg)) + if (mysql_result($aerg, 0, "Avatar") > 0) + return (" "); +} + +function UIDgekommen($UID) { + global $con; + + $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; + $Erg = mysql_query($SQL, $con); + + if (mysql_num_rows($Erg)) + return mysql_result($Erg, 0); + else + return "0"; +} +?> -- cgit v1.2.3-54-g00ecf From 0d351f47915679f98cbd93cd5d8f4d32d91a834a Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 16:56:45 +0200 Subject: admin rooms --- includes/funktion_schichtplan.php | 389 ----------------------------- includes/funktion_schichtplan_Tage.php | 101 -------- includes/funktion_schichtplan_aray.php | 38 --- includes/pages/admin_rooms.php | 148 +++++++++++ includes/pages/user_news.php | 54 ++-- includes/sys_shift.php | 442 +++++++++++++++++++++++++++++++++ includes/sys_template.php | 8 + templates/admin_rooms_edit_form.html | 59 +++++ templates/admin_rooms_new_form.html | 46 ++++ www-ssl/css/base.css | 16 ++ www-ssl/index.php | 5 + 11 files changed, 751 insertions(+), 555 deletions(-) delete mode 100644 includes/funktion_schichtplan.php delete mode 100644 includes/funktion_schichtplan_Tage.php delete mode 100644 includes/funktion_schichtplan_aray.php create mode 100644 includes/pages/admin_rooms.php create mode 100644 includes/sys_shift.php create mode 100644 templates/admin_rooms_edit_form.html create mode 100644 templates/admin_rooms_new_form.html diff --git a/includes/funktion_schichtplan.php b/includes/funktion_schichtplan.php deleted file mode 100644 index 6d6c3553..00000000 --- a/includes/funktion_schichtplan.php +++ /dev/null @@ -1,389 +0,0 @@ -\n"); - - /////////////////////////////////////////////////////////////////// - // Ausgabe des Schischtnamens - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; - $Erg = mysql_query($SQL, $con); - if( mysql_result($Erg, 0, 0) != "") - $Spalten.="$Man:
        "; - else - $Spalten.="".$Man.":
        "; - - - /////////////////////////////////////////////////////////////////// - // SQL abfrage für die benötigten schichten - /////////////////////////////////////////////////////////////////// - $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; - $Erg = mysql_query($SQL, $con); - - $Anzahl = mysql_num_rows($Erg); - $Feld=0; - $Temp_TID_old=-1; - for( $i = 0; $i < $Anzahl; $i++ ) - { - if( isset($Temp[$Feld]["TID"])) - $Temp_TID_old = $Temp[$Feld]["TID"]; - if( isset($Temp[$Feld]["UID"])) - $Temp_UID_old = $Temp[$Feld]["UID"]; - - $Temp_TID = mysql_result($Erg, $i, "TID"); - - // wenn sich der Type ändert wird zumnästen feld geweckselt - if( $Temp_TID_old != $Temp_TID ) - $Feld++; - - $Temp[$Feld]["TID"] = $Temp_TID; - $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); - - // sonderfall ersten durchlauf - if( $i == 0 ) - { - $Temp_TID_old = $Temp[$Feld]["TID"]; - $Temp_UID_old = $Temp[$Feld]["UID"]; - } - - // ist es eine zu vergeben schicht? - if( $Temp[$Feld]["UID"] == 0 ) - { - if( isset($Temp[$Feld]["free"])) - $Temp[$Feld]["free"]++; - else - $Temp[$Feld]["free"]=1; - } - else - $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; - } // FOR - - - /////////////////////////////////////////////////////////////////// - // Aus gabe der Schicht - /////////////////////////////////////////////////////////////////// - if( isset($Temp)) - if( count($Temp) ) - foreach( $Temp as $TempEntry => $TempValue ) - { - if( !isset($TempValue["free"])) - $TempValue["free"] = 0; - - // ausgabe EngelType - $Spalten.= $EngelTypeID[ $TempValue["TID"] ]. " "; - - // ausgabe Eingetragener Engel - if( isset($TempValue["Engel"])) - if( count($TempValue["Engel"]) > 0 ) - { - if( count($TempValue["Engel"]) == 1 ) - $Spalten.= Get_Text("inc_schicht_ist"). ":
        \n"; - else - $Spalten.= Get_Text("inc_schicht_sind"). ":
        \n"; - - foreach( $TempValue["Engel"] as $TempEngelEntry=> $TempEngelID ) - { - if( funktion_isLinkAllowed( "admin/user.php") === TRUE) - { - // add color, wenn Engel "Gekommen" - $TempText= - ((UIDgekommen( $TempEngelID ) == "1") - ? "" - : ""). - UID2Nick( $TempEngelID). ""; - } - else - { - $TempText = UID2Nick( $TempEngelID ); - } - - // add link to user - $TempText= funktion_isLinkAllowed_addLink_OrLinkText( - "admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", - $TempText); - - $Spalten.= "  ". $TempText. - ( ($_GET["Icon"]==1) ? DisplayAvatar( $TempEngelID): ""). - "
        \n"; - - - } - $Spalten = substr( $Spalten, 0, strlen($Spalten)-7 ); - } - - // ausgabe benötigter Engel - //////////////////////////// - //in vergangenheit - $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '". - gmdate("Y-m-d H:i:s", time()+ $gmdateOffset). "')"; - $Ergtime = mysql_query($SQLtime, $con); - if( mysql_num_rows( $Ergtime) > 0) - { - //wenn keien rechte definiert sind - if( !isset($_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ])) - $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] = "Y"; - - if( $_SESSION['CVS'][ $TID2Name[$TempValue["TID"]] ] == "Y") - if( $TempValue["free"] > 0 ) - { - $Spalten.= "
        \n  "; - $Spalten.= $TempValue["free"]; - if( $TempValue["free"] != 1 ) - $Spalten.= Get_Text("inc_schicht_weitere"). - " ".Get_Text("inc_schicht_Engel"). - Get_Text("inc_schicht_wird"); - else - $Spalten.= Get_Text("inc_schicht_weiterer"). - " ".Get_Text("inc_schicht_Engel"). - Get_Text("inc_schicht_werden"); - $Spalten.= Get_Text("inc_schicht_noch_gesucht"); - $Spalten.= ""; - } - } - else - { - if( isset($TempValue["free"])) - if( $TempValue["free"] > 0 ) - $Spalten.= "
        \n  

        Fehlen noch: ". - $TempValue["free"]. "

        "; - } - $Spalten.= "
        \n"; - - } // FOREACH - return $Spalten; -} // function Ausgabe_Feld_Inhalt - - - -/*####################################################### -# gibt die engelschischten Druckergerecht aus # -#######################################################*/ -function Ausgabe_Feld_Inhalt_Druck($RID, $Man ) -{ -// gibt, nach übergabe der der SchichtID (SID) und der RaumBeschreibung, -// die eingetragenden und und offenden Schichteintäge zurück - - -} // function Ausgabe_Feld_Inhalt - - - - -/*####################################################### -# Ausgabe der Raum Spalten # -#######################################################*/ -function CreateRoomShifts( $raum ) -{ - global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages; - - ///////////////////////////////////////////////////////////// - // beginnt die erste schicht vor dem heutigen tag und geht darüber hinaus - ///////////////////////////////////////////////////////////// - $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND ". - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - if( (mysql_num_rows( $ErgSonder) > 1) ) - { - if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) - { - echo "

        ". Get_Text("pub_schichtplan_colision"). "

        "; - for( $i=0; $i". - mysql_result($ErgSonder, $i, "DateS"). - " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-24)". - "
        \n"; - } - } - } - elseif( (mysql_num_rows( $ErgSonder) == 1) ) - { - $Spalten[0].= "\n". - "

        ↑↑↑

        ". - Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), - mysql_result($ErgSonder, 0, "Man") ). - "

        ↓↓↓

        ". - "\n\n"; - return; - } - - $ZeitZeiger = 0; - - ///////////////////////////////////////////////////////////// - // beginnt die erste schicht vor dem heutigen tag? - ///////////////////////////////////////////////////////////// - $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND ". - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; - $ErgSonder = mysql_query($SQLSonder, $con); - if( (mysql_num_rows( $ErgSonder) > 1) ) - { - if( funktion_isLinkAllowed( "admin/schichtplan.php") === TRUE ) - { - echo "

        ". Get_Text("pub_schichtplan_colision"). "

        "; - for( $i=0; $i". - mysql_result($ErgSonder, $i, "DateS"). - " '". mysql_result($ErgSonder, $i, "Man")."' (RID $raum) (00-xx)". - "
        \n"; - } - } - } - elseif( (mysql_num_rows( $ErgSonder) == 1) ) - { - $ZeitZeiger = substr( mysql_result($ErgSonder, 0, "DateE"), 11, 2 )+ - (substr( mysql_result($ErgSonder, 0, "DateE"), 14, 2 ) / 60); - $Spalten[0].= "\n". - "

        ↑↑↑

        ". - Ausgabe_Feld_Inhalt( mysql_result($ErgSonder, 0, "SID"), - mysql_result($ErgSonder, 0, "Man") ). - "\n\n"; - } - - ///////////////////////////////////////////////////////////// - // gibt die schichten für den tag aus - ///////////////////////////////////////////////////////////// - $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') and ". - "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and ". - "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; - $Erg = mysql_query($SQL, $con); - for( $i = 0; $i < mysql_num_rows($Erg); ++$i ) - { - $ZeitPos = substr( mysql_result($Erg, $i, "DateS"), 11, 2 )+ - (substr( mysql_result($Erg, $i, "DateS"), 14, 2 ) / 60); - $len = mysql_result($Erg, $i, "Len"); - - if( $len <= 0) - array_push( $error_messages, "Error in shift denition SID=". mysql_result($Erg, $i, "SID"). " Len=$len"); - - if( $ZeitZeiger < $ZeitPos ) - { - $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - " \n"; - - $ZeitZeiger += $ZeitPos - $ZeitZeiger; - } - if($ZeitZeiger == $ZeitPos ) - { - //sonderfall wenn die schicht über dei 24 stunden hinaus geht - // (eintrag abkürzen, pfeiel ausgeben) - $Spalten[$ZeitZeiger * $GlobalZeileProStunde].= - "\n". - "". - Ausgabe_Feld_Inhalt( mysql_result($Erg, $i, "SID"), - mysql_result($Erg, $i, "Man") ). - (( ($ZeitZeiger+$len) > 24)? "

        ↓↓↓

        " : ""). - "\n\n"; - $ZeitZeiger += $len; - } - else - { - echo "

        ". Get_Text("pub_schichtplan_colision"). "

        "; - echo "". - mysql_result($Erg, $i, "DateS"). - " '". mysql_result($Erg, $i, "Man"). "' ". - " (". mysql_result($Erg, $i, "SID"). " R$raum) (xx-xx)

        "; - } - } - if( $ZeitZeiger < 24 ) - $Spalten[($ZeitZeiger * $GlobalZeileProStunde)].= - " \n"; -} // function CreateRoomShifts - - -/*####################################################### -# Ausgabe der freien schichten # -#######################################################*/ -function showEmptyShifts( ) -{ - global $con, $debug, $RoomID, $gmdateOffset; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` ". - "WHERE (`Shifts`.`DateS`>='". gmdate("Y-m-d H:i:s", time()+$gmdateOffset). "') ". - "ORDER BY `DateS`, `RID`;"; - $Erg = mysql_query($sql, $con); - - $angezeigt = 0; - for ($i=0; ($i0) - { - $angezeigt++; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - } - - echo "
        ". Get_Text("inc_schicht_date"). "". Get_Text("inc_schicht_time"). "". Get_Text("inc_schicht_room"). "". Get_Text("inc_schicht_commend"). "
        ". substr(mysql_result( $Erg, $i, "DateS"), 0, 10). "". substr(mysql_result( $Erg, $i, "DateS"), 11). "". $RoomID[mysql_result( $Erg, $i, "RID")]. "". - ausgabe_Feld_Inhalt( mysql_result( $Erg, $i, "SID"), mysql_result( $Erg, $i, "Man")). - "
        \n"; - -} //function showEmptyShifts - - -/*####################################################### -# Gibt die anzahl der Schichten im Raum zurück # -#######################################################*/ -function SummRoomShifts( $raum ) -{ - global $ausdatum, $con, $debug, $GlobalZeileProStunde; - - $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` ". - "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND ". - "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; - - $ErgSonder = mysql_query($SQLSonder, $con); - - return mysql_num_rows($ErgSonder); -} - -?> diff --git a/includes/funktion_schichtplan_Tage.php b/includes/funktion_schichtplan_Tage.php deleted file mode 100644 index 2c21a992..00000000 --- a/includes/funktion_schichtplan_Tage.php +++ /dev/null @@ -1,101 +0,0 @@ - $Mmax) { - $Tag = 1; - $Monat++; - } - - if($Monat > 12) { - $Monat = 1; - $Jahr++; - } - - $Tag = strlen( $Tag ) == 1 ? "0".$Tag : $Tag; - $Monat = strlen( $Monat ) == 1 ? "0".$Monat : $Monat; - - return ("$Jahr-$Monat-$Tag"); - } - } - - // suchen den ersten eintrags - $SQL = "SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1"; - $Erg = mysql_query($SQL, $con); - - $Pos = 0; - - if(mysql_num_rows($Erg) > 0) { - do { - // Startdatum einlesen und link ausgeben - $DateS = substr(mysql_result($Erg, 0 , 0), 0,10); - $VeranstaltungsTage[$Pos++] = $DateS; - - // auslesen den endes und eventuelle weitere tage ausgeben - $SQL2 = "SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '$DateS%') AND NOT (`DateE` like '%00:00:00'))"; - $Erg2 = mysql_query($SQL2, $con); - $DateE = substr(mysql_result($Erg2, 0 , 0), 0,10); - - if(strlen($DateE) == 0) - $DateE = $DateS; - else - while( $DateS != $DateE) { - $DateS = DatumUm1TagErhoehen( $DateS); - $VeranstaltungsTage[$Pos++] = $DateS; - } - - // suchen den naesten eintrag - $SQL = "SELECT `DateS` FROM `Shifts` ". - "WHERE (`DateS` > '$DateE 23:59:59' ) ". - "ORDER BY `DateS` ". - "LIMIT 1"; - $Erg = mysql_query($SQL, $con); - } while( mysql_fetch_row($Erg) > 0); - } - - $VeranstaltungsTageMax = $Pos - 1; -?> diff --git a/includes/funktion_schichtplan_aray.php b/includes/funktion_schichtplan_aray.php deleted file mode 100644 index f9b04bd6..00000000 --- a/includes/funktion_schichtplan_aray.php +++ /dev/null @@ -1,38 +0,0 @@ - diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php new file mode 100644 index 00000000..6695d6a9 --- /dev/null +++ b/includes/pages/admin_rooms.php @@ -0,0 +1,148 @@ +\nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen " . + "oder vorhandene abzuändern:

        \n"; + + $html .= "Neuen Raum/Ort eintragen
        \n"; + + // Räume auflisten + if (count($rooms) > 0) { + $html .= ''; + + $html .= "
        \n"; + $html .= "\n"; + + // Tabellenüberschriften generieren + foreach ($rooms[0] as $attr => $tmp) + if ($attr == 'RID') + $html .= ''; + else + $html .= ''; + $html .= ''; + $html .= ''; + + foreach ($rooms as $i => $room) { + $html .= ''; + foreach ($room as $attr => $value) + if ($attr == 'RID') + $html .= ''; + else + $html .= ''; + $html .= ''; + $html .= ''; + } + + $html .= '
        Anzahl: ' . count($rooms) . '' . $attr . ' 
        ' . ($i +1) . '' . $value . 'Edit
        '; + } + } else { + switch ($_REQUEST["action"]) { + + case 'new' : + $html .= template_render('../templates/admin_rooms_new_form.html', array ( + 'link' => page_link_to("admin_rooms") + )); + break; + + case 'newsave' : + $name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Name'])); + $man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Man'])); + $from_pentabarf = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['FromPentabarf'])); + $show = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['Show'])); + $number = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['Number'])); + sql_query("INSERT INTO `Room` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($show) . "', `Number`='" . sql_escape($number) . "'"); + header("Location: " . page_link_to("admin_rooms")); + break; + + case 'change' : + if (isset ($_REQUEST['RID']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['RID'])) + $rid = $_REQUEST['RID']; + else + return error("Incomplete call, missing Room ID."); + + $room = sql_select("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1"); + if (count($room) > 0) { + list ($room) = $room; + $room_angel_types = sql_select("SELECT * FROM `AngelTypes` LEFT OUTER JOIN `RoomAngelTypes` ON (`AngelTypes`.`TID` = `RoomAngelTypes`.`angel_type_id` AND `RoomAngelTypes`.`room_id`=" . sql_escape($rid) . ") ORDER BY `AngelTypes`.`Name`"); + + $angel_types = ""; + foreach ($room_angel_types as $room_angel_type) { + if ($room_angel_type['count'] == "") + $room_angel_type['count'] = "0"; + $angel_types .= '' . $room_angel_type['Name'] . ''; + } + + $html .= template_render('../templates/admin_rooms_edit_form.html', array ( + 'link' => page_link_to("admin_rooms"), + 'room_id' => $rid, + 'name' => $room['Name'], + 'man' => $room['Man'], + 'number' => $room['Number'], + 'from_pentabarf_options' => html_options('FromPentabarf', array ( + 'Y' => 'Yes', + 'N' => 'No' + ), $room['FromPentabarf']), + 'show_options' => html_options('Show', array ( + 'Y' => 'Yes', + 'N' => 'No' + ), $room['show']), + 'angel_types' => $angel_types + )); + } else + return error("No Room found."); + break; + + case 'changesave' : + if (isset ($_REQUEST['RID']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['RID'])) + $rid = $_REQUEST['RID']; + else + return error("Incomplete call, missing Room ID."); + + $room = sql_select("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1"); + if (count($room) > 0) { + list ($room) = $room; + $room_angel_types = sql_select("SELECT * FROM `AngelTypes` LEFT OUTER JOIN `RoomAngelTypes` ON (`AngelTypes`.`TID` = `RoomAngelTypes`.`angel_type_id` AND `RoomAngelTypes`.`room_id`=" . sql_escape($rid) . ") ORDER BY `AngelTypes`.`Name`"); + + $name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Name'])); + $man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Man'])); + $from_pentabarf = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['FromPentabarf'])); + $show = preg_replace("/([^YN]{1,})/ui", '', strip_tags($_REQUEST['Show'])); + $number = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['Number'])); + sql_query("UPDATE `Room` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "', `FromPentabarf`='" . sql_escape($from_pentabarf) . "', `show`='" . sql_escape($show) . "', `Number`='" . sql_escape($number) . "' WHERE `RID`=" . sql_escape($rid) . " LIMIT 1"); + sql_query("DELETE FROM `RoomAngelTypes` WHERE `room_id`=" . sql_escape($rid)); + foreach ($room_angel_types as $room_angel_type) { + if (isset ($_REQUEST['angel_type_' . $room_angel_type['TID']]) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['angel_type_' . $room_angel_type['TID']])) + $count = $_REQUEST['angel_type_' . $room_angel_type['TID']]; + else + $count = "0"; + sql_query("INSERT INTO `RoomAngelTypes` SET `room_id`=" . sql_escape($rid) . ", `angel_type_id`=" . sql_escape($room_angel_type['TID']) . ", `count`=" . sql_escape($count)); + } + header("Location: " . page_link_to("admin_rooms")); + } else + return error("No Room found."); + break; + + case 'delete' : + if (isset ($_REQUEST['RID']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['RID'])) + $rid = $_REQUEST['RID']; + else + return error("Incomplete call, missing Room ID."); + + if (sql_num_query("SELECT * FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1") > 0) { + sql_query("DELETE FROM `Room` WHERE `RID`=" . sql_escape($rid) . " LIMIT 1"); + sql_query("DELETE FROM `RoomAngelTypes` WHERE `room_id`=" . sql_escape($rid) . " LIMIT 1"); + header("Location: " . page_link_to("admin_rooms")); + } else + return error("No Room found."); + break; + + } + } + return $html; +} +?> diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 7012bb99..4295edb8 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -64,43 +64,43 @@ function user_news_output() { for ($i = 1; $i <= $dis_rows; $i++) { if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { - $html .= "$i  "; + $html .= '' . $i . '  '; } else { $html .= "$i  "; } } $html .= ' -
        -

        ' . Get_Text(6) . '

        -   - -
        - - - - - - - - - - - '; +
        +

        ' . Get_Text(6) . '

        +   + + + + +
        ' . Get_Text(7) . '
        ' . Get_Text(8) . '
        + + + + + + + + '; if (in_array('news_add_meeting', $privileges)) { $html .= ' - - - '; + + + '; } $html .= '
        ' . Get_Text(7) . '
        ' . Get_Text(8) . '
        ' . Get_Text(9) . '
        ' . Get_Text(9) . '
        -
        - -
        '; +
        + + '; return $html; } ?> \ No newline at end of file diff --git a/includes/sys_shift.php b/includes/sys_shift.php new file mode 100644 index 00000000..ff75465c --- /dev/null +++ b/includes/sys_shift.php @@ -0,0 +1,442 @@ + $r) { + $Room[$i] = array ( + 'RID' => $r['RID'], + 'Name' => $r['Name'] + ); + $RoomID[$r['RID']] = $r['Name']; + } + + // erstellt ein Array der Engeltypen + $engel_types = sql_select("SELECT `TID`, `Name` FROM `EngelType` ORDER BY `Name`"); + foreach ($engel_types as $engel_type) { + $EngelType[$i] = array ( + 'TID' => $engel_type['TID'], + 'Name' => $engel_type['Name'] . Get_Text("inc_schicht_engel") + ); + $EngelTypeID[$engel_type['TID']] = $engel_type['Name'] . Get_Text("inc_schicht_engel"); + $TID2Name[$engel_type['TID']] = $engel_type['Name']; + } + + // Erste Schicht suchen + $Pos = 0; + $first_shift = sql_select("SELECT `DateS` FROM `Shifts` ORDER BY `DateS` LIMIT 1"); + if (count($first_shift) > 0) { + do { + // Startdatum einlesen und link ausgeben + $DateS = substr($first_shift[0]['DateS'], 0, 10); + $VeranstaltungsTage[$Pos++] = $DateS; + + // auslesen den endes und eventuelle weitere tage ausgeben + $last_shift = sql_select("SELECT MAX(`DateE`) FROM `Shifts` WHERE ( (`DateS` like '" . sql_escape($DateS) . "%') AND NOT (`DateE` like '%00:00:00'))"); + $DateE = substr($last_shift[0]['DateE'], 0, 10); + + if (strlen($DateE) == 0) + $DateE = $DateS; + else + while ($DateS != $DateE) { + $DateS = DatumUm1TagErhoehen($DateS); + $VeranstaltungsTage[$Pos++] = $DateS; + } + + // suchen den nächsten eintrag + $first_shift = sql_select("SELECT `DateS` FROM `Shifts` " . "WHERE (`DateS` > '" . sql_escape($DateE) . " 23:59:59' ) " . "ORDER BY `DateS` " . "LIMIT 1"); + } while (count($first_shift) > 0); + } + + $VeranstaltungsTageMax = $Pos -1; +} + +/*####################################################### +# gibt die engelschischten aus # +#######################################################*/ +function ausgabe_Feld_Inhalt($SID, $Man) { + // gibt, nach �bergabe der der SchichtID (SID) und der RaumBeschreibung, + // die eingetragenden und und offenden Schichteint�ge zur�ck + global $EngelType, $EngelTypeID, $TID2Name, $con, $debug, $gmdateOffset; + + $Spalten = ""; + + if (!isset ($_GET["Icon"])) + $_GET["Icon"] = 1; + + /////////////////////////////////////////////////////////////////// + // Schow Admin Page + /////////////////////////////////////////////////////////////////// + $Spalten .= funktion_isLinkAllowed_addLink_OrEmpty("admin/schichtplan.php?action=change&SID=$SID", "edit
        \n"); + + /////////////////////////////////////////////////////////////////// + // Ausgabe des Schischtnamens + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; + $Erg = mysql_query($SQL, $con); + if (mysql_result($Erg, 0, 0) != "") + $Spalten .= "$Man:
        "; + else + $Spalten .= "" . + $Man . ":
        "; + + /////////////////////////////////////////////////////////////////// + // SQL abfrage f�r die ben�tigten schichten + /////////////////////////////////////////////////////////////////// + $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; + $Erg = mysql_query($SQL, $con); + + $Anzahl = mysql_num_rows($Erg); + $Feld = 0; + $Temp_TID_old = -1; + for ($i = 0; $i < $Anzahl; $i++) { + if (isset ($Temp[$Feld]["TID"])) + $Temp_TID_old = $Temp[$Feld]["TID"]; + if (isset ($Temp[$Feld]["UID"])) + $Temp_UID_old = $Temp[$Feld]["UID"]; + + $Temp_TID = mysql_result($Erg, $i, "TID"); + + // wenn sich der Type �ndert wird zumn�sten feld geweckselt + if ($Temp_TID_old != $Temp_TID) + $Feld++; + + $Temp[$Feld]["TID"] = $Temp_TID; + $Temp[$Feld]["UID"] = mysql_result($Erg, $i, "UID"); + + // sonderfall ersten durchlauf + if ($i == 0) { + $Temp_TID_old = $Temp[$Feld]["TID"]; + $Temp_UID_old = $Temp[$Feld]["UID"]; + } + + // ist es eine zu vergeben schicht? + if ($Temp[$Feld]["UID"] == 0) { + if (isset ($Temp[$Feld]["free"])) + $Temp[$Feld]["free"]++; + else + $Temp[$Feld]["free"] = 1; + } else + $Temp[$Feld]["Engel"][] = $Temp[$Feld]["UID"]; + } // FOR + + /////////////////////////////////////////////////////////////////// + // Aus gabe der Schicht + /////////////////////////////////////////////////////////////////// + if (isset ($Temp)) + if (count($Temp)) + foreach ($Temp as $TempEntry => $TempValue) { + if (!isset ($TempValue["free"])) + $TempValue["free"] = 0; + + // ausgabe EngelType + $Spalten .= $EngelTypeID[$TempValue["TID"]] . " "; + + // ausgabe Eingetragener Engel + if (isset ($TempValue["Engel"])) + if (count($TempValue["Engel"]) > 0) { + if (count($TempValue["Engel"]) == 1) + $Spalten .= Get_Text("inc_schicht_ist") . ":
        \n"; + else + $Spalten .= Get_Text("inc_schicht_sind") . ":
        \n"; + + foreach ($TempValue["Engel"] as $TempEngelEntry => $TempEngelID) { + if (funktion_isLinkAllowed("admin/user.php") === TRUE) { + // add color, wenn Engel "Gekommen" + $TempText = ((UIDgekommen($TempEngelID) == "1") ? "" : "") . + UID2Nick($TempEngelID) . ""; + } else { + $TempText = UID2Nick($TempEngelID); + } + + // add link to user + $TempText = funktion_isLinkAllowed_addLink_OrLinkText("admin/userChangeNormal.php?enterUID=$TempEngelID&Type=Normal", $TempText); + + $Spalten .= "  " . $TempText . + (($_GET["Icon"] == 1) ? DisplayAvatar($TempEngelID) : "") . + "
        \n"; + + } + $Spalten = substr($Spalten, 0, strlen($Spalten) - 7); + } + + // ausgabe ben�tigter Engel + //////////////////////////// + //in vergangenheit + $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '" . + gmdate("Y-m-d H:i:s", time() + $gmdateOffset) . "')"; + $Ergtime = mysql_query($SQLtime, $con); + if (mysql_num_rows($Ergtime) > 0) { + //wenn keien rechte definiert sind + if (!isset ($_SESSION['CVS'][$TID2Name[$TempValue["TID"]]])) + $_SESSION['CVS'][$TID2Name[$TempValue["TID"]]] = "Y"; + + if ($_SESSION['CVS'][$TID2Name[$TempValue["TID"]]] == "Y") + if ($TempValue["free"] > 0) { + $Spalten .= "
        \n  "; + $Spalten .= $TempValue["free"]; + if ($TempValue["free"] != 1) + $Spalten .= Get_Text("inc_schicht_weitere") . + " " . Get_Text("inc_schicht_Engel") . + Get_Text("inc_schicht_wird"); + else + $Spalten .= Get_Text("inc_schicht_weiterer") . + " " . Get_Text("inc_schicht_Engel") . + Get_Text("inc_schicht_werden"); + $Spalten .= Get_Text("inc_schicht_noch_gesucht"); + $Spalten .= ""; + } + } else { + if (isset ($TempValue["free"])) + if ($TempValue["free"] > 0) + $Spalten .= "
        \n  

        Fehlen noch: " . + $TempValue["free"] . "

        "; + } + $Spalten .= "
        \n"; + + } // FOREACH + return $Spalten; +} // function Ausgabe_Feld_Inhalt + +/*####################################################### +# gibt die engelschischten Druckergerecht aus # +#######################################################*/ +function Ausgabe_Feld_Inhalt_Druck($RID, $Man) { + // gibt, nach �bergabe der der SchichtID (SID) und der RaumBeschreibung, + // die eingetragenden und und offenden Schichteint�ge zur�ck + +} // function Ausgabe_Feld_Inhalt + +/*####################################################### +# Ausgabe der Raum Spalten # +#######################################################*/ +function CreateRoomShifts($raum) { + global $Spalten, $ausdatum, $con, $debug, $GlobalZeileProStunde, $error_messages; + + ///////////////////////////////////////////////////////////// + // beginnt die erste schicht vor dem heutigen tag und geht dar�ber hinaus + ///////////////////////////////////////////////////////////// + $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` " . + "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND " . + "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); + if ((mysql_num_rows($ErgSonder) > 1)) { + if (funktion_isLinkAllowed("admin/schichtplan.php") === TRUE) { + echo "

        " . Get_Text("pub_schichtplan_colision") . "

        "; + for ($i = 0; $i < mysql_num_rows($ErgSonder); $i++) { + echo "" . + mysql_result($ErgSonder, $i, "DateS") . + " '" . mysql_result($ErgSonder, $i, "Man") . "' (RID $raum) (00-24)" . + "
        \n"; + } + } + } + elseif ((mysql_num_rows($ErgSonder) == 1)) { + $Spalten[0] .= "\n" . + "

        ↑↑↑

        " . + Ausgabe_Feld_Inhalt(mysql_result($ErgSonder, 0, "SID"), mysql_result($ErgSonder, 0, "Man")) . + "

        ↓↓↓

        " . + "\n\n"; + return; + } + + $ZeitZeiger = 0; + + ///////////////////////////////////////////////////////////// + // beginnt die erste schicht vor dem heutigen tag? + ///////////////////////////////////////////////////////////// + $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` " . + "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND " . + "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); + if ((mysql_num_rows($ErgSonder) > 1)) { + if (funktion_isLinkAllowed("admin/schichtplan.php") === TRUE) { + echo "

        " . Get_Text("pub_schichtplan_colision") . "

        "; + for ($i = 0; $i < mysql_num_rows($ErgSonder); $i++) { + echo "" . + mysql_result($ErgSonder, $i, "DateS") . + " '" . mysql_result($ErgSonder, $i, "Man") . "' (RID $raum) (00-xx)" . + "
        \n"; + } + } + } + elseif ((mysql_num_rows($ErgSonder) == 1)) { + $ZeitZeiger = substr(mysql_result($ErgSonder, 0, "DateE"), 11, 2) + (substr(mysql_result($ErgSonder, 0, "DateE"), 14, 2) / 60); + $Spalten[0] .= "\n" . + "

        ↑↑↑

        " . + Ausgabe_Feld_Inhalt(mysql_result($ErgSonder, 0, "SID"), mysql_result($ErgSonder, 0, "Man")) . + "\n\n"; + } + + ///////////////////////////////////////////////////////////// + // gibt die schichten f�r den tag aus + ///////////////////////////////////////////////////////////// + $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` " . + "WHERE ((`RID` = '$raum') and " . + "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and " . + "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; + $Erg = mysql_query($SQL, $con); + for ($i = 0; $i < mysql_num_rows($Erg); ++ $i) { + $ZeitPos = substr(mysql_result($Erg, $i, "DateS"), 11, 2) + (substr(mysql_result($Erg, $i, "DateS"), 14, 2) / 60); + $len = mysql_result($Erg, $i, "Len"); + + if ($len <= 0) + array_push($error_messages, "Error in shift denition SID=" . mysql_result($Erg, $i, "SID") . " Len=$len"); + + if ($ZeitZeiger < $ZeitPos) { + $Spalten[$ZeitZeiger * $GlobalZeileProStunde] .= " \n"; + + $ZeitZeiger += $ZeitPos - $ZeitZeiger; + } + if ($ZeitZeiger == $ZeitPos) { + //sonderfall wenn die schicht �ber dei 24 stunden hinaus geht + // (eintrag abk�rzen, pfeiel ausgeben) + $Spalten[$ZeitZeiger * $GlobalZeileProStunde] .= "\n" . + "" . + Ausgabe_Feld_Inhalt(mysql_result($Erg, $i, "SID"), mysql_result($Erg, $i, "Man")) . + ((($ZeitZeiger + $len) > 24) ? "

        ↓↓↓

        " : "") . + "\n\n"; + $ZeitZeiger += $len; + } else { + echo "

        " . Get_Text("pub_schichtplan_colision") . "

        "; + echo "" . + mysql_result($Erg, $i, "DateS") . + " '" . mysql_result($Erg, $i, "Man") . "' " . + " (" . mysql_result($Erg, $i, "SID") . " R$raum) (xx-xx)

        "; + } + } + if ($ZeitZeiger < 24) + $Spalten[($ZeitZeiger * $GlobalZeileProStunde)] .= " \n"; +} // function CreateRoomShifts + +/*####################################################### +# Ausgabe der freien schichten # +#######################################################*/ +function showEmptyShifts() { + global $con, $debug, $RoomID, $gmdateOffset; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + $sql = "SELECT `SID`, `DateS`, `Man`, `RID` FROM `Shifts` " . + "WHERE (`Shifts`.`DateS`>='" . gmdate("Y-m-d H:i:s", time() + $gmdateOffset) . "') " . + "ORDER BY `DateS`, `RID`;"; + $Erg = mysql_query($sql, $con); + + $angezeigt = 0; + for ($i = 0;($i < mysql_num_rows($Erg)) && ($angezeigt < 15); $i++) + if (isset ($RoomID[mysql_result($Erg, $i, "RID")])) + if ($RoomID[mysql_result($Erg, $i, "RID")] != "") { + $Sql2 = "SELECT `UID` FROM `ShiftEntry` " . + "WHERE `SID`=" . mysql_result($Erg, $i, "SID") . " AND " . + "`UID`='0';"; + $Erg2 = mysql_query($Sql2, $con); + + if (mysql_num_rows($Erg2) > 0) { + $angezeigt++; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + } + + echo "
        " . Get_Text("inc_schicht_date") . "" . Get_Text("inc_schicht_time") . "" . Get_Text("inc_schicht_room") . "" . Get_Text("inc_schicht_commend") . "
        " . substr(mysql_result($Erg, $i, "DateS"), 0, 10) . "" . substr(mysql_result($Erg, $i, "DateS"), 11) . "" . $RoomID[mysql_result($Erg, $i, "RID")] . "" . + ausgabe_Feld_Inhalt(mysql_result($Erg, $i, "SID"), mysql_result($Erg, $i, "Man")) . + "
        \n"; + +} //function showEmptyShifts + +/*####################################################### +# Gibt die anzahl der Schichten im Raum zur�ck # +#######################################################*/ +function SummRoomShifts($raum) { + global $ausdatum, $con, $debug, $GlobalZeileProStunde; + + $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` " . + "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND " . + "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; + + $ErgSonder = mysql_query($SQLSonder, $con); + + return mysql_num_rows($ErgSonder); +} + +function DatumUm1TagErhoehen($Datum) { + $Jahr = substr($Datum, 0, 4); + $Monat = substr($Datum, 5, 2); + $Tag = substr($Datum, 8, 2); + + $Tag++; + + switch ($Monat) { + case 1 : + $Mmax = 31; + break; + case 2 : + $Mmax = 28; + break; + case 3 : + $Mmax = 31; + break; + case 4 : + $Mmax = 30; + break; + case 5 : + $Mmax = 31; + break; + case 6 : + $Mmax = 30; + break; + case 7 : + $Mmax = 31; + break; + case 8 : + $Mmax = 31; + break; + case 9 : + $Mmax = 30; + break; + case 10 : + $Mmax = 31; + break; + case 11 : + $Mmax = 30; + break; + case 12 : + $Mmax = 31; + break; + } + + if ($Tag > $Mmax) { + $Tag = 1; + $Monat++; + } + + if ($Monat > 12) { + $Monat = 1; + $Jahr++; + } + + $Tag = strlen($Tag) == 1 ? "0" . $Tag : $Tag; + $Monat = strlen($Monat) == 1 ? "0" . $Monat : $Monat; + + return ("$Jahr-$Monat-$Tag"); +} +?> diff --git a/includes/sys_template.php b/includes/sys_template.php index ab613c07..2c7f4f22 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -14,4 +14,12 @@ function template_render($file, $data) { die('Cannot find template file «' . $file . '».'); } } + +function html_options($name, $options, $selected = "") { + $html = ""; + foreach ($options as $value => $label) + $html .= ' ' . $label; + + return $html; +} ?> \ No newline at end of file diff --git a/templates/admin_rooms_edit_form.html b/templates/admin_rooms_edit_form.html new file mode 100644 index 00000000..cd1506fa --- /dev/null +++ b/templates/admin_rooms_edit_form.html @@ -0,0 +1,59 @@ +Raum und dafür benötigte Engel bearbeiten: +
        +
        + + + + + + + + + + + + + + + + + + + + + + + + + + %angel_types% +
        + Name + + +
        + Man + + +
        + From Pentabarf + + %from_pentabarf_options% +
        + Show + + %show_options% +
        + Number + + +
        + Angle Type + + Needed for this room +
        + +
        +
        + +
        \ No newline at end of file diff --git a/templates/admin_rooms_new_form.html b/templates/admin_rooms_new_form.html new file mode 100644 index 00000000..68ea9485 --- /dev/null +++ b/templates/admin_rooms_new_form.html @@ -0,0 +1,46 @@ +Neuen Raum einrichten: +
        +
        + + + + + + + + + + + + + + + + + + + + + +
        + Name + + +
        + Man + + +
        + From Pentabarf + + Yes No +
        + Show + + Yes No +
        + Number + + +
        +
        \ No newline at end of file diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 808fb512..8b46e703 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -93,6 +93,22 @@ a.sprache img { margin-right: 5px; } +table { + border-collapse: collapse; +} + +tr:hover > td { + background: #f0f0f0; +} + +th { + background: #f0f0f0; +} + +td, th { + border: 1px solid #888; +} + .background { background: #f0f0f0; } diff --git a/www-ssl/index.php b/www-ssl/index.php index 98c7e439..184702c8 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -6,6 +6,7 @@ require_once ('includes/sys_lang.php'); require_once ('includes/sys_menu.php'); require_once ('includes/sys_mysql.php'); require_once ('includes/sys_page.php'); +require_once ('includes/sys_shift.php'); require_once ('includes/sys_template.php'); require_once ('includes/sys_user.php'); @@ -43,6 +44,10 @@ if (in_array($p, $privileges)) { elseif ($p == "logout") { require_once ('includes/pages/guest_login.php'); $content = guest_logout(); + } + elseif ($p == "admin_rooms") { + require_once ('includes/pages/admin_rooms.php'); + $content = admin_rooms(); } else { require_once ('includes/pages/guest_start.php'); $content = guest_start(); -- cgit v1.2.3-54-g00ecf From b16d0abb6ec9063aab239c291ff91ac5640b8d7d Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 16:59:18 +0200 Subject: db config --- default-conf/var_www_includes/config_db.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php index a90e012e..d07529c0 100644 --- a/default-conf/var_www_includes/config_db.php +++ b/default-conf/var_www_includes/config_db.php @@ -1,8 +1,9 @@ -- cgit v1.2.3-54-g00ecf From ed3a22e87e6481447c0fd718aa3cf83861cd18bc Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 17:02:43 +0200 Subject: db dumb --- DB/db_rewrite.sql | 1166 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1166 insertions(+) create mode 100644 DB/db_rewrite.sql diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql new file mode 100644 index 00000000..09427ff2 --- /dev/null +++ b/DB/db_rewrite.sql @@ -0,0 +1,1166 @@ +-- phpMyAdmin SQL Dump +-- version 3.2.4 +-- http://www.phpmyadmin.net +-- +-- Host: localhost +-- Erstellungszeit: 02. Juni 2011 um 15:01 +-- Server Version: 5.1.44 +-- PHP-Version: 5.3.1 + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; + +-- +-- Datenbank: `engelsystem` +-- + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `AngelTypes` +-- + +CREATE TABLE IF NOT EXISTS `AngelTypes` ( + `TID` int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(25) NOT NULL DEFAULT '', + `Man` text, + PRIMARY KEY (`TID`), + UNIQUE KEY `Name` (`Name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; + +-- +-- Daten für Tabelle `AngelTypes` +-- + +INSERT INTO `AngelTypes` (`TID`, `Name`, `Man`) VALUES +(1, 'Video', NULL), +(2, 'Audio', NULL); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `ChangeLog` +-- + +CREATE TABLE IF NOT EXISTS `ChangeLog` ( + `Time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `UID` int(11) NOT NULL DEFAULT '0', + `Commend` text NOT NULL, + `SQLCommad` text NOT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Daten für Tabelle `ChangeLog` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Counter` +-- + +CREATE TABLE IF NOT EXISTS `Counter` ( + `URL` varchar(255) NOT NULL DEFAULT '', + `Anz` bigint(20) NOT NULL DEFAULT '0', + PRIMARY KEY (`URL`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Counter der Seiten'; + +-- +-- Daten für Tabelle `Counter` +-- + +INSERT INTO `Counter` (`URL`, `Anz`) VALUES +('news', 39), +('login', 5), +('logout', 2), +('start', 8), +('faq', 4), +('credits', 1), +('register', 1), +('admin_rooms', 64); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `FAQ` +-- + +CREATE TABLE IF NOT EXISTS `FAQ` ( + `FID` bigint(20) NOT NULL AUTO_INCREMENT, + `Frage` text NOT NULL, + `Antwort` text NOT NULL, + PRIMARY KEY (`FID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=24 ; + +-- +-- Daten für Tabelle `FAQ` +-- + +INSERT INTO `FAQ` (`FID`, `Frage`, `Antwort`) VALUES +(1, 'Komme ich als Engel billiger/kostenlos auf den Congress?
        \r\nDo I get in cheaper / for free to the congress as an angel ?', 'Nein, jeder Engel muss normal Eintritt bezahlen.
        \r\nNo, every angel has to pay full price.'), +(2, 'Was bekomme ich für meine Mitarbeit?
        \r\nWhat can i expect in return for my help? \r\n', 'Jeder Engel der arbeitet bekommt ein kostenloses T-Shirt nach der Veranstalltung
        \r\nEvery working angel gets a free shirt after the event. '), +(3, 'Wie lange muss ich als Engel arbeiten?
        \r\nHow long do I have to work as an angel ?', 'Diese Frage ist schwer zu beantworten. Es hängt z.B. davon ab, was man macht (z.B. Workshop-Engel) und wieviele Engel wir zusammen bekommen.
        \r\nThis is difficult to answer. It depends on what you decide to do (e.g. workshop angel) and how many people will attend. '), +(6, 'Ich bin erst XX Jahre alt. Kann ich überhaupt helfen?
        \r\nI''m only XX years old. Can I help anyway?', 'Wir können jede helfende Hand gebrauchen. Wenn du alt genug bist, um zum Congress zu kommen, bist du auch alt genug zu helfen.
        \r\nWe need every help we can get. If your old enough to come to the congress, your old enough to help.'), +(8, 'Wer sind eigentlich die Erzengel?
        \r\nWho are the Arch-Angels?\r\n', 'Erzengel sind dieses Jahr: BugBlue, TabascoEye, Jeedi, Daizy, volty
        \r\nThe ArchAngels for this year are: BugBlue, TabascoEye, Jeedi, Daizy, volty\r\n'), +(9, 'Gibt es dieses Jahr wieder einen IRC-Channel für Engel?
        \r\nWill there be an IRC-channel for angels again?', 'Ja, im IRC-Net existiert #chaos-angel. Einfach mal reinschaun!
        \r\nYes, in the IRC-net there''s #chaos-angel. Just have a look!'), +(10, 'Wie gehe ich mit den Besuchern um?
        \r\nHow do I treat visitors?', 'Man soll gegenüber den Besuchern immer höflich und freundlich sein, auch wenn diese gestresst sind. Wenn man das Gefühl hat, dass man mit der Situation nicht mehr klarkommt, sollte man sich jemanden zur Unterstützung holen, bevor man selbst auch gestresst wird :-)
        \r\nYou should always be polite and friendly, especially if they are stressed. When you feel you can''t handle it on your own, get someone to help you out before you get so stressed yourself that you get impolite.'), +(11, 'Wann sind die Engelbesprechungen?
        \r\nWhen are the angels briefings?', 'Das wird vor Ort noch festgelegt und steht im Himmelnewssystem.
        \r\nThe information on the Angel Briefings will be in the news section of this system.'), +(12, 'Was muss ich noch bedenken?
        \r\nAnything else I should know?', 'Man sollte nicht total übermüdet oder ausgehungert, wenn n man einen Einsatz hat. Eine gewisse Fitness ist hilfreich.
        \r\nYou should not be exhausted or starving when you arrive for a shift. A reasonable amount of fitness for work would be very helpful.'), +(13, 'Ich habe eine Frage, auf die ich in der FAQ keine Antwort gefunden habe. Wohin soll ich mich wenden?
        \r\nI have a guestion not answered here. Who can I ask?', 'Bei weitere Fragen kannst du die Anfragen an die Erzengel Formular benutzen.
        \r\nIf you have further questions, you can use the Questions for the ArchAngels form.'), +(20, 'Wer muss alles Eintritt zahlen?
        \r\nWho has to pay the full entrance price?', 'Jeder. Zumindest, solange er/sie älter als 12 Jahre ist...
        \r\nEveryone who is at older than 12 years old.'); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `GroupPrivileges` +-- + +CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `group_id` int(11) NOT NULL, + `privilege_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `group_id` (`group_id`,`privilege_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ; + +-- +-- Daten für Tabelle `GroupPrivileges` +-- + +INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES +(1, -1, 1), +(2, -1, 2), +(3, -2, 3), +(4, -2, 4), +(5, -1, 5), +(6, -4, 6); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Groups` +-- + +CREATE TABLE IF NOT EXISTS `Groups` ( + `Name` varchar(35) NOT NULL, + `UID` int(11) NOT NULL, + PRIMARY KEY (`UID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- +-- Daten für Tabelle `Groups` +-- + +INSERT INTO `Groups` (`Name`, `UID`) VALUES +('1-Gast', -1), +('2-Engel', -2), +('3-Shift Coordinator', -3), +('4-Erzengel', -4), +('5-Developer', -5); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Messages` +-- + +CREATE TABLE IF NOT EXISTS `Messages` ( + `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `SUID` int(11) NOT NULL DEFAULT '0', + `RUID` int(11) NOT NULL DEFAULT '0', + `isRead` char(1) NOT NULL DEFAULT 'N', + `Text` text NOT NULL, + PRIMARY KEY (`Datum`,`SUID`,`RUID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Fuers interen Communikationssystem'; + +-- +-- Daten für Tabelle `Messages` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `News` +-- + +CREATE TABLE IF NOT EXISTS `News` ( + `ID` int(11) NOT NULL AUTO_INCREMENT, + `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Betreff` varchar(150) NOT NULL DEFAULT '', + `Text` text NOT NULL, + `UID` int(11) NOT NULL DEFAULT '0', + `Treffen` tinyint(4) NOT NULL DEFAULT '0', + PRIMARY KEY (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=9 ; + +-- +-- Daten für Tabelle `News` +-- + +INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES +(3, '2011-06-02 01:32:31', '', '', 0, 0), +(4, '2011-06-02 01:36:27', 'Darf ich News erstellen?', 'Darf ich.', 0, 0), +(5, '2011-06-02 01:36:35', 'Darf ich News erstellen?', 'asdfasdfasdf', 1, 0), +(6, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0), +(7, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0), +(8, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `news_comments` +-- + +CREATE TABLE IF NOT EXISTS `news_comments` ( + `ID` bigint(11) NOT NULL AUTO_INCREMENT, + `Refid` int(11) NOT NULL DEFAULT '0', + `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Text` text NOT NULL, + `UID` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`ID`), + KEY `Refid` (`Refid`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Daten für Tabelle `news_comments` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Privileges` +-- + +CREATE TABLE IF NOT EXISTS `Privileges` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(128) NOT NULL, + `desc` varchar(1024) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=7 ; + +-- +-- Daten für Tabelle `Privileges` +-- + +INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES +(1, 'start', 'Startseite für Gäste/Nicht eingeloggte User'), +(2, 'login', 'Logindialog'), +(3, 'news', 'Anzeigen der News-Seite'), +(4, 'logout', 'User darf sich ausloggen'), +(5, 'register', 'Einen neuen Engel registerieren'), +(6, 'admin_rooms', 'Räume administrieren'); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Questions` +-- + +CREATE TABLE IF NOT EXISTS `Questions` ( + `QID` bigint(20) NOT NULL AUTO_INCREMENT, + `UID` int(11) NOT NULL DEFAULT '0', + `Question` text NOT NULL, + `AID` int(11) NOT NULL DEFAULT '0', + `Answer` text NOT NULL, + PRIMARY KEY (`QID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; + +-- +-- Daten für Tabelle `Questions` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Room` +-- + +CREATE TABLE IF NOT EXISTS `Room` ( + `RID` int(11) NOT NULL AUTO_INCREMENT, + `Name` varchar(35) NOT NULL DEFAULT '', + `Man` text, + `FromPentabarf` char(1) NOT NULL DEFAULT 'N', + `show` char(1) NOT NULL DEFAULT 'Y', + `Number` int(11) DEFAULT NULL, + PRIMARY KEY (`RID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; + +-- +-- Daten für Tabelle `Room` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `RoomAngelTypes` +-- + +CREATE TABLE IF NOT EXISTS `RoomAngelTypes` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `room_id` int(11) NOT NULL, + `angel_type_id` int(11) NOT NULL, + `count` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `room_id` (`room_id`,`angel_type_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; + +-- +-- Daten für Tabelle `RoomAngelTypes` +-- + +INSERT INTO `RoomAngelTypes` (`id`, `room_id`, `angel_type_id`, `count`) VALUES +(1, 1, 2, 2), +(2, 1, 1, 3); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `ShiftEntry` +-- + +CREATE TABLE IF NOT EXISTS `ShiftEntry` ( + `SID` int(11) NOT NULL DEFAULT '0', + `TID` int(11) NOT NULL DEFAULT '0', + `UID` int(11) NOT NULL DEFAULT '0', + `Comment` text +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Daten für Tabelle `ShiftEntry` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `ShiftFreeloader` +-- + +CREATE TABLE IF NOT EXISTS `ShiftFreeloader` ( + `ID` int(11) NOT NULL AUTO_INCREMENT, + `Remove_Time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `UID` int(11) NOT NULL, + `Length` int(11) NOT NULL, + `Comment` text NOT NULL, + PRIMARY KEY (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Daten für Tabelle `ShiftFreeloader` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Shifts` +-- + +CREATE TABLE IF NOT EXISTS `Shifts` ( + `SID` int(11) NOT NULL AUTO_INCREMENT, + `DateS` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `DateE` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Len` float NOT NULL DEFAULT '0', + `RID` int(11) NOT NULL DEFAULT '0', + `Man` text, + `URL` text, + `PSID` text, + PRIMARY KEY (`SID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Daten für Tabelle `Shifts` +-- + + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Sprache` +-- + +CREATE TABLE IF NOT EXISTS `Sprache` ( + `TextID` varchar(35) NOT NULL DEFAULT 'makeuser_', + `Sprache` char(2) NOT NULL DEFAULT 'DE', + `Text` text NOT NULL, + KEY `TextID` (`TextID`,`Sprache`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- +-- Daten für Tabelle `Sprache` +-- + +INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES +('Hallo', 'DE', 'Hallo '), +('Hallo', 'EN', 'Greetings '), +('2', 'DE', ',\r\n\r\nIm Engelsystem eingeloggt..\r\nWähle zum Abmelden bitte immer den Abmelden-Button auf der linken Seite.'), +('3', 'DE', 'Neuen Eintrag erfassen...'), +('3', 'EN', 'Create new entry...'), +('4', 'EN', 'Entry saved.\r\n\r\n'), +('4', 'DE', 'Eintrag wurde gesichert.\n\n'), +('2', 'EN', ',\r\n\r\nyou are now logged in.\r\nTo log out please choose the logout-button on the right side.'), +('5', 'DE', 'Seite: '), +('5', 'EN', 'Page: '), +('6', 'DE', 'Neue News erstellen:'), +('6', 'EN', 'Create new News:'), +('7', 'DE', 'Betreff:'), +('7', 'EN', 'Subject:'), +('8', 'EN', 'Text:'), +('8', 'DE', 'Text:'), +('9', 'DE', 'Treffen:'), +('9', 'EN', 'Meeting:'), +('save', 'DE', 'Sichern'), +('save', 'EN', 'save'), +('back', 'DE', 'zurück '), +('back', 'EN', 'back '), +('top', 'DE', 'top'), +('top', 'EN', 'top '), +('13', 'DE', 'auf dieser Seite kannst Du deine persönlichen Einstellungen ändern, wie zum Beispiel dein Kennwort, Farbeinstellungen usw.\r\n\r\n'), +('13', 'EN', 'here you can change your personal settings i.e. password, color settings etc.\r\n\r\n'), +('14', 'DE', 'Hier kannst du dein Kennwort ändern.. '), +('14', 'EN', 'Here you can change your password.'), +('15', 'DE', 'Altes Passwort:'), +('15', 'EN', 'Old password:'), +('16', 'DE', 'Neues Passwort:'), +('16', 'EN', 'New password:'), +('17', 'DE', 'Passwortbestätigung:'), +('17', 'EN', 'password confirmation:'), +('18', 'DE', 'Hier kannst du dir dein Farblayout aussuchen:'), +('18', 'EN', 'Here you can choose your color settings:'), +('19', 'DE', 'Farblayout:'), +('19', 'EN', 'color settings:'), +('20', 'DE', 'Hier kannst Du dir deine Sprache aussuchen:\r\nHere you can choose your language:'), +('20', 'EN', 'Here you can choose your language:\r\nHier kannst Du dir deine Sprache aussuchen:'), +('21', 'DE', 'Sprache:'), +('21', 'EN', 'Language:'), +('22', 'DE', 'Hier kannst du dir einen Avatar aussuchen. Dies lässt neben deinem Nick z. B. in den News das Bildchen erscheinen.'), +('22', 'EN', 'Here you can choose your avatar. It will be displayed next to your Nick. '), +('23', 'DE', 'Avatar:'), +('23', 'EN', 'Avatar:'), +('24', 'DE', 'Keiner'), +('24', 'EN', 'nobody'), +('25', 'DE', 'Eingegebene Kennwörter sind nicht gleich -> OK.\r\nCheck ob altes Passwort ok ist:'), +('25', 'EN', 'The passwords entered don't match. -> OK.\r\nCheck if the old password is correct:'), +('26', 'DE', '-> OK.\r\n'), +('26', 'EN', '-> OK.'), +('27', 'DE', 'Setzen des neuen Kennwortes...:'), +('27', 'EN', 'Set your new password...:'), +('28', 'DE', 'Neues Kennwort wurde gesetzt.'), +('28', 'EN', 'New password saved.'), +('29', 'DE', 'Ein Fehler ist aufgetreten.\r\nProbiere es noch einmal.'), +('29', 'EN', 'An error has occured.\r\nPlease try again.'), +('30', 'DE', '-> nicht OK.\r\nBitte nocheinmal probieren.'), +('30', 'EN', '-> not OK.\r\nPlease try again.\r\n'), +('31', 'DE', 'Kennwörter sind nicht gleich. Bitte wiederholen.'), +('31', 'EN', 'The passwords don't match. Please try again.'), +('32', 'DE', 'Neues Farblayout wurde gesetzt. Mit der nächsten Seite wird es aktiv.'), +('32', 'EN', 'New color settings are saved. On the next page it will be active.'), +('33', 'DE', 'Sprache wurde gesetzt. Mit der nächsten Seite wird es aktiv.'), +('33', 'EN', 'Language is saved. On the next page it will be active.'), +('34', 'DE', 'Avatar wurde gesetzt.'), +('34', 'EN', 'Avatar is saved.'), +('35', 'DE', '<b>Neue Anfrage:</b>\r\nIn diesem Formular hast du die Möglichkeit, den Dispatchern eine Frage zu stellen. Wenn diese beantwortet ist, wirst du hier darüber informiert. Sollte die Frage von allgemeinem Interesse sein, wird diese in die FAQ übernommen.'), +('35', 'EN', 'New Question\r\nWith this form you may sumbit questions to our Dispatcher. Topics of common interest may be added to the FAQ. (Section: answered questions).\r\n'), +('36', 'DE', 'Stelle hier deine Frage'), +('36', 'EN', 'Tell us your question'), +('37', 'DE', 'Deine Anfrage war:'), +('37', 'EN', 'Your question was:'), +('38', 'DE', 'Diese liegt nun bei den Dispatchern zur Beantwortung vor.'), +('38', 'EN', 'It is queued for answering.'), +('39', 'DE', 'Deine bisherigen Anfragen:'), +('39', 'EN', 'Your past inquiries:'), +('40', 'DE', 'Offene Anfragen:'), +('40', 'EN', 'Open inquiries:'), +('41', 'DE', 'keine vorhanden...'), +('41', 'EN', 'nothing exists...'), +('42', 'DE', 'Beantwortete Anfragen:'), +('42', 'EN', 'Answered inquiries:'), +('pub_index_pass_no_ok', 'DE', 'Dein Passwort ist nicht korrekt. Bitte probiere es nocheinmal:'), +('pub_index_User_unset', 'DE', 'Es wurde kein User mit deinem Nick gefunden. Bitte probiere es noch einmal oder wende dich an die Dispatcher.'), +('pub_index_User_more_as_one', 'DE', 'Für deinen Nick gab es mehrere User... bitte wende dich an die Dispatcher'), +('Hello', 'DE', 'Hallo '), +('Hello', 'EN', 'Hello '), +('pub_schicht_beschreibung', 'DE', 'Hier kannst du dich für Schichten eintragen. Dazu such dir eine freie Schicht und klicke auf den Link! Du kannst dir eine Schicht über den Raum bzw. Datum aussuchen. Wähle hierfür einen Tag / ein Datum aus.'), +('pub_schicht_auswahl_raeume', 'DE', 'Zur Auswahl stehende Räume:'), +('pub_schicht_alles_1', 'DE', 'Und natürlich kannst du dir auch '), +('pub_schicht_alles_2', 'DE', 'alles '), +('pub_schicht_alles_3', 'DE', 'auf einmal anzeigen lassen.'), +('pub_schicht_Anzeige_1', 'DE', 'Anzeige des Schichtplans am '), +('pub_schicht_Anzeige_2', 'DE', ' im Raum: '), +('pub_schicht_Anzeige_3', 'DE', 'Anzeige des Schichtplans für den '), +('inc_schicht_engel', 'DE', 'Engel'), +('inc_schicht_engel', 'EN', 'Drone'), +('inc_schicht_ist', 'DE', 'ist'), +('inc_schicht_sind', 'DE', 'sind'), +('inc_schicht_weitere', 'DE', ' weitere'), +('inc_schicht_weiterer', 'DE', ' weiterer'), +('inc_schicht_werden', 'DE', ' werden '), +('inc_schicht_wird', 'DE', ' wird '), +('inc_schicht_noch_gesucht', 'DE', ' noch gesucht'), +('inc_schicht_und', 'DE', ' und '), +('pub_wake_beschreibung', 'DE', 'hier kannst du dich zum Wecken eintragen. Dazu sage einfach wann und wo und der Engel vom Dienst wird dich wecken.'), +('pub_wake_beschreibung2', 'DE', 'Deine bisherigen eingetragenen Zeiten:'), +('pub_wake_Datum', 'DE', 'Datum'), +('pub_wake_Ort', 'DE', 'Ort'), +('pub_wake_Bemerkung', 'DE', 'Bermerkung'), +('lageplan_text1', 'DE', 'Hier eine Übersicht über die Raumssituation:'), +('pub_wake_Text2', 'DE', 'Hier kannst du einen neuen Eintrag erfassen:'), +('pub_wake_bouton', 'DE', 'Weck mich!'), +('pub_wake_bouton', 'EN', 'wake me up!'), +('pub_wake_del', 'EN', 'delete'), +('pub_mywake_beschreibung1', 'DE', 'Hier siehst du die Schichten, für die du dich eingetragen hast.'), +('pub_mywake_beschreibung2', 'DE', 'Bitte versuche pünktlich zu den Schichten zu erscheinen.'), +('pub_mywake_beschreibung3', 'DE', 'Hier hast du auch die Möglichkeit, dich bis '), +('pub_mywake_beschreibung4', 'DE', ' Stunden vor Schichtbeginn auszutragen.'), +('pub_mywake_anzahl1', 'DE', 'Du hast dich für '), +('pub_mywake_anzahl2', 'DE', ' Schichten eingetragen'), +('pub_mywake_Datum', 'DE', 'Datum'), +('pub_mywake_Uhrzeit', 'DE', 'Uhrzeit'), +('pub_mywake_Ort', 'DE', 'Ort'), +('pub_mywake_Bemerkung', 'DE', 'Bemerkung'), +('pub_mywake_austragen', 'DE', 'austragen'), +('pub_mywake_delate1', 'DE', 'Schicht wird ausgetragen...'), +('pub_mywake_add_ok', 'DE', 'Schicht wurde ausgetragen.'), +('pub_mywake_add_ko', 'DE', 'Sorry, ein kleiner Fehler ist aufgetreten... probiere es doch bitte nocheinmal :)'), +('pub_mywake_after', 'DE', 'zu spät'), +('pub_index_pass_no_ok', 'EN', 'Your password is incorrect. Please try it again:\r\n'), +('pub_index_User_unset', 'EN', 'No user was found with that Nickname. Please try again. If you are still having problems, ask an Dispatcher\r\n'), +('pub_index_User_more_as_one', 'EN', 'This nickname is registered for more than one user, please contact an Dispatcher.\r\n'), +('pub_schicht_beschreibung', 'EN', 'Here, you can register for shifts. To do this, please choose an empty shift, and click the link. You can choose the place, time and date of the shift. You can choose the date at the right.\r\n'), +('pub_schicht_alles_1', 'EN', 'And of course you can also choose to show\r\n'), +('pub_schicht_alles_2', 'EN', 'everything'), +('pub_schicht_alles_3', 'EN', ' at once.'), +('pub_schicht_auswahl_raeume', 'EN', 'To the selection of available areas.\r\n'), +('pub_schicht_Anzeige_1', 'EN', 'Show the shift schedule\r\n'), +('pub_schicht_Anzeige_2', 'EN', ' in Area: '), +('pub_schicht_Anzeige_3', 'EN', 'Show the shift schedule for\r\n'), +('inc_schicht_ist', 'EN', 'is'), +('inc_schicht_sind', 'EN', 'are '), +('pub_wake_beschreibung', 'EN', 'Here you can register for a wake-up "call". Simply say when and where the drone should come to wake you.\r\n'), +('inc_schicht_weitere', 'EN', ' more'), +('inc_schicht_weiterer', 'EN', ' more'), +('inc_schicht_werden', 'EN', ' are '), +('inc_schicht_wird', 'EN', ' is '), +('inc_schicht_noch_gesucht', 'EN', ' still needed '), +('inc_schicht_und', 'EN', ' and '), +('pub_wake_beschreibung2', 'EN', 'The wake-up calls you have ordered:\r\n'), +('pub_wake_Datum', 'EN', 'Date'), +('pub_wake_Ort', 'EN', 'Place'), +('pub_wake_change', 'EN', 'delete'), +('pub_wake_Bemerkung', 'EN', 'Notes'), +('pub_wake_change', 'DE', 'löschen'), +('pub_wake_del', 'DE', 'löschen'), +('pub_wake_Text2', 'EN', 'Schedule a new wake-up here:'), +('pub_mywake_beschreibung1', 'EN', 'Here are the shifts that you have signed up for.\r\n'), +('pub_mywake_beschreibung2', 'EN', 'Please try to arrive for your shift on time. Be punctual!\r\n'), +('pub_mywake_beschreibung3', 'EN', 'Here you can remove yourself from a shift up to\r\n'), +('pub_mywake_beschreibung4', 'EN', ' hours before your shift is scheduled to begin.'), +('pub_mywake_anzahl1', 'EN', 'You have signed up for '), +('pub_mywake_anzahl2', 'EN', ' shift(s) so far'), +('pub_mywake_Datum', 'EN', 'Date'), +('pub_mywake_Uhrzeit', 'EN', 'Time'), +('pub_mywake_Ort', 'EN', 'Place'), +('pub_mywake_Bemerkung', 'EN', 'Notes'), +('pub_schichtplan_add_Error', 'EN', 'An error occurred'), +('pub_mywake_austragen', 'EN', 'remove'), +('pub_mywake_austragen_n_c', 'EN', 'is no longer possible'), +('pub_mywake_austragen_n_c', 'DE', 'nicht mehr möglich'), +('pub_mywake_delate1', 'EN', 'Shift is being removed...'), +('pub_mywake_add_ok', 'EN', 'Shift has been removed.'), +('pub_mywake_add_ko', 'EN', 'Sorry, something went wrong somewhere. Please try it again. :)\r\n'), +('pub_mywake_after', 'EN', 'sorry, too late!'), +('index_text1', 'DE', 'Wiederstand ist zwecklos!'), +('index_text2', 'DE', 'Deine physikalischen und biologischen Eigenschaften werden den unsrigen hinzugefuegt!'), +('index_text1', 'EN', 'Resistance is futile!\r\n'), +('index_text3', 'DE', 'Datenerfassungsbogen:'), +('index_text2', 'EN', 'Your biological and physical parameters will be added to our collectiv!'), +('index_text4', 'EN', 'Please note: You have to activate cookies!'), +('index_text4', 'DE', 'Achtung: Cookies müssen aktiviert sein'), +('index_text3', 'EN', 'Assimilating drone:'), +('index_lang_nick', 'DE', 'Wie ist Dein Nick:'), +('index_lang_pass', 'DE', 'Wie ist Dein Passwort:'), +('index_lang_send', 'DE', 'Fullfill order!'), +('index_lang_nick', 'EN', 'What is your Loginname:\r\n'), +('index_lang_pass', 'EN', 'What is your password:'), +('index_logout', 'DE', 'Du wurdest erfolgreich abgemeldet.'), +('index_logout', 'EN', 'You have been successfully logged out.'), +('menu_index', 'DE', 'Index'), +('menu_FAQ', 'DE', 'FAQ'), +('menu_plan', 'DE', 'Lageplan'), +('menu_index', 'EN', 'Index'), +('menu_FAQ', 'EN', 'FAQ'), +('pub_menu_menuname', 'DE', 'Menü'), +('menu_plan', 'EN', 'Map'), +('news', 'EN', 'News'), +('news', 'DE', 'News'), +('pub_menu_Engelbesprechung', 'DE', 'Engelbesprechung'), +('pub_menu_menuname', 'EN', 'Menu'), +('pub_menu_Schichtplan', 'DE', 'Schichtplan'), +('pub_menu_Wecken', 'DE', 'Wecken'), +('pub_menu_mySchichtplan', 'DE', 'Mein Schichtplan'), +('pub_menu_questionEngel', 'DE', 'Anfragen an die Dispatcher'), +('pub_menu_Einstellungen', 'DE', 'Einstellungen'), +('pub_menu_Engelbesprechung', 'EN', 'Drone meeting'), +('logout', 'DE', 'Abmelden'), +('pub_menu_Schichtplan', 'EN', 'Available Shifts'), +('pub_menu_Wecken', 'EN', 'Wake-up Service'), +('index_lang_send', 'EN', 'Fullfill order!'), +('pub_menu_mySchichtplan', 'EN', 'My Shifts'), +('pub_menu_questionEngel', 'EN', 'Questions for the Dispatcher'), +('logout', 'EN', 'Logout'), +('pub_menu_Einstellungen', 'EN', 'Options'), +('menu_Name', 'DE', 'Garage'), +('menu_Name', 'EN', 'Garage'), +('menu_MakeUser', 'DE', 'Benutzer anlegen'), +('menu_MakeUser', 'EN', 'Create new account'), +('pub_menu_Waeckerlist', 'DE', 'Weckerlist'), +('pub_menu_Waeckerlist', 'EN', 'Wake-up list'), +('pub_waeckliste_Text1', 'DE', 'dies ist die Weckliste. Schau hier bitte, wann die Leute geweckt werden wollen und erledige dies... schliesslich willst du bestimmt nicht deren Schichten uebernehmen :-)\r\n<br><br>\r\nDie bisherigen eingetragenen Zeiten:'), +('pub_waeckliste_Nick', 'DE', 'Nick'), +('pub_waeckliste_Nick', 'EN', 'Nick'), +('pub_waeckliste_Datum', 'DE', 'Datum'), +('pub_waeckliste_Datum', 'EN', 'Date'), +('pub_waeckliste_Ort', 'DE', 'Ort'), +('pub_waeckliste_Ort', 'EN', 'Place'), +('pub_waeckliste_Comment', 'DE', 'Bemerkung'), +('pub_waeckliste_Comment', 'EN', 'comment'), +('pub_waeckliste_Text1', 'EN', 'This is the wake-up list. Pleace look here, when the drones want to wake-up and \r\nhandle this... you don't want to take on this shift, isn't it?:-)\r\n<br><br>\r\nShow all entries:'), +('pub_schichtplan_add_ToManyYousers', 'DE', 'FEHLER: Es wurden keine weiteren Engel benötigt !!'), +('pub_schichtplan_add_ToManyYousers', 'EN', 'ERROR: There are enough drones for this shift'), +('pub_mywake_Len', 'DE', 'Länge'), +('pub_mywake_Len', 'EN', 'length'), +('pub_schichtplan_add_AllreadyinShift', 'DE', 'du bist bereits in einer Schicht eingetragen!'), +('pub_schichtplan_add_AllreadyinShift', 'EN', 'you have another shift on this time'), +('pub_schichtplan_add_Error', 'DE', 'Ein Fehler ist aufgetreten'), +('pub_schichtplan_add_WriteOK', 'DE', 'Du bist jetzt der Schicht zugeteilt. Vielen Dank für deine Mitarbeit.'), +('pub_schichtplan_add_Text1', 'DE', 'Hier kannst du dich in eine Schicht eintragen. Als Kommentar kannst du etwas x-beliebiges eintragen, wie z. B.\r\nwelcher Vortrag dies ist oder ähnliches. Den Kommentar kannst nur du sehen. '), +('pub_schichtplan_add_Date', 'DE', 'Datum'), +('pub_schichtplan_add_Place', 'DE', 'Ort'), +('pub_schichtplan_add_Job', 'DE', 'Aufgabe'), +('pub_schichtplan_add_Len', 'DE', 'Dauer'), +('pub_schichtplan_add_TextFor', 'DE', 'Text zur Schicht'), +('pub_schichtplan_add_Comment', 'DE', 'Dein Kommentar'), +('pub_schichtplan_add_submit', 'DE', 'Ja, ich will helfen..."'), +('index_text5', 'DE', 'Bitte überprüfen Sie den SSL Key'), +('index_text5', 'EN', 'Please check your SSL-Key:'), +('pub_myshift_Edit_Text1', 'DE', 'Hier könnt ihr euren Kommentar ändern:'), +('pub_myshift_EditSave_Text1', 'DE', 'Text wird gespeichert'), +('pub_myshift_EditSave_OK', 'DE', 'erfolgreich gespeichert.'), +('pub_myshift_EditSave_KO', 'DE', 'Fehler beim Speichern'), +('pub_sprache_text1', 'DE', 'hier kannst du die übersetzten Texte bearbeiten.'), +('pub_sprache_text1', 'EN', 'here can you edit the texts of the dronesystem'), +('pub_sprache_TextID', 'EN', 'TextID'), +('pub_sprache_TextID', 'DE', 'TextID'), +('pub_sprache_Sprache', 'DE', 'Sprache '), +('pub_sprache_Sprache', 'EN', 'Language '), +('pub_schichtplan_add_Place', 'EN', 'place'), +('pub_sprache_Edit', 'DE', 'Bearbeiten'), +('pub_sprache_Edit', 'EN', 'edit'), +('pub_schichtplan_add_Date', 'EN', 'Date'), +('pub_myshift_EditSave_KO', 'EN', 'Error on saving'), +('pub_myshift_EditSave_OK', 'EN', 'save OK'), +('pub_myshift_EditSave_Text1', 'EN', 'Text was saved'), +('pub_myshift_Edit_Text1', 'EN', 'Here can you change your comment:'), +('pub_schichtplan_add_Comment', 'EN', 'Your comment'), +('pub_aktive_Text1', 'DE', 'Diese Funktion ermöglicht es den Dispatchern, schnell einen Engel mit einer vorgebbaren Anzahl an Stunden als Aktiv zu markieren.'), +('pub_aktive_Text1', 'EN', 'This function enables the archdrones to mark drones as active who worked enough hours.'), +('pub_aktive_Text2', 'DE', 'Über die Engelliste kann dies für einzelne Drohne erledigt werden.'), +('pub_aktive_Text2', 'EN', 'Over the dronelist you can do this for single drones.'), +('pub_aktive_Text31', 'DE', 'Alle Engel mit mindestens'), +('pub_aktive_Text31', 'EN', 'All drones with at least'), +('pub_aktive_Text32', 'DE', 'Schichten als Aktiv markieren'), +('pub_aktive_Text32', 'EN', 'mark shifts as "active"'), +('pub_aktive_Nick', 'DE', 'Nick'), +('pub_aktive_Nick', 'EN', 'Nick'), +('pub_aktive_Anzahl', 'DE', 'Anzahl Schichten'), +('pub_aktive_Anzahl', 'EN', 'number of shifts'), +('pub_aktive_Time', 'DE', 'Gesamtzeit'), +('pub_aktive_Time', 'EN', 'summary time'), +('pub_schichtplan_add_submit', 'EN', 'Yes, I want to help..."'), +('pub_schichtplan_add_Len', 'EN', 'duration'), +('pub_schichtplan_add_Job', 'EN', 'job'), +('pub_aktive_Text5_1', 'DE', 'Alle Engel mit mindestens '), +('pub_aktive_Text5_1', 'EN', 'All drones with at least '), +('pub_aktive_Text5_2', 'DE', ' Schichten werden jetzt als "Aktiv" markiert'), +('pub_aktive_Text5_2', 'EN', ' shifts were marked as "active"'), +('pub_aktive_Active', 'DE', 'Aktiv'), +('pub_aktive_Active', 'EN', 'active'), +('pub_schichtplan_add_TextFor', 'EN', 'text for shift'), +('pub_schichtplan_add_WriteOK', 'EN', 'Now, you signed up for this shift. Thank you for your cooperation.'), +('pub_schichtplan_add_Text1', 'EN', 'Here you can sign up for a shift. As commend can you write what you want, it is only for you.'), +('pub_schichtplan_colision', 'DE', '<h1>Fehler</h1>\r\nÜberschneidung von Schichten:'), +('pub_schichtplan_colision', 'EN', '<h1>error</h1>\r\noverlap on shift:'), +('pub_schicht_EmptyShifts', 'DE', 'Die nächsten 15 freien Schichten:'), +('pub_schicht_EmptyShifts', 'EN', 'The next 15 empty shifts:'), +('inc_schicht_date', 'DE', 'Datum'), +('inc_schicht_date', 'EN', 'Date'), +('inc_schicht_time', 'DE', 'Zeit'), +('inc_schicht_time', 'EN', 'Time'), +('inc_schicht_room', 'DE', 'Raum'), +('inc_schicht_room', 'EN', 'room'), +('inc_schicht_commend', 'DE', 'Kommentar'), +('inc_schicht_commend', 'EN', 'comment'), +('pub_einstellungen_Name', 'DE', 'Nachname:'), +('pub_einstellungen_Name', 'EN', 'Last name:'), +('pub_einstellungen_Nick', 'DE', 'Nick:'), +('pub_einstellungen_Nick', 'EN', 'nick:'), +('pub_einstellungen_Vorname', 'DE', 'Vorname:'), +('pub_einstellungen_Vorname', 'EN', 'first name:'), +('pub_einstellungen_Alter', 'DE', 'Alter:'), +('pub_einstellungen_Alter', 'EN', 'Age:'), +('pub_einstellungen_Telefon', 'DE', 'Telefon:'), +('pub_einstellungen_Telefon', 'EN', 'Phone:'), +('pub_einstellungen_Handy', 'DE', 'Handy:'), +('pub_einstellungen_Handy', 'EN', 'Mobile Phone:'), +('pub_einstellungen_DECT', 'DE', 'DECT:'), +('pub_einstellungen_DECT', 'EN', 'DECT:'), +('pub_einstellungen_email', 'DE', 'E-Mail:'), +('pub_einstellungen_email', 'EN', 'email:'), +('pub_einstellungen_Text_UserData', 'EN', 'Here you can change your user details.'), +('pub_einstellungen_UserDateSaved', 'DE', 'Deine Beschreibung für unsere Dronenverwaltung wurde geändert.'), +('pub_einstellungen_UserDateSaved', 'EN', 'Your user details were saved.'), +('pub_menu_SchichtplanBeamer', 'DE', 'Schichtplan für Beamer optimiert'), +('pub_menu_SchichtplanBeamer', 'EN', 'Shifts for beamer optimice'), +('pub_einstellungen_Text_UserData', 'DE', 'Hier kannst du deine Beschreibung für unsere Engelverwaltung ändern.'), +('lageplan_text1', 'EN', 'This is a map of available rooms:'), +('register', 'DE', 'Engel werden'), +('register', 'EN', 'Become an angel'), +('makeuser_text1', 'DE', 'Mit dieser Maske meldet ihr euch im Engelsystem an. Durch das Engelsystem findet auf der Veranstaltung die Aufgabenverteilung der Engel statt.\r\n\r\n'), +('makeuser_text1', 'EN', 'By completing this form you're registering as a Chaos-Drone. This script will create you an account in the drone task sheduler.\r\n\r\n'), +('makeuser_Nickname', 'DE', 'Nickname'), +('makeuser_Nickname', 'EN', 'nick'), +('makeuser_text2', 'DE', 'Habt ihr schon einmal bei einer
        \r\nCCC-Veranstaltung mitgeholfen?
        \r\nWenn ja, in welchem
        \r\nwelchen Aufgabengebiet(en)?'), +('makeuser_text2', 'EN', 'Did you help at former
        \r\nCCC events and which tasks
        \r\nhave you performed then?'), +('makeuser_Nachname', 'DE', 'Nachname'), +('makeuser_Nachname', 'EN', 'last name'), +('makeuser_Vorname', 'DE', 'Vorname'), +('makeuser_Vorname', 'EN', 'first name'), +('makeuser_Alter', 'DE', 'Alter'), +('makeuser_Alter', 'EN', 'age'), +('makeuser_Telefon', 'DE', 'Telefon'), +('makeuser_Telefon', 'EN', 'phone'), +('makeuser_DECT', 'DE', 'DECT'), +('makeuser_DECT', 'EN', 'DECT'), +('makeuser_Handy', 'DE', 'Handy'), +('makeuser_Handy', 'EN', 'mobile'), +('makeuser_E-Mail', 'DE', 'E-Mail'), +('makeuser_E-Mail', 'EN', 'e-mail'), +('makeuser_T-Shirt', 'DE', 'T-Shirt Größe'), +('makeuser_T-Shirt', 'EN', 'shirt size'), +('makeuser_Engelart', 'DE', 'Zuteilung'), +('makeuser_Engelart', 'EN', 'designation'), +('makeuser_Passwort', 'DE', 'Passwort'), +('makeuser_Passwort', 'EN', 'password'), +('makeuser_Passwort2', 'DE', 'Passwort Bestätigung'), +('makeuser_Passwort2', 'EN', 'password confirm'), +('makeuser_Anmelden', 'DE', 'Anmelden...'), +('makeuser_Anmelden', 'EN', 'register me...'), +('makeuser_text3', 'DE', '*Dieser Eintrag ist eine Pflichtangabe.'), +('makeuser_text3', 'EN', '* entry required!'), +('makeuser_error_nick1', 'DE', 'Fehler: Nickname "'), +('makeuser_error_nick1', 'EN', 'error: your nick "'), +('makeuser_error_nick2', 'DE', '" ist zu kurz gewählt (Mindestens 2 Zeichen).'), +('makeuser_error_nick2', 'EN', '" is too short (min. 2 characters)'), +('makeuser_error_mail', 'DE', 'Fehler: E-Mail-Adresse ist nicht gültig.'), +('makeuser_error_mail', 'EN', 'error: e-mail address is not correct'), +('makeuser_error_password1', 'DE', 'Fehler: Passwörter sind nicht identisch.'), +('makeuser_error_password1', 'EN', 'error: your passwords don't match'), +('makeuser_error_password2', 'DE', 'Fehler: Passwort ist zu kurz (Mindestens 6 Zeichen)'), +('makeuser_error_password2', 'EN', 'error: your password is to short (at least 6 characters)'), +('makeuser_error_write1', 'DE', 'Fehler: Kann die eingegebenen Daten nicht sichern?!?'), +('makeuser_error_write1', 'EN', 'error: can t save your data...'), +('makeuser_writeOK', 'DE', 'Registration erfolgreich.'), +('makeuser_writeOK', 'EN', 'transmitted.'), +('makeuser_error_write2', 'DE', 'Fehler: Beim Speichern der Userrechte...'), +('makeuser_error_write2', 'EN', 'error: can't save userrights... '), +('makeuser_writeOK2', 'DE', 'Userrechte wurden gespeichert...'), +('makeuser_writeOK2', 'EN', 'userright was saved...'), +('makeuser_writeOK3', 'EN', 'Your account was successfully created, have a lot of fun.'), +('makeuser_writeOK3', 'DE', 'Dein Account wurde erfolgreich gespeichert, have a lot of fun.'), +('makeuser_writeOK4', 'DE', 'Engel Registriert!'), +('makeuser_writeOK4', 'EN', 'Drone registered!'), +('makeuser_text4', 'DE', 'Wenn du dich als Engel registrieren möchtest, fülle bitte folgendes Formular aus:'), +('makeuser_text4', 'EN', 'If you would like to be a chaos drone please insert following details into this form:'), +('makeuser_error_nick3', 'DE', '" existiert bereits.'), +('makeuser_error_nick3', 'EN', '" already exist.'), +('makeuser_Hometown', 'EN', 'hometown'), +('makeuser_Hometown', 'DE', 'Wohnort'), +('pub_einstellungen_Hometown', 'DE', 'Wohnort'), +('pub_einstellungen_Hometown', 'EN', 'hometown'), +('makeuser_error_Alter', 'DE', 'Fehler: Dein Alter muss eine Zahl oder leer sein'), +('makeuser_error_Alter', 'EN', 'error: your age must be a number or empty'), +('pub_menu_messages', 'DE', 'Nachrichten'), +('pub_menu_messages', 'EN', 'messages'), +('pub_messages_Datum', 'DE', 'Datum'), +('pub_messages_Datum', 'EN', 'date'), +('pub_messages_Von', 'DE', 'Gesendet'), +('pub_messages_Von', 'EN', 'transmitted'), +('pub_messages_An', 'DE', 'Empfänger'), +('pub_messages_An', 'EN', 'receiver'), +('pub_messages_Text', 'DE', 'Text'), +('pub_messages_Text', 'EN', 'text'), +('pub_messages_Send1', 'DE', 'Nachricht wird gesendet'), +('pub_messages_Send1', 'EN', 'message will be send'), +('pub_messages_Send_OK', 'DE', 'Senden erfolgeich'), +('pub_messages_Send_OK', 'EN', 'transmitting was OK'), +('pub_messages_Send_Error', 'DE', 'Senden ist fehlgeschlagen'), +('pub_messages_Send_Error', 'EN', 'transmitting was terminate with an Error'), +('pub_messages_MarkRead', 'DE', 'als gelesen makieren'), +('pub_messages_MarkRead', 'EN', 'mark as read'), +('pub_messages_NoCommand', 'DE', 'kein Kommando erkannt'), +('pub_messages_NoCommand', 'EN', 'no command recognised'), +('pub_messages_MarkRead_OK', 'DE', 'als gelesen markiert'), +('pub_messages_MarkRead_OK', 'EN', 'mark as read'), +('pub_messages_MarkRead_KO', 'DE', 'Fehler beim als gelesen Markieren'), +('pub_messages_MarkRead_KO', 'EN', 'error on: mark as read'), +('pub_messages_text1', 'DE', 'hier kannst du Nachrichten an andere Engel versenden'), +('pub_messages_text1', 'EN', 'here can you leave messages for other drones'), +('pub_messages_DelMsg', 'DE', 'Nachricht löschen'), +('pub_messages_DelMsg', 'EN', 'delete message'), +('pub_messages_DelMsg_OK', 'DE', 'Nachricht gelöscht'), +('pub_messages_DelMsg_OK', 'EN', 'delete message'), +('pub_messages_DelMsg_KO', 'DE', 'Nachricht konnte nicht gelöscht werden'), +('pub_messages_DelMsg_KO', 'EN', 'cannot delete message'), +('pub_messages_new1', 'DE', 'Du hast'), +('pub_messages_new1', 'EN', 'You have'), +('pub_messages_new2', 'DE', 'neue Nachrichten'), +('pub_messages_new2', 'EN', 'new messages'), +('pub_messages_NotRead', 'DE', 'nicht gelesen'), +('pub_messages_NotRead', 'EN', 'not read'), +('pub_mywake_Name', 'DE', 'Schicht Titel'), +('pub_mywake_Name', 'EN', 'shift title'), +('pub_sprache_ShowEntry', 'DE', 'Einträge anzeigen'), +('pub_sprache_ShowEntry', 'EN', 'show entrys'), +('admin_rooms', 'DE', 'Räume'), +('admin_rooms', 'EN', 'Rooms'), +('pub_menu_Engeltypen', 'DE', 'Engeltypen'), +('pub_menu_Engeltypen', 'EN', 'Dronetypes'), +('pub_menu_SchichtplanEdit', 'DE', 'Schichtplan'), +('pub_menu_SchichtplanEdit', 'EN', 'Shiftplan'), +('pub_menu_UpdateDB', 'DE', 'UpdateDB'), +('pub_menu_UpdateDB', 'EN', 'UpdateDB'), +('pub_menu_Dect', 'DE', 'Dect'), +('pub_menu_Dect', 'EN', 'Dect'), +('pub_menu_Engelliste', 'DE', 'Engelliste'), +('pub_menu_Engelliste', 'EN', 'Drone-list'), +('pub_menu_EngelDefaultSetting', 'DE', 'Engel Voreinstellungen'), +('pub_menu_EngelDefaultSetting', 'EN', 'Drone Default Setting'), +('pub_menu_Aktivliste', 'DE', 'Aktiv Liste'), +('pub_menu_Aktivliste', 'EN', 'active list'), +('pub_menu_T-Shirtausgabe', 'DE', 'T-Shirtausgabe'), +('pub_menu_T-Shirtausgabe', 'EN', 'T-Shirt handout'), +('pub_menu_News-Verwaltung', 'DE', 'News-Verwaltung'), +('pub_menu_News-Verwaltung', 'EN', 'News-Center'), +('faq', 'DE', 'FAQ'), +('faq', 'EN', 'FAQ'), +('pub_menu_FreeEngel', 'DE', 'Freie Engel'), +('pub_menu_FreeEngel', 'EN', 'free Drones'), +('pub_menu_Debug', 'DE', 'Debug'), +('pub_menu_Debug', 'EN', 'Debug'), +('pub_menu_Recentchanges', 'DE', 'Letzte Änderungen'), +('pub_menu_Recentchanges', 'EN', 'recent changes'), +('pub_menu_Language', 'DE', 'Sprachen'), +('pub_menu_Language', 'EN', 'Language'), +('makeuser_text0', 'DE', 'Anmeldung als Engel'), +('makeuser_text0', 'EN', 'Drone registration'), +('/', 'DE', 'Willkommen'), +('/', 'EN', 'welcome'), +('nonpublic/', 'DE', 'Garage'), +('nonpublic/', 'EN', 'garage'), +('admin/', 'DE', 'admin'), +('admin/', 'EN', 'admin'), +('index.php', 'DE', 'Start'), +('index.php', 'EN', 'Start'), +('logout.php', 'DE', 'logout'), +('logout.php', 'EN', 'logout'), +('faq.php', 'DE', 'FAQ'), +('faq.php', 'EN', 'FAQ'), +('lageplan.php', 'DE', 'Lageplan'), +('lageplan.php', 'EN', 'Map'), +('nonpublic/index.php', 'DE', ' '), +('nonpublic/index.php', 'EN', ' '), +('nonpublic/news.php', 'EN', 'News'), +('nonpublic/news.php', 'DE', 'News'), +('nonpublic/news_comments.php', 'EN', ' '), +('nonpublic/news_comments.php', 'DE', ' '), +('nonpublic/engelbesprechung.php', 'DE', 'Engelbesprechung'), +('nonpublic/engelbesprechung.php', 'EN', 'Drone gathering'), +('nonpublic/schichtplan.php', 'DE', 'Schichtplan'), +('nonpublic/schichtplan.php', 'EN', 'Available Shifts'), +('nonpublic/schichtplan_add.php', 'DE', ' '), +('nonpublic/schichtplan_add.php', 'EN', ' '), +('nonpublic/myschichtplan.php', 'DE', 'Mein Schichtplan'), +('nonpublic/myschichtplan.php', 'EN', 'My Shifts'), +('nonpublic/myschichtplan_ical.php', 'DE', ' '), +('nonpublic/myschichtplan_ical.php', 'EN', ' '), +('nonpublic/einstellungen.php', 'DE', 'Einstellungen'), +('nonpublic/einstellungen.php', 'EN', 'Options'), +('nonpublic/wecken.php', 'DE', 'Wecken'), +('nonpublic/wecken.php', 'EN', 'Wake-up Service'), +('nonpublic/waeckliste.php', 'DE', 'Weckerlist'), +('nonpublic/waeckliste.php', 'EN', 'Wake-up list'), +('nonpublic/messages.php', 'DE', 'Nachrichten'), +('nonpublic/messages.php', 'EN', 'messages'), +('nonpublic/schichtplan_beamer.php', 'DE', 'Schichtplan für Beamer optimiert'), +('nonpublic/schichtplan_beamer.php', 'EN', 'Shifts for beamer optimice'), +('nonpublic/faq.php', 'DE', 'Anfragen an die Dispatcher'), +('nonpublic/faq.php', 'EN', 'Questions for the Dispatcher'), +('admin/index.php', 'DE', ' '), +('admin/index.php', 'EN', ' '), +('pub_einstellungen_PictureUpload', 'DE', 'Hochzuladendes Bild auswählen:'), +('pub_einstellungen_PictureUpload', 'EN', 'Choose a picture to Upload:'), +('pub_einstellungen_send_OK', 'EN', 'The file was uploaded successfully'), +('pub_einstellungen_send_OK', 'DE', 'Die Datei wurde erfolgreich hochgeladen.'), +('pub_einstellungen_PictureNoShow', 'EN', 'The photo isnot free at the moment'), +('pub_einstellungen_PictureShow', 'DE', 'Das Foto ist freigegeben'), +('pub_einstellungen_PictureShow', 'EN', 'The photo is free at the moment'), +('pub_einstellungen_del_OK', 'DE', 'Bild wurde erfolgreich gel?scht.'), +('pub_einstellungen_del_OK', 'EN', 'Picture was deleted successfully.'), +('pub_einstellungen_del_KO', 'DE', 'Bild wurde nicht erfolgreich gel?scht.'), +('pub_einstellungen_del_KO', 'EN', 'Picture was not deleted successfully.'), +('delete', 'DE', 'l?schen'), +('delete', 'EN', 'delete'), +('upload', 'EN', 'upload'), +('upload', 'DE', 'hochladen'), +('pub_einstellungen_PictureNoShow', 'DE', 'Das Foto ist nicht freigegeben'), +('pub_einstellungen_send_KO', 'DE', 'Beim Hochladen ist ein Fehler aufgetreten.'), +('pub_einstellungen_send_KO', 'EN', 'An error was detected. Please try again!'), +('admin/room.php', 'DE', 'Räume'), +('admin/room.php', 'EN', 'rooms'), +('admin/EngelType.php', 'DE', 'Engeltypen'), +('admin/EngelType.php', 'EN', 'Drone-Types'), +('admin/schichtplan.php', 'DE', 'Schichtplan'), +('admin/schichtplan.php', 'EN', 'Shiftplan'), +('admin/shiftadd.php', 'DE', ' '), +('admin/shiftadd.php', 'EN', ' '), +('admin/schichtplan_druck.php', 'DE', ' '), +('admin/schichtplan_druck.php', 'EN', ' '), +('admin/dbUpdateFromXLS.php', 'DE', 'UpdateDB'), +('admin/dbUpdateFromXLS.php', 'EN', 'UpdateDB'), +('admin/dect.php', 'DE', 'Dect'), +('admin/dect.php', 'EN', 'Dect'), +('admin/dect_call.php', 'DE', ' '), +('admin/dect_call.php', 'EN', ' '), +('admin/user.php', 'DE', 'Engelliste'), +('admin/user.php', 'EN', 'Drone-list'), +('admin/userDefaultSetting.php', 'DE', 'Engel Voreinstellungen'), +('admin/userDefaultSetting.php', 'EN', 'Drone Default Setting'), +('admin/UserPicture.php', 'DE', 'Benutzerbilder'), +('admin/UserPicture.php', 'EN', 'User Pictures'), +('admin/aktiv.php', 'DE', 'Aktiv Liste'), +('admin/aktiv.php', 'EN', 'active list'), +('admin/tshirt.php', 'DE', 'T-Shirtausgabe'), +('admin/tshirt.php', 'EN', 'T-Shirt handout'), +('admin/news.php', 'DE', 'News-Verwaltung'), +('admin/news.php', 'EN', 'News-Center'), +('admin/free.php', 'DE', 'Freie Engel'), +('admin/free.php', 'EN', 'free Drones'), +('admin/debug.php', 'DE', 'Debug'), +('admin/debug.php', 'EN', 'Debug'), +('admin/Recentchanges.php', 'DE', 'Letzte ?nderungen'), +('admin/Recentchanges.php', 'EN', 'recentchanges'), +('admin/sprache.php', 'DE', 'Sprachen'), +('admin/sprache.php', 'EN', 'Language'), +('admin/faq.php', 'DE', 'FAQ'), +('admin/faq.php', 'EN', 'FAQ'), +('pub_myschichtplan_ical', 'DE', 'export my Shifts as iCal file'), +('pub_myschichtplan_ical', 'EN', 'iCal File exportieren'), +('Sprache', 'DE', 'Sprache'), +('Sprache', 'EN', 'Language'), +('start', 'DE', 'Start'), +('start', 'EN', 'Start'), +('login', 'DE', 'Login'), +('login', 'EN', 'Login'), +('credits', 'DE', 'Credits'), +('credits', 'EN', 'Credits'); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `User` +-- + +CREATE TABLE IF NOT EXISTS `User` ( + `UID` int(11) NOT NULL AUTO_INCREMENT, + `Nick` varchar(23) CHARACTER SET utf8 NOT NULL DEFAULT '', + `Name` varchar(23) CHARACTER SET utf8 DEFAULT NULL, + `Vorname` varchar(23) CHARACTER SET utf8 DEFAULT NULL, + `Alter` int(4) DEFAULT NULL, + `Telefon` varchar(40) CHARACTER SET utf8 DEFAULT NULL, + `DECT` varchar(4) CHARACTER SET utf8 DEFAULT NULL, + `Handy` varchar(40) CHARACTER SET utf8 DEFAULT NULL, + `email` varchar(123) CHARACTER SET utf8 DEFAULT NULL, + `ICQ` varchar(30) CHARACTER SET utf8 DEFAULT NULL, + `jabber` varchar(200) CHARACTER SET utf8 DEFAULT NULL, + `Size` varchar(4) CHARACTER SET utf8 DEFAULT NULL, + `Passwort` varchar(40) CHARACTER SET utf8 DEFAULT NULL, + `Gekommen` tinyint(4) NOT NULL DEFAULT '0', + `Aktiv` tinyint(4) NOT NULL DEFAULT '0', + `Tshirt` tinyint(4) DEFAULT '0', + `color` tinyint(4) DEFAULT '6', + `Sprache` char(2) CHARACTER SET utf8 DEFAULT 'EN', + `Avatar` int(11) DEFAULT '0', + `Menu` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'L', + `lastLogIn` int(11) NOT NULL, + `CreateDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Art` varchar(30) CHARACTER SET utf8 DEFAULT NULL, + `kommentar` text CHARACTER SET utf8, + `Hometown` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '', + PRIMARY KEY (`UID`,`Nick`), + UNIQUE KEY `Nick` (`Nick`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=148 ; + +-- +-- Daten für Tabelle `User` +-- + +INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES +(1, 'admin', '', '', 0, '', '', '', '', NULL, NULL, '', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307026626, '0000-00-00 00:00:00', '', '', ''), +(147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1306971362, '2011-06-02 00:55:09', '', '', ''); + +-- -------------------------------------------------------- + +-- +-- 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) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `logout.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `faq.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `lageplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `makeuser.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/index.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/news.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/newsAddMeting` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/news_comments.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/myschichtplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/myschichtplan_ical.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/schichtplan_beamer.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/engelbesprechung.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/schichtplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/schichtplan_add.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/wecken.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/waeckliste.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/messages.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/faq.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `nonpublic/einstellungen.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `Change T_Shirt Size` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/index.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/room.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/EngelType.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/schichtplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/shiftadd.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/schichtplan_druck.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/user.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/userChangeNormal.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/userSaveNormal.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/userChangeSecure.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/userSaveSecure.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/group.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/userDefaultSetting.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/UserPicture.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/userArrived.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/aktiv.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/tshirt.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/news.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/faq.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/free.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/sprache.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/dect.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/dect_call.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/dbUpdateFromXLS.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/Recentchanges.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `admin/debug.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `Herald` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `Info` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `Conference` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `Kasse` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', + `credits.php` char(1) CHARACTER SET latin1 NOT NULL, + PRIMARY KEY (`UID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- +-- 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`, `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` +-- + +CREATE TABLE IF NOT EXISTS `UserGroups` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `uid` int(11) NOT NULL, + `group_id` int(11) NOT NULL, + PRIMARY KEY (`id`), + KEY `uid` (`uid`,`group_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ; + +-- +-- Daten für Tabelle `UserGroups` +-- + +INSERT INTO `UserGroups` (`id`, `uid`, `group_id`) VALUES +(1, 1, -2), +(2, 1, -3), +(3, 1, -5), +(4, 1, -4), +(5, 147, -2); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `UserPicture` +-- + +CREATE TABLE IF NOT EXISTS `UserPicture` ( + `UID` int(11) NOT NULL DEFAULT '0', + `Bild` longblob NOT NULL, + `ContentType` varchar(20) NOT NULL DEFAULT '', + `show` char(1) NOT NULL DEFAULT 'N', + PRIMARY KEY (`UID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1; + +-- +-- Daten für Tabelle `UserPicture` +-- + +INSERT INTO `UserPicture` (`UID`, `Bild`, `ContentType`, `show`) VALUES +(-1, 0xffd8ffe000104a46494600010200000100010000ffe100e645786966000049492a00080000000500120103000100000001000000310102001c0000004a00000032010200140000006600000013020300010000000100000069870400010000007a000000000000004143442053797374656d73204469676974616c20496d6167696e6700323030363a31323a31352031353a34303a353700050000900700040000003032323090920200040000003632320002a00400010000007401000003a00400010000002c01000005a0040001000000bc0000000000000002000100020004000000523938000200070004000000303130300000000000000000ffc0001108012c017403012100021101031101ffdb008400010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101ffc401a20000010501010101010100000000000000000102030405060708090a0b100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9fa0100030101010101010101010000000000000102030405060708090a0b1100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffda000c03010002110311003f00fefe28a0028a0028a0028a0028a0028a0028a0028a002bc33f68bfda6bf67efd91fe16ebbf1abf698f8bfe04f829f0bfc3d15d1bcf1678f75eb5d1adafafedb49d535c8fc39e1ab0776d5fc63e33d534dd175497c3be06f0969fae78c7c517167258787342d575031dab9fd7f5bfe5f78d26dd92bbfe9b7d6c96eddac92bbb9fc03ffc1463fe0f35f8d5e3bbcd5be1f7fc1343e155afc0ef06ab0807ed07f1d345f0ff008dfe336b051bc19a9c379e0ff855e76bdf09be1c436fa85878e7c2da92f8d67f8e3378bfc27ade89e20d3ad7e15f8a6c25b283f956fda0bfe0a67ff050afdaa2e35d6fda03f6d1fda4fe25e91e21f165ef8def3c15ac7c5df19da7c32b0f12df4ba9c86f7c35f0ab46d4f4cf86fe0fb6b18f58d4ec344d27c27e16d1748f0ee9177268da169fa7693b2c94df7ff81af975febb8d49c5a717669a6a69b524d6a9c5f2a6b5d53d1dd27eebf87cc7e17feda1fb617c11beb9d53e0bfed5dfb49fc23d4eef4b9b44bad4be197c73f89de02d427d1ae2f6cf51b8d264bdf0b789b4cba7d3a7d434eb0bd9ec8ca2de6bab3b59e48da482364fd91ff827e7fc1cefff000542fd893c516b6ff107e2eebdfb6bfc19bfd64ea3e2cf863fb5178afc43e39f17bc57fa8f851b5bbdf007c7bd5a4d5fe2b782f5ff00f847fc3573a1785ac75cd57c7df08fc3571e25d7bc4b71f07b5ed7ee85e22b24acb45d12d97e1fa7f9c473729394db9b936e4e526e4db7ab7269b726f5bb72f33fbc2fd803fe0e63ff00825d7edbfe0f8e5f187c68f0d7ec69f1734ad1a1bff18fc2dfdaa7c61e14f871a243736d61e135d6eefe1ffc65d6750d3be18f8fbc3bff00092f896eb42f0b5bdd6afe11f8ade21b1f0eeb1e28d4fe10f86345b73227f12bff0005d2ff0083853f68afdb53f6a7f1ff0081ff00636fda53e2d7c2efd86fc0965aa7c39f87767f0af5af1efc0fd47e3b691ae683a1d87c4af19fc5fb5d27c4b6dac78df43f15f88ecf5cb0f87da0f8b2cf42b2d27e15368d1ea7f0ff00c37e33f127c431aa9bdba757beb6e97b2eb67b6a959deef96aca29cb495e3686abed3d5b8f24efcb1528b5eeb8ca509dfe1e6fe73be1f7c6cf8cbf09be2658fc69f857f16be267c34f8c7a65deb97fa6fc58f0078f3c53e0ef897a7dff0089f4cd4f45f12ded8f8efc3da9e9fe28b4bcf1068fad6b1a4eb77506a71cdaae9bab6a5657cf716d7b711bfd6a9ff0566ff82a7a2ba8ff008295fedf789176b6ff00db17f686760339f919fe20bb46d9fe28cc6c7bb114ff00afebfad7a917fd77f3f54ff5d75df53ea1f829ff000711ff00c168fe017856ebc1de08fdbefe2d788746bcd76efc4535cfc6bd1fe1cfed21e2917f7b65a7584d6f6be3dfda13c0ff0013fc7761a1241a5dac969e17b0f125af86b4fbd9351d4ac749b6d4758d5aeaf7eccf81bff0772ffc165be146bdab6abf10be25fc15fda6b4bd4ec22b2b6f0cfc67f813e0bf0de95e1e992f21b99757d0af3f674b7f80fafc9aacb6f1c961b3c49ac788b464b79e495747fb6a437711fd7f5fd7e8175d52fbda7eb650b5faefafda7b33fb0cfd8d7fe0ed4ff82537ed35ff0008e786be2f789fc7ff00b197c4cd5ffe159e873693f1d3c3536abf0baffc75e3969b4ff10e9fe19f8d5f0e878a3c3ba5f807c01afc3041adfc51f8f1a47c01d14f87357d1fc5977a7693676de2fb4f07ff004f940bfafebfafbf4614500145001450014500145001450014500145001450014500145001450014500145001450014500145007e1b7fc15fbfe0bcffb25ff00c1267c1874bd56ef41fda07f6a8d4b52d2ad3c3ffb29f833e21e99a178bf4ed2ee9744d5b53f167c5ad7ecf42f1bcbf077c329e15d66df55f094de25f0addeb5f11352bab0b1f07e87a86896fe2ef15783bfcb03f6feff0082937ed77ff052df8c1a97c5efdaa3e286ade280bad6b7aa780be176937fad58fc1bf83563af5ae85a7df787be117802ff0056d56cbc23a5dce9de18f0ddaeaf7fe7dff89fc5d71a2da6b9e37f107897c4925deb374b7ff87ebf77eaf5d7b72d7c2bfbd2fc23ebde5bbdbddb6ea4f97e0fa29921450014500145001450015fe82fff0006fdff00c1cfff00087c35f0b7e08ffc13ff00fe0a11369ff0b67f875a57827e0bfc03fda86da3d0b42f8491fc36f0c786a6f0ff0083bc2dfb43493de69317c3abdf085a689e18f0768df14f4cb1d57c2be22d3353b5d4fe292f8065f09788be22f8d8febfab27fd77bde351b3bc5d95f66db8d9abe9a466ad2db58d93e56e518a933fbe1a282428a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a002bf832ff82e9ffc1d69e19d2340f881fb20ff00c12c3c5daa5efc415f126a5e0bf89bfb6ae91fd8573e09d27c356165a6ff006b597eca7aadbea1abcbe2bd775ed5ae759f09df7c6dd4749d2343f0be95a0dfebdf049bc6d79e31f047c61f01035d5f4fd5eda59fcfb5bed5d72ff9fc78c7c65e2ff889e2cf1278f7e2078abc49e3af1cf8cb5cd4fc4de2ff001a78c75cd53c4fe2cf15f8935bbc9750d67c41e24f11eb7757dac6bbae6af7f3cf7da9eadaa5e5d5fdfde4d2dcddcf2cd233b73740b7d5eaff00af5febbee1450014500145001450014500145007f735ff0006dfff00c1c936ff0005e0f0afec0bff00051bf8a0d1fc1e8db4bf0dfecd5fb4c78f351b99cfc2233dc5b69ba67c1ef8c5e29bbf3cc5f076269a15f01fc47f115cc769f05ed2297c35e2ed621f8370787ef3e107fa2f51fd7f5fd7e854acf55d56aaf7d7afdef5f9f5d185141214500145001450014500145001450014500145001450014500145001450014500145007f9a97fc1c1dff000731f8cff69793e367fc13f7f61f922f037eceba7f8d3c59f0d3e2efed27e16f1de9fe23d77f6a4f06e910dae85abf863e1e5ff85eddb45f077c07f146bd178a23d575bd03c59e2fd4be3dfc3bff00845229355f05f80bc43e3ff0078dbf8b4a3e56febfaff83a32a565eea7cc937aabd9bead5d2767a5aeb54aef576894504851400514005140051400514005140057f633ff000432ff0083a33e2bfec977df07ff00640fdbd35483e247ec73a52cde0bf0e7c71b9d3b5dd5be36fecf3a1c967a2587822c750b8d2a5bc1f13be08f81a4d32faca7f0e4fe1cbbf8a7e1ad07c4b2dcf857c5be20f0e7c3ef07fc1cbf3fafe975febcca8dbe17b49aeb6b3d936f95e8afef796babb1fe987e18f13f86bc6de1af0f78cfc19e21d0fc5de0ff0017687a4f89fc29e2bf0c6ad61aff0086bc4fe1ad7ec2df55d0bc43e1ed774ab8bbd2f5ad0f5ad2eeed752d2756d36eae6c352b0b9b7bcb3b89ade68e46dca09db47a3eddbfaf441450014500145001450014500145001450014500145001450014500145001450015fc2bffc1da5ff0005ac6f86fe1fd7ff00e094bfb347893c63a0fc52f1359787354fdb07e21787b533e1db3d03e16f8b3c3035fd1ff675b09d74f3afeaba87c55d075ff0d78bfe266a5a2eaba06876bf0d65d2be1cde5c78eec3e28fc43f0f7828febfad1ff5d761aeaf4d13d1b6b5d95ad7d537cdb5bddf7aeac7f9d7d140828a0028a0028a0028a0028a0028a0028a0028a00ff469ff008344ff00e0b0f77f16bc1337fc12dbf689f18ea9ab7c4af859a06abe2bfd92bc65e33f17e8f3c9e27f833e1eb2d221d5bf672d1ad7575b0f136abaf7c1eb58f52f1a7c3dd3ad352f1a5c7fc2971e27d02c74cf027807e01e8d0eabfdc7d1fd7f5fd3ff00e45bfcd79fa3dfcd5faaff00db4a2810514005140051400514005140051400514005140051400514005140051401fcff00ff00c1c43ff057af107fc1267f645f0beb1f07ec7c33abfed37fb45f8a75ff00875f0722f139bb9acbc09a3e87e18b8d4fc77f1b13443a0ea9a178ca7f8777fa9f81344d3bc1dafea7a2d85f7883c7da1eb97d1789340f0e6bfe18d53fc8bfc71e36f17fc4bf1a78bbe237c41f12eb3e32f1e78fbc4daf78d3c6be2ff11ea171aaf883c53e2cf146a973adf88bc45ae6a976f25d6a3abeb5abdf5dea5a95f5cbbcf7779712cf2b33b9653fafebf0efb6bd3969e915e7abd7cecb4eeacddefadd69a291cbd141214500145001450014500145001450014500145007a27c21f8b1f107e037c56f86bf1bbe13788a5f08fc50f843e3bf0a7c4bf877e288ac349d59bc3fe35f046bb61e24f0ceae748d7ec355d07588ac358d3acee67d235dd2b54d13548637b0d5f4dd434fb8b8b57ff670ff00823c7fc1493c37ff000552fd863e1dfed4763a5e8be16f8809aa6b5f0d3e3af80bc3d36b775a3780fe32783e3d3ae75cd274bbbd76c6d6e66d23c43e1ad77c23f11342b68eef5ffec5d03c6ba5f87b50f11eb3ae68fab5dd1fd7f5fd7dfbc5fd97abba7a2e9afc4fd748f6befaf2ae5fd44a281051400514005140051400514005140051400514005140051400514005717f123e21f82fe117c3bf1efc58f891afda7853e1dfc30f05f8a7e21f8f7c1400514005140051400514005140051400514005140057f089ff00079d7fc14574cd17e1c7c1cff826c7c2cf88ba5dc7897c6dae47f19bf6aaf0a68179ae7f6ce83e0cf0c0d2af3e057827c657367245e17974df1cf89ef358f89971e0cd44ea3e27d3ae7e197c32f19ddd8683a36bbe15d43c4c7f5faff5f8dca8f576d93f95f44fff000271ff0087e571ff003c2a282428a0028a0028a0028a0028a0028a0028a0028a0028a0028a00fef33fe0d31ff82dac1e12bef0a7fc1277f69cf13782bc39e05bd7f125cfec69f11bc4378de1fd447c42f16f8ca0d7aebf664be9ed7413a26b72fc40d77c4fe32f18fc2ef1078c3c43a2eb4be2e59fe0ee9179e32bff001bfc25f07f86ff00d0b28f2febfafbff002e5a96bef6bef5eef5b732b736ad2bbf864f4d2fd74614504851400514005140051400514005140051400514005140051401c0fc55f89fe05f825f0bfe247c67f8a1aeaf85be1a7c22f0178c3e27fc44f133e9faaeac9e1df02f807c3da8f8afc5baebe95a0d86a9ae6a6ba4681a4ea1a8369fa3699a8eab782dfecfa7585e5e4b0dbcbfe217ff000504fdb23c6fff000503fdb37f685fdb0bc7f66749d67e36f8faef5dd23c34d3e95787c13e00d16c6c3c25f0b7e1f36aba2f87bc2963e2093e1ffc34f0ff0084bc19378a5fc3da5ea5e2c9f4293c4fae4326b9ab6a37129fd7f5fd7dfbc5f47dff004ebf8db75afc91f1cd140828a0028a0028a0028a0028a0028a0028a0028a0028a0028a00b169757563756d7d63733d9ded9dc437567776b3496f756b756f22cd6f736d71132cb04f04c892c3344cb24522aba30650d5fea81ff06e1ffc17cbc07ff0501f853e05fd8d7f68ff00125b785bf6eaf84be08b1f0ee8d7fe24f116a9a87fc35c7827c0be1fd8ff0011bc3fadf8ab53d535bd63e39697e1cd1e5d73e38f846ff55d4b55f113da6b9f19fc1e66f0adc78dfc2ff08cfeb7fd2cefadbfcf7296a9abaeeba5dadd5f95f4bbb5fde692df959fd5851412145001450014500145001450014500145001450014500145007f0ddff07a57ede761e0cf825f007fe09d7e0bd7b5eb2f1d7c60f10d8fed1df19a0d13c43e23d06c57e0af82e5f14f847e1c7843c5ba441a2c5e1ff1ef87fe257c555d6bc636763278a267f07f88ff00678d1f55d5fc2d2cfaef8475cd3bfce628febfafebcf5dc6fa2f2fcf5f9f4bf55b3bd938945020a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a9609e6b59a1b9b69a5b7b9b79639edee2091e19a09a2712453432c644914b1c8aaf1c88cae8ea194ee00a81b6ab47d3faff0086fd4fedbbfe0dfeff0083987f6abd1fe3cfecf5fb03feda9a96b5fb4dfc36f8e1f15b49f84bf0f7e3bf8a759d67c41fb487807c7bf17bc4da2787fe1fd878c3c65e21d66787e2c7c3287c6da89b1be1e2944f88fe16d33c5b79a9e9be39f10f86bc0fe16f858ffe90b47f5fd7f4fbff0085bb68d75dd767df65a3d3e77d1251e628a04145001450014500145001450014500145001450015f24fedc1fb6efecf3ff0004f3fd9c3c75fb517ed33e2e7f0c7c3bf05411db59699a5c36fa8f8d7e21f8c7508ae0f867e1afc36f0f5c5e69ebe24f1df8aee2da6874bb09af74ed1f4bb1b6d53c55e2fd6fc35e08f0f7897c4fa29fd7dfff0006dea349bd12beef4ec95dbd3a25ab7d12bb3fc61ffe0a0bfb67fc41ff0082847ed91f1f3f6bcf890b7163abfc62f1d6a1ab787bc313dd6937e3e1ff00c38d2d21d03e177c348753d0fc37e10d3f5c8fe1e7c3dd2fc37e1093c4ede1bd2f54f17dce8f71e2cf11453f88b5bd5aee6f8d6807bf7ff2e9bebb5bf50a28105140051400514005140051400514005140051400514005140051401fb17ff06fcfc0fb2fda0ffe0b31ff0004fbf01dfebf3f86e0f0ff00c7383e3826a16f611ea525cdefeccbe14f137ed21a6e806da4bcb15483c57a97c29b4f0c5d5faccf26916babcdab4767a8c96296171fecdb47f5fd7f5fa0decbbeaefe5a2b5addd5f777f92e528a0414500145001450014500145001450014500145001f00b36fbc6bf117e376b5fb456a8d6de26b51acf857c23f087c0fe23f873a3c5abf83e2b59afce95f10f5cf8cdab4be1ff11dedf69b65f6cf859e24d374fb4d72e13509fc387f5dbfaefe76f9c6a3d77b28c9b69376d2caf66aca4da8dde8ae9da5a23fce328a090a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2803fa00ff835c149ff0082eb7ec3a411f2afed32c7dc1fd8ff00e3faf1ef9653f41df8dbfebf140df4f4fd7fa7d7ff009128a04145001450014500145001450014500145001450015fc2a7fc1e7bff0004f9f1dfc46f067ecfbff050cf86ba57897c5769f0834bbdf805f1d743d2adf55d662f0af80b57d5758f1bfc37f8989a6697e1db8b7d0fc3ba678ab50f19784be21789f5df1141036a7e2ef84da6e99a5e4eaf7b49f7eceffa3bd93e8dfa6ed9a534e4dc16f38b8dbab6ad28a5ddca518ab6eefeede5ca7f9d9514ccc28a0028a0028a0028a00f4ff027c19f89df129d3fe10ef07eadaa5a33aa36aaf10b0d16224f3e66af7e6df4fca8cb3451cef3607cb139da2bec0f0a7fc13ebc4f790a4fe33f1e691a1c8c037d8742d36e75e9573fc135ddd4da3411c83bf9315e479e8ef8cd7e39c7de3370f70655a996e161fdb99e537cb570386aea961b072fe5c7637d9578d3abff0050d4a956ad16bf7ca8f34247fa4bf449fd99de31fd2630384e33cf712bc28f0b3171f6b80e28cf32caf8dceb89a95f4abc2dc34eb602a62f012dbfb6b30c66032da89f3e5f5334953ab4a1eafa77fc13efe1cc23fe26be36f19df377fb08d174c527d76cda5ea8473ce371e9d7a1ab37dff04fef85f2c4469de2ff001d59cdda4bab8d0afa3cff00b5147a158311ec25527fbdd36fe2b3fa49714bc473c323c82385e65fb897f68cebb8f55f5a589a74f99ff37d52cb7e59688ff4f70ffb12fc01864cf0d8af157c5caf9fba724b36a1538470d95aacedcb3fec49f0ce2b12e945ef49e77cf25a7b64d291e4be30ff00827debd656725d781bc7565ae5d4619c695afe9afa2bcc072238352b6b8d46dda66190a2e2d6d212d8df3c632cbf0a78c3c11e2cf006b13681e31d0aff0040d561f9becf7b1e1278b3817167731992d6fad588212eace6b8b7620812965217f73f0dfc59cab8fbdae06a61ff00b273dc3c1d6965f3afede962b0f1694abe0abba545d4f6778fb7a13a71ab493534eb439aa43fca9fa6bfecf6e3efa237d438a7079cbf10fc29cdb134f2fa3c6187cb2795e3b21cdeb29ca8e53c5195c2be369613eb9184ff00b3335c3e2eae071f529ce855860718f0f86adcad15fad1fe79851400514005140051401fd43ffc1a2ffb356abf1bff00e0ad5a0fc53b4f19788bc0f63fb27fc1bf887f19a7bbd0741d17578fc5fa8789bfb2be07c5f0d355bef1058ea5a7f87f4df157877e2af8ab52d4353b4d3ee3c452697e18d46c3c3373e1fd62eedf1dd67c73e2dd053c41ac68de2a7d2f4db6d466925d1ede2b7d334bbe49df4b005b5e5c19af24cfdbd6ea00ab16c823914cadf97f8c39f667c3bc099963f28c43c2632a56c2609626293ab4a8e2eb2a55a5464e32f6759d36e30aaa3cf49bf694daa9184a3fddff00b377c26e05f197e95dc15c27e22e4d0e21e1ac1657c45c513c96bd59c30198e61c3b97fd7b2ca19a53a7caf19974716a9d6c560272587c6c69470d8c8e2307531186adfa7f0c30dbc51c16f1470410a2c70c30a2c51451a001238e340111140015554281800702a4aff3e25294e4e526e52937294a4dca5293776db7ab6deadbd5bd5f53fec36952a587a54a850a74e8d0a34e14a8d1a508d3a54a9538a853a74e9c528c29c20a3184231518c52495ac1452340af37f8a3f0abc21f173c3371e1bf165824ca564934bd561545d5344be65c25f69b72559a37042f9f0306b6bc897c9b98e44236fa9926718dc8336cbf39cbaa3a58ccbb134f1346576a32707efd2a96bf351af4dce8d683569d2a9384ae99f05e28f86fc2fe2ff00879c5fe19f1960a38ee1be33c8f1b9266549c60ead0589a7fecd9860e538c951cc72bc6470f9965b895173c2e3f0986c443dfa5071fc2af8a5f0d75ef84fe34d57c19e20557b8b1659ac6fe2575b5d5f4ab82c6c753b5de3222b8456592225dadaea2b8b591da5818af9e57fa6392e6b86cf328cb738c1b7f56ccf0586c7514dde508622946afb39d92fde537274ea2e5569c5ab1ff0e9e26700e75e167887c6de1bf11462b3be06e28cef85f319c2328d1c457c9b30af82fae61d4b5784c7428c319849bbfb4c356a55136a498515e99f0e1450014500145007faefff00c1b0dfb1468dfb21ff00c126be0378ab50f0959689f177f6b1d34fed2df12f5c12e81a96a7ae7877c7b35cde7c09b41ace8f6ff6c4f0fd97c1197c15af59785b56d4b51b8f0c78abc5be387922d2751d6354d2ed7fa19a17f5f3d5fe3e4bf22a6ef27aded68a7aeaa29453d527aa4b75eb7d18514121450014500145001450014500145001450014500145007f89b7fc1653e036b7fb35ff00c154bf6f9f853ac782747f875676bfb507c57f1c781fc1fe1d1e1e8bc3da47c26f8b5e27bdf8aff06c68563e169a6d0f46d22efe15f8d3c1f7b61e1cb55b39fc316f709e1dd4f4bd2354d2ef34bb2fcd0a072f89bbdeedbbddbbdf5bddeaef7bea93efd428a04145001450015fae3ff04feff9259e2dff00b1f6ebff004c1a0d7e2fe3e7fc9b9c77fd8cb2affd493fd37fd919ff00299fc31ff64471f7fea94fbbebf337e3b7eda1e37f0cf8c3c4fe04f03689a468c7c39ab5e68d71e20d4f7eaf7f753d9c8d149716564c9069d6519901d897716a8ccaaacdb0b145fe66f08b8132fe3be21c4e1735c456a597e598358ec450c3fb9571b7af4e8c30fedf7a14dca7cd56a4632a8e31e4a6e9ca6ab52ff71ff68b7d2bf8bfe8a1e0ee4d9ff00e519663b8bf8e38927c2794e6b9c296232fe1ae5cabca1a469479608fd1bfd9c7f6b7b3f8a77d0782bc6f6965a1f8da58dce977964d245a37890c28649608619de5934fd5444ad28b469a682f16391ada48a409695f6c57f0ff00891c173e05e28c564f19ceb602ad3863b2ac454d6a55c05794e318556a318bad87ad4eae1eac924aa3a4ab72c2352108ff00d4cfd0a3e93585fa56781391f88b5b0d84cb78b72ec66278578fb28c14a5f54c0f15e55470b5abe23010a939d6a796e7397e372fceb034aacaacb090c7cf2e962315570357113fcfcfdbff00c1f6d79e0af08f8e22b653a8689af36837574a0890e95acda5cdcc69363868a0d434f8843bff00d5497926cff5cd5f9455fd71e0463658cf0e72ca739b9bc063733c12bbbb8c562e78a84365a4618a8a8a77b47955da48ff009dbfdac5c2f43873e9a3c738cc361e387a7c5dc35c0fc5128c1350ab5ea70f61b21c562231b24a55f1590d5a959c6ea75dd4a926e7390515fb19fe6d0514005140057d2bfb1d7ecb7f12ff006d6fda83e07fecaff08b4c9f51f1cfc6cf885a0782ec6e12c756beb0f0d6937b76b2f8a7c75e235d0f4dd6353b3f07fc3ff0bc1ac78d7c65ab5b6977a747f0be83ab6a8f6d325a3230f6febf4bbfc3ef2a0b9a514f66f5f25d5eb65a2d5dda5a5dbfb51ff72cf867f0e3c15f073e1bfc3ef845f0d74287c2ff000e7e15f823c29f0e3c01e19b7bad42fadfc3be0af03e8361e19f0ae8505eead777faade43a4685a5d8584575a9df5eea17096e26bcbbb9b879677ede813776dbeadbf2d7d125ff0092af40a2810514005140051400514005140051400514005140051401fc0bff00c1ec9fb15433e93fb2b7fc144b46d54fdb2c2ea0fd8dbe22683797f23799a7de2fc49f8d1f08f5df0e6970680638a3b2bd8be32699e39d4755f1406964d57e1bdae85a0b795e21d453fcfbe8effd7f5fd6fb952b3b3b5bdd57d34bad2eb577ba49b7fcd7d344145048514005140057e8d7ec17f13f42d166f13fc37d6efedf4ebbd76fed75cf0db5dceb043a85f2db0b1d474d89e4023fb6bc3058cf6906fdf74b1dc88d59e20adf9878c994e2339f0ef3fa184a72ad88c2c30b98c2941394a74f018ba35f13cb18a6e4e3848d79a4b56e092bb763fbb7f66b788793786ff4c9f09335e21c6d0cbb26cf7119f7066271d89ab1a187a18be2be1fcc729c93db559da9d3a75f886b653869d4a928d3a71acea4e4a306e3fa3be31f1a7867c03a05ff00897c57ab5ae93a5584324cf2dc4a892dcba2164b4b180b092f2fae1808edad2057966919540e7727f3d9e32f114be2ef16f89fc533a7952f88f5fd5f5b78739f24ea77f3de0873ce4422658c7b2f7e0d7e47f46ac9f130ff005973eab4a70c2d6860b2cc255926a35ea42757118ce46d5a4a8ffb22934dae69f2fc507cbfe87fedbbf12324c43f04bc27c0e3f0f89cf72eafc4dc71c4381a55a13ad95e0f1787cbb26e1c962a9c64dd29e66d67f52953a8a33f63828d5e574eb5291cdd15fd567f8066ef85f52d4746f12f87f56d21a55d534dd6b4cbed3fc866494de5b5ec335baa32f3b9e5545c73bb3820e48afe909492aa48c120123d091c8fc0fb0afe4bfa4cd2a4b15c1f5d72fb6a987cee954fe674a8d4cb274afa7c2a75ab72eaf572d165001450014500145001450014500145001450014500145007ca9fb717ec97e02fdbaff00648f8fbfb247c4a916d3c2df1c7e1eeabe135d6cdadeea0de11f14c325b6b9e01f1edbe9761ad78766d62f3e1f78f749f0cf8decb45975ad3ec35abcf0fc1a5ea93369b77751bff88ffed2df01bc61fb2d7ed0ff001cbf66bf88177a3ea3e36f809f167e207c21f14ea9e1c97509fc39abeb5f0f7c51a9f85efb5af0e5c6ada768faadc787b599b4c6d5343b8d4b49d2efee34abbb49af34fb3b877b78975df75b6bd1ef6dbaaf3d16fa38def4b6f866ef2b2d7da4559376be9ecdb49b6b56d25ab3c4a8a640514005140052824104120839041c1047208239073ce78f5f7a37dc69b4d34da69dd34ecd35d535aa77ebf32cdcdede5e95379777576501086e6e269ca03c90be6bb9504f271d7be782b56a29d3a74a0a9d28429d38df9614e2a105777768c74576eef4577a9be2f198bc7e22a62f1d89c46331559a757138baf571388aae31518ba95ab4a5526d46318ae66ed18a4b44b94a500920019278007524f618e79ab39d26da495dbd125bb6fa2b6ba9fa15fb2a7ecafae5feb9a37c4cf88ba6cba4e85a4cf06abe1bf0f5fc4d1ea1addfc2cb3586a37f672c7bed348b59425d4115c2a5c6a33470b18bfb3cefbafd55afe08f1b38c30fc57c5f3a597d555b2cc8a83cb30d5a12e6a589c42ab2a98ec4d27f0ca9ceb72e1e9ce2dc6ad3c2d3aaaeaa4647fd707ecbefa38e71e007d1cb0f8de2fc054cb78ebc56cd63c739e65b89a6e963725c9e782a183e15c8f1d4e518d4a58ba196c2ae718bc3568c6be031d9e62b2fc4463570923e36fdb9bc491e8df04e4d1837effc59e24d1b4b541d4dbe9f249af5c4879fb8b26996b19e0fcd3271c864fc68afe84fa3d615e1fc3f9566bfdfb3dccb14bcd42960f057dbf9b08fbed76f650ff1d7f6c5e7f0ce3e97b4f2e84aef857c2ae0bc8aa47f96a6271bc45c4d6f9d2e21a32d7f1f75c4a2bf733fca90a2800a2803ea4fd87fe01db7ed51fb657eca9fb365fdfdce93a57c77fda17e107c28d6f57b3b09354b9d1b40f1cf8f342f0f78835a8b4e8ae6c5ef0e8fa35fdf6a6d07dbac11d2d5bccbeb48f75d41fee75e1bf0df877c1be1dd03c1fe0fd0345f0a784bc29a2e95e1bf0bf85fc37a558e87e1df0df87742b1834bd1340d0344d320b5d3347d1747d32d6d74ed2b4ad3ad6dac74fb1b682d2d208a0863445d5fa2fcdfe7d7d116ff00871d379ceeeef5b46164d6deeddb4f57ef3db436a8a6405140051400514005140051400514005140051400514005140057f98b7fc1e7dfb300f85fff00050bf82ffb4ce87e0e8744f0c7ed4ff00acac3c45e2a4d75afe5f1b7c69f80facbf843c5b34fa1dd6b17b79e1ffec0f83de21fd9eb4789acf49d17c37ac2426e74ff00ed1f115bf8bae90edfd7fc3ffc33e88a8bd26b4d636d55efef45e9a3b3d2f7d344d36ef63f8f0a282428a0028a0028a00294024803924e00f527f3eaa2f175aaf23777ecd46fd397fe22be949e31cfc7dfa4078a5e2c2f6cb2fe2ae27c43e1fa588e655a870b651468647c2d42b53925ecabc387f2dcbbeb54e315158a75a5ab9390515f547e0414500145007eef7fc1b35e08f0c78fff00e0b7dfb0c68de2dd306ada6697e20f8c3e37b2b46babcb458fc4ff000ebf678f8b7e3cf066a665b19ede790e89e2ef0ee89ad476af2fd8ef25d3e3b4d4a0bcd366bab39bfd86a81bd92e9abf9b767d3af2c7abdbff000128a041450014500145001450014500145001450014500145001450015fc1b7fc1f1cda5ffc2bcff8271acb677efad1f19fed3ad61a8476923e976ba5ae87f0386af67797c018adefefeedb439f4db476125e5be9daa4d1065b094a27faafcffaf52e1f13d2fee54e97de9cb5b2ececdbe9f133fcf428a64051400514005140054917fad8bfeba27fe84293d9fa334a5fc5a5ff005f21ff00a523fa588bfd545ff5cd3ff4114b2489123cb2ba471468d249248c112344059dddd885545505999880a0124f535fe5559b95926db95925ab6dbd124aedb6fcbefb9ff7ed19c29e1e352a4e30a74e8a9ce7392842108c39a539ca5eec6318a72949d9452bbee7cb9f11ff006bff0083de0117b6567abbf8d35fb50c8ba57867fd26d3ed0095f2ee75e64feca8515c62736d3dfdc4383fe8b230095f97df193f688f881f19ee4c3adddae93e198661358784f4a79134c89d0feea7be91b6cfab5ea8e45c5e13142fb9acad6d03b2d7f5bf833e116272cc450e2ee29c37b1c5d38c6ae499556fe2e1a538dd6638da767ecf1118bb6130d52d530f3e6af5a30af1a4a1ff003bdfb4c3f68a647c7393e6bf477f0133dfed2e1ec5d6ad82f1438f72e94e382cee8e1710e9cf83786717cb1faee4f5ebd1f699f67587ff0063cde846965997d7c565788cc2788f06a2bfa7cff09828a0028a0028a00fd96ff837b7e36e95f003fe0b39fb0078e359d264d66cfc43f1a24f8250dac370d6b2dbeabfb49f82fc57fb3c683ab0956cef898f44d77e2869bac5d5b98116f6cec6e2c9ef34e5b93a8d9ffb3151fd7f5fd7f98ddacb5d7556d745a34efb6adbdb6e5d778b0a28105140051400514005140051400514005140051400514005140057f119ff0007bafc31f176affb277ec51f18ec750f0fc7e04f007ed09e3af86fe26d26e5750ff84aaf3c55f167e1cffc24be0bd4f4668e16d28787b4bd2be0df8ead3c4cb7b7116a0da96b3e116d321b8b64d5a4b51ebfd79a7fd77fc6351766ff00c335b5f7835f8df7e9beb63fcdea8a090a2800a2800a2800a50482083820e41e9823be79c73edf9d034da69a7669dd3dacd75beb6d7cbef3f7c7e077c61f0bfc54f03683a8d96af61ff090c1a65a5af88f4492ee24d4f4fd5ada08e1bc67b472b3bd9dccc8d736576b1b433c12a7ceb3a4f141e19fb677c65f0d689f0e354f879a4eb1657fe2bf163da595dd8d8dcc5752e91a2c37515e5f5cea1e4c8c2d5ef05b2585bdbcc566992e659d6331c0cd5fc0dc2fc0f9ad3f1670590d4c16214726e228e3b155254aaf067c55e27d4fc6fa65af88b40f11689e22f883f067528a3d4f44d4357b5aff004c9a3bff005fa2ebebeaf41bd2cb4bd95edadefef26f57ad9c7d2d66ae985140828a0028a0028a0028a0028a0028a0028a0028a0028a0028a002b23c41e1fd07c59a0eb7e16f15689a47897c31e25d2352f0ff0088fc39e20d36cf59d07c41a0eb367369dac689ade91a8c373a7eaba46aba7dcdc58ea5a6df5bcf677d677135b5d432c32ba3009b4d34ecd6a9ad1a7dd35aa3fc63bfe0b71ff04d2bbff82567edf7f10ff671d2b50d6fc41f07fc43a2685f17ff0067af16f8924f0e9d7fc45f087c6b26a3696f6dae5bf87750ba8a0d63c0de38d03c6ff0cafef751d3bc2d7de2b93c12be3cb5f08787bc3fe2cd0ac97f23e8febfaff86454adccda4926ee92d927ad95f5b2dbe5a851412145001450015ada1685ac789b57d3f40d034ebad5b59d56e52d34fd3ece3325c5ccf2721517a2aaa869259642b1430a3cd3c89146ce98e2711430987af8bc4d5851c36168d5c4622b547cb0a5428c1d4ab5672b3e5853a7194e4f95d926eccf4b26c9f34e22ce32ae1fc8f0388cd33acf332c0e4f9465b8487b4c56619a6678aa582cbf0386a6b5a988c5e2ebd1a1461a73d4a915d6e7db3a0fec07f132feca3b9d73c51e14f0fdcc8a1bfb395b50d5ee20ce3e4b99adad62b3122f39fb2dc5dc648e243d579ff1c7ec39f163c2ba65ceada2de687e3482d2279a7b0d1e5bcb5d68c51a9791edec2fad6286ecaa824416d792ddc846c82da7728b5f83e13e90fc2189ce29e5f3c166985c055c42c3c338aca82a315297243115f0aa4ebd1c337694a57a9569d3b4e5493e68c3fd65e22fd8d9f48bc8fc38c5f17e1b8af80b3ce2cc064f3cdf15e1d6595b3796655a54683c462328caf3aab808e59986730847d951a0d61b038bc527468661283a15eafc64cac8cc8eac8e8c559181565653865653cab0390410083d79a6d7efc9a6934ee9ea9ad534faa7d6ff00d6e7f91328ca129425171945b8ca324d4a324ece324f54d3d1a6934d6ba85140828a0028a0028a00ff005d7ff8356fe19f867e1f7fc1123f658d6b44f0f2687af7c59f11fc7bf899e3fbbdd7be7f89fc4cff001d7e20780747f10dd45772bc5039f86fe02f00e896cba7c56d653e9da258de7952dddcdd5e5d7f44342b74d9ebf7ebfd7fc3152bf334ef78fbbae8d72fbb66bbab2be8bcc28a090a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2803f133fe0b91ff00046ef017fc160ff66ad23c1d1f89a3f871fb497c117f15f89ff669f897a9cfa9cbe0fb0d7bc5367a347e2af87df12748d3e1bf9a7f879f1257c2de18b5d63c45a369779e31f02eafa0f87fc5da0daf88f4dd33c45f0efc77fe40bf183e0cfc5afd9f7e23789be10fc72f86de37f847f147c1b71676be29f007c45f0ceb3e10f16e8726a5a658eb9a53ea1a16bb6761a8416dac685a9e97af68d76d6c2d757d0f53d3758d3a5bad36fed6ea53f5d7f2f979ff009ef1bb5e17d3dcf75ea936a5cd24f977959a7cd2d547dc52247146acf248ec7015110166663d02a924f63c57f47ff00f047eff83703f6c1ff0082857c5bf07f88ff00681f86df157f65afd8d2cacf41f1b78cbe2cf8ebc23a9782bc5ff143c1fab416bab687e1afd9ef44f18e950cbe27d4bc7da5cf1cb63f13e4d1f53f86de0bf0fcb71e2abc97c59ac47e18f87de344df4eaffabecff15ae8b7712e31ba736bdc8eeef64de9ee2ef2775a28ca4a3efb5cb1728ffabf7c32f86fe09f837f0dbe1f7c21f867a05bf853e1c7c2af04784fe1bfc3ff000bda5c5f5dda786fc13e06d06c3c31e14d02d6eb53babed4ae6df47d0b4bb0d3a1b8d42f6eefa68ed964bbbab8b86799fb8a643776df7d74d17c92492ffc057a051400514005140051400514005140051400514005140051400514005140057927c67f801f023f68ef0ad9f817f686f827f093e3cf8234ed76d7c51a7f83be33fc37f077c50f0ad8f89ac6c353d2ecbc4567e1ef1be8daee916baed9e99ad6b1a75aeaf0d9c77f6f61ab6a76915c25bdf5ca4a05edb7f97e5fd33fcf3ffe0e66ff0083787c31fb2ee9be35ff0082907ec3da0e85e16fd9da5d5f4abafda3bf679d33ec1a1e9bf04b5ef17f8874df0de99f113e0be963ecb6aff093c51e2ad6f4ad2fc43f0b34a8cde7c28f10eaf6da9f81ac2ebe0fdfdee87f04ff00892a0a974977dfb732b73744bac65a5edcd6bbb20a282428a002b5743d7357f0d6afa7ebda0ea173a56b1a55cc779a7ea167218ae2dae23fbae8c010cac0b24b1ba3c5344ef14d1cb13b256388c3d0c5e1ebe13134a15f0d89a3570f88a3515e9d5a15a12a75694d6b7854a729464adaa6f7b9e964d9c667c3d9be559fe498ec46599ce479960738ca332c24fd962b2fccf2cc552c6e031d86a8aee9e23098ba347114676f72a538cb5b1f6c683fb7dfc4fd3ed23b6d73c35e12f104f18da6fc47a8e91733e07dfb88ed6e65b2f30b60936f696d1f6110e0d73be35fdb87e2ef8a34db8d2b478341f06417513c335f68705ecdac849015905bea17f73711da3321c2cf696705dc2dfbc86e62902327e1384fa3c70761b378661531b9ae2b014abac453ca2bd4a0e84b965cf1c3d7c44682af5f0c9f2a70fddd49c172d4ad2bca52ff00583887f6c8fd24b3cf0ef13c2385e1ae00c8b8ab1d9554cab17e22e5785ce219b52f6b43eaf5736cab28ab9854ca72dcea5172ad0c43a78ac0e1b132f6d85cba8fb3a30a5f1b3bbc8ed248ccf23b33bbbb1677763b99999b25999892cc79279392734dafded2492492492b24b4492d925d11fe47ca529ca539ca539ce4e539c9b94a5293bca5294aee5293776deadbbbbb770a299214500145007f593ff0669fc34f0678e7fe0acde33f1678a7418357d6be0cfec75f17be21fc36d426babfb793c2de38d63e207c1af84979aedac367736f6f7d35cfc38f89df107c32f6daac57d611dbf88a7bc8ed5754b5d36f6cbfd4be8febfafebcfb0df4db6ede7d7bbbf577d2dda3ca5140828a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a00f9dff6bcf835aa7ed1bfb277ed3ffb3d6897da4e99ad7c77fd9dfe35fc1ad2352d7cdc8d0b4fd53e287c36f137822c2fb5a36765a95d8d26d2ef5c86e35136ba75fdcfd8e398c365752ec81ffc24a48de291e2914abc6ed1ba9eaae8c5594fb86041a3afddfd7e5f77a15a722eea4eefa59a8f2fe2a5f86fbc594504851400514005140051400514005140051401fdc97fc1905f046cf5cfda2ff6ebfda424d767b7bff85ff057e167c11b3f0cad94725aeaf67f1e3c75ad78f353d767d44dcacb693f8767fd9cb49b0b4b24b3b88f518fc51793cb7368da5431deff00a3351fd7e5ff000fd7ff00916fa2ecbefbb6fb2efe7b6ef40a28105140051400514005140051400514005140051400514005140051400514005140057f887ffc1587f67eb4fd96ff00e0a57fb707c0ad23c1fa9780bc29e07fda4fe291f87be14d523d6d66d2be16789bc4d7be2ff8542d6e3c4735d6b7a9e9179f0eb5ff000c5fe85ae6a1797f36bda35cd86b5f6fbe4be4bb95755e8f5fbb4f9eff0022d7f0e7afdba6f97be93f7bd22ec9f4bc95eef95c7f3de8a64051400514005140051400514005140051401fe9f1ff0006607c048be1ff00fc1367e317c73d57c0d7ba078a3f684fda7fc4d1693e34be8753b71e3ff847f093c1be10f0af849b495b997fb32f743f0b7c53d4fe3b6911ea7a65aacb26befe22d2f50bbb97d1adedf4efec0285fe7f9ebf8ff5b0e5bef7d23b7f8569a76d9f9ad6ef50a28105140051400514005140051400514005140051400514005140051400514005140057f9ddff00c1ea9fb0addf877e267ece1ff0514f07e89a55bf863e2268f17ecc7f1aaef4cd33c3ba3dcafc4bf0bc3e24f1bfc21f136bf7106a51f88bc6bae78dfe1f278dfc2326b33e83716fe12f0efc13f08683a97887cad5fc27a45a9fd7f5f7dfcff18d4a25bb6f44b57a1fc347fc14bbfe0f31bdb5d7f57f865ff0004b6f86da3ea3e1eb7d37c5be1fd5bf697fda13c23aafdab50d6a6bcd5345d0fc5bf043e14c1e21d39acf48d3f4e834ff19f8735ef8dd6335f6af7faa43a1f8c7e0668b6de1fbc87c4ff00c4bfed41fb5ffed3bfb697c4ad43e2efed51f1c3e217c70f1f5fc97de46abe38d7ee2fec3c3da7dfeb1aa6befe1df04f86605b4f0b7803c1d69ab6b7ab5de91e0af0468ba0784b42fb7dcc3a368d616f218a95afabf92d74f3d95defafcbccae6514e30eaad395fe3d765eec6d0f87ddbbe692e697d88c3e6fa2990145001450014500145001450014a091d3f11d8fd4743dbebfaa834edfd7f97f5f9c5f946e1be43cf2bb8afb6576f193dc13eb838f97fd6c3fe0d3df08fc2ef0d7fc114fe00eadf0fedf4187c57e3cf88ff1fbc5bf1be4d1b5cfed8bebbf8a36bf173c4de09d2ae7c516a2fef17c3daf7fc298f077c21b787445b6d2bfe29bb7f0f6b1269ef3eaf2ea7a825a68ddfb3befe4d5b57f3f3d5ae6347cb28ca70567a2a9049b51575ef45f2be58ca5cba735e2fdd4e49dcfe9128a66414500145001450014500145001450014500145001450014500145001450015f9b7fb4f7fc160ffe0985fb1cb6af67fb427edb9f017c25e23f0f78a1bc19e22f87de1bf16ffc2d6f8b1e1cf11c51ea725cd8f88fe107c21b5f1e7c50d062b07d22f6d354d4757f0859697a56a62d34ad4afadb53d474db3bb3fafeac9fe5f7ef1a8c5caf65b6edbe58addeb27eeabd9daf7bf67a23f9dbfda93fe0f55fd8cfe1b7885b40fd94bf661f8c3fb50db69dad78934cd5bc67e38f15e95fb37f82755d3f4cbbb4b6f0ef88fc026efc29f167c7dade95e278bfb4b506b5f1d7c3df85faee89670e92b79a3cd7fa96a165a07f0fff00f0539ff82b17ed71ff000560f8c1a5fc52fda5bc45a469ba078434a8f44f863f053e1dc7aee8bf077e18d8c90dbaeb57fe1af0d6b5ae7882feefc59e30bd81353f1978d7c43abeb3e25d6a48f4dd0e2bed3fc17e17f06f857c36bf2fbfb6bb2d9fdfa3f21be58dd464e52d9c95d46d7926a3a73494972eaf974e68ca32ba947f33e8a6405140051400514005140051400514005140057df9ff0004f9ff008299fed7ff00f04caf8b969f15ff00659f89da8f87edaeb53d26f7e207c28d76ef57d53e0d7c60b0d212faded746f8a1e02b4d4f4db3d7e2b7b2d5f58b4d235db4b8d2bc61e15fed5bfbdf07f89740d4a737aa357feadf95ff002d7adca84b91dec9a69a945ed28bdd3d1faa7cb78c94671f7a3191fdaf7ecd1ff07b87c0cd7ee34cd1ff006bbfd8bfe24fc33487c29669aa78f3e0178fb40f8b767ac78ee16d1adefa587e1bf8e74df8517de10f066a4afafead063e237c41d7b40fb368fa03c5e2837b79e24d3bfa62fd96bfe0b41ff04b4fdb3f5987c33fb3c7edaff06bc51e2fbed6346f0fe8de06f17dfebbf06fc7fe27d6fc437535968fa5f837c05f1ab42f877e30f1ad001450014500145001450014500145007e2efedc7ff0007027fc12c3f604d63c53e06f8b3fb46d878fbe32f84488356f81df0134abaf8b5f106cf5683c532f8535bf0cebba8e8d25b7c31f01f8cbc2f7567aa6a5e23f067c4cf889e09f14e9fa5698f2a68f757ba9f87ecb59fe52ff6c5ff0083d7be33f8924d5fc37fb0afecb1e0cf85fa334be36d26d7e287ed13ab5f7c46f1bdee9578f1d9781bc59a27c3af065e7857c1de02f1669366b73adea9a2788bc4df1afc3126b17761a5b7f69e95a2de4fe2757bedb7777fc172ebeaf4d9ae6fb3af2c20af51de57d2926eff000a69ce4a368abb5ee24e6f967197b37c933f984fda9ffe0b07ff000533fdb3bfe12eb1fda0bf6cef8e1e27f0878e574c8bc4df0bbc3be2ebbf873f07353b5d18e9726956771f08be1d2f853e1dcd6f6775a2e97aa0171e1b9a5bad76d0788afa7bad7a6b8d465fcd9249249249249249c924f5249e4927a9efd4d0925f3ddddbbfdff959244ca6e5a68a2b5518dd416895d46cb56a315293bce5ca9ce52769094532028a0028a0028a0028a0028a0028a0028a0028a0028a00294120820e08e411c107d411c8a00fd1efd95ffe0af3ff00052efd8b4784ac3f676fdb3be39783fc1fe068b54b7f0bfc2cd6fc6177f113e0be9369ad49aacfab5a5a7c19f88c9e2bf8630457d7bae6abaabbc3e158ee20d76eff00e121b29edb5e82d752b7fe9f3f63aff83d7be377861f46f0cfedd3fb2c7827e2be8c93f82749bdf8a7fb3d6b17df0cfc7763a2d962c7c75e2dd73e1c78c2e3c5be0af885e33d5ed8c7af699a27873c4ff02fc269ac5b5de908ba5695abd9dd78615adf0ffe02dbb6d656f75f2ecb6baeaf57735e78cff8b7bbff009791d67acb99b9ae54aab6dbbca72552ed7bee31503fab3fd86bfe0e0dff0082577edf9acf853c09f0abf689b5f875f19fc61be1d23e067ed03a3dcfc25f1fddeab3f8ba1f07e83e17d0f58d524bcf853e3df1af8b6eef749d4fc31e06f865f12bc6fe2fd4747d5629a4d16defb4bf10e9fa2fed5509dfcbba7bafc12fbaebcd9138383dd493bf2ce2ef1924ed7578c5abefcb28a924d3718dd0514c90a2800a2800a2800a2800a2800a2803f2d7e377fc16e3fe0923fb3df8697c55f117fe0a11fb305ed8b6ab65a37f657c2af897a5fc7ef1a4777a859dddf5b5c4ff000f3e030f897e3eb7d1fecf6521b8f105c7869341b39a6b0b5bcd4adeeb53d361bafcd9f8e1ff0007737fc119fe135a68771e04f88df1cbf69a9f5697518f51d3be07fc09f15e8777e165b2fecefb34daecdfb46cbf0034db98b57fb6dc1d3c785efbc49345fd91a87f6b45a59934a1aa2bf6d7d3cedafa75eb7f5f86dc1c5da5683f7aea4e574e37f76514a528c9b56b4a3bb4e568fbd1fe79ff006f6ff83cff00f688f89da46b5e03ff00827dfc0fd33f664b2975bd620b4f8f3f15eefc39f173e2d5379a9da7857c05e1cb1d46c3c3ba76b36de12f85de04b0f0b7c35f07c7e2387c25e1bb8f157fc231e13d25bc57aa68f67adf890ea9ac235f316bef67e5adbe7a2bebafddd931f3f23bd3724ecd39ddc64efa3b597ba9ad1d9b6d5efeecad0f8968a6661450014500145001450014500145001450014500145001450014500145001450015f6afec85ff0519fdb87f60bf18c9e38fd92bf696f895f07b55bab4b6b0d5b47d3b52b3f12f807c4b67a7e9fe23d3746b7f187c2df1c58789fe19f8ce3f0e41e2ef12dc785078abc25ac1f09eabac5debbe1b3a5eb4c97f1164fe5b7f5fd5fa94a728a94536a3256946ef964b7f7959a76766af1ba92525aa8c8fe993fe09fff00f07937ed7df08f5ab3f0bffc1413c07a2fed69f0ef52d6e17d4be26780b47f077c20f8e7e0fd32faff00408350b9d3bc3fe15d0bc3df07be2158681a2d9ebd7ba2f832ef41f86bac6b9e20d5e24d5be2de9ba3d9dbdb41fd177c15ff0083c03fe08f1f1535ebdd1fc71acfed27fb37585ae977d7f6fe29f8d5f045b5bd0354bcb4bdd1ad6df43b287f678f157c7af1245aa6a90ea77ba958cfaa78774dd0e2b2f0eeb09a9eb1a76a13787acb5a5aaf3d77db47dfdd57fbbd6df14aa5ece56714a9be5f7a2e5371949595e0fd9b6b996ae33768b8c9fb4b4a118fe977c0cff82eaffc120bf68ab3d56f7e1cff00c1417f674d3974796d61b9b3f8c1e2e9ff00675d62e5af16f5e36d1b41fda134ef85dadf88618974fb86beb8d034ed4edf4d5368da8c968350d3cdc7eb1d3bafebfcbcdeddfcf464b84a2936b47a2927cd16d28b69497bada528f325ac6fef6b6e528a090a2800a2803e00f8ebff000558ff00826afecd2be3187e35fedd1fb2ef8335ef006a8da1f8bfc08bf193c17e25f8a7a26b50f8817c2f7ba3cff08fc21a9f883e274faa693ae79d69af69f67e12b9bbf0fc7a7ead7dadc56161a36a97561f867fb5a7fc1e25ff0004c2f82da4dfda7ecd1a47c5ff00db37c6d2787f4fd57c3e7c35e13d6be087c296d62e75bbcb0bff000bf8bfc71f19342d1be23787eff4dd1ec0ebada8f86be0878fb44bc1aae81a75b6a0d7336bd278655d74d7e6edd7af2bea9dedaaebd0be46b59fb9e4efcff65e94f57aa9271728c212d7ded1b87f3f9fb5bffc1e89fb737c58d2aefc3bfb24fc04f841fb22586a7e1ed36d2e7c63e22d52e3f692f8b5a2789ed3c4126a57fadf83b59f13785fc07f092cf48d57438ac7c392f87fc63f03fc75716c926b9ab59ebd0dfdf68e7c37fcdffed75ff0536fdbf7f6f0bebf9ff6b1fdac3e317c5ed1750d5f42f109f8797fe267f0cfc1ad3bc41e1bd064f0ce8daff87be077822dfc33f07fc31af5b68d717d6f3eb5e1df03e99aa6a371aaeb5a96a77579aa6bbabdeddbfebfafebf462e64be1d37bbbbe677566b48d92dfcf5b36f471f8568a090a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800a2800afbabf644ff829b7edf9fb075f58cffb26fed5df187e1068b63aceb9e233f0f34ff12b7897e0dea7e22f126811f86358f10788be07f8dadbc4df07fc51af5ce8b6f636d0eb5e23f046a9a9e9f71a4685a9e9d776baa683a2de581fd7f5fd6bd469b57b75566ba35e6b5bebaad347692bbb1fd13fecb1ff00079e7fc141be15dbf85740fda83e0cfc09fdabfc3da25a6b717887c51616da9fc02f8d1e35bbbe9356bbd1ae751f14f836dfc45f06f465d0ee6f74bb130f87ff0067ad3d752f0f68b1d9dd6df105fddf8aabfa1efd927fe0f0ff00f8260fc6bd0eda1fda674cf8b7fb17f8e6db43bad4b5d87c4de13f107c71f85d36aa9adad8d9f877c17e39f835e1cd6bc7fafdedce8f3dbeb73df78b3e0a7c3cd26d1adf56d345eddcb69a65c6b2b5f5edd3b6fa3bebafd9e9eb1b7ece4b4f724936d49b7093bc9da0d4138fbbc91519f35da94a55358423fb8df027fe0abbff0004d1fda593c192b3e928caa41a6b67782d55fdef7651ff001e5a2a8c028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a00ffd9, 'image/jpeg', 'Y'); + +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `Wecken` +-- + +CREATE TABLE IF NOT EXISTS `Wecken` ( + `ID` int(11) NOT NULL AUTO_INCREMENT, + `UID` int(11) NOT NULL DEFAULT '0', + `Date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Ort` text NOT NULL, + `Bemerkung` text NOT NULL, + PRIMARY KEY (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Daten für Tabelle `Wecken` +-- + -- cgit v1.2.3-54-g00ecf From de66e87c6f0c81d73a27d62a38c162a7aba905ad Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 17:09:19 +0200 Subject: fix register --- includes/pages/guest_login.php | 2 +- includes/sys_menu.php | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 7fe081fc..bbf36b6d 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -170,7 +170,7 @@ function guest_register() { $html .= "" . Get_Text("makeuser_Engelart") . "\n"; $html .= " + -- cgit v1.2.3-54-g00ecf From fac68e78579f8737c418539621b63220bc5d5c23 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 17:17:30 +0200 Subject: rooms done --- www-ssl/admin/room.php | 180 ------------------------------------------------- 1 file changed, 180 deletions(-) delete mode 100644 www-ssl/admin/room.php diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php deleted file mode 100644 index e3defb23..00000000 --- a/www-ssl/admin/room.php +++ /dev/null @@ -1,180 +0,0 @@ -\nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen " . - "oder vorhandene abzuändern:

        \n"; - - echo "- Neuen Raum/Ort eintragen
        \n"; - - echo "\n"; - echo "\n"; - - for ($i = 1; $i < mysql_num_fields($Erg); $i++) { - if (substr(mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_") - echo "\t"; - else - echo "\t"; - } - echo "\t"; - echo ""; - - for ($t = 0; $t < mysql_num_rows($Erg); $t++) { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
        Anzahl " . $EngelTypeID[substr(mysql_field_name($Erg, $i), 12)] . "" . mysql_field_name($Erg, $i) . "Ändern
        " . mysql_result($Erg, $t, $j) . "###
        "; -} else { - - UnSet ($SQL); - - switch ($_GET["action"]) { - - case 'new' : - echo "Neuen Raum einrichten:
        "; - echo "
        \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++) { - if ((mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf")) { - echo "" . - "\n"; - } else { - //sonderfall fuer Default Engel - if (substr(mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_") - $FeldName = "Anzahl " . $EngelTypeID[substr(mysql_field_name($Erg, $Uj), 12)]; - else - $FeldName = mysql_field_name($Erg, $Uj); - - echo "" . - "\n"; - } - } - echo "
        " . mysql_field_name($Erg, $Uj) . "" . - "Yes" . - "No" . - "
        $FeldName"; - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - break; - - case 'newsave' : - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys = ""; - $Values = ""; - foreach ($vars as $key => $value) { - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - $SQL = "INSERT INTO `Room` (" . substr($Keys, 2) . ") VALUES (" . substr($Values, 2) . ")"; - SetHeaderGo2Back(); - break; - - case 'change' : - if (!IsSet ($_GET["RID"])) - echo "Fehlerhafter Aufruf!"; - else { - $SQL2 = "SELECT * FROM `Room` WHERE `RID`='" . $_GET["RID"] . "'"; - $ERG = mysql_query($SQL2, $con); - - if (mysql_num_rows($ERG) > 0) { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, welche und wieviele Engel für den Raum zur Verf?gung stehen müssen."; - echo "
        \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) { - if ((mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf")) { - echo "" . - "\n"; - } else { - if (substr(mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_") - //sonderfall fuer Default Engel - $FeldName = "Anzahl " . $EngelTypeID[substr(mysql_field_name($ERG, $Uj), 12)]; - else - $FeldName = mysql_field_name($ERG, $Uj); - echo "" . - "\n"; - } - } - echo "
        " . mysql_field_name($Erg, $Uj) . "" . - "Yes" . - "No" . - "
        $FeldName" . - "
        \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
        "; - echo "
        \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
        "; - } else - echo "FEHLER: Room ID " . $_GET["RID"] . " nicht gefunden"; - } - break; - - case 'changesave' : - $sql = ""; - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - foreach ($vars as $key => $value) { - $keys = substr($key, 1); - $sql .= ", `" . $keys . "`='" . $value . "' "; - } - $SQL = "UPDATE `Room` SET " . substr($sql, 2) . " WHERE `RID`='" . $_GET["eRID"] . "'"; - SetHeaderGo2Back(); - break; - - case 'delete' : - if (IsSet ($_GET["RID"])) { - $SQL = "DELETE FROM `Room` WHERE `RID`='" . $_GET["RID"] . "'"; - } else { - echo "Fehlerhafter Aufruf"; - } - SetHeaderGo2Back(); - break; - - } //switch - - // Update ??? - - if (IsSet ($SQL)) { - // echo $SQL; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, "exec SQL"); - if ($Erg == 1) - echo "Änderung wurde gesichert...
        "; - else { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

        " . mysql_error($con) . "
        ($SQL)
        "; - } - } // Ende Update - -} //IF IsSet($action) - -include ("includes/footer.php"); -?> -- cgit v1.2.3-54-g00ecf From bf33764fec621b3f8e35be36297e584b9cca1f27 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Thu, 2 Jun 2011 17:29:24 +0200 Subject: utf8t the db --- DB/db_rewrite.sql | 134 +++++++++++++++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 09427ff2..888bddbf 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `ChangeLog` ( `UID` int(11) NOT NULL DEFAULT '0', `Commend` text NOT NULL, `SQLCommad` text NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Daten für Tabelle `ChangeLog` @@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `Counter` ( `URL` varchar(255) NOT NULL DEFAULT '', `Anz` bigint(20) NOT NULL DEFAULT '0', PRIMARY KEY (`URL`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Counter der Seiten'; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Counter der Seiten'; -- -- Daten für Tabelle `Counter` @@ -171,7 +171,7 @@ CREATE TABLE IF NOT EXISTS `Messages` ( `isRead` char(1) NOT NULL DEFAULT 'N', `Text` text NOT NULL, PRIMARY KEY (`Datum`,`SUID`,`RUID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Fuers interen Communikationssystem'; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fuers interen Communikationssystem'; -- -- Daten für Tabelle `Messages` @@ -192,7 +192,7 @@ CREATE TABLE IF NOT EXISTS `News` ( `UID` int(11) NOT NULL DEFAULT '0', `Treffen` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=9 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; -- -- Daten für Tabelle `News` @@ -220,7 +220,7 @@ CREATE TABLE IF NOT EXISTS `news_comments` ( `UID` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`), KEY `Refid` (`Refid`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `news_comments` @@ -266,7 +266,7 @@ CREATE TABLE IF NOT EXISTS `Questions` ( `AID` int(11) NOT NULL DEFAULT '0', `Answer` text NOT NULL, PRIMARY KEY (`QID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; -- -- Daten für Tabelle `Questions` @@ -287,7 +287,7 @@ CREATE TABLE IF NOT EXISTS `Room` ( `show` char(1) NOT NULL DEFAULT 'Y', `Number` int(11) DEFAULT NULL, PRIMARY KEY (`RID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; -- -- Daten für Tabelle `Room` @@ -307,7 +307,7 @@ CREATE TABLE IF NOT EXISTS `RoomAngelTypes` ( `count` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `room_id` (`room_id`,`angel_type_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; -- -- Daten für Tabelle `RoomAngelTypes` @@ -328,7 +328,7 @@ CREATE TABLE IF NOT EXISTS `ShiftEntry` ( `TID` int(11) NOT NULL DEFAULT '0', `UID` int(11) NOT NULL DEFAULT '0', `Comment` text -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Daten für Tabelle `ShiftEntry` @@ -348,7 +348,7 @@ CREATE TABLE IF NOT EXISTS `ShiftFreeloader` ( `Length` int(11) NOT NULL, `Comment` text NOT NULL, PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `ShiftFreeloader` @@ -371,7 +371,7 @@ CREATE TABLE IF NOT EXISTS `Shifts` ( `URL` text, `PSID` text, PRIMARY KEY (`SID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `Shifts` @@ -1013,7 +1013,7 @@ CREATE TABLE IF NOT EXISTS `User` ( `Hometown` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '', PRIMARY KEY (`UID`,`Nick`), UNIQUE KEY `Nick` (`Nick`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=148 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=148 ; -- -- Daten für Tabelle `User` @@ -1032,58 +1032,58 @@ INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT` CREATE TABLE IF NOT EXISTS `UserCVS` ( `UID` int(11) NOT NULL DEFAULT '0', `GroupID` int(11) DEFAULT '-2', - `index.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `logout.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `faq.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `lageplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `makeuser.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/index.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/news.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/newsAddMeting` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/news_comments.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/myschichtplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/myschichtplan_ical.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/schichtplan_beamer.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/engelbesprechung.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/schichtplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/schichtplan_add.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/wecken.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/waeckliste.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/messages.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/faq.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `nonpublic/einstellungen.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `Change T_Shirt Size` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/index.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/room.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/EngelType.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/schichtplan.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/shiftadd.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/schichtplan_druck.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/user.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/userChangeNormal.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/userSaveNormal.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/userChangeSecure.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/userSaveSecure.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/group.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/userDefaultSetting.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/UserPicture.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/userArrived.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/aktiv.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/tshirt.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/news.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/faq.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/free.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/sprache.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/dect.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/dect_call.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/dbUpdateFromXLS.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/Recentchanges.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `admin/debug.php` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `Herald` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `Info` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `Conference` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `Kasse` char(1) CHARACTER SET latin1 NOT NULL DEFAULT 'G', - `credits.php` char(1) CHARACTER SET latin1 NOT NULL, + `index.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `logout.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `faq.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `lageplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `makeuser.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/index.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/news.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/newsAddMeting` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/news_comments.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/myschichtplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/myschichtplan_ical.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/schichtplan_beamer.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/engelbesprechung.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/schichtplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/schichtplan_add.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/wecken.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/waeckliste.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/messages.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/faq.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `nonpublic/einstellungen.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `Change T_Shirt Size` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/index.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/room.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/EngelType.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/schichtplan.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/shiftadd.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/schichtplan_druck.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/user.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/userChangeNormal.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/userSaveNormal.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/userChangeSecure.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/userSaveSecure.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/group.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/userDefaultSetting.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/UserPicture.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/userArrived.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/aktiv.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/tshirt.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/news.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/faq.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/free.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/sprache.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/dect.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/dect_call.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/dbUpdateFromXLS.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/Recentchanges.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `admin/debug.php` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `Herald` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `Info` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `Conference` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `Kasse` char(1) CHARACTER SET utf8 NOT NULL DEFAULT 'G', + `credits.php` char(1) CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`UID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -1111,7 +1111,7 @@ CREATE TABLE IF NOT EXISTS `UserGroups` ( `group_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `uid` (`uid`,`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; -- -- Daten für Tabelle `UserGroups` @@ -1136,7 +1136,7 @@ CREATE TABLE IF NOT EXISTS `UserPicture` ( `ContentType` varchar(20) NOT NULL DEFAULT '', `show` char(1) NOT NULL DEFAULT 'N', PRIMARY KEY (`UID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -- Daten für Tabelle `UserPicture` @@ -1158,7 +1158,7 @@ CREATE TABLE IF NOT EXISTS `Wecken` ( `Ort` text NOT NULL, `Bemerkung` text NOT NULL, PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Daten für Tabelle `Wecken` -- cgit v1.2.3-54-g00ecf From 8297d3ba41a4728a84aab5996fa6efe70b67093d Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 17:30:17 +0200 Subject: begin angel types --- includes/pages/admin_angel_types.php | 138 +++++++++++++++++++++++++++++++++++ includes/sys_menu.php | 1 + templates/admin_angel_types.html | 41 +++++++++++ www-ssl/index.php | 4 + 4 files changed, 184 insertions(+) create mode 100644 includes/pages/admin_angel_types.php create mode 100644 templates/admin_angel_types.html diff --git a/includes/pages/admin_angel_types.php b/includes/pages/admin_angel_types.php new file mode 100644 index 00000000..e5952d10 --- /dev/null +++ b/includes/pages/admin_angel_types.php @@ -0,0 +1,138 @@ +\nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen " . + "oder vorhandene abzuändern:

        \n"; + + echo "- Neuen EngelType eintragen
        \n"; + + echo "\n"; + echo "\n"; + + for ($i = 1; $i < mysql_num_fields($Erg); $i++) { + echo "\t"; + } + echo "\t"; + echo ""; + + for ($t = 0; $t < mysql_num_rows($Erg); $t++) { + echo "\t\n"; + for ($j = 1; $j < mysql_num_fields($Erg); $j++) { + echo "\t\t\n"; + } + echo "\t\t\n"; + echo "\t\n"; + } // ende Auflistung Raeume + echo "
        " . mysql_field_name($Erg, $i) . "Ändern
        " . mysql_result($Erg, $t, $j) . "###
        "; + } else { + + switch ($_GET["action"]) { + + case 'new' : + echo "Neuen EngelType einrichten:
        "; + echo "
        \n"; + echo "\n"; + + for ($Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++) { + echo "" . + "\n"; + } + echo "
        " . mysql_field_name($Erg, $Uj) . "
        \n"; + echo "\n"; + echo "\n"; + echo "
        "; + break; + + case 'newsave' : + $vars = $_GET; + $count = count($vars) - 1; + $vars = array_splice($vars, 0, $count); + $Keys = ""; + $Values = ""; + foreach ($vars as $key => $value) { + $Keys .= ", `$key`"; + $Values .= ", '$value'"; + } + + if (runSQL_log("INSERT INTO `EngelType` (" . substr($Keys, 2) . ") VALUES (" . substr($Values, 2) . ")", "save new EngelType")) { + SetHeaderGo2Back(); + + $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='" . $_GET["Name"] . "'"; + $ERG = mysql_query($SQL2, $con); + + if (mysql_num_rows($ERG) == 1) + runSQL_log("ALTER TABLE `Room` ADD `DEFAULT_EID_" . mysql_result($ERG, 0, 0) . + "` INT DEFAULT '0' NOT NULL;", "add new EngelType in Romm Table"); + } + break; + + case 'change' : + if (!IsSet ($_GET["TID"])) + echo "Fehlerhafter Aufruf!"; + else { + echo "Raum abändern:\n"; + echo "Hier kannst du eintragen, den EngelType ändern."; + echo "
        \n"; + echo "\n"; + + $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'"; + $ERG = mysql_query($SQL2, $con); + + for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) + echo "" . + "\n"; + + echo "
        " . mysql_field_name($ERG, $Uj) . "
        \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
        "; + echo "
        \n"; + echo "\n"; + echo "\n"; + echo ""; + echo "
        "; + } + break; + + case 'changesave' : + $vars = $_GET; + $count = count($vars) - 2; + $vars = array_splice($vars, 0, $count); + $keys = ""; + $sql = ""; + foreach ($vars as $key => $value) { + $keys = substr($key, 1); + $sql .= ", `" . $keys . "`='" . $value . "'"; + } + runSQL_log("UPDATE `EngelType` SET " . substr($sql, 2) . " WHERE `TID`='" . $_GET["eTID"] . "'", "Save Change EngelType"); + SetHeaderGo2Back(); + break; + + case 'delete' : + if (IsSet ($_GET["TID"])) { + if (runSQL_log("DELETE FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'", "delete EngelType")) + runSQL_log("ALTER TABLE `Room` DROP `DEFAULT_EID_" . $_GET["TID"] . "`;", "delete EngelType in Room Table"); + } else + echo "Fehlerhafter Aufruf"; + SetHeaderGo2Back(); + break; + } + } + + include ("includes/footer.php"); +} +?> diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 924d8e64..3b8847de 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -26,6 +26,7 @@ function make_navigation() { // Admin Navigation $menu .= make_navigation_for(Get_Text('admin/'), array ( + "admin_angel_types", "admin_rooms" )); return $menu; diff --git a/templates/admin_angel_types.html b/templates/admin_angel_types.html new file mode 100644 index 00000000..4ad8e9f1 --- /dev/null +++ b/templates/admin_angel_types.html @@ -0,0 +1,41 @@ +Angel types: + + + + + + + + + + %table% + +
        + Name + + Man + + Action +
        +
        +

        Create new Angel type:

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

        " . mysql_error($con) . "
        "; - echo "[$SQL]
        "; - return 0; - } -} - -function runSQL_log($SQL, $commed) { - global $con; - // hier muesste das SQL ausgefuehrt werden... - $Erg = db_query($SQL, $commed); - if ($Erg) { - echo "Änderung wurde gesichert...
        "; - echo "[$SQL]
        "; - return 1; - } else { - echo "Fehler beim speichern... bitte noch ein mal probieren :)"; - echo "

        " . mysql_error($con) . "
        "; - echo "[$SQL]
        "; - return 0; - } -} - -$Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`"; -$Erg = mysql_query($Sql, $con); - -if (!IsSet ($_GET["action"])) { - echo "Hallo " . $_SESSION['Nick'] . - ",
        \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen " . - "oder vorhandene abzuändern:

        \n"; - - echo "- Neuen EngelType eintragen
        \n"; - - echo "\n"; - echo "\n"; - - for ($i = 1; $i < mysql_num_fields($Erg); $i++) { - echo "\t"; - } - echo "\t"; - echo ""; - - for ($t = 0; $t < mysql_num_rows($Erg); $t++) { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
        " . mysql_field_name($Erg, $i) . "Ändern
        " . mysql_result($Erg, $t, $j) . "###
        "; -} else { - - switch ($_GET["action"]) { - - case 'new' : - echo "Neuen EngelType einrichten:
        "; - echo "
        \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++) { - echo "" . - "\n"; - } - echo "
        " . mysql_field_name($Erg, $Uj) . "
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - break; - - case 'newsave' : - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys = ""; - $Values = ""; - foreach ($vars as $key => $value) { - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - - if (runSQL_log("INSERT INTO `EngelType` (" . substr($Keys, 2) . ") VALUES (" . substr($Values, 2) . ")", "save new EngelType")) { - SetHeaderGo2Back(); - - $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='" . $_GET["Name"] . "'"; - $ERG = mysql_query($SQL2, $con); - - if (mysql_num_rows($ERG) == 1) - runSQL_log("ALTER TABLE `Room` ADD `DEFAULT_EID_" . mysql_result($ERG, 0, 0) . - "` INT DEFAULT '0' NOT NULL;", "add new EngelType in Romm Table"); - } - break; - - case 'change' : - if (!IsSet ($_GET["TID"])) - echo "Fehlerhafter Aufruf!"; - else { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, den EngelType ändern."; - echo "
        \n"; - echo "\n"; - - $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'"; - $ERG = mysql_query($SQL2, $con); - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - echo "" . - "\n"; - - echo "
        " . mysql_field_name($ERG, $Uj) . "
        \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
        "; - echo "
        \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
        "; - } - break; - - case 'changesave' : - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - $keys = ""; - $sql = ""; - foreach ($vars as $key => $value) { - $keys = substr($key, 1); - $sql .= ", `" . $keys . "`='" . $value . "'"; - } - runSQL_log("UPDATE `EngelType` SET " . substr($sql, 2) . " WHERE `TID`='" . $_GET["eTID"] . "'", "Save Change EngelType"); - SetHeaderGo2Back(); - break; - - case 'delete' : - if (IsSet ($_GET["TID"])) { - if (runSQL_log("DELETE FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'", "delete EngelType")) - runSQL_log("ALTER TABLE `Room` DROP `DEFAULT_EID_" . $_GET["TID"] . "`;", "delete EngelType in Room Table"); - } else - echo "Fehlerhafter Aufruf"; - SetHeaderGo2Back(); - break; - } -} - -include ("includes/footer.php"); -?> -- cgit v1.2.3-54-g00ecf From 72d8f6bb134355ccdbaeae71be444b649bfaf193 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 18:06:28 +0200 Subject: fix news --- includes/pages/user_news.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 4295edb8..56c5bb68 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -5,6 +5,8 @@ function user_news() { function user_news_output() { global $DISPLAY_NEWS, $privileges; + + $html = ""; if (isset ($_POST["text"]) && isset ($_POST["betreff"]) && IsSet ($_POST["date"])) { if (!isset ($_POST["treffen"])) -- cgit v1.2.3-54-g00ecf From d381f57951463a366b5264986a147ef5798ba205 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 20:18:01 +0200 Subject: user settings --- DB/db_rewrite.sql | 40 +++--- includes/pages/user_settings.php | 252 ++++++++++++++++++++++++++++++++++++ includes/sys_menu.php | 3 +- includes/sys_template.php | 11 ++ templates/user_settings.html | 106 +++++++++++++++ templates/user_settings_tshirt.html | 4 + txt/TODO | 5 + www-ssl/css/base.css | 4 - www-ssl/css/style10.css | 4 + www-ssl/index.php | 4 + www/404.php | 3 - www/index.php | 3 - 12 files changed, 410 insertions(+), 29 deletions(-) create mode 100644 includes/pages/user_settings.php create mode 100644 templates/user_settings.html create mode 100644 templates/user_settings_tshirt.html delete mode 100644 www/404.php delete mode 100644 www/index.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 64fe75e8..71b968e7 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 15:48 +-- Erstellungszeit: 02. Juni 2011 um 18:17 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `AngelTypes` ( `Man` text, PRIMARY KEY (`TID`), UNIQUE KEY `Name` (`Name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; -- -- Daten für Tabelle `AngelTypes` @@ -33,7 +33,8 @@ CREATE TABLE IF NOT EXISTS `AngelTypes` ( INSERT INTO `AngelTypes` (`TID`, `Name`, `Man`) VALUES (1, 'Sex', ''), -(4, 'Audio', ''); +(4, 'Audio', ''), +(5, 'Massage', ''); -- -------------------------------------------------------- @@ -70,15 +71,16 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 39), -('login', 5), -('logout', 2), -('start', 8), +('news', 44), +('login', 12), +('logout', 5), +('start', 13), ('faq', 4), -('credits', 2), -('register', 1), -('admin_rooms', 64), -('admin_angel_types', 58); +('credits', 3), +('register', 3), +('admin_rooms', 70), +('admin_angel_types', 68), +('user_settings', 109); -- -------------------------------------------------------- @@ -122,7 +124,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -135,7 +137,8 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (4, -2, 4), (5, -1, 5), (6, -4, 6), -(7, -4, 7); +(7, -4, 7), +(8, -2, 8); -- -------------------------------------------------------- @@ -241,7 +244,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; -- -- Daten für Tabelle `Privileges` @@ -254,7 +257,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (4, 'logout', 'User darf sich ausloggen'), (5, 'register', 'Einen neuen Engel registerieren'), (6, 'admin_rooms', 'Räume administrieren'), -(7, 'admin_angel_types', 'Engel Typen administrieren'); +(7, 'admin_angel_types', 'Engel Typen administrieren'), +(8, 'user_settings', 'User profile settings'); -- -------------------------------------------------------- @@ -606,7 +610,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pub_menu_Wecken', 'DE', 'Wecken'), ('pub_menu_mySchichtplan', 'DE', 'Mein Schichtplan'), ('pub_menu_questionEngel', 'DE', 'Anfragen an die Dispatcher'), -('pub_menu_Einstellungen', 'DE', 'Einstellungen'), +('user_settings', 'DE', 'Einstellungen'), ('pub_menu_Engelbesprechung', 'EN', 'Drone meeting'), ('logout', 'DE', 'Abmelden'), ('pub_menu_Schichtplan', 'EN', 'Available Shifts'), @@ -615,7 +619,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pub_menu_mySchichtplan', 'EN', 'My Shifts'), ('pub_menu_questionEngel', 'EN', 'Questions for the Dispatcher'), ('logout', 'EN', 'Logout'), -('pub_menu_Einstellungen', 'EN', 'Options'), +('user_settings', 'EN', 'Settings'), ('menu_Name', 'DE', 'Garage'), ('menu_Name', 'EN', 'Garage'), ('menu_MakeUser', 'DE', 'Benutzer anlegen'), @@ -1022,7 +1026,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', NULL, NULL, '', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307029663, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307038600, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1306971362, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php new file mode 100644 index 00000000..97c8626f --- /dev/null +++ b/includes/pages/user_settings.php @@ -0,0 +1,252 @@ + Get_Text("makeuser_T-Shirt"), + 'size_select' => ($user['Tshirt'] == 0) ? html_select_key('size', array ( + 'S' => "S", + 'M' => "M", + 'L' => "L", + 'XL' => "XL", + '2XL' => "2XL", + '3XL' => "3XL", + '4XL' => "4XL", + '5XL' => "5XL", + 'S-G' => "S Girl", + 'M-G' => "M Girl", + 'L-G' => "L Girl", + 'XL-G' => "XL Girl" + ), $user['Size']) : $user['Size'] + )); + + return template_render('../templates/user_settings.html', array ( + 'link' => page_link_to("user_settings"), + 'greeting' => Get_Text("Hallo") . $user['Nick'] . ",
        " . Get_Text(13), + 'text_user_data' => Get_Text("pub_einstellungen_Text_UserData"), + 'label_nick' => Get_Text("pub_einstellungen_Nick"), + 'label_name' => Get_Text("pub_einstellungen_Name"), + 'label_prename' => Get_Text("pub_einstellungen_Vorname"), + 'label_age' => Get_Text("pub_einstellungen_Alter"), + 'label_tel' => Get_Text("pub_einstellungen_Telefon"), + 'label_mobile' => Get_Text("pub_einstellungen_Handy"), + 'label_dect' => Get_Text("pub_einstellungen_DECT"), + 'label_mail' => Get_Text("pub_einstellungen_Email"), + 'label_hometown' => Get_Text("pub_einstellungen_Hometown"), + 'nick' => $user['Nick'], + 'name' => $user['Name'], + 'prename' => $user['Vorname'], + 'age' => $user['Alter'], + 'tel' => $user['Telefon'], + 'mobile' => $user['Handy'], + 'dect' => $user['DECT'], + 'mail' => $user['email'], + 'icq' => $user['ICQ'], + 'jabber' => $user['jabber'], + 'hometown' => $user['Hometown'], + 'label_save' => Get_Text("save"), + 'tshirts' => $tshirt_html, + 'text_password' => Get_Text(14), + 'current_pw_label' => Get_Text(15), + 'new_pw_label' => Get_Text(16), + 'new_pw2_label' => Get_Text(17), + 'text_theme' => Get_Text(18), + 'theme_label' => Get_Text(19), + 'theme_select' => html_select_key('theme', array ( + "1" => "Standard-Style", + "2" => "ot/Gelber Style", + "3" => "Club-Mate Style", + "5" => "Debian Style", + "6" => "c-base Style", + "7" => "Blau/Gelber Style", + "8" => "Pastel Style", + "4" => "Test Style", + "9" => "Test Style 21c3", + "10" => "msquare (cccamp2011)" + ), $user['color']), + 'text_language' => Get_Text(20), + 'language_label' => Get_Text(21), + 'language_select' => html_select_key('language', array ( + 'DE' => "Deutsch", + 'EN' => "English" + ), $user['Sprache']) + )); + } else { + switch ($_REQUEST['action']) { + case 'sprache' : + if (isset ($_REQUEST['language']) && preg_match("/^DE|EN$/", $_REQUEST['language'])) + $language = $_REQUEST['language']; + else + $language = "EN"; + sql_query("UPDATE `User` SET " . "`Sprache`='" . sql_escape($language) . "' WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1"); + $_SESSION['Sprache'] = $language; + header("Location: " . page_link_to("user_settings")); + break; + + case 'colour' : + $theme = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['theme'])); + sql_query("UPDATE `User` SET " . "`color`='" . sql_escape($theme) . "' WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1"); + header("Location: " . page_link_to("user_settings")); + break; + + case 'set' : + $html = ""; + if ($_REQUEST["new_pw"] == $_REQUEST["new_pw2"]) { + if (PassCrypt($_REQUEST["current_pw"]) == $user['Passwort']) { + sql_query("UPDATE `User` SET `Passwort`='" . sql_escape(PassCrypt($_REQUEST['new_pw'])) . "' WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1"); + header("Location: " . page_link_to("user_settings")); + } else { + $html .= error(Get_Text(30)); + } + } else { + $html .= error(Get_Text(31)); + } + return $html; + break; + + case "setUserData" : + $nick = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['nick'])); + $name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['name'])); + $prename = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['prename'])); + $age = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['age'])); + $tel = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['tel'])); + $mobile = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['mobile'])); + $dect = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['dect'])); + $mail = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['mail'])); + $icq = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['icq'])); + $jabber = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['jabber'])); + $hometown = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['hometown'])); + $size = ($user['TShirt'] == 0) ? preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['size'])) : $user['Size']; + + sql_query("UPDATE `User` SET " . + "`Nick`='" . sql_escape($nick) . "', " . + "`Name`='" . sql_escape($name) . "', " . + "`Vorname`='" . sql_escape($prename) . "', " . + "`Alter`='" . sql_escape($age) . "', " . + "`Telefon`='" . sql_escape($tel) . "', " . + "`Handy`='" . sql_escape($mobile) . "', " . + "`DECT`='" . sql_escape($dect) . "', " . + "`email`='" . sql_escape($mail) . "', " . + "`ICQ`='" . sql_escape($icq) . "', " . + "`jabber`='" . sql_escape($jabber) . "', " . + "`Hometown`='" . sql_escape($hometown) . "', " . + "`Size`='" . sql_escape($size) . "' " . + "WHERE `UID`=" . sql_escape($user['UID']) . " LIMIT 1"); + header("Location: " . page_link_to("user_settings")); + break; + } + } + + // AVATARE + /* + if (get_cfg_var("file_uploads")) { + echo "
        \n
        \n
        \n\n"; + echo Get_Text('pub_einstellungen_PictureUpload') . "
        "; + echo "
        \n"; + echo "\n"; + echo "\n"; + echo "(max " . get_cfg_var("post_max_size") . "Byte)
        \n"; + echo "\n"; + echo "
        \n"; + } + + switch (GetPicturShow($_SESSION['UID'])) { + case 'Y' : + echo Get_Text('pub_einstellungen_PictureShow') . "
        "; + echo displayPictur($_SESSION['UID'], 0); + echo "
        \n"; + echo "\n"; + echo "\n"; + echo "
        \n"; + break; + case 'N' : + echo Get_Text('pub_einstellungen_PictureNoShow') . "
        "; + echo displayPictur($_SESSION['UID'], 0); + echo "
        \n"; + echo "\n"; + echo "\n"; + echo "
        \n"; + echo "
        \n
        \n
        \n\n"; + case '' : + echo "
        \n
        \n
        \n\n"; + echo Get_Text(22) . "
        "; + echo "\n
        \n"; + echo "\n"; + echo "\n"; + echo "\n\n\n"; + echo "\n"; + echo "\n\n"; + echo "
        " . Get_Text(23) . "
        \n"; + echo "  \n"; + echo "\n"; + echo "
        \n"; + echo "\n"; + echo "
        \n"; + break; + } //CASE + + } else { + switch ($_POST["action"]) { + + case 'avatar' : + $chsql = "UPDATE `User` SET `Avatar`='" . $_POST["eAvatar"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + $_SESSION['Avatar'] = $_POST["eAvatar"]; + if ($Erg == 1) + Print_Text(34); + else + Print_Text(29); + break; + + case 'setUserData' : + + break; + + case 'sendPicture' : + if ($_FILES["file"]["size"] > 0) { + if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) { + $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); + + if (GetPicturShow($_SESSION['UID']) == "") + $SQL = "INSERT INTO `UserPicture` " . + "( `UID`,`Bild`, `ContentType`, `show`) " . + "VALUES ('" . $_SESSION['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')"; + else + $SQL = "UPDATE `UserPicture` SET " . + "`Bild`='$data', " . + "`ContentType`='" . $_FILES["file"]["type"] . "', " . + "`show`='N' " . + "WHERE `UID`='" . $_SESSION['UID'] . "'"; + + $res = mysql_query($SQL, $con); + if ($res) + Print_Text("pub_einstellungen_send_OK"); + else + Print_Text("pub_einstellungen_send_KO"); + + echo "
        ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"] . ", " . $_FILES["file"]["size"] . " Byte)
        "; + } else + Print_Text("pub_einstellungen_send_KO"); + } else + Print_Text("pub_einstellungen_send_KO"); + break; + + case 'delPicture' : + $chsql = "DELETE FROM `UserPicture` WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; + $Erg = mysql_query($chsql, $con); + if ($Erg == 1) + Print_Text("pub_einstellungen_del_OK"); + else + Print_Text("pub_einstellungen_del_KO"); + Break; + } + } + */ +} +?> diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 3b8847de..da9d5666 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -21,7 +21,8 @@ function make_navigation() { // Engel Navigation $menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array ( - "news" + "news", + "user_settings" )); // Admin Navigation diff --git a/includes/sys_template.php b/includes/sys_template.php index 2c7f4f22..893d2d7e 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -22,4 +22,15 @@ function html_options($name, $options, $selected = "") { return $html; } + +function html_select_key($name, $rows, $selected) { + $html = ''; + return $html; +} ?> \ No newline at end of file diff --git a/templates/user_settings.html b/templates/user_settings.html new file mode 100644 index 00000000..08790d33 --- /dev/null +++ b/templates/user_settings.html @@ -0,0 +1,106 @@ +%greeting% + +
        +%text_user_data% +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +%tshirts% +
        %label_nick%
        %label_name%
        %label_prename%
        %label_age%
        %label_tel%
        %label_mobile%
        %label_dect%
        %label_mail%
        ICQ
        jabber
        %label_hometown%
        + +
        + +
        + +%text_password% +
        + + + + +
        %current_pw_label%
        %new_pw_label%
        %new_pw2_label%
        + +
        + +
        + +%text_theme% +
        + + + + + +
        %theme_label% + %theme_select% +
        + +
        + +
        + +%text_language% +
        + + + + + +
        %language_label% + %language_select% +
        + +
        diff --git a/templates/user_settings_tshirt.html b/templates/user_settings_tshirt.html new file mode 100644 index 00000000..e147acae --- /dev/null +++ b/templates/user_settings_tshirt.html @@ -0,0 +1,4 @@ + + %label_size% + %size_select% + \ No newline at end of file diff --git a/txt/TODO b/txt/TODO index 21ea5ecc..c6d32b39 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,3 +1,8 @@ + * MD5-Passwörter mit Salt speichern + * Passwort-Mindestanforderungen stellen + * Avatare + + * schichten ueber monatsgrenzen einbaue im moment werden die tage nur hochgezaehlt und die monatzgrenzen werden ignoriert * verify use of dect_clear.php and jabberserver.php diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 3a1a545f..5731fec0 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -101,10 +101,6 @@ table { border-collapse: collapse; } -tr:hover > td { - background: #f0f0f0; -} - th { background: #f0f0f0; } diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css index 311097c7..fdaf9398 100644 --- a/www-ssl/css/style10.css +++ b/www-ssl/css/style10.css @@ -5,3 +5,7 @@ margin: 10px auto; width: 523px; } + +tr:hover > td { + background: #f0f0f0; +} \ No newline at end of file diff --git a/www-ssl/index.php b/www-ssl/index.php index e8c900a5..6b2e267b 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -33,6 +33,10 @@ if (in_array($p, $privileges)) { require_once ('includes/pages/user_news.php'); $content = user_news(); } + elseif ($p == "user_settings") { + require_once ('includes/pages/user_settings.php'); + $content = user_settings(); + } elseif ($p == "login") { require_once ('includes/pages/guest_login.php'); $content = guest_login(); diff --git a/www/404.php b/www/404.php deleted file mode 100644 index dc19cd26..00000000 --- a/www/404.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/www/index.php b/www/index.php deleted file mode 100644 index 9105555e..00000000 --- a/www/index.php +++ /dev/null @@ -1,3 +0,0 @@ - -- cgit v1.2.3-54-g00ecf From c0b15dfe0dce7c4603cc7ec7c19b5a6cf226dc95 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 21:38:19 +0200 Subject: user messages --- DB/db_rewrite.sql | 64 +++--- includes/pages/user_messages.php | 216 +++++++++++++++++++++ includes/sys_menu.php | 1 + templates/user_messages.html | 50 +++++ txt/TODO | 5 +- www-ssl/css/base.css | 11 ++ www-ssl/css/style6.css | 2 +- www-ssl/index.php | 11 +- www-ssl/nonpublic/einstellungen.php | 376 ------------------------------------ www-ssl/nonpublic/index.php | 77 -------- 10 files changed, 331 insertions(+), 482 deletions(-) create mode 100644 includes/pages/user_messages.php create mode 100644 templates/user_messages.html delete mode 100644 www-ssl/nonpublic/einstellungen.php delete mode 100644 www-ssl/nonpublic/index.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 71b968e7..d4811235 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 18:17 +-- Erstellungszeit: 02. Juni 2011 um 19:37 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,16 +71,17 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 44), -('login', 12), -('logout', 5), -('start', 13), +('news', 73), +('login', 18), +('logout', 11), +('start', 23), ('faq', 4), ('credits', 3), ('register', 3), ('admin_rooms', 70), -('admin_angel_types', 68), -('user_settings', 109); +('admin_angel_types', 69), +('user_settings', 111), +('user_messages', 102); -- -------------------------------------------------------- @@ -124,7 +125,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -138,7 +139,8 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (5, -1, 5), (6, -4, 6), (7, -4, 7), -(8, -2, 8); +(8, -2, 8), +(9, -2, 9); -- -------------------------------------------------------- @@ -170,18 +172,28 @@ INSERT INTO `Groups` (`Name`, `UID`) VALUES -- CREATE TABLE IF NOT EXISTS `Messages` ( - `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `id` int(11) NOT NULL AUTO_INCREMENT, + `Datum` int(11) NOT NULL, `SUID` int(11) NOT NULL DEFAULT '0', `RUID` int(11) NOT NULL DEFAULT '0', `isRead` char(1) NOT NULL DEFAULT 'N', `Text` text NOT NULL, - PRIMARY KEY (`Datum`,`SUID`,`RUID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fuers interen Communikationssystem'; + PRIMARY KEY (`id`), + KEY `Datum` (`Datum`), + KEY `SUID` (`SUID`), + KEY `RUID` (`RUID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fuers interen Communikationssystem' AUTO_INCREMENT=8 ; -- -- Daten für Tabelle `Messages` -- +INSERT INTO `Messages` (`id`, `Datum`, `SUID`, `RUID`, `isRead`, `Text`) VALUES +(2, 1307042342, 1, 147, 'Y', 'asdfasdfasdfasdf'), +(4, 1307042622, 1, 147, 'Y', 'asdfasdfasdf'), +(5, 1307042643, 1, 147, 'Y', 'foobar'), +(6, 1307042663, 1, 147, 'Y', 'foobar'), +(7, 1307042692, 147, 1, 'Y', 'foobar'); -- -------------------------------------------------------- @@ -197,19 +209,16 @@ CREATE TABLE IF NOT EXISTS `News` ( `UID` int(11) NOT NULL DEFAULT '0', `Treffen` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; -- -- Daten für Tabelle `News` -- INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES -(3, '2011-06-02 01:32:31', '', '', 0, 0), -(4, '2011-06-02 01:36:27', 'Darf ich News erstellen?', 'Darf ich.', 0, 0), -(5, '2011-06-02 01:36:35', 'Darf ich News erstellen?', 'asdfasdfasdf', 1, 0), -(6, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0), -(7, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0), -(8, '2011-06-02 01:38:59', '"''>', '"''>\r\n', 1, 0); +(1, '2011-06-02 21:35:27', '', '', 1, 0), +(2, '2011-06-02 21:36:57', '', '', 1, 0), +(3, '2011-06-02 21:36:57', '', '', 1, 0); -- -------------------------------------------------------- @@ -244,7 +253,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=9 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ; -- -- Daten für Tabelle `Privileges` @@ -258,7 +267,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (5, 'register', 'Einen neuen Engel registerieren'), (6, 'admin_rooms', 'Räume administrieren'), (7, 'admin_angel_types', 'Engel Typen administrieren'), -(8, 'user_settings', 'User profile settings'); +(8, 'user_settings', 'User profile settings'), +(9, 'user_messages', 'Writing and reading messages from user to user'); -- -------------------------------------------------------- @@ -800,8 +810,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pub_einstellungen_Hometown', 'EN', 'hometown'), ('makeuser_error_Alter', 'DE', 'Fehler: Dein Alter muss eine Zahl oder leer sein'), ('makeuser_error_Alter', 'EN', 'error: your age must be a number or empty'), -('pub_menu_messages', 'DE', 'Nachrichten'), -('pub_menu_messages', 'EN', 'messages'), +('user_messages', 'DE', 'Nachrichten'), +('user_messages', 'EN', 'Messages'), ('pub_messages_Datum', 'DE', 'Datum'), ('pub_messages_Datum', 'EN', 'date'), ('pub_messages_Von', 'DE', 'Gesendet'), @@ -983,7 +993,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('login', 'DE', 'Login'), ('login', 'EN', 'Login'), ('credits', 'DE', 'Credits'), -('credits', 'EN', 'Credits'); +('credits', 'EN', 'Credits'), +('pub_messages_Neu', 'DE', 'Neu'), +('pub_messages_Neu', 'EN', 'New'); -- -------------------------------------------------------- @@ -1026,8 +1038,8 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307038600, '0000-00-00 00:00:00', '', '', ''), -(147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1306971362, '2011-06-02 00:55:09', '', '', ''); +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307043433, '0000-00-00 00:00:00', '', '', ''), +(147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php new file mode 100644 index 00000000..e3e9a469 --- /dev/null +++ b/includes/pages/user_messages.php @@ -0,0 +1,216 @@ + 0) + return '

        ' . Get_Text("pub_messages_new1") . " " . $new_messages . " " . Get_Text("pub_messages_new2") . '

        '; + + return ""; +} + +function user_messages() { + global $user; + + if (!isset ($_REQUEST['action'])) { + $users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" . sql_escape($user['UID']) . " ORDER BY `Nick`"); + $to_select_data = array ( + "" => "Select receiver..." + ); + foreach ($users as $u) + $to_select_data[$u['UID']] = $u['Nick']; + $to_select = html_select_key('to', $to_select_data, ''); + + $messages_html = ""; + $messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" . sql_escape($user['UID']) . " OR `RUID`=" . sql_escape($user['UID']) . " ORDER BY `isRead`,`Datum` DESC"); + foreach ($messages as $message) { + $messages_html .= ''; + $messages_html .= '' . ($message['isRead'] == 'N' ? '•' : '') . ''; + $messages_html .= '' . date("Y-m-d H:i", $message['Datum']) . ''; + $messages_html .= '' . UID2Nick($message['SUID']) . ''; + $messages_html .= '' . UID2Nick($message['RUID']) . ''; + $messages_html .= '' . str_replace("\n", '
        ', $message['Text']) . ''; + $messages_html .= ''; + if ($message['RUID'] == $user['UID']) { + if ($message['isRead'] == 'N') + $messages_html .= '' . Get_Text("pub_messages_MarkRead") . ''; + } else { + $messages_html .= '' . Get_Text("pub_messages_DelMsg") . ''; + } + $messages_html .= ''; + } + + return template_render('../templates/user_messages.html', array ( + 'link' => page_link_to("user_messages"), + 'greeting' => Get_Text("Hello") . $user['Nick'] . ",
        \n" . Get_Text("pub_messages_text1") . "

        \n", + 'messages' => $messages_html, + 'new_label' => Get_Text("pub_messages_Neu"), + 'date_label' => Get_Text("pub_messages_Datum"), + 'from_label' => Get_Text("pub_messages_Von"), + 'to_label' => Get_Text("pub_messages_An"), + 'text_label' => Get_Text("pub_messages_Text"), + 'date' => date("Y-m-d H:i"), + 'from' => $user['Nick'], + 'to_select' => $to_select, + 'submit_label' => Get_Text("save") + )); + } else { + switch ($_REQUEST['action']) { + case "read" : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Message ID."); + + $message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + if (count($message) > 0 && $message[0]['RUID'] == $user['UID']) { + sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + header("Location: " . page_link_to("user_messages")); + } else + return error("No Message found."); + break; + + case "delete" : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Message ID."); + + $message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + if (count($message) > 0 && $message[0]['SUID'] == $user['UID']) { + sql_query("DELETE FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1"); + header("Location: " . page_link_to("user_messages")); + } else + return error("No Message found."); + break; + + case "send" : + $text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text'])); + $to = preg_replace("/([^0-9]{1,})/ui", '', strip_tags($_REQUEST['to'])); + if ($text != "" && is_numeric($to) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($to) . " AND NOT `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0) { + sql_query("INSERT INTO `Messages` SET `Datum`=" . sql_escape(time()) . ", `SUID`=" . sql_escape($user['UID']) . ", `RUID`=" . sql_escape($to) . ", `Text`='" . sql_escape($text) . "'"); + header("Location: " . page_link_to("user_messages")); + } else { + return error(Get_Text("pub_messages_Send_Error")); + } + break; + } + return ""; + } + + if (!isset ($_GET["action"])) + $_GET["action"] = "start"; + + switch ($_GET["action"]) { + case "start" : + echo Get_Text("Hello") . $_SESSION['Nick'] . ",
        \n"; + echo Get_Text("pub_messages_text1") . "

        \n"; + + //show exist Messages + $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; + $erg = mysql_query($SQL, $con); + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + for ($i = 0; $i < mysql_num_rows($erg); $i++) { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + + // send Messeges + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + + // Listet alle Nicks auf + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + + echo "
        " . Get_Text("pub_messages_Datum") . "" . Get_Text("pub_messages_Von") . "" . Get_Text("pub_messages_An") . "" . Get_Text("pub_messages_Text") . "
        " . mysql_result($erg, $i, "Datum") . "" . UID2Nick(mysql_result($erg, $i, "SUID")) . "" . UID2Nick(mysql_result($erg, $i, "RUID")) . "" . mysql_result($erg, $i, "Text") . ""; + + if (mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { + echo "" . Get_Text("pub_messages_DelMsg") . ""; + + if (mysql_result($erg, $i, "isRead") == "N") + echo "" . Get_Text("pub_messages_MarkRead") . ""; + } else { + if (mysql_result($erg, $i, "isRead") == "N") + echo Get_Text("pub_messages_NotRead"); + } + + echo "
        \n"; + break; + + case "SendMsg" : + echo Get_Text("pub_messages_Send1") . "...
        \n"; + + $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (" . + "'" . gmdate("Y-m-j H:i:s", time()) . "', " . + "'" . $_SESSION["UID"] . "', " . + "'" . $_POST["RUID"] . "', " . + "'" . $_POST["Text"] . "');"; + + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_Send_OK") . "\n"; + else + echo Get_Text("pub_messages_Send_Error") . "...\n(" . mysql_error($con) . ")"; + break; + + case "MarkRead" : + $SQL = "UPDATE `Messages` SET `isRead` = 'Y' " . + "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID`='" . $_SESSION["UID"] . "' " . + "LIMIT 1 ;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_MarkRead_OK") . "\n"; + else + echo Get_Text("pub_messages_MarkRead_KO") . "...\n(" . mysql_error($con) . ")"; + break; + + case "DelMsg" : + $SQL = "DELETE FROM `Messages` " . + "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID` ='" . $_SESSION["UID"] . "' " . + "LIMIT 1;"; + $Erg = mysql_query($SQL, $con); + + if ($Erg == 1) + echo Get_Text("pub_messages_DelMsg_OK") . "\n"; + else + echo Get_Text("pub_messages_DelMsg_KO") . "...\n(" . mysql_error($con) . ")"; + break; + + default : + echo Get_Text("pub_messages_NoCommand"); + } +} +?> diff --git a/includes/sys_menu.php b/includes/sys_menu.php index da9d5666..822d558f 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -22,6 +22,7 @@ function make_navigation() { // Engel Navigation $menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array ( "news", + "user_messages", "user_settings" )); diff --git a/templates/user_messages.html b/templates/user_messages.html new file mode 100644 index 00000000..b7bb26fb --- /dev/null +++ b/templates/user_messages.html @@ -0,0 +1,50 @@ +%greeting% +
        + + + + + + + + + + + + + %messages% + + + + + + + + + +
        + %new_label% + + %date_label% + + %from_label% + + %to_label% + + %text_label% + +   +
        +   + + %date% + + %from% + + %to_select% + + + + +
        +
        \ No newline at end of file diff --git a/txt/TODO b/txt/TODO index c6d32b39..fbaf4377 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,6 +1,9 @@ * MD5-Passwörter mit Salt speichern * Passwort-Mindestanforderungen stellen - * Avatare + * User-Avatare + * user_messages schön machen + * Formulare weg von Tabellen + * user_news lässt sich nicht bedienen (POST ohne redirects...) * schichten ueber monatsgrenzen einbaue im moment werden die tage nur diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 5731fec0..bfe050a5 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -128,3 +128,14 @@ td, th { .success { color: #090; } + +.notice { + background: #f0f0f0; + border: 2px solid #888; + margin: 10px; + padding: 10px; +} + +.new_message { + font-weight: bold; +} diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css index 2272f598..8dc008e7 100644 --- a/www-ssl/css/style6.css +++ b/www-ssl/css/style6.css @@ -71,6 +71,6 @@ h4.menu { font-size : 6pt; } -h4, h1 { +h4, h1, th { background: #333E47; } diff --git a/www-ssl/index.php b/www-ssl/index.php index 6b2e267b..48aea75c 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -13,6 +13,8 @@ require_once ('includes/sys_user.php'); require_once ('config/config.php'); require_once ('config/config_db.php'); +require_once ('includes/pages/user_messages.php'); + session_start(); sql_connect($config['host'], $config['user'], $config['pw'], $config['db']); @@ -20,7 +22,7 @@ sql_connect($config['host'], $config['user'], $config['pw'], $config['db']); load_auth(); // Gewünschte Seite/Funktion -$p = "start"; +$p = isset ($user) ? "news" : "start"; if (isset ($_REQUEST['p'])) $p = $_REQUEST['p']; @@ -33,6 +35,9 @@ if (in_array($p, $privileges)) { require_once ('includes/pages/user_news.php'); $content = user_news(); } + elseif ($p == "user_messages") { + $content = user_messages(); + } elseif ($p == "user_settings") { require_once ('includes/pages/user_settings.php'); $content = user_settings(); @@ -79,6 +84,10 @@ elseif ($p == "faq") { } } +// Hinweis für ungelesene Nachrichten +if (isset ($user) && $p != "user_messages") + $content = user_unread_messages() . $content; + echo template_render('../templates/layout.html', array ( 'theme' => isset ($user) ? $user['color'] : $default_theme, 'title' => $title, diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php deleted file mode 100644 index 713425bb..00000000 --- a/www-ssl/nonpublic/einstellungen.php +++ /dev/null @@ -1,376 +0,0 @@ -\n\n"; - Print_Text(13); -?> -
        - -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        ">
        ICQ
        jabber
        - "> -
        -
        - -
        - -
        - - - - - -
        - "> -
        -
        - -
        -
        - -
        - - - - - - - - - - -
        - -
        Menu>L - >R -
        - "> -
        -
        -
        -
        - -
        - - - - - -
        - -
        - "> -
        - -\n
        \n
        \n\n"; - echo Get_Text('pub_einstellungen_PictureUpload') . "
        "; - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "(max " . get_cfg_var("post_max_size") . "Byte)
        \n"; - echo "\n"; - echo "
        \n"; - } - - switch (GetPicturShow($_SESSION['UID'])) { - case 'Y' : - echo Get_Text('pub_einstellungen_PictureShow') . "
        "; - echo displayPictur($_SESSION['UID'], 0); - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "
        \n"; - break; - case 'N' : - echo Get_Text('pub_einstellungen_PictureNoShow') . "
        "; - echo displayPictur($_SESSION['UID'], 0); - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "
        \n"; - echo "
        \n
        \n
        \n\n"; - case '' : - echo "
        \n
        \n
        \n\n"; - echo Get_Text(22) . "
        "; - echo "\n
        \n"; - echo "\n"; - echo "\n"; - echo "\n\n\n"; - echo "\n"; - echo "\n\n"; - echo "
        " . Get_Text(23) . "
        \n"; - echo "  \n"; - echo "\n"; - echo "
        \n"; - echo "\n"; - echo "
        \n"; - break; - } //CASE - -} else { - switch ($_POST["action"]) { - case 'set' : - if ($_POST["new1"] == $_POST["new2"]) { - Print_Text(25); - $sql = "SELECT * FROM `User` WHERE `UID`='" . $_SESSION['UID'] . "'"; - $Erg = mysql_query($sql, $con); - - if (PassCrypt($_POST["old"]) == mysql_result($Erg, 0, "Passwort")) { - Print_Text(26); - Print_Text(27); - $usql = "UPDATE `User` SET `Passwort`='" . PassCrypt($_POST["new1"]) . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; - $Erg = mysql_query($usql, $con); - - if ($Erg == 1) { - Print_Text(28); - } else { - Print_Text(29); - } - } else { - Print_Text(30); - } - } else { - Print_Text(31); - } - break; - - case 'colour' : - - $chsql = "UPDATE `User` SET " . - "`color`= '" . $_POST["colourid"] . "', " . - "`Menu`= '" . $_POST["eMenu"] . "' " . - "WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - echo mysql_error($con); - $_SESSION['color'] = $_POST["colourid"]; - $_SESSION['Menu'] = $_POST["eMenu"]; - if ($Erg == 1) { - Print_Text(32); - } else { - Print_Text(29); - } - break; - - case 'sprache' : - - $chsql = "UPDATE `User` SET `Sprache` = '" . $_POST["language"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - $_SESSION['Sprache'] = $_POST["language"]; - if ($Erg == 1) { - Print_Text(33); - } else { - Print_Text(29); - } - break; - - case 'avatar' : - $chsql = "UPDATE `User` SET `Avatar`='" . $_POST["eAvatar"] . "' WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - $_SESSION['Avatar'] = $_POST["eAvatar"]; - if ($Erg == 1) - Print_Text(34); - else - Print_Text(29); - break; - - case 'setUserData' : - if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { - $chsql = "UPDATE `User` SET " . - "`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " . - "`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " . - "`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " . - "`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " . - "`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " . - "`Hometown`='" . $_POST["Hometown"] . "', `Size`='" . $_POST["Sizeid"] . "' " . - "WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;"; - } else { - $chsql = "UPDATE `User` SET " . - "`Nick`='" . $_POST["eNick"] . "', `Name`='" . $_POST["eName"] . "', " . - "`Vorname`='" . $_POST["eVorname"] . "', `Alter`='" . $_POST["eAlter"] . "', " . - "`Telefon`='" . $_POST["eTelefon"] . "', `Handy`='" . $_POST["eHandy"] . "', " . - "`DECT`='" . $_POST["eDECT"] . "', `email`='" . $_POST["eemail"] . "', " . - "`ICQ`='" . $_POST["eICQ"] . "', `jabber`='" . $_POST["ejabber"] . "', " . - "`Hometown`='" . $_POST["Hometown"] . "' " . - "WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1;"; - } - $Erg = mysql_query($chsql, $con); - - if ($Erg == 1) { - $_SESSION['Nick'] = $_POST["eNick"]; - $_SESSION['Name'] = $_POST["eName"]; - $_SESSION['Vorname'] = $_POST["eVorname"]; - $_SESSION['Alter'] = $_POST["eAlter"]; - $_SESSION['Telefon'] = $_POST["eTelefon"]; - $_SESSION['Handy'] = $_POST["eHandy"]; - $_SESSION['DECT'] = $_POST["eDECT"]; - $_SESSION['email'] = $_POST["eemail"]; - $_SESSION['ICQ'] = $_POST["eICQ"]; - $_SESSION['jabber'] = $_POST["ejabber"]; - $_SESSION['Hometown'] = $_POST["Hometown"]; - if ($_SESSION['CVS']["Change T_Shirt Size"] == "Y") { - $_SESSION['Size'] = $_POST["Sizeid"]; - } else - if ($_SESSION['Size'] != $_POST["Sizeid"]) { - array_push($error_messages, "einstellungen.php, change t-shirt size not allowed\n"); - } - - Print_Text("pub_einstellungen_UserDateSaved"); - } else { - Print_Text(29); - echo mysql_error($con); - } - break; - - case 'sendPicture' : - if ($_FILES["file"]["size"] > 0) { - if (($_FILES["file"]["type"] == "image/jpeg") || ($_FILES["file"]["type"] == "image/png") || ($_FILES["file"]["type"] == "image/gif")) { - $data = addslashes(fread(fopen($_FILES["file"]["tmp_name"], "r"), filesize($_FILES["file"]["tmp_name"]))); - - if (GetPicturShow($_SESSION['UID']) == "") - $SQL = "INSERT INTO `UserPicture` " . - "( `UID`,`Bild`, `ContentType`, `show`) " . - "VALUES ('" . $_SESSION['UID'] . "', '$data', '" . $_FILES["file"]["type"] . "', 'N')"; - else - $SQL = "UPDATE `UserPicture` SET " . - "`Bild`='$data', " . - "`ContentType`='" . $_FILES["file"]["type"] . "', " . - "`show`='N' " . - "WHERE `UID`='" . $_SESSION['UID'] . "'"; - - $res = mysql_query($SQL, $con); - if ($res) - Print_Text("pub_einstellungen_send_OK"); - else - Print_Text("pub_einstellungen_send_KO"); - - echo "
        ('" . $_FILES["file"]["name"] . "', MIME-Type: " . $_FILES["file"]["type"] . ", " . $_FILES["file"]["size"] . " Byte)
        "; - } else - Print_Text("pub_einstellungen_send_KO"); - } else - Print_Text("pub_einstellungen_send_KO"); - break; - - case 'delPicture' : - $chsql = "DELETE FROM `UserPicture` WHERE `UID`='" . $_SESSION['UID'] . "' LIMIT 1"; - $Erg = mysql_query($chsql, $con); - if ($Erg == 1) - Print_Text("pub_einstellungen_del_OK"); - else - Print_Text("pub_einstellungen_del_KO"); - Break; - } -} -include ("includes/footer.php"); -?> diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php deleted file mode 100644 index b53f8088..00000000 --- a/www-ssl/nonpublic/index.php +++ /dev/null @@ -1,77 +0,0 @@ - 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"); -?> - - -- cgit v1.2.3-54-g00ecf From 3afd05636e46aedb53e1c1d954d23d6563b5e104 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 22:40:08 +0200 Subject: admin groups --- DB/db_rewrite.sql | 28 ++++---- includes/funktion_menu.php | 40 ----------- includes/pages/admin_groups.php | 73 ++++++++++++++++++++ includes/sys_menu.php | 3 +- templates/admin_groups.html | 21 ++++++ templates/admin_groups_edit_form.html | 21 ++++++ txt/TODO | 2 + www-ssl/admin/group.php | 49 -------------- www-ssl/index.php | 4 ++ www-ssl/nonpublic/messages.php | 124 ---------------------------------- 10 files changed, 139 insertions(+), 226 deletions(-) delete mode 100644 includes/funktion_menu.php create mode 100644 includes/pages/admin_groups.php create mode 100644 templates/admin_groups.html create mode 100644 templates/admin_groups_edit_form.html delete mode 100644 www-ssl/admin/group.php delete mode 100644 www-ssl/nonpublic/messages.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index d4811235..5041ce9b 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 19:37 +-- Erstellungszeit: 02. Juni 2011 um 20:39 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -80,8 +80,9 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES ('register', 3), ('admin_rooms', 70), ('admin_angel_types', 69), -('user_settings', 111), -('user_messages', 102); +('user_settings', 115), +('user_messages', 102), +('admin_groups', 86); -- -------------------------------------------------------- @@ -125,22 +126,22 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=28 ; -- -- Daten für Tabelle `GroupPrivileges` -- INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES -(1, -1, 1), -(2, -1, 2), +(24, -1, 5), (3, -2, 3), (4, -2, 4), -(5, -1, 5), +(23, -1, 2), (6, -4, 6), (7, -4, 7), (8, -2, 8), -(9, -2, 9); +(9, -2, 9), +(12, -5, 10); -- -------------------------------------------------------- @@ -253,7 +254,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; -- -- Daten für Tabelle `Privileges` @@ -268,7 +269,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (6, 'admin_rooms', 'Räume administrieren'), (7, 'admin_angel_types', 'Engel Typen administrieren'), (8, 'user_settings', 'User profile settings'), -(9, 'user_messages', 'Writing and reading messages from user to user'); +(9, 'user_messages', 'Writing and reading messages from user to user'), +(10, 'admin_groups', 'Manage usergroups and their rights'); -- -------------------------------------------------------- @@ -995,7 +997,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('credits', 'DE', 'Credits'), ('credits', 'EN', 'Credits'), ('pub_messages_Neu', 'DE', 'Neu'), -('pub_messages_Neu', 'EN', 'New'); +('pub_messages_Neu', 'EN', 'New'), +('admin_groups', 'DE', 'Gruppenrechte'), +('admin_groups', 'EN', 'Grouprights'); -- -------------------------------------------------------- @@ -1038,7 +1042,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307043433, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307046926, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php deleted file mode 100644 index 0a324758..00000000 --- a/includes/funktion_menu.php +++ /dev/null @@ -1,40 +0,0 @@ - $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 ((true || $debug) && ($TempName == "")) - $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 .= "
      • $TempName
        • \n"; - $Gefunden = true; - } - } - elseif ($debug) { - $Gefunden = true; - $Text .= "
      • $TempName ($Key)
        • \n"; - } - } - if ($Gefunden) - echo ''; -} //function ShowMenue -?> diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php new file mode 100644 index 00000000..5d9d8180 --- /dev/null +++ b/includes/pages/admin_groups.php @@ -0,0 +1,73 @@ +'; + $groups_html .= '' . $group['Name'] . ''; + $privileges = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group['UID'])); + $privileges_html = array (); + foreach ($privileges as $priv) + $privileges_html[] = $priv['name']; + $groups_html .= '' . join(", ", $privileges_html) . ''; + $groups_html .= 'Ändern'; + $groups_html .= ''; + } + + return template_render('../templates/admin_groups.html', array ( + 'nick' => $user['Nick'], + 'groups' => $groups_html + )); + } else { + switch ($_REQUEST["action"]) { + case 'edit' : + if (isset ($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Groups ID."); + + $room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + if (count($room) > 0) { + list ($room) = $room; + $privileges = sql_select("SELECT `Privileges`.*, `GroupPrivileges`.`group_id` FROM `Privileges` LEFT OUTER JOIN `GroupPrivileges` ON (`Privileges`.`id` = `GroupPrivileges`.`privilege_id` AND `GroupPrivileges`.`group_id`=" . sql_escape($id) . ") ORDER BY `Privileges`.`name`"); + $privileges_html = ""; + foreach ($privileges as $priv) + $privileges_html .= '' . $priv['name'] . '' . $priv['desc'] . ''; + + $html .= template_render('../templates/admin_groups_edit_form.html', array ( + 'link' => page_link_to("admin_groups"), + 'id' => $id, + 'privileges' => $privileges_html + )); + } else + return error("No Group found."); + break; + + case 'save' : + if (isset ($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Groups ID."); + + $room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + if (!is_array($_REQUEST['privileges'])) + $_REQUEST['privileges'] = array (); + if (count($room) > 0) { + list ($room) = $room; + sql_query("DELETE FROM `GroupPrivileges` WHERE `group_id`=" . sql_escape($id)); + foreach ($_REQUEST['privileges'] as $priv) + if (preg_match("/^[0-9]{1,}$/", $priv) && sql_num_query("SELECT * FROM `Privileges` WHERE `id`=" . sql_escape($priv)) > 0) + sql_query("INSERT INTO `GroupPrivileges` SET `group_id`=" . sql_escape($id) . ", `privilege_id`=" . sql_escape($priv)); + header("Location: " . page_link_to("admin_groups")); + } else + return error("No Group found."); + break; + } + } + return $html; +} +?> diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 822d558f..739cb9d1 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -29,7 +29,8 @@ function make_navigation() { // Admin Navigation $menu .= make_navigation_for(Get_Text('admin/'), array ( "admin_angel_types", - "admin_rooms" + "admin_rooms", + "admin_groups" )); return $menu; } diff --git a/templates/admin_groups.html b/templates/admin_groups.html new file mode 100644 index 00000000..c5b4ac57 --- /dev/null +++ b/templates/admin_groups.html @@ -0,0 +1,21 @@ +Hallo %nick%, +
        +hier hast du die Möglichkeit Gruppenrechte zu ändern: + + + + + + + + + + %groups% + +
        + Name + + Rechte + +   +
        diff --git a/templates/admin_groups_edit_form.html b/templates/admin_groups_edit_form.html new file mode 100644 index 00000000..5729df64 --- /dev/null +++ b/templates/admin_groups_edit_form.html @@ -0,0 +1,21 @@ +
        + + + + + + + + + + %privileges% + +
        +   + + Name + + Description +
        + +
        \ No newline at end of file diff --git a/txt/TODO b/txt/TODO index fbaf4377..1ebf5e52 100644 --- a/txt/TODO +++ b/txt/TODO @@ -4,6 +4,8 @@ * user_messages schön machen * Formulare weg von Tabellen * user_news lässt sich nicht bedienen (POST ohne redirects...) + * Privilegien korrigieren (an die vom CVS anpassen) + * Beim Raum-Management die benötigten Engel anzeigen * schichten ueber monatsgrenzen einbaue im moment werden die tage nur diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php deleted file mode 100644 index b8a52ec2..00000000 --- a/www-ssl/admin/group.php +++ /dev/null @@ -1,49 +0,0 @@ -\n"; - echo "\n"; - echo "\tGroupname\n"; - echo "\tLink\n"; - echo "\n"; - - for ($n = 0; $n < $Zeilen; $n++) { - echo "\n"; - echo "\t" . mysql_result($Erg, $n, "Name") . "\n"; - - echo "change\n"; - echo "\n"; - } - - // new form - echo "\n"; - echo "\t
        \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
        \n"; - echo "\n"; - - echo "\t\n"; - // Ende Userliste -} - -include ("includes/footer.php"); -?> - - diff --git a/www-ssl/index.php b/www-ssl/index.php index 48aea75c..6bfbcc32 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -61,6 +61,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_rooms") { require_once ('includes/pages/admin_rooms.php'); $content = admin_rooms(); + } + elseif ($p == "admin_groups") { + require_once ('includes/pages/admin_groups.php'); + $content = admin_groups(); } else { require_once ('includes/pages/guest_start.php'); $content = guest_start(); diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php deleted file mode 100644 index 4868136d..00000000 --- a/www-ssl/nonpublic/messages.php +++ /dev/null @@ -1,124 +0,0 @@ -\n"; - echo Get_Text("pub_messages_text1") . "

        \n"; - - //show exist Messages - $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; - $erg = mysql_query($SQL, $con); - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - for ($i = 0; $i < mysql_num_rows($erg); $i++) { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - - // send Messeges - echo ""; - echo "\n"; - echo "\n"; - echo "\n"; - - // Listet alle Nicks auf - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - - echo "
        " . Get_Text("pub_messages_Datum") . "" . Get_Text("pub_messages_Von") . "" . Get_Text("pub_messages_An") . "" . Get_Text("pub_messages_Text") . "
        " . mysql_result($erg, $i, "Datum") . "" . UID2Nick(mysql_result($erg, $i, "SUID")) . "" . UID2Nick(mysql_result($erg, $i, "RUID")) . "" . mysql_result($erg, $i, "Text") . ""; - - if (mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { - echo "" . Get_Text("pub_messages_DelMsg") . ""; - - if (mysql_result($erg, $i, "isRead") == "N") - echo "" . Get_Text("pub_messages_MarkRead") . ""; - } else { - if (mysql_result($erg, $i, "isRead") == "N") - echo Get_Text("pub_messages_NotRead"); - } - - echo "
        \n"; - break; - - case "SendMsg" : - echo Get_Text("pub_messages_Send1") . "...
        \n"; - - $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (" . - "'" . gmdate("Y-m-j H:i:s", time()) . "', " . - "'" . $_SESSION["UID"] . "', " . - "'" . $_POST["RUID"] . "', " . - "'" . $_POST["Text"] . "');"; - - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_Send_OK") . "\n"; - else - echo Get_Text("pub_messages_Send_Error") . "...\n(" . mysql_error($con) . ")"; - break; - - case "MarkRead" : - $SQL = "UPDATE `Messages` SET `isRead` = 'Y' " . - "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID`='" . $_SESSION["UID"] . "' " . - "LIMIT 1 ;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_MarkRead_OK") . "\n"; - else - echo Get_Text("pub_messages_MarkRead_KO") . "...\n(" . mysql_error($con) . ")"; - break; - - case "DelMsg" : - $SQL = "DELETE FROM `Messages` " . - "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID` ='" . $_SESSION["UID"] . "' " . - "LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_DelMsg_OK") . "\n"; - else - echo Get_Text("pub_messages_DelMsg_KO") . "...\n(" . mysql_error($con) . ")"; - break; - - default : - echo Get_Text("pub_messages_NoCommand"); -} - -include "includes/footer.php"; -?> -- cgit v1.2.3-54-g00ecf From cb1736d180ce91cb8b66acfe6cf7cede3a04d097 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 2 Jun 2011 23:41:50 +0200 Subject: include/pages/admin_angel_types: Cleanup; add strip_request_item function --- includes/pages/admin_angel_types.php | 162 ++++++----------------------------- includes/sys_page.php | 11 ++- 2 files changed, 36 insertions(+), 137 deletions(-) diff --git a/includes/pages/admin_angel_types.php b/includes/pages/admin_angel_types.php index ba2e5325..c5283899 100644 --- a/includes/pages/admin_angel_types.php +++ b/includes/pages/admin_angel_types.php @@ -1,22 +1,36 @@ ' . $angel_type['Name'] . '' . $angel_type['Man'] . 'Edit'; + $table .= sprintf( + '%s%s' + . 'Edit', + $angel_type['Name'], $angel_type['Man'], + page_link_to("admin_angel_types"), + $angel_type['TID'] + ); $html .= template_render('../templates/admin_angel_types.html', array ( 'link' => page_link_to("admin_angel_types"), 'table' => $table )); + } else { + switch ($_REQUEST['action']) { + case 'create' : - $name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['name'])); - $man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['man'])); + $name = strip_request_item("name"); + $man = strip_request_item("man"); + sql_query("INSERT INTO `AngelTypes` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "'"); + header("Location: " . page_link_to("admin_angel_types")); break; @@ -30,11 +44,12 @@ function admin_angel_types() { if (count($angel_type) > 0) { list ($angel_type) = $angel_type; - $html .= template_render('../templates/admin_angel_types_edit_form.html', array ( - 'link' => page_link_to("admin_angel_types"), - 'id' => $id, - 'name' => $angel_type['Name'], - 'man' => $angel_type['Man'] + $html .= template_render( + '../templates/admin_angel_types_edit_form.html', array ( + 'link' => page_link_to("admin_angel_types"), + 'id' => $id, + 'name' => $angel_type['Name'], + 'man' => $angel_type['Man'] )); } else return error("No Angel Type found."); @@ -50,8 +65,9 @@ function admin_angel_types() { if (count($angel_type) > 0) { list ($angel_type) = $angel_type; - $name = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['name'])); - $man = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['man'])); + $name = strip_request_item("name"); + $man = strip_request_item("man"); + sql_query("UPDATE `AngelTypes` SET `Name`='" . sql_escape($name) . "', `Man`='" . sql_escape($man) . "' WHERE `TID`=" . sql_escape($id) . " LIMIT 1"); header("Location: " . page_link_to("admin_angel_types")); } else @@ -76,131 +92,5 @@ function admin_angel_types() { } return $html; - $Sql = "SELECT * FROM `EngelType` ORDER BY `NAME`"; - $Erg = mysql_query($Sql, $con); - - if (!IsSet ($_GET["action"])) { - echo "Hallo " . $_SESSION['Nick'] . - ",
        \nhier hast du die Möglichkeit, neue Engeltypen für die Schichtpläne einzutragen " . - "oder vorhandene abzuändern:

        \n"; - - echo "- Neuen EngelType eintragen
        \n"; - - echo "\n"; - echo "\n"; - - for ($i = 1; $i < mysql_num_fields($Erg); $i++) { - echo "\t"; - } - echo "\t"; - echo ""; - - for ($t = 0; $t < mysql_num_rows($Erg); $t++) { - echo "\t\n"; - for ($j = 1; $j < mysql_num_fields($Erg); $j++) { - echo "\t\t\n"; - } - echo "\t\t\n"; - echo "\t\n"; - } // ende Auflistung Raeume - echo "
        " . mysql_field_name($Erg, $i) . "Ändern
        " . mysql_result($Erg, $t, $j) . "###
        "; - } else { - - switch ($_GET["action"]) { - - case 'new' : - echo "Neuen EngelType einrichten:
        "; - echo "
        \n"; - echo "\n"; - - for ($Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++) { - echo "" . - "\n"; - } - echo "
        " . mysql_field_name($Erg, $Uj) . "
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - break; - - case 'newsave' : - $vars = $_GET; - $count = count($vars) - 1; - $vars = array_splice($vars, 0, $count); - $Keys = ""; - $Values = ""; - foreach ($vars as $key => $value) { - $Keys .= ", `$key`"; - $Values .= ", '$value'"; - } - - if (runSQL_log("INSERT INTO `EngelType` (" . substr($Keys, 2) . ") VALUES (" . substr($Values, 2) . ")", "save new EngelType")) { - SetHeaderGo2Back(); - - $SQL2 = "SELECT * FROM `EngelType` WHERE `Name`='" . $_GET["Name"] . "'"; - $ERG = mysql_query($SQL2, $con); - - if (mysql_num_rows($ERG) == 1) - runSQL_log("ALTER TABLE `Room` ADD `DEFAULT_EID_" . mysql_result($ERG, 0, 0) . - "` INT DEFAULT '0' NOT NULL;", "add new EngelType in Romm Table"); - } - break; - - case 'change' : - if (!IsSet ($_GET["TID"])) - echo "Fehlerhafter Aufruf!"; - else { - echo "Raum abändern:\n"; - echo "Hier kannst du eintragen, den EngelType ändern."; - echo "
        \n"; - echo "\n"; - - $SQL2 = "SELECT * FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'"; - $ERG = mysql_query($SQL2, $con); - - for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++) - echo "" . - "\n"; - - echo "
        " . mysql_field_name($ERG, $Uj) . "
        \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
        "; - echo "
        \n"; - echo "\n"; - echo "\n"; - echo ""; - echo "
        "; - } - break; - - case 'changesave' : - $vars = $_GET; - $count = count($vars) - 2; - $vars = array_splice($vars, 0, $count); - $keys = ""; - $sql = ""; - foreach ($vars as $key => $value) { - $keys = substr($key, 1); - $sql .= ", `" . $keys . "`='" . $value . "'"; - } - runSQL_log("UPDATE `EngelType` SET " . substr($sql, 2) . " WHERE `TID`='" . $_GET["eTID"] . "'", "Save Change EngelType"); - SetHeaderGo2Back(); - break; - - case 'delete' : - if (IsSet ($_GET["TID"])) { - if (runSQL_log("DELETE FROM `EngelType` WHERE `TID`='" . $_GET["TID"] . "'", "delete EngelType")) - runSQL_log("ALTER TABLE `Room` DROP `DEFAULT_EID_" . $_GET["TID"] . "`;", "delete EngelType in Room Table"); - } else - echo "Fehlerhafter Aufruf"; - SetHeaderGo2Back(); - break; - } - } - - include ("includes/footer.php"); } ?> diff --git a/includes/sys_page.php b/includes/sys_page.php index ab8b05e2..2af5f729 100644 --- a/includes/sys_page.php +++ b/includes/sys_page.php @@ -1,4 +1,13 @@ ' . $msg . '

        '; } @@ -6,4 +15,4 @@ function error($msg) { function success($msg) { return '

        ' . $msg . '

        '; } -?> \ No newline at end of file +?> -- cgit v1.2.3-54-g00ecf From 0d6499f7f1aadabc345f6896fa3ad26f7a299150 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 2 Jun 2011 23:45:54 +0200 Subject: user questions --- DB/db_rewrite.sql | 45 ++++++++++++++++++--------------- includes/pages/user_questions.php | 41 ++++++++++++++++++++++++++++++ includes/sys_menu.php | 1 + templates/user_questions.html | 52 +++++++++++++++++++++++++++++++++++++++ txt/TODO | 4 +-- www-ssl/admin/dect_call.php | 8 ------ www-ssl/index.php | 4 +++ 7 files changed, 125 insertions(+), 30 deletions(-) create mode 100644 includes/pages/user_questions.php create mode 100644 templates/user_questions.html delete mode 100644 www-ssl/admin/dect_call.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 5041ce9b..6a259c61 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 20:39 +-- Erstellungszeit: 02. Juni 2011 um 21:45 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,18 +71,19 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 73), -('login', 18), -('logout', 11), -('start', 23), +('news', 78), +('login', 20), +('logout', 12), +('start', 24), ('faq', 4), ('credits', 3), ('register', 3), ('admin_rooms', 70), ('admin_angel_types', 69), -('user_settings', 115), -('user_messages', 102), -('admin_groups', 86); +('user_settings', 116), +('user_messages', 107), +('admin_groups', 94), +('user_questions', 30); -- -------------------------------------------------------- @@ -126,21 +127,22 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=28 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=33 ; -- -- Daten für Tabelle `GroupPrivileges` -- INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES +(32, -2, 8), (24, -1, 5), -(3, -2, 3), -(4, -2, 4), +(31, -2, 11), +(30, -2, 9), (23, -1, 2), (6, -4, 6), (7, -4, 7), -(8, -2, 8), -(9, -2, 9), +(29, -2, 3), +(28, -2, 4), (12, -5, 10); -- -------------------------------------------------------- @@ -192,8 +194,6 @@ CREATE TABLE IF NOT EXISTS `Messages` ( INSERT INTO `Messages` (`id`, `Datum`, `SUID`, `RUID`, `isRead`, `Text`) VALUES (2, 1307042342, 1, 147, 'Y', 'asdfasdfasdfasdf'), (4, 1307042622, 1, 147, 'Y', 'asdfasdfasdf'), -(5, 1307042643, 1, 147, 'Y', 'foobar'), -(6, 1307042663, 1, 147, 'Y', 'foobar'), (7, 1307042692, 147, 1, 'Y', 'foobar'); -- -------------------------------------------------------- @@ -254,7 +254,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=12 ; -- -- Daten für Tabelle `Privileges` @@ -270,7 +270,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (7, 'admin_angel_types', 'Engel Typen administrieren'), (8, 'user_settings', 'User profile settings'), (9, 'user_messages', 'Writing and reading messages from user to user'), -(10, 'admin_groups', 'Manage usergroups and their rights'); +(10, 'admin_groups', 'Manage usergroups and their rights'), +(11, 'user_questions', 'Let users ask questions'); -- -------------------------------------------------------- @@ -285,12 +286,14 @@ CREATE TABLE IF NOT EXISTS `Questions` ( `AID` int(11) NOT NULL DEFAULT '0', `Answer` text NOT NULL, PRIMARY KEY (`QID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=21 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=4 ; -- -- Daten für Tabelle `Questions` -- +INSERT INTO `Questions` (`QID`, `UID`, `Question`, `AID`, `Answer`) VALUES +(3, 1, 'Ficken?', 0, ''); -- -------------------------------------------------------- @@ -999,7 +1002,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('pub_messages_Neu', 'DE', 'Neu'), ('pub_messages_Neu', 'EN', 'New'), ('admin_groups', 'DE', 'Gruppenrechte'), -('admin_groups', 'EN', 'Grouprights'); +('admin_groups', 'EN', 'Grouprights'), +('user_questions', 'DE', 'Erzengel fragen'), +('user_questions', 'EN', 'Ask arch angel'); -- -------------------------------------------------------- @@ -1042,7 +1047,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307046926, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307051093, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/user_questions.php b/includes/pages/user_questions.php new file mode 100644 index 00000000..8201c6d6 --- /dev/null +++ b/includes/pages/user_questions.php @@ -0,0 +1,41 @@ +' . $question['Question'] . 'Delete'; + + return template_render('../templates/user_questions.html', array ( + 'link' => page_link_to("user_questions"), + 'open_questions' => $open_questions + )); + } else { + switch ($_REQUEST['action']) { + case 'ask' : + $question = trim(preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['question']))); + if ($question != "") { + sql_query("INSERT INTO `Questions` SET `UID`=" . sql_escape($user['UID']) . ", `Question`='" . sql_escape($question) . "'"); + header("Location: " . page_link_to("user_questions")); + } else + return error("Please enter a Question!"); + break; + case 'delete' : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Question ID."); + + $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + if (count($question) > 0 && $question[0]['UID'] == $user['UID']) { + sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + header("Location: " . page_link_to("user_questions")); + } else + return error("No Question found."); + break; + } + } +} +?> \ No newline at end of file diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 739cb9d1..6cddf66a 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -23,6 +23,7 @@ function make_navigation() { $menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array ( "news", "user_messages", + "user_questions", "user_settings" )); diff --git a/templates/user_questions.html b/templates/user_questions.html new file mode 100644 index 00000000..96b1e980 --- /dev/null +++ b/templates/user_questions.html @@ -0,0 +1,52 @@ +Not yet answered questions: + + + + + + + + + %open_questions% + +
        + Question + +   +
        +
        Answered questions: + + + + + + + + + + + %answered_questions% + +
        + Question + + From + + Answer + +   +
        +
        +
        + + + + + +
        + Question: + + +
        + +
        \ No newline at end of file diff --git a/txt/TODO b/txt/TODO index 1ebf5e52..14188a6f 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,12 +1,12 @@ * MD5-Passwörter mit Salt speichern * Passwort-Mindestanforderungen stellen - * User-Avatare + * User-Avatare (code liegt auskommentiert in user_settings.php) * user_messages schön machen * Formulare weg von Tabellen * user_news lässt sich nicht bedienen (POST ohne redirects...) * Privilegien korrigieren (an die vom CVS anpassen) * Beim Raum-Management die benötigten Engel anzeigen - + * Löschen nur mit Rückfrage * schichten ueber monatsgrenzen einbaue im moment werden die tage nur hochgezaehlt und die monatzgrenzen werden ignoriert diff --git a/www-ssl/admin/dect_call.php b/www-ssl/admin/dect_call.php deleted file mode 100644 index 0799c2be..00000000 --- a/www-ssl/admin/dect_call.php +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/www-ssl/index.php b/www-ssl/index.php index 6bfbcc32..831225e6 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -38,6 +38,10 @@ if (in_array($p, $privileges)) { elseif ($p == "user_messages") { $content = user_messages(); } + elseif ($p == "user_questions") { + require_once ('includes/pages/user_questions.php'); + $content = user_questions(); + } elseif ($p == "user_settings") { require_once ('includes/pages/user_settings.php'); $content = user_settings(); -- cgit v1.2.3-54-g00ecf From 32b3ce5f900cf0d378f77a6675b989ee0e641f13 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 00:22:11 +0200 Subject: admin questions --- DB/db_rewrite.sql | 43 +++++++++++---------- includes/pages/admin_questions.php | 76 ++++++++++++++++++++++++++++++++++++++ includes/pages/user_messages.php | 10 +++-- includes/pages/user_questions.php | 17 +++++++-- includes/sys_menu.php | 7 +++- templates/admin_questions.html | 47 +++++++++++++++++++++++ templates/user_questions.html | 2 +- www-ssl/index.php | 8 ++++ 8 files changed, 181 insertions(+), 29 deletions(-) create mode 100644 includes/pages/admin_questions.php create mode 100644 templates/admin_questions.html diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 6a259c61..5d6b4e2c 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 21:45 +-- Erstellungszeit: 02. Juni 2011 um 22:21 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,19 +71,20 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 78), -('login', 20), -('logout', 12), -('start', 24), -('faq', 4), +('news', 80), +('login', 24), +('logout', 13), +('start', 25), +('faq', 6), ('credits', 3), ('register', 3), ('admin_rooms', 70), ('admin_angel_types', 69), ('user_settings', 116), -('user_messages', 107), -('admin_groups', 94), -('user_questions', 30); +('user_messages', 108), +('admin_groups', 99), +('user_questions', 53), +('admin_questions', 41); -- -------------------------------------------------------- @@ -127,7 +128,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=33 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=36 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -139,11 +140,12 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (31, -2, 11), (30, -2, 9), (23, -1, 2), -(6, -4, 6), -(7, -4, 7), +(34, -4, 12), +(33, -4, 7), (29, -2, 3), (28, -2, 4), -(12, -5, 10); +(12, -5, 10), +(35, -4, 6); -- -------------------------------------------------------- @@ -254,7 +256,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=12 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=13 ; -- -- Daten für Tabelle `Privileges` @@ -271,7 +273,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (8, 'user_settings', 'User profile settings'), (9, 'user_messages', 'Writing and reading messages from user to user'), (10, 'admin_groups', 'Manage usergroups and their rights'), -(11, 'user_questions', 'Let users ask questions'); +(11, 'user_questions', 'Let users ask questions'), +(12, 'admin_questions', 'Answer user''s questions'); -- -------------------------------------------------------- @@ -286,14 +289,14 @@ CREATE TABLE IF NOT EXISTS `Questions` ( `AID` int(11) NOT NULL DEFAULT '0', `Answer` text NOT NULL, PRIMARY KEY (`QID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=4 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Fragen und Antworten' AUTO_INCREMENT=5 ; -- -- Daten für Tabelle `Questions` -- INSERT INTO `Questions` (`QID`, `UID`, `Question`, `AID`, `Answer`) VALUES -(3, 1, 'Ficken?', 0, ''); +(4, 1, 'Hallo?\nEy?', 1, 'Jo,\nJo!'); -- -------------------------------------------------------- @@ -1004,7 +1007,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin_groups', 'DE', 'Gruppenrechte'), ('admin_groups', 'EN', 'Grouprights'), ('user_questions', 'DE', 'Erzengel fragen'), -('user_questions', 'EN', 'Ask arch angel'); +('user_questions', 'EN', 'Ask arch angel'), +('admin_questions', 'DE', 'Fragen beantworten'), +('admin_questions', 'EN', 'Answer questions'); -- -------------------------------------------------------- @@ -1047,7 +1052,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307051093, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307053257, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php new file mode 100644 index 00000000..5355dd86 --- /dev/null +++ b/includes/pages/admin_questions.php @@ -0,0 +1,76 @@ + 0) + return '

        There are unanswered questions!

        '; + } + + return ""; +} + +function admin_questions() { + global $user; + + if (!isset ($_REQUEST['action'])) { + $open_questions = ""; + $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0"); + foreach ($questions as $question) { + $open_questions .= '' . UID2Nick($question['UID']) . '' . str_replace("\n", '
        ', $question['Question']) . ''; + $open_questions .= '

        '; + $open_questions .= 'Delete'; + } + + $answered_questions = ""; + $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0"); + foreach ($questions as $question) { + $answered_questions .= '' . UID2Nick($question['UID']) . '' . str_replace("\n", '
        ', $question['Question']) . ''; + $answered_questions .= '' . UID2Nick($question['AID']) . '' . str_replace("\n", '
        ', $question['Answer']) . ''; + $answered_questions .= 'Delete'; + } + + return template_render('../templates/admin_questions.html', array ( + 'link' => page_link_to("admin_questions"), + 'open_questions' => $open_questions, + 'answered_questions' => $answered_questions + )); + } else { + switch ($_REQUEST['action']) { + case 'answer' : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Question ID."); + + $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + if (count($question) > 0 && $question[0]['AID'] == "0") { + $answer = trim(preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['answer']))); + + if ($answer != "") { + sql_query("UPDATE `Questions` SET `AID`=" . sql_escape($user['UID']) . ", `Answer`='" . sql_escape($answer) . "' WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + header("Location: " . page_link_to("admin_questions")); + } else + return error("Please enter an answer!"); + } else + return error("No question found."); + break; + case 'delete' : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Question ID."); + + $question = sql_select("SELECT * FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + if (count($question) > 0) { + sql_query("DELETE FROM `Questions` WHERE `QID`=" . sql_escape($id) . " LIMIT 1"); + header("Location: " . page_link_to("admin_questions")); + } else + return error("No question found."); + break; + } + } +} +?> \ No newline at end of file diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php index e3e9a469..30871d9d 100644 --- a/includes/pages/user_messages.php +++ b/includes/pages/user_messages.php @@ -1,11 +1,13 @@ 0) - return '

        ' . Get_Text("pub_messages_new1") . " " . $new_messages . " " . Get_Text("pub_messages_new2") . '

        '; + if ($new_messages > 0) + return '

        ' . Get_Text("pub_messages_new1") . " " . $new_messages . " " . Get_Text("pub_messages_new2") . '

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

        Anfragen und FAQ

        - -
      • Alle Anfragen
        • -
      • Offene Anfragen ()
        • -
      • FAQ-Liste editiern
        • - diff --git a/www-ssl/admin/faq.php b/www-ssl/admin/faq.php deleted file mode 100644 index 779d8822..00000000 --- a/www-ssl/admin/faq.php +++ /dev/null @@ -1,271 +0,0 @@ - - Alle Anfragen:
        - - - - - - - - - - -\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } else { - echo "Nein\n"; - echo "\n"; - echo "\n"; - } - echo ""; - echo "\n"; - } - echo "
        FrageAnfragenderBeantwortet?AntwortAntwort vonchange
        " . mysql_result($Erg, $n, "Question") . "" . UID2Nick(mysql_result($Erg, $n, "UID")) . ""; - if (mysql_result($Erg, $n, "AID") > 0) { - echo "Ja" . mysql_result($Erg, $n, "Answer") . "" . UID2Nick(mysql_result($Erg, $n, "AID")) . "  xxx
        \n"; - break; - - case "open" : - $SQL = "SELECT * FROM `Questions` WHERE `AID`='0' ORDER BY `QID` DESC"; - $quest_bearb = 1; // Fragenliste anzeigen - echo "\t\tOffene Anfragen:
        \n"; - break; - - case "edit" : - if (!IsSet ($_GET["QID"])) - echo "\t\tFehlerhafter Aufruf...
        Bitte die Bearbeitung nochmals beginnen :)\n"; - else { - $SQL = "SELECT * FROM `Questions` WHERE `QID`='" . $_GET["QID"] . "'"; - $Erg = mysql_query($SQL, $con); - echo "\t\t
        \n"; - echo "\t\tAnfrage von " . UID2NICK(mysql_result($Erg, 0, "UID")) . ":
        \n"; - echo "\t\t\n"; - echo "

        Antwort der Erzengel:
        \n"; - if (mysql_result($Erg, 0, "Answer") == "") - echo "\t\t
        \n"; - else - echo "\t\t\n
        \n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t\t\n"; - echo "\t
        \n"; - if (mysql_result($Erg, 0, "AID") <> "0") { - echo "\tDu kannst diese Anfrage so wie sie ist, als Engel-FAQ eintrag übernehmen.
        \n"; - echo "Als FAQ-Eintrag sichern...\n"; - } - } // Abfrage der QID - break; - - case "save" : - if (!IsSet ($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten..."; - else { - $SQL = "UPDATE `Questions` SET `Question`='" . $_GET["Question"] . - "', `AID`='" . $_SESSION['UID'] . "' , `Answer`='" . $_GET["Answer"] . "' " . - "WHERE `QID`='" . $_GET["QID"] . "' LIMIT 1"; - $Erg = db_query($SQL, "save Question"); - if ($Erg == 1) { - echo "\tDer Eintrag wurde geändert
        \n"; - SetHeaderGo2Back(); - } else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - break; - - case "transfer" : - if (!IsSet ($_GET["QID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; - else { - $SQL1 = "SELECT * FROM `Questions` WHERE `QID`='" . $_GET["QID"] . "'"; - $Erg = mysql_query($SQL1, $con); - $SQL2 = "INSERT INTO `FAQ` Values ('', '" . - mysql_result($Erg, 0, "Question") . "', '" . mysql_result($Erg, 0, "Answer") . "')"; - $Erg = db_query($SQL2, "trasfert to request to the FAQ"); - if ($Erg == 1) - echo "\tDer Eintrag wurde übertragen.
        \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - - break; - - // *--------------------------------------------------------------------------- - // * FAQ - Bearbeitung - // *--------------------------------------------------------------------------- - // * je nach �bergabeoption ($quest) koennen FAQ's erfasst werden, - // * geaendert oder geloscht werden... - // *--------------------------------------------------------------------------- - case "faq" : - $quest_bearb = 0; // keine Fragenliste anzeigen, FAQ editieren... - echo "\tFAQ-Liste:
        "; - echo "Neuen Eintrag"; - - $SQL = "SELECT * FROM `FAQ`"; - $Erg = mysql_query($SQL, $con); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - for ($n = 0; $n < $Zeilen; $n++) - if (mysql_result($Erg, $n, "Antwort") != "") { - echo "\t

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

        \n"; - echo "\t

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

        \n"; - echo "\tBearbeiten\n
        ---
        \n"; - } - break; - - case "faqedit" : - if (!IsSet ($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf...
        Bitte die Bearbeitung nochmals beginnen :)\n"; - else { - $SQL = "SELECT * FROM `FAQ` WHERE `FID`='" . $_GET["FAQID"] . "'"; - $Erg = mysql_query($SQL, $con); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); -?> -
        - Frage:
        - -

        - Antwort:
        -
        - "> - - -
        -
        - "> - - -
        -\n"; - else - echo "\tEin Fehler ist aufgetreten. Ist der Eintag bereits gelöscht gewesen?\n"; - } - break; - - case "faqsave"; - if (!IsSet ($_GET["FAQID"])) - echo "\tFehlerhafter Aufruf... Bitte die Bearbeitung nochmal starten...\n"; - else { - $SQL = "UPDATE `FAQ` SET `Frage`='" . $_GET["Frage"] . "', `Antwort`='" . $_GET["Antwort"] . - "' WHERE `FID`='" . $_GET["FAQID"] . "' LIMIT 1"; - $Erg = db_query($SQL, $con); - if ($Erg == 1) - echo "\tDer Eintrag wurde geändert
        \n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - } - break; - - case "faqnew" : -?> -
        - Frage:
        -

        - Antwort:
        -
        - - -
        -\n"; - else - echo "\tEin Fehler ist aufgetreten. Sorry, du kannst es aber ja nochmal probieren :)\n"; - break; - - } //switch ($_GET["quest"]) - - // Hilfsroutine f�r die Anfragen: - // Fragenliste anzeigen??? - if ($quest_bearb == 1) { - $Erg = mysql_query($SQL, $con); - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - if ($Zeilen == 0) - echo "\tkeine vorhanden...\n"; - else - for ($n = 0; $n < $Zeilen; $n++) { - echo "\t

        " . nl2br(mysql_result($Erg, $n, "Question")) . "\n


        \n"; - echo "\tBearbeiten\n"; - echo "
        ---
        \n"; - } - - } - -} //if (IsSet($_GET["quest"])) -else { - echo "Bitte wähle aus, ob du:\n"; - echo "\n"; -} - -include ("includes/footer.php"); -?> diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index bfe050a5..44e1959c 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -109,6 +109,11 @@ td, th { border: 1px solid #888; } +textarea { + height: 200px; + width: 300px; +} + .background { background: #f0f0f0; } diff --git a/www-ssl/index.php b/www-ssl/index.php index d722de32..8ad025aa 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -73,6 +73,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_groups") { require_once ('includes/pages/admin_groups.php'); $content = admin_groups(); + } + elseif ($p == "admin_faq") { + require_once ('includes/pages/admin_faq.php'); + $content = admin_faq(); } else { require_once ('includes/pages/guest_start.php'); $content = guest_start(); diff --git a/www-ssl/nonpublic/faq.php b/www-ssl/nonpublic/faq.php deleted file mode 100644 index fcc17158..00000000 --- a/www-ssl/nonpublic/faq.php +++ /dev/null @@ -1,73 +0,0 @@ - -

        -
        - -

        - "> -
        -" . Get_Text(37) . "

        \n" . nl2br($_POST["frage"]) . "

        \n" . Get_Text(38) . "
        \n"; - - $SQL = "INSERT INTO `Questions` VALUES ('', '" . $_SESSION['UID'] . "', '" . $_POST["frage"] . "', '', '')"; - $Erg = mysql_query($SQL, $con); - -} -// Bisherige Anfragen: -echo "
        \n" . Get_Text(39) . "
        \n"; -echo "
        \n"; -echo "
        " . Get_Text(40) . "
        \n"; - -$SQL = "SELECT * FROM `Questions` WHERE `UID` = " . $_SESSION['UID'] . " AND `AID`='0' ORDER BY 'QID' DESC"; -$Erg = mysql_query($SQL, $con); - -// anzahl zeilen -$Zeilen = mysql_num_rows($Erg); - -if ($Zeilen == 0) { - Print_Text(41); - -} else { - for ($n = 0; $n < $Zeilen; $n++) { - echo "

        " . nl2br(mysql_result($Erg, $n, "Question")) . "
        \n"; - // Es gibt ja noch keine Antwort: - // echo "

        ".nl2br(mysql_result($Erg, $n, "Answer"))."

        \n"; - echo "\n
        ---
        "; - } -} - -echo "
        \n"; -echo "
        " . Get_Text(42) . "
        \n"; -$SQL = "SELECT * FROM `Questions` WHERE `UID`='" . $_SESSION['UID'] . "' and `AID`<>'0' ORDER BY 'QID' DESC"; -$Erg = mysql_query($SQL, $con); - -// anzahl zeilen -$Zeilen = mysql_num_rows($Erg); - -if ($Zeilen == 0) { - Print_Text(41); -} else { - for ($n = 0; $n < $Zeilen; $n++) { - echo "

        " . nl2br(mysql_result($Erg, $n, "Question")) . "
        \n"; - echo "

        " . nl2br(mysql_result($Erg, $n, "Answer")) . - "@" . UID2Nick(mysql_result($Erg, $n, "AID")) . "\n"; - echo "\n
        ---
        "; - } -} - -include ("includes/footer.php"); -?> -- cgit v1.2.3-54-g00ecf From d5d3db847e5202d2e0cc52881c5ecb970f2c7b98 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 01:40:25 +0200 Subject: cleanup, preparation --- includes/sys_menu.php | 4 ++++ txt/TODO | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/includes/sys_menu.php b/includes/sys_menu.php index ca34ee6c..2a05fdb4 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -22,6 +22,8 @@ function make_navigation() { // Engel Navigation $menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array ( "news", + "user_myshifts", + "user_shifts", "user_messages", "user_questions", "user_settings" @@ -29,8 +31,10 @@ function make_navigation() { // Admin Navigation $menu .= make_navigation_for(Get_Text('admin/'), array ( + "admin_usershifts", "admin_questions", "admin_angel_types", + "admin_shifts", "admin_rooms", "admin_groups", "admin_faq" diff --git a/txt/TODO b/txt/TODO index 5609482b..cebcb0de 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,3 +1,15 @@ +jetzt: + * news kommentieren + * news administrieren + * user administrieren + * schichtimport + * schichtadministration + * meine schichten + * schichten + * meetings + * weckservice? + +später: * MD5-Passwörter mit Salt speichern * Passwort-Mindestanforderungen stellen * User-Avatare (code liegt auskommentiert in user_settings.php) -- cgit v1.2.3-54-g00ecf From 91f6e7bbaf7c9ed8820fea59e041c8fa17bcea91 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 05:12:50 +0200 Subject: news refined --- DB/db_rewrite.sql | 76 ++++++++++------- includes/pages/user_news.php | 197 +++++++++++++++++++++++++------------------ includes/sys_user.php | 6 +- txt/TODO | 2 +- www-ssl/css/base.css | 73 ++++++++++++---- www-ssl/index.php | 4 + 6 files changed, 224 insertions(+), 134 deletions(-) diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index fa31c6f8..b85f04c9 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 23:02 +-- Erstellungszeit: 03. Juni 2011 um 03:12 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,21 +71,23 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 80), -('login', 24), +('news', 164), +('login', 26), ('logout', 13), -('start', 25), -('faq', 16), +('start', 26), +('faq', 18), ('credits', 3), ('register', 3), -('admin_rooms', 70), -('admin_angel_types', 69), -('user_settings', 116), -('user_messages', 111), -('admin_groups', 104), -('user_questions', 54), -('admin_questions', 41), -('admin_faq', 53); +('admin_rooms', 75), +('admin_angel_types', 70), +('user_settings', 125), +('user_messages', 112), +('admin_groups', 114), +('user_questions', 55), +('admin_questions', 42), +('admin_faq', 55), +('admin_news', 2), +('news_comments', 144); -- -------------------------------------------------------- @@ -131,25 +133,27 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=40 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=51 ; -- -- Daten für Tabelle `GroupPrivileges` -- INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES -(32, -2, 8), +(42, -2, 15), (24, -1, 5), -(31, -2, 11), -(30, -2, 9), +(40, -2, 4), +(41, -2, 3), (23, -1, 2), -(36, -4, 7), -(37, -4, 13), -(29, -2, 3), -(28, -2, 4), +(48, -4, 14), +(46, -4, 7), +(44, -2, 11), +(43, -2, 9), (12, -5, 10), -(38, -4, 12), -(39, -4, 6); +(47, -4, 13), +(49, -4, 12), +(45, -2, 8), +(50, -4, 6); -- -------------------------------------------------------- @@ -210,7 +214,7 @@ INSERT INTO `Messages` (`id`, `Datum`, `SUID`, `RUID`, `isRead`, `Text`) VALUES CREATE TABLE IF NOT EXISTS `News` ( `ID` int(11) NOT NULL AUTO_INCREMENT, - `Datum` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Datum` int(11) NOT NULL, `Betreff` varchar(150) NOT NULL DEFAULT '', `Text` text NOT NULL, `UID` int(11) NOT NULL DEFAULT '0', @@ -223,9 +227,9 @@ CREATE TABLE IF NOT EXISTS `News` ( -- INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES -(1, '2011-06-02 21:35:27', '', '', 1, 0), -(2, '2011-06-02 21:36:57', '', '', 1, 0), -(3, '2011-06-02 21:36:57', '', '', 1, 0); +(1, 1307070566, 'asdf', 'asdf', 1, 0), +(2, 1307070579, 'Achtung, Treffen!', 'Uiuiuiui.', 1, 0), +(3, 1307070686, 'Achtung, Treffen!', 'Jojojo!', 1, 1); -- -------------------------------------------------------- @@ -241,12 +245,16 @@ CREATE TABLE IF NOT EXISTS `news_comments` ( `UID` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`), KEY `Refid` (`Refid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; -- -- Daten für Tabelle `news_comments` -- +INSERT INTO `news_comments` (`ID`, `Refid`, `Datum`, `Text`, `UID`) VALUES +(1, 10, '2011-06-03 04:12:28', 'FOobar :)', 1), +(2, 10, '2011-06-03 04:13:03', 'FOobar :)', 1), +(3, 10, '2011-06-03 04:13:06', 'FOobar :)', 1); -- -------------------------------------------------------- @@ -260,7 +268,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=14 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=16 ; -- -- Daten für Tabelle `Privileges` @@ -279,7 +287,9 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (10, 'admin_groups', 'Manage usergroups and their rights'), (11, 'user_questions', 'Let users ask questions'), (12, 'admin_questions', 'Answer user''s questions'), -(13, 'admin_faq', 'Edit FAQs'); +(13, 'admin_faq', 'Edit FAQs'), +(14, 'admin_news', 'Administrate the news section'), +(15, 'news_comments', 'User can comment news'); -- -------------------------------------------------------- @@ -1016,7 +1026,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin_questions', 'DE', 'Fragen beantworten'), ('admin_questions', 'EN', 'Answer questions'), ('admin_faq', 'DE', 'FAQs bearbeiten'), -('admin_faq', 'EN', 'Edit FAQs'); +('admin_faq', 'EN', 'Edit FAQs'), +('news_comments', 'DE', 'News Kommentare'), +('news_comments', 'EN', 'News comments'); -- -------------------------------------------------------- @@ -1059,7 +1071,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307055685, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307070695, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 56c5bb68..34c346dd 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -1,108 +1,139 @@ " . Get_Text(3) . "" . user_news_output(); +function display_news($news) { + global $privileges, $p; + + $html .= ""; + $html .= '

        '; + $html .= '
        '; + $html .= date("Y-m-d H:i",$news['Datum']) . ', '; + $html .= UID2Nick($news['UID']); + if ($p != "news_comments") + $html .= ', Kommentare (' . sql_num_query("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . ') »'; + $html .= '
        '; + $html .= '

        '.($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '

        '; + $html .= '

        ' . ReplaceSmilies(nl2br($news['Text'])) . '

        '; + if (in_array("admin_news", $privileges)) + $html .= "
        Edit
        \n"; + + $html .= '
        '; + return $html; } -function user_news_output() { - global $DISPLAY_NEWS, $privileges; - +function user_news_comments() { + global $user; + $html = ""; + if (isset ($_REQUEST["nid"]) && preg_match("/^[0-9]{1,}$/", $_REQUEST['nid']) && sql_num_query("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1") > 0) { + $nid = $_REQUEST["nid"]; + list ($news) = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($_REQUEST['nid']) . " LIMIT 1"); + if (isset ($_REQUEST["text"])) { + $text = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['text'])); + sql_query("INSERT INTO `news_comments` (`Refid`, `Datum`, `Text`, `UID`) VALUES ('" . sql_escape($nid) . "', '" . date("Y-m-d H:i:s") . "', '" . sql_escape($text) . "', '" . sql_escape($user["UID"]) . "')"); + $html .= success("Eintrag wurde gespeichert"); + } - if (isset ($_POST["text"]) && isset ($_POST["betreff"]) && IsSet ($_POST["date"])) { - if (!isset ($_POST["treffen"])) - $_POST["treffen"] = 0; - $SQL = "INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " . - "VALUES ('" . sql_escape($_POST["date"]) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($_SESSION['uid']) . - "', '" . sql_escape($_POST["treffen"]) . "');"; - $Erg = sql_query($SQL); - if ($Erg == 1) - $html .= Get_Text(4); - } + $html .= '« Back'; + $html .= display_news($news); - if (!IsSet ($_GET["news_begin"])) - $_GET["news_begin"] = 0; + $html .= '

        Comments

        '; + + $comments = sql_select("SELECT * FROM `news_comments` WHERE `Refid`='" . $nid . "' ORDER BY 'ID'"); + foreach ($comments as $comment) { + $html .= '
        '; + $html .= DisplayAvatar($comment['UID']); + $html .= '
        '; + $html .= $comment['Datum'] . ', '; + $html .= UID2Nick($comment['UID']); + $html .= '
        '; + $html .= '

        ' . nl2br($comment['Text']) . '

        '; + $html .= '
        '; + } - if (!IsSet ($_GET["DISPLAY_NEWS"])) - $_GET["DISPLAY_NEWS"] = 5; + $html .= ""; + $html .= ' +
        +
        +

        Neuer Kommentar:

        +   + +
        + + + + + + +
        Text:
        +
        + +
        '; + } else { + $html .= "Fehlerhafter Aufruf!"; + } - $SQL = "SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . intval($_GET["news_begin"]) . ", " . intval($_GET["DISPLAY_NEWS"]); - $Erg = sql_query($SQL); + return $html; +} - // anzahl zeilen - $news_rows = mysql_num_rows($Erg); +function user_news() { + global $DISPLAY_NEWS, $privileges, $user; - for ($n = 0; $n < $news_rows; $n++) { + $html = ""; - if (mysql_result($Erg, $n, "Treffen") == 0) - $html .= "

        "; - else - $html .= "

        "; - - $html .= "" . ReplaceSmilies(mysql_result($Erg, $n, "Betreff")) . "\n"; - - // Schow Admin Page - if ($_SESSION['CVS']["admin/news.php"] == "Y") - $html .= " [edit]
        \n\t\t"; - - $html .= "
           " . mysql_result($Erg, $n, "Datum") . ", "; - $html .= UID2Nick(mysql_result($Erg, $n, "UID")) . ""; - // avatar anzeigen? - $html .= DisplayAvatar(mysql_result($Erg, $n, "UID")); - $html .= "

        \n"; - $html .= "

        " . ReplaceSmilies(nl2br(mysql_result($Erg, $n, "Text"))) . "

        \n"; - $RefID = mysql_result($Erg, $n, "ID"); - $countSQL = "SELECT COUNT(*) FROM `news_comments` WHERE `Refid`='$RefID'"; - $countErg = sql_query($countSQL); - $countcom = mysql_result($countErg, 0, "COUNT(*)"); - $html .= "

        $countcom comments

        \n\n"; + if (isset ($_POST["text"]) && isset ($_POST["betreff"])) { + if (!isset ($_POST["treffen"]) || !in_array("admin_news", $privileges)) + $_POST["treffen"] = 0; + sql_query("INSERT INTO `News` (`Datum`, `Betreff`, `Text`, `UID`, `Treffen`) " . + "VALUES ('" . sql_escape(time()) . "', '" . sql_escape($_POST["betreff"]) . "', '" . sql_escape($_POST["text"]) . "', '" . sql_escape($user['UID']) . + "', '" . sql_escape($_POST["treffen"]) . "');"); + $html .= success(Get_Text(4)); } - $html .= "
        \n\n"; - $rowerg = sql_query("SELECT * FROM `News`"); - $rows = mysql_num_rows($rowerg); - $dis_rows = round(($rows / $DISPLAY_NEWS) + 0.5); + if (isset ($_REQUEST['page']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['page'])) + $page = $_REQUEST['page']; + else + $page = 0; + + $news = sql_select("SELECT * FROM `News` ORDER BY `ID` DESC LIMIT " . ($page * $DISPLAY_NEWS) . ", " . $DISPLAY_NEWS); + foreach ($news as $entry) + $html .= display_news($entry); + + $html .= "
        \n\n"; + $dis_rows = ceil(sql_num_query("SELECT * FROM `News`") / $DISPLAY_NEWS); $html .= Get_Text(5); - for ($i = 1; $i <= $dis_rows; $i++) { - if (!((($i * $DISPLAY_NEWS) - $_GET["news_begin"]) == $DISPLAY_NEWS)) { - $html .= '' . $i . '  '; - } else { - $html .= "$i  "; - } + for ($i = 0; $i < $dis_rows; $i++) { + if ($i == $_REQUEST['page']) + $html .= ($i +1) . "  "; + else + $html .= '' . ($i +1) . '  '; } $html .= '
        -
        -

        ' . Get_Text(6) . '

        -   - -
        - - - - - - - - - - - '; - if (in_array('news_add_meeting', $privileges)) { +
        +

        ' . Get_Text(6) . '

        +   + + +
        ' . Get_Text(7) . '
        ' . Get_Text(8) . '
        + + + + + + + + '; + if (in_array('admin_news', $privileges)) { $html .= ' - - - '; + + + '; } $html .= '
        ' . Get_Text(7) . '
        ' . Get_Text(8) . '
        ' . Get_Text(9) . '
        ' . Get_Text(9) . '
        -
        - -
        '; +
        + + '; return $html; } ?> \ No newline at end of file diff --git a/includes/sys_user.php b/includes/sys_user.php index 6274003d..5dcf3f1f 100644 --- a/includes/sys_user.php +++ b/includes/sys_user.php @@ -75,9 +75,9 @@ function displayPictur($UID, $height = "30") { global $url, $ENGEL_ROOT; if ($height > 0) - return ("\"picture"); + return ("
        \"picture
        "); else - return ("\"picture"); + return ("
        \"picture
        "); } function displayavatar($UID, $height = "30") { @@ -92,7 +92,7 @@ function displayavatar($UID, $height = "30") { if (mysql_num_rows($aerg)) if (mysql_result($aerg, 0, "Avatar") > 0) - return (" "); + return'
        '. (" ").'
        '; } function UIDgekommen($UID) { diff --git a/txt/TODO b/txt/TODO index cebcb0de..fb1b3098 100644 --- a/txt/TODO +++ b/txt/TODO @@ -10,12 +10,12 @@ jetzt: * weckservice? später: + * Zurück-/Backlinks setzen * MD5-Passwörter mit Salt speichern * Passwort-Mindestanforderungen stellen * User-Avatare (code liegt auskommentiert in user_settings.php) * user_messages schön machen * Formulare weg von Tabellen - * user_news lässt sich nicht bedienen (POST ohne redirects...) * Privilegien korrigieren (an die vom CVS anpassen) * Beim Raum-Management die benötigten Engel anzeigen * Löschen nur mit Rückfrage diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 44e1959c..0a137099 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -15,6 +15,12 @@ header { width: 100%; } +article, details { + clear: none; + display: block; + float: none; +} + footer { clear: both; display: block; @@ -64,13 +70,13 @@ dd { margin-left: 20px; } -h1, h4 { +h1, h2, h3, h4 { font-size: 16px; padding: 0 4px; } hr { - margin: 10px 0; + margin: 10px 0; } ul { @@ -81,7 +87,7 @@ nav { margin: 0 10px 10px 0; } -#content article { +#content > article { padding: 10px; } @@ -98,20 +104,28 @@ a.sprache img { } table { - border-collapse: collapse; + border-collapse: collapse; } th { - background: #f0f0f0; + background: #f0f0f0; } td, th { - border: 1px solid #888; + border: 1px solid #888; } textarea { - height: 200px; - width: 300px; + height: 200px; + width: 300px; +} + +.clear { + clear: both; +} + +.pagination { + text-align: center; } .background { @@ -127,20 +141,49 @@ textarea { } .error { - color: #f00; + color: #f00; } .success { - color: #090; + color: #090; } .notice { - background: #f0f0f0; - border: 2px solid #888; - margin: 10px; - padding: 10px; + background: #f0f0f0; + border: 2px solid #888; + margin: 10px; + padding: 10px; } .new_message { - font-weight: bold; + font-weight: bold; +} + +.news_comment, .news { + border: 1px solid #888; + margin: 10px 0; +} + +.news_comment details, .news details { + background: #f0f0f0; + padding: 4px; +} + +.news_comment p, .news p, h3 { + padding: 4px; +} + +.news_comment p, .news_comment details { + margin-left: 72px; +} + +.avatar { + float: left; + margin: 4px; + max-width: 64px; +} + +.news.meeting { + border: 1px solid #000; + box-shadow: 1px 1px 5px #888; } diff --git a/www-ssl/index.php b/www-ssl/index.php index 8ad025aa..9524459a 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -36,6 +36,10 @@ if (in_array($p, $privileges)) { require_once ('includes/pages/user_news.php'); $content = user_news(); } + elseif ($p == "news_comments") { + require_once ('includes/pages/user_news.php'); + $content = user_news_comments(); + } elseif ($p == "user_messages") { $content = user_messages(); } -- cgit v1.2.3-54-g00ecf From 9325d7a78adac2aeee96324fa23528f8110d198f Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 05:21:11 +0200 Subject: news refined --- includes/pages/admin_rooms.php | 11 ++--- includes/pages/user_news.php | 2 +- txt/TODO | 6 +-- www-ssl/nonpublic/news_comments.php | 86 ------------------------------------- 4 files changed, 7 insertions(+), 98 deletions(-) delete mode 100644 www-ssl/nonpublic/news_comments.php diff --git a/includes/pages/admin_rooms.php b/includes/pages/admin_rooms.php index 6695d6a9..be54b8ea 100644 --- a/includes/pages/admin_rooms.php +++ b/includes/pages/admin_rooms.php @@ -9,8 +9,6 @@ function admin_rooms() { ",
        \nhier hast du die Möglichkeit, neue Räume für die Schichtpläne einzutragen " . "oder vorhandene abzuändern:

        \n"; - $html .= "Neuen Raum/Ort eintragen
        \n"; - // Räume auflisten if (count($rooms) > 0) { $html .= ''; @@ -20,9 +18,7 @@ function admin_rooms() { // Tabellenüberschriften generieren foreach ($rooms[0] as $attr => $tmp) - if ($attr == 'RID') - $html .= ''; - else + if ($attr != 'RID') $html .= ''; $html .= ''; $html .= ''; @@ -30,9 +26,7 @@ function admin_rooms() { foreach ($rooms as $i => $room) { $html .= ''; foreach ($room as $attr => $value) - if ($attr == 'RID') - $html .= ''; - else + if ($attr != 'RID') $html .= ''; $html .= ''; $html .= ''; @@ -40,6 +34,7 @@ function admin_rooms() { $html .= '
        Anzahl: ' . count($rooms) . '' . $attr . ' 
        ' . ($i +1) . '' . $value . 'Edit
        '; } + $html .= "
        Neuen Raum/Ort eintragen
        \n"; } else { switch ($_REQUEST["action"]) { diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 34c346dd..7b4f9482 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -35,7 +35,7 @@ function user_news_comments() { $html .= '« Back'; $html .= display_news($news); - $html .= '

        Comments

        '; + $html .= '

        Kommentare

        '; $comments = sql_select("SELECT * FROM `news_comments` WHERE `Refid`='" . $nid . "' ORDER BY 'ID'"); foreach ($comments as $comment) { diff --git a/txt/TODO b/txt/TODO index fb1b3098..42684e23 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,5 +1,4 @@ jetzt: - * news kommentieren * news administrieren * user administrieren * schichtimport @@ -14,12 +13,13 @@ später: * MD5-Passwörter mit Salt speichern * Passwort-Mindestanforderungen stellen * User-Avatare (code liegt auskommentiert in user_settings.php) - * user_messages schön machen + * user_messages schön machen (dialogbasiert) * Formulare weg von Tabellen * Privilegien korrigieren (an die vom CVS anpassen) - * Beim Raum-Management die benötigten Engel anzeigen + * (Beim Raum-Management die benötigten Engel anzeigen) * Löschen nur mit Rückfrage * FAQ ordentlich mehrsprachig machen + * Fertig übersetzen/Sprachwirrwarr beseitigen * schichten ueber monatsgrenzen einbaue im moment werden die tage nur hochgezaehlt und die monatzgrenzen werden ignoriert diff --git a/www-ssl/nonpublic/news_comments.php b/www-ssl/nonpublic/news_comments.php deleted file mode 100644 index db95ec8c..00000000 --- a/www-ssl/nonpublic/news_comments.php +++ /dev/null @@ -1,86 +0,0 @@ -
        "; - SetHeaderGo2Back(); - } - } - - $SQL = "SELECT * FROM `news_comments` WHERE `Refid`='" . $_GET["nid"] . "' ORDER BY 'ID'"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - // anzahl zeilen - $news_rows = mysql_num_rows($Erg); -?> - - - - - - - - - - -"; - echo "\t\t"; - echo "\t\t"; - echo ""; - echo "\t"; - echo "\t\t"; - echo ""; - } - - echo "
        DatumNick
        Kommentar
        "; - echo mysql_result($Erg, $n, "Datum"); - echo "\t\t"; - echo UID2Nick(mysql_result($Erg, $n, "UID")); - // avatar anzeigen? - echo DisplayAvatar(mysql_result($Erg, $n, "UID")); - echo "\t\t
        "; - echo nl2br(mysql_result($Erg, $n, "Text")) . "\n"; - echo "\t\t
        "; -?> - -
        -
        -

        Neuer Kommentar:

        -  - -
        -"> - - - - - -
        Text:
        -
        - -
        - - -- cgit v1.2.3-54-g00ecf From 9941d2a7a799ad45b8e54c528c2161f880ab159e Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 05:49:56 +0200 Subject: admin news --- DB/db_rewrite.sql | 39 +++++++++---------- includes/pages/admin_news.php | 87 +++++++++++++++++++++++++++++++++++++++++++ txt/TODO | 2 +- www-ssl/admin/index.php | 21 ----------- www-ssl/index.php | 4 ++ 5 files changed, 112 insertions(+), 41 deletions(-) create mode 100644 includes/pages/admin_news.php delete mode 100644 www-ssl/admin/index.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index b85f04c9..f5ba1c6d 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 03:12 +-- Erstellungszeit: 03. Juni 2011 um 03:49 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,23 +71,23 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 164), +('news', 187), ('login', 26), ('logout', 13), ('start', 26), -('faq', 18), +('faq', 19), ('credits', 3), ('register', 3), -('admin_rooms', 75), -('admin_angel_types', 70), -('user_settings', 125), -('user_messages', 112), -('admin_groups', 114), +('admin_rooms', 89), +('admin_angel_types', 71), +('user_settings', 126), +('user_messages', 113), +('admin_groups', 117), ('user_questions', 55), ('admin_questions', 42), ('admin_faq', 55), -('admin_news', 2), -('news_comments', 144); +('admin_news', 32), +('news_comments', 151); -- -------------------------------------------------------- @@ -226,10 +226,6 @@ CREATE TABLE IF NOT EXISTS `News` ( -- Daten für Tabelle `News` -- -INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES -(1, 1307070566, 'asdf', 'asdf', 1, 0), -(2, 1307070579, 'Achtung, Treffen!', 'Uiuiuiui.', 1, 0), -(3, 1307070686, 'Achtung, Treffen!', 'Jojojo!', 1, 1); -- -------------------------------------------------------- @@ -245,7 +241,7 @@ CREATE TABLE IF NOT EXISTS `news_comments` ( `UID` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`), KEY `Refid` (`Refid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; -- -- Daten für Tabelle `news_comments` @@ -254,7 +250,8 @@ CREATE TABLE IF NOT EXISTS `news_comments` ( INSERT INTO `news_comments` (`ID`, `Refid`, `Datum`, `Text`, `UID`) VALUES (1, 10, '2011-06-03 04:12:28', 'FOobar :)', 1), (2, 10, '2011-06-03 04:13:03', 'FOobar :)', 1), -(3, 10, '2011-06-03 04:13:06', 'FOobar :)', 1); +(3, 10, '2011-06-03 04:13:06', 'FOobar :)', 1), +(4, 3, '2011-06-03 05:20:05', 'Fünününü!', 1); -- -------------------------------------------------------- @@ -327,12 +324,14 @@ CREATE TABLE IF NOT EXISTS `Room` ( `show` char(1) NOT NULL DEFAULT 'Y', `Number` int(11) DEFAULT NULL, PRIMARY KEY (`RID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; -- -- Daten für Tabelle `Room` -- +INSERT INTO `Room` (`RID`, `Name`, `Man`, `FromPentabarf`, `show`, `Number`) VALUES +(2, 'Mein Zimmer', 'msquare', 'N', 'Y', 1337); -- -------------------------------------------------------- @@ -1028,7 +1027,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin_faq', 'DE', 'FAQs bearbeiten'), ('admin_faq', 'EN', 'Edit FAQs'), ('news_comments', 'DE', 'News Kommentare'), -('news_comments', 'EN', 'News comments'); +('news_comments', 'EN', 'News comments'), +('admin_news', 'DE', 'News verwalten'), +('admin_news', 'EN', 'Manage news'); -- -------------------------------------------------------- @@ -1071,7 +1072,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307070695, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307072950, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php new file mode 100644 index 00000000..2c6e1f45 --- /dev/null +++ b/includes/pages/admin_news.php @@ -0,0 +1,87 @@ + 0) { + list ($news) = $news; + + $html .= '« Back'; + + $html .= "
        \n"; + + $html .= "\n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= "
        Datum" . + date("Y-m-d H:i", $news['Datum']) . "
        Betreff
        Text
        Engel" . + UID2Nick($news["UID"]) . "
        Treffen" . html_select_key('eTreffen', array ( + '1' => "Ja", + '0' => "Nein" + ), $news['Treffen']) . "
        "; + + $html .= "\n"; + $html .= "\n"; + $html .= "
        "; + + $html .= "
        \n"; + $html .= "\n"; + $html .= "\n"; + $html .= "
        "; + } else + return error("No News found."); + break; + + case 'save' : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing News ID."); + + $news = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + if (count($news) > 0) { + list ($news) = $news; + + sql_query("UPDATE `News` SET `Datum`='" . sql_escape(time()) . "', `Betreff`='" . sql_escape($_POST["eBetreff"]) . "', `Text`='" . sql_escape($_POST["eText"]) . "', `UID`='" . sql_escape($user['UID']) . + "', `Treffen`='" . sql_escape($_POST["eTreffen"]) . "' WHERE `ID`=".sql_escape($id)." LIMIT 1"); + header("Location: " . page_link_to("news")); + } else + return error("No News found."); + break; + + case 'delete' : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing News ID."); + + $news = sql_select("SELECT * FROM `News` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + if (count($news) > 0) { + list ($news) = $news; + + sql_query("DELETE FROM `news` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + header("Location: " . page_link_to("news")); + } else + return error("No News found."); + break; + } + } + return $html; +} +?> \ No newline at end of file diff --git a/txt/TODO b/txt/TODO index 42684e23..02dd8626 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,5 +1,4 @@ jetzt: - * news administrieren * user administrieren * schichtimport * schichtadministration @@ -20,6 +19,7 @@ später: * Löschen nur mit Rückfrage * FAQ ordentlich mehrsprachig machen * Fertig übersetzen/Sprachwirrwarr beseitigen + * Übersetzung * schichten ueber monatsgrenzen einbaue im moment werden die tage nur hochgezaehlt und die monatzgrenzen werden ignoriert diff --git a/www-ssl/admin/index.php b/www-ssl/admin/index.php deleted file mode 100644 index 4e761078..00000000 --- a/www-ssl/admin/index.php +++ /dev/null @@ -1,21 +0,0 @@ -\n"; -?> - -du bist jetzt im Erzengel-Bereich. Hier kannst du die Engel-Verwaltung vornehmen.

        - -Bitte melde dich hier nach getaner Arbeit immer ab, damit kein anderer hier Änderungen vornehmen kann. - - - diff --git a/www-ssl/index.php b/www-ssl/index.php index 9524459a..c62b03e0 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -66,6 +66,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_questions") { $content = admin_questions(); } + elseif ($p == "admin_news") { + require_once ('includes/pages/admin_news.php'); + $content = admin_news(); + } elseif ($p == "admin_angel_types") { require_once ('includes/pages/admin_angel_types.php'); $content = admin_angel_types(); -- cgit v1.2.3-54-g00ecf From 705370aec6c21a7e1a91d58d0ae4f3f1aaaab081 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 05:50:36 +0200 Subject: admin news --- www-ssl/admin/news.php | 123 ------------------------------------------------- 1 file changed, 123 deletions(-) delete mode 100644 www-ssl/admin/news.php diff --git a/www-ssl/admin/news.php b/www-ssl/admin/news.php deleted file mode 100644 index b6d9dc69..00000000 --- a/www-ssl/admin/news.php +++ /dev/null @@ -1,123 +0,0 @@ - -Hallo ,
        -hier kannst du die News säubern... falls jemand auf die Idee kommt, -hier herumzuspamen oder aus Versehen falsche Informationen zu hinterlegen :)

        - - - - - - - - - - -\n"; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t "; - echo "\t\n"; - } - echo "
        DatumBetreffTextErfasserEngeltreffÄnd.
        ".mysql_result($Erg, $i, "Datum")."".mysql_result($Erg, $i, "Betreff")."".mysql_result($Erg, $i, "Text")."".UID2Nick(mysql_result($Erg, $i, "UID"))."".mysql_result($Erg, $i, "Treffen")."XXX
        "; -} -else -{ - - unSet($chsql); - - switch ($_GET["action"]) - { - case 'change': - if (isset($_GET["date"])) - { - $SQL = "SELECT * FROM `News` WHERE (`Datum`='". $_GET["date"]. "')"; - $Erg = mysql_query($SQL, $con); - - if( mysql_num_rows( $Erg)>0) - { - echo "
        \n"; - - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
        Datum
        Betreff
        Text
        Engel
        Treffen
        "; - - echo "\n"; - echo "\n"; - echo "\n"; - echo "
        "; - - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - } - else - echo "FEHLER: Eintrag \"". $_GET["date"]. "\" nicht gefunden"; - } - else - echo "Fehler: \"date\" nicht �bergeben"; - break; - - case 'change_save': - if( isset($_GET["date"]) && isset($_GET["eBetreff"]) && isset($_GET["eText"]) ) - $chsql="UPDATE `News` SET `Betreff`='". $_GET["eBetreff"]. "', `Text`='". $_GET["eText"]. - "', `Treffen`='". $_GET["eTreffen"]. "' WHERE (`Datum`='". $_GET["date"]. "') limit 1"; - else - echo "Fehler: nicht gen�gend parameter �bergeben"; - break; - - case 'delete': - if (isset($_POST["date"])) - $chsql="DELETE FROM `News` WHERE `Datum`='". $_POST["date"]. "' LIMIT 1"; - else - echo "Fehler: \"date\" nicht �bergeben"; - break; - } //SWITCH - - if (IsSet($chsql)) - { - // SQL-Statement ausf�hren... - $Erg = mysql_query($chsql, $con); - If ($Erg == 1) - echo "Änderung erfolgreich gesichert..."; - else - echo "Ein Fehler ist aufgetreten... probiere es am besten nocheinmal... :)

        \n". - mysql_error($con). "

        \n[$chsql]"; - SetHeaderGo2Back(); - } -}// IF-ELSE - -include ("includes/footer.php"); -?> - -- cgit v1.2.3-54-g00ecf From 35fe4b3ed65718e9d09951b8879cc7cc69f7c1ef Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 06:40:29 +0200 Subject: admin user --- DB/db_rewrite.sql | 36 ++++++++------ includes/funktion_db_list.php | 27 +++++----- includes/pages/admin_user.php | 111 ++++++++++++++++++++++++++++++++++++++++++ includes/sys_menu.php | 1 + www-ssl/css/base.css | 16 ++++++ www-ssl/index.php | 4 ++ 6 files changed, 165 insertions(+), 30 deletions(-) create mode 100644 includes/pages/admin_user.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index f5ba1c6d..f713c813 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 03:49 +-- Erstellungszeit: 03. Juni 2011 um 04:40 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,23 +71,24 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 187), +('news', 190), ('login', 26), ('logout', 13), ('start', 26), ('faq', 19), ('credits', 3), -('register', 3), +('register', 8), ('admin_rooms', 89), ('admin_angel_types', 71), ('user_settings', 126), ('user_messages', 113), -('admin_groups', 117), +('admin_groups', 125), ('user_questions', 55), ('admin_questions', 42), ('admin_faq', 55), ('admin_news', 32), -('news_comments', 151); +('news_comments', 151), +('admin_user', 55); -- -------------------------------------------------------- @@ -133,7 +134,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=51 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=64 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -145,15 +146,17 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (40, -2, 4), (41, -2, 3), (23, -1, 2), -(48, -4, 14), -(46, -4, 7), +(62, -4, 16), +(61, -4, 6), (44, -2, 11), (43, -2, 9), (12, -5, 10), -(47, -4, 13), -(49, -4, 12), +(60, -4, 12), +(59, -4, 14), (45, -2, 8), -(50, -4, 6); +(58, -4, 13), +(57, -4, 7), +(63, -4, 5); -- -------------------------------------------------------- @@ -265,7 +268,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=16 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=17 ; -- -- Daten für Tabelle `Privileges` @@ -286,7 +289,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (12, 'admin_questions', 'Answer user''s questions'), (13, 'admin_faq', 'Edit FAQs'), (14, 'admin_news', 'Administrate the news section'), -(15, 'news_comments', 'User can comment news'); +(15, 'news_comments', 'User can comment news'), +(16, 'admin_user', 'Administrate the angels'); -- -------------------------------------------------------- @@ -984,8 +988,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'EN', 'Dect'), ('admin/dect_call.php', 'DE', ' '), ('admin/dect_call.php', 'EN', ' '), -('admin/user.php', 'DE', 'Engelliste'), -('admin/user.php', 'EN', 'Drone-list'), +('admin_user', 'DE', 'Engelliste'), +('admin_user', 'EN', 'Manage angels'), ('admin/userDefaultSetting.php', 'DE', 'Engel Voreinstellungen'), ('admin/userDefaultSetting.php', 'EN', 'Drone Default Setting'), ('admin/UserPicture.php', 'DE', 'Benutzerbilder'), @@ -1072,7 +1076,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307072950, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307075960, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php index 44e3d865..3e2878da 100644 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -34,32 +34,31 @@ function funktion_db_element_list_2row( $TopicName, $SQL) { - global $con; + $html = ""; + $html .= "\n"; + $html .= ""; +# $html .= "\n"; - echo "
        $TopicName

        $TopicName
        \n"; - echo ""; -# echo "\n"; - - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); + $Erg = sql_query($SQL); - echo ""; + $html .= ""; for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) { - echo ""; + $html .= ""; } - echo ""; + $html .= ""; for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) { - echo ""; + $html .= ""; for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) { - echo ""; + $html .= ""; } - echo ""; + $html .= ""; } - echo "
        $TopicName

        $TopicName
        ". mysql_field_name($Erg, $m). "". mysql_field_name($Erg, $m). "
        ".mysql_result($Erg, $n, $m). "".mysql_result($Erg, $n, $m). "
        \n"; + $html .= "\n"; + return $html; } ?> diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php new file mode 100644 index 00000000..b64c9678 --- /dev/null +++ b/includes/pages/admin_user.php @@ -0,0 +1,111 @@ +Neuen Engel eintragen »

        \n"; + + if (!isset ($_GET["OrderBy"])) + $_GET["OrderBy"] = "Nick"; + $SQL = "SELECT * FROM `User` ORDER BY `" . $_GET["OrderBy"] . "` ASC"; + $Erg = sql_query($SQL); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + $html .= "Anzahl Engel: $Zeilen

        \n"; + $html .= ' + + + + + + + + + + + + + '; + $Gekommen = 0; + $Active = 0; + $Tshirt = 0; + + for ($n = 0; $n < $Zeilen; $n++) { + $title = ""; + $user_groups = sql_select("SELECT * FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape(mysql_result($Erg, $n, "UID")) . " ORDER BY `Groups`.`Name`"); + $groups = array (); + foreach ($user_groups as $user_group) { + $groups[] = $user_group['Name']; + } + $title .= 'Groups: ' . join(", ", $groups) . "
        "; + if (strlen(mysql_result($Erg, $n, "Telefon")) > 0) + $title .= "Tel: " . mysql_result($Erg, $n, "Telefon") . "
        "; + if (strlen(mysql_result($Erg, $n, "Handy")) > 0) + $title .= "Handy: " . mysql_result($Erg, $n, "Handy") . "
        "; + if (strlen(mysql_result($Erg, $n, "DECT")) > 0) + $title .= "DECT: " . + mysql_result($Erg, $n, "DECT") . "
        "; + if (strlen(mysql_result($Erg, $n, "Hometown")) > 0) + $title .= "Hometown: " . mysql_result($Erg, $n, "Hometown") . "
        "; + if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0) + $title .= "Last login: " . date("Y-m-d H:i", mysql_result($Erg, $n, "lastLogIn")) . "
        "; + if (strlen(mysql_result($Erg, $n, "Art")) > 0) + $title .= "Type: " . mysql_result($Erg, $n, "Art") . "
        "; + if (strlen(mysql_result($Erg, $n, "ICQ")) > 0) + $title .= "ICQ: " . mysql_result($Erg, $n, "ICQ") . "
        "; + if (strlen(mysql_result($Erg, $n, "jabber")) > 0) + $title .= "jabber: " . mysql_result($Erg, $n, "jabber") . "
        "; + + $html .= "\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $Gekommen += mysql_result($Erg, $n, "Gekommen"); + $html .= "\t\n"; + $Active += mysql_result($Erg, $n, "Aktiv"); + $html .= "\t\n"; + $Tshirt += mysql_result($Erg, $n, "Tshirt"); + $html .= "\t\n"; + $html .= ""; + $html .= "\t\n"; + $html .= "\n"; + } + $html .= "" . + "" . + "\n"; + $html .= "\t
        + Nick + Vorname NameAlter + E-Mail + GrößeGekommenAktivT-ShirtRegistrierÄnd.
        " . mysql_result($Erg, $n, "Nick") . "" . mysql_result($Erg, $n, "Vorname") . " " . mysql_result($Erg, $n, "Name") . "" . mysql_result($Erg, $n, "Alter") . ""; + if (strlen(mysql_result($Erg, $n, "email")) > 0) + $html .= "" . + mysql_result($Erg, $n, "email") . ""; + $html .= ''; + $html .= "" . mysql_result($Erg, $n, "Size") . "" . mysql_result($Erg, $n, "Gekommen") . "" . mysql_result($Erg, $n, "Aktiv") . "" . mysql_result($Erg, $n, "Tshirt") . "" . mysql_result($Erg, $n, "CreateDate") . "" . 'Edit' . + "
        $Gekommen$Active$Tshirt
        \n"; + // Ende Userliste + + $html .= "

        Statistics

        "; + $html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + + $html .= "
        \n"; + + $html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + + $html .= "
        \n"; + + $html .= funktion_db_element_list_2row("Used Groups", "SELECT Groups.Name AS 'GroupName', COUNT(Groups.Name) AS Count FROM `UserGroups` " . + "LEFT JOIN `Groups` ON Groups.UID = UserGroups.group_id " . + "WHERE (UserGroups.group_id!='NULL') " . + "GROUP BY `GroupName` " . + ""); + return $html; +} +?> \ No newline at end of file diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 2a05fdb4..6a10c32b 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -31,6 +31,7 @@ function make_navigation() { // Admin Navigation $menu .= make_navigation_for(Get_Text('admin/'), array ( + "admin_user", "admin_usershifts", "admin_questions", "admin_angel_types", diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 0a137099..236eba81 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -120,6 +120,22 @@ textarea { width: 300px; } +.hidden { + background: #fff; + border: 1px solid #888; + display: none; + font-size: 12px; + padding: 4px; +} + +td .hidden { + position: absolute; +} + +tr:hover .hidden { + display: block; +} + .clear { clear: both; } diff --git a/www-ssl/index.php b/www-ssl/index.php index c62b03e0..f6c6aaa2 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -66,6 +66,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_questions") { $content = admin_questions(); } + elseif ($p == "admin_user") { + require_once ('includes/pages/admin_user.php'); + $content = admin_user(); + } elseif ($p == "admin_news") { require_once ('includes/pages/admin_news.php'); $content = admin_news(); -- cgit v1.2.3-54-g00ecf From 11e274a6fedc639223285557766b13b405c03be8 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 06:47:35 +0200 Subject: user meetings --- DB/db_rewrite.sql | 43 ++++++----- includes/pages/user_news.php | 71 ++++++++++++------ includes/sys_menu.php | 1 + www-ssl/admin/user.php | 133 --------------------------------- www-ssl/index.php | 4 + www-ssl/nonpublic/engelbesprechung.php | 29 ------- 6 files changed, 80 insertions(+), 201 deletions(-) delete mode 100644 www-ssl/admin/user.php delete mode 100644 www-ssl/nonpublic/engelbesprechung.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index f713c813..20a23f1e 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 04:40 +-- Erstellungszeit: 03. Juni 2011 um 04:47 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 190), +('news', 192), ('login', 26), ('logout', 13), ('start', 26), @@ -82,13 +82,14 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES ('admin_angel_types', 71), ('user_settings', 126), ('user_messages', 113), -('admin_groups', 125), +('admin_groups', 129), ('user_questions', 55), ('admin_questions', 42), ('admin_faq', 55), -('admin_news', 32), +('admin_news', 33), ('news_comments', 151), -('admin_user', 55); +('admin_user', 59), +('user_meetings', 5); -- -------------------------------------------------------- @@ -134,29 +135,30 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=64 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=71 ; -- -- Daten für Tabelle `GroupPrivileges` -- INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES -(42, -2, 15), +(69, -2, 11), (24, -1, 5), -(40, -2, 4), -(41, -2, 3), +(68, -2, 9), +(67, -2, 17), (23, -1, 2), (62, -4, 16), (61, -4, 6), -(44, -2, 11), -(43, -2, 9), +(66, -2, 15), +(65, -2, 3), (12, -5, 10), (60, -4, 12), (59, -4, 14), -(45, -2, 8), +(64, -2, 4), (58, -4, 13), (57, -4, 7), -(63, -4, 5); +(63, -4, 5), +(70, -2, 8); -- -------------------------------------------------------- @@ -223,12 +225,14 @@ CREATE TABLE IF NOT EXISTS `News` ( `UID` int(11) NOT NULL DEFAULT '0', `Treffen` tinyint(4) NOT NULL DEFAULT '0', PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ; -- -- Daten für Tabelle `News` -- +INSERT INTO `News` (`ID`, `Datum`, `Betreff`, `Text`, `UID`, `Treffen`) VALUES +(4, 1307076340, 'Achtung, Treffen!', '', 1, 1); -- -------------------------------------------------------- @@ -268,7 +272,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=17 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=18 ; -- -- Daten für Tabelle `Privileges` @@ -290,7 +294,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (13, 'admin_faq', 'Edit FAQs'), (14, 'admin_news', 'Administrate the news section'), (15, 'news_comments', 'User can comment news'), -(16, 'admin_user', 'Administrate the angels'); +(16, 'admin_user', 'Administrate the angels'), +(17, 'user_meetings', 'Lists meetings (news)'); -- -------------------------------------------------------- @@ -1033,7 +1038,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('news_comments', 'DE', 'News Kommentare'), ('news_comments', 'EN', 'News comments'), ('admin_news', 'DE', 'News verwalten'), -('admin_news', 'EN', 'Manage news'); +('admin_news', 'EN', 'Manage news'), +('user_meetings', 'DE', 'Treffen'), +('user_meetings', 'EN', 'Meetings'); -- -------------------------------------------------------- @@ -1076,7 +1083,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307075960, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307076377, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php index 7b4f9482..818c2da2 100644 --- a/includes/pages/user_news.php +++ b/includes/pages/user_news.php @@ -1,16 +1,45 @@ \n\n"; + $dis_rows = ceil(sql_num_query("SELECT * FROM `News` WHERE `Treffen`=1") / $DISPLAY_NEWS); + + $html .= Get_Text(5); + + for ($i = 0; $i < $dis_rows; $i++) { + if ($i == $_REQUEST['page']) + $html .= ($i +1) . "  "; + else + $html .= '' . ($i +1) . '  '; + } + $html .= '
        '; + return $html; +} + function display_news($news) { global $privileges, $p; $html .= ""; $html .= '
        '; $html .= '
        '; - $html .= date("Y-m-d H:i",$news['Datum']) . ', '; + $html .= date("Y-m-d H:i", $news['Datum']) . ', '; $html .= UID2Nick($news['UID']); if ($p != "news_comments") $html .= ', Kommentare (' . sql_num_query("SELECT * FROM `news_comments` WHERE `Refid`='" . sql_escape($news['ID']) . "'") . ') »'; $html .= '
        '; - $html .= '

        '.($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '

        '; + $html .= '

        ' . ($news['Treffen'] == 1 ? '[Meeting] ' : '') . ReplaceSmilies($news['Betreff']) . '

        '; $html .= '

        ' . ReplaceSmilies(nl2br($news['Text'])) . '

        '; if (in_array("admin_news", $privileges)) $html .= "
        Edit
        \n"; @@ -51,22 +80,22 @@ function user_news_comments() { $html .= ""; $html .= ' -
        -
        -

        Neuer Kommentar:

        -   - -
        - - - - - - -
        Text:
        -
        - -
        '; +
        +
        +

        Neuer Kommentar:

        +   + +
        + + + + + + +
        Text:
        +
        + +
        '; } else { $html .= "Fehlerhafter Aufruf!"; } @@ -125,9 +154,9 @@ function user_news() { '; if (in_array('admin_news', $privileges)) { $html .= ' - ' . Get_Text(9) . ' - - '; + ' . Get_Text(9) . ' + + '; } $html .= ' diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 6a10c32b..d5543f97 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -22,6 +22,7 @@ function make_navigation() { // Engel Navigation $menu .= make_navigation_for(Get_Text('inc_schicht_engel'), array ( "news", + "user_meetings", "user_myshifts", "user_shifts", "user_messages", diff --git a/www-ssl/admin/user.php b/www-ssl/admin/user.php deleted file mode 100644 index 0b31c97c..00000000 --- a/www-ssl/admin/user.php +++ /dev/null @@ -1,133 +0,0 @@ -Neuen Engel eintragen

        \n"; - - if (!isset ($_GET["OrderBy"])) - $_GET["OrderBy"] = "Nick"; - $SQL = "SELECT User.*, UserGroups.Name AS 'Group' FROM `User` " . - "LEFT JOIN `UserCVS` ON User.UID = UserCVS.UID " . - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID " . - "ORDER BY `" . $_GET["OrderBy"] . "` ASC"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - echo "Anzahl Engel: $Zeilen

        \n"; -?> - - - - - - - - - - - - - - - - \n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - $Gekommen += mysql_result($Erg, $n, "Gekommen"); - echo "\t\n"; - $Active += mysql_result($Erg, $n, "Aktiv"); - echo "\t\n"; - $Tshirt += mysql_result($Erg, $n, "Tshirt"); - echo "\t\n"; - echo "\t\n"; - echo "\t\n"; - echo "\n"; - } - echo "" . - "" . - "\n"; - echo "\t
        - ?OrderBy=Nick">Nick | - ?OrderBy=CreateDate">CreateDate - ?OrderBy=Name">Name?OrderBy=Vorname">Vorname?OrderBy=Alter">Alter - ?OrderBy=email">@ | - ?OrderBy=DECT">DECT | - ?OrderBy=Hometown">Hometown | - ?OrderBy=lastLogIn">lastLogIn | - ?OrderBy=Art">Type | - ?OrderBy=ICQ">ICQ | - ?OrderBy=jabber">jabber | - ?OrderBy=Group">Group - ?OrderBy=Size">Größe?OrderBy=Gekommen">G?OrderBy=Aktiv">A?OrderBy=Tshirt">TÄnd.Secure
        " . mysql_result($Erg, $n, "Nick") . "
        (Create: " . mysql_result($Erg, $n, "CreateDate") . ")        		" . mysql_result($Erg, $n, "Name") . "" . mysql_result($Erg, $n, "Vorname") . "" . mysql_result($Erg, $n, "Alter") . ""; - if (strlen(mysql_result($Erg, $n, "Telefon")) > 0) - echo "\n\t\tTel: " . mysql_result($Erg, $n, "Telefon") . "
        "; - if (strlen(mysql_result($Erg, $n, "Handy")) > 0) - echo "\n\t\tHandy: " . mysql_result($Erg, $n, "Handy") . "
        "; - if (strlen(mysql_result($Erg, $n, "DECT")) > 0) - echo "\n\t\tDECT: " . - mysql_result($Erg, $n, "DECT") . "
        "; - if (strlen(mysql_result($Erg, $n, "email")) > 0) - echo "\n\t\temail: " . - mysql_result($Erg, $n, "email") . "
        "; - if (strlen(mysql_result($Erg, $n, "Hometown")) > 0) - echo "\n\t\tHometown: " . mysql_result($Erg, $n, "Hometown") . "
        "; - if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0) - echo "\n\t\tlastLogIn: " . mysql_result($Erg, $n, "lastLogIn") . "
        "; - if (strlen(mysql_result($Erg, $n, "Art")) > 0) - echo "\n\t\tType: " . mysql_result($Erg, $n, "Art") . "
        "; - if (strlen(mysql_result($Erg, $n, "ICQ")) > 0) - echo "\n\t\tICQ: " . mysql_result($Erg, $n, "ICQ") . "
        "; - if (strlen(mysql_result($Erg, $n, "jabber")) > 0) - echo "\n\t\tjabber: " . mysql_result($Erg, $n, "jabber") . "
        "; - echo "\n\t\tGroup: " . mysql_result($Erg, $n, "Group") . "
        "; - echo "        		" . mysql_result($Erg, $n, "Size") . "" . mysql_result($Erg, $n, "Gekommen") . "" . mysql_result($Erg, $n, "Aktiv") . "" . mysql_result($Erg, $n, "Tshirt") . "" . funktion_isLinkAllowed_addLink_OrEmpty("admin/userChangeNormal.php?enterUID=" . - mysql_result($Erg, $n, "UID") . "&Type=Normal", "Änd.") . - "" . funktion_isLinkAllowed_addLink_OrEmpty("admin/userChangeSecure.php?enterUID=" . - mysql_result($Erg, $n, "UID") . "&Type=Secure", "Secure") . - "
        $Gekommen$Active$Tshirt
        \n"; - // Ende Userliste - - echo "

        Statistics

        "; - funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); - - echo "
        \n"; - - funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); - - echo "
        \n"; - - funktion_db_element_list_2row("Used Groups", "SELECT UserGroups.Name AS 'GroupName', COUNT(UserGroups.Name) AS Count FROM `UserCVS` " . - "LEFT JOIN `UserGroups` ON UserGroups.UID = UserCVS.GroupID " . - "WHERE (UserCVS.GroupID!='NULL') " . - "GROUP BY `GroupName` " . - ""); -} else { - echo "error"; -} - -include ("includes/footer.php"); -?> - - diff --git a/www-ssl/index.php b/www-ssl/index.php index f6c6aaa2..ded6c110 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -40,6 +40,10 @@ if (in_array($p, $privileges)) { require_once ('includes/pages/user_news.php'); $content = user_news_comments(); } + elseif ($p == "user_meetings") { + require_once ('includes/pages/user_news.php'); + $content = user_meetings(); + } elseif ($p == "user_messages") { $content = user_messages(); } diff --git a/www-ssl/nonpublic/engelbesprechung.php b/www-ssl/nonpublic/engelbesprechung.php deleted file mode 100644 index 7ff684d4..00000000 --- a/www-ssl/nonpublic/engelbesprechung.php +++ /dev/null @@ -1,29 +0,0 @@ -" . mysql_result($Erg, $n, "Betreff") . ""; - - // Show Admin Page - if ($_SESSION['CVS']["admin/news.php"] == "Y") - echo " [edit]"; - - echo "
           " . mysql_result($Erg, $n, "Datum") . ", "; - echo UID2Nick(mysql_result($Erg, $n, "UID")) . "

        \n"; - echo "

        " . nl2br(mysql_result($Erg, $n, "Text")) . "

        \n"; - } -} - -include ("includes/footer.php"); -?> -- cgit v1.2.3-54-g00ecf From 6b155db36c30718ccbe25200d640c177d5d78589 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 07:44:50 +0200 Subject: user management --- DB/db_rewrite.sql | 14 +- includes/pages/admin_user.php | 363 +++++++++++++++++++++++++---------- includes/sys_template.php | 2 +- includes/sys_user.php | 11 +- txt/TODO | 1 - www-ssl/admin/userChangeNormal.php | 133 ------------- www-ssl/admin/userDefaultSetting.php | 138 ------------- www-ssl/admin/userSaveNormal.php | 119 ------------ 8 files changed, 277 insertions(+), 504 deletions(-) delete mode 100644 www-ssl/admin/userChangeNormal.php delete mode 100644 www-ssl/admin/userDefaultSetting.php delete mode 100644 www-ssl/admin/userSaveNormal.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 20a23f1e..18a75dee 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 04:47 +-- Erstellungszeit: 03. Juni 2011 um 05:44 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -80,15 +80,15 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES ('register', 8), ('admin_rooms', 89), ('admin_angel_types', 71), -('user_settings', 126), +('user_settings', 131), ('user_messages', 113), ('admin_groups', 129), ('user_questions', 55), -('admin_questions', 42), +('admin_questions', 43), ('admin_faq', 55), ('admin_news', 33), ('news_comments', 151), -('admin_user', 59), +('admin_user', 157), ('user_meetings', 5); -- -------------------------------------------------------- @@ -1083,8 +1083,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307076377, '0000-00-00 00:00:00', '', '', ''), -(147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); +(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 0, 0, 10, 'DE', 115, 'L', 1307079838, '0000-00-00 00:00:00', '', '', ''); -- -------------------------------------------------------- @@ -1184,8 +1183,7 @@ INSERT INTO `UserGroups` (`id`, `uid`, `group_id`) VALUES (1, 1, -2), (2, 1, -3), (3, 1, -5), -(4, 1, -4), -(5, 147, -2); +(4, 1, -4); -- -------------------------------------------------------- diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index b64c9678..497f5fdb 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -1,111 +1,280 @@ Neuen Engel eintragen »

        \n"; - - if (!isset ($_GET["OrderBy"])) - $_GET["OrderBy"] = "Nick"; - $SQL = "SELECT * FROM `User` ORDER BY `" . $_GET["OrderBy"] . "` ASC"; - $Erg = sql_query($SQL); - - // anzahl zeilen - $Zeilen = mysql_num_rows($Erg); - - $html .= "Anzahl Engel: $Zeilen

        \n"; - $html .= ' - - - - - - - - - - - - - '; - $Gekommen = 0; - $Active = 0; - $Tshirt = 0; - - for ($n = 0; $n < $Zeilen; $n++) { - $title = ""; - $user_groups = sql_select("SELECT * FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape(mysql_result($Erg, $n, "UID")) . " ORDER BY `Groups`.`Name`"); - $groups = array (); - foreach ($user_groups as $user_group) { - $groups[] = $user_group['Name']; + + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['id']) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_REQUEST['id'])) > 0) { + $id = $_REQUEST['id']; + if (!isset ($_REQUEST['action'])) { + $html .= "Hallo,
        " . + "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . + "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . + "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . + "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . + "bereits sein T-Shirt erhalten hat.

        \n"; + + $html .= "\n"; + $html .= "
        - Nick - Vorname NameAlter - E-Mail - GrößeGekommenAktivT-ShirtRegistrierÄnd.
        \n"; + $html .= "\n"; + + $SQL = "SELECT * FROM `User` WHERE `UID`='" . $id . "'"; + $Erg = sql_query($SQL); + + $html .= ""; + + $html .= "\n"; + $html .= "
        \n"; + $html .= "\n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + + $options = array ( + '1' => "Yes", + '0' => "No" + ); + + // Gekommen? + $html .= " \n"; + + // Aktiv? + $html .= " \n"; + + // T-Shirt bekommen? + $html .= " \n"; + + $html .= " \n"; + + $html .= "
        Nick" . + "
        lastLogIn" . + date("Y-m-d H:i", mysql_result($Erg, 0, "lastLogIn")) . "
        Name" . + "
        Vorname" . + "
        Alter" . + "
        Telefon" . + "
        Handy" . + "
        DECT" . + "
        email" . + "
        ICQ" . + "
        jabber" . + "
        Size" . + html_select_key('size', array ( + 'S' => "S", + 'M' => "M", + 'L' => "L", + 'XL' => "XL", + '2XL' => "2XL", + '3XL' => "3XL", + '4XL' => "4XL", + '5XL' => "5XL", + 'S-G' => "S Girl", + 'M-G' => "M Girl", + 'L-G' => "L Girl", + 'XL-G' => "XL Girl" + ), mysql_result($Erg, 0, "Size")) . "
        Gekommen\n"; + $html .= html_options('eGekommen', $options, mysql_result($Erg, 0, "Gekommen")) . "
        Aktiv\n"; + $html .= html_options('eAktiv', $options, mysql_result($Erg, 0, "Aktiv")) . "
        T-Shirt\n"; + $html .= html_options('eTshirt', $options, mysql_result($Erg, 0, "Tshirt")) . "
        Hometown" . + "
        \n        		" . displayavatar($id, false) . "
        \n
        \n"; + $html .= "\n"; + $html .= "\n"; + $html .= ""; + + $html .= "
        "; + + $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:
        \n"; + $html .= "\n"; + $html .= " \n"; + $html .= " \n"; + + $html .= "
        Passwort" . + "
        Wiederholung" . + "
        "; + $html .= "\n"; + $html .= "\n"; + $html .= "
        "; + + $html .= "
        "; + + $html .= "
        \n"; + $html .= "\n"; + $html .= "\n"; + $html .= "
        "; + + $html .= "
        "; + $html .= funktion_db_element_list_2row("Freeloader Shifts", "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=" . $_REQUEST['id']); + } else { + switch ($_REQUEST['action']) { + case 'delete' : + if ($user['UID'] != $id) { + sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); + sql_query("UPDATE `ShiftEntry` SET `UID`=0, `Comment`=NULL WHERE `UID`=" . sql_escape($id)); + $html .= success("Benutzer gelöscht!"); + } else { + $html .= error("Du kannst Dich nicht selber löschen!"); + } + break; + + case 'save' : + $SQL = "UPDATE `User` SET "; + $SQL .= " `Nick` = '" . $_POST["eNick"] . "', `Name` = '" . $_POST["eName"] . "', " . + "`Vorname` = '" . $_POST["eVorname"] . "', " . + "`Telefon` = '" . $_POST["eTelefon"] . "', " . + "`Handy` = '" . $_POST["eHandy"] . "', " . + "`Alter` = '" . $_POST["eAlter"] . "', " . + "`DECT` = '" . $_POST["eDECT"] . "', " . + "`email` = '" . $_POST["eemail"] . "', " . + "`ICQ` = '" . $_POST["eICQ"] . "', " . + "`jabber` = '" . $_POST["ejabber"] . "', " . + "`Size` = '" . $_POST["eSize"] . "', " . + "`Gekommen`= '" . $_POST["eGekommen"] . "', " . + "`Aktiv`= '" . $_POST["eAktiv"] . "', " . + "`Tshirt` = '" . $_POST["eTshirt"] . "', " . + "`Hometown` = '" . $_POST["Hometown"] . "' " . + "WHERE `UID` = '" . $id . + "' LIMIT 1;"; + sql_query($SQL); + $html .= success("Änderung wurde gespeichert...\n"); + break; + + case 'change_pw' : + if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) { + sql_query("UPDATE `User` SET `Passwort`='" . sql_escape(PassCrypt($_REQUEST['new_pw'])) . "' WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + $html .= success("Passwort neu gesetzt."); + } else { + $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!"); + } + break; + } } - $title .= 'Groups: ' . join(", ", $groups) . "
        "; - if (strlen(mysql_result($Erg, $n, "Telefon")) > 0) - $title .= "Tel: " . mysql_result($Erg, $n, "Telefon") . "
        "; - if (strlen(mysql_result($Erg, $n, "Handy")) > 0) - $title .= "Handy: " . mysql_result($Erg, $n, "Handy") . "
        "; - if (strlen(mysql_result($Erg, $n, "DECT")) > 0) - $title .= "DECT: " . - mysql_result($Erg, $n, "DECT") . "
        "; - if (strlen(mysql_result($Erg, $n, "Hometown")) > 0) - $title .= "Hometown: " . mysql_result($Erg, $n, "Hometown") . "
        "; - if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0) - $title .= "Last login: " . date("Y-m-d H:i", mysql_result($Erg, $n, "lastLogIn")) . "
        "; - if (strlen(mysql_result($Erg, $n, "Art")) > 0) - $title .= "Type: " . mysql_result($Erg, $n, "Art") . "
        "; - if (strlen(mysql_result($Erg, $n, "ICQ")) > 0) - $title .= "ICQ: " . mysql_result($Erg, $n, "ICQ") . "
        "; - if (strlen(mysql_result($Erg, $n, "jabber")) > 0) - $title .= "jabber: " . mysql_result($Erg, $n, "jabber") . "
        "; - - $html .= "\n"; - $html .= "\t" . mysql_result($Erg, $n, "Nick") . "\n"; - $html .= "\t" . mysql_result($Erg, $n, "Vorname") . " " . mysql_result($Erg, $n, "Name") . "\n"; - $html .= "\t" . mysql_result($Erg, $n, "Alter") . "\n"; - $html .= "\t"; - if (strlen(mysql_result($Erg, $n, "email")) > 0) - $html .= "" . - mysql_result($Erg, $n, "email") . ""; - $html .= ''; - $html .= "\n"; - $html .= "\t" . mysql_result($Erg, $n, "Size") . "\n"; - $Gekommen += mysql_result($Erg, $n, "Gekommen"); - $html .= "\t" . mysql_result($Erg, $n, "Gekommen") . "\n"; - $Active += mysql_result($Erg, $n, "Aktiv"); - $html .= "\t" . mysql_result($Erg, $n, "Aktiv") . "\n"; - $Tshirt += mysql_result($Erg, $n, "Tshirt"); - $html .= "\t" . mysql_result($Erg, $n, "Tshirt") . "\n"; - $html .= "" . mysql_result($Erg, $n, "CreateDate") . ""; - $html .= "\t" . 'Edit' . - "\n"; - $html .= "\n"; - } - $html .= "" . - "" . - "$Gekommen$Active$Tshirt\n"; - $html .= "\t\n"; - // Ende Userliste + } else { + // Userliste, keine UID uebergeben... + + $html .= "Neuen Engel eintragen »

        \n"; - $html .= "

        Statistics

        "; - $html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + if (!isset ($_GET["OrderBy"])) + $_GET["OrderBy"] = "Nick"; + $SQL = "SELECT * FROM `User` ORDER BY `" . sql_escape($_GET["OrderBy"]) . "` ASC"; + $Erg = sql_query($SQL); - $html .= "
        \n"; + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - $html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + $html .= "Anzahl Engel: $Zeilen

        \n"; + $html .= ' + + + + + + + + + + + + + '; + $Gekommen = 0; + $Active = 0; + $Tshirt = 0; - $html .= "
        \n"; + for ($n = 0; $n < $Zeilen; $n++) { + $title = ""; + $user_groups = sql_select("SELECT * FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape(mysql_result($Erg, $n, "UID")) . " ORDER BY `Groups`.`Name`"); + $groups = array (); + foreach ($user_groups as $user_group) { + $groups[] = $user_group['Name']; + } + $title .= 'Groups: ' . join(", ", $groups) . "
        "; + if (strlen(mysql_result($Erg, $n, "Telefon")) > 0) + $title .= "Tel: " . mysql_result($Erg, $n, "Telefon") . "
        "; + if (strlen(mysql_result($Erg, $n, "Handy")) > 0) + $title .= "Handy: " . mysql_result($Erg, $n, "Handy") . "
        "; + if (strlen(mysql_result($Erg, $n, "DECT")) > 0) + $title .= "DECT: " . + mysql_result($Erg, $n, "DECT") . "
        "; + if (strlen(mysql_result($Erg, $n, "Hometown")) > 0) + $title .= "Hometown: " . mysql_result($Erg, $n, "Hometown") . "
        "; + if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0) + $title .= "Last login: " . date("Y-m-d H:i", mysql_result($Erg, $n, "lastLogIn")) . "
        "; + if (strlen(mysql_result($Erg, $n, "Art")) > 0) + $title .= "Type: " . mysql_result($Erg, $n, "Art") . "
        "; + if (strlen(mysql_result($Erg, $n, "ICQ")) > 0) + $title .= "ICQ: " . mysql_result($Erg, $n, "ICQ") . "
        "; + if (strlen(mysql_result($Erg, $n, "jabber")) > 0) + $title .= "jabber: " . mysql_result($Erg, $n, "jabber") . "
        "; - $html .= funktion_db_element_list_2row("Used Groups", "SELECT Groups.Name AS 'GroupName', COUNT(Groups.Name) AS Count FROM `UserGroups` " . - "LEFT JOIN `Groups` ON Groups.UID = UserGroups.group_id " . - "WHERE (UserGroups.group_id!='NULL') " . - "GROUP BY `GroupName` " . - ""); + $html .= "\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $Gekommen += mysql_result($Erg, $n, "Gekommen"); + $html .= "\t\n"; + $Active += mysql_result($Erg, $n, "Aktiv"); + $html .= "\t\n"; + $Tshirt += mysql_result($Erg, $n, "Tshirt"); + $html .= "\t\n"; + $html .= ""; + $html .= "\t\n"; + $html .= "\n"; + } + $html .= "" . + "" . + "\n"; + $html .= "\t
        + Nick + Vorname NameAlter + E-Mail + GrößeGekommenAktivT-ShirtRegistrierÄnd.
        " . mysql_result($Erg, $n, "Nick") . "" . mysql_result($Erg, $n, "Vorname") . " " . mysql_result($Erg, $n, "Name") . "" . mysql_result($Erg, $n, "Alter") . ""; + if (strlen(mysql_result($Erg, $n, "email")) > 0) + $html .= "" . + mysql_result($Erg, $n, "email") . ""; + $html .= ''; + $html .= "" . mysql_result($Erg, $n, "Size") . "" . mysql_result($Erg, $n, "Gekommen") . "" . mysql_result($Erg, $n, "Aktiv") . "" . mysql_result($Erg, $n, "Tshirt") . "" . mysql_result($Erg, $n, "CreateDate") . "" . 'Edit' . + "
        $Gekommen$Active$Tshirt
        \n"; + // Ende Userliste + + $html .= "

        Statistics

        "; + $html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + + $html .= "
        \n"; + + $html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + + $html .= "
        \n"; + + $html .= funktion_db_element_list_2row("Used Groups", "SELECT Groups.Name AS 'GroupName', COUNT(Groups.Name) AS Count FROM `UserGroups` " . + "LEFT JOIN `Groups` ON Groups.UID = UserGroups.group_id " . + "WHERE (UserGroups.group_id!='NULL') " . + "GROUP BY `GroupName` " . + ""); + } return $html; } ?> \ No newline at end of file diff --git a/includes/sys_template.php b/includes/sys_template.php index 893d2d7e..7524b0cb 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -18,7 +18,7 @@ function template_render($file, $data) { function html_options($name, $options, $selected = "") { $html = ""; foreach ($options as $value => $label) - $html .= ' ' . $label; + $html .= ' ' . $label; return $html; } diff --git a/includes/sys_user.php b/includes/sys_user.php index 5dcf3f1f..4f55da38 100644 --- a/includes/sys_user.php +++ b/includes/sys_user.php @@ -86,13 +86,10 @@ function displayavatar($UID, $height = "30") { if (GetPicturShow($UID) == 'Y') return " " . displayPictur($UID, $height); - // show avator - $asql = "select * from User where UID = $UID"; - $aerg = mysql_query($asql, $con); - - if (mysql_num_rows($aerg)) - if (mysql_result($aerg, 0, "Avatar") > 0) - return'
        '. (" ").'
        '; + $user = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($UID) . " LIMIT 1"); + if (count($user) > 0) + if ($user[0]['Avatar'] > 0) + return '
        ' . (" ") . '
        '; } function UIDgekommen($UID) { diff --git a/txt/TODO b/txt/TODO index 02dd8626..9d29b09c 100644 --- a/txt/TODO +++ b/txt/TODO @@ -4,7 +4,6 @@ jetzt: * schichtadministration * meine schichten * schichten - * meetings * weckservice? später: diff --git a/www-ssl/admin/userChangeNormal.php b/www-ssl/admin/userChangeNormal.php deleted file mode 100644 index 36eb4b6d..00000000 --- a/www-ssl/admin/userChangeNormal.php +++ /dev/null @@ -1,133 +0,0 @@ - Aendern... - - echo "Hallo,
        " . - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . - "bereits sein T-Shirt erhalten hat.

        \n"; - - echo "
        \n"; - echo "\n"; - echo "\n"; - - $SQL = "SELECT * FROM `User` WHERE `UID`='" . $_GET["enterUID"] . "'"; - $Erg = mysql_query($SQL, $con); - - if (mysql_num_rows($Erg) != 1) - echo ""; - else { - echo ""; - } - - echo "\n"; - echo "
        Sorry, der Engel (UID=" . $_GET["enterUID"] . - ") wurde in der Liste nicht gefunden.
        \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 " \n"; - - // Gekommen? - echo " \n"; - - // Aktiv? - echo " \n"; - - // T-Shirt bekommen? - echo " \n"; - - echo " \n"; - - echo "
        Nick" . - "
        lastLogIn" . - "
        Name" . - "
        Vorname" . - "
        Alter" . - "
        Telefon" . - "
        Handy" . - "
        DECT" . - "
        email" . - "
        ICQ" . - "
        jabber" . - "
        Size" . - "
        Passwort" . - "neues Kennwort setzen
        Gekommen\n"; - echo " No \n"; - echo " Yes \n"; - echo "
        Aktiv\n"; - echo " No \n"; - echo " Yes \n"; - echo "
        T-Shirt\n"; - echo " No \n"; - echo " Yes \n"; - echo "
        Hometown" . - "
        \n        		" . displayavatar($_GET["enterUID"], FALSE) . "
        \n
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - - echo "
        "; - funktion_db_element_list_2row("Freeloader Shifts", "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=" . $_GET["enterUID"]); -} - -include ("includes/footer.php"); -?> - - diff --git a/www-ssl/admin/userDefaultSetting.php b/www-ssl/admin/userDefaultSetting.php deleted file mode 100644 index e7a69925..00000000 --- a/www-ssl/admin/userDefaultSetting.php +++ /dev/null @@ -1,138 +0,0 @@ -\nhier hast du die Möglichkeit, die Defaulteinstellungen für neue User einzustellen:

        \n"; - -echo "\n"; -echo "\t\n"; -echo "\t\t\n\t\t\n\t\t\n"; -echo "\t\n"; - -if (isset ($_GET["Field"]) && isset ($_GET["Default"]) && isset ($_GET["Send"])) { - switch ($_GET["Send"]) { - case "New" : - $SQL = "ALTER TABLE `UserCVS` ADD `" . $_GET["Field"] . "` " . - "CHAR( 1 ) DEFAULT '" . $_GET["Default"] . "' NOT NULL"; - $Erg = db_query($SQL, "New user default setting"); - if ($Erg == 1) - echo "

        Create " . $_GET["Field"] . " = " . $_GET["Default"] . " succesfull

        \n"; - else - echo "

        Create " . $_GET["Field"] . " = " . $_GET["Default"] . " error...

        \n" . - "[" . mysql_error() . "]

        "; - break; - case "Del" : - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - break; - case "Del sure" : - $SQL = "ALTER TABLE `UserCVS` DROP `" . $_GET["Field"] . "` "; - $Erg = db_query($SQL, "del user default setting"); - if ($Erg == 1) - echo "

        Delete " . $_GET["Field"] . " succesfull

        \n"; - else - echo "

        Delete " . $_GET["Field"] . " error...

        \n" . - "[" . mysql_error() . "]

        "; - break; - case "SetForAllUser" : - $SQL = "UPDATE `UserCVS` SET `" . $_GET["Field"] . "`='" . $_GET["Default"] . "' WHERE UID>0"; - $Erg = db_query($SQL, "Set new user default setting for all user"); - if ($Erg == 1) - echo "

        UPDATE " . $_GET["Field"] . " = " . $_GET["Default"] . " for all Users succesfull

        \n"; - else - echo "

        UPDATE " . $_GET["Field"] . " = " . $_GET["Default"] . " for all Users error...

        \n" . - "[" . mysql_error() . "]

        "; - case "Save" : - $SQL = "ALTER TABLE `UserCVS` CHANGE `" . $_GET["Field"] . "` " . - "`" . $_GET["Field"] . "` CHAR( 1 ) NOT NULL DEFAULT '" . $_GET["Default"] . "'"; - $Erg = db_query($SQL, "Save user default setting"); - if ($Erg == 1) - echo "

        Write " . $_GET["Field"] . " = " . $_GET["Default"] . " succesfull

        \n"; - else - echo "

        Write " . $_GET["Field"] . " = " . $_GET["Default"] . " error...

        \n" . - "[" . mysql_error() . "]

        "; - break; - } //SWITCH -} //IF( - -$erg = mysql_query("SHOW COLUMNS FROM `UserCVS`"); -echo mysql_error(); -echo "\t\n"; -echo "\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\n"; -echo "\t\n"; - -for ($i = 2; $i < mysql_num_rows($erg); $i++) { - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; -} - -echo "\t\n"; -echo "\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\t\n"; -echo "\t\t\n"; -echo "\t\n"; - -echo "
        PageShow
        Group\n"; -echo "\t\t\t
        " . mysql_result($erg, $i, "Field") . "\n"; - - echo "\t\t\t\tallow\n"; - - echo "\t\t\t\tdenied\n"; - - echo "\t\t\t\tgroup-setting\n"; - - echo "\t\t\t\n"; - echo "\t\t\t \n"; - echo "\t\t\t
        \n"; -echo "\t\t\t\tallow\n"; -echo "\t\t\t\tdenied\n"; -echo "\t\t\t\tgroup-setting\n"; -echo "\t\t\t
        \n"; - -include ("includes/footer.php"); -?> - diff --git a/www-ssl/admin/userSaveNormal.php b/www-ssl/admin/userSaveNormal.php deleted file mode 100644 index deaf96d9..00000000 --- a/www-ssl/admin/userSaveNormal.php +++ /dev/null @@ -1,119 +0,0 @@ -"; - - switch ($_GET["action"]) { - case "change" : - if (IsSet ($_POST["enterUID"])) { - if ($_POST["Type"] == "Normal") { - $SQL = "UPDATE `User` SET "; - $SQL .= " `Nick` = '" . $_POST["eNick"] . "', `Name` = '" . $_POST["eName"] . "', " . - "`Vorname` = '" . $_POST["eVorname"] . "', " . - "`Telefon` = '" . $_POST["eTelefon"] . "', " . - "`Handy` = '" . $_POST["eHandy"] . "', " . - "`DECT` = '" . $_POST["eDECT"] . "', " . - "`email` = '" . $_POST["eemail"] . "', " . - "`ICQ` = '" . $_POST["eICQ"] . "', " . - "`jabber` = '" . $_POST["ejabber"] . "', " . - "`Size` = '" . $_POST["eSize"] . "', " . - "`Gekommen`= '" . $_POST["eGekommen"] . "', " . - "`Aktiv`= '" . $_POST["eAktiv"] . "', " . - "`Tshirt` = '" . $_POST["eTshirt"] . "', " . - "`Hometown` = '" . $_POST["Hometown"] . "' " . - "WHERE `UID` = '" . $_POST["enterUID"] . - "' LIMIT 1;"; - echo "User-"; - $Erg = db_query($SQL, "change user details"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - } else - echo "

        Fehler: Unbekanter Type (" . $_POST["Type"] . ") �bergeben\n

        \n"; - } else - echo "

        Fehler: UserID (enterUID) wurde nicht per POST �bergeben

        \n"; - break; - - case "delete" : - if (IsSet ($_POST["enterUID"])) { - echo "delate User..."; - $SQL = "DELETE FROM `User` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - - echo "
        \ndelate UserCVS..."; - $SQL2 = "DELETE FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - - echo "
        \ndelate UserEntry..."; - $SQL3 = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL " . - "WHERE `UID`='" . $_POST["enterUID"] . "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - } - break; - - case "newpw" : - echo "Bitte neues Kennwort für "; - // Get Nick - $USQL = "SELECT * FROM `User` WHERE `UID`='" . $_GET["eUID"] . "'"; - $Erg = mysql_query($USQL, $con); - echo mysql_result($Erg, 0, "Nick"); - echo " eingeben:
        "; - echo "
        \n"; - echo ""; - echo ""; - echo ""; - echo "\n"; - echo "
        "; - break; - - case "newpwsave" : - if ($_POST["ePasswort"] == $_POST["ePasswort2"]) { // beide Passwoerter passen... - $_POST["ePasswort"] = PassCrypt($_POST["ePasswort"]); - $SQL = "UPDATE `User` SET `Passwort`='" . $_POST["ePasswort"] . "' " . - "WHERE `UID`='" . $_POST["eUID"] . "'"; - $Erg = db_query($SQL, "User new passwort"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - } else - echo "Das Passwort wurde nicht übereinstimmend eingegeben!"; - break; - } // end switch - - // ende - Action ist gesetzt -} else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
        Bitte neu editieren..."; -} - -include ("includes/footer.php"); -?> - -- cgit v1.2.3-54-g00ecf From bad34a0b263a60f024102df21a5613f9b0e72cc9 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 08:12:53 +0200 Subject: user management --- DB/db_rewrite.sql | 32 +++++++++-------- includes/pages/admin_user.php | 84 ++++++++++++++++++++++++++++++++----------- 2 files changed, 82 insertions(+), 34 deletions(-) diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 18a75dee..19a82c05 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 05:44 +-- Erstellungszeit: 03. Juni 2011 um 06:12 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,24 +71,24 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 192), -('login', 26), -('logout', 13), -('start', 26), +('news', 193), +('login', 28), +('logout', 14), +('start', 27), ('faq', 19), ('credits', 3), -('register', 8), +('register', 10), ('admin_rooms', 89), ('admin_angel_types', 71), -('user_settings', 131), +('user_settings', 134), ('user_messages', 113), -('admin_groups', 129), +('admin_groups', 130), ('user_questions', 55), ('admin_questions', 43), ('admin_faq', 55), ('admin_news', 33), ('news_comments', 151), -('admin_user', 157), +('admin_user', 196), ('user_meetings', 5); -- -------------------------------------------------------- @@ -1065,7 +1065,7 @@ CREATE TABLE IF NOT EXISTS `User` ( `Gekommen` tinyint(4) NOT NULL DEFAULT '0', `Aktiv` tinyint(4) NOT NULL DEFAULT '0', `Tshirt` tinyint(4) DEFAULT '0', - `color` tinyint(4) DEFAULT '6', + `color` tinyint(4) DEFAULT '10', `Sprache` char(2) DEFAULT 'EN', `Avatar` int(11) DEFAULT '0', `Menu` char(1) NOT NULL DEFAULT 'L', @@ -1076,14 +1076,15 @@ CREATE TABLE IF NOT EXISTS `User` ( `Hometown` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`UID`,`Nick`), UNIQUE KEY `Nick` (`Nick`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=148 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=149 ; -- -- Daten für Tabelle `User` -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 0, 0, 10, 'DE', 115, 'L', 1307079838, '0000-00-00 00:00:00', '', '', ''); +(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 1, 1, 0, 10, 'DE', 115, 'L', 1307081238, '0000-00-00 00:00:00', '', '', ''), +(148, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 1, 1, 10, 'DE', 0, 'L', 1307081543, '2011-06-03 07:55:24', 'AudioEngel', '', ''); -- -------------------------------------------------------- @@ -1173,7 +1174,7 @@ CREATE TABLE IF NOT EXISTS `UserGroups` ( `group_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `uid` (`uid`,`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; -- -- Daten für Tabelle `UserGroups` @@ -1183,7 +1184,10 @@ INSERT INTO `UserGroups` (`id`, `uid`, `group_id`) VALUES (1, 1, -2), (2, 1, -3), (3, 1, -5), -(4, 1, -4); +(4, 1, -4), +(8, 148, -2), +(9, 148, -3), +(10, 148, -4); -- -------------------------------------------------------- diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 497f5fdb..630ca772 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -98,7 +98,6 @@ function admin_user() { $html .= "\n"; $html .= "\n
        \n"; - $html .= "\n"; $html .= "\n"; $html .= ""; @@ -112,14 +111,31 @@ function admin_user() { "\n"; $html .= ""; - $html .= "\n"; $html .= "\n"; $html .= ""; $html .= "
        "; + $html .= "Hier kannst Du die Benutzergruppen des Engels festlegen:
        \n"; + $html .= ''; + + list ($my_highest_group) = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `uid`"); + list ($his_highest_group) = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `uid`"); + + if ($id != $user['UID'] && $my_highest_group <= $his_highest_group) { + $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group['group_id']) . " ORDER BY `Groups`.`Name`"); + foreach ($groups as $group) + $html .= ''; + + $html .= '
        ' . $group['Name'] . '
        '; + + $html .= "\n"; + $html .= "
        "; + + $html .= "
        "; + } + $html .= "
        \n"; - $html .= "\n"; $html .= "\n"; $html .= "
        "; @@ -127,6 +143,34 @@ function admin_user() { $html .= funktion_db_element_list_2row("Freeloader Shifts", "SELECT `Remove_Time`, `Length`, `Comment` FROM `ShiftFreeloader` WHERE UID=" . $_REQUEST['id']); } else { switch ($_REQUEST['action']) { + case 'save_groups' : + if ($id != $user['UID']) { + list ($my_highest_group) = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `uid`"); + list ($his_highest_group) = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `uid`"); + + if ($my_highest_group <= $his_highest_group) { + $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group['group_id']) . " ORDER BY `Groups`.`Name`"); + $grouplist = array (); + foreach ($groups as $group) + $grouplist[] = $group['UID']; + + if (!is_array($_REQUEST['groups'])) + $_REQUEST['groups'] = array (); + + sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); + foreach ($_REQUEST['groups'] as $group) + if (in_array($group, $grouplist)) + sql_query("INSERT INTO `UserGroups` SET `uid`=" . + sql_escape($id) . ", `group_id`=" . sql_escape($group)); + $html .= success("Benutzergruppen gespeichert."); + } else { + $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten."); + } + } else { + $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten."); + } + break; + case 'delete' : if ($user['UID'] != $id) { sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); @@ -185,23 +229,23 @@ function admin_user() { $html .= "Anzahl Engel: $Zeilen

        \n"; $html .= ' - - - - - - - - - - - - - '; +
        - Nick - Vorname NameAlter - E-Mail - GrößeGekommenAktivT-ShirtRegistrierÄnd.
        + + + + + + + + + + + + '; $Gekommen = 0; $Active = 0; $Tshirt = 0; -- cgit v1.2.3-54-g00ecf From 170f8d2342e87f91f3ee3c4ad8ef161095666349 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 08:17:16 +0200 Subject: user management --- txt/TODO | 1 - www-ssl/admin/userChangeSecure.php | 104 ----------------------- www-ssl/admin/userSaveSecure.php | 167 ------------------------------------- 3 files changed, 272 deletions(-) delete mode 100644 www-ssl/admin/userChangeSecure.php delete mode 100644 www-ssl/admin/userSaveSecure.php diff --git a/txt/TODO b/txt/TODO index 9d29b09c..d78d3198 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,5 +1,4 @@ jetzt: - * user administrieren * schichtimport * schichtadministration * meine schichten diff --git a/www-ssl/admin/userChangeSecure.php b/www-ssl/admin/userChangeSecure.php deleted file mode 100644 index 69c4601d..00000000 --- a/www-ssl/admin/userChangeSecure.php +++ /dev/null @@ -1,104 +0,0 @@ - Aendern... - - echo "Hallo,
        " . - "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . - "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . - "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . - "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . - "bereits sein T-Shirt erhalten hat.

        \n"; - - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_GET["enterUID"] . "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - - if (mysql_num_rows($Erg_CVS) != 1) - echo "Sorry, der Engel (UID=" . $_GET["enterUID"] . ") wurde in der Liste nicht gefunden."; - else { - // Rename if is an group - if ($_GET["enterUID"] < 0) { - $SQLname = "SELECT `Name` FROM `UserGroups` WHERE `UID`='" . $_GET["enterUID"] . "'"; - $ErgName = mysql_query($SQLname, $con); - echo mysql_error($con); - - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - } - - echo "
        \n"; - echo "
        + Nick + Vorname NameAlter + E-Mail + GrößeGekommenAktivT-ShirtRegistrierÄnd.
        \n"; - echo "\n"; - echo " \n"; - - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) { - $CVS_Data_i++; - //nur jeder zweiter sonst wird f�r jeden text noch die position (Zahl) ausgegeben - if ($CVS_Data_i % 2 && $CVS_Data_Name != "UID") { - if ($CVS_Data_Name == "GroupID") { - if ($_GET["enterUID"] > 0) { - echo "\n" . - ""; - } - } else { - echo "\n"; - } - } - } //IF - } //Foreach - echo "\n"; - - // Ende Formular - echo "\n"; - echo "

        Rights of \"" . UID2Nick($_GET["enterUID"]) . "\":
        Group
        $CVS_Data_Name"; - echo "allow \n"; - echo "denied \n"; - if ($_GET["enterUID"] > 0) { - echo "group-setting \n"; - echo "
        \n
        \n"; - echo "\n"; - echo "\n"; - echo ""; - - echo "
        \n"; - echo "\n"; - echo "\n"; - echo "
        "; - } -} - -include ("includes/footer.php"); -?> - - diff --git a/www-ssl/admin/userSaveSecure.php b/www-ssl/admin/userSaveSecure.php deleted file mode 100644 index de4b47ff..00000000 --- a/www-ssl/admin/userSaveSecure.php +++ /dev/null @@ -1,167 +0,0 @@ - 0) { - $Right = $_SESSION['CVS']["admin/user.php"]; -} else { - $Right = $_SESSION['CVS']["admin/group.php"]; -} - -if (($Right == "Y") && IsSet ($_GET["action"])) { - SetHeaderGo2Back(); - echo "Gesendeter Befehl: " . $_GET["action"] . "
        "; - - switch ($_GET["action"]) { - case "change" : - if (IsSet ($_POST["enterUID"])) { - if ($_POST["Type"] == "Secure") { - $SQL2 = "UPDATE `UserCVS` SET "; - $SQL_CVS = "SELECT * FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "'"; - $Erg_CVS = mysql_query($SQL_CVS, $con); - $CVS_Data = mysql_fetch_array($Erg_CVS); - $CVS_Data_i = 1; - foreach ($CVS_Data as $CVS_Data_Name => $CVS_Data_Value) { - if (($CVS_Data_i +1) % 2 && $CVS_Data_Name != "UID") { - if ($CVS_Data_Name == "GroupID") { - if ($_POST["enterUID"] > 0) - $SQL2 .= "`$CVS_Data_Name` = '" . $_POST["GroupID"] . "', "; - else - $SQL2 .= "`$CVS_Data_Name` = NULL, "; - } else { - $SQL2 .= "`$CVS_Data_Name` = '" . $_POST[$CVS_Data_i] . "', "; - } - } - $CVS_Data_i++; - } - $SQL2 = substr($SQL2, 0, strlen($SQL2) - 2); - $SQL2 .= " WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - echo "
        Secure-"; - $Erg = db_query($SQL2, "change user CVS"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - } else - echo "

        Fehler: Unbekanter Type (" . $_POST["Type"] . ") �bergeben\n

        \n"; - } else - echo "

        Fehler: UserID (enterUID) wurde nicht per POST �bergeben

        \n"; - break; - - case "changeGroupName" : - if (IsSet ($_POST["enterUID"]) && ($_POST["enterUID"] < 0)) { - $SQL = "UPDATE `UserGroups` SET `Name`='" . $_POST["GroupName"] . "' WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1 ;"; - $Erg = db_query($SQL, "Update Group Name"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - } else - echo "

        Fehler: UserID (enterUID) wurde nicht per POST �bergeben

        \n"; - break; - - case "delete" : - if (IsSet ($_POST["enterUID"]) && ($_POST["enterUID"] > 0)) { - echo "delate User..."; - $SQL = "DELETE FROM `User` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - $Erg = db_query($SQL, "User delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - - echo "
        \ndelate UserCVS..."; - $SQL2 = "DELETE FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - - echo "
        \ndelate UserEntry..."; - $SQL3 = "UPDATE `ShiftEntry` SET `UID`='0', `Comment`=NULL " . - "WHERE `UID`='" . $_POST["enterUID"] . "';"; - $Erg = db_query($SQL3, "delate UserEntry"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - } - elseif (IsSet ($_POST["enterUID"]) && ($_POST["enterUID"] < 0)) { - echo "delate Group..."; - $SQL = "DELETE FROM `UserGroups` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - $Erg = db_query($SQL, "Group delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - - echo "
        \ndelate UserCVS..."; - $SQL2 = "DELETE FROM `UserCVS` WHERE `UID`='" . $_POST["enterUID"] . "' LIMIT 1;"; - $Erg = db_query($SQL2, "User CVS delete"); - if ($Erg == 1) { - echo "Änderung wurde gesichert...\n"; - } else { - echo "Fehler beim speichern...\n(" . mysql_error($con) . ")"; - } - - } - break; - } // end switch - - // ende - Action ist gesetzt -} -elseif (IsSet ($_GET["new"]) && ($_SESSION['CVS']["admin/group.php"] == "Y")) { - echo "Gesendeter Befehl: " . $_GET["new"] . "
        "; - - switch ($_GET["new"]) { - case "newGroup" : - echo "\tGenerate new Group ID...\n"; - $SQLid = "SELECT MIN(`UID`) FROM `UserCVS`;"; - $Erg = mysql_query($SQLid); - - if (mysql_num_rows($Erg) == 1) { - $NewId = mysql_result($Erg, 0, 0) - 1; - $SQLnew1 = "INSERT INTO `UserGroups` (`UID`, `Name`) VALUES ('$NewId', '" . $_POST["GroupName"] . "' );"; - $SQLnew2 = "INSERT INTO `UserCVS` (`UID`, `GroupID`) VALUES ('$NewId', NULL );"; - echo "\t
        Generate new UserGroup ...\n"; - $ErgNew1 = db_query($SQLnew1, "create UserGroups Entry"); - if ($ErgNew1 == 1) { - echo "\t
        Generate new User rights...\n"; - $ErgNew2 = db_query($SQLnew2, "UserCVS Entry"); - if ($ErgNew1 == 1) { - echo "\t
        New group was created.\n"; - } else { - echo "Error on creation\n(" . mysql_error($con) . ")"; - } - } else { - echo "Error on creation\n(" . mysql_error($con) . ")"; - } - - } - - break; - } -} else { - // kein Action gesetzt -> abbruch - echo "Unzulässiger Aufruf.
        Bitte neu editieren..."; -} - -include ("includes/footer.php"); -?> - -- cgit v1.2.3-54-g00ecf From 5113776a42d0bc7ff8ed2db8619045d3ffb164a9 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 11:09:25 +0200 Subject: include/pages/admin_faq cleanup --- includes/pages/admin_faq.php | 46 +++++++++++++++++++++++++++++++------------- includes/sys_page.php | 8 ++++++++ 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/includes/pages/admin_faq.php b/includes/pages/admin_faq.php index 5b9a338f..b8ba1a64 100644 --- a/includes/pages/admin_faq.php +++ b/includes/pages/admin_faq.php @@ -4,8 +4,14 @@ function admin_faq() { $faqs_html = ""; $faqs = sql_select("SELECT * FROM `FAQ`"); foreach ($faqs as $faq) { - $faqs_html .= '
        ' . $faq['Frage_de'] . '
        ' . $faq['Antwort_de'] . '
        ' . $faq['Frage_en'] . '
        ' . $faq['Antwort_en'] . '
        '; - $faqs_html .= 'Edit'; + $faqs_html .= sprintf( + '
        %s
        %s
        ' + . '
        %s
        %s
        ' + . 'Edit', + $faq['Frage_de'], $faq['Antwort_de'], + $faq['Frage_en'], $faq['Antwort_en'], + page_link_to('admin_faq'), $faq['FID'] + ); } return template_render('../templates/admin_faq.html', array ( 'link' => page_link_to("admin_faq"), @@ -14,11 +20,18 @@ function admin_faq() { } else { switch ($_REQUEST['action']) { case 'create' : - $frage = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['frage'])); - $antwort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['antwort'])); - $question = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['question'])); - $answer = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['answer'])); - sql_query("INSERT INTO `FAQ` SET `Frage_de`='" . sql_escape($frage) . "', `Frage_en`='" . sql_escape($question) . "', `Antwort_de`='" . sql_escape($antwort) . "', `Antwort_en`='" . sql_escape($answer) . "'"); + $frage = strip_request_item_nl('frage'); + $antwort = strip_request_item_nl('antwort'); + $question = strip_request_item_nl('question'); + $answer = strip_request_item_nl('answer'); + + sql_query("INSERT INTO `FAQ` SET `Frage_de`='" . sql_escape($frage) + . "', `Frage_en`='" . sql_escape($question) + . "', `Antwort_de`='" . sql_escape($antwort) + . "', `Antwort_en`='" . sql_escape($answer) + . "'" + ); + header("Location: " . page_link_to("admin_faq")); break; @@ -32,11 +45,18 @@ function admin_faq() { if (count($faq) > 0) { list ($faq) = $faq; - $frage = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['frage'])); - $antwort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['antwort'])); - $question = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['question'])); - $answer = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['answer'])); - sql_query("UPDATE `FAQ` SET `Frage_de`='" . sql_escape($frage) . "', `Frage_en`='" . sql_escape($question) . "', `Antwort_de`='" . sql_escape($antwort) . "', `Antwort_en`='" . sql_escape($answer) . "' WHERE `FID`=" . sql_escape($id) . " LIMIT 1"); + $frage = strip_request_item_nl('frage'); + $antwort = strip_request_item_nl('antwort'); + $question = strip_request_item_nl('question'); + $answer = strip_request_item_nl('answer'); + + sql_query("UPDATE `FAQ` SET `Frage_de`='" . sql_escape($frage) + . "', `Frage_en`='" . sql_escape($question) + . "', `Antwort_de`='" . sql_escape($antwort) + . "', `Antwort_en`='" . sql_escape($answer) + . "' WHERE `FID`=" . sql_escape($id) . " LIMIT 1" + ); + header("Location: " . page_link_to("admin_faq")); } else return error("No FAQ found."); @@ -82,4 +102,4 @@ function admin_faq() { } } } -?> \ No newline at end of file +?> diff --git a/includes/sys_page.php b/includes/sys_page.php index 2af5f729..e499cd57 100644 --- a/includes/sys_page.php +++ b/includes/sys_page.php @@ -8,6 +8,14 @@ function strip_request_item($name) { ); } +function strip_request_item_nl($name) { + return preg_replace( + "/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", + '', + strip_tags($_REQUEST[$name]) + ); +} + function error($msg) { return '

        ' . $msg . '

        '; } -- cgit v1.2.3-54-g00ecf From 93dd7113b13b06de1701b216b77bb73e76421fb5 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 11:17:09 +0200 Subject: admin_groups minor cleanup --- includes/pages/admin_groups.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php index 5d9d8180..842640d8 100644 --- a/includes/pages/admin_groups.php +++ b/includes/pages/admin_groups.php @@ -7,15 +7,23 @@ function admin_groups() { if (!isset ($_REQUEST["action"])) { $groups_html = ""; foreach ($groups as $group) { - $groups_html .= ''; - $groups_html .= '' . $group['Name'] . ''; + $groups_html .= sprintf( + '%s', + $group['Name'] + ); $privileges = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group['UID'])); $privileges_html = array (); + foreach ($privileges as $priv) $privileges_html[] = $priv['name']; - $groups_html .= '' . join(", ", $privileges_html) . ''; - $groups_html .= 'Ändern'; - $groups_html .= ''; + + $groups_html .= sprintf( + '%s' + . 'Ändern', + join(', ', $privileges_html), + page_link_to("admin_groups"), + $group['UID'] + ); } return template_render('../templates/admin_groups.html', array ( -- cgit v1.2.3-54-g00ecf From 554bd796dc7aed67b6810e2ae3f30ba66bf263e3 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 11:24:22 +0200 Subject: includes/sys_auth: Add sql_escape, just to be safe --- includes/sys_auth.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/sys_auth.php b/includes/sys_auth.php index 68e336b0..009be2d8 100644 --- a/includes/sys_auth.php +++ b/includes/sys_auth.php @@ -19,7 +19,10 @@ function load_auth() { 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;"); + sql_query("UPDATE `User` SET " + . "`lastLogIn` = '" . time() . "'" + . " WHERE `UID` = '" . sql_escape($_SESSION['uid']) . "' LIMIT 1;" + ); } else unset ($_SESSION['uid']); } @@ -52,4 +55,4 @@ function PassCrypt($passwort) { return md5($passwort); } } -?> \ No newline at end of file +?> -- cgit v1.2.3-54-g00ecf From 70de7e5a1dd96c47c48eb45498004d219bec1283 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 11:34:54 +0200 Subject: guest_login: Cleanup, fix sql injection --- includes/pages/guest_faq.php | 14 ++++++++--- includes/pages/guest_login.php | 56 ++++++++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 20 deletions(-) diff --git a/includes/pages/guest_faq.php b/includes/pages/guest_faq.php index c4bcd0bb..2799cbaf 100644 --- a/includes/pages/guest_faq.php +++ b/includes/pages/guest_faq.php @@ -5,11 +5,17 @@ function guest_faq() { foreach ($faqs as $faq) { $html .= "
        "; if ($_SESSION['Sprache'] == "DE") { - $html .= "
        " . $faq['Frage_de'] . "
        "; - $html .= "
        " . $faq['Antwort_de'] . "
        "; + $html .= sprintf( + '
        %s
        %s
        ', + $faq['frage_de'], + $faq['antwort_de'] + ); } else { - $html .= "
        " . $faq['Frage_en'] . "
        "; - $html .= "
        " . $faq['Antwort_en'] . "
        "; + $html .= sprintf( + '
        %s
        %s
        ', + $faq['frage_en'], + $faq['antwort_en'] + ); } $html .= "
        "; } diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index bbf36b6d..db20a207 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -16,12 +16,25 @@ function guest_register() { $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"); + $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"]); @@ -35,15 +48,26 @@ function guest_register() { "`Size`, " . "`Passwort`, " . "`Art` , " . "`kommentar`, " . "`Hometown`," . "`CreateDate`, `Sprache` ) " . - "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(), '" . $_SESSION['Sprache'] . "')"); + "VALUES ( '" + . sql_escape($_POST["Nick"]) . "', " . "'" + . sql_escape($_POST["Name"]) . "', " . "'" + . sql_escape($_POST["Vorname"]) . "', " . "'" + . sql_escape($_POST["Alter"]) . "', " . "'" + . sql_escape($_POST["Telefon"]) . "', " . "'" + . sql_escape($_POST["DECT"]) . "', " . "'" + . sql_escape($_POST["Handy"]) . "', " . "'" + . sql_escape($_POST["email"]) . "', " . "'" + . sql_escape($_POST["ICQ"]) . "', " . "'" + . sql_escape($_POST["jabber"]) . "', " . "'" + . sql_escape($_POST["Size"]) . "', " . "'" + . sql_escape($_POST["Passwort"]) . "', " . "'" + . sql_escape($_POST["Art"]) . "', " . "'" + . sql_escape($_POST["kommentar"]) . "', " . "'" + . sql_escape($_POST["Hometown"]) . "'," + . "NOW(), '" + . sql_escape($_SESSION["Sprache"]) + . "')" + ); if ($Erg != 1) { $html .= Get_Text("makeuser_error_write1") . "
        \n"; @@ -242,4 +266,4 @@ function guest_login_form() { 'send' => Get_Text("index_lang_send") )); } -?> \ No newline at end of file +?> -- cgit v1.2.3-54-g00ecf From 75a7755041c4e4b9c5c31bccabc917e188982e80 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 11:46:46 +0200 Subject: user_messages: Initial (unfinished) cleanup --- includes/pages/user_messages.php | 41 ++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/includes/pages/user_messages.php b/includes/pages/user_messages.php index 30871d9d..a13b28f0 100644 --- a/includes/pages/user_messages.php +++ b/includes/pages/user_messages.php @@ -6,7 +6,13 @@ function user_unread_messages() { $new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID'])); if ($new_messages > 0) - return '

        ' . Get_Text("pub_messages_new1") . " " . $new_messages . " " . Get_Text("pub_messages_new2") . '

        '; + return sprintf( + '

        %s %s %s

        ', + page_link_to("user_messages"), + Get_Text("pub_messages_new1"), + $new_messages, + Get_Text("pub_messages_new2") + ); } return ""; @@ -16,23 +22,37 @@ function user_messages() { global $user; if (!isset ($_REQUEST['action'])) { - $users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" . sql_escape($user['UID']) . " ORDER BY `Nick`"); + $users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" + . sql_escape($user['UID']) . " ORDER BY `Nick`"); + $to_select_data = array ( "" => "Select receiver..." ); + foreach ($users as $u) $to_select_data[$u['UID']] = $u['Nick']; + $to_select = html_select_key('to', $to_select_data, ''); $messages_html = ""; - $messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" . sql_escape($user['UID']) . " OR `RUID`=" . sql_escape($user['UID']) . " ORDER BY `isRead`,`Datum` DESC"); + $messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" + . sql_escape($user['UID']) + . " OR `RUID`=" . sql_escape($user['UID']) + . " ORDER BY `isRead`,`Datum` DESC" + ); foreach ($messages as $message) { - $messages_html .= ''; - $messages_html .= '' . ($message['isRead'] == 'N' ? '•' : '') . ''; - $messages_html .= '' . date("Y-m-d H:i", $message['Datum']) . ''; - $messages_html .= '' . UID2Nick($message['SUID']) . ''; - $messages_html .= '' . UID2Nick($message['RUID']) . ''; - $messages_html .= '' . str_replace("\n", '
        ', $message['Text']) . ''; + + $messages_html .= sprintf( + ' %s %s %s %s' + .'%s', + ($message['isRead'] == 'N' ? ' class="new_message"' : ''), + ($message['isRead'] == 'N' ? '•' : ''), + date("Y-m-d H:i", $message['Datum']), + UID2Nick($message['SUID']), + UID2Nick($message['RUID']), + str_replace("\n", '
        ', $message['Text']) + ); + $messages_html .= ''; if ($message['RUID'] == $user['UID']) { if ($message['isRead'] == 'N') @@ -45,7 +65,8 @@ function user_messages() { return template_render('../templates/user_messages.html', array ( 'link' => page_link_to("user_messages"), - 'greeting' => Get_Text("Hello") . $user['Nick'] . ",
        \n" . Get_Text("pub_messages_text1") . "

        \n", + 'greeting' => Get_Text("Hello") . $user['Nick'] . ",
        \n" + . Get_Text("pub_messages_text1") . "

        \n", 'messages' => $messages_html, 'new_label' => Get_Text("pub_messages_Neu"), 'date_label' => Get_Text("pub_messages_Datum"), -- cgit v1.2.3-54-g00ecf From e7a25448f2e922cdcb38f3745cf88fa744a3f20b Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 14:38:12 +0200 Subject: admin language / translation --- DB/db_rewrite.sql | 47 +++++++++--------- includes/pages/admin_language.php | 100 ++++++++++++++++++++++++++++++++++++++ includes/pages/admin_user.php | 2 +- includes/sys_menu.php | 3 +- txt/TODO | 5 ++ www-ssl/index.php | 4 ++ 6 files changed, 137 insertions(+), 24 deletions(-) create mode 100644 includes/pages/admin_language.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 19a82c05..8758c191 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 06:12 +-- Erstellungszeit: 03. Juni 2011 um 12:37 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,25 +71,26 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 193), -('login', 28), -('logout', 14), -('start', 27), +('news', 198), +('login', 34), +('logout', 15), +('start', 28), ('faq', 19), -('credits', 3), +('credits', 7), ('register', 10), -('admin_rooms', 89), +('admin_rooms', 90), ('admin_angel_types', 71), ('user_settings', 134), ('user_messages', 113), -('admin_groups', 130), +('admin_groups', 135), ('user_questions', 55), ('admin_questions', 43), ('admin_faq', 55), ('admin_news', 33), ('news_comments', 151), -('admin_user', 196), -('user_meetings', 5); +('admin_user', 206), +('user_meetings', 5), +('admin_language', 22); -- -------------------------------------------------------- @@ -135,7 +136,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=71 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=73 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -151,14 +152,15 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (61, -4, 6), (66, -2, 15), (65, -2, 3), -(12, -5, 10), +(71, -5, 10), (60, -4, 12), (59, -4, 14), (64, -2, 4), (58, -4, 13), (57, -4, 7), (63, -4, 5), -(70, -2, 8); +(70, -2, 8), +(72, -5, 18); -- -------------------------------------------------------- @@ -272,7 +274,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=18 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=19 ; -- -- Daten für Tabelle `Privileges` @@ -295,7 +297,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (14, 'admin_news', 'Administrate the news section'), (15, 'news_comments', 'User can comment news'), (16, 'admin_user', 'Administrate the angels'), -(17, 'user_meetings', 'Lists meetings (news)'); +(17, 'user_meetings', 'Lists meetings (news)'), +(18, 'admin_language', 'Translate the system'); -- -------------------------------------------------------- @@ -1040,7 +1043,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin_news', 'DE', 'News verwalten'), ('admin_news', 'EN', 'Manage news'), ('user_meetings', 'DE', 'Treffen'), -('user_meetings', 'EN', 'Meetings'); +('user_meetings', 'EN', 'Meetings'), +('admin_language', 'DE', 'Übersetzung'), +('admin_language', 'EN', 'Translation'); -- -------------------------------------------------------- @@ -1083,8 +1088,8 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 1, 1, 0, 10, 'DE', 115, 'L', 1307081238, '0000-00-00 00:00:00', '', '', ''), -(148, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 1, 1, 10, 'DE', 0, 'L', 1307081543, '2011-06-03 07:55:24', 'AudioEngel', '', ''); +(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 1, 1, 0, 10, 'DE', 115, 'L', 1307104634, '0000-00-00 00:00:00', '', '', ''), +(148, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 1, 1, 10, 'DE', 0, 'L', 1307082872, '2011-06-03 07:55:24', 'AudioEngel', '', ''); -- -------------------------------------------------------- @@ -1174,7 +1179,7 @@ CREATE TABLE IF NOT EXISTS `UserGroups` ( `group_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `uid` (`uid`,`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=12 ; -- -- Daten für Tabelle `UserGroups` @@ -1185,9 +1190,7 @@ INSERT INTO `UserGroups` (`id`, `uid`, `group_id`) VALUES (2, 1, -3), (3, 1, -5), (4, 1, -4), -(8, 148, -2), -(9, 148, -3), -(10, 148, -4); +(11, 148, -2); -- -------------------------------------------------------- diff --git a/includes/pages/admin_language.php b/includes/pages/admin_language.php new file mode 100644 index 00000000..a866528e --- /dev/null +++ b/includes/pages/admin_language.php @@ -0,0 +1,100 @@ +\n"; + $html .= Get_Text("pub_sprache_text1") . "

        \n"; + + $html .= "" . Get_Text("pub_sprache_ShowEntry") . ""; + // ausgabe Tabellenueberschift + $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; + $erg_Sprachen = sql_query($SQL_Sprachen); + + for ($i = 0; $i < mysql_num_rows($erg_Sprachen); $i++) + $Sprachen[mysql_result($erg_Sprachen, $i, "Sprache")] = $i; + + $html .= "\t\n\t\t"; + $html .= "\t\t"; + foreach ($Sprachen as $Name => $Value) + $html .= ""; + $html .= "\t\t"; + $html .= "\t\t"; + + if (isset ($_GET["ShowEntry"])) { + // ausgabe eintraege + $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; + $erg = sql_query($SQL); + + $TextID_Old = mysql_result($erg, 0, "TextID"); + for ($i = 0; $i < mysql_num_rows($erg); $i++) { + $TextID_New = mysql_result($erg, $i, "TextID"); + if ($TextID_Old != $TextID_New) { + $html .= ""; + $html .= "\n"; + $html .= "\t\t\n"; + + foreach ($Sprachen as $Name => $Value) { + $Value = html_entity_decode($Value, ENT_QUOTES); + $html .= "\t\t\n"; + $Sprachen[$Name] = ""; + } + + $html .= "\t\t\n"; + $html .= ""; + $html .= "\n"; + $TextID_Old = $TextID_New; + } + $Sprachen[mysql_result($erg, $i, "Sprache")] = mysql_result($erg, $i, "Text"); + } /*FOR*/ + } + + //fuer neu eintraege + $html .= ""; + $html .= "\n"; + $html .= "\t\t\n"; + + foreach ($Sprachen as $Name => $Value) + $html .= "\t\t\n"; + + $html .= "\t\t\n"; + $html .= ""; + $html .= "\n"; + + $html .= "
        " . Get_Text("pub_sprache_TextID") . "" . + Get_Text("pub_sprache_Sprache") . " " . $Name . + "" . Get_Text("pub_sprache_Edit") . "
        $TextID_Old " . + "
        \n"; + } /*if( !isset( $TextID ) )*/ + else { + $html .= "edit: " . $_POST["TextID"] . "

        "; + foreach ($_POST as $k => $v) { + if ($k != "TextID") { + $sql_test = "SELECT * FROM `Sprache` " . + "WHERE `TextID`='" . $_POST["TextID"] . "' AND `Sprache`='$k'"; + $erg_test = sql_query($sql_test); + + if (mysql_num_rows($erg_test) == 0) { + $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) " . + "VALUES ('" . $_POST["TextID"] . "', '$k', '$v')"; + $html .= $sql_save . "
        "; + $Erg = sql_query($sql_save); + $html .= success("$k Save: OK
        \n"); + } else + if (mysql_result($erg_test, 0, "Text") != $v) { + $sql_save = "UPDATE `Sprache` SET `Text`='$v' " . + "WHERE `TextID`='" . $_POST["TextID"] . "' AND `Sprache`='$k' "; + $html .= $sql_save . "
        "; + $Erg = sql_query($sql_save); + $html .= success(" $k Update: OK
        \n"); + } else + $html .= "\t $k no changes
        \n"; + } + } + + } + return $html; +} +?> + diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 630ca772..0399dda8 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -243,7 +243,7 @@ function admin_user() { Gekommen Aktiv T-Shirt - Registrier + Registriert Änd. '; $Gekommen = 0; diff --git a/includes/sys_menu.php b/includes/sys_menu.php index d5543f97..744d28d5 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -39,7 +39,8 @@ function make_navigation() { "admin_shifts", "admin_rooms", "admin_groups", - "admin_faq" + "admin_faq", + "admin_language" )); return $menu; } diff --git a/txt/TODO b/txt/TODO index d78d3198..62bbe106 100644 --- a/txt/TODO +++ b/txt/TODO @@ -1,8 +1,13 @@ jetzt: + * aktiv + * gekommen + * tshirt * schichtimport * schichtadministration * meine schichten * schichten + * Services? + * DECT-kram? * weckservice? später: diff --git a/www-ssl/index.php b/www-ssl/index.php index ded6c110..fe8c4795 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -93,6 +93,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_faq") { require_once ('includes/pages/admin_faq.php'); $content = admin_faq(); + } + elseif ($p == "admin_language") { + require_once ('includes/pages/admin_language.php'); + $content = admin_language(); } else { require_once ('includes/pages/guest_start.php'); $content = guest_start(); -- cgit v1.2.3-54-g00ecf From 2fcd0a63f5c1bb8edd753788729ea2e22e01c0ab Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 14:38:47 +0200 Subject: remove old admin language --- www-ssl/admin/sprache.php | 110 ---------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 www-ssl/admin/sprache.php diff --git a/www-ssl/admin/sprache.php b/www-ssl/admin/sprache.php deleted file mode 100644 index a36bf694..00000000 --- a/www-ssl/admin/sprache.php +++ /dev/null @@ -1,110 +0,0 @@ -\n"; - echo Get_Text("pub_sprache_text1") . "

        \n"; - - echo "" . Get_Text("pub_sprache_ShowEntry") . ""; - // ausgabe Tabellenueberschift - $SQL_Sprachen = "SELECT `Sprache` FROM `Sprache` GROUP BY `Sprache`;"; - $erg_Sprachen = mysql_query($SQL_Sprachen, $con); - echo mysql_error($con); - - for ($i = 0; $i < mysql_num_rows($erg_Sprachen); $i++) - $Sprachen[mysql_result($erg_Sprachen, $i, "Sprache")] = $i; - - echo "\t\n\t\t"; - echo "\t\t"; - foreach ($Sprachen as $Name => $Value) - echo ""; - echo "\t\t"; - echo "\t\t"; - - if (isset ($_GET["ShowEntry"])) { - // ausgabe eintraege - $SQL = "SELECT * FROM `Sprache` ORDER BY `TextID`;"; - $erg = mysql_query($SQL, $con); - echo mysql_error($con); - - $TextID_Old = mysql_result($erg, 0, "TextID"); - for ($i = 0; $i < mysql_num_rows($erg); $i++) { - $TextID_New = mysql_result($erg, $i, "TextID"); - if ($TextID_Old != $TextID_New) { - echo ""; - echo "\n"; - echo "\t\t\n"; - - foreach ($Sprachen as $Name => $Value) { - $Value = html_entity_decode($Value, ENT_QUOTES); - echo "\t\t\n"; - $Sprachen[$Name] = ""; - } - - echo "\t\t\n"; - echo ""; - echo "\n"; - $TextID_Old = $TextID_New; - } - $Sprachen[mysql_result($erg, $i, "Sprache")] = mysql_result($erg, $i, "Text"); - } /*FOR*/ - } - - //fuer neu eintraege - echo ""; - echo "\n"; - echo "\t\t\n"; - - foreach ($Sprachen as $Name => $Value) - echo "\t\t\n"; - - echo "\t\t\n"; - echo ""; - echo "\n"; - - echo "
        " . Get_Text("pub_sprache_TextID") . "" . - Get_Text("pub_sprache_Sprache") . " " . $Name . - "" . Get_Text("pub_sprache_Edit") . "
        $TextID_Old " . - "
        \n"; -} /*if( !isset( $TextID ) )*/ -else { - echo "edit: " . $_GET["TextID"] . "

        "; - foreach ($_GET as $k => $v) { - if ($k != "TextID") { - $sql_test = "SELECT * FROM `Sprache` " . - "WHERE `TextID`='" . $_GET["TextID"] . "' AND `Sprache`='$k'"; - $erg_test = mysql_query($sql_test, $con); - - if (mysql_num_rows($erg_test) == 0) { - $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) " . - "VALUES ('" . $_GET["TextID"] . "', '$k', '$v')"; - echo $sql_save . "
        "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Save: OK
        \n"; - else - echo "\t $k Save: KO
        \n"; - } else - if (mysql_result($erg_test, 0, "Text") != $v) { - $sql_save = "UPDATE `Sprache` SET `Text`='$v' " . - "WHERE `TextID`='" . $_GET["TextID"] . "' AND `Sprache`='$k' "; - echo $sql_save . "
        "; - $Erg = mysql_query($sql_save, $con); - if ($Erg == 1) - echo "\t $k Update: OK
        \n"; - else - echo "\t $k Update: KO
        \n"; - } else - echo "\t $k no changes
        \n"; - } - } - -} - -include ("includes/footer.php"); -?> - -- cgit v1.2.3-54-g00ecf From 7e91f4821aee41589dd744a9540f15b76d729bab Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 14:44:01 +0200 Subject: recentchanges -> admin log --- DB/db_rewrite.sql | 23 ++++++++++++++--------- includes/pages/admin_log.php | 25 +++++++++++++++++++++++++ includes/sys_menu.php | 3 ++- www-ssl/admin/Recentchanges.php | 29 ----------------------------- www-ssl/index.php | 4 ++++ 5 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 includes/pages/admin_log.php delete mode 100644 www-ssl/admin/Recentchanges.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 8758c191..525d6e7b 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 12:37 +-- Erstellungszeit: 03. Juni 2011 um 12:43 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -82,7 +82,7 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES ('admin_angel_types', 71), ('user_settings', 134), ('user_messages', 113), -('admin_groups', 135), +('admin_groups', 141), ('user_questions', 55), ('admin_questions', 43), ('admin_faq', 55), @@ -90,7 +90,8 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES ('news_comments', 151), ('admin_user', 206), ('user_meetings', 5), -('admin_language', 22); +('admin_language', 25), +('admin_log', 5); -- -------------------------------------------------------- @@ -136,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=73 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=74 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -160,7 +161,8 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (57, -4, 7), (63, -4, 5), (70, -2, 8), -(72, -5, 18); +(72, -5, 18), +(73, -3, 19); -- -------------------------------------------------------- @@ -274,7 +276,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=19 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=20 ; -- -- Daten für Tabelle `Privileges` @@ -298,7 +300,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (15, 'news_comments', 'User can comment news'), (16, 'admin_user', 'Administrate the angels'), (17, 'user_meetings', 'Lists meetings (news)'), -(18, 'admin_language', 'Translate the system'); +(18, 'admin_language', 'Translate the system'), +(19, 'admin_log', 'Display recent changes'); -- -------------------------------------------------------- @@ -1045,7 +1048,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('user_meetings', 'DE', 'Treffen'), ('user_meetings', 'EN', 'Meetings'), ('admin_language', 'DE', 'Übersetzung'), -('admin_language', 'EN', 'Translation'); +('admin_language', 'EN', 'Translation'), +('admin_log', 'EN', 'Log'), +('admin_log', 'DE', 'Log'); -- -------------------------------------------------------- @@ -1088,7 +1093,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 1, 1, 0, 10, 'DE', 115, 'L', 1307104634, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 1, 1, 0, 10, 'DE', 115, 'L', 1307105002, '0000-00-00 00:00:00', '', '', ''), (148, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 1, 1, 10, 'DE', 0, 'L', 1307082872, '2011-06-03 07:55:24', 'AudioEngel', '', ''); -- -------------------------------------------------------- diff --git a/includes/pages/admin_log.php b/includes/pages/admin_log.php new file mode 100644 index 00000000..5f112f03 --- /dev/null +++ b/includes/pages/admin_log.php @@ -0,0 +1,25 @@ + 0) { + $html .= "\n"; + $html .= "\n\t\n\t\n\t\n\t\n\n"; + for ($n = 0; $n < mysql_num_rows($Erg); $n++) { + $html .= "\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\n"; + } + $html .= "
        TimeUserCommendSQL Command
        " . mysql_result($Erg, $n, "Time") . "" . UID2Nick(mysql_result($Erg, $n, "UID")) . displayavatar(mysql_result($Erg, $n, "UID")) . "" . mysql_result($Erg, $n, "Commend") . "" . mysql_result($Erg, $n, "SQLCommad") . "
        \n"; + } else { + $html .= "Log is empty..."; + } + return $html; +} +?> + diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 744d28d5..e81bed8d 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -40,7 +40,8 @@ function make_navigation() { "admin_rooms", "admin_groups", "admin_faq", - "admin_language" + "admin_language", + "admin_log" )); return $menu; } diff --git a/www-ssl/admin/Recentchanges.php b/www-ssl/admin/Recentchanges.php deleted file mode 100644 index 26324406..00000000 --- a/www-ssl/admin/Recentchanges.php +++ /dev/null @@ -1,29 +0,0 @@ -\n"; -echo "\n\tTime\n\tUser\n\tCommend\n\tSQL Commad\n\n"; - -for ($n = 0; $n < mysql_num_rows($Erg); $n++) { - echo "\n"; - echo "\t" . mysql_result($Erg, $n, "Time") . "\n"; - echo "\t" . UID2Nick(mysql_result($Erg, $n, "UID")) . displayavatar(mysql_result($Erg, $n, "UID")) . "\n"; - echo "\t" . mysql_result($Erg, $n, "Commend") . "\n"; - echo "\t" . mysql_result($Erg, $n, "SQLCommad") . "\n"; - echo "\n"; -} - -echo "\n"; - -include ("includes/footer.php"); -?> - diff --git a/www-ssl/index.php b/www-ssl/index.php index fe8c4795..7c65abb2 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -97,6 +97,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_language") { require_once ('includes/pages/admin_language.php'); $content = admin_language(); + } + elseif ($p == "admin_log") { + require_once ('includes/pages/admin_log.php'); + $content = admin_log(); } else { require_once ('includes/pages/guest_start.php'); $content = guest_start(); -- cgit v1.2.3-54-g00ecf From ded7bcb0b49e101c0414034fe1ff168a043b6a75 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 14:48:05 +0200 Subject: debug -> admin log --- includes/funktion_db_list.php | 100 +++++++++++++++++++++--------------------- includes/pages/admin_log.php | 51 +++++++++++++++++++++ www-ssl/admin/debug.php | 58 ------------------------ 3 files changed, 100 insertions(+), 109 deletions(-) delete mode 100644 www-ssl/admin/debug.php diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php index 3e2878da..35bb7255 100644 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -1,64 +1,62 @@ "; - echo "DB: $Table_Name"; + $SQL = "SELECT * FROM `" . $Table_Name . "`"; + $Erg = mysql_query($SQL, $con); - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo "". mysql_field_name($Erg, $m). ""; - } - echo ""; + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo "".mysql_result($Erg, $n, $m). ""; - } - echo ""; - } - echo ""; -} + $Anzahl_Felder = mysql_num_fields($Erg); -function funktion_db_element_list_2row( $TopicName, $SQL) -{ - $html = ""; - $html .= "\n"; - $html .= ""; -# $html .= "\n"; + $html .= "
        $TopicName

        $TopicName
        "; + $html .= ""; - $Erg = sql_query($SQL); - - $html .= ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - $html .= ""; - } - $html .= ""; + $html .= ""; + for ($m = 0; $m < $Anzahl_Felder; $m++) { + $html .= ""; + } + $html .= ""; - for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) - { - $html .= ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - $html .= ""; - } - $html .= ""; - } - $html .= "
        DB: $Table_Name
        ". mysql_field_name($Erg, $m). "
        " . mysql_field_name($Erg, $m) . "
        ".mysql_result($Erg, $n, $m). "
        \n"; - return $html; + for ($n = 0; $n < $Zeilen; $n++) { + $html .= ""; + for ($m = 0; $m < $Anzahl_Felder; $m++) { + $html .= "" . mysql_result($Erg, $n, $m) . ""; + } + $html .= ""; + } + $html .= ""; + return $html; } +function funktion_db_element_list_2row($TopicName, $SQL) { + $html = ""; + $html .= "\n"; + $html .= ""; + # $html .= "\n"; + + $Erg = sql_query($SQL); + + $html .= ""; + for ($m = 0; $m < mysql_num_fields($Erg); $m++) { + $html .= ""; + } + $html .= ""; + + for ($n = 0; $n < mysql_num_rows($Erg); $n++) { + $html .= ""; + for ($m = 0; $m < mysql_num_fields($Erg); $m++) { + $html .= ""; + } + $html .= ""; + } + $html .= "
        $TopicName

        $TopicName
        " . mysql_field_name($Erg, $m) . "
        " . mysql_result($Erg, $n, $m) . "
        \n"; + return $html; +} ?> diff --git a/includes/pages/admin_log.php b/includes/pages/admin_log.php index 5f112f03..2798b2cf 100644 --- a/includes/pages/admin_log.php +++ b/includes/pages/admin_log.php @@ -1,5 +1,7 @@ "; + + $html .= "

        Web Counter

        "; + $html .= funktion_db_list("Counter"); + + /* + $html .= "

        Raeume


        "; + funktion_db_list("Raeume"); + + $html .= "

        Schichtbelegung


        "; + funktion_db_list("Schichtbelegung"); + + $html .= "

        Schichtplan


        Hier findest du alle bisher eingetragenen Schichten:"; + funktion_db_list("Schichtplan"); + + $html .= "

        User


        "; + funktion_db_list("User"); + + $html .= "

        News


        "; + funktion_db_list("News"); + + $html .= "

        FAQ


        "; + funktion_db_list("FAQ"); + + $html .= "Deaktiviert"; + */ + + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Tshirt nicht ausgegeben (Gekommen=1)", "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); + + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Gesamte Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Geleisteter Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); + + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Gesamte Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); + $html .= "
        \n"; + $html .= funktion_db_element_list_2row("Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); + return $html; } ?> diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php deleted file mode 100644 index ec1b2c9f..00000000 --- a/www-ssl/admin/debug.php +++ /dev/null @@ -1,58 +0,0 @@ -Web Counter"; -funktion_db_list("Counter"); - -/* -echo "

        Raeume


        "; -funktion_db_list("Raeume"); - -echo "

        Schichtbelegung


        "; -funktion_db_list("Schichtbelegung"); - -echo "

        Schichtplan


        Hier findest du alle bisher eingetragenen Schichten:"; -funktion_db_list("Schichtplan"); - -echo "

        User


        "; -funktion_db_list("User"); - -echo "

        News


        "; -funktion_db_list("News"); - -echo "

        FAQ


        "; -funktion_db_list("FAQ"); - -echo "Deaktiviert"; -*/ - -echo "
        \n"; -funktion_db_element_list_2row("Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); -echo "
        \n"; -funktion_db_element_list_2row("Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); -echo "
        \n"; -funktion_db_element_list_2row("Tshirt nicht ausgegeben (Gekommen=1)", "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); - -echo "
        \n"; -funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); -echo "
        \n"; -funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); - -echo "
        \n"; -funktion_db_element_list_2row("Gesamte Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); -echo "
        \n"; -funktion_db_element_list_2row("Geleisteter Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); - -echo "
        \n"; -funktion_db_element_list_2row("Gesamte Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); -echo "
        \n"; -funktion_db_element_list_2row("Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); - -include ("includes/footer.php"); -?> - -- cgit v1.2.3-54-g00ecf From f6ad58750d8597329526413a0bff3c0b85dfdd28 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 15:08:05 +0200 Subject: fixed faq --- includes/pages/guest_faq.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/pages/guest_faq.php b/includes/pages/guest_faq.php index 2799cbaf..e639731b 100644 --- a/includes/pages/guest_faq.php +++ b/includes/pages/guest_faq.php @@ -7,14 +7,14 @@ function guest_faq() { if ($_SESSION['Sprache'] == "DE") { $html .= sprintf( '
        %s
        %s
        ', - $faq['frage_de'], - $faq['antwort_de'] + $faq['Frage_de'], + $faq['Antwort_de'] ); } else { $html .= sprintf( '
        %s
        %s
        ', - $faq['frage_en'], - $faq['antwort_en'] + $faq['Frage_en'], + $faq['Antwort_en'] ); } $html .= ""; -- cgit v1.2.3-54-g00ecf From 225398d87d56257e63f03504fb1a0452a8d9ae02 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 15:30:17 +0200 Subject: json auth service complete --- includes/sys_auth.php | 79 ++++++++++++++++++++++++++++++++++------------ www-ssl/index.php | 10 ++++-- www-ssl/nonpublic/auth.php | 45 +++----------------------- 3 files changed, 70 insertions(+), 64 deletions(-) diff --git a/includes/sys_auth.php b/includes/sys_auth.php index 009be2d8..15c5591a 100644 --- a/includes/sys_auth.php +++ b/includes/sys_auth.php @@ -3,7 +3,7 @@ // Testet ob ein User eingeloggt ist und lädt die entsprechenden Privilegien function load_auth() { - global $user; + global $user, $privileges; if (!isset ($_SESSION['IP'])) $_SESSION['IP'] = $_SERVER['REMOTE_ADDR']; @@ -19,30 +19,12 @@ function load_auth() { 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` = '" . sql_escape($_SESSION['uid']) . "' LIMIT 1;" - ); + sql_query("UPDATE `User` SET " . "`lastLogIn` = '" . time() . "'" . " WHERE `UID` = '" . sql_escape($_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']; - } + $privileges = isset ($user) ? privileges_for_user($user['UID']) : privileges_for_group(-1); } function PassCrypt($passwort) { @@ -55,4 +37,59 @@ function PassCrypt($passwort) { return md5($passwort); } } + +// JSON Authorisierungs-Schnittstelle +function json_auth_service() { + global $CurrentExternAuthPass; + + header("Content-Type: application/json"); + + $User = $_REQUEST['user']; + $Pass = $_REQUEST['pw']; + $SourceOuth = $_REQUEST['so']; + + if (isset ($CurrentExternAuthPass) && $SourceOuth == $CurrentExternAuthPass) { + $sql = "SELECT * FROM `User` WHERE `Nick`='" . sql_escape($User) . "'"; + $Erg = sql_query($sql); + + if (mysql_num_rows($Erg) == 1) { + if (mysql_result($Erg, 0, "Passwort") == PassCrypt($Pass)) { + $UID = mysql_result($Erg, 0, "UID"); + + $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($UID) . ";"); + foreach ($user_privs as $user_priv) + $privileges[] = $user_priv['name']; + + $msg = array ( + 'status' => 'success', + 'rights' => $privileges + ); + echo json_encode($msg); + die(); + } + } + } + + echo json_encode(array ( + 'status' => 'failed', + 'error' => "JSON Service GET syntax: https://engelsystem.de/?auth&user=&pw=&so=, POST is possible too" + )); + die(); +} + +function privileges_for_user($user_id) { + $privileges = array (); + $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_id) . ";"); + foreach ($user_privs as $user_priv) + $privileges[] = $user_priv['name']; + return $privileges; +} + +function privileges_for_group($group_id) { + $privileges = array (); + $groups_privs = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group_id)); + foreach ($groups_privs as $guest_priv) + $privileges[] = $guest_priv['name']; + return $privileges; +} ?> diff --git a/www-ssl/index.php b/www-ssl/index.php index 7c65abb2..214ec54a 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -22,6 +22,10 @@ sql_connect($config['host'], $config['user'], $config['pw'], $config['db']); load_auth(); +// JSON Authorisierung gewünscht? +if (isset ($_REQUEST['auth'])) + json_auth_service(); + // Gewünschte Seite/Funktion $p = isset ($user) ? "news" : "start"; if (isset ($_REQUEST['p'])) @@ -89,15 +93,15 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_groups") { require_once ('includes/pages/admin_groups.php'); $content = admin_groups(); - } + } elseif ($p == "admin_faq") { require_once ('includes/pages/admin_faq.php'); $content = admin_faq(); - } + } elseif ($p == "admin_language") { require_once ('includes/pages/admin_language.php'); $content = admin_language(); - } + } elseif ($p == "admin_log") { require_once ('includes/pages/admin_log.php'); $content = admin_log(); diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php index 7d58988c..143ea8c8 100644 --- a/www-ssl/nonpublic/auth.php +++ b/www-ssl/nonpublic/auth.php @@ -1,43 +1,8 @@ 'success', - 'rights' => $CVS - ); - echo json_encode($msg); - } else - echo json_encode(array ( - 'status' => 'failed' - )); - } else - echo json_encode(array ( - 'status' => 'failed' - )); -} else - echo json_encode(array ( - 'status' => 'failed' - )); +// Bleibt erstmal, damit Benutzer, die die Schnittstelle nutzen mitkriegen, dass diese Umgezogen ist +echo json_encode(array ( + 'status' => 'failed', + 'error' => "JSON Service moved to https://engelsystem.de/?auth&user=&pw=&so=" +)); ?> -- cgit v1.2.3-54-g00ecf From f38500a2f10d4e1bfe4f7a40405043cefc05644f Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 15:31:59 +0200 Subject: delete old json auth service --- www-ssl/nonpublic/auth.php | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 www-ssl/nonpublic/auth.php diff --git a/www-ssl/nonpublic/auth.php b/www-ssl/nonpublic/auth.php deleted file mode 100644 index 143ea8c8..00000000 --- a/www-ssl/nonpublic/auth.php +++ /dev/null @@ -1,8 +0,0 @@ - 'failed', - 'error' => "JSON Service moved to https://engelsystem.de/?auth&user=&pw=&so=" -)); -?> -- cgit v1.2.3-54-g00ecf From 7a6f4b2750465da6f59b13aefa575d734f5471f3 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 16:22:33 +0200 Subject: wake-up calls --- DB/db_rewrite.sql | 73 +++++++++++++++++-------------- includes/pages/user_wakeup.php | 92 ++++++++++++++++++++++++++++++++++++++++ includes/sys_menu.php | 1 + www-ssl/index.php | 4 ++ www-ssl/nonpublic/waeckliste.php | 46 -------------------- www-ssl/nonpublic/wecken.php | 86 ------------------------------------- 6 files changed, 138 insertions(+), 164 deletions(-) create mode 100644 includes/pages/user_wakeup.php delete mode 100644 www-ssl/nonpublic/waeckliste.php delete mode 100644 www-ssl/nonpublic/wecken.php diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index 525d6e7b..e4bb6689 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 12:43 +-- Erstellungszeit: 03. Juni 2011 um 14:20 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,27 +71,28 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 198), -('login', 34), -('logout', 15), -('start', 28), -('faq', 19), +('news', 206), +('login', 42), +('logout', 19), +('start', 32), +('faq', 27), ('credits', 7), -('register', 10), +('register', 12), ('admin_rooms', 90), ('admin_angel_types', 71), -('user_settings', 134), +('user_settings', 137), ('user_messages', 113), -('admin_groups', 141), +('admin_groups', 149), ('user_questions', 55), ('admin_questions', 43), -('admin_faq', 55), +('admin_faq', 56), ('admin_news', 33), ('news_comments', 151), ('admin_user', 206), ('user_meetings', 5), -('admin_language', 25), -('admin_log', 5); +('admin_language', 29), +('admin_log', 19), +('user_wakeup', 61); -- -------------------------------------------------------- @@ -137,32 +138,34 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=74 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=85 ; -- -- Daten für Tabelle `GroupPrivileges` -- INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES -(69, -2, 11), +(83, -2, 8), (24, -1, 5), -(68, -2, 9), -(67, -2, 17), +(82, -2, 11), +(81, -2, 9), (23, -1, 2), (62, -4, 16), (61, -4, 6), -(66, -2, 15), -(65, -2, 3), -(71, -5, 10), +(80, -2, 17), +(79, -2, 15), +(75, -5, 18), (60, -4, 12), (59, -4, 14), -(64, -2, 4), +(78, -2, 3), (58, -4, 13), (57, -4, 7), (63, -4, 5), -(70, -2, 8), -(72, -5, 18), -(73, -3, 19); +(77, -2, 4), +(74, -5, 10), +(73, -3, 19), +(76, -5, 20), +(84, -2, 20); -- -------------------------------------------------------- @@ -276,7 +279,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=20 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=21 ; -- -- Daten für Tabelle `Privileges` @@ -301,7 +304,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (16, 'admin_user', 'Administrate the angels'), (17, 'user_meetings', 'Lists meetings (news)'), (18, 'admin_language', 'Translate the system'), -(19, 'admin_log', 'Display recent changes'); +(19, 'admin_log', 'Display recent changes'), +(20, 'user_wakeup', 'User wakeup-service organization'); -- -------------------------------------------------------- @@ -557,7 +561,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('inc_schicht_noch_gesucht', 'DE', ' noch gesucht'), ('inc_schicht_und', 'DE', ' und '), ('pub_wake_beschreibung', 'DE', 'hier kannst du dich zum Wecken eintragen. Dazu sage einfach wann und wo und der Engel vom Dienst wird dich wecken.'), -('pub_wake_beschreibung2', 'DE', 'Deine bisherigen eingetragenen Zeiten:'), +('pub_wake_beschreibung2', 'DE', 'Alle eingetragenen Weckwünsche, die nächsten zuerst.'), ('pub_wake_Datum', 'DE', 'Datum'), ('pub_wake_Ort', 'DE', 'Ort'), ('pub_wake_Bemerkung', 'DE', 'Bermerkung'), @@ -601,7 +605,7 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('inc_schicht_wird', 'EN', ' is '), ('inc_schicht_noch_gesucht', 'EN', ' still needed '), ('inc_schicht_und', 'EN', ' and '), -('pub_wake_beschreibung2', 'EN', 'The wake-up calls you have ordered:\r\n'), +('pub_wake_beschreibung2', 'EN', 'All ordered wake-up calls, next first.'), ('pub_wake_Datum', 'EN', 'Date'), ('pub_wake_Ort', 'EN', 'Place'), ('pub_wake_change', 'EN', 'delete'), @@ -1050,7 +1054,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin_language', 'DE', 'Übersetzung'), ('admin_language', 'EN', 'Translation'), ('admin_log', 'EN', 'Log'), -('admin_log', 'DE', 'Log'); +('admin_log', 'DE', 'Log'), +('user_wakeup', 'DE', 'Weckservice'), +('user_wakeup', 'EN', 'Wakeup service'); -- -------------------------------------------------------- @@ -1093,8 +1099,8 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '4297f44b13955235245b2497399d7a93', 1, 1, 0, 10, 'DE', 115, 'L', 1307105002, '0000-00-00 00:00:00', '', '', ''), -(148, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 1, 1, 10, 'DE', 0, 'L', 1307082872, '2011-06-03 07:55:24', 'AudioEngel', '', ''); +(1, 'admin', 'Gates', 'Bill', 42, '', '', '', '', '', '', '', '21232f297a57a5a743894a0e4a801fc3', 1, 1, 0, 10, 'DE', 115, 'L', 1307110821, '0000-00-00 00:00:00', '', '', ''), +(148, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', '', '4297f44b13955235245b2497399d7a93', 0, 1, 1, 10, 'DE', 0, 'L', 1307110798, '2011-06-03 07:55:24', 'AudioEngel', '', ''); -- -------------------------------------------------------- @@ -1227,13 +1233,16 @@ INSERT INTO `UserPicture` (`UID`, `Bild`, `ContentType`, `show`) VALUES CREATE TABLE IF NOT EXISTS `Wecken` ( `ID` int(11) NOT NULL AUTO_INCREMENT, `UID` int(11) NOT NULL DEFAULT '0', - `Date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `Date` int(11) NOT NULL, `Ort` text NOT NULL, `Bemerkung` text NOT NULL, PRIMARY KEY (`ID`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=8 ; -- -- Daten für Tabelle `Wecken` -- +INSERT INTO `Wecken` (`ID`, `UID`, `Date`, `Ort`, `Bemerkung`) VALUES +(4, 1, 1307109840, 'Tent 23', 'knock knock leo, follow the white rabbit to the blue tent'), +(5, 1, 1307109840, 'Tent 23', 'knock knock leo, follow the white rabbit to the blue tent'); diff --git a/includes/pages/user_wakeup.php b/includes/pages/user_wakeup.php new file mode 100644 index 00000000..b6955669 --- /dev/null +++ b/includes/pages/user_wakeup.php @@ -0,0 +1,92 @@ +getTimestamp(); + $bemerkung = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['Bemerkung'])); + $ort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Ort'])); + $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) " . + "VALUES ('" . $user['UID'] . "', '" . $date . "', '" . $ort . "', " . + "'" . $bemerkung . "')"; + sql_query($SQL); + $html .= success(Get_Text(4)); + } else + $html .= error("Broken date!"); + break; + + case 'delete' : + if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing wake-up ID."); + + $wakeup = sql_select("SELECT * FROM `Wecken` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + if (count($wakeup) > 0 && $wakeup[0]['UID'] == $user['UID']) { + sql_query("DELETE FROM `Wecken` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + $html .= success("Wake-up call deleted."); + } else + return error("No wake-up found."); + break; + } + } + + $html .= "

        " . Get_Text("Hello") . $user['Nick'] . ",
        " . Get_Text("pub_wake_beschreibung") . "

        \n\n"; + $html .= Get_Text("pub_wake_beschreibung2"); + $html .= ' + + + + + + + + +'; + + $sql = "SELECT * FROM `Wecken` ORDER BY `Date` ASC"; + $Erg = sql_query($sql); + $count = mysql_num_rows($Erg); + + for ($i = 0; $i < $count; $i++) { + $row = mysql_fetch_row($Erg); + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + if (mysql_result($Erg, $i, "UID") == $user['UID']) + $html .= ''; + else + $html .= ''; + $html .= ''; + } + + $html .= '
        ' . Get_Text("pub_wake_Datum") . '' . Get_Text("pub_waeckliste_Nick") . '' . Get_Text("pub_wake_Ort") . '' . Get_Text("pub_wake_Bemerkung") . '
        ' . date("Y-m-d H:i", mysql_result($Erg, $i, "Date")) . ' ' . UID2Nick(mysql_result($Erg, $i, "UID")) . ' ' . mysql_result($Erg, $i, "Ort") . ' ' . mysql_result($Erg, $i, "Bemerkung") . ' " . Get_Text("pub_wake_del") . '
        ' . Get_Text("pub_wake_Text2") . ' +
        + + + + + + + + + + + + + +
        ' . Get_Text("pub_wake_Datum") . ':
        ' . Get_Text("pub_wake_Ort") . '
        ' . Get_Text("pub_wake_Bemerkung") . '
        + +
        '; + + return $html; +} +?> \ No newline at end of file diff --git a/includes/sys_menu.php b/includes/sys_menu.php index e81bed8d..b651a002 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -27,6 +27,7 @@ function make_navigation() { "user_shifts", "user_messages", "user_questions", + "user_wakeup", "user_settings" )); diff --git a/www-ssl/index.php b/www-ssl/index.php index 214ec54a..71c13d15 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -55,6 +55,10 @@ if (in_array($p, $privileges)) { require_once ('includes/pages/user_questions.php'); $content = user_questions(); } + elseif ($p == "user_wakeup") { + require_once ('includes/pages/user_wakeup.php'); + $content = user_wakeup(); + } elseif ($p == "user_settings") { require_once ('includes/pages/user_settings.php'); $content = user_settings(); diff --git a/www-ssl/nonpublic/waeckliste.php b/www-ssl/nonpublic/waeckliste.php deleted file mode 100644 index d98dd455..00000000 --- a/www-ssl/nonpublic/waeckliste.php +++ /dev/null @@ -1,46 +0,0 @@ - - -

        \n" . Get_Text("pub_waeckliste_Text1"); ?>

        - - - - - - - - - - - - - - - - -
        - - diff --git a/www-ssl/nonpublic/wecken.php b/www-ssl/nonpublic/wecken.php deleted file mode 100644 index 0d44b48d..00000000 --- a/www-ssl/nonpublic/wecken.php +++ /dev/null @@ -1,86 +0,0 @@ -" . Get_Text("Hello") . $_SESSION['Nick'] . ",
        " . Get_Text("pub_wake_beschreibung") . "

        \n\n"; -echo Get_Text("pub_wake_beschreibung2"); -?> - - - - - - - - - - - - - - - - - -
        " . Get_Text("pub_wake_del"); ?>
        -

        - -

        - -
        - - - - - - - - - - - - - -
        :
        -" /> -
        - -- cgit v1.2.3-54-g00ecf From 7bee3ce4d20a569e76ad6405e3cafa4aebe23c58 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 16:30:00 +0200 Subject: config cleanup, removed unused files --- default-conf/var_www_includes/config.php | 3 -- includes/UserCVS.php | 80 -------------------------------- includes/menu.php | 52 --------------------- www-ssl/ShowUserPicture.php | 3 ++ www-ssl/lageplan.php | 12 ----- 5 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 includes/UserCVS.php delete mode 100644 includes/menu.php delete mode 100644 www-ssl/lageplan.php diff --git a/default-conf/var_www_includes/config.php b/default-conf/var_www_includes/config.php index ca0c39c9..574c44ae 100644 --- a/default-conf/var_www_includes/config.php +++ b/default-conf/var_www_includes/config.php @@ -23,9 +23,6 @@ $LETZTES_AUSTRAGEN=3; $crypt_system="md5"; //$crypt_system="crypt"; -// the archangels -$arch_angels="fnord"; - // timezonen offsett $gmdateOffset=3600; diff --git a/includes/UserCVS.php b/includes/UserCVS.php deleted file mode 100644 index b7fb412c..00000000 --- a/includes/UserCVS.php +++ /dev/null @@ -1,80 +0,0 @@ - $v) { - if($v == "G") - $_SESSION['CVS'][$k] = $_SESSION['CVS_Group'][$k]; - } - } - - // pagename ermitteln -// $Page["Name"] = basename($_SERVER['PHP_SELF']); - $Page["Name"] = str_replace($ENGEL_ROOT, '', $_SERVER['PHP_SELF']); - - //recht fuer diese seite auslesen - if(isset($_SESSION['CVS'][$Page["Name"]])) - $Page["CVS"] = $_SESSION['CVS'][$Page["Name"]]; - else { - echo "SYSTEM ERROR: no right for " . $Page["Name"] . " exists."; - die; - } - - if($debug) { - echo "
        \$_SESSION:\n";
-    print_r($_SESSION);
-    echo "
        "; - - if( strlen($Page["CVS"]) == 0 ) - echo "

        CVS ERROR, on page '". $Page["Name"]. "'

        "; - else - echo "CVS: ". $Page["Name"]. " => '". $Page["CVS"]. "'
        "; - } - - function funktion_isLinkAllowed($PageName) { - global $_SESSION; - - // separate page parameter - $ParameterPos = strpos($PageName, ".php?"); - - if($ParameterPos === false) - $pName = $PageName; - else - $pName = substr($PageName, 0, $ParameterPos + 4); - - // check rights - if((isset( $_SESSION['CVS'][ $pName ]) === true) && $_SESSION['CVS'][ $pName ] == "Y") - return true; - - return false; - } - - function funktion_isLinkAllowed_addLink_OrLinkText( $PageName, $LinkText) { - global $url, $ENGEL_ROOT; - - if(funktion_isLinkAllowed( $PageName) === true) - return "" . $LinkText . ""; - - return $LinkText; - } - - function funktion_isLinkAllowed_addLink_OrEmpty( $PageName, $LinkText) { - global $url, $ENGEL_ROOT; - - if(funktion_isLinkAllowed( $PageName) === true) - return "" . $LinkText . ""; - - return ""; - } -?> diff --git a/includes/menu.php b/includes/menu.php deleted file mode 100644 index 6a209a0f..00000000 --- a/includes/menu.php +++ /dev/null @@ -1,52 +0,0 @@ - - - -= 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++) { -?> - - - - - - - - diff --git a/www-ssl/ShowUserPicture.php b/www-ssl/ShowUserPicture.php index 96b1092a..5a222c07 100644 --- a/www-ssl/ShowUserPicture.php +++ b/www-ssl/ShowUserPicture.php @@ -1,4 +1,7 @@ " . Get_Text("lageplan_text1") . "

        "; -echo "

        \"\""; - -include "includes/footer.php"; -?> -- cgit v1.2.3-54-g00ecf From 586272ccec099913814c0171d7616ad737421ac7 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 16:52:57 +0200 Subject: begin pentabarf import --- includes/funktion_xml.php | 244 +++++++++++++++++++------------------- includes/pages/admin_import.php | 253 ++++++++++++++++++++++++++++++++++++++++ includes/sys_menu.php | 1 + www-ssl/index.php | 4 + 4 files changed, 380 insertions(+), 122 deletions(-) create mode 100644 includes/pages/admin_import.php diff --git a/includes/funktion_xml.php b/includes/funktion_xml.php index 60eb26fa..87fd72d0 100644 --- a/includes/funktion_xml.php +++ b/includes/funktion_xml.php @@ -1,154 +1,154 @@ sub[ $XMLpos[$Tiefe] ]->data .= htmlentities( convertValues($Data), ENT_QUOTES); - - if($XMLDEBUG) - echo "???". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. "|$Data|$Tiefe???
        "; - } else - dataXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); +function dataXMLmain($Data, & $Objekt, $Tiefe) { + global $XMLmain, $XMLpos, $depth, $XMLDEBUG; + + if ($XMLDEBUG) + echo "?$Tiefe$depth"; + + if (($depth -1) == $Tiefe) { + $Objekt->sub[$XMLpos[$Tiefe]]->data .= htmlentities(convertValues($Data), ENT_QUOTES); + + if ($XMLDEBUG) + echo "???" . $Objekt->sub[$XMLpos[$Tiefe]]->name . "|$Data|$Tiefe???
        "; + } else + dataXMLmain($Data, $Objekt->sub[$XMLpos[$Tiefe]], $Tiefe +1); } -function startXMLmain( $Data, &$Objekt, $Tiefe ) { - global $XMLpos, $depth, $XMLDEBUG; - - if( $XMLDEBUG) - if($Tiefe==1) - { print_r(array_values ($XMLpos)); echo "--".$Data->name; - echo " #$Tiefe/$depth#"; - } - - if( $depth==$Tiefe) - { - $Objekt->sub[ $XMLpos[$Tiefe] ] = $Data; - if( $XMLDEBUG) - echo "|". $XMLpos[$Tiefe]."|". $Objekt->sub[ $XMLpos[$Tiefe] ]->name. " ". $Data->name." save|". "#-#
        "; - } - else - startXMLmain( $Data, $Objekt->sub[ $XMLpos[$Tiefe] ], $Tiefe+1); +function startXMLmain($Data, & $Objekt, $Tiefe) { + global $XMLpos, $depth, $XMLDEBUG; + + if ($XMLDEBUG) + if ($Tiefe == 1) { + print_r(array_values($XMLpos)); + echo "--" . $Data->name; + echo " #$Tiefe/$depth#"; + } + + if ($depth == $Tiefe) { + $Objekt->sub[$XMLpos[$Tiefe]] = $Data; + if ($XMLDEBUG) + echo "|" . $XMLpos[$Tiefe] . "|" . $Objekt->sub[$XMLpos[$Tiefe]]->name . " " . $Data->name . " save|" . "#-#
        "; + } else + startXMLmain($Data, $Objekt->sub[$XMLpos[$Tiefe]], $Tiefe +1); } -function start_element_handler($parser, $name, $attribs) -{ - global $depth, $XMLmain, $XMLpos; +function start_element_handler($parser, $name, $attribs) { + global $depth, $XMLmain, $XMLpos; - $Data = new element; - $Data->name = $name; - while(list($key, $value) = each($attribs)) - $Data->attributes[$key] = convertValues($value); - $Data->depth = $depth; - $XMLpos[$depth]++; + $Data = new element; + $Data->name = $name; + while (list ($key, $value) = each($attribs)) + $Data->attributes[$key] = convertValues($value); + $Data->depth = $depth; + $XMLpos[$depth]++; - if( $depth==0) - $XMLmain= $Data; - else - startXMLmain( $Data, $XMLmain, 1); + if ($depth == 0) + $XMLmain = $Data; + else + startXMLmain($Data, $XMLmain, 1); - $depth++; + $depth++; } -function end_element_handler($parser, $name) -{ - global $depth, $XMLpos; - $XMLpos[$depth]=0; - $depth--; +function end_element_handler($parser, $name) { + global $depth, $XMLpos; + $XMLpos[$depth] = 0; + $depth--; } -function character_data_handler($parser, $data) -{ - global $XMLmain; - if( strlen(trim($data)) ) - dataXMLmain( $data, $XMLmain, 1); +function character_data_handler($parser, $data) { + global $XMLmain; + if (strlen(trim($data))) + dataXMLmain($data, $XMLmain, 1); } /*#######################################################################################*/ -function readXMLfile( $file ) -{ - global $XMLDEBUG; - - //$xml_parser = xml_parser_create_ns(); - $xml_parser = xml_parser_create("UTF-8"); - xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler"); - xml_set_character_data_handler($xml_parser, "character_data_handler"); - - if (file_exists($file)) - { - if (!($fp = fopen($file, "r"))) - { - echo("

        could not open XML file \"$file\"

        "); - return -1; - } - } - else - { - echo("

        XML file \"$file\" not exist

        "); - return -1; - } - - if( $XMLDEBUG) echo "
        ";
-  while ($data = fread($fp, 4096)) 
-  {
-    if (!xml_parse($xml_parser, $data, feof($fp))) 
-    {
-      die(sprintf("XML error: %s at line %d",
-            xml_error_string(xml_get_error_code($xml_parser)),
-            xml_get_current_line_number($xml_parser)));
-    }
-  }
-  if( $XMLDEBUG)  echo "
        "; - xml_parser_free($xml_parser); - return 0; +function readXMLfile($file) { + global $XMLDEBUG; + + //$xml_parser = xml_parser_create_ns(); + $xml_parser = xml_parser_create("UTF-8"); + xml_set_element_handler($xml_parser, "start_element_handler", "end_element_handler"); + xml_set_character_data_handler($xml_parser, "character_data_handler"); + + if (file_exists($file)) { + if (!($fp = fopen($file, "r"))) { + echo ("

        could not open XML file \"$file\"

        "); + return -1; + } + } else { + echo ("

        XML file \"$file\" not exist

        "); + return -1; + } + + if ($XMLDEBUG) + echo "
        ";
+	while ($data = fread($fp, 4096)) {
+		if (!xml_parse($xml_parser, $data, feof($fp))) {
+			die(sprintf("XML error: %s at line %d", xml_error_string(xml_get_error_code($xml_parser)), xml_get_current_line_number($xml_parser)));
+		}
+	}
+	if ($XMLDEBUG)
+		echo "
        "; + xml_parser_free($xml_parser); + return 0; } /*#######################################################################################*/ -function getXMLsubPease( $Sourse, $Name ) -{ - foreach($Sourse->sub as $key => $value) { - if ($value->name == $Name) { - return $value; - } - } - - echo "

        Fehler: getXMLsubPease( $Sourse, $Name ) not found

        "; -// die; +function getXMLsubPease($Sourse, $Name) { + foreach ($Sourse->sub as $key => $value) { + if ($value->name == $Name) { + return $value; + } + } + + echo "

        Fehler: getXMLsubPease( $Sourse, $Name ) not found

        "; + // die; } /*#######################################################################################*/ -function getXMLsubData( $Sourse, $Name ) -{ - $XML = getXMLsubPease( $Sourse, $Name); - return $XML->data; +function getXMLsubData($Sourse, $Name) { + $XML = getXMLsubPease($Sourse, $Name); + return $XML->data; } ?> diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php new file mode 100644 index 00000000..9b8af2e2 --- /dev/null +++ b/includes/pages/admin_import.php @@ -0,0 +1,253 @@ +\n

        XML File:

        \n"; + if (isset ($_POST["PentabarfUser"]) && isset ($_POST["password"]) && isset ($_POST["PentabarfURL"])) { + $html .= "Update XCAL-File from Pentabarf.."; + if ($PentabarfGetWith == "fsockopen") { + + //backup error messeges and delate + $Backuperror_messages = $error_messages; + $fp = fsockopen("ssl://$PentabarfXMLhost", 443, $errno, $errstr, 30); + // $error_messages = $Backuperror_messages; + + if (!$fp) { + $html .= "

        fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!" . + "[$errstr ($errno)]

        "; + } else { + if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) { + $head = 'GET /' . $PentabarfXMLpath . $_POST["PentabarfURL"] . ' HTTP/1.1' . "\r\n" . + 'Host: ' . $PentabarfXMLhost . "\r\n" . + 'User-Agent: Engelsystem' . "\r\n" . + 'Authorization: Basic ' . + base64_encode($_POST["PentabarfUser"] . ':' . $_POST["password"]) . "\r\n" . + "\r\n"; + fputs($fp, $head); + $Zeilen = -1; + while (!feof($fp)) { + $Temp = fgets($fp, 1024); + + // ende des headers + if ($Temp == "f20\r\n") { + $Zeilen = 0; + $Temp = ""; + } + + //file ende? + if ($Temp == "0\r\n") + break; + + if (($Zeilen > -1) && ($Temp != "ffb\r\n")) { + //steuerzeichen ausfiltern + if (strpos("#$Temp", "\r\n") > 0) + $Temp = substr($Temp, 0, strlen($Temp) - 2); + if (strpos("#$Temp", "1005") > 0) + $Temp = ""; + if (strpos("#$Temp", "783") > 0) + $Temp = ""; + //schreiben in file + fputs($fileOut, $Temp); + $Zeilen++; + } + } + fclose($fileOut); + + $html .= "
        Es wurden $Zeilen Zeilen eingelesen
        "; + } else + $html .= "

        fail: File '$Tempdir/engelXML' not writeable!

        "; + fclose($fp); + } + } + elseif ($PentabarfGetWith == "fopen") { + //user uns password in url einbauen + $FileNameIn = "https://" . $_POST["PentabarfUser"] . ':' . $_POST["password"] . "@" . + $PentabarfXMLhost . "/" . $PentabarfXMLpath . $_POST["PentabarfURL"]; + + if (($fileIn = fopen($FileNameIn, "r")) != FALSE) { + if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) { + $Zeilen = 0; + while (!feof($fileIn)) { + $Zeilen++; + fputs($fileOut, fgets($fileIn)); + } + fclose($fileOut); + $html .= "
        Es wurden $Zeilen Zeilen eingelesen
        "; + } else + $html .= "

        fail: File '$Tempdir/engelXML' not writeable!

        "; + fclose($fileIn); + } else + $html .= "

        fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!

        "; + } + elseif ($PentabarfGetWith == "wget") { + $Command = "wget --http-user=" . $_POST["PentabarfUser"] . " --http-passwd=" . $_POST["password"] . " " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML" . + " --no-check-certificate"; + $html .= system($Command, $Status); + if ($Status == 0) + $html .= "OK.
        "; + else + $html .= "fail ($Status)($Command).
        "; + } + elseif ($PentabarfGetWith == "lynx") { + $Command = "lynx -auth=" . $_POST["PentabarfUser"] . ":" . $_POST["password"] . " -dump " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . " > $Tempdir/engelXML"; + $html .= system($Command, $Status); + if ($Status == 0) + $html .= "OK.
        "; + else + $html .= "fail ($Status)($Command).
        "; + } + elseif ($PentabarfGetWith == "fopen") { + //user uns password in url einbauen + $FileNameIn = "https://" . $_POST["PentabarfUser"] . ':' . $_POST["password"] . "@" . + $PentabarfXMLhost . "/" . $PentabarfXMLpath . $_POST["PentabarfURL"]; + + if (($fileIn = fopen($FileNameIn, "r")) != FALSE) { + if (($fileOut = fopen("$Tempdir/engelXML", "w")) != FALSE) { + $Zeilen = 0; + while (!feof($fileIn)) { + $Zeilen++; + fputs($fileOut, fgets($fileIn)); + } + fclose($fileOut); + $html .= "
        Es wurden $Zeilen Zeilen eingelesen
        "; + } else + $html .= "

        fail: File '$Tempdir/engelXML' not writeable!

        "; + fclose($fileIn); + } else + $html .= "

        fail: File 'https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . "' not readable!

        "; + } + elseif ($PentabarfGetWith == "wget") { + $Command = "wget --http-user=" . $_POST["PentabarfUser"] . " --http-passwd=" . $_POST["password"] . " " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . + " --output-file=$Tempdir/engelXMLwgetLog --output-document=$Tempdir/engelXML" . + " --no-check-certificate"; + $html .= system($Command, $Status); + if ($Status == 0) + $html .= "OK.
        "; + else + $html .= "fail ($Status)($Command).
        "; + } + elseif ($PentabarfGetWith == "lynx") { + $Command = "lynx -auth=" . $_POST["PentabarfUser"] . ":" . $_POST["password"] . " -dump " . + "https://$PentabarfXMLhost/$PentabarfXMLpath" . $_POST["PentabarfURL"] . " > $Tempdir/engelXML"; + $html .= system($Command, $Status); + if ($Status == 0) + $html .= "OK.
        "; + else + $html .= "fail ($Status)($Command).
        "; + } else + $html .= "

        The PentabarfGetWith='$PentabarfGetWith' not supported

        "; + } else { + $html .= "
        \n"; + $html .= "\n"; + $html .= "\t" . + "\n"; + $html .= "\t" . + "\n"; + $html .= "\t" . + "\n"; + $html .= "\t\n"; + $html .= "
        XCAL-File: https://$PentabarfXMLhost/$PentabarfXMLpath
        Username:
        Password:
        \n"; + $html .= "
        \n"; + } + + //readXMLfile("xml.php.xml"); + if (readXMLfile("$Tempdir/engelXML") == 0) { + $XMLmain = getXMLsubPease($XMLmain, "VCALENDAR"); + + if ($ShowDataStrukture) { + $html .= "

        ";
+			$html .= $XMLmain->name;
+			$html .= "
        ";
+			print_r(array_values($XMLmain->sub));
+			$html .= "
        "; + } + + /* + $html .= "
        "; + $Feld=7; + $html .= "$Feld#". $XMLmain->sub[$Feld]->name. "
        "; + $html .= "$Feld#". $XMLmain->sub[$Feld]->sub; + //print_r(array_values ($XMLmain->sub[$Feld]->sub)); + while(list($key, $value) = each($XMLmain->sub[$Feld]->sub)) + $html .= "?ID".$value->sub[1]->data. "=". $value->sub[2]->data. "\n"; + $html .= ""; + */ + + /*############################################################################################## + V e r s i o n + ##############################################################################################*/ + + $html .= "
        \n"; + $XMLrelease = getXMLsubPease($XMLmain, "X-WR-CALDESC"); + $html .= "release: " . $XMLrelease->data . "
        \n"; + //$XMLreleaseDate = getXMLsubPease( $XMLmain, "RELEASE-DATE"); + //$html .= "release date: ". $XMLreleaseDate->data. "
        \n"; + $html .= "
        \n"; + + /*############################################################################################## + V e r s i o n + ##############################################################################################*/ + if ($EnableRoomFunctions) + include ("includes/funktion_xml_room.php"); + + if ($EnableSchudleFunctions) + include ("includes/funktion_xml_schudle.php"); + + /*############################################################################################## + U P D A T E A L L + ##############################################################################################*/ + $html .= "\n\n
        \n

        Update ALL:

        \n"; + + $html .= "
        \n"; + $html .= "\t\n"; + $html .= "
        \n"; + + } //if XMLopenOOK + return $html; +} + +/*############################################################################################## + erstellt Arrays der Reume + ##############################################################################################*/ +function CreateRoomArrays() { + global $Room, $RoomID, $RoomName, $con; + + $sql = "SELECT `RID`, `Name` FROM `Room` " . + "WHERE `Show`='Y'" . + "ORDER BY `Number`, `Name`;"; + $Erg = mysql_query($sql, $con); + $rowcount = mysql_num_rows($Erg); + + for ($i = 0; $i < $rowcount; $i++) { + $Room[$i]["RID"] = mysql_result($Erg, $i, "RID"); + $Room[$i]["Name"] = mysql_result($Erg, $i, "Name"); + $RoomID[mysql_result($Erg, $i, "RID")] = mysql_result($Erg, $i, "Name"); + $RoomName[mysql_result($Erg, $i, "Name")] = mysql_result($Erg, $i, "RID"); + } +} +?> + diff --git a/includes/sys_menu.php b/includes/sys_menu.php index b651a002..dfe33216 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -42,6 +42,7 @@ function make_navigation() { "admin_groups", "admin_faq", "admin_language", + "admin_import", "admin_log" )); return $menu; diff --git a/www-ssl/index.php b/www-ssl/index.php index 71c13d15..e1a4496f 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -106,6 +106,10 @@ if (in_array($p, $privileges)) { require_once ('includes/pages/admin_language.php'); $content = admin_language(); } + elseif ($p == "admin_import") { + require_once ('includes/pages/admin_import.php'); + $content = admin_import(); + } elseif ($p == "admin_log") { require_once ('includes/pages/admin_log.php'); $content = admin_log(); -- cgit v1.2.3-54-g00ecf From c7657ca7ff7ccfceb62e6e460a2bc041a282ff75 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 17:24:52 +0200 Subject: user_wakeup: Cleanup, use template --- includes/pages/user_wakeup.php | 44 ++++++++++++++++++------------------------ templates/user_wakeup.html | 19 ++++++++++++++++++ 2 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 templates/user_wakeup.html diff --git a/includes/pages/user_wakeup.php b/includes/pages/user_wakeup.php index b6955669..fe2ecc7a 100644 --- a/includes/pages/user_wakeup.php +++ b/includes/pages/user_wakeup.php @@ -10,11 +10,12 @@ function user_wakeup() { $date = DateTime::createFromFormat("Y-m-d H:i", $_REQUEST['Date']); if ($date != null) { $date = $date->getTimestamp(); - $bemerkung = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['Bemerkung'])); - $ort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Ort'])); - $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) " . - "VALUES ('" . $user['UID'] . "', '" . $date . "', '" . $ort . "', " . - "'" . $bemerkung . "')"; + $bemerkung = strip_request_item_nl('Bemerkung'); + $ort = strip_request_item('Ort'); + $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) " + . "VALUES ('" . sql_escape($user['UID']) . "', '" + . sql_escape($date) . "', '" . sql_escape($ort) . "', " . "'" + . sql_escape($bemerkung) . "')"; sql_query($SQL); $html .= success(Get_Text(4)); } else @@ -37,7 +38,8 @@ function user_wakeup() { } } - $html .= "

        " . Get_Text("Hello") . $user['Nick'] . ",
        " . Get_Text("pub_wake_beschreibung") . "

        \n\n"; + $html .= "

        " . Get_Text("Hello") . $user['Nick'] . ",
        " + . Get_Text("pub_wake_beschreibung") . "

        \n\n"; $html .= Get_Text("pub_wake_beschreibung2"); $html .= ' @@ -68,25 +70,17 @@ function user_wakeup() { $html .= ''; } - $html .= '
        ' . Get_Text("pub_wake_Text2") . ' -
        - - - - - - - - - - - - - -
        ' . Get_Text("pub_wake_Datum") . ':
        ' . Get_Text("pub_wake_Ort") . '
        ' . Get_Text("pub_wake_Bemerkung") . '
        - -
        '; + $html .= '
        ' . Get_Text("pub_wake_Text2"); + $html .= template_render('../templates/user_wakeup.html', array ( + 'wakeup_link' => page_link_to("user_wakeup"), + 'date_text' => Get_Text("pub_wake_Datum"), + 'date_value' => date("Y-m-d H:i"), + 'place_text' => Get_Text("pub_wake_Ort"), + 'comment_text' => Get_Text("pub_wake_Ort"), + 'comment_value' => "Knock knock Leo, follow the white rabbit to the blue tent", + 'submit_text' => Get_Text("pub_wake_button") + )); return $html; } -?> \ No newline at end of file +?> diff --git a/templates/user_wakeup.html b/templates/user_wakeup.html new file mode 100644 index 00000000..8384fe85 --- /dev/null +++ b/templates/user_wakeup.html @@ -0,0 +1,19 @@ +
        + + + + + + + + + + + + + +
        %date_text%:
        %place_text%
        %comment_text%
        + +
        -- cgit v1.2.3-54-g00ecf From 3a041d4ef3060a9a8bdca282d1a5d8431eea01c2 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 17:26:48 +0200 Subject: user_wakeup: Whoops. Fixes. --- includes/pages/user_wakeup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/pages/user_wakeup.php b/includes/pages/user_wakeup.php index fe2ecc7a..2c6940e7 100644 --- a/includes/pages/user_wakeup.php +++ b/includes/pages/user_wakeup.php @@ -77,9 +77,9 @@ function user_wakeup() { 'date_text' => Get_Text("pub_wake_Datum"), 'date_value' => date("Y-m-d H:i"), 'place_text' => Get_Text("pub_wake_Ort"), - 'comment_text' => Get_Text("pub_wake_Ort"), + 'comment_text' => Get_Text("pub_wake_Bemerkung"), 'comment_value' => "Knock knock Leo, follow the white rabbit to the blue tent", - 'submit_text' => Get_Text("pub_wake_button") + 'submit_text' => Get_Text("pub_wake_bouton") )); return $html; } -- cgit v1.2.3-54-g00ecf From 14820a5741e5aca9fc1e99cd388988ed9b9b3160 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 17:29:20 +0200 Subject: user_wakeup template: no tab/newline fuckup --- templates/user_wakeup.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/user_wakeup.html b/templates/user_wakeup.html index 8384fe85..d02ff5e8 100644 --- a/templates/user_wakeup.html +++ b/templates/user_wakeup.html @@ -11,8 +11,7 @@ %comment_text% +%comment_value% -- cgit v1.2.3-54-g00ecf From 72f547e65a9ea779c043056a8c87526b4c345b9f Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 17:54:33 +0200 Subject: todo... --- txt/TODO | 1 + 1 file changed, 1 insertion(+) diff --git a/txt/TODO b/txt/TODO index 62bbe106..5bb347bd 100644 --- a/txt/TODO +++ b/txt/TODO @@ -12,6 +12,7 @@ jetzt: später: * Zurück-/Backlinks setzen + * Pagination * MD5-Passwörter mit Salt speichern * Passwort-Mindestanforderungen stellen * User-Avatare (code liegt auskommentiert in user_settings.php) -- cgit v1.2.3-54-g00ecf From 5d9335fe183a0486c593975c45c2abe6875ab719 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 20:24:36 +0200 Subject: admin_questions: More templates + sql fixes --- includes/pages/admin_groups.php | 12 +++++++++++- includes/pages/admin_language.php | 18 ++++++++++++++---- includes/pages/admin_questions.php | 31 ++++++++++++++++++++----------- templates/admin_question_answered.html | 9 +++++++++ templates/admin_question_unanswered.html | 14 ++++++++++++++ templates/admin_questions.html | 6 +++--- 6 files changed, 71 insertions(+), 19 deletions(-) create mode 100644 templates/admin_question_answered.html create mode 100644 templates/admin_question_unanswered.html diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php index 842640d8..770f09b4 100644 --- a/includes/pages/admin_groups.php +++ b/includes/pages/admin_groups.php @@ -44,7 +44,17 @@ function admin_groups() { $privileges = sql_select("SELECT `Privileges`.*, `GroupPrivileges`.`group_id` FROM `Privileges` LEFT OUTER JOIN `GroupPrivileges` ON (`Privileges`.`id` = `GroupPrivileges`.`privilege_id` AND `GroupPrivileges`.`group_id`=" . sql_escape($id) . ") ORDER BY `Privileges`.`name`"); $privileges_html = ""; foreach ($privileges as $priv) - $privileges_html .= '' . $priv['name'] . '' . $priv['desc'] . ''; + $privileges_html .= sprintf( + '' + . ' %s %s', + $priv['id'], + ($priv['group_id'] != "" + ? 'checked="checked"' + : ''), + $priv['name'], + $priv['desc'] + ); $html .= template_render('../templates/admin_groups_edit_form.html', array ( 'link' => page_link_to("admin_groups"), diff --git a/includes/pages/admin_language.php b/includes/pages/admin_language.php index a866528e..749cd643 100644 --- a/includes/pages/admin_language.php +++ b/includes/pages/admin_language.php @@ -72,19 +72,29 @@ function admin_language() { foreach ($_POST as $k => $v) { if ($k != "TextID") { $sql_test = "SELECT * FROM `Sprache` " . - "WHERE `TextID`='" . $_POST["TextID"] . "' AND `Sprache`='$k'"; + "WHERE `TextID`='" . sql_escape($_POST["TextID"]) + . "' AND `Sprache`='" + . sql_escape($k) . "'"; + $erg_test = sql_query($sql_test); if (mysql_num_rows($erg_test) == 0) { $sql_save = "INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) " . - "VALUES ('" . $_POST["TextID"] . "', '$k', '$v')"; + "VALUES ('" . sql_escape($_POST["TextID"]) . "', '" + . sql_escape($k) . "', '" + . sql_escape($v) . "')"; + $html .= $sql_save . "
        "; $Erg = sql_query($sql_save); $html .= success("$k Save: OK
        \n"); } else if (mysql_result($erg_test, 0, "Text") != $v) { - $sql_save = "UPDATE `Sprache` SET `Text`='$v' " . - "WHERE `TextID`='" . $_POST["TextID"] . "' AND `Sprache`='$k' "; + $sql_save = "UPDATE `Sprache` SET `Text`='" + . sql_escape($v) . "' " . + "WHERE `TextID`='" + . sql_escape($_POST["TextID"]) + . "' AND `Sprache`='" . sql_escape($k) . "' "; + $html .= $sql_save . "
        "; $Erg = sql_query($sql_save); $html .= success(" $k Update: OK
        \n"); diff --git a/includes/pages/admin_questions.php b/includes/pages/admin_questions.php index 5355dd86..0e4469d5 100644 --- a/includes/pages/admin_questions.php +++ b/includes/pages/admin_questions.php @@ -18,19 +18,28 @@ function admin_questions() { if (!isset ($_REQUEST['action'])) { $open_questions = ""; $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`=0"); - foreach ($questions as $question) { - $open_questions .= '' . UID2Nick($question['UID']) . '' . str_replace("\n", '
        ', $question['Question']) . ''; - $open_questions .= '

        '; - $open_questions .= 'Delete'; - } + foreach ($questions as $question) + $open_questions .= template_render( + '../templates/admin_question_unanswered.html', array ( + 'question_nick' => UID2Nick($question['UID']), + 'question_id' => $question['QID'], + 'link' => page_link_to("admin_questions"), + 'question' => str_replace("\n", '
        ', $question['Question']) + )); $answered_questions = ""; $questions = sql_select("SELECT * FROM `Questions` WHERE `AID`>0"); - foreach ($questions as $question) { - $answered_questions .= '' . UID2Nick($question['UID']) . '' . str_replace("\n", '
        ', $question['Question']) . ''; - $answered_questions .= '' . UID2Nick($question['AID']) . '' . str_replace("\n", '
        ', $question['Answer']) . ''; - $answered_questions .= 'Delete'; - } + + foreach ($questions as $question) + $answered_questions .= template_render( + '../templates/admin_question_answered.html', array ( + 'question_id' => $question['QID'], + 'question_nick' => UID2Nick($question['UID']), + 'question' => str_replace("\n", "
        ", $question['Question']), + 'answer_nick' => UID2Nick($question['AID']), + 'answer' => str_replace("\n", "
        ", $question['Answer']), + 'link' => page_link_to("admin_questions"), + )); return template_render('../templates/admin_questions.html', array ( 'link' => page_link_to("admin_questions"), @@ -73,4 +82,4 @@ function admin_questions() { } } } -?> \ No newline at end of file +?> diff --git a/templates/admin_question_answered.html b/templates/admin_question_answered.html new file mode 100644 index 00000000..e4f07932 --- /dev/null +++ b/templates/admin_question_answered.html @@ -0,0 +1,9 @@ + + %question_nick% + %question% + %answer_nick% + %answer% + + Delete + + diff --git a/templates/admin_question_unanswered.html b/templates/admin_question_unanswered.html new file mode 100644 index 00000000..fc3db78a --- /dev/null +++ b/templates/admin_question_unanswered.html @@ -0,0 +1,14 @@ + + %question_nick% + %question% + +
        + + + +
        + + + Delete + + diff --git a/templates/admin_questions.html b/templates/admin_questions.html index ad8d6572..171f10b5 100644 --- a/templates/admin_questions.html +++ b/templates/admin_questions.html @@ -24,6 +24,9 @@ Not yet answered questions: + @@ -33,9 +36,6 @@ Not yet answered questions: - -- cgit v1.2.3-54-g00ecf From e294647c744129f0748bc4f17cb3fba375fc07e1 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sat, 4 Jun 2011 00:09:15 +0200 Subject: some pentabarf import sample data --- import/27C3_sample.xcs.xml | 2090 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2090 insertions(+) create mode 100644 import/27C3_sample.xcs.xml diff --git a/import/27C3_sample.xcs.xml b/import/27C3_sample.xcs.xml new file mode 100644 index 00000000..a84e31d3 --- /dev/null +++ b/import/27C3_sample.xcs.xml @@ -0,0 +1,2090 @@ + + + + 2.0 + -//Pentabarf//Schedule #<Conference_release::Row:0x2eadcdf118d8>//EN + 27C3 Schedule Release #<Conference_release::Row:0x2eadcdf118d8> + 27C3 Schedule + + PUBLISH + 4302@27C3@pentabarf.org + 4302 + 27c3_keynote_we_come_in_peace + 27C3 Keynote + We come in Peace + English + en + 20101227T113000 + 20101227T123000 + 01H00M00S + 27C3 Keynote- We come in Peace + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4302.en.html + Saal 1 + Rop Gonggrijp + + + PUBLISH + 4244@27C3@pentabarf.org + 4244 + critical_overview_of_10_years_pet + A Critical Overview of 10 years of Privacy Enhancing Technologies + + English + en + 20101229T113000 + 20101229T123000 + 01H00M00S + A Critical Overview of 10 years of Privacy Enhancing Technologies + The objective of the session is to provide a critical overview of "privacy research" within computer science. The mechanisms proposed in the last ten year include mechanisms for anonymous communications, censorship resistance, selective disclosure credentials (and their integration in identity management systems), as well as privacy in databases. All of these system are meant to shield the user from different aspects of on-line surveillance either through allowing a user to keep some of her data "confidential" or by allowing her to assert "control" over her data. We will illustrate using concrete examples, why some paradigms came to dominate the field, their advantages, but also their blind spots, and unfulfilled promises given the conditions of our surveillance societies. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4244.en.html + Saal 2 + seda + + + PUBLISH + 4245@27C3@pentabarf.org + 4245 + adventures_in_analyzing_stuxnet + Adventures in analyzing Stuxnet + + English + en + 20101227T230000 + 20101228T000000 + 01H00M00S + Adventures in analyzing Stuxnet + There has been many publications on the topic of Stuxnet and its "sophistication" in the mainstream press. However, there is not a complete publication which explains all of the technical vulnerability details and how they were discovered. In this talk, you will get a first-hand account of the entire story. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4245.en.html + Saal 1 + Bruce Dang + Peter Ferrie + + + PUBLISH + 4057@27C3@pentabarf.org + 4057 + adventures_in_mapping_afghanistan_elections + Adventures in Mapping Afghanistan Elections + The story of 3 Ushahidi mapping and reporting projects. + English + en + 20101228T214500 + 20101228T224500 + 01H00M00S + Adventures in Mapping Afghanistan Elections- The story of 3 Ushahidi mapping and reporting projects. + Monitoring and reporting about elections in a war zone is a complex and dangerous task. While crisis mapping carried out via sms and email proved highly successful with the use of Ushahidi in situations like post-election violence in Kenya, tracking crime in Atlanta, or earthquake recovery in Haiti, could it prove useful in such a complex situation as the Afghan political process? This year a team of people set out to do just that with three different Ushahidi mapping projects for national media, national election observers, and international observers. The following presentation is about the challenges we faced, successes we did or did not have, and the lessons learned for the future of crisis mapping. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4057.en.html + Saal 1 + Bicyclemark + + + PUBLISH + 4168@27C3@pentabarf.org + 4168 + automated_architecture_independent_gadget_search + A framework for automated architecture-independent gadget search + CCC edition + English + en + 20101230T143000 + 20101230T150000 + 00H30M00S + A framework for automated architecture-independent gadget search- CCC edition + We demonstrate that automated, architecture-independent gadget search is possible. Gadgets are code fragments which can be used to build unintended programs from existing code in memory. Our contribution is a framework of algorithms capable of locating a Turing-complete gadget set. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4168.en.html + Saal 2 + kornau + + + PUBLISH + 4046@27C3@pentabarf.org + 4046 + all_colours_are_beautiful + AllColoursAreBeautiful + interactive light installation inspired by blinkenlights + English + en + 20101227T183000 + 20101227T193000 + 01H00M00S + AllColoursAreBeautiful- interactive light installation inspired by blinkenlights + Starting in the beginning of August 2010 and lasting until the mid of November, the project AllColoursAreBeautiful by the Munich chapter of the Chaos Computer Club was serving as a platform for interested people on the world to illuminate, animate and interact with the front of a vacant department store in Munich. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4046.en.html + Saal 3 + Franz Pletz + lilafisch + + + PUBLISH + 4114@27C3@pentabarf.org + 4114 + analyzing_modern_cryptographic_rfid_stystem + Analyzing a modern cryptographic RFID system + HID iClass demystified + English + en + 20101229T171500 + 20101229T181500 + 01H00M00S + Analyzing a modern cryptographic RFID system- HID iClass demystified + Popular contactless systems for physical access control still rely on obscurity. As we have shown, time and time again, proprietary encryption systems are weak and easy to break. In a follow-up to last year's presentation we will now demonstrate attacks on systems with 'proper' cryptographic algorithms. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4114.en.html + Saal 2 + Henryk Plötz + Milosch Meriac + + + PUBLISH + 4151@27C3@pentabarf.org + 4151 + android_geolocation_using_gsm_network + Android geolocation using GSM network + "Where was Waldroid?" + English + en + 20101229T171500 + 20101229T181500 + 01H00M00S + Android geolocation using GSM network- "Where was Waldroid?" + We introduce a new forensic technique that allows to collect users' past locations on most current Android phones, within a few seconds. It becomes possible to tell where the user was at a given time, or where a phone call took place over the last few hours or days. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4151.en.html + Saal 3 + Renaud Lifchitz + + + PUBLISH + 4144@27C3@pentabarf.org + 4144 + short_political_history_of_acoustics + A short political history of acoustics + For whom, and to do what, the science of sound was developed in the 17th century + English + en + 20101228T160000 + 20101228T170000 + 01H00M00S + A short political history of acoustics- For whom, and to do what, the science of sound was developed in the 17th century + The birth of the modern science of acoustics was directly intertwined with the desires to surveill and communicate, either in secret or to everybody at once. Acoustics was not just about 'learning more about nature,' right from the start it was an applied science, driven by very clear notions of who has the right, and thus should have the possibility, of listening in on others, who needs to be able to converse in private, and who should be heard by everybody if he wishes to. How are these historical ideas related to those of today? + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4144.en.html + Saal 3 + Oona Leganovic + + + PUBLISH + 4160@27C3@pentabarf.org + 4160 + automatic_identification_cryptographic_primitives + Automatic Identification of Cryptographic Primitives in Software + + English + en + 20101227T160000 + 20101227T170000 + 01H00M00S + Automatic Identification of Cryptographic Primitives in Software + In this talk I demonstrate our research and the implementation of methods to detect cryptographic algorithms and their parameters in software. Based on +our observations on cryptographic code, I will point out several inherent characteristics to design signature-based and generic identification methods. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4160.en.html + Saal 3 + Felix Gröbert + + + PUBLISH + 4061@27C3@pentabarf.org + 4061 + bulding_custom_disassemblers + Building Custom Disassemblers + Instruction Set Reverse Engineering + English + en + 20101228T171500 + 20101228T181500 + 01H00M00S + Building Custom Disassemblers- Instruction Set Reverse Engineering + The Reverse Engineer occasionally faces situations where even his most advanced commercial tools do not support the instruction set of an arcane CPU. To overcome this situation, one can develop the missing disassembler. This talk is meant to be a tutorial on how to approach the task, what to focus on first and what surprises one may be in for. The primary focus will be on the transformation of byte code back into mnemonic representation where only the reverse transformation is available (i.e. you have the respective assembler). It also covers how to integrate your new disassembler into your reverse engineering tool chain. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4061.en.html + Saal 1 + FX of Phenoelit + + + PUBLISH + 4298@27C3@pentabarf.org + 4298 + ccc_jahresrueckblick_2010 + CCC-Jahresrückblick 2010 + + German + de + 20101229T113000 + 20101229T133000 + 02H00M00S + CCC-Jahresrückblick 2010 + Wir berichten über vergangene Veranstaltungen, Erfa-Aktivitäten, Demonstrationen, Hacks, Medienkontakte, Gerichtsverhandlungen, Lobbyarbeit sowie weiteres Erfreuliches und Ärgerliches des Jahres 2010 keinesfalls objektiv, sondern mit der gewohnten Hackerperspektive. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4298.en.html + Saal 1 + Andreas Bogk + Andy Müller-Maguhn + Constanze Kurz + Frank Rieger + + + PUBLISH + 4211@27C3@pentabarf.org + 4211 + chip_and_pin_is_broken + Chip and PIN is Broken + Vulnerabilities in the EMV Protocol + English + en + 20101229T203000 + 20101229T213000 + 01H00M00S + Chip and PIN is Broken- Vulnerabilities in the EMV Protocol + EMV is the dominant protocol used for smart card payments worldwide, with over 730 million cards in circulation. Known to bank customers as “Chip and PIN”, it is used in Europe; it is being introduced in Canada; and there is pressure from banks to introduce it in the USA too. EMV secures credit and debit card transactions by authenticating both the card and the customer presenting it through a combination of cryptographic authentication codes, digital signatures, and the entry of a PIN. In this paper we describe and demonstrate a protocol flaw which allows criminals to use a genuine card to make a payment without knowing the card’s PIN, and to remain undetected even when the merchant has an online connection to the banking network. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4211.en.html + Saal 1 + Steven J. Murdoch + + + PUBLISH + 4299@27C3@pentabarf.org + 4299 + closing_event + Closing Event + + English + en + 20101230T183000 + 20101230T193000 + 01H00M00S + Closing Event + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4299.en.html + Saal 1 + Frank Rieger + + + PUBLISH + 4096@27C3@pentabarf.org + 4096 + code_deobfuscation_by_optimization + Code deobfuscation by optimization + + English + en + 20101227T124500 + 20101227T134500 + 01H00M00S + Code deobfuscation by optimization + Optimization algorithms present an effective way for removing most obfuscations that are used today. Much of the compiler theory can be applied in removing obfuscations and building fast and reliable deobfuscation systems. By understanding traditional optimization problems and techniques it is possible to develop and customize compiler optimization algorithms for usage in binary deobfuscation/analysis. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4096.en.html + Saal 2 + Branko Spasojevic + + + PUBLISH + 4276@27C3@pentabarf.org + 4276 + cognitive_psychology_for_hackers + Cognitive Psychology for Hackers + Bugs, exploits, and occasional patches + English + en + 20101229T140000 + 20101229T150000 + 01H00M00S + Cognitive Psychology for Hackers- Bugs, exploits, and occasional patches + Experience firsthand some of the most interesting, surprising, and perspective-changing findings from cognitive and social neuropsychology. With perceptual illusions, priming, biases, heuristics, and unconscious influences, humans have tons of firmware "bugs". All have exploits; some even have patches. + +Learn how to improve your own thinking, use others' bugs to your advantage, and gain new perspective on the unconscious and often illusory processes involved in your perceptions. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4276.en.html + Saal 3 + Sai + + + PUBLISH + 4087@27C3@pentabarf.org + 4087 + console_hacking_2010 + Console Hacking 2010 + PS3 Epic Fail + English + en + 20101229T160000 + 20101229T170000 + 01H00M00S + Console Hacking 2010- PS3 Epic Fail + Over 70 million Wiis, over 40 million Xbox 360s and over 35 million Playstation 3s have been sold in the last few years. That makes over 145 million embedded devices out there and most of them are just used to play games. But what can you do with them if you don't like playing games? You hack them to make them run your own code of course! +We're going to talk about the various hacks that you can use to gain control of your hardware and make it do what you want it to do. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4087.en.html + Saal 1 + bushing + marcan + sven + + + PUBLISH + 4140@27C3@pentabarf.org + 4140 + contemporary_profiling_of_web_users + Contemporary Profiling of Web Users + On Using Anonymizers and Still Get Fucked + English + en + 20101227T140000 + 20101227T150000 + 01H00M00S + Contemporary Profiling of Web Users- On Using Anonymizers and Still Get Fucked + This talk will provide a summary of recently discovered methods which allow to break the Internet's privacy and anonymity. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4140.en.html + Saal 2 + Dominik Herrmann + lexi + + + PUBLISH + 4103@27C3@pentabarf.org + 4103 + copyright_enforcement_versus_freedoms + Copyright Enforcement Vs. Freedoms + ACTA, IPRED3 and other upcoming battles of the crusade against sharing + English + en + 20101227T124500 + 20101227T134500 + 01H00M00S + Copyright Enforcement Vs. Freedoms- ACTA, IPRED3 and other upcoming battles of the crusade against sharing + ACTA, upcoming criminal enforcement directive, filtering of content... The entertainment industries go further and further into their crusade against sharing. They not only attack our fundamental freedoms, but also the very essence of the Internet. + +This session is a panorama of the current and upcoming battles, campaigns and actions. Everyone can help defeat the motherf#§$ers! + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4103.en.html + Saal 1 + Jérémie Zimmermann + + + PUBLISH + 4003@27C3@pentabarf.org + 4003 + cybernetics_for_the_masses + Cybernetics for the Masses + implants, sensory extension and silicon - all for you! + English + en + 20101230T124500 + 20101230T133000 + 00H45M00S + Cybernetics for the Masses- implants, sensory extension and silicon - all for you! + Lightning talk on biohacking, complete with cyborg speaker, implant demonstrations, and knowledge of how to hack your own perception of electromagnetic radiation for approximately thirty Euros. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4003.en.html + Saal 2 + Lepht Anonym + + + PUBLISH + 4067@27C3@pentabarf.org + 4067 + data_analysis_in_terabit_ethernet_traffic + Data Analysis in Terabit Ethernet Traffic + Solutions for monitoring and lawful interception within a lot of bits + English + en + 20101230T140000 + 20101230T150000 + 01H00M00S + Data Analysis in Terabit Ethernet Traffic- Solutions for monitoring and lawful interception within a lot of bits + Network traffic grows faster than monitoring and analysis tools can handle. During the last two years a couple of appliances hit the market which help in finding the “bits of interest”. Recently installed strategies and solutions for carriers, banks or lawful interception organizations will be discussed as examples. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4067.en.html + Saal 3 + Lars Weiler + + + PUBLISH + 4231@27C3@pentabarf.org + 4231 + datenrettung_fun_with_hard_drives + Data Recovery Techniques + Fun with Hard Drives + English + en + 20101228T214500 + 20101228T224500 + 01H00M00S + Data Recovery Techniques- Fun with Hard Drives + Data recovery has always been an area of myths. This lecture will lift some of their covers. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4231.en.html + Saal 3 + Peter Franck + + + PUBLISH + 4190@27C3@pentabarf.org + 4190 + data_retention_in_the_eu + Data Retention in the EU five years after the Directive + Why the time is now to get active + English + en + 20101227T203000 + 20101227T213000 + 01H00M00S + Data Retention in the EU five years after the Directive- Why the time is now to get active + 2011 will again be a crucial year in the battle against data retention and blanket surveillance. The EU Commission is planning to publish its review of the directive in December (right in time before 27C3), and the lobbying and PR battle has already begun. In six months from now, we will see the legislative proposal from the EU commission for the revision of data retention. + +The talk will give a full picture of the legal state of play, what is going on in Brussels, what is already being done and of course where you can help. The speakers are closely involved in the process on the European and national level. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4190.en.html + Saal 1 + axel + Katarzyna Szymielewicz + Patrick Breyer + Ralf Bendrath + + + PUBLISH + 4123@27C3@pentabarf.org + 4123 + defense_is_not_dead + Defense is not dead + Why we will have more secure computers - tomorrow + English + en + 20101228T183000 + 20101228T193000 + 01H00M00S + Defense is not dead- Why we will have more secure computers - tomorrow + The security model of our current computer architectures - kernel in ring 0, processes in ring 3 - goes back to the early 70s. However, science hasn't stopped. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4123.en.html + Saal 2 + Andreas Bogk + + + PUBLISH + 4017@27C3@pentabarf.org + 4017 + desktop_on_the_linux + Desktop on the Linux... (and BSD, of course) + you're doing it confused? weird? strange? wrong? + English + en + 20101227T203000 + 20101227T213000 + 01H00M00S + Desktop on the Linux... (and BSD, of course)- you're doing it confused? weird? strange? wrong? + Time to take a look back and under the hood of the current state of FOSS based desktops: The Good, The Bad and The Ugly – Bloat, strange APIs, too much complexity. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4017.en.html + Saal 2 + datenwolf + + + PUBLISH + 4297@27C3@pentabarf.org + 4297 + die_gesamte_technik_ist_sicher + "Die gesamte Technik ist sicher" + Besitz und Wissen: Relay-Angriffe auf den neuen Personalausweis + German + de + 20101227T214500 + 20101227T224500 + 01H00M00S + "Die gesamte Technik ist sicher"- Besitz und Wissen: Relay-Angriffe auf den neuen Personalausweis + Für den neuen elektronischen Personalausweis sind drei verschiedene Lesegeräteklassen spezifiziert, von denen die einfachste bereits einige Kritik erfahren hat. Nach der Diskussion um die Sicherheit des Personalausweises stellt sich die Frage: Können zertifizierte Lesegeräte den neuen Ausweis schützen? + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4297.en.html + Saal 1 + Dominik Oepen + Frank Morgner + + + PUBLISH + 4085@27C3@pentabarf.org + 4085 + digitale_spaltung_per_gesetz + Digitale Spaltung per Gesetz + Das Internet und geschaffene soziale Ungleichheit im Alltag von Erwerbslosen + German + de + 20101229T203000 + 20101229T213000 + 01H00M00S + Digitale Spaltung per Gesetz- Das Internet und geschaffene soziale Ungleichheit im Alltag von Erwerbslosen + Hartz IV-Empfangende brauchen keine internetfähigen Computer, weil sie Fernseher haben. Dieser Ansicht sind deutsche Sozialgerichte und forcieren damit eine digitale Spaltung per Gesetz. Im Zeitalter der digitalen Informations- und Kommunikationsgesellschaft mutet dieser Umstand absurd an, aber eine breite öffentlichkeitswirksame Debatte steht bisher aus. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4085.en.html + Saal 2 + Betje Schwarz + Doris Gerbig + Kathrin Englert + + + PUBLISH + 4203@27C3@pentabarf.org + 4203 + distributed_fpga_number_crunching_for_the_masses + Distributed FPGA Number Crunching For The Masses + How we obtained the equivalent power of a Deep Crack for a fistful of dollars - and how the community can benefit from this + English + en + 20101228T113000 + 20101228T123000 + 01H00M00S + Distributed FPGA Number Crunching For The Masses- How we obtained the equivalent power of a Deep Crack for a fistful of dollars - and how the community can benefit from this + In 1998, the EFF built "Deep Crack", a machine designed to perform a walk over DES's 56-bit keyspace in nine days, for $250.000. With today's FPGA technology, a cost decrease of 25x can be achieved, as the copacobana project has shown. If that's still too much, two approaches should be considered: Recycling hardware and distributed computing. This talk will be about combining both approaches for the greater good. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4203.en.html + Saal 2 + Felix Domke + + + PUBLISH + 4006@27C3@pentabarf.org + 4006 + diy_synthesizers_and_sound_generators + DIY synthesizers and sound generators + Where does the sound come from? + English + en + 20101229T160000 + 20101229T170000 + 01H00M00S + DIY synthesizers and sound generators- Where does the sound come from? + At least if you have used all the features of a synthesizer, you probably ask the questions: "How can I modify it? How can I build a synthesizer myself? What features do I personally need?" + +This talk covers this topic from a theoretical and technical point of view. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4006.en.html + Saal 2 + Sylwester + + + PUBLISH + 4111@27C3@pentabarf.org + 4111 + eins_zwei_drei_alle_sind_dabei + Eins, zwei, drei - alle sind dabei + Von der Volkszählung zum Bundesmelderegister + German + de + 20101227T160000 + 20101227T170000 + 01H00M00S + Eins, zwei, drei - alle sind dabei- Von der Volkszählung zum Bundesmelderegister + Neben einer kurzen Einführung in die Problematik des Zensus 2011, soll es in dem Vortrag auch über die CCC Stellungnahmen für mehrere Landetage gehen. Weiterhin geht es auch um die mittlerweile abgewiesene Verfassungsbeschwerde des AK Zensus sowie weitere Möglichkeiten "was zu machen". + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4111.en.html + Saal 2 + Oliver "Unicorn" Knapp + + + PUBLISH + 4099@27C3@pentabarf.org + 4099 + file_print_electronics + File -> Print -> Electronics + A new circuit board printer will liberate you from the Arduino-Industrial Complex + English + en + 20101228T113000 + 20101228T123000 + 01H00M00S + File -> Print -> Electronics- A new circuit board printer will liberate you from the Arduino-Industrial Complex + Are you ready to wake up from the cult of Arduino? Tired of plugging together black-box pre-built modules like a mindless drone, copying and pasting in code you found on Hackaday? You've soldered together your TV-Be-Gone, built your fifth Minty Boost, and your bench is awash with discarded Adafruit packaging and Make magazines. It's time to stop this passive consumption. It's time to create something that is truly yours. It's time, my friend, to design your first circuit board. And you'll need a machine to print it. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4099.en.html + Saal 1 + Jeff Gough + + + PUBLISH + 4070@27C3@pentabarf.org + 4070 + fnord_jahresrueckblick_2010 + Fnord-Jahresrückblick 2010 + von Atomausstieg bis Zwangsintegration + German + de + 20101229T214500 + 20101229T224500 + 01H00M00S + Fnord-Jahresrückblick 2010- von Atomausstieg bis Zwangsintegration + Auch dieses Jahr werden wir uns wieder bemühen, Euch mit einem Rückblick auf die Fnords des Jahres zu unterhalten. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4070.en.html + Saal 1 + Felix von Leitner + Frank Rieger + + + PUBLISH + 4334@27C3@pentabarf.org + 4334 + fnord_jahresrueckblick_2010_translation + Fnord-Jahresrückblick 2010 (english translation) + von Atomausstieg bis Zwangsintegration + English + en + 20101229T214500 + 20101229T224500 + 01H00M00S + Fnord-Jahresrückblick 2010 (english translation)- von Atomausstieg bis Zwangsintegration + Auch dieses Jahr werden wir uns wieder bemühen, Euch mit einem Rückblick auf die Fnords des Jahres zu unterhalten. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4334.en.html + Saal 2 + Felix von Leitner + Frank Rieger + + + PUBLISH + 4164@27C3@pentabarf.org + 4164 + friede_sei_mit_euren_daten + Friede sei mit Euren Daten + Ein datenschutzrechtlicher Ausflug in ein kirchliches Parelleluniversum + German + de + 20101227T171500 + 20101227T181500 + 01H00M00S + Friede sei mit Euren Daten- Ein datenschutzrechtlicher Ausflug in ein kirchliches Parelleluniversum + Bundesdeutscher und kirchlicher Datenschutz führen eine Parallelexistenz. Während das Bundesdatenschutzgesetz von der Öffentlichkeit wahrgenommen und kritisch begleitet wird, ist den Wenigsten überhaupt klar, dass es auch einen vom BDSG losgelösten Datenschutz innerhalb der Kirchen gibt, der sich in einigen wichtigen Punkten vom staatlichen unterscheidet. Dieser Vortrag soll das Bewusstsein für ein Recht wecken, von dem sechzig Prozent der Deutschen betroffen sind – oft ohne es zu wissen. Praxisbeispiele und Tipps inbegriffen. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4164.en.html + Saal 2 + Jochim Selzer + + + PUBLISH + 4175@27C3@pentabarf.org + 4175 + from_robot_to_robot + From robot to robot + Restoring creativity in school pupils using robotics + English + en + 20101227T124500 + 20101227T134500 + 01H00M00S + From robot to robot- Restoring creativity in school pupils using robotics + Today, hacking is reserved for the microscopic fraction of the population who manage to shake themselves free of the suppressive education regime. Student Robotics is the beginning of the solution. By fostering creativity through competition to solve engineering challenges, we provide the inspiration society desperately needs. We develop an open platform for robotics and provide it to schools to open students' minds to the world of hacking. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4175.en.html + Saal 3 + Robert Spanton + + + PUBLISH + 4018@27C3@pentabarf.org + 4018 + frozencache + FrozenCache + Mitigating cold-boot attacks for Full-Disk-Encryption software + English + en + 20101229T230000 + 20101230T000000 + 01H00M00S + FrozenCache- Mitigating cold-boot attacks for Full-Disk-Encryption software + Cold boot attacks are a major risk for the protection that Full-Disk-Encryption solutions provide. FrozenCache is a general-purpose solution to this attack for x86 based systems that employs a special CPU cache mode known as "Cache-as-RAM". Switching the CPU cache into a special mode forces data to held exclusively in the CPU cache and not to be written to the backing RAM locations, thus safeguarding data from being obtained from RAM by means of cold boot attacks. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4018.en.html + Saal 3 + Juergen Pabel + + + PUBLISH + 4141@27C3@pentabarf.org + 4141 + hacker_jeopardy + Hacker Jeopardy + Number guessing for geeks + German + de + 20101229T230000 + 20101230T010000 + 02H00M00S + Hacker Jeopardy- Number guessing for geeks + The Hacker Jeopardy is a quiz show. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4141.en.html + Saal 1 + Ray + Stefan 'Sec' Zehl + + + PUBLISH + 4333@27C3@pentabarf.org + 4333 + hacker_jeopardy_translation + Hacker Jeopardy (english translation) + Number guessing for geeks + English + en + 20101229T230000 + 20101230T010000 + 02H00M00S + Hacker Jeopardy (english translation)- Number guessing for geeks + The Hacker Jeopardy is a quiz show. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4333.en.html + Saal 2 + + + PUBLISH + 3983@27C3@pentabarf.org + 3983 + hackers_and_computer_science + Hackers and Computer Science + What hacker research taught me + English + en + 20101230T134500 + 20101230T141500 + 00H30M00S + Hackers and Computer Science- What hacker research taught me + Although most academics and industry practitioners regard "hacking" as mostly ad-hoc, a loose collection of useful tricks essentially random in nature, I will argue that hacking has in fact become a "distinct research and engineering discipline" with deep underlying engineering ideas and insights. Although not yet formally defined as such, it are these ideas and insights that drive the great contributions that hacking has been making to our understanding of computing, including the challenges of handling complexity, composition, and security in complex systems. I will argue that hacking uncovers and helps to understand (and teach) fundamental issues that go to the heart of Computer Science as we know it, and will try to formulate several such fundamental principles which I have learned from hacker research. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/3983.en.html + Saal 2 + Sergey + + + PUBLISH + 4176@27C3@pentabarf.org + 4176 + hacking_ibuttons + Hacking iButtons + + German + de + 20101227T203000 + 20101227T213000 + 01H00M00S + Hacking iButtons + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4176.en.html + Saal 3 + Christian Brandt + + + PUBLISH + 4265@27C3@pentabarf.org + 4265 + hacking_smart_phones + hacking smart phones + expanding the attack surface and then some + English + en + 20101227T183000 + 20101227T193000 + 01H00M00S + hacking smart phones- expanding the attack surface and then some + There's been a fair bit written and presented about smartphone's, and yet, when it comes to the attack surface of the operating systems running on them, and the applications running on top of those, much still has to be explorer. This talk will dive a bit deeper into that attack surface. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4265.en.html + Saal 2 + Ilja van Sprundel + + + PUBLISH + 4193@27C3@pentabarf.org + 4193 + having_fun_with_rtp + Having fun with RTP + „Who is speaking???“ + English + en + 20101230T171500 + 20101230T181500 + 01H00M00S + Having fun with RTP- „Who is speaking???“ + A lot of people are interested and involved in voice over IP security. Most of the effort is concentrated on the security of the signalling protocols. This talk is focussing on the security of the voice part involved in todays voice over IP world. It is the result of the questions that I had to ask myself while i was debugging audio quality problems of customers and implementing a RTP stack from scratch. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4193.en.html + Saal 3 + kapejod + + + PUBLISH + 4295@27C3@pentabarf.org + 4295 + high_speed_high_security_cryptography + High-speed high-security cryptography: encrypting and authenticating the whole Internet + + English + en + 20101228T203000 + 20101228T213000 + 01H00M00S + High-speed high-security cryptography: encrypting and authenticating the whole Internet + Are you writing a program that sends data through the Internet? Are you sending the data through HTTP, or SMTP, or simply TCP, leaving it vulnerable to espionage, corruption, and sabotage by anyone who owns a machine connected to the same network? + +You can use SSH and IPsec to protect communication with your own machines, but how do you talk to the rest of the Internet? You can use TCPcrypt to protect yourself against attackers too lazy to forge packets, but how do you protect yourself against serious attackers? You can use HTTPS for low-frequency communication, but how do you handle heavy network traffic, and how do you protect yourself against the security flaws in HTTPS? Today's Internet cryptography is slow, untrustworthy, hard to use, and remarkably unsuccessful as a competitor to good old unprotected TCP. + +This talk will present a different approach to high-security Internet cryptography. This approach is easy for users, easy for system administrators, and, perhaps most importantly, easy for programmers. The main reason that the approach has not been tried before is that it seems to involve very slow cryptographic operations; this talk will show that the approach is extremely fast when it is done right. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4295.en.html + Saal 1 + Daniel J. Bernstein + + + PUBLISH + 4301@27C3@pentabarf.org + 4301 + flow_analysis_of_internet_activities + How the Internet sees you + demonstrating what activities most ISPs see you doing on the Internet + English + en + 20101230T160000 + 20101230T170000 + 01H00M00S + How the Internet sees you- demonstrating what activities most ISPs see you doing on the Internet + On the Internet one tends to think that one is pretty much safe from poking eyes. Taps in most countries can only be established after a judge has issued a warrant, thus upto such a tap is succesfully deployed one might think one is pretty much in the clear. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4301.en.html + Saal 1 + Jeroen Massar + + + PUBLISH + 4089@27C3@pentabarf.org + 4089 + ich_sehe_nicht_dass_wir_nicht_zustimmen_werden + Ich sehe nicht, dass wir nicht zustimmen werden + Die Sprache des politischen Verrats und seiner Rechtfertigung + German + de + 20101230T124500 + 20101230T134500 + 01H00M00S + Ich sehe nicht, dass wir nicht zustimmen werden- Die Sprache des politischen Verrats und seiner Rechtfertigung + Der Vortrag zeigt auf, wie sich Politiker rechtfertigen, wenn sie gegen ihre Argumentation und die Überzeugungen entscheiden oder handeln, für die sie stehen. Es ergibt sich dabei eine extreme Zwangslage, denn es ist oft nicht so einfach möglich, die zuvor vorgebrachten Argumente aufzugeben. Also muss auf Leerformeln, Nebelkerzen, Scheinargumente und spezielle grammatische Mittel zurückgegriffen werden, die die Regresspflicht mindern (Konjunktive, doppelte Verneinungen, Modalpartikeln usw.); dabei sind Kunstgriffe nötig, die über die inzwischen hinlänglich bekannte Leyen-Rhetorik hinausgehen. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4089.en.html + Saal 1 + maha/Martin Haase + + + PUBLISH + 4149@27C3@pentabarf.org + 4149 + i_control_your_code + I Control Your Code + Attack Vectors Through the Eyes of Software-based Fault Isolation + English + en + 20101228T140000 + 20101228T150000 + 01H00M00S + I Control Your Code- Attack Vectors Through the Eyes of Software-based Fault Isolation + Unsafe languages and an arms race for new bugs calls for an additional line of defense in software systems. User-space virtualization uses dynamic instrumentation to detect different attack vectors and protects from the execution of malicious code. An additional advantage of these virtualization systems is that they can be used to analyze different exploits step by step and to extract the exploit code from a running program. + +This talk explains the concept of different attack vectors (stack buffer overflows, format string attacks, return to libc attacks, race attacks / TOCTTOU, integer overflows, heap buffer overflows, and code anomalies). For each of these attack vectors we show possible exploits and explain how the virtualization system is able to detect and prevent the exploit. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4149.en.html + Saal 3 + Mathias Payer + + + PUBLISH + 4084@27C3@pentabarf.org + 4084 + ignorance_and_peace_narratives_in_cyberspace + Ignorance and Peace Narratives in Cyberspace + Cloud Computing, Assessment, and Fools like Me. + English + en + 20101229T134500 + 20101229T141500 + 00H30M00S + Ignorance and Peace Narratives in Cyberspace- Cloud Computing, Assessment, and Fools like Me. + This paper explores the challenges of being proactive with existing and future data mining possibilities when facing the realities of institutional expectations for assessment and when facing the fact that one’s own understanding of cyber capabilities is less than ideal. This paper discusses the current assessment cyber resources, trends, and pressures within USA academic institutions and the challenges of reactive/proactive labor in the midst of multiple levels of technological/informational literacies amongst administrators. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4084.en.html + Saal 2 + Angela Crow + + + PUBLISH + 4206@27C3@pentabarf.org + 4206 + immi_from_concept_to_reality + IMMI, from concept to reality + The Icelandic Modern Media Initiative and our need for a well-regulated flow of information + English + en + 20101229T171500 + 20101229T181500 + 01H00M00S + IMMI, from concept to reality- The Icelandic Modern Media Initiative and our need for a well-regulated flow of information + The talk will give an update on the status of the Icelandic Modern Media Initiative. If we put IMMI into the context of the bus Rop talked about in the keynote, then IMMI is the quality rubber for the tires that can ride that road safely. It is part of what our bus should look like, ride like, feel like. The talk will also try to define some more of that bus, and elaborate on what else we need apart from the best rubber we can get. + +The talk will hence deal with some of the latest developments in respect to freedom of speech, specifically that of the press, and political pressure being excersized on it, roles and responsibilities, and the role of responsibility. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4206.en.html + Saal 1 + Daniel Domscheit-Berg + + + PUBLISH + 4237@27C3@pentabarf.org + 4237 + indect_eu_surveillance_project + INDECT - an EU-Surveillance Project + + English + en + 20101229T183000 + 20101229T193000 + 01H00M00S + INDECT - an EU-Surveillance Project + INDECT + +The acronym stands for Intelligent Information System Supporting Observation, Searching and Detection for Security of Citizens in Urban Environment. +A total of 17 partners in nine member states are developing an infrastructure for linking existing surveillance technologies to form one mighty instrument for controlling the people. They are laying the foundation of a European police state, since INDECT's results serve to increase the effectiveness of police operation on the national and European level. +INDECT is funded under the European Commission's Seventh Framework Programme (FP7), the security-related research of which provides € 1.4 billion Euro for more than 60 partly interlaced projects. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4237.en.html + Saal 2 + Sylvia Johnigk + + + PUBLISH + 4236@27C3@pentabarf.org + 4236 + international_cyber_jurisdiction + International Cyber Jurisdiction + Kill Switching” Cyberspace, Cyber Criminal Prosecution & Jurisdiction Hopping + English + en + 20101230T160000 + 20101230T170000 + 01H00M00S + International Cyber Jurisdiction- Kill Switching” Cyberspace, Cyber Criminal Prosecution & Jurisdiction Hopping + Concepts of sovereignty, freedom, privacy and intellectual property become amorphous when discussing territories that only exists as far as the Internet connects. International cyber jurisdiction is supported by a complicated web of international law and treaties. Jurisdiction hopping, a technique that is becoming popular for controversial content, is one we have used for the U.S. 1st Amendment censorship-resistant and non-profit hosting company, Project DOD, by using PRQ's services in Sweden. This technique is used to place assets in a diverse, but accessible, web of countries in which that content may be legal in the hosting country, but may have legal complications in the country in which it is accessed. As ownership and protection of property becomes a concept that is difficult to maintain across boundaries that are not easily distinguishable, can the U.S. "kill-switch" parts of the Internet and under what authority can it be done? Similarly, the geographic challenges to international cyber criminal law – and the feasibility of new sovereign nations – will be analyzed. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4236.en.html + Saal 2 + TiffanyRad + + + PUBLISH + 4121@27C3@pentabarf.org + 4121 + is_the_ssliverse_a_safe_place + Is the SSLiverse a safe place? + An update on EFF's SSL Observatory project + English + en + 20101228T160000 + 20101228T170000 + 01H00M00S + Is the SSLiverse a safe place?- An update on EFF's SSL Observatory project + The EFF SSL Observatory has collected a dataset of all TLS/HTTPS certificates visible on the public web. We discuss this dataset - what we have learned from it, how you can use it, and how intend to offer a live, continually updated version of it. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4121.en.html + Saal 2 + Jesse + Peter Eckersley + + + PUBLISH + 4011@27C3@pentabarf.org + 4011 + embedded_reverse_engineering + JTAG/Serial/FLASH/PCB Embedded Reverse Engineering Tools and Techniques + a dump of simple tools for embedded analysis at many layers + English + en + 20101227T140000 + 20101227T150000 + 01H00M00S + JTAG/Serial/FLASH/PCB Embedded Reverse Engineering Tools and Techniques- a dump of simple tools for embedded analysis at many layers + Bring your target. Will release a slew of simple tools that explore attack surfaces and explain of how to use: jtag/serial scanners, parallel flash dumper, DePCB board routing analysis. So, crossover from software RE and start hacking/improving like its 1996 again. (full documentation and reference at: http://events.ccc.de/congress/2010/wiki/Embedded_Analysis) + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4011.en.html + Saal 3 + Nathan Fain + Vadik + + + PUBLISH + 4296@27C3@pentabarf.org + 4296 + lightning_days_d2 + Lightning Talks - Day 2 + 4 minutes of fame + English + en + 20101228T124500 + 20101228T134500 + 01H00M00S + Lightning Talks - Day 2- 4 minutes of fame + 4 minutes for every speaker. Learn about the good, the bad, and the ugly - in software, hardware, projects, and more. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4296.en.html + Saal 3 + Nick Farr + + + PUBLISH + 4239@27C3@pentabarf.org + 4239 + lightning_talks_d3 + Lightning Talks - Day 3 + where is my community? + English + en + 20101229T113000 + 20101229T134500 + 02H15M00S + Lightning Talks - Day 3- where is my community? + 4 minutes for every speaker. Learn about the good, the bad, and the ugly - in software, hardware, projects, and more. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4239.en.html + Saal 3 + Nick Farr + + + PUBLISH + 4300@27C3@pentabarf.org + 4300 + lightning_talks_d4 + Lightning Talks - Day 4 + where is my community? + English + en + 20101230T113000 + 20101230T134500 + 02H15M00S + Lightning Talks - Day 4- where is my community? + 4 minutes for every speaker. Learn about the good, the bad, and the ugly - in software, hardware, projects, and more. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4300.en.html + Saal 3 + Nick Farr + + + PUBLISH + 4195@27C3@pentabarf.org + 4195 + literarischer_abend + Literarischer Abend + + German + de + 20101228T171500 + 20101228T181500 + 01H00M00S + Literarischer Abend + Ein literarischer Abend im Quartett. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4195.en.html + Saal 2 + Andreas Lehner + Lars + + + PUBLISH + 4073@27C3@pentabarf.org + 4073 + logikschaltungen_ohne_elektronik + Logikschaltungen ohne Elektronik + logische Schaltungen mit Pneumatik + German + de + 20101228T143000 + 20101228T150000 + 00H30M00S + Logikschaltungen ohne Elektronik- logische Schaltungen mit Pneumatik + Ein kurzer Überblick über mechanische und strömungstechnische Logikschaltungen und Computer + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4073.en.html + Saal 2 + Äpex + xif + + + PUBLISH + 4210@27C3@pentabarf.org + 4210 + lying_to_the_neighbours + Lying To The Neighbours + Nasty effects with tracker-less BitTorrent + English + en + 20101228T130000 + 20101228T133000 + 00H30M00S + Lying To The Neighbours- Nasty effects with tracker-less BitTorrent + Distributed Hash Tables implement Routing and Addressability in large P2P networks. In the Kademlia adaption for Bittorrent a peer's address (NodeID) is to be generated randomly, or more appropriate: arbitrarily. Because randomness isn't verifiable, an implementation can advertise itself with popular NodeIDs or even change them on a per-packet basis. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4210.en.html + Saal 2 + Astro + + + PUBLISH + 4081@27C3@pentabarf.org + 4081 + netzmedienrecht_lobbyismus_korruption + Netzmedienrecht, Lobbyismus und Korruption + Wie wirkt die Lobby von Medienkonzernen? + German + de + 20101228T171500 + 20101228T181500 + 01H00M00S + Netzmedienrecht, Lobbyismus und Korruption- Wie wirkt die Lobby von Medienkonzernen? + Die Mediennutzung, aber auch ihre Verwaltung und Vergütung, also ihr Management, müssen an eine digitale Netzwelt angepasst werden. Wie ist der Stand der juristischen Auseinandersetzung um die Rechte von Urhebern, Verwertern und Nutzern von Medieninhalten? Wie und wo setzen sich starke Wirtschaftsinteressen mit Lobbygruppen durch? + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4081.en.html + Saal 3 + Thomas Barth + + + PUBLISH + 4094@27C3@pentabarf.org + 4094 + netzneutralitaet_und_qos + Netzneutralität und QoS - ein Widerspruch? + Fakten auf den Tisch + German + de + 20101227T183000 + 20101227T200000 + 01H30M00S + Netzneutralität und QoS - ein Widerspruch?- Fakten auf den Tisch + Geht es mit der Netzneutralität zu Ende? Was haben wir den Lobbyisten und PR-Leuten der Telekommunikationsunternehmen argumentativ entgegenzusetzen? Was sind die Fakten, was gehört ins Reich der Mythen? + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4094.en.html + Saal 1 + Andreas Bogk + Falk Lüke + scusi + Uli Blumenthal + + + PUBLISH + 4261@27C3@pentabarf.org + 4261 + key_recovery_attacks_rc4 + News Key Recovery Attacks on RC4/WEP + + English + en + 20101230T171500 + 20101230T181500 + 01H00M00S + News Key Recovery Attacks on RC4/WEP + In this paper, we present several weaknesses in the stream cipher RC4. +First, we present a technique to automatically reveal linear +correlations in the PRGA of RC4. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4261.en.html + Saal 2 + Martin Vuagnoux + + + PUBLISH + 4142@27C3@pentabarf.org + 4142 + nodejs_as_a_networking_tool + Node.js as a networking tool + + English + en + 20101228T134500 + 20101228T141500 + 00H30M00S + Node.js as a networking tool + Node.js is a library that provides non-blocking I/O for Google's V8 JavaScript engine. This talk explores node's suitability for a diverse range of networking applications. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4142.en.html + Saal 2 + Felix Geisendörfer + + + PUBLISH + 4221@27C3@pentabarf.org + 4221 + omg_wtf_pdf + OMG WTF PDF + What you didn't know about Acrobat + English + en + 20101230T113000 + 20101230T123000 + 01H00M00S + OMG WTF PDF- What you didn't know about Acrobat + Ambiguities in the PDF specification means that no two PDF parsers will see a file in the same way. This leads to many opportunities for exploit obfuscation. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4221.en.html + Saal 1 + Julia Wolf + + + PUBLISH + 4339@27C3@pentabarf.org + 4339 + openleaks + OpenLeaks + + English + en + 20101230T160000 + 20101230T170000 + 01H00M00S + OpenLeaks + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4339.en.html + Saal 3 + Daniel Domscheit-Berg + + + PUBLISH + 4143@27C3@pentabarf.org + 4143 + parttimescientists + Part-Time Scientists + One year of Rocket Science! + English + en + 20101228T160000 + 20101228T170000 + 01H00M00S + Part-Time Scientists- One year of Rocket Science! + The Part-Time Scientists is an international team of Scientists and Engineers participating in the first private race to the moon, the Google Lunar X-Prize. Our approach to win this competition is quite unique as everyone involved really is a part-time scientist. + +In our presentation we will present our latest lunar rover, lander, electronic and communications developments. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4143.en.html + Saal 1 + Karsten Becker + Robert Boehme + + + PUBLISH + 4253@27C3@pentabarf.org + 4253 + pentanews_game_show + Pentanews Game Show + Your opponents will be riddled as well + English + en + 20101228T001500 + 20101228T011500 + 01H00M00S + Pentanews Game Show- Your opponents will be riddled as well + Out of the news section of the [C3D2](http://www.c3d2.de "CCC Dresden") [radio programme](http://www.pentamedia.org/pentaradio Pentaradio24) we've compiled an entertaining game show, an Internet-based multiplayer "Who becomes millionaire?" challenge. The audience and folks on the peace missions are asked to help the players. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4253.en.html + Saal 1 + Alien8 + Astro + + + PUBLISH + 4326@27C3@pentabarf.org + 4326 + radio_der_zukunft + Radio der Zukunft + Was kommt nach dem analogen Radio? + German + de + 20101229T140000 + 20101229T150000 + 01H00M00S + Radio der Zukunft- Was kommt nach dem analogen Radio? + Radio – das ist eine der wenigen elektronischen Medientechnologien, die den Sprung in die digitale Ära noch nicht richtig geschafft hat. Während die Fernsehverbreitung schon fast vollständig per volldigitalen Systemen wie DVB-T stattfindet, bleiben die Radiosender dem guten alten Analog-Funk auf UKW treu. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4326.en.html + Saal 1 + Peter Welchering + Ralph Müller-Schmid + Tim Pritlove + Willi Steul + + + PUBLISH + 3957@27C3@pentabarf.org + 3957 + ipv6_insecurities + Recent advances in IPv6 insecurities + + English + en + 20101227T214500 + 20101227T224500 + 01H00M00S + Recent advances in IPv6 insecurities + New protocol features have been proposed and implemented in the last 5 years and ISPs are now slowly starting to deploy IPv6. This talk starts with a brief summary of the issues presented five years ago, and then expands on the new risks. +Discovered implemention security issues in Windows 7/2008, Linux and Cisco will be shown too. Comes with a GPL'ed toolkit: thc-ipv6 + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/3957.en.html + Saal 2 + vanHauser + + + PUBLISH + 4036@27C3@pentabarf.org + 4036 + reverse_engineering_a_real_word_rfid_payment_system + Reverse Engineering a real-world RFID payment system + Corporations enabling citizens to print digital money + English + en + 20101229T203000 + 20101229T213000 + 01H00M00S + Reverse Engineering a real-world RFID payment system- Corporations enabling citizens to print digital money + How to reverse engineer the data format of a real-world RFID based debit card system. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4036.en.html + Saal 3 + Harald Welte + + + PUBLISH + 4159@27C3@pentabarf.org + 4159 + reverse_engineering_mos_6502 + Reverse Engineering the MOS 6502 CPU + 3510 transistors in 60 minutes + English + en + 20101228T124500 + 20101228T134500 + 01H00M00S + Reverse Engineering the MOS 6502 CPU- 3510 transistors in 60 minutes + The MOS 6502 CPU, which was designed in 1975 and powered systems like the Apple II, the Atari 2600, the Nintendo NES and the Commodore 64 for two decades, has always been subject to intense reverse engineering of its inner workings. Only recently, the Visual6502.org project has converted a hi-res die-shot of the 6502 into a polygon model suitable for visually simulating the original mask at the transistor level. This talk will present the way from a chip package to a digital representation, how to simulate transistors in software, and new insights gained form this research about 6502 internals, like "illegal" opcodes. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4159.en.html + Saal 1 + Michael Steil + + + PUBLISH + 4082@27C3@pentabarf.org + 4082 + sap_landscape + Rootkits and Trojans on Your SAP Landscape + SAP Security and the Enterprise + English + en + 20101227T230000 + 20101228T000000 + 01H00M00S + Rootkits and Trojans on Your SAP Landscape- SAP Security and the Enterprise + SAP systems are the heart of many enterprises. Most critical business functions run on SAP Applications and the complexity of these systems makes it very difficult to protect against attackers. Default setups, forgotten/unimplemented security configurations, weak password management and change processes that apply to one ‘unimportant’ system can result in complete compromise of the SAP landscape. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4082.en.html + Saal 3 + Ertunga Arsal + + + PUBLISH + 3952@27C3@pentabarf.org + 3952 + running_your_own_gsm_stack_on_a_phone_osmocombb + Running your own GSM stack on a phone + Introducing Project OsmocomBB + English + en + 20101229T183000 + 20101229T193000 + 01H00M00S + Running your own GSM stack on a phone- Introducing Project OsmocomBB + In recent years, we have seen several Free Software projects implementing the network side of the GSM protocol. In 2010, OsmocomBB was started to create a free software implementation of the telephone-side. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/3952.en.html + Saal 1 + Harald Welte + Steve Markgraf + + + PUBLISH + 4183@27C3@pentabarf.org + 4183 + safety_on_open_sea + Safety on the Open Sea + Safe navigation with the aid of an open sea chart. + English + en + 20101229T160000 + 20101229T170000 + 01H00M00S + Safety on the Open Sea- Safe navigation with the aid of an open sea chart. + In maritime shipping accurate positioning is vital to preserve damage to life, ship, and goods. Today, we might tend to think that this problem is sufficiently solved yet because of the existence of electronic positioning systems like, most notably, the Global Positioning System (GPS) or the Russian counterpart GLONASS. This is wrong. Positions in terms of latitude and longitude just make sense together with an accurate sea chart (and of course, together with a navigator that is able to translate charting data into reality). + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4183.en.html + Saal 3 + Bernhard Fischer + + + PUBLISH + 4138@27C3@pentabarf.org + 4138 + secure_communications_below_the_hearing_threshold + Secure communications below the hearing threshold + Improved approaches for auditive steganography + English + en + 20101228T230000 + 20101229T000000 + 01H00M00S + Secure communications below the hearing threshold- Improved approaches for auditive steganography + Auditive steganography allows for various usage scenarios. In our project we focused on hidden communications in VoIP and GSM in which voice data is typically compressed and transmitted in realtime. A framework has been developed to meet these requirements, providing interfaces for robust steganographic algorithms. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4138.en.html + Saal 2 + Marcus Nutzinger + Rainer Poisel + + + PUBLISH + 4230@27C3@pentabarf.org + 4230 + security_nightmares + Security Nightmares + + German + de + 20101230T171500 + 20101230T181500 + 01H00M00S + Security Nightmares + Was hat sich im letzten Jahr im Bereich IT-Sicherheit getan? Welche neuen Entwicklungen haben sich ergeben? Welche neuen Buzzwords und Trends waren zu sehen? + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4230.en.html + Saal 1 + Frank Rieger + Ron + + + PUBLISH + 4181@27C3@pentabarf.org + 4181 + sip_home_gateways_under_fire + SIP home gateways under fire + Source routing attacks applied to SIP + English + en + 20101229T143000 + 20101229T150000 + 00H30M00S + SIP home gateways under fire- Source routing attacks applied to SIP + The SIP home gateway -- which combines a NAT router, a SIP proxy, and analogue phone adapters -- is the weakest link in a Voice over IP network. SIP's numerous source routing mechanisms share the well-known security weaknesses of IP source routing. The talk discusses possible exploits and countermeasures. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4181.en.html + Saal 2 + Wolfgang Beck + + + PUBLISH + 4060@27C3@pentabarf.org + 4060 + attacking_mobile_phones + SMS-o-Death + From analyzing to attacking mobile phones on a large scale. + English + en + 20101227T171500 + 20101227T181500 + 01H00M00S + SMS-o-Death- From analyzing to attacking mobile phones on a large scale. + Smart phones, everybody has a smart phone! No! Just about 16% of all mobile phones are smart phones! Feature phones are the most common type of mobile phone in the world. Some time ago we decided to investigate the security of feature phones. In this talk we show how we analyzed feature phones for SMS security issues. We show our results and the kind of attacks that are possible with our bugs. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4060.en.html + Saal 1 + Collin Mulliner + Nico Golde + + + PUBLISH + 4125@27C3@pentabarf.org + 4125 + spinning_the_electronic_wheel + Spinning the electronic Wheel + Still the bicycles for the 21th century + German + de + 20101227T230000 + 20101228T000000 + 01H00M00S + Spinning the electronic Wheel- Still the bicycles for the 21th century + Dreieinhalb Jahre nach dem Talk '21st Century digital Bikes' auf dem Camp 2007 ist einiges in der Welt der elektrischen Fortbewegung passiert. Ende 2010 ist ein guter Zeitpunkt, den Stand der Dinge aufzurollen, die Neuigkeiten darzustellen und über eine mehr unschärfer als klarer werdende Zukunft der elektrischen Mobilität zu sprechen. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4125.en.html + Saal 2 + Betty + Gismo C. + + + PUBLISH + 4145@27C3@pentabarf.org + 4145 + spoilers_human_interfaces_airplanes + "Spoilers, Reverse Green, DECEL!" or "What's it doing now?" + Thoughts on the Automation and its Human interfaces on Airplanes + English + en + 20101228T203000 + 20101228T213000 + 01H00M00S + "Spoilers, Reverse Green, DECEL!" or "What's it doing now?"- Thoughts on the Automation and its Human interfaces on Airplanes + Getting the interfaces right to computers controlling complex and dangerous machines such as commercial airliners is crucial. I will present a successful accident analysis method and talk about interface design problems, ideas for solutions, methods for understanding causal control flow. There will be some spectacular aviation accident videos and stories of bad luck, bad design, bad decisions, and a hero that managed to turn a near-catastrophe into an accident without fatalities. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4145.en.html + Saal 3 + Bernd Sieker + + + PUBLISH + 4184@27C3@pentabarf.org + 4184 + stanislaw_lem_weltverbesserer + Stanislaw Lem - Der enttäuschte Weltverbesserer + Ein audiovisuelles Live-Feature + German + de + 20101229T001500 + 20101229T011500 + 01H00M00S + Stanislaw Lem - Der enttäuschte Weltverbesserer- Ein audiovisuelles Live-Feature + Man kennt ihn als einen der wichtigsten Science-Fiction-Autoren des zwanzigsten Jahrhunderts. Aber Lem war mehr als das: Als Philosoph und Wissenschaftler konnte er technische Entwicklungen der Menschheit und ihre Auswirkungen sogar voraussehen. Als solcher prägte er viele heute geläufige Begriffe für technische Errungenschaften, die seinerzeit noch gar nicht existierten. Seine teils utopische, teils humoristische und selbstironische Art zu schreiben, brachte ihm weltweit große Popularität ein, seine Bücher erreichten eine Auflage von mehr als 45 Millionen und wurden zum Teil verfilmt. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4184.en.html + Saal 1 + Agata Królikowski + Constanze Kurz + Ina Kwasniewski + Jens-Martin Loebel + Kai Kittler + Marcus Richter + + + PUBLISH + 4097@27C3@pentabarf.org + 4097 + identifizierung_von_netzwerkprotokollen + Techniken zur Identifizierung von Netzwerk-Protokollen + + German + de + 20101228T183000 + 20101228T193000 + 01H00M00S + Techniken zur Identifizierung von Netzwerk-Protokollen + Der Vortrag soll Techniken aufzeigen, mit denen man Netzwerk-Protokolle identifizieren kann, die in Layer 7 des OSI-Modells angesiedelt sind. Alle Techniken - darunter auch die Deep Packet Inspection (DPI) - werden technisch erläutert und kritisch bewertet. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4097.en.html + Saal 3 + Florian Adamsky + + + PUBLISH + 4055@27C3@pentabarf.org + 4055 + terrorists_win_exploiting_telecommunications_data + Terrorists Win - Exploiting Telecommunications Data Retention? + + English + en + 20101229T123000 + 20101229T133000 + 01H00M00S + Terrorists Win - Exploiting Telecommunications Data Retention? + Telecommunications data retention (TDR) has become a reality in most +Western countries. Protagonists claim that the collection of massive +amounts of data on the communication behavior of all individuals +within a country would enable law enforcement agencies to exploit +patterns in the stored data to uncover connections between suspects. + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4055.en.html + Saal 2 + Kay Hamacher + Stefan Katzenbeisser + + + PUBLISH + 4090@27C3@pentabarf.org + 4090 + baseband_apocalypse + The Baseband Apocalypse + all your baseband are belong to us + English + en + 20101228T203000 + 20101228T213000 + 01H00M00S + The Baseband Apocalypse- all your baseband are belong to us + Attack scenarios against mobile phones have thus far concentrated on the application processor. The operating systems running on these processors are getting hardened by vendors as can be seen in the case of Apple's iOS -- the current release uses data execution prevention and code signing. In contrast, the GSM stack running on the baseband processor is neglected. The advent of open-source solutions such as OpenBSC and OpenBTS for running GSM base stations is a game-changer: Malicious base stations are not within the attack model assumed by the GSMA and ETSI. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4090.en.html + Saal 2 + Ralf-Philipp Weinmann + + + PUBLISH + 4201@27C3@pentabarf.org + 4201 + the_concert_a_disconcerting_moment_for_free_culture + "The Concert" + a disconcerting moment for free culture + English + en + 20101228T183000 + 20101228T193000 + 01H00M00S + "The Concert"- a disconcerting moment for free culture + Corey Cerovsek and Julien Quentin, accomplished musicians known worldwide for their classical recital performances, and media artist Alex Antener present something that's not quite an ordinary concert, to draw attention to the importance of the public domain in centuries of classical music tradition. It's both more — and less — than what you might expect to see and hear at a classical concert. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4201.en.html + Saal 1 + Alex Antener + Corey Cerovsek + Julien Quentin + + + PUBLISH + 4174@27C3@pentabarf.org + 4174 + the_hidden_nemesis + The Hidden Nemesis + Backdooring Embedded Controllers + English + en + 20101228T230000 + 20101229T000000 + 01H00M00S + The Hidden Nemesis- Backdooring Embedded Controllers + Want to persistently backdoor a laptop? Backdooring the BIOS is out of the question since your target can dump and diff it? Planting hardware is out of the question as well? Shhhhhhh.. I have something for you: + + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4174.en.html + Saal 3 + Ralf-Philipp Weinmann + + + PUBLISH + 4263@27C3@pentabarf.org + 4263 + resisting_excessive_government_surveillance + The importance of resisting Excessive Government Surveillance + Join me in exposing and challenging the constant violations of our right to privacy + English + en + 20101228T230000 + 20101229T000000 + 01H00M00S + The importance of resisting Excessive Government Surveillance- Join me in exposing and challenging the constant violations of our right to privacy + My name is Nicholas Merrill and I was the plaintiff in a legal case in the US court system where I challenged the FBI’s policy of using a feature of the so-called USA PATRIOT act - what are called “National Security Letters” - to bypass the American Constitution's system of checks and balances and in violation of the United Nations Universal Declaration of Human Rights - in order to obtain protected personal information and to unmask anonymous Internet users. I spent over 6 years not able to speak to anyone (other than my lawyers) about my case - forced to lie to those closest to me due to an FBI gag order that carried a possible 10 year prison sentence for violating it. However the lawsuit resulted in the establishment of two key legal precedents and made changes that affect every Internet worker and Telephone worker in America. I would like to speak to the 27C3 audience in order to tell about my experience and to challenge (and offer my support and assistance to) those individuals who are in a position to challenge government surveillance requests to follow their consciences and do so. + +People who work at Internet Service Providers and Telephone companies as well as IT workers at Universities and private businesses are increasingly likely to encounter government attempts at surveillance. I would like to speak to the CCC regarding my experiences in resisting a National Security Letter and also a “Grand Jury Subpoena” as well as my experience of being gagged by the FBI for nearly 7 years - unable to speak on the subject or identify myself as the plaintiff in the NSL lawsuit. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4263.en.html + Saal 1 + Nicholas Merrill + + + PUBLISH + 4124@27C3@pentabarf.org + 4124 + three_jobs_that_journalists_will_do_in_2050 + Three jobs that journalists will do in 2050 + Why future media may be more powerful (and more subversive) than ever before + English + en + 20101230T140000 + 20101230T150000 + 01H00M00S + Three jobs that journalists will do in 2050- Why future media may be more powerful (and more subversive) than ever before + Print media are dying, but what is rising up to take their place? In this presentation, I'll answer that question by describing three new kinds of jobs for journalists that do not exist in mainstream print media. These jobs are: hacker journalist, data-mining reporter, and crowd engineer. I'll be describing what these jobs entail, and current examples of organizations already employing people to do them. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4124.en.html + Saal 1 + Annalee Newitz + + + PUBLISH + 4098@27C3@pentabarf.org + 4098 + tor_is_peace_software_freedom_is_slavery + Tor is Peace, Software Freedom is Slavery, Wikipedia is Truth + The political philosophy of the Internet + English + en + 20101230T113000 + 20101230T123000 + 01H00M00S + Tor is Peace, Software Freedom is Slavery, Wikipedia is Truth- The political philosophy of the Internet + The Internet began as state-sponsored anarchy, but it is now the tool of first resort for dissidents and propagandists alike. The poster-child project of the Free Software Movement runs on the authority of a single person; the rest clash over the very definition of the word 'free'. A company which pictured itself as smashing Big Brother is now seen as one of the perceived secretive and authoritarian in the industry; and for another, 'Don't Be Evil' is proving to be a challenging motto to live by. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4098.en.html + Saal 2 + Adam + + + PUBLISH + 4234@27C3@pentabarf.org + 4234 + usb_and_libusb + USB and libusb + So much more than a serial port with power + English + en + 20101227T171500 + 20101227T181500 + 01H00M00S + USB and libusb- So much more than a serial port with power + Learn about the benefits and limitations of Universal Serial Bus, how communication works on the bus, how and why the right (and sometimes wrong?) driver can be loaded automatically by the operating system, and find out the easiest way to add USB to your washing machine, toaster, or other favorite appliance. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4234.en.html + Saal 3 + Peter Stuge + + + PUBLISH + 4252@27C3@pentabarf.org + 4252 + von_zensursula_ueber_censilia_zum_kindernet + Von Zensursula über Censilia hin zum Kindernet + Jahresrückblick rund um Internet-Sperren, Sendezeitbegrenzungen im Internet und vermeintlichen Jugendschutz + German + de + 20101227T140000 + 20101227T150000 + 01H00M00S + Von Zensursula über Censilia hin zum Kindernet- Jahresrückblick rund um Internet-Sperren, Sendezeitbegrenzungen im Internet und vermeintlichen Jugendschutz + Nach Zensursula kam Censilia und das Kindernet: 2010 brachte nach den hitzigen Diskussionen um Internet-Sperren und das Zugangserschwerungsgesetz einige neue Entwicklungen – und die Rundfunkkommission der Länder wollte mal wieder den Jugendschutz im Internet angehen. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4252.en.html + Saal 1 + Alvar C. H. Freude + + + PUBLISH + 4185@27C3@pentabarf.org + 4185 + whistleblowing__licht_ins_dunkel + Whistleblowing + Licht ins Dunkel! + German + de + 20101227T160000 + 20101227T170000 + 01H00M00S + Whistleblowing- Licht ins Dunkel! + Whistleblowing als universelles Konzept für mehr Transparenz – oder: über die Rückeroberung der Dunkelräume in Wirtschaft und Politik auch jenseits von Wikileaks. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4185.en.html + Saal 1 + Johannes Ludwig + Whistleblower-Netzwerk + + + PUBLISH + 4208@27C3@pentabarf.org + 4208 + wideband_gsm_sniffing + Wideband GSM Sniffing + + English + en + 20101228T140000 + 20101228T150000 + 01H00M00S + Wideband GSM Sniffing + GSM is still the most widely used security technology in the world with a user base of 5 billion and a quickly growing number of critical applications. 26C3's rainbow table attack on GSM's A5/1 encryption convinced many users that GSM calls should be considered unprotected. The network operators, however, have not woken up to the threat yet. Perhaps the new capabilities to be unleashed this year – like wide-band sniffing and real-time signal processing – will wake them up. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4208.en.html + Saal 1 + Karsten Nohl + Sylvain Munaut + + + PUBLISH + 4338@27C3@pentabarf.org + 4338 + wikileaks_und_mehr + Wikileaks und mehr + Eine Whistleblowerperspektive auf Leaking-Plattformen + German + de + 20101228T113000 + 20101228T123000 + 01H00M00S + Wikileaks und mehr- Eine Whistleblowerperspektive auf Leaking-Plattformen + Als kurzfristiger Ersatz für eine ausgefallenen Vortrag wurde die Entwicklung von Wikileaks kurz nachgezeichnet, bis hin zu den derzeit entstehenden weiteren Leaking-Plattformen. Im Mittelpunkt stand die Frage welchen Nutzen Wikileaks & Co. für Whistleblower bieten, welche Voraussetzungen für ihre anonyme Nutzung bestehen und wie die Entwicklung weitergehen wird. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4338.en.html + Saal 3 + Guido Strack + + + PUBLISH + 4187@27C3@pentabarf.org + 4187 + your_infrastructure_will_kill_you + Your Infrastructure Will Kill You + + English + en + 20101229T183000 + 20101229T193000 + 01H00M00S + Your Infrastructure Will Kill You + The past century our infrastructure has seen both massive expansion and heavy centralization. When it fails, it fails big -- this is the reality of our modern interconnectedness. We live in a world of crumbling bridges and bankrupt states, and our infrastructure will kill us. The people we’re relying on to keep us safe are trying to accomplish long-term risk management with short-term thinking. So, what now? We can't opt out, but we can become more resilient, and we can start thinking about risk differently. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4187.en.html + Saal 3 + Eleanor Saitta + + + PUBLISH + 4209@27C3@pentabarf.org + 4209 + zero_sized_heap_allocations_vulnerability_analysis + Zero-sized heap allocations vulnerability analysis + Applications of theorem proving for securing the windows kernel + English + en + 20101229T214500 + 20101229T224500 + 01H00M00S + Zero-sized heap allocations vulnerability analysis- Applications of theorem proving for securing the windows kernel + The dynamic memory allocator is a fundamental component of modern operating systems, and one of the most important sources of security vulnerabilities. In this presentation, we emphasize on a particular weakness of the heap management that has proven to be the root cause of many escalation of privilege bugs in the windows kernel and other critical remote vulnerabilities in user-land applications. + PUBLIC + CONFIRMED + Lecture + http://events.ccc.de/congress/2010/Fahrplan/events/4209.en.html + Saal 3 + Julien Vanegue + + + -- cgit v1.2.3-54-g00ecf From f7b335f8aec23b47327f1fce3999d873f78b3f7f Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Sat, 4 Jun 2011 23:53:58 +0200 Subject: todo --- txt/TODO | 2 ++ 1 file changed, 2 insertions(+) diff --git a/txt/TODO b/txt/TODO index 5bb347bd..a3f3e045 100644 --- a/txt/TODO +++ b/txt/TODO @@ -24,6 +24,8 @@ später: * FAQ ordentlich mehrsprachig machen * Fertig übersetzen/Sprachwirrwarr beseitigen * Ãœbersetzung + * Infotresen-Support (Engel angekommen/Badge gekriegt ohne Adminrechte + setzen) * schichten ueber monatsgrenzen einbaue im moment werden die tage nur hochgezaehlt und die monatzgrenzen werden ignoriert -- cgit v1.2.3-54-g00ecf From e715245e1298313a1c9be3574d71b83b8f849da3 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 10 Jun 2011 10:30:51 +0200 Subject: More sql escapes --- includes/sys_shift.php | 23 ++++++++++++----------- includes/sys_user.php | 10 +++++----- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/includes/sys_shift.php b/includes/sys_shift.php index ff75465c..7baeb8a4 100644 --- a/includes/sys_shift.php +++ b/includes/sys_shift.php @@ -71,7 +71,7 @@ function ausgabe_Feld_Inhalt($SID, $Man) { $Spalten .= funktion_isLinkAllowed_addLink_OrEmpty("admin/schichtplan.php?action=change&SID=$SID", "edit
        \n"); /////////////////////////////////////////////////////////////////// - // Ausgabe des Schischtnamens + // Ausgabe des Schichtnamens /////////////////////////////////////////////////////////////////// $SQL = "SELECT `URL` FROM `Shifts` WHERE (`SID` = '$SID');"; $Erg = mysql_query($SQL, $con); @@ -84,7 +84,7 @@ function ausgabe_Feld_Inhalt($SID, $Man) { /////////////////////////////////////////////////////////////////// // SQL abfrage f�r die ben�tigten schichten /////////////////////////////////////////////////////////////////// - $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '$SID') ORDER BY `TID`, `UID` DESC ;"; + $SQL = "SELECT * FROM `ShiftEntry` WHERE (`SID` = '" . sql_escape($SID) . "') ORDER BY `TID`, `UID` DESC ;"; $Erg = mysql_query($SQL, $con); $Anzahl = mysql_num_rows($Erg); @@ -164,7 +164,7 @@ function ausgabe_Feld_Inhalt($SID, $Man) { // ausgabe ben�tigter Engel //////////////////////////// //in vergangenheit - $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='$SID' AND `DateE` >= '" . + $SQLtime = "SELECT `DateE` FROM `Shifts` WHERE (`SID`='" . sql_escape($SID) . "' AND `DateE` >= '" . gmdate("Y-m-d H:i:s", time() + $gmdateOffset) . "')"; $Ergtime = mysql_query($SQLtime, $con); if (mysql_num_rows($Ergtime) > 0) { @@ -219,8 +219,8 @@ function CreateRoomShifts($raum) { // beginnt die erste schicht vor dem heutigen tag und geht dar�ber hinaus ///////////////////////////////////////////////////////////// $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` " . - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 23:59:59') AND " . - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + "WHERE ((`RID` = '" . sql_escape($raum) . "') AND (`DateE` > '$ausdatum 23:59:59') AND " . + "(`DateS` < '" . sql_escape($ausdatum) . " 00:00:00') ) ORDER BY `DateS`;"; $ErgSonder = mysql_query($SQLSonder, $con); if ((mysql_num_rows($ErgSonder) > 1)) { if (funktion_isLinkAllowed("admin/schichtplan.php") === TRUE) { @@ -249,8 +249,9 @@ function CreateRoomShifts($raum) { // beginnt die erste schicht vor dem heutigen tag? ///////////////////////////////////////////////////////////// $SQLSonder = "SELECT `SID`, `DateS`, `DateE` , `Len`, `Man` FROM `Shifts` " . - "WHERE ((`RID` = '$raum') AND (`DateE` > '$ausdatum 00:00:00') AND " . - "(`DateS` < '$ausdatum 00:00:00') ) ORDER BY `DateS`;"; + "WHERE ((`RID` = '" . sql_escape($raum) . "') AND (`DateE` > '" . sql_escape($ausdatum) . " 00:00:00') AND " . + "(`DateS` < '" . sql_escape($ausdatum) . " 00:00:00') ) ORDER BY `DateS`;"; + $ErgSonder = mysql_query($SQLSonder, $con); if ((mysql_num_rows($ErgSonder) > 1)) { if (funktion_isLinkAllowed("admin/schichtplan.php") === TRUE) { @@ -276,9 +277,9 @@ function CreateRoomShifts($raum) { // gibt die schichten f�r den tag aus ///////////////////////////////////////////////////////////// $SQL = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` " . - "WHERE ((`RID` = '$raum') and " . - "(`DateS` >= '$ausdatum $ZeitZeiger:00:00') and " . - "(`DateS` like '$ausdatum%')) ORDER BY `DateS`;"; + "WHERE ((`RID` = '" . sql_escape($raum) . "') and " . + "(`DateS` >= '" . sql_escape($ausdatum) . ' ' . sql_escape($ZeitZeiger) . ":00:00') and " . + "(`DateS` like '" . sql_escape($ausdatum) . "%')) ORDER BY `DateS`;"; $Erg = mysql_query($SQL, $con); for ($i = 0; $i < mysql_num_rows($Erg); ++ $i) { $ZeitPos = substr(mysql_result($Erg, $i, "DateS"), 11, 2) + (substr(mysql_result($Erg, $i, "DateS"), 14, 2) / 60); @@ -370,7 +371,7 @@ function SummRoomShifts($raum) { global $ausdatum, $con, $debug, $GlobalZeileProStunde; $SQLSonder = "SELECT `SID`, `DateS`, `Len`, `Man` FROM `Shifts` " . - "WHERE ((`RID` = '$raum') AND (`DateE` >= '$ausdatum 00:00:00') AND " . + "WHERE ((`RID` = '" . sql_escape($raum) . "') AND (`DateE` >= '$ausdatum 00:00:00') AND " . "(`DateS` <= '$ausdatum 23:59:59') ) ORDER BY `DateS`;"; $ErgSonder = mysql_query($SQLSonder, $con); diff --git a/includes/sys_user.php b/includes/sys_user.php index 4f55da38..8d5a6ae6 100644 --- a/includes/sys_user.php +++ b/includes/sys_user.php @@ -1,9 +1,9 @@ 0) - $SQL = "SELECT Nick FROM `User` WHERE UID='$UID'"; + $SQL = "SELECT Nick FROM `User` WHERE UID='" . sql_escape($UID) . "'"; else - $SQL = "SELECT Name FROM `Groups` WHERE UID='$UID'"; + $SQL = "SELECT Name FROM `Groups` WHERE UID='" . sql_escape($UID) . "'"; $Erg = sql_select($SQL); @@ -23,7 +23,7 @@ function UID2Nick($UID) { function TID2Type($TID) { global $con; - $SQL = "SELECT Name FROM `EngelType` WHERE TID='$TID'"; + $SQL = "SELECT Name FROM `EngelType` WHERE TID='" . sql_escape($TID) . "'"; $Erg = mysql_query($SQL, $con); if (mysql_num_rows($Erg)) @@ -62,7 +62,7 @@ function ReplaceSmilies($neueckig) { function GetPicturShow($UID) { global $con; - $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='$UID'"; + $SQL = "SELECT `show` FROM `UserPicture` WHERE `UID`='" . sql_escape($UID) . "'"; $res = mysql_query($SQL, $con); if (mysql_num_rows($res) == 1) @@ -95,7 +95,7 @@ function displayavatar($UID, $height = "30") { function UIDgekommen($UID) { global $con; - $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='$UID'"; + $SQL = "SELECT `Gekommen` FROM `User` WHERE UID='" . sql_escape($UID) . "'"; $Erg = mysql_query($SQL, $con); if (mysql_num_rows($Erg)) -- cgit v1.2.3-54-g00ecf From 80a1a65aefcd2f33951dc60c72d29df1ad19b187 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sat, 11 Jun 2011 17:01:41 +0200 Subject: tmp commit --- includes/funktion_xml.php | 2 -- includes/funktionen.php | 23 ----------------------- includes/pages/admin_import.php | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 includes/funktionen.php diff --git a/includes/funktion_xml.php b/includes/funktion_xml.php index 87fd72d0..4ab3bfd5 100644 --- a/includes/funktion_xml.php +++ b/includes/funktion_xml.php @@ -141,8 +141,6 @@ function getXMLsubPease($Sourse, $Name) { return $value; } } - - echo "

        Fehler: getXMLsubPease( $Sourse, $Name ) not found

        "; // die; } diff --git a/includes/funktionen.php b/includes/funktionen.php deleted file mode 100644 index fb63b708..00000000 --- a/includes/funktionen.php +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/includes/pages/admin_import.php b/includes/pages/admin_import.php index 9b8af2e2..6523050c 100644 --- a/includes/pages/admin_import.php +++ b/includes/pages/admin_import.php @@ -175,7 +175,7 @@ function admin_import() { } //readXMLfile("xml.php.xml"); - if (readXMLfile("$Tempdir/engelXML") == 0) { + if (readXMLfile("../import/27C3_sample.xcs.xml") == 0) { $XMLmain = getXMLsubPease($XMLmain, "VCALENDAR"); if ($ShowDataStrukture) { -- cgit v1.2.3-54-g00ecf
        + From + Question Answer - From -