5 files changed, 185 insertions, 191 deletions

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 90825bc2f..810eb1c94 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -1,38 +1,38 @@
 <?php
-	/**
-	 * Disable plugin action.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Disable plugin action.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-	
-	// block non-admin users
-	admin_gatekeeper();
-	
-	// Validate the action
-	action_gatekeeper();
-	
-	// Get the plugin 
-	$plugin = get_input('plugin');
-	if (!is_array($plugin))
-		$plugin = array($plugin);
-	
-	foreach ($plugin as $p)
-	{
-		// Disable
-		if (disable_plugin($p))
-			system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
-		else
-			register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
-	}		
-	
-	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();
-		
-	forward($_SERVER['HTTP_REFERER']);
-	exit;
-?>
\ No newline at end of file
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+// block non-admin users
+admin_gatekeeper();
+
+// Validate the action
+action_gatekeeper();
+
+// Get the plugin
+$plugin = get_input('plugin');
+if (!is_array($plugin)) {
+	$plugin = array($plugin);
+}
+
+foreach ($plugin as $p) {
+	// Disable
+	if (disable_plugin($p)) {
+		system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
+	} else {
+		register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
+	}
+}
+
+elgg_view_regenerate_simplecache();
+elgg_filepath_cache_reset();
+
+forward($_SERVER['HTTP_REFERER']);
+exit;
\ No newline at end of file
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index 672915bce..b06961450 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -1,35 +1,34 @@
 <?php
-	/**
-	 * Disable plugin action.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Disable plugin action.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-	
-	// block non-admin users
-	admin_gatekeeper();
-	
-	// Validate the action
-	action_gatekeeper();
-	
-	$plugins = get_installed_plugins();
-		
-	foreach ($plugins as $p => $data)
-	{
-		// Disable
-		if (disable_plugin($p))
-			system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
-		else
-			register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
-	}		
-	
-	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();
-		
-	forward($_SERVER['HTTP_REFERER']);
-	exit;
-?>
\ No newline at end of file
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+// block non-admin users
+admin_gatekeeper();
+
+// Validate the action
+action_gatekeeper();
+
+$plugins = get_installed_plugins();
+
+foreach ($plugins as $p => $data) {
+	// Disable
+	if (disable_plugin($p)) {
+		system_message(sprintf(elgg_echo('admin:plugins:disable:yes'), $p));
+	} else {
+		register_error(sprintf(elgg_echo('admin:plugins:disable:no'), $p));
+	}
+}
+
+elgg_view_regenerate_simplecache();
+elgg_filepath_cache_reset();
+
+forward($_SERVER['HTTP_REFERER']);
+exit;
\ No newline at end of file
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index 890e6648e..0a6631b65 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -1,38 +1,38 @@
 <?php
-	/**
-	 * Enable plugin action.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Enable plugin action.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-	
-	// block non-admin users
-	admin_gatekeeper();
-	
-	// Validate the action
-	action_gatekeeper();
-	
-	// Get the plugin 
-	$plugin = get_input('plugin');
-	if (!is_array($plugin))
-		$plugin = array($plugin);
-	
-	foreach ($plugin as $p)
-	{
-		// Disable
-		if (enable_plugin($p))
-			system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
-		else
-			register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));		
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+// block non-admin users
+admin_gatekeeper();
+
+// Validate the action
+action_gatekeeper();
+
+// Get the plugin
+$plugin = get_input('plugin');
+if (!is_array($plugin)) {
+	$plugin = array($plugin);
+}
+
+foreach ($plugin as $p) {
+	// Disable
+	if (enable_plugin($p)) {
+		system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
+	} else {
+		register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));
 	}
-		
-	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();
-	
-	forward($_SERVER['HTTP_REFERER']);
-	exit;
-?>
\ No newline at end of file
+}
+
+elgg_view_regenerate_simplecache();
+elgg_filepath_cache_reset();
+
+forward($_SERVER['HTTP_REFERER']);
+exit;
\ No newline at end of file
diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php
index 596955884..92a44b7a7 100644
--- a/actions/admin/plugins/enableall.php
+++ b/actions/admin/plugins/enableall.php
@@ -1,37 +1,35 @@
 <?php
-	/**
-	 * Enable plugin action.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Enable plugin action.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-		
-	// block non-admin users
-	admin_gatekeeper();
-	
-	// Validate the action
-	action_gatekeeper();
-	
-	$plugins = get_installed_plugins();
-		
-	foreach ($plugins as $p => $data)
-	{
-		// Enable
-		if (enable_plugin($p))
-			system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
-		else
-			register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));	
-	}		
-	
-	// Regen view cache
-	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();
-		
-	forward($_SERVER['HTTP_REFERER']);
-	exit;
-	
-?>
\ No newline at end of file
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+// block non-admin users
+admin_gatekeeper();
+
+// Validate the action
+action_gatekeeper();
+
+$plugins = get_installed_plugins();
+
+foreach ($plugins as $p => $data) {
+	// Enable
+	if (enable_plugin($p)) {
+		system_message(sprintf(elgg_echo('admin:plugins:enable:yes'), $p));
+	} else {
+		register_error(sprintf(elgg_echo('admin:plugins:enable:no'), $p));
+	}
+}
+
+// Regen view cache
+elgg_view_regenerate_simplecache();
+elgg_filepath_cache_reset();
+
+forward($_SERVER['HTTP_REFERER']);
+exit;
\ No newline at end of file
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index 36ba1f66d..67cb6f02b 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -1,54 +1,51 @@
 <?php
-	/**
-	 * Reorder plugin action.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-	require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-	
-	// block non-admin users
-	admin_gatekeeper();
-	
-	// Validate the action
-	action_gatekeeper();
-	
-	// Get the plugin 
-	$mod = get_input('plugin');
-	$mod = str_replace('.','',$mod);
-	$mod = str_replace('/','',$mod);
-	
-	// Get the new order
-	$order = (int) get_input('order');
-	
-	// Get the current plugin list
-	$plugins = get_plugin_list();
-
-	// Inject the plugin order back into the list
-	if ($key = array_search($mod, $plugins)) {
-		
-		unset($plugins[$key]);
-		while (isset($plugins[$order])) {
-			$order++;
-		}
-		
-		$plugins[$order] = $mod;
+/**
+ * Reorder plugin action.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
+
+// block non-admin users
+admin_gatekeeper();
+
+// Validate the action
+action_gatekeeper();
+
+// Get the plugin
+$mod = get_input('plugin');
+$mod = str_replace('.','',$mod);
+$mod = str_replace('/','',$mod);
+
+// Get the new order
+$order = (int) get_input('order');
+
+// Get the current plugin list
+$plugins = get_plugin_list();
+
+// Inject the plugin order back into the list
+if ($key = array_search($mod, $plugins)) {
+
+	unset($plugins[$key]);
+	while (isset($plugins[$order])) {
+		$order++;
 	}
-	
-	// Disable
-	if (regenerate_plugin_list($plugins))
-		system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));
-	else
-		register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));		
-		
-	elgg_view_regenerate_simplecache();
-	elgg_filepath_cache_reset();
-		
-	forward($_SERVER['HTTP_REFERER']);
-
-?>
\ No newline at end of file
+
+	$plugins[$order] = $mod;
+}
+
+// Disable
+if (regenerate_plugin_list($plugins)) {
+	system_message(sprintf(elgg_echo('admin:plugins:reorder:yes'), $plugin));
+} else {
+	register_error(sprintf(elgg_echo('admin:plugins:reorder:no'), $plugin));
+}
+
+elgg_view_regenerate_simplecache();
+elgg_filepath_cache_reset();
+
+forward($_SERVER['HTTP_REFERER']);