Refs #1538: Removed action_gatekeeper() from action files in core.

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

25 files changed, 7 insertions, 47 deletions

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 4726a47fa..d5042e2bf 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -11,9 +11,6 @@
 // block non-admin users
 admin_gatekeeper();
 
-// Validate the action
-action_gatekeeper();
-
 // Get the plugin
 $plugin = get_input('plugin');
 if (!is_array($plugin)) {
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index b48841047..70a945ee4 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -11,9 +11,6 @@
 // block non-admin users
 admin_gatekeeper();
 
-// Validate the action
-action_gatekeeper();
-
 $plugins = get_installed_plugins();
 
 foreach ($plugins as $p => $data) {
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index 6e4b98658..b5286336b 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -11,9 +11,6 @@
 // block non-admin users
 admin_gatekeeper();
 
-// Validate the action
-action_gatekeeper();
-
 // Get the plugin
 $plugin = get_input('plugin');
 if (!is_array($plugin)) {
diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php
index d6cac3938..ea4b48f95 100644
--- a/actions/admin/plugins/enableall.php
+++ b/actions/admin/plugins/enableall.php
@@ -11,9 +11,6 @@
 // block non-admin users
 admin_gatekeeper();
 
-// Validate the action
-action_gatekeeper();
-
 $plugins = get_installed_plugins();
 
 foreach ($plugins as $p => $data) {
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index 45bcefc78..6050a585f 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -11,9 +11,6 @@
 // block non-admin users
 admin_gatekeeper();
 
-// Validate the action
-action_gatekeeper();
-
 // Get the plugin
 $mod = get_input('plugin');
 $mod = str_replace('.','',$mod);
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 70cc72730..d9fa8f367 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -15,7 +15,6 @@ global $CONFIG;
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 if (get_input('settings') == 'go') {
 	if (datalist_get('default_site')) {
@@ -91,4 +90,4 @@ if (get_input('settings') == 'go') {
 		forward($_SERVER['HTTP_REFERER']);
 		exit;
 	}
-}
\ No newline at end of file
+}
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
index 83e789615..1a5d9e4a9 100644
--- a/actions/admin/user/ban.php
+++ b/actions/admin/user/ban.php
@@ -11,7 +11,6 @@
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index 3cd0aaecf..c22d27e8a 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -11,7 +11,6 @@
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
index e3fbac7e7..580e7df05 100644
--- a/actions/admin/user/makeadmin.php
+++ b/actions/admin/user/makeadmin.php
@@ -12,7 +12,6 @@ global $CONFIG;
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
index 33d719adc..445596331 100644
--- a/actions/admin/user/removeadmin.php
+++ b/actions/admin/user/removeadmin.php
@@ -12,7 +12,6 @@ global $CONFIG;
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index d168ab9cc..aead052dd 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -12,7 +12,6 @@ global $CONFIG;
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 // Get the user
 $guid = get_input('guid');
diff --git a/actions/admin/user/unban.php b/actions/admin/user/unban.php
index 208ffb5db..6e04c8114 100644
--- a/actions/admin/user/unban.php
+++ b/actions/admin/user/unban.php
@@ -11,7 +11,6 @@
 
 // block non-admin users
 admin_gatekeeper();
-action_gatekeeper();
 
 $access_status = access_get_show_hidden_status();
 access_show_hidden_entities(true);
diff --git a/actions/comments/add.php b/actions/comments/add.php
index 434342656..67429f033 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -9,7 +9,6 @@
 
 // Make sure we're logged in; forward to the front page if not
 gatekeeper();
-action_gatekeeper();
 
 // Get input
 $entity_guid = (int) get_input('entity_guid');
@@ -66,4 +65,4 @@ system_message(elgg_echo("generic_comment:posted"));
 add_to_river('annotation/annotate','comment',$user->guid,$entity->guid, "", 0, $annotation);
 
 // Forward to the entity page
-forward($entity->getURL());
\ No newline at end of file
+forward($entity->getURL());
diff --git a/actions/friends/add.php b/actions/friends/add.php
index 3698f5887..934424b57 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -10,7 +10,6 @@
 
 // Ensure we are logged in
 gatekeeper();
-action_gatekeeper();
 
 // Get the GUID of the user to friend
 $friend_guid = get_input('friend');
diff --git a/actions/friends/addcollection.php b/actions/friends/addcollection.php
index 6a15805ec..e5541797b 100644
--- a/actions/friends/addcollection.php
+++ b/actions/friends/addcollection.php
@@ -13,7 +13,6 @@
 
 //must be logged in
 gatekeeper();
-action_gatekeeper();
 
 $collection_name = get_input('collection_name');
 $friends = get_input('friends_collection');
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 9969544da..768291055 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -10,7 +10,6 @@
 
 // Ensure we are logged in
 gatekeeper();
-action_gatekeeper();
 
 // Get the GUID of the user to friend
 $friend_guid = get_input('friend');
diff --git a/actions/import/opendd.php b/actions/import/opendd.php
index b91a38dc4..a9fbfb19c 100644
--- a/actions/import/opendd.php
+++ b/actions/import/opendd.php
@@ -13,7 +13,6 @@
 
 // Safety
 admin_gatekeeper();
-action_gatekeeper();
 
 // Get input
 $data = get_input('data', '', false);
@@ -27,4 +26,4 @@ if ($return) {
 	register_error(elgg_echo('importfail'));
 }
 
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/login.php b/actions/login.php
index 86160bb00..3c6f5a647 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -8,9 +8,6 @@
  * @link http://elgg.org/
  */
 
-// Safety first
-action_gatekeeper();
-
 // Get username and password
 $username = get_input('username');
 $password = get_input("password");
@@ -65,4 +62,4 @@ if ($result) {
 	} else {
 		register_error(elgg_echo('loginerror'));
 	}
-}
\ No newline at end of file
+}
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index 8abc3703b..bbbb6a367 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -12,7 +12,6 @@ $params = get_input('params');
 $plugin = get_input('plugin');
 
 gatekeeper();
-action_gatekeeper();
 
 $result = false;
 
@@ -29,4 +28,4 @@ foreach ($params as $k => $v) {
 }
 
 system_message(sprintf(elgg_echo('plugins:settings:save:ok'), $plugin));
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index 172e8ee04..d8db3bb1e 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -12,7 +12,6 @@ $params = get_input('params');
 $plugin = get_input('plugin');
 
 gatekeeper();
-action_gatekeeper();
 
 $result = false;
 
@@ -29,4 +28,4 @@ foreach ($params as $k => $v) {
 }
 
 system_message(sprintf(elgg_echo('plugins:usersettings:save:ok'), $plugin));
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/register.php b/actions/register.php
index b211f34f1..c515d27ee 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -10,8 +10,6 @@
 
 global $CONFIG;
 
-action_gatekeeper();
-
 // Get variables
 $username = get_input('username');
 $password = get_input('password');
diff --git a/actions/user/requestnewpassword.php b/actions/user/requestnewpassword.php
index 88a02a4fc..400ce86ae 100644
--- a/actions/user/requestnewpassword.php
+++ b/actions/user/requestnewpassword.php
@@ -10,8 +10,6 @@
 
 global $CONFIG;
 
-action_gatekeeper();
-
 $username = get_input('username');
 
 $access_status = access_get_show_hidden_status();
diff --git a/actions/useradd.php b/actions/useradd.php
index ea0bc66e0..71fc3cd63 100644
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -9,7 +9,6 @@
  */
 
 admin_gatekeeper(); // Only admins can add a user
-action_gatekeeper();
 
 // Get variables
 global $CONFIG;
diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
index 3690860ef..87ba69cb0 100644
--- a/actions/usersettings/save.php
+++ b/actions/usersettings/save.php
@@ -10,7 +10,6 @@
 global $CONFIG;
 
 gatekeeper();
-action_gatekeeper();
 
 trigger_plugin_hook('usersettings:save','user');
 
diff --git a/actions/widgets/save.php b/actions/widgets/save.php
index 60861acb8..7e9c91dcd 100644
--- a/actions/widgets/save.php
+++ b/actions/widgets/save.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-action_gatekeeper();
-
 $guid = get_input('guid');
 $params = $_REQUEST['params'];
 $pageurl = get_input('pageurl');
@@ -29,4 +27,4 @@ if ($result) {
 
 if (!$noforward) {
 	forward($_SERVER['HTTP_REFERER']);
-}
\ No newline at end of file
+}