2 files changed, 90 insertions, 24 deletions
diff --git a/mod/logbrowser/views/default/admin/overview/logbrowser.php b/mod/logbrowser/views/default/admin/overview/logbrowser.php
new file mode 100644
index 000000000..d82b1e00b
--- /dev/null
+++ b/mod/logbrowser/views/default/admin/overview/logbrowser.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Elgg log browser.
+ * 
+ * @package ElggLogBrowser
+ * @author Curverider Ltd
+ * @link http://elgg.com/
+ */
+
+$limit = get_input('limit', 40);
+$offset = get_input('offset');
+
+$search_username = get_input('search_username');
+if ($search_username) {
+	if ($user = get_user_by_username($search_username)) {
+		$user = $user->guid;
+	}
+} else {
+	$user_guid = get_input('user_guid',0);
+	if ($user_guid) {
+		$user = (int) $user_guid;
+	} else {
+		$user = "";
+	}
+}
+
+$timelower = get_input('timelower');
+if ($timelower) {
+	$timelower = strtotime($timelower);
+}
+
+$timeupper = get_input('timeupper');
+if ($timeupper) {
+	$timeupper = strtotime($timeupper);
+}
+
+$title = elgg_view_title(elgg_echo('logbrowser'));
+
+$form = elgg_view('logbrowser/form', array(
+	'user_guid' => $user,
+	'timeupper' => $timeupper,
+	'timelower' => $timelower,
+));
+
+// Get log entries
+$log = get_system_log($user, "", "", "","", $limit, $offset, false, $timeupper, $timelower);
+$count = get_system_log($user, "", "", "","", $limit, $offset, true, $timeupper, $timelower);
+$log_entries = array();
+
+foreach ($log as $l) {
+	$tmp = new ElggObject();
+	$tmp->subtype = 'logwrapper';
+	$tmp->entry = $l;
+	$log_entries[] = $tmp;
+}
+
+$list = elgg_view_entity_list($log_entries, $count, $offset, $limit, false, false);
+
+// display admin body
+$body = <<<__HTML
+$title
+$form
+<div class="admin_settings log_browser radius8 clearfloat">
+	$list
+</div>
+__HTML;
+
+echo $body;
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index d79e71d86..7c993e6a2 100644
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -22,34 +22,32 @@
 		}
 		
 
-		$form = "";
-		
-		$form .= "<p>" . elgg_echo('logbrowser:user');
-		$form .= elgg_view('input/text',array(
-														'internalname' => 'search_username',
-														'value' => $userval 
-													)) . "</p>";
+		$form = "<p>" . elgg_echo('logbrowser:user');
+		$form .= elgg_view('input/text', array(
+			'internalname' => 'search_username',
+			'value' => $userval,
+		)) . "</p>";
 		
 		$form .= "<p>" . elgg_echo('logbrowser:starttime');
-		$form .= elgg_view('input/text',array(
-														'internalname' => 'timelower',
-														'value' => $lowerval 
-													)) . "</p>";
+		$form .= elgg_view('input/text', array(
+			'internalname' => 'timelower',
+			'value' => $lowerval,
+		)) . "</p>";
 
 		$form .= "<p>" . elgg_echo('logbrowser:endtime');
-		$form .= elgg_view('input/text',array(
-														'internalname' => 'timeupper',
-														'value' => $upperval
-													))  . "</p>";
-		$form .= elgg_view('input/submit',array(
-														'value' => elgg_echo('search')
-													));
-													
-		$wrappedform = elgg_view('input/form',array(
-														'body' => $form,
-														'method' => 'get',
-														'action' => $vars['url'] . "mod/logbrowser/"
-										));										
+		$form .= elgg_view('input/text', array(
+			'internalname' => 'timeupper',
+			'value' => $upperval,
+		))  . "</p>";
+		$form .= elgg_view('input/submit', array(
+			'value' => elgg_echo('search'),
+		));
+		
+		$wrappedform = elgg_view('input/form', array(
+			'body' => $form,
+			'method' => 'get',
+			'action' => "{$vars['url']}pg/admin/logbrowser",
+		));
 ?>
 
 	<div id="log_browser_search_form" class="hidden radius8"><?php echo $wrappedform; ?></div>