From 7355326146c6dd1f3e54f023510095c5fb0eb51c Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 29 Dec 2010 22:18:25 +0000 Subject: fixes for previous commit git-svn-id: http://code.elgg.org/elgg/trunk@7761 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/admin/overview/logbrowser.php | 66 ---------------------- .../views/default/admin/utilities/logbrowser.php | 66 ++++++++++++++++++++++ .../default/admin/overview/reportedcontent.php | 20 ------- .../default/admin/utilities/reportedcontent.php | 20 +++++++ 4 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 mod/logbrowser/views/default/admin/overview/logbrowser.php create mode 100644 mod/logbrowser/views/default/admin/utilities/logbrowser.php delete mode 100644 mod/reportedcontent/views/default/admin/overview/reportedcontent.php create mode 100644 mod/reportedcontent/views/default/admin/utilities/reportedcontent.php diff --git a/mod/logbrowser/views/default/admin/overview/logbrowser.php b/mod/logbrowser/views/default/admin/overview/logbrowser.php deleted file mode 100644 index 373e48a49..000000000 --- a/mod/logbrowser/views/default/admin/overview/logbrowser.php +++ /dev/null @@ -1,66 +0,0 @@ -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); - -$table = elgg_view('logbrowser/table', array('log_entries' => $log)); - -$nav = elgg_view('navigation/pagination',array( - 'offset' => $offset, - 'count' => $count, - 'limit' => $limit, -)); - -// display admin body -$body = <<<__HTML -$title -$form -
- $nav $table $nav -
-__HTML; - -echo $body; diff --git a/mod/logbrowser/views/default/admin/utilities/logbrowser.php b/mod/logbrowser/views/default/admin/utilities/logbrowser.php new file mode 100644 index 000000000..373e48a49 --- /dev/null +++ b/mod/logbrowser/views/default/admin/utilities/logbrowser.php @@ -0,0 +1,66 @@ +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); + +$table = elgg_view('logbrowser/table', array('log_entries' => $log)); + +$nav = elgg_view('navigation/pagination',array( + 'offset' => $offset, + 'count' => $count, + 'limit' => $limit, +)); + +// display admin body +$body = <<<__HTML +$title +$form +
+ $nav $table $nav +
+__HTML; + +echo $body; diff --git a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php deleted file mode 100644 index 3f79d500a..000000000 --- a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php +++ /dev/null @@ -1,20 +0,0 @@ - 'object', 'subtypes' => 'reported_content')); -if (!$list) { - $list = '

' . elgg_echo('reportedcontent:none') . '

'; -} - -$body = <<<__HTML -$title -$list -__HTML; - -echo $body; \ No newline at end of file diff --git a/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php new file mode 100644 index 000000000..3f79d500a --- /dev/null +++ b/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php @@ -0,0 +1,20 @@ + 'object', 'subtypes' => 'reported_content')); +if (!$list) { + $list = '

' . elgg_echo('reportedcontent:none') . '

'; +} + +$body = <<<__HTML +$title +$list +__HTML; + +echo $body; \ No newline at end of file -- cgit v1.2.3