From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: fixes --- 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 ++--- 18 files changed, 1234 insertions(+), 1304 deletions(-) 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 (limited to 'www-ssl/nonpublic') 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"); ?>
    -

    +

    -

    +

    - - + + - - + + - - + +
    ::
    -"> +" />
    - -- cgit v1.2.3-54-g00ecf