From 2834a7bb487adce872ebe366435c40fd5c6daaa0 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Thu, 23 Aug 2007 22:48:33 +0000
Subject: [PATCH] user names

git-svn-id: file:///home/shish/svn/shimmie2/trunk@470 7f39781d-f577-437e-ae19-be835c7a54ca
---
 contrib/event_log/main.php  | 7 ++++++-
 contrib/event_log/theme.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/contrib/event_log/main.php b/contrib/event_log/main.php
index 5ec532c7..9c44d7c6 100644
--- a/contrib/event_log/main.php
+++ b/contrib/event_log/main.php
@@ -21,7 +21,12 @@ class EventLog extends Extension {
 			global $user;
 			if($user->is_admin()) {
 				global $database;
-				$events = $database->db->GetAll("SELECT * FROM event_log WHERE date > date_sub(now(), interval 1 day) ORDER BY date DESC");
+				$events = $database->db->GetAll("
+					SELECT event_log.*,users.name FROM event_log
+					JOIN users ON event_log.owner_id = users.id
+					WHERE date > date_sub(now(), interval 1 day)
+					ORDER BY date DESC
+				");
 				$this->theme->display_page($event->page, $events);
 			}
 			else {
diff --git a/contrib/event_log/theme.php b/contrib/event_log/theme.php
index 5322d544..51be1fa0 100644
--- a/contrib/event_log/theme.php
+++ b/contrib/event_log/theme.php
@@ -22,7 +22,7 @@ class EventLogTheme extends Themelet {
 			$table .= "
 				<tr>
 					<td>{$event['id']}</td>
-					<td>{$event['owner_id']}</td>
+					<td>{$event['name']}</td>
 					<td>{$event['owner_ip']}</td>
 					<td>{$event['date']}</td>
 					<td>{$event['event']}</td>