Standardized admin/*

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

diff --git a/admin/index.php b/admin/index.php
index 98466cb207cd5fcb2b5042ee8fbb9712df8664eb..4ee1902135f843467e4872bdcd6f307bfb1ffd59 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,21 +1,16 @@
 <?php
+/**
+ * Elgg administration system index
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg administration system index
-        * 
-        * @package Elgg
-        * @subpackage Core
+// Get the Elgg framework
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        */
-
-       // Get the Elgg framework
-               require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-       // Make sure only valid admin users can see this
-               admin_gatekeeper();
-               forward('pg/admin/statistics/')
-               
-?>
\ No newline at end of file
+// Make sure only valid admin users can see this
+admin_gatekeeper();
+forward('pg/admin/statistics/');
\ No newline at end of file

diff --git a/admin/plugins.php b/admin/plugins.php
index 9900c98e9c845f8be0f40860f32f472d631a7a9c..7c452ad2d1541169bdb121d8968d6300e2e8777d 100644 (file)
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -1,28 +1,31 @@
 <?php
+/**
+ * Elgg administration plugin system index
+ * This is a special page that permits the configuration of plugins in a standard way.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg administration plugin system index
-        * This is a special page that permits the configuration of plugins in a standard way.
-        * 
-        * @package Elgg
-        * @subpackage Core
-        * @author Curverider Ltd
-        * @link http://elgg.org/
-        */
+// Get the Elgg framework
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
-       // Get the Elgg framework
-               require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+// Make sure only valid admin users can see this
+admin_gatekeeper();
 
-       // Make sure only valid admin users can see this
-               admin_gatekeeper();
-               
-    // Set admin user for user block
-               //set_page_owner($_SESSION['guid']);
-               
-       // Regenerate plugin list
-               regenerate_plugin_list();
-               
-       // Display main admin menu
-               page_draw(elgg_echo("admin:plugins"),elgg_view_layout("two_column_left_sidebar", '', elgg_view_title(elgg_echo('admin:plugins')) . elgg_view("admin/plugins", array('installed_plugins' => get_installed_plugins()))));
-               
-?>
\ No newline at end of file
+// Set admin user for user block
+//set_page_owner($_SESSION['guid']);
+
+// Regenerate plugin list
+regenerate_plugin_list();
+
+// Display main admin menu
+$vars = array('installed_plugins' => get_installed_plugins());
+
+$title = elgg_view_title(elgg_echo('admin:plugins'));
+$main_box = elgg_view("admin/plugins", $vars);
+$content = elgg_view_layout("two_column_left_sidebar", '', $title . $main_box);
+
+page_draw(elgg_echo('admin:plugins'), $content);
\ No newline at end of file

diff --git a/admin/site.php b/admin/site.php
index c66dc290a28127fe1f8c6720060e9eef8c506d0c..5e0f2a6a021272c7b4d3060e052e631eac9e6a63 100644 (file)
--- a/admin/site.php
+++ b/admin/site.php
@@ -1,26 +1,23 @@
 <?php
+/**
+ * Elgg administration site system index
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg administration site system index
-        * 
-        * @package Elgg
-        * @subpackage Core
+// Get the Elgg framework
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
-        * @author Curverider Ltd
+// Make sure only valid admin users can see this
+admin_gatekeeper();
 
-        * @link http://elgg.org/
-        */
+// Display main admin menu
 
-       // Get the Elgg framework
-               require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+$title = elgg_view_title(elgg_echo('admin:site'));
+$main_box = elgg_view("admin/site");
+$content = elgg_view_layout("two_column_left_sidebar", '', $title . $main_box);
 
-       // Make sure only valid admin users can see this
-               admin_gatekeeper();
-               
-    // Set admin user for user block
-               //set_page_owner($_SESSION['guid']);
-               
-       // Display main admin menu
-               page_draw(elgg_echo("admin:site"),elgg_view_layout("two_column_left_sidebar",'', elgg_view_title(elgg_echo('admin:site')) . elgg_view("admin/site")));
-               
-?>
\ No newline at end of file
+page_draw(elgg_echo("admin:site"), $content);
\ No newline at end of file

diff --git a/admin/statistics.php b/admin/statistics.php
index 19c6a273119ebe083eee68adf69cb1cd941c6098..b71f64ef747238e6144aa6ecdb88d9b27984fc22 100644 (file)
--- a/admin/statistics.php
+++ b/admin/statistics.php
@@ -1,25 +1,23 @@
 <?php
+/**
+ * Elgg administration statistics index
+ * This is a special page that displays a number of statistics
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg administration statistics index
-        * This is a special page that displays a number of statistics
-        * 
-        * @package Elgg
-        * @subpackage Core
-        * @author Curverider Ltd
-        * @link http://elgg.org/
-        */
+// Get the Elgg framework
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
-       // Get the Elgg framework
-               require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+// Make sure only valid admin users can see this
+admin_gatekeeper();
 
-       // Make sure only valid admin users can see this
-               admin_gatekeeper();
-       
-       // Set admin user for user block
-               //set_page_owner($_SESSION['guid']);
+// Display main admin menu
+$title = elgg_view_title(elgg_echo('admin:statistics'));
+$main_box = elgg_view("admin/statistics");
+$content = elgg_view_layout("two_column_left_sidebar", '', $title . $main_box);
 
-       // Display main admin menu
-               page_draw(elgg_echo("admin:statistics"),elgg_view_layout("two_column_left_sidebar",'',elgg_view_title(elgg_echo('admin:statistics')) . elgg_view("admin/statistics")));
-               
-?>
+page_draw(elgg_echo("admin:statistics"), $content);
\ No newline at end of file

diff --git a/admin/user.php b/admin/user.php
index a95bb69ce53b61cba7fc7c0e28fa785585eb3605..47c3786de94cee44026b20d66ea9b9a6025b393b 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -1,45 +1,38 @@
 <?php
+/**
+ * Elgg administration user system index
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg administration user system index
-        * 
-        * @package Elgg
-        * @subpackage Core
-
-        * @author Curverider Ltd
-
-        * @link http://elgg.org/
-        */
-
-       // Get the Elgg framework
-               require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-       // Make sure only valid admin users can see this
-               admin_gatekeeper();
-               
-       // Set admin user for user block
-               //set_page_owner($_SESSION['guid']);
-
-       // Are we performing a search
-               $search = get_input('s');
-               $limit = get_input('limit', 10);
-               $offset = get_input('offset', 0);
-               
-               $context = get_context();
-               
-               $title = elgg_view_title(elgg_echo('admin:user'));
-               
-               set_context('search');
-
-               $result = list_entities('user', '', 0, $limit, false);
-               
-               set_context('admin');
-                       
-       // Display main admin menu
-               page_draw(elgg_echo("admin:user"),
-                                               elgg_view_layout("two_column_left_sidebar", 
-                                                                               '', 
-                                                                               $title . elgg_view("admin/user") . $result)
-                                                                               );
-
-?>
+// Get the Elgg framework
+require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+
+// Make sure only valid admin users can see this
+admin_gatekeeper();
+
+// Are we performing a search
+$search = get_input('s');
+$limit = get_input('limit', 10);
+$offset = get_input('offset', 0);
+
+$context = get_context();
+
+$title = elgg_view_title(elgg_echo('admin:user'));
+
+set_context('search');
+
+$result = list_entities('user', '', 0, $limit, false);
+
+set_context('admin');
+
+// Display main admin menu
+page_draw(elgg_echo("admin:user"),
+       elgg_view_layout("two_column_left_sidebar",
+               '',
+               $title . elgg_view("admin/user") . $result
+       )
+);