Upgraded to Elgg 1.8.4.

4 files changed, 29 insertions, 6 deletions

diff --git a/mod/logbrowser/languages/en.php b/mod/logbrowser/languages/en.php
index 3b6ead272..f36b4bc6b 100644
--- a/mod/logbrowser/languages/en.php
+++ b/mod/logbrowser/languages/en.php
@@ -17,6 +17,7 @@ $english = array(
 	'logbrowser:explore' => 'Explore log',
 
 	'logbrowser:date' => 'Date and time',
+	'logbrowser:ip_address' => 'IP address',
 	'logbrowser:user:name' => 'User',
 	'logbrowser:user:guid' => 'User GUID',
 	'logbrowser:object' => 'Object type',
diff --git a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index a04ef686a..89894e3d2 100644
--- a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
@@ -12,11 +12,12 @@ $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 = get_input('user_guid',0);
+	$user_guid = get_input('user_guid', null);
 	if ($user_guid) {
 		$user_guid = (int) $user_guid;
 	} else {
@@ -34,6 +35,8 @@ if ($timeupper) {
 	$timeupper = strtotime($timeupper);
 }
 
+$ip_address = get_input('ip_address');
+
 $refine = elgg_view('logbrowser/refine', array(
 	'user_guid' => $user_guid,
 	'timeupper' => $timeupper,
@@ -41,8 +44,10 @@ $refine = elgg_view('logbrowser/refine', array(
 ));
 
 // 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);
 
 $table = elgg_view('logbrowser/table', array('log_entries' => $log));
 
diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
index ff3f48b03..6ec5907b6 100644
--- a/mod/logbrowser/views/default/forms/logbrowser/refine.php
+++ b/mod/logbrowser/views/default/forms/logbrowser/refine.php
@@ -19,13 +19,14 @@ if (isset($vars['timeupper'])) {
 	$upperval = "";
 }
 if (isset($vars['user_guid'])) {
-	if ($user = get_entity($vars['user_guid'])) {
+	$user = get_entity($vars['user_guid']);
+	if ($user) {
 		$userval = $user->username;
 	}
 } else {
 	$userval = "";
 }
-
+$ip_address = elgg_extract('ip_address', '');
 
 $form = "<div>" . elgg_echo('logbrowser:user');
 $form .= elgg_view('input/text', array(
@@ -33,6 +34,12 @@ $form .= elgg_view('input/text', array(
 	'value' => $userval,
 )) . "</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',
diff --git a/mod/logbrowser/views/default/logbrowser/table.php b/mod/logbrowser/views/default/logbrowser/table.php
index b7f6a1f20..9a867e080 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,6 +21,12 @@ $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(
@@ -51,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>