" . $SystemDisableMessage . "

'; +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) {
-

+ -

+ - diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 27e20788..6c0bc298 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -4,7 +4,6 @@ } body { - background: #f0f0f0; font-family: Arial; sans-serif; font-size: @@ -78,18 +77,22 @@ nav { margin: 0 10px 10px 0; } -nav, #content { - border: 1px solid #888; -} - #content article { padding: 10px; } -nav ul, nav p, #content article { - background: #fff; -} - a.sprache img { margin: 5px; } + +.background { + background: #f0f0f0; +} + +.container { + border: 1px solid #888; +} + +.content { + background: #fff; +} diff --git a/www-ssl/css/style1.css b/www-ssl/css/style1.css index 8fec5db0..fd8426f1 100644 --- a/www-ssl/css/style1.css +++ b/www-ssl/css/style1.css @@ -1,84 +1,83 @@ -body { - background-color: #131313; - - color: #424242; - - line-height: 150%; - font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif; - - margin-bottom: 20px; +body, .background { + background-color: #131313; + color: #424242; + line-height: 150%; + font-family: Trebuchet MS, Lucida Grande, Arial, sans-serif; } a { - text-decoration: none; - color: #424242 + text-decoration: none; + color: #424242 } td { - font-size: small + font-size: small } a:active, a:hover { - font-weight: bold + font-weight: bold } - + li { - font-size: small + font-size: small } .content { - background-color: #131313; - color: #424242; + background-color: #131313; + color: #424242; } -.contenttopic { - font-weight: bold; - font-size: small; - color: #000000; - background-color: #333333 +.contenttopic, h1 { + font-weight: bold; + font-size: small; + color: #000000; + background-color: #333333 } -.border { - background-color: #333333 +.border, .container { + background-color: #333333; + border: 1px solid #424242; } .menu { - background-color: #131313; - color: #424242; - font-size: small + background-color: #131313; + color: #424242; + font-size: small } -h4.menu { - background-color: #333333; - font-weight: bold; - font-size: small; - color: #000000 + +h4 { + background-color: #333333; + font-weight: bold; + font-size: small; + color: #000000 } .linkbox { - background-color: #ffffff + background-color: #ffffff } .linkboxtitle { - font-weight: bold; - background-color: #000000; - color: #ffffff + font-weight: bold; + background-color: #000000; + color: #ffffff } .question { - font-weight: bold; - font-size: 9pt + font-weight: bold; + font-size: 9pt } .engeltreffen { - font-weight: bold; - font-size: 9pt; - color: #ff0000; + font-weight: bold; + font-size: 9pt; + color: #ff0000; } .answer { - font-size: 9pt; + font-size: 9pt; } + .comment { - font-size : 6pt; + font-size: 6pt; } -- cgit v1.2.3-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 'includes/funktion_menu.php') 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 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/funktion_menu.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\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 "

Feldname	old Value	new Value
Feldname	old Value	new 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 "
"; } diff --git a/includes/funktion_xml_schudle.php b/includes/funktion_xml_schudle.php index 41efce04..f73f11ad 100644 --- a/includes/funktion_xml_schudle.php +++ b/includes/funktion_xml_schudle.php @@ -134,7 +134,7 @@ function SaveSchedule() { $EngelMin = $EngelNeeded_NotEmpty; echo "---> WARING ". $EngelNeeded_NotEmpty. - " shift is used, can't del ". TID2Type($EngelTypeID). " shifts\t"; + " shift is used, can't del ". TID2Type($EngelTypeID). " shifts"; } echo "---->Delete empty Shifts for engeltype: ". TID2Type($EngelTypeID). " ". @@ -192,7 +192,7 @@ foreach($XMLmain->sub as $EventKey => $Event) if( $Event->name == "VEVENT") { echo "

\n"; - echo "\t\n"; + echo "\n"; $PSIDXML = getXMLsubData( $Event, "UID"); $DateXML = @@ -236,17 +236,17 @@ foreach($XMLmain->sub as $EventKey => $Event) else $SIDDB = $PSIDDB = $TimeDB = $LenDB = $RIDDB = $ManDB = $URLDB = ""; - echo "\t\n"; - echo "\t\n\t\t". + echo "\n"; + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n"; - echo "\t\n"; + echo "\n"; + echo "\n"; if( !( $PSIDXML==$PSIDDB && $DateXML==$TimeDB && $RIDXML==$RIDDB && @@ -254,15 +254,15 @@ foreach($XMLmain->sub as $EventKey => $Event) $ManXML==$ManDB && $URLXML==$URLDB) ) { - echo "\t\n"; + echo "\n"; $DS_KO++; } else { - echo "\t". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "\n"; + echo "". funktion_isLinkAllowed_addLink_OrLinkText("admin/schichtplan.php?action=change&SID=".$SIDDB, "edit"). "\n"; $DS_OK++; } - echo "\t\n"; + echo "\n"; echo "

\n"; $Where.= " OR `PSID`='$PSIDXML'"; } @@ -281,7 +281,7 @@ echo mysql_error($con); if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB ) for( $i=0; $i\n"; + echo "\n"; $SID = mysql_result($Erg2, $i, "SID"); $Time = mysql_result($Erg2, $i, "DateS"); $Len = mysql_result($Erg2, $i, "Len"); @@ -290,18 +290,18 @@ if(mysql_num_rows($Erg2)>0 && $EnableSchudleDB ) else $RID = "RID.". mysql_result($Erg2, $i, "RID"); $Man = mysql_result($Erg2, $i, "Man"); - echo "\t\n"; - echo "\t\n\t\t". + echo "\n"; + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t\n\t\t". + echo "\n". "\n"; - echo "\t". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). + echo "". funktion_isLinkAllowed_addLink_OrLinkText( "admin/schichtplan.php?action=change&SID=".$SID, "edit"). "\n"; - echo "\t\n"; + echo "\n"; } echo ""; diff --git a/includes/header.php b/includes/header.php index d4f212d9..9cd2e51d 100644 --- a/includes/header.php +++ b/includes/header.php @@ -3,7 +3,7 @@ include "header_start.php"; echo "\n"; ?> - + <?php echo $title; ?> - Engelsystem @@ -22,8 +22,6 @@ echo "\n"; \n"; if (isset ($_SESSION['oldurl'])) - echo "" . Get_Text("back") . " geht's zurück...\n"; + echo "hier gehts zurück...\n"; else - echo "" . Get_Text("back") . " geht's zurück...\n"; + echo "hier geht's zurück...\n"; exit (); } diff --git a/www-ssl/bootstrap.php b/www-ssl/bootstrap.php index 3189c89a..40a32578 100644 --- a/www-ssl/bootstrap.php +++ b/www-ssl/bootstrap.php @@ -1,6 +1,4 @@ Date: Thu, 2 Jun 2011 22:40:08 +0200 Subject: admin groups --- DB/db_rewrite.sql | 28 ++++---- includes/funktion_menu.php | 40 ----------- includes/pages/admin_groups.php | 73 ++++++++++++++++++++ includes/sys_menu.php | 3 +- templates/admin_groups.html | 21 ++++++ templates/admin_groups_edit_form.html | 21 ++++++ txt/TODO | 2 + www-ssl/admin/group.php | 49 -------------- www-ssl/index.php | 4 ++ www-ssl/nonpublic/messages.php | 124 ---------------------------------- 10 files changed, 139 insertions(+), 226 deletions(-) delete mode 100644 includes/funktion_menu.php create mode 100644 includes/pages/admin_groups.php create mode 100644 templates/admin_groups.html create mode 100644 templates/admin_groups_edit_form.html delete mode 100644 www-ssl/admin/group.php delete mode 100644 www-ssl/nonpublic/messages.php (limited to 'includes/funktion_menu.php') diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index d4811235..5041ce9b 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 02. Juni 2011 um 19:37 +-- Erstellungszeit: 02. Juni 2011 um 20:39 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -80,8 +80,9 @@ INSERT INTO `Counter` (`URL`, `Anz`) VALUES ('register', 3), ('admin_rooms', 70), ('admin_angel_types', 69), -('user_settings', 111), -('user_messages', 102); +('user_settings', 115), +('user_messages', 102), +('admin_groups', 86); -- -------------------------------------------------------- @@ -125,22 +126,22 @@ CREATE TABLE IF NOT EXISTS `GroupPrivileges` ( `privilege_id` int(11) NOT NULL, PRIMARY KEY (`id`), KEY `group_id` (`group_id`,`privilege_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=28 ; -- -- Daten fÃ¼r Tabelle `GroupPrivileges` -- INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES -(1, -1, 1), -(2, -1, 2), +(24, -1, 5), (3, -2, 3), (4, -2, 4), -(5, -1, 5), +(23, -1, 2), (6, -4, 6), (7, -4, 7), (8, -2, 8), -(9, -2, 9); +(9, -2, 9), +(12, -5, 10); -- -------------------------------------------------------- @@ -253,7 +254,7 @@ CREATE TABLE IF NOT EXISTS `Privileges` ( `desc` varchar(1024) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=10 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=11 ; -- -- Daten fÃ¼r Tabelle `Privileges` @@ -268,7 +269,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (6, 'admin_rooms', 'RÃ¤ume administrieren'), (7, 'admin_angel_types', 'Engel Typen administrieren'), (8, 'user_settings', 'User profile settings'), -(9, 'user_messages', 'Writing and reading messages from user to user'); +(9, 'user_messages', 'Writing and reading messages from user to user'), +(10, 'admin_groups', 'Manage usergroups and their rights'); -- -------------------------------------------------------- @@ -995,7 +997,9 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('credits', 'DE', 'Credits'), ('credits', 'EN', 'Credits'), ('pub_messages_Neu', 'DE', 'Neu'), -('pub_messages_Neu', 'EN', 'New'); +('pub_messages_Neu', 'EN', 'New'), +('admin_groups', 'DE', 'Gruppenrechte'), +('admin_groups', 'EN', 'Grouprights'); -- -------------------------------------------------------- @@ -1038,7 +1042,7 @@ CREATE TABLE IF NOT EXISTS `User` ( -- INSERT INTO `User` (`UID`, `Nick`, `Name`, `Vorname`, `Alter`, `Telefon`, `DECT`, `Handy`, `email`, `ICQ`, `jabber`, `Size`, `Passwort`, `Gekommen`, `Aktiv`, `Tshirt`, `color`, `Sprache`, `Avatar`, `Menu`, `lastLogIn`, `CreateDate`, `Art`, `kommentar`, `Hometown`) VALUES -(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307043433, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307046926, '0000-00-00 00:00:00', '', '', ''), (147, 'msquare', '', '', 23, '', '', '', 'msquare@notrademark.de', '', '', 'L', 'e10adc3949ba59abbe56e057f20f883e', 0, 0, 0, 6, 'EN', 0, 'L', 1307042703, '2011-06-02 00:55:09', '', '', ''); -- -------------------------------------------------------- diff --git a/includes/funktion_menu.php b/includes/funktion_menu.php deleted file mode 100644 index 0a324758..00000000 --- a/includes/funktion_menu.php +++ /dev/null @@ -1,40 +0,0 @@ - $Entry) - if (strpos($Key, ".php") > 0) - if ((strpos("00$Key", "0$MenuName") > 0) || ((strlen($MenuName) == 0) && (strpos("0$Key", "/") == 0))) { - $TempName = Get_Text($Key, true); - - if ((true || $debug) && ($TempName == "")) - $TempName = "not found: \"$Key\""; - - if ($Entry == "Y") { - //zum absichtlkichen ausblenden von eintrÃ¤gen - if (strlen($TempName) > 1) { - //sonderfÃ¤lle: - - if ($Key == "admin/faq.php") - $TempName .= " (" . noAnswer() . ")"; - elseif ($Key == "credits.php") continue; - //ausgabe - $Text .= "

$TempName

\n"; - $Gefunden = true; - } - } - elseif ($debug) { - $Gefunden = true; - $Text .= "

$TempName ($Key)

\n"; - } - } - if ($Gefunden) - echo ''; -} //function ShowMenue -?> diff --git a/includes/pages/admin_groups.php b/includes/pages/admin_groups.php new file mode 100644 index 00000000..5d9d8180 --- /dev/null +++ b/includes/pages/admin_groups.php @@ -0,0 +1,73 @@ +'; + $groups_html .= '' . $group['Name'] . ''; + $privileges = sql_select("SELECT * FROM `GroupPrivileges` JOIN `Privileges` ON (`GroupPrivileges`.`privilege_id` = `Privileges`.`id`) WHERE `group_id`=" . sql_escape($group['UID'])); + $privileges_html = array (); + foreach ($privileges as $priv) + $privileges_html[] = $priv['name']; + $groups_html .= '' . join(", ", $privileges_html) . ''; + $groups_html .= 'Ã„ndern'; + $groups_html .= ''; + } + + return template_render('../templates/admin_groups.html', array ( + 'nick' => $user['Nick'], + 'groups' => $groups_html + )); + } else { + switch ($_REQUEST["action"]) { + case 'edit' : + if (isset ($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Groups ID."); + + $room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + if (count($room) > 0) { + list ($room) = $room; + $privileges = sql_select("SELECT `Privileges`.*, `GroupPrivileges`.`group_id` FROM `Privileges` LEFT OUTER JOIN `GroupPrivileges` ON (`Privileges`.`id` = `GroupPrivileges`.`privilege_id` AND `GroupPrivileges`.`group_id`=" . sql_escape($id) . ") ORDER BY `Privileges`.`name`"); + $privileges_html = ""; + foreach ($privileges as $priv) + $privileges_html .= '' . $priv['name'] . '' . $priv['desc'] . ''; + + $html .= template_render('../templates/admin_groups_edit_form.html', array ( + 'link' => page_link_to("admin_groups"), + 'id' => $id, + 'privileges' => $privileges_html + )); + } else + return error("No Group found."); + break; + + case 'save' : + if (isset ($_REQUEST['id']) && preg_match("/^-[0-9]{1,11}$/", $_REQUEST['id'])) + $id = $_REQUEST['id']; + else + return error("Incomplete call, missing Groups ID."); + + $room = sql_select("SELECT * FROM `Groups` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + if (!is_array($_REQUEST['privileges'])) + $_REQUEST['privileges'] = array (); + if (count($room) > 0) { + list ($room) = $room; + sql_query("DELETE FROM `GroupPrivileges` WHERE `group_id`=" . sql_escape($id)); + foreach ($_REQUEST['privileges'] as $priv) + if (preg_match("/^[0-9]{1,}$/", $priv) && sql_num_query("SELECT * FROM `Privileges` WHERE `id`=" . sql_escape($priv)) > 0) + sql_query("INSERT INTO `GroupPrivileges` SET `group_id`=" . sql_escape($id) . ", `privilege_id`=" . sql_escape($priv)); + header("Location: " . page_link_to("admin_groups")); + } else + return error("No Group found."); + break; + } + } + return $html; +} +?> diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 822d558f..739cb9d1 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -29,7 +29,8 @@ function make_navigation() { // Admin Navigation $menu .= make_navigation_for(Get_Text('admin/'), array ( "admin_angel_types", - "admin_rooms" + "admin_rooms", + "admin_groups" )); return $menu; } diff --git a/templates/admin_groups.html b/templates/admin_groups.html new file mode 100644 index 00000000..c5b4ac57 --- /dev/null +++ b/templates/admin_groups.html @@ -0,0 +1,21 @@ +Hallo %nick%, +
+hier hast du die MÃ¶glichkeit Gruppenrechte zu Ã¤ndern: + + + + + + + + + + %groups% + +

+ Name +	+ Rechte +	+ +

diff --git a/templates/admin_groups_edit_form.html b/templates/admin_groups_edit_form.html new file mode 100644 index 00000000..5729df64 --- /dev/null +++ b/templates/admin_groups_edit_form.html @@ -0,0 +1,21 @@ +

+ + + + + + + + + + %privileges% + +

+ +	+ Name +	+ Description +

+ +

\ No newline at end of file diff --git a/txt/TODO b/txt/TODO index fbaf4377..1ebf5e52 100644 --- a/txt/TODO +++ b/txt/TODO @@ -4,6 +4,8 @@ * user_messages schÃ¶n machen * Formulare weg von Tabellen * user_news lÃ¤sst sich nicht bedienen (POST ohne redirects...) + * Privilegien korrigieren (an die vom CVS anpassen) + * Beim Raum-Management die benÃ¶tigten Engel anzeigen * schichten ueber monatsgrenzen einbaue im moment werden die tage nur diff --git a/www-ssl/admin/group.php b/www-ssl/admin/group.php deleted file mode 100644 index b8a52ec2..00000000 --- a/www-ssl/admin/group.php +++ /dev/null @@ -1,49 +0,0 @@ -\n"; - echo "\n"; - echo "\tGroupname\n"; - echo "\tLink\n"; - echo "\n"; - - for ($n = 0; $n < $Zeilen; $n++) { - echo "\n"; - echo "\t" . mysql_result($Erg, $n, "Name") . "\n"; - - echo "change\n"; - echo "\n"; - } - - // new form - echo "\n"; - echo "\t\n"; - echo "\n"; - - echo "\t\n"; - // Ende Userliste -} - -include ("includes/footer.php"); -?> - - diff --git a/www-ssl/index.php b/www-ssl/index.php index 48aea75c..6bfbcc32 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -61,6 +61,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_rooms") { require_once ('includes/pages/admin_rooms.php'); $content = admin_rooms(); + } + elseif ($p == "admin_groups") { + require_once ('includes/pages/admin_groups.php'); + $content = admin_groups(); } else { require_once ('includes/pages/guest_start.php'); $content = guest_start(); diff --git a/www-ssl/nonpublic/messages.php b/www-ssl/nonpublic/messages.php deleted file mode 100644 index 4868136d..00000000 --- a/www-ssl/nonpublic/messages.php +++ /dev/null @@ -1,124 +0,0 @@ -\n"; - echo Get_Text("pub_messages_text1") . "

\n"; - - //show exist Messages - $SQL = "SELECT * FROM `Messages` WHERE `SUID`='" . $_SESSION["UID"] . "' OR `RUID`='" . $_SESSION["UID"] . "'"; - $erg = mysql_query($SQL, $con); - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - for ($i = 0; $i < mysql_num_rows($erg); $i++) { - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - } - - // send Messeges - echo ""; - echo "\n"; - echo "\n"; - echo "\n"; - - // Listet alle Nicks auf - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo ""; - - echo "

" . Get_Text("pub_messages_Datum") . "	" . Get_Text("pub_messages_Von") . "	" . Get_Text("pub_messages_An") . "	" . Get_Text("pub_messages_Text") . "
" . mysql_result($erg, $i, "Datum") . "	" . UID2Nick(mysql_result($erg, $i, "SUID")) . "	" . UID2Nick(mysql_result($erg, $i, "RUID")) . "	" . mysql_result($erg, $i, "Text") . "	"; - - if (mysql_result($erg, $i, "RUID") == $_SESSION["UID"]) { - echo "" . Get_Text("pub_messages_DelMsg") . ""; - - if (mysql_result($erg, $i, "isRead") == "N") - echo "" . Get_Text("pub_messages_MarkRead") . ""; - } else { - if (mysql_result($erg, $i, "isRead") == "N") - echo Get_Text("pub_messages_NotRead"); - } - - echo "

\n"; - break; - - case "SendMsg" : - echo Get_Text("pub_messages_Send1") . "...
\n"; - - $SQL = "INSERT INTO `Messages` ( `Datum` , `SUID` , `RUID` , `Text` ) VALUES (" . - "'" . gmdate("Y-m-j H:i:s", time()) . "', " . - "'" . $_SESSION["UID"] . "', " . - "'" . $_POST["RUID"] . "', " . - "'" . $_POST["Text"] . "');"; - - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_Send_OK") . "\n"; - else - echo Get_Text("pub_messages_Send_Error") . "...\n(" . mysql_error($con) . ")"; - break; - - case "MarkRead" : - $SQL = "UPDATE `Messages` SET `isRead` = 'Y' " . - "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID`='" . $_SESSION["UID"] . "' " . - "LIMIT 1 ;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_MarkRead_OK") . "\n"; - else - echo Get_Text("pub_messages_MarkRead_KO") . "...\n(" . mysql_error($con) . ")"; - break; - - case "DelMsg" : - $SQL = "DELETE FROM `Messages` " . - "WHERE `Datum` = '" . $_GET["Datum"] . "' AND `RUID` ='" . $_SESSION["UID"] . "' " . - "LIMIT 1;"; - $Erg = mysql_query($SQL, $con); - - if ($Erg == 1) - echo Get_Text("pub_messages_DelMsg_OK") . "\n"; - else - echo Get_Text("pub_messages_DelMsg_KO") . "...\n(" . mysql_error($con) . ")"; - break; - - default : - echo Get_Text("pub_messages_NoCommand"); -} - -include "includes/footer.php"; -?> -- cgit v1.2.3-70-g09d2

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

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

Engel online

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

$TopicName

$TopicName

↑↑↑

↑↑↑

↓↓↓

↑↑↑

↑↑↑

↓↓↓