From 74098af09d11d0af1292b17e6df0483a303b6cce Mon Sep 17 00:00:00 2001
From: Philip Häusler <msquare@notrademark.de>
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(-)

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 @@
 <?php
 function admin_log() {
-	require_once ("includes/funktion_db_list.php");
-
-	$html = "";
-	$SQL = "SELECT * FROM `ChangeLog` ORDER BY `Time` DESC LIMIT 0,10000";
-	$Erg = sql_query($SQL);
-
-	if (mysql_num_rows($Erg) > 0) {
-		$html .= "<table border=1>\n";
-		$html .= "<tr>\n\t<th>Time</th>\n\t<th>User</th>\n\t<th>Commend</th>\n\t<th>SQL Command</th>\n</tr>\n";
-		for ($n = 0; $n < mysql_num_rows($Erg); $n++) {
-			$html .= "<tr>\n";
-			$html .= "\t<td>" . mysql_result($Erg, $n, "Time") . "</td>\n";
-			$html .= "\t<td>" . UID2Nick(mysql_result($Erg, $n, "UID")) . displayavatar(mysql_result($Erg, $n, "UID")) . "</td>\n";
-			$html .= "\t<td>" . mysql_result($Erg, $n, "Commend") . "</td>\n";
-			$html .= "\t<td>" . mysql_result($Erg, $n, "SQLCommad") . "</td>\n";
-			$html .= "</tr>\n";
-		}
-		$html .= "</table>\n";
-	} else {
-		$html .= "Log is empty...";
-	}
-	$html .= "<hr />";
-
-	$html .= "<h1>Web Counter</h1>";
-	$html .= funktion_db_list("Counter");
-
-	/*
-	$html .= "<h1>Raeume</h1> <br />";
-	funktion_db_list("Raeume");
-	
-	$html .= "<h1>Schichtbelegung</h1> <br />";
-	funktion_db_list("Schichtbelegung");
-	
-	$html .= "<h1>Schichtplan</h1> <br />Hier findest du alle bisher eingetragenen Schichten:";
-	funktion_db_list("Schichtplan");
-	
-	$html .= "<h1>User</h1> <br />";
-	funktion_db_list("User");
-	
-	$html .= "<h1>News</h1> <br />";
-	funktion_db_list("News");
-	
-	$html .= "<h1>FAQ</h1> <br />";
-	funktion_db_list("FAQ");
-	
-	$html .= "Deaktiviert";
-	*/
-
-	$html .= "<hr>\n";
-	$html .= funktion_db_element_list_2row("Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`");
-	$html .= "<br />\n";
-	$html .= funktion_db_element_list_2row("Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`");
-	$html .= "<br />\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 .= "<hr>\n";
-	$html .= funktion_db_element_list_2row("Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`");
-	$html .= "<br />\n";
-	$html .= funktion_db_element_list_2row("Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`");
-
-	$html .= "<hr>\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 .= "<br />\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 .= "<hr>\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 .= "<br />\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-54-g00ecf