Closes #335: Marcus Povey :

* Per user tools settings now present again (only displays if there are settings present AND the plugin is enabled - needs skinning accordingly)
* Re-jigged the settings code to behave like a proper page handler.
* Minor tweak to language

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

4 files changed, 42 insertions, 16 deletions

diff --git a/settings/index.php b/settings/index.php
index 041a06616..4aaf875bf 100644
--- a/settings/index.php
+++ b/settings/index.php
@@ -17,11 +17,11 @@
 			set_page_owner($_SESSION['guid']);

 			

 	// Make sure we don't open a security hole ...

-		if (!page_owner_entity()->canEdit()) {

+		if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {

 			set_page_owner($_SESSION['guid']);

 		}

 		

 	// Forward to the user settings
-		forward('pg/settings/user?username=' . page_owner_entity()->username);

+		forward('pg/settings/user/' . page_owner_entity()->username . "/");

 		
 ?>
\ No newline at end of file
diff --git a/settings/plugins.php b/settings/plugins.php
new file mode 100644
index 000000000..677d18d93
--- /dev/null
+++ b/settings/plugins.php
@@ -0,0 +1,26 @@
+<?php
+	/**
+	 * Elgg user settings functions.
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd 
+	 * @copyright Curverider Ltd 2008
+	 * @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
+		gatekeeper();
+		
+	// Make sure we don't open a security hole ...
+		if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+			set_page_owner($_SESSION['guid']);
+		}
+
+	// Display main admin menu
+		page_draw(elgg_echo("usersettings:plugins"),elgg_view_layout('two_column_left_sidebar','',elgg_view_title(elgg_echo("usersettings:plugins")) . elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins()))));
+?>
\ No newline at end of file
diff --git a/settings/statistics/index.php b/settings/statistics.php
index c1c91371d..ba2d5f0f4 100644
--- a/settings/statistics/index.php
+++ b/settings/statistics.php
@@ -11,14 +11,14 @@
 	 */
 
 	// Get the Elgg framework
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
 	// Make sure only valid admin users can see this
-		gatekeeper();

-		

-	// Make sure we don't open a security hole ...

-		if (!page_owner_entity()->canEdit()) {

-			set_page_owner($_SESSION['guid']);

+		gatekeeper();
+		
+	// Make sure we don't open a security hole ...
+		if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+			set_page_owner($_SESSION['guid']);
 		}
 
 	// Display main admin menu
diff --git a/settings/user/index.php b/settings/user.php
index 0e6727069..0711f4885 100644
--- a/settings/user/index.php
+++ b/settings/user.php
@@ -11,19 +11,19 @@
 	 */
 
 	// Get the Elgg framework
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+		require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 
 	// Make sure only valid admin users can see this
 		gatekeeper();
-		

-	// Make sure we don't open a security hole ...

-		if (!page_owner_entity()->canEdit()) {

-			set_page_owner($_SESSION['guid']);

+		
+	// Make sure we don't open a security hole ...
+		if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+			set_page_owner($_SESSION['guid']);
 		}
 
 	// Display main admin menu
-		page_draw(

-					elgg_echo("usersettings:user"),

-					elgg_view_layout("two_column_left_sidebar", '', elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form"))

+		page_draw(
+					elgg_echo("usersettings:user"),
+					elgg_view_layout("two_column_left_sidebar", '', elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form"))
 				  );
 ?>
\ No newline at end of file