1 files changed, 23 insertions, 5 deletions
diff --git a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index a04ef686a..9506c9d9f 100644
--- a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
@@ -12,13 +12,20 @@ $offset = get_input('offset');
 
 $search_username = get_input('search_username');
 if ($search_username) {
-	if ($user = get_user_by_username($search_username)) {
+	$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_guid = (int) $user_guid;
+		$user = get_entity($user_guid);
+		if ($user) {
+			$search_username = $user->username;
+		}
 	} else {
 		$user_guid = null;
 	}
@@ -34,15 +41,26 @@ if ($timeupper) {
 	$timeupper = strtotime($timeupper);
 }
 
+$ip_address = get_input('ip_address');
+
 $refine = elgg_view('logbrowser/refine', array(
-	'user_guid' => $user_guid,
 	'timeupper' => $timeupper,
 	'timelower' => $timelower,
+	'ip_address' => $ip_address,
+	'username' => $search_username,
 ));
 
 // Get log entries
-$log = get_system_log($user_guid, "", "", "","", $limit, $offset, false, $timeupper, $timelower);
-$count = get_system_log($user_guid, "", "", "","", $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));