aboutsummaryrefslogtreecommitdiff
path: root/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-01-20 18:43:34 -0800
committerBrett Profitt <brett.profitt@gmail.com>2012-01-20 18:43:34 -0800
commit12c4a61edc0a225677c31f6d26a7a785c065c115 (patch)
treea17ceb5171ce8225f25fcb6299dd6739f9e47365 /mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
parent9cca28b590a5884033c60af5a47aa3dcc383f7f0 (diff)
downloadelgg-12c4a61edc0a225677c31f6d26a7a785c065c115.tar.gz
elgg-12c4a61edc0a225677c31f6d26a7a785c065c115.tar.bz2
Fixes #2222. Added IP address to system log table and log browser. Fixed problem in log browser that would only show entries without an owner_guid.
Diffstat (limited to 'mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php')
-rw-r--r--mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php13
1 files changed, 9 insertions, 4 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..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));