From 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 Mon Sep 17 00:00:00 2001 From: Moritz helios Rudert Date: Wed, 1 Jun 2011 12:13:39 +0200 Subject: fixes --- includes/header.php | 174 ++++++++++++++++++++++++---------------------------- 1 file changed, 81 insertions(+), 93 deletions(-) mode change 100755 => 100644 includes/header.php (limited to 'includes/header.php') 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"). "

"; } } ?> - - + - 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.3.1 From 6ebee2c46ba11ce42e85b830189346b13514d497 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 1 Jun 2011 14:30:29 +0200 Subject: bootstrapping --- config/.gitignore | 4 + config/config_MessegeServer.php | 7 ++ default-conf/var_www_includes/config.php | 9 +- default-conf/var_www_includes/config_db.php | 2 +- includes/UserCVS.php | 5 +- includes/config_MessegeServer.php | 7 -- includes/config_modem.php | 10 --- includes/crypt.php | 2 +- includes/error_handler.php | 2 +- includes/header.php | 4 +- includes/header_start.php | 4 +- includes/login_eingabefeld.php | 2 +- www-ssl/bootstrap.php | 12 +++ www-ssl/css/base.css | 3 + www-ssl/faq.php | 34 ++++---- www-ssl/index.php | 20 +++-- www-ssl/logout.php | 19 ++-- www-ssl/makeuser.php | 10 +-- www-ssl/nonpublic/index.php | 131 +++++++++++++--------------- www-ssl/nonpublic/news.php | 14 +-- 20 files changed, 159 insertions(+), 142 deletions(-) create mode 100644 config/.gitignore create mode 100644 config/config_MessegeServer.php delete mode 100644 includes/config_MessegeServer.php delete mode 100644 includes/config_modem.php create mode 100644 www-ssl/bootstrap.php (limited to 'includes/header.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.3.1 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(-) (limited to 'includes/header.php') diff --git a/includes/footer.php b/includes/footer.php index 62260e55..8e5b35b9 100644 --- a/includes/footer.php +++ b/includes/footer.php @@ -1,27 +1,7 @@ - -
-

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

- - -
+ - - + - - - + + + @@ -13,27 +14,27 @@ - - - - -
-"; - 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 (); +} +?> + -- cgit v1.3.1 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 (limited to 'includes/header.php') 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") . " "; +?>

-
© 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']))
+ +
- - - - +
+ -if ($_SESSION['Menu'] == "R") - include ("menu.php"); -?> - - - 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"])) { } } ?> - - +
+
- - - - - - 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.3.1 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 (limited to 'includes/header.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
+ +
"; -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.3.1 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(-) (limited to 'includes/header.php') 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) {
      -
\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 @@