5 files changed, 10 insertions, 15 deletions
diff --git a/core/helpers/core_block.php b/core/helpers/core_block.php
index defde6ce..06354a10 100644
--- a/core/helpers/core_block.php
+++ b/core/helpers/core_block.php
@@ -55,6 +55,7 @@ class core_block_Core {
     $block->id = "gLogEntries";
     $block->title = _("Log Entries");
     $block->content = new View("admin_block_log_entries.html");
+    $block->content->entries = ORM::factory("log")->orderby("timestamp", "DESC")->find_all(5);
     $blocks[] = $block;
 
     return implode("\n", $blocks);
diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index 53b5bfe6..87ec3d87 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -78,6 +78,7 @@ class core_installer {
                    `severity` int(9) default 0,
                    `timestamp` int(9) default 0,
                    `url` varchar(255) default NULL,
+                   `user_id` int(9) default 0,
                    PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
diff --git a/core/helpers/log.php b/core/helpers/log.php
index fece9de3..906aa034 100644
--- a/core/helpers/log.php
+++ b/core/helpers/log.php
@@ -39,6 +39,7 @@ class log_Core {
     $log->url = url::abs_current(true);
     $log->referer = request::referrer(null);
     $log->timestamp = time();
+    $log->user_id =  user::active()->id;
     $log->save();
   }
 }
diff --git a/core/models/log.php b/core/models/log.php
index 6803d41d..534ea090 100644
--- a/core/models/log.php
+++ b/core/models/log.php
@@ -18,4 +18,5 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Log_Model extends ORM {
+  protected $has_one = array("user");
 }
diff --git a/core/views/admin_block_log_entries.html.php b/core/views/admin_block_log_entries.html.php
index b2ec8e91..31929068 100644
--- a/core/views/admin_block_log_entries.html.php
+++ b/core/views/admin_block_log_entries.html.php
@@ -1,20 +1,11 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <ul>
+  <? foreach ($entries as $entry): ?>
   <li>
-    <a href="">hacker</a> 2008-12-10 23:02:23 Something happened
-  </li>
-  <li>
-    <a href="">username</a> 2008-12-10 23:02:23 Someone logged in
-  </li>
-  <li>
-    <a href="">username</a> 2008-12-10 23:02:23 New module installed
-  </li>
-  <li>
-    <a href="">username</a> 2008-12-10 23:02:23 Someone logged in
-  </li>
-  <li>
-    <a href="">username</a> 2008-12-10 23:02:23 RSS feed updated
+    <a href="<?= url::site("user/$entry->user_id") ?>"><?= $entry->user->name ?></a>
+    <?= date("Y-M-d H:i:s", $entry->timestamp) ?>
+    <?= $entry->message ?>
+    <?= $entry->html ?>
   </li>
+  <? endforeach ?>
 </ul>
-
-