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/funktion_db_list.php | 100 +++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 51 deletions(-) mode change 100755 => 100644 includes/funktion_db_list.php (limited to 'includes/funktion_db_list.php') diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php old mode 100755 new mode 100644 index 9393e97e..1131ffd3 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -1,67 +1,65 @@ -"; - echo "DB: $Table_Name"; + echo ""; + echo ""; - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo ""; - } - echo ""; + echo ""; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + { + echo ""; + } + echo ""; - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo ""; - } - echo ""; - } - echo "
DB: $Table_Name
". mysql_field_name($Erg, $m). "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
"; + for ($n = 0 ; $n < $Zeilen ; $n++) + { + echo ""; + for ($m = 0 ; $m < $Anzahl_Felder ; $m++) + { + echo "".mysql_result($Erg, $n, $m). ""; + } + echo ""; + } + echo ""; } function funktion_db_element_list_2row( $TopicName, $SQL) { - global $con; + global $con; - echo "\n"; - echo ""; -# echo "\t\n"; + echo "
$TopicName

$TopicName
\n"; + echo ""; +# echo "\t\n"; - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); - - echo ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - echo ""; - } - echo ""; + $Erg = mysql_query($SQL, $con); + echo mysql_error($con); + + echo ""; + for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) + { + echo ""; + } + echo ""; - for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) - { - echo ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - echo ""; - } - echo ""; - } - echo "
$TopicName

$TopicName
". mysql_field_name($Erg, $m). "
". mysql_field_name($Erg, $m). "
".mysql_result($Erg, $n, $m). "
\n"; + for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) + { + echo ""; + for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) + { + echo "".mysql_result($Erg, $n, $m). ""; + } + echo ""; + } + echo "\n"; } ?> -- 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/funktion_db_list.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 "
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 @@ Date: Fri, 3 Jun 2011 06:40:29 +0200 Subject: admin user --- DB/db_rewrite.sql | 36 ++++++++------ includes/funktion_db_list.php | 27 +++++----- includes/pages/admin_user.php | 111 ++++++++++++++++++++++++++++++++++++++++++ includes/sys_menu.php | 1 + www-ssl/css/base.css | 16 ++++++ www-ssl/index.php | 4 ++ 6 files changed, 165 insertions(+), 30 deletions(-) create mode 100644 includes/pages/admin_user.php (limited to 'includes/funktion_db_list.php') diff --git a/DB/db_rewrite.sql b/DB/db_rewrite.sql index f5ba1c6d..f713c813 100644 --- a/DB/db_rewrite.sql +++ b/DB/db_rewrite.sql @@ -3,7 +3,7 @@ -- http://www.phpmyadmin.net -- -- Host: localhost --- Erstellungszeit: 03. Juni 2011 um 03:49 +-- Erstellungszeit: 03. Juni 2011 um 04:40 -- Server Version: 5.1.44 -- PHP-Version: 5.3.1 @@ -71,23 +71,24 @@ CREATE TABLE IF NOT EXISTS `Counter` ( -- INSERT INTO `Counter` (`URL`, `Anz`) VALUES -('news', 187), +('news', 190), ('login', 26), ('logout', 13), ('start', 26), ('faq', 19), ('credits', 3), -('register', 3), +('register', 8), ('admin_rooms', 89), ('admin_angel_types', 71), ('user_settings', 126), ('user_messages', 113), -('admin_groups', 117), +('admin_groups', 125), ('user_questions', 55), ('admin_questions', 42), ('admin_faq', 55), ('admin_news', 32), -('news_comments', 151); +('news_comments', 151), +('admin_user', 55); -- -------------------------------------------------------- @@ -133,7 +134,7 @@ 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=51 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=64 ; -- -- Daten für Tabelle `GroupPrivileges` @@ -145,15 +146,17 @@ INSERT INTO `GroupPrivileges` (`id`, `group_id`, `privilege_id`) VALUES (40, -2, 4), (41, -2, 3), (23, -1, 2), -(48, -4, 14), -(46, -4, 7), +(62, -4, 16), +(61, -4, 6), (44, -2, 11), (43, -2, 9), (12, -5, 10), -(47, -4, 13), -(49, -4, 12), +(60, -4, 12), +(59, -4, 14), (45, -2, 8), -(50, -4, 6); +(58, -4, 13), +(57, -4, 7), +(63, -4, 5); -- -------------------------------------------------------- @@ -265,7 +268,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=16 ; +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=17 ; -- -- Daten für Tabelle `Privileges` @@ -286,7 +289,8 @@ INSERT INTO `Privileges` (`id`, `name`, `desc`) VALUES (12, 'admin_questions', 'Answer user''s questions'), (13, 'admin_faq', 'Edit FAQs'), (14, 'admin_news', 'Administrate the news section'), -(15, 'news_comments', 'User can comment news'); +(15, 'news_comments', 'User can comment news'), +(16, 'admin_user', 'Administrate the angels'); -- -------------------------------------------------------- @@ -984,8 +988,8 @@ INSERT INTO `Sprache` (`TextID`, `Sprache`, `Text`) VALUES ('admin/dect.php', 'EN', 'Dect'), ('admin/dect_call.php', 'DE', ' '), ('admin/dect_call.php', 'EN', ' '), -('admin/user.php', 'DE', 'Engelliste'), -('admin/user.php', 'EN', 'Drone-list'), +('admin_user', 'DE', 'Engelliste'), +('admin_user', 'EN', 'Manage angels'), ('admin/userDefaultSetting.php', 'DE', 'Engel Voreinstellungen'), ('admin/userDefaultSetting.php', 'EN', 'Drone Default Setting'), ('admin/UserPicture.php', 'DE', 'Benutzerbilder'), @@ -1072,7 +1076,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', 1307072950, '0000-00-00 00:00:00', '', '', ''), +(1, 'admin', '', '', 0, '', '', '', '', '', '', 'L', '21232f297a57a5a743894a0e4a801fc3', 0, 0, 0, 10, 'DE', 115, 'L', 1307075960, '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_db_list.php b/includes/funktion_db_list.php index 44e3d865..3e2878da 100644 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -34,32 +34,31 @@ function funktion_db_element_list_2row( $TopicName, $SQL) { - global $con; + $html = ""; + $html .= "\n"; + $html .= ""; +# $html .= "\n"; - echo "
    $TopicName

    $TopicName
    \n"; - echo ""; -# echo "\n"; - - $Erg = mysql_query($SQL, $con); - echo mysql_error($con); + $Erg = sql_query($SQL); - echo ""; + $html .= ""; for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) { - echo ""; + $html .= ""; } - echo ""; + $html .= ""; for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) { - echo ""; + $html .= ""; for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) { - echo ""; + $html .= ""; } - echo ""; + $html .= ""; } - echo "
    $TopicName

    $TopicName
    ". mysql_field_name($Erg, $m). "". mysql_field_name($Erg, $m). "
    ".mysql_result($Erg, $n, $m). "".mysql_result($Erg, $n, $m). "
    \n"; + $html .= "\n"; + return $html; } ?> diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php new file mode 100644 index 00000000..b64c9678 --- /dev/null +++ b/includes/pages/admin_user.php @@ -0,0 +1,111 @@ +Neuen Engel eintragen »

    \n"; + + if (!isset ($_GET["OrderBy"])) + $_GET["OrderBy"] = "Nick"; + $SQL = "SELECT * FROM `User` ORDER BY `" . $_GET["OrderBy"] . "` ASC"; + $Erg = sql_query($SQL); + + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); + + $html .= "Anzahl Engel: $Zeilen

    \n"; + $html .= ' + + + + + + + + + + + + + '; + $Gekommen = 0; + $Active = 0; + $Tshirt = 0; + + for ($n = 0; $n < $Zeilen; $n++) { + $title = ""; + $user_groups = sql_select("SELECT * FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape(mysql_result($Erg, $n, "UID")) . " ORDER BY `Groups`.`Name`"); + $groups = array (); + foreach ($user_groups as $user_group) { + $groups[] = $user_group['Name']; + } + $title .= 'Groups: ' . join(", ", $groups) . "
    "; + if (strlen(mysql_result($Erg, $n, "Telefon")) > 0) + $title .= "Tel: " . mysql_result($Erg, $n, "Telefon") . "
    "; + if (strlen(mysql_result($Erg, $n, "Handy")) > 0) + $title .= "Handy: " . mysql_result($Erg, $n, "Handy") . "
    "; + if (strlen(mysql_result($Erg, $n, "DECT")) > 0) + $title .= "DECT: " . + mysql_result($Erg, $n, "DECT") . "
    "; + if (strlen(mysql_result($Erg, $n, "Hometown")) > 0) + $title .= "Hometown: " . mysql_result($Erg, $n, "Hometown") . "
    "; + if (strlen(mysql_result($Erg, $n, "lastLogIn")) > 0) + $title .= "Last login: " . date("Y-m-d H:i", mysql_result($Erg, $n, "lastLogIn")) . "
    "; + if (strlen(mysql_result($Erg, $n, "Art")) > 0) + $title .= "Type: " . mysql_result($Erg, $n, "Art") . "
    "; + if (strlen(mysql_result($Erg, $n, "ICQ")) > 0) + $title .= "ICQ: " . mysql_result($Erg, $n, "ICQ") . "
    "; + if (strlen(mysql_result($Erg, $n, "jabber")) > 0) + $title .= "jabber: " . mysql_result($Erg, $n, "jabber") . "
    "; + + $html .= "\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $html .= "\t\n"; + $Gekommen += mysql_result($Erg, $n, "Gekommen"); + $html .= "\t\n"; + $Active += mysql_result($Erg, $n, "Aktiv"); + $html .= "\t\n"; + $Tshirt += mysql_result($Erg, $n, "Tshirt"); + $html .= "\t\n"; + $html .= ""; + $html .= "\t\n"; + $html .= "\n"; + } + $html .= "" . + "" . + "\n"; + $html .= "\t
    + Nick + Vorname NameAlter + E-Mail + GrößeGekommenAktivT-ShirtRegistrierÄnd.
    " . mysql_result($Erg, $n, "Nick") . "" . mysql_result($Erg, $n, "Vorname") . " " . mysql_result($Erg, $n, "Name") . "" . mysql_result($Erg, $n, "Alter") . ""; + if (strlen(mysql_result($Erg, $n, "email")) > 0) + $html .= "" . + mysql_result($Erg, $n, "email") . ""; + $html .= ''; + $html .= "" . mysql_result($Erg, $n, "Size") . "" . mysql_result($Erg, $n, "Gekommen") . "" . mysql_result($Erg, $n, "Aktiv") . "" . mysql_result($Erg, $n, "Tshirt") . "" . mysql_result($Erg, $n, "CreateDate") . "" . 'Edit' . + "
    $Gekommen$Active$Tshirt
    \n"; + // Ende Userliste + + $html .= "

    Statistics

    "; + $html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + + $html .= "
    \n"; + + $html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + + $html .= "
    \n"; + + $html .= funktion_db_element_list_2row("Used Groups", "SELECT Groups.Name AS 'GroupName', COUNT(Groups.Name) AS Count FROM `UserGroups` " . + "LEFT JOIN `Groups` ON Groups.UID = UserGroups.group_id " . + "WHERE (UserGroups.group_id!='NULL') " . + "GROUP BY `GroupName` " . + ""); + return $html; +} +?> \ No newline at end of file diff --git a/includes/sys_menu.php b/includes/sys_menu.php index 2a05fdb4..6a10c32b 100644 --- a/includes/sys_menu.php +++ b/includes/sys_menu.php @@ -31,6 +31,7 @@ function make_navigation() { // Admin Navigation $menu .= make_navigation_for(Get_Text('admin/'), array ( + "admin_user", "admin_usershifts", "admin_questions", "admin_angel_types", diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css index 0a137099..236eba81 100644 --- a/www-ssl/css/base.css +++ b/www-ssl/css/base.css @@ -120,6 +120,22 @@ textarea { width: 300px; } +.hidden { + background: #fff; + border: 1px solid #888; + display: none; + font-size: 12px; + padding: 4px; +} + +td .hidden { + position: absolute; +} + +tr:hover .hidden { + display: block; +} + .clear { clear: both; } diff --git a/www-ssl/index.php b/www-ssl/index.php index c62b03e0..f6c6aaa2 100644 --- a/www-ssl/index.php +++ b/www-ssl/index.php @@ -66,6 +66,10 @@ if (in_array($p, $privileges)) { elseif ($p == "admin_questions") { $content = admin_questions(); } + elseif ($p == "admin_user") { + require_once ('includes/pages/admin_user.php'); + $content = admin_user(); + } elseif ($p == "admin_news") { require_once ('includes/pages/admin_news.php'); $content = admin_news(); -- cgit v1.3.1 From ded7bcb0b49e101c0414034fe1ff168a043b6a75 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 3 Jun 2011 14:48:05 +0200 Subject: debug -> admin log --- includes/funktion_db_list.php | 100 +++++++++++++++++++++--------------------- includes/pages/admin_log.php | 51 +++++++++++++++++++++ www-ssl/admin/debug.php | 58 ------------------------ 3 files changed, 100 insertions(+), 109 deletions(-) delete mode 100644 www-ssl/admin/debug.php (limited to 'includes/funktion_db_list.php') diff --git a/includes/funktion_db_list.php b/includes/funktion_db_list.php index 3e2878da..35bb7255 100644 --- a/includes/funktion_db_list.php +++ b/includes/funktion_db_list.php @@ -1,64 +1,62 @@ "; - echo "DB: $Table_Name"; + $SQL = "SELECT * FROM `" . $Table_Name . "`"; + $Erg = mysql_query($SQL, $con); - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo "". mysql_field_name($Erg, $m). ""; - } - echo ""; + // anzahl zeilen + $Zeilen = mysql_num_rows($Erg); - for ($n = 0 ; $n < $Zeilen ; $n++) - { - echo ""; - for ($m = 0 ; $m < $Anzahl_Felder ; $m++) - { - echo "".mysql_result($Erg, $n, $m). ""; - } - echo ""; - } - echo ""; -} + $Anzahl_Felder = mysql_num_fields($Erg); -function funktion_db_element_list_2row( $TopicName, $SQL) -{ - $html = ""; - $html .= "\n"; - $html .= ""; -# $html .= "\n"; + $html .= "
    $TopicName

    $TopicName
    "; + $html .= ""; - $Erg = sql_query($SQL); - - $html .= ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - $html .= ""; - } - $html .= ""; + $html .= ""; + for ($m = 0; $m < $Anzahl_Felder; $m++) { + $html .= ""; + } + $html .= ""; - for ($n = 0 ; $n < mysql_num_rows($Erg) ; $n++) - { - $html .= ""; - for ($m = 0 ; $m < mysql_num_fields($Erg) ; $m++) - { - $html .= ""; - } - $html .= ""; - } - $html .= "
    DB: $Table_Name
    ". mysql_field_name($Erg, $m). "
    " . mysql_field_name($Erg, $m) . "
    ".mysql_result($Erg, $n, $m). "
    \n"; - return $html; + for ($n = 0; $n < $Zeilen; $n++) { + $html .= ""; + for ($m = 0; $m < $Anzahl_Felder; $m++) { + $html .= "" . mysql_result($Erg, $n, $m) . ""; + } + $html .= ""; + } + $html .= ""; + return $html; } +function funktion_db_element_list_2row($TopicName, $SQL) { + $html = ""; + $html .= "\n"; + $html .= ""; + # $html .= "\n"; + + $Erg = sql_query($SQL); + + $html .= ""; + for ($m = 0; $m < mysql_num_fields($Erg); $m++) { + $html .= ""; + } + $html .= ""; + + for ($n = 0; $n < mysql_num_rows($Erg); $n++) { + $html .= ""; + for ($m = 0; $m < mysql_num_fields($Erg); $m++) { + $html .= ""; + } + $html .= ""; + } + $html .= "
    $TopicName

    $TopicName
    " . mysql_field_name($Erg, $m) . "
    " . mysql_result($Erg, $n, $m) . "
    \n"; + return $html; +} ?> diff --git a/includes/pages/admin_log.php b/includes/pages/admin_log.php index 5f112f03..2798b2cf 100644 --- a/includes/pages/admin_log.php +++ b/includes/pages/admin_log.php @@ -1,5 +1,7 @@ "; + + $html .= "

    Web Counter

    "; + $html .= funktion_db_list("Counter"); + + /* + $html .= "

    Raeume


    "; + funktion_db_list("Raeume"); + + $html .= "

    Schichtbelegung


    "; + funktion_db_list("Schichtbelegung"); + + $html .= "

    Schichtplan


    Hier findest du alle bisher eingetragenen Schichten:"; + funktion_db_list("Schichtplan"); + + $html .= "

    User


    "; + funktion_db_list("User"); + + $html .= "

    News


    "; + funktion_db_list("News"); + + $html .= "

    FAQ


    "; + funktion_db_list("FAQ"); + + $html .= "Deaktiviert"; + */ + + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Tshirt nicht ausgegeben (Gekommen=1)", "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); + + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); + + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Gesamte Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Geleisteter Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); + + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Gesamte Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); + $html .= "
    \n"; + $html .= funktion_db_element_list_2row("Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); + return $html; } ?> diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php deleted file mode 100644 index ec1b2c9f..00000000 --- a/www-ssl/admin/debug.php +++ /dev/null @@ -1,58 +0,0 @@ -Web Counter"; -funktion_db_list("Counter"); - -/* -echo "

    Raeume


    "; -funktion_db_list("Raeume"); - -echo "

    Schichtbelegung


    "; -funktion_db_list("Schichtbelegung"); - -echo "

    Schichtplan


    Hier findest du alle bisher eingetragenen Schichten:"; -funktion_db_list("Schichtplan"); - -echo "

    User


    "; -funktion_db_list("User"); - -echo "

    News


    "; -funktion_db_list("News"); - -echo "

    FAQ


    "; -funktion_db_list("FAQ"); - -echo "Deaktiviert"; -*/ - -echo "
    \n"; -funktion_db_element_list_2row("Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); -echo "
    \n"; -funktion_db_element_list_2row("Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); -echo "
    \n"; -funktion_db_element_list_2row("Tshirt nicht ausgegeben (Gekommen=1)", "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); - -echo "
    \n"; -funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); -echo "
    \n"; -funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); - -echo "
    \n"; -funktion_db_element_list_2row("Gesamte Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); -echo "
    \n"; -funktion_db_element_list_2row("Geleisteter Arbeit", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); - -echo "
    \n"; -funktion_db_element_list_2row("Gesamte Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (Shifts.RID!=7)"); -echo "
    \n"; -funktion_db_element_list_2row("Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); - -include ("includes/footer.php"); -?> - -- cgit v1.3.1