From 0dabaa505e4463498665a1eb6ab95979578beab3 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 26 Dec 2012 14:02:27 +0100 Subject: #28 begin log --- includes/model/LogEntries_model.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 includes/model/LogEntries_model.php (limited to 'includes/model/LogEntries_model.php') diff --git a/includes/model/LogEntries_model.php b/includes/model/LogEntries_model.php new file mode 100644 index 00000000..d8615f0e --- /dev/null +++ b/includes/model/LogEntries_model.php @@ -0,0 +1,15 @@ + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 74098af09d11d0af1292b17e6df0483a303b6cce Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 26 Dec 2012 20:36:31 +0100 Subject: #28 finnished logging --- includes/model/LogEntries_model.php | 7 ++- includes/pages/admin_log.php | 86 +++++++------------------------------ public/index.php | 3 ++ 3 files changed, 24 insertions(+), 72 deletions(-) (limited to 'includes/model/LogEntries_model.php') diff --git a/includes/model/LogEntries_model.php b/includes/model/LogEntries_model.php index d8615f0e..5659c0ee 100644 --- a/includes/model/LogEntries_model.php +++ b/includes/model/LogEntries_model.php @@ -6,10 +6,15 @@ * @param $message Log Message */ function LogEntry_create($nick, $message) { - $timestamp = date(); + $timestamp = time(); sql_query("INSERT INTO `LogEntries` SET `timestamp`=" . sql_escape($timestamp) . ", `nick`='" . sql_escape($nick) . "', `message`='" . sql_escape($message) . "'"); } +function LogEntries() { + $log_entries_source = sql_select("SELECT * FROM `LogEntries` WHERE `timestamp` > " . (time() - 24*60*60) . " LIMIT 1000"); + return $log_entries_source; +} + ?> \ No newline at end of file diff --git a/includes/pages/admin_log.php b/includes/pages/admin_log.php index 4a29a496..ce30a246 100644 --- a/includes/pages/admin_log.php +++ b/includes/pages/admin_log.php @@ -1,76 +1,20 @@ 0) { - $html .= "\n"; - $html .= "\n\t\n\t\n\t\n\t\n\n"; - for ($n = 0; $n < mysql_num_rows($Erg); $n++) { - $html .= "\n"; - $html .= "\t\n"; - $html .= "\t\n"; - $html .= "\t\n"; - $html .= "\t\n"; - $html .= "\n"; - } - $html .= "
TimeUserCommendSQL Command
" . mysql_result($Erg, $n, "Time") . "" . UID2Nick(mysql_result($Erg, $n, "UID")) . displayavatar(mysql_result($Erg, $n, "UID")) . "" . mysql_result($Erg, $n, "Commend") . "" . mysql_result($Erg, $n, "SQLCommad") . "
\n"; - } else { - $html .= "Log is empty..."; - } - $html .= "
"; - - $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("Geleistete 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 Aufbau (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("Geleistete Arbeit (Ohne Raum Aufbau (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; + $log_entries_source = LogEntries(); + $log_entries = array(); + foreach($log_entries_source as $log_entry) { + $log_entry['date'] = date("H:i", $log_entry['timestamp']); + $log_entries[] = $log_entry; + } + + return page(array( + msg(), + table(array( + 'date' => "Time", + 'nick' => "Angel", + 'message' => "Log Entry" + ), $log_entries) + )); } ?> diff --git a/public/index.php b/public/index.php index bd7e552d..a7efbd86 100644 --- a/public/index.php +++ b/public/index.php @@ -11,6 +11,9 @@ require_once ('includes/sys_shift.php'); require_once ('includes/sys_template.php'); require_once ('includes/sys_user.php'); +require_once ('includes/model/LogEntries_model.php'); +require_once ('includes/model/User_model.php'); + require_once ('config/config.php'); require_once ('config/config_db.php'); -- cgit v1.2.3-70-g09d2 From 29a6f020e6a1a8e900239b9855f553e62a00dc26 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 27 Dec 2012 02:18:02 +0100 Subject: #28 finnished logging, fixes, inverted log order --- includes/model/LogEntries_model.php | 2 +- includes/pages/admin_user_angeltypes.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/model/LogEntries_model.php') diff --git a/includes/model/LogEntries_model.php b/includes/model/LogEntries_model.php index 5659c0ee..95ecf6cd 100644 --- a/includes/model/LogEntries_model.php +++ b/includes/model/LogEntries_model.php @@ -12,7 +12,7 @@ function LogEntry_create($nick, $message) { } function LogEntries() { - $log_entries_source = sql_select("SELECT * FROM `LogEntries` WHERE `timestamp` > " . (time() - 24*60*60) . " LIMIT 1000"); + $log_entries_source = sql_select("SELECT * FROM `LogEntries` WHERE `timestamp` > " . (time() - 24*60*60) . " ORDER BY `timestamp` DESC LIMIT 1000"); return $log_entries_source; } diff --git a/includes/pages/admin_user_angeltypes.php b/includes/pages/admin_user_angeltypes.php index 38c4d9c8..ba9a825b 100644 --- a/includes/pages/admin_user_angeltypes.php +++ b/includes/pages/admin_user_angeltypes.php @@ -8,7 +8,7 @@ function admin_user_angeltypes() { global $privileges; if (isset ($_REQUEST['confirm']) && test_request_int('confirm') && sql_num_query("SELECT * FROM `UserAngelTypes` WHERE `id`=" . sql_escape($_REQUEST['confirm']) . " AND `confirm_user_id` IS NULL") > 0) { - $user_angel_type_source = sql_select("SELECT `UserAngelTypes`.*, `User`.`Nick`, `AngelTypes`.`name` FROM `UserAngelTypes` JOIN `User` ON `User`.`UID`=`UserAngelTypes`.`user_id` JOIN `AngelTypes` ON `AngelTypes`.`id`=`UserAngelTypes`.`angeltype_id` WHERE `id`=" . sql_escape($_REQUEST['confirm']) . " LIMIT 1"); + $user_angel_type_source = sql_select("SELECT `UserAngelTypes`.*, `User`.`Nick`, `AngelTypes`.`name` FROM `UserAngelTypes` JOIN `User` ON `User`.`UID`=`UserAngelTypes`.`user_id` JOIN `AngelTypes` ON `AngelTypes`.`id`=`UserAngelTypes`.`angeltype_id` WHERE `UserAngelTypes`.`id`=" . sql_escape($_REQUEST['confirm']) . " LIMIT 1"); if(count($user_angel_type_source) > 0) { sql_query("UPDATE `UserAngelTypes` SET `confirm_user_id`=" . sql_escape($_SESSION['uid']) . " WHERE `id`=" . sql_escape($_REQUEST['confirm']) . " LIMIT 1"); engelsystem_log("Confirmed " . $user_angel_type_source[0]['Nick'] . " as " . $user_angel_type_source[0]['name']); @@ -19,7 +19,7 @@ function admin_user_angeltypes() { } if (isset ($_REQUEST['discard']) && test_request_int('discard') && sql_num_query("SELECT * FROM `UserAngelTypes` WHERE `id`=" . sql_escape($_REQUEST['discard']) . " AND `confirm_user_id` IS NULL") > 0) { - $user_angel_type_source = sql_select("SELECT `UserAngelTypes`.*, `User`.`Nick`, `AngelTypes`.`name` FROM `UserAngelTypes` JOIN `User` ON `User`.`UID`=`UserAngelTypes`.`user_id` JOIN `AngelTypes` ON `AngelTypes`.`id`=`UserAngelTypes`.`angeltype_id` WHERE `id`=" . sql_escape($_REQUEST['discard']) . " LIMIT 1"); + $user_angel_type_source = sql_select("SELECT `UserAngelTypes`.*, `User`.`Nick`, `AngelTypes`.`name` FROM `UserAngelTypes` JOIN `User` ON `User`.`UID`=`UserAngelTypes`.`user_id` JOIN `AngelTypes` ON `AngelTypes`.`id`=`UserAngelTypes`.`angeltype_id` WHERE `UserAngelTypes`.`id`=" . sql_escape($_REQUEST['discard']) . " LIMIT 1"); if(count($user_angel_type_source) > 0) { sql_query("DELETE FROM `UserAngelTypes` WHERE `id`=" . sql_escape($_REQUEST['discard']) . " LIMIT 1"); engelsystem_log("Discarded " . $user_angel_type_source[0]['Nick'] . " as " . $user_angel_type_source[0]['name']); -- cgit v1.2.3-70-g09d2 From 26ffee4a96f08aa58a348d11674f6fd29c1498b0 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 27 Dec 2012 02:18:56 +0100 Subject: #28 logging doku --- includes/model/LogEntries_model.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'includes/model/LogEntries_model.php') diff --git a/includes/model/LogEntries_model.php b/includes/model/LogEntries_model.php index 95ecf6cd..f8a552f2 100644 --- a/includes/model/LogEntries_model.php +++ b/includes/model/LogEntries_model.php @@ -11,6 +11,9 @@ function LogEntry_create($nick, $message) { sql_query("INSERT INTO `LogEntries` SET `timestamp`=" . sql_escape($timestamp) . ", `nick`='" . sql_escape($nick) . "', `message`='" . sql_escape($message) . "'"); } +/** + * Returns log entries of the last 24 hours with maximum count of 1000. + */ function LogEntries() { $log_entries_source = sql_select("SELECT * FROM `LogEntries` WHERE `timestamp` > " . (time() - 24*60*60) . " ORDER BY `timestamp` DESC LIMIT 1000"); return $log_entries_source; -- cgit v1.2.3-70-g09d2