From d163b9921b3ddb71f027199c87e6cf18fbb9a624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Wed, 1 Jun 2011 17:28:03 +0200 Subject: [PATCH] rebase, new flags --- includes/funktion_activeUser.php | 63 ++++++++++--------------------- includes/funktion_flag.php | 12 +++--- includes/funktion_menu.php | 4 +- includes/header_start.php | 60 ++++++++++++++--------------- includes/menu.php | 53 +++++++++++--------------- www-ssl/css/base.css | 10 +++++ www-ssl/css/style10.css | 0 www-ssl/faq.php | 11 +++++- www-ssl/nonpublic/index.php | 2 +- www-ssl/pic/flag/de.gif | Bin 321 -> 0 bytes www-ssl/pic/flag/de.png | Bin 0 -> 545 bytes www-ssl/pic/flag/en.gif | Bin 2430 -> 0 bytes www-ssl/pic/flag/en.png | Bin 0 -> 599 bytes 13 files changed, 99 insertions(+), 116 deletions(-) create mode 100644 www-ssl/css/style10.css delete mode 100644 www-ssl/pic/flag/de.gif create mode 100644 www-ssl/pic/flag/de.png delete mode 100644 www-ssl/pic/flag/en.gif create mode 100644 www-ssl/pic/flag/en.png diff --git a/includes/funktion_activeUser.php b/includes/funktion_activeUser.php index e214a1f9..ca6e3aaa 100644 --- a/includes/funktion_activeUser.php +++ b/includes/funktion_activeUser.php @@ -1,57 +1,34 @@ Engel online"; +// Funktionen gibt es nicht auf allen Rechnern +echo "

Engel online

"; - $SQL = "SELECT UID, Nick, lastLogIn " . - "FROM User " . - "WHERE (`lastLogIn` > '" . gmdate("YmdHis", time() - (60 * 60)) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " . - "ORDER BY lastLogIn DESC;"; +$SQL = "SELECT UID, Nick, lastLogIn " . +"FROM User " . +"WHERE (`lastLogIn` > '" . (time() - 60 * 60) . "' AND NOT (UID=" . $_SESSION['UID'] . ")) " . +"ORDER BY lastLogIn DESC;"; - $Erg = mysql_query($SQL, $con); - - $Tist = (gmdate("d", time()) * 60 * 60 * 24) + // Tag - (gmdate("H", time()) * 60 * 60) + // Stunde - (gmdate("i", time()) * 60) + // Minute - (gmdate("s", time()) ); // Sekunde +$Erg = mysql_query($SQL, $con); - echo ""; ?> diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php index b6a02242..b394d18a 100644 --- a/includes/funktion_flag.php +++ b/includes/funktion_flag.php @@ -1,9 +1,9 @@ 0) - $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage="; - else - $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; +if (strpos($_SERVER["REQUEST_URI"], "?") > 0) + $URL = $_SERVER["REQUEST_URI"] . "&SetLanguage="; +else + $URL = $_SERVER["REQUEST_URI"] . "?SetLanguage="; - echo "\"DE\" "; - echo "\"EN\" "; +echo 'DE'; +echo 'EN'; ?> diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php index 387310aa..3d20420b 100644 --- a/includes/funktion_menu.php +++ b/includes/funktion_menu.php @@ -7,7 +7,7 @@ function ShowMenu($MenuName) { $Gefunden = false; // Ueberschift - $Text = "

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

-
- - -
-"; - ShowMenu(""); ShowMenu("nonpublic"); ShowMenu("admin"); -if(!isset($submenus)) - $submenus = 0; +if (!isset ($submenus)) + $submenus = 0; if ($submenus >= 1) { - $inc_name = $_SERVER['PHP_SELF']; - $filenamepos = strrpos($inc_name, '/'); - $filenamepos += 1; - $filename = substr ($inc_name, $filenamepos ); - $filepost = substr ($filename, 0, -4); - $filepre = substr ($filename, -4 ); - $verzeichnis = substr ($inc_name, 0 , $filenamepos); - - for ($index_nummer=1; $index_nummer <= $submenus; $index_nummer++) { + $inc_name = $_SERVER['PHP_SELF']; + $filenamepos = strrpos($inc_name, '/'); + $filenamepos += 1; + $filename = substr($inc_name, $filenamepos); + $filepost = substr($filename, 0, -4); + $filepre = substr($filename, -4); + $verzeichnis = substr($inc_name, 0, $filenamepos); + + for ($index_nummer = 1; $index_nummer <= $submenus; $index_nummer++) { ?> @@ -42,26 +30,27 @@ if ($submenus >= 1) {
-
- - - -
+
+ + diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index d87fc2f9..b285c40d 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -4,6 +4,7 @@ } body { + font-size: 14px; } header { @@ -13,6 +14,7 @@ header { footer { display: block; + font-size: 12px; text-align: center; width: 100%; } @@ -41,6 +43,10 @@ dt { font-weight: bold; } +dd { + margin-left: 20px; +} + h4 { padding: 0 4px; } @@ -48,3 +54,7 @@ h4 { ul { margin: 0 0 0 20px; } + +a.sprache img { + margin: 5px; +} diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css new file mode 100644 index 00000000..e69de29b diff --git a/www-ssl/faq.php b/www-ssl/faq.php index 472915e5..8a7b3ede 100644 --- a/www-ssl/faq.php +++ b/www-ssl/faq.php @@ -13,9 +13,16 @@ $Zeilen = mysql_num_rows($Erg); for ($n = 0; $n < $Zeilen; $n++) { if (mysql_result($Erg, $n, "Antwort") != "") { + list ($frage_de, $frage_en) = split('
', mysql_result($Erg, $n, "Frage")); + list ($antwort_de, $antwort_en) = split('
', mysql_result($Erg, $n, "Antwort")); echo "
"; - echo "
" . mysql_result($Erg, $n, "Frage") . "
"; - echo "
" . mysql_result($Erg, $n, "Antwort") . "
"; + if ($_SESSION['Sprache'] == "DE") { + echo "
" . $frage_de . "
"; + echo "
" . $antwort_de . "
"; + } else { + echo "
" . $frage_en . "
"; + echo "
" . $antwort_en . "
"; + } echo "
"; } } diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php index add0fdd3..b53f8088 100644 --- a/www-ssl/nonpublic/index.php +++ b/www-ssl/nonpublic/index.php @@ -10,7 +10,7 @@ include ("includes/crypt.php"); session_start(); // alte Session - falls vorhanden - wiederherstellen... function LoginOK() { - include ("../../config/config.php"); + include ("config/config.php"); header("HTTP/1.1 302 Moved Temporarily"); header("Location: " . $url . $ENGEL_ROOT . "nonpublic/news.php"); } diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif deleted file mode 100644 index 15739e2e4a7d6b3846dff95eaae41892f4805876..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmZ?wbhEHbG-8lrIKsein1O+rk!ddz;~@sN-7HKWzp^kevL0n%+rh|Iz{L1LeMy%y}8B*5$n3SD&B zJpG#Y{|_uE_+c#3e_~0|$s9H23oA;z)<&(r+){S>ZPoq<1=}6}T|Ermrnp;}i+B-U1xq5p0`X@}BG`XL7+VmMSXU(27cP7h%g^Lz1 zS-NcbV)j+5*Q{N)e#6GKJX^MI+rDGxuHD=D_U%7#@X+BSM-Q@|IC<*ynX~84pBA`u k`O4L6*Kgdsb^FfUd-oqaeDwIq(`V0LynOZgnIeNV048aOz5oCK diff --git a/www-ssl/pic/flag/de.png b/www-ssl/pic/flag/de.png new file mode 100644 index 0000000000000000000000000000000000000000..ac4a977362738ca7daa20784717f10f9617136b4 GIT binary patch literal 545 zcmV++0^a?JP)h<6BFn%a z@b8~2SoNP@zd$;E{sbbRuHQd?{QCI=sNwhbA3*&Qe}GP900=;09NYi^fU@pUdVa9*13;+Sd!tjgXKhXQEMobL97(p6<{RLvMGBN!7 j!N9=G@a-1^K!5=NcXWu!7_DDe00000NkvXXu0mjfeQx^H literal 0 HcmV?d00001 diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif deleted file mode 100644 index 34936ee362225646e63c2f88501f0fb86b5b293e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2430 zcmV-^34!)UNk%w1VKM+A0QUd@NLYpB(bY9dgV^To*&-^|GBnj2BhA&}lbW{JdweQ8 zb=8E0;3X(+JNIuEftMCdN29?7FMgDk$lPkjv27 zIZcGh86EZi|KoUf?(yu|E;89xScH+aWq6rGQF_%VB+}K~rnJWMtE$;DIq|r->cYGG z{q^+b&k|Ko~_ z#VEPTVm|x=KIyu>+|wMPKZ5Ef8m3K@YdGo zgM;(7uEWgM>XMfE?CbH^*YwWO+BiFcjIA?Be$n0Q`{CU=LVWuF{N<^m+A=oo;M~

|NKZ{iRqT0@Y2pYNP^AF+tg7@{`&vvrJ3xzvF5C(``g;tEGqc_|LBK`(AVYR zxwF|WF5WCU%}i6*HaPY8{$y#C^3c!MJ3QSrG=q|__R-Q`c9{D5_|qpH+%q-luBPt) z|J^PxqN=^zBp5SFi2wcn!Nk$oC@bljnJ`RwVr5f(K?cmDkQ_x%0w|NrWlm(ER3 z?$puSDk{wk4%H?w_WAnhhlJN28ZbYA@4vYA!@$ST;L!;X;Iz0{eWl**^!U=&-ZwYf zFEY?uSJyQ&{r>ymtgrq2|Ko{-+b$^EDKY7XeK|gH;2jw5=kC-L73k*6XL68YY>mIc z$*;=U@A&iO`1IV3hTR|^>$}G8qo+SgdeAsH;-RDR=jZzU{`>s=`TzSmPLT8I=F>?* z=bD&rdY#}XINcyC*DyQy<>>eS`|{A#F-C{}|NPC*)7m*U#>d&qE-u?~a^U6X@%{Po z&&2x6#Q*>QA^8LV00000EC2ui05Sj}000R80QK~#Md-@E0{~_y@xqYdjvYz>{P_1M z6Pk-?BH8%|0)P%BN_I4aSVPD zk*8>ejU9C)62L*HfHto}{WvDVLOx6}{vk7P$&MCLE&lyeG-w7+RXvperC1;LcHnpiCpfW`{a5bCY+|e^$L#XO7{DZ}WMYS@?KTwpA#u{fxVNEQ`L=c?^{H0NX z0vtS~Rw4@YFaZdSm_`RVJ}fAfHv8zvV}+b`gF-bJtfR{u3z*^MKlYHIKpP-&kcb*; zw9$qFuY4j1DEe5H1u--LQO`d{{8P$=ZDp`t3lT^WNCzU^A<7N3{Id@NPb%=sFYk2` z5(lK#(1u=GG_p!Hp4S1QSdIJ`myoBOcrV4;*l0mO(GIxPXX1$3zj`4fRy997KQ%{{H)C(n%+02p}h75I_NPVt_F?ASZA!4_qLE40DJ^G&p7g z2lV3wxX7Re!GH@ec<_T@FoOt%ke?Eo&;$G8mj_nCAQlvWV?-cAD-wV&Q8b1|w4enL z7G%O39N~vRJOTp$5P*s%pu-4G00I?=@q|5eNeu3ggB)Ur1bq;q9?X~p6)LfSFW4ah zrZ_+yJ~6~HBH#!LNTV9ln2jK~;2e^W1R_2_fDT}y95=YbB`gs`B2@8;|CmJ;Uhn}6 z#9|ya2tWk@u*NjXpeZ_0g95yO3JUzA5dVlmGnilv7=(chlK96R3P1$jsz!5_@jTAUBfHb6$DNJDq2V|gtK?LDmanJ(;tg#3zR3iuj_y-1-QA$soQXkIX zMI96&7D?Oy5eblhF3^Al3M^6qssM=>l<*5Lj9?`X(aJb1AOyq|0|*wW zkQ@Pn2q6eT3|k=uLKqC!7poS&K1_9_m2Wsd70<1ao4&1SyiZ_20g&X4GLj|bKv0*7k~f_B5;d$>|zO! wpu`|#P=n4o#V%d&Xf%2&hYT!%1~+JjQJtcbMASeQX=uU}oUpAIC?g;MI}~Y=&Hw-a diff --git a/www-ssl/pic/flag/en.png b/www-ssl/pic/flag/en.png new file mode 100644 index 0000000000000000000000000000000000000000..ff701e19f6d2c0658fb23b1d94124cba4ce60851 GIT binary patch literal 599 zcmV-d0;v6oP)U(k2*|8J(R-+sudaynhucHbwAMTnor{mwqO^w7JHzaBsT z{O^B8RYf5+LvDs&KmRKVd78=o{`1#HTiEo_OolaGleS)G+IQ#sUI`b*pv<`1zCJ=H0jd{{2S>p`ri%{LsXJ%FbMS z$#S`6f|?OG!^Jxczkf6Q`UNF{l0Sd`ad7zm>({^EzyAS6{{CgrkluOb3l1A>ZU2~A zK+FZ=zkmP!`TOVhpFbzBzFaPmD2$N3;+$pK?>zdet`f0002ovPDHLkV1gy;I?Vt8 literal 0 HcmV?d00001