Updating administration plugins with admin submenu views.

git-svn-id: http://code.elgg.org/elgg/trunk@6220 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 92 insertions, 112 deletions

diff --git a/mod/logbrowser/index.php b/mod/logbrowser/index.php
deleted file mode 100644
index c72e9fc23..000000000
--- a/mod/logbrowser/index.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-	/**
-	 * Elgg log browser.
-	 * 
-	 * @package ElggLogBrowser
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.com/
-	 */
-
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	admin_gatekeeper();
-	set_context('admin');
-	
-	$limit = get_input('limit', 40);
-	$offset = get_input('offset');
-	
-	$search_username = get_input('search_username');
-	if ($search_username) {
-		if ($user = get_user_by_username($search_username)) {
-			$user = $user->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'));
-	
-	// Get log entries
-	$log = get_system_log($user, "", "", "","", $limit, $offset, false, $timeupper, $timelower);
-	$count = get_system_log($user, "", "", "","", $limit, $offset, true, $timeupper, $timelower);
-	$log_entries = array();
-	
-	foreach ($log as $l)
-	{
-		$tmp = new ElggObject();
-		$tmp->subtype = 'logwrapper';
-		$tmp->entry = $l;
-		$log_entries[] = $tmp;
-	}
-	
-	$form = elgg_view('logbrowser/form',array('user_guid' => $user, 'timeupper' => $timeupper, 'timelower' => $timelower));
-	
-	set_context('search');
-	$result = elgg_view_entity_list($log_entries, $count, $offset, $limit, false, false);
-	$result = "<div class='admin_settings log_browser radius8 clearfloat'>".$result."</div>";
-	set_context('admin');
-		
-// Display main admin menu
-	page_draw(elgg_echo('logbrowser'),elgg_view_layout('administration', $title . $form . $result));
-
-?>
diff --git a/mod/logbrowser/start.php b/mod/logbrowser/start.php
index c8c830f00..378bab8f7 100644
--- a/mod/logbrowser/start.php
+++ b/mod/logbrowser/start.php
@@ -11,13 +11,9 @@
  * Initialise the log browser and set up the menus.
  *
  */
-function logbrowser_init()
-{
+function logbrowser_init() {
 	global $CONFIG;
 	
-	// Register a page handler, so we can have nice URLs
-	register_page_handler('logbrowser','logbrowser_page_handler');
-	
 	// Extend CSS
 	elgg_extend_view('css','logbrowser/css');
 	
@@ -26,26 +22,8 @@ function logbrowser_init()
 		elgg_extend_view('profile/menu/adminlinks','logbrowser/adminlinks',10000);
 	}
 	
-	elgg_add_submenu_item(array(
-		'text' => elgg_echo('logbrowser'),
-		'href' => "{$CONFIG->wwwroot}pg/logbrowser",
-		'parent_id' => 'overview',
-	), 'admin', 'default');
+	elgg_add_admin_submenu_item('logbrowser', elgg_echo('logbrowser'), 'overview');
 }
 
-/**
- * Log browser page handler
- *
- * @param array $page Array of page elements, forwarded by the page handling mechanism
- */
-function logbrowser_page_handler($page) 
-{
-	global $CONFIG;
-	
-	// only interested in one page for now
-	include($CONFIG->pluginspath . "logbrowser/index.php"); 
-}
-
-
 // Initialise log browser
 register_elgg_event_handler('init','system','logbrowser_init');
diff --git a/mod/logbrowser/views/default/admin/overview/logbrowser.php b/mod/logbrowser/views/default/admin/overview/logbrowser.php
new file mode 100644
index 000000000..d82b1e00b
--- /dev/null
+++ b/mod/logbrowser/views/default/admin/overview/logbrowser.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Elgg log browser.
+ * 
+ * @package ElggLogBrowser
+ * @author Curverider Ltd
+ * @link http://elgg.com/
+ */
+
+$limit = get_input('limit', 40);
+$offset = get_input('offset');
+
+$search_username = get_input('search_username');
+if ($search_username) {
+	if ($user = get_user_by_username($search_username)) {
+		$user = $user->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);
+$log_entries = array();
+
+foreach ($log as $l) {
+	$tmp = new ElggObject();
+	$tmp->subtype = 'logwrapper';
+	$tmp->entry = $l;
+	$log_entries[] = $tmp;
+}
+
+$list = elgg_view_entity_list($log_entries, $count, $offset, $limit, false, false);
+
+// display admin body
+$body = <<<__HTML
+$title
+$form
+<div class="admin_settings log_browser radius8 clearfloat">
+	$list
+</div>
+__HTML;
+
+echo $body;
diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
index d79e71d86..7c993e6a2 100644
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ b/mod/logbrowser/views/default/logbrowser/form.php
@@ -22,34 +22,32 @@
 		}
 		
 
-		$form = "";
-		
-		$form .= "<p>" . elgg_echo('logbrowser:user');
-		$form .= elgg_view('input/text',array(
-														'internalname' => 'search_username',
-														'value' => $userval 
-													)) . "</p>";
+		$form = "<p>" . elgg_echo('logbrowser:user');
+		$form .= elgg_view('input/text', array(
+			'internalname' => 'search_username',
+			'value' => $userval,
+		)) . "</p>";
 		
 		$form .= "<p>" . elgg_echo('logbrowser:starttime');
-		$form .= elgg_view('input/text',array(
-														'internalname' => 'timelower',
-														'value' => $lowerval 
-													)) . "</p>";
+		$form .= elgg_view('input/text', array(
+			'internalname' => 'timelower',
+			'value' => $lowerval,
+		)) . "</p>";
 
 		$form .= "<p>" . elgg_echo('logbrowser:endtime');
-		$form .= elgg_view('input/text',array(
-														'internalname' => 'timeupper',
-														'value' => $upperval
-													))  . "</p>";
-		$form .= elgg_view('input/submit',array(
-														'value' => elgg_echo('search')
-													));
-													
-		$wrappedform = elgg_view('input/form',array(
-														'body' => $form,
-														'method' => 'get',
-														'action' => $vars['url'] . "mod/logbrowser/"
-										));										
+		$form .= elgg_view('input/text', array(
+			'internalname' => 'timeupper',
+			'value' => $upperval,
+		))  . "</p>";
+		$form .= elgg_view('input/submit', array(
+			'value' => elgg_echo('search'),
+		));
+		
+		$wrappedform = elgg_view('input/form', array(
+			'body' => $form,
+			'method' => 'get',
+			'action' => "{$vars['url']}pg/admin/logbrowser",
+		));
 ?>
 
 	<div id="log_browser_search_form" class="hidden radius8"><?php echo $wrappedform; ?></div>