From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: fixes --- 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 +++++++-------- 5 files changed, 11 insertions(+), 12 deletions(-) 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 (limited to 'default-conf') 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 @@ - -- cgit v1.2.3-70-g09d2 From 6ebee2c46ba11ce42e85b830189346b13514d497 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 14:30:29 +0200 Subject: bootstrapping --- config/.gitignore | 4 + config/config_MessegeServer.php | 7 ++ default-conf/var_www_includes/config.php | 9 +- default-conf/var_www_includes/config_db.php | 2 +- includes/UserCVS.php | 5 +- includes/config_MessegeServer.php | 7 -- includes/config_modem.php | 10 --- includes/crypt.php | 2 +- includes/error_handler.php | 2 +- includes/header.php | 4 +- includes/header_start.php | 4 +- includes/login_eingabefeld.php | 2 +- www-ssl/bootstrap.php | 12 +++ www-ssl/css/base.css | 3 + www-ssl/faq.php | 34 ++++---- www-ssl/index.php | 20 +++-- www-ssl/logout.php | 19 ++-- www-ssl/makeuser.php | 10 +-- www-ssl/nonpublic/index.php | 131 +++++++++++++--------------- www-ssl/nonpublic/news.php | 14 +-- 20 files changed, 159 insertions(+), 142 deletions(-) create mode 100644 config/.gitignore create mode 100644 config/config_MessegeServer.php delete mode 100644 includes/config_MessegeServer.php delete mode 100644 includes/config_modem.php create mode 100644 www-ssl/bootstrap.php (limited to 'default-conf') 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-70-g09d2 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(-) (limited to 'default-conf') 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++) { ?> - - - - -
+
- -
+ 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"])) { + -- cgit v1.2.3-70-g09d2 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(-) (limited to 'default-conf') 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-70-g09d2 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(-) (limited to 'default-conf') 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-70-g09d2 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 (limited to 'default-conf') 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-70-g09d2