5 files changed, 145 insertions, 91 deletions

diff --git a/mod/logbrowser/views/default/admin/utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index dadc6cda3..9506c9d9f 100644
--- a/mod/logbrowser/views/default/admin/utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
@@ -12,15 +12,22 @@ $offset = get_input('offset');
 
 $search_username = get_input('search_username');
 if ($search_username) {
-	if ($user = get_user_by_username($search_username)) {
-		$user = $user->guid;
+	$user = get_user_by_username($search_username);
+	if ($user) {
+		$user_guid = $user->guid;
+	} else {
+		$user_guid = null;
 	}
 } else {
-	$user_guid = get_input('user_guid',0);
+	$user_guid = get_input('user_guid', null);
 	if ($user_guid) {
-		$user = (int) $user_guid;
+		$user_guid = (int) $user_guid;
+		$user = get_entity($user_guid);
+		if ($user) {
+			$search_username = $user->username;
+		}
 	} else {
-		$user = "";
+		$user_guid = null;
 	}
 }
 
@@ -34,15 +41,26 @@ if ($timeupper) {
 	$timeupper = strtotime($timeupper);
 }
 
-$form = elgg_view('logbrowser/form', array(
-	'user_guid' => $user,
+$ip_address = get_input('ip_address');
+
+$refine = elgg_view('logbrowser/refine', array(
 	'timeupper' => $timeupper,
 	'timelower' => $timelower,
+	'ip_address' => $ip_address,
+	'username' => $search_username,
 ));
 
 // Get log entries
-$log = get_system_log($user, "", "", "","", $limit, $offset, false, $timeupper, $timelower);
-$count = get_system_log($user, "", "", "","", $limit, $offset, true, $timeupper, $timelower);
+$log = get_system_log($user_guid, "", "", "","", $limit, $offset, false, $timeupper, $timelower,
+		0, $ip_address);
+$count = get_system_log($user_guid, "", "", "","", $limit, $offset, true, $timeupper, $timelower,
+		0, $ip_address);
+
+// if user does not exist, we have no results
+if ($search_username && is_null($user_guid)) {
+	$log = false;
+	$count = 0;
+}
 
 $table = elgg_view('logbrowser/table', array('log_entries' => $log));
 
@@ -54,7 +72,7 @@ $nav = elgg_view('navigation/pagination',array(
 
 // display admin body
 $body = <<<__HTML
-$form
+$refine
 $nav
 $table
 $nav
diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
new file mode 100644
index 000000000..3d081c9c2
--- /dev/null
+++ b/mod/logbrowser/views/default/forms/logbrowser/refine.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Form body for refining the log browser search.
+ * Look for a particular person or in a time window.
+ *
+ * @uses $vars['username']
+ * @uses $vars['ip_address']
+ * @uses $vars['timelower']
+ * @uses $vars['timeupper']
+ */
+
+if (isset($vars['timelower']) && $vars['timelower']) {
+	$lowerval = date('r', $vars['timelower']);
+} else {
+	$lowerval = "";
+}
+if (isset($vars['timeupper']) && $vars['timeupper']) {
+	$upperval = date('r', $vars['timeupper']);
+} else {
+	$upperval = "";
+}
+$ip_address = elgg_extract('ip_address', $vars);
+$username = elgg_extract('username', $vars);
+
+$form = "<div>" . elgg_echo('logbrowser:user');
+$form .= elgg_view('input/text', array(
+	'name' => 'search_username',
+	'value' => $username,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:ip_address');
+$form .= elgg_view('input/text', array(
+	'name' => 'ip_address',
+	'value' => $ip_address,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:starttime');
+$form .= elgg_view('input/text', array(
+	'name' => 'timelower',
+	'value' => $lowerval,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:endtime');
+$form .= elgg_view('input/text', array(
+	'name' => 'timeupper',
+	'value' => $upperval,
+))  . "</div>";
+$form .= '<div class="elgg-foot">';
+$form .= elgg_view('input/submit', array(
+	'value' => elgg_echo('search'),
+));
+$form .= '</div>';
+
+echo $form;
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
deleted file mode 100644
index d2476afac..000000000
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Log browser search form
- *
- * @package ElggLogBrowser
- */
-?>
-
-<div id="logbrowser-search-area">
-<?php
-	
-	if ($vars['timelower']) {
-		$lowerval = date('r',$vars['timelower']);
-	} else {
-		$lowerval = "";
-	}
-	if ($vars['timeupper']) {
-		$upperval = date('r',$vars['timeupper']);
-	} else {
-		$upperval = "";
-	}
-	if ($vars['user_guid']) {
-		if ($user = get_entity($vars['user_guid']))
-			$userval = $user->username;
-	} else {
-		$userval = "";
-	}
-	
-
-	$form = "<p>" . elgg_echo('logbrowser:user');
-	$form .= elgg_view('input/text', array(
-		'name' => 'search_username',
-		'value' => $userval,
-	)) . "</p>";
-		
-	$form .= "<p>" . elgg_echo('logbrowser:starttime');
-	$form .= elgg_view('input/text', array(
-		'name' => 'timelower',
-		'value' => $lowerval,
-	)) . "</p>";
-
-	$form .= "<p>" . elgg_echo('logbrowser:endtime');
-	$form .= elgg_view('input/text', array(
-		'name' => 'timeupper',
-		'value' => $upperval,
-	))  . "</p>";
-	$form .= elgg_view('input/submit', array(
-		'value' => elgg_echo('search'),
-	));
-		
-	//@todo Forms 1.8: Convert to use elgg_view_form()
-	$wrappedform = elgg_view('input/form', array(
-		'body' => $form,
-		'method' => 'get',
-		'action' => "admin/overview/logbrowser",
-		'disable_security' => true,
-	));
-
-	$toggle_link = elgg_view('output/url', array(
-		'href' => '#log-browser-search-form',
-		'text' => elgg_echo('logbrowser:search'),
-		'class' => 'elgg-toggler',
-	));
-?>
-	<div id="log-browser-search-form" class="elgg-module elgg-module-inline hidden">
-		<div class="elgg-head">
-			<h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
-		</div>
-		<div class="elgg-body">
-			<?php echo $wrappedform; ?>
-		</div>
-	</div>
-	<p>
-		<?php echo $toggle_link; ?>
-	</p>
-</div>
\ No newline at end of file
diff --git a/mod/logbrowser/views/default/logbrowser/refine.php b/mod/logbrowser/views/default/logbrowser/refine.php
new file mode 100644
index 000000000..b40f23fa3
--- /dev/null
+++ b/mod/logbrowser/views/default/logbrowser/refine.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Log browser search form
+ *
+ * @package ElggLogBrowser
+ */
+
+$form_vars = array(
+	'method' => 'get',
+	'action' => 'admin/administer_utilities/logbrowser',
+	'disable_security' => true,
+);
+$form = elgg_view_form('logbrowser/refine', $form_vars, $vars);
+
+$toggle_link = elgg_view('output/url', array(
+	'href' => '#log-browser-search-form',
+	'text' => elgg_echo('logbrowser:search'),
+	'rel' => 'toggle',
+));
+
+$form_class = 'elgg-module elgg-module-inline';
+if (!isset($vars['user_guid']) && !isset($vars['username'])) {
+	$form_class .= ' hidden';
+}
+
+?>
+
+<div id="logbrowser-search-area" class="mbm">
+	<div>
+		<?php echo $toggle_link; ?>
+	</div>
+	<div id="log-browser-search-form" class="<?php echo $form_class; ?>">
+		<div class="elgg-head">
+			<h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
+		</div>
+		<div class="elgg-body">
+			<?php echo $form; ?>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/mod/logbrowser/views/default/logbrowser/table.php b/mod/logbrowser/views/default/logbrowser/table.php
index 86c8a1423..b08a0c428 100644
--- a/mod/logbrowser/views/default/logbrowser/table.php
+++ b/mod/logbrowser/views/default/logbrowser/table.php
@@ -11,6 +11,7 @@ $log_entries = $vars['log_entries'];
 <table class="elgg-table">
 	<tr>
 		<th><?php echo elgg_echo('logbrowser:date'); ?></th>
+		<th><?php echo elgg_echo('logbrowser:ip_address'); ?></th>
 		<th><?php echo elgg_echo('logbrowser:user:name'); ?></th>
 		<th><?php echo elgg_echo('logbrowser:user:guid'); ?></th>
 		<th><?php echo elgg_echo('logbrowser:object'); ?></th>
@@ -20,15 +21,23 @@ $log_entries = $vars['log_entries'];
 <?php
 	$alt = '';
 	foreach ($log_entries as $entry) {
+		if ($entry->ip_address) {
+			$ip_address = $entry->ip_address;
+		} else {
+			$ip_address = '&nbsp;';
+		}
+
 		$user = get_entity($entry->performed_by_guid);
 		if ($user) {
 			$user_link = elgg_view('output/url', array(
 				'href' => $user->getURL(),
-				'text' => $user->name
+				'text' => $user->name,
+				'is_trusted' => true,
 			));
 			$user_guid_link = elgg_view('output/url', array(
-				'href' => "admin/overview/logbrowser?user_guid=$user->guid",
-				'text' => $user->getGUID()
+				'href' => "admin/administer_utilities/logbrowser?user_guid={$user->guid}",
+				'text' => $user->getGUID(),
+				'is_trusted' => true,
 			));
 		} else {
 			$user_guid_link = $user_link = '&nbsp;';
@@ -38,7 +47,8 @@ $log_entries = $vars['log_entries'];
 		if (is_callable(array($object, 'getURL'))) {
 			$object_link = elgg_view('output/url', array(
 				'href' => $object->getURL(),
-				'text' => $entry->object_class
+				'text' => $entry->object_class,
+				'is_trusted' => true,
 			));
 		} else {
 			$object_link = $entry->object_class;
@@ -48,6 +58,9 @@ $log_entries = $vars['log_entries'];
 		<td class="log-entry-time">
 			<?php echo date('r', $entry->time_created); ?>
 		</td>
+		<td class="log-entry-ip-address">
+			<?php echo $ip_address; ?>
+		</td>
 		<td class="log-entry-user">
 			<?php echo $user_link; ?>
 		</td>
@@ -69,4 +82,9 @@ $log_entries = $vars['log_entries'];
 		$alt = $alt ? '' : 'class="alt"';
 	}
 ?>
-</table>
\ No newline at end of file
+</table>
+<?php
+if (!$log_entries) {
+	echo elgg_echo('logbrowser:no_result');
+	return true;
+}