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

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 4726a47fa477402a85246a9b5c91b0ccdc018c78..d5042e2bf271e13e12290205ddd76fe83306ef99 100644 (file)
--- 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 b4884104745754624e5dd111e83444ee39ba18f8..70a945ee451e645fce096949272b9a527fdbdaf2 100644 (file)
--- 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 6e4b9865868186efc7dba0709582ec5cfc0a7e5c..b5286336b8ec40f50b8077d3e39dc5044a740daa 100644 (file)
--- 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 d6cac3938cf5c746eb88fdbd5cdda6a26a47d490..ea4b48f9531a429e0700e99801a1d751e21d3560 100644 (file)
--- 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 45bcefc786a98f822b0eae661d1403657e90239d..6050a585fccb721a080a6e7dd4d12d7c86b857d9 100644 (file)
--- 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 70cc7273027a53a4470308251946795cdf2b45cf..d9fa8f36769a60ff588476a235d9c7f374f7a35b 100644 (file)
--- 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 83e7896156970bb6934a09c735057ccbb4f0fe8a..1a5d9e4a9d11d9b4d39183d9669a74409e8e88ac 100644 (file)
--- 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 3cd0aaecf4fe8d130710a1770903c64afce4a049..c22d27e8a876bb0a73a680a9e38f1ce491139549 100644 (file)
--- 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 e3fbac7e7426b1781256744fa6762943213630f4..580e7df05397308b4725c0bb8ff170578a4985ee 100644 (file)
--- 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 33d719adcad0c29053b4e4d927f2b35fa8bb6bd4..44559633109a22da64cc156a3006b90c0f51aabf 100644 (file)
--- 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 d168ab9cce1041afc9860329d6b481d72c5e0c0d..aead052dd1cf592ed1cb58d0a1c9d16a80e8a95c 100644 (file)
--- 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 208ffb5dbc5922490ae97d36308904ee8b021550..6e04c811435c5608581713ae0e00a6e8576bf545 100644 (file)
--- 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 43434265616e141a24dbb943b1cece6eb61a9147..67429f0335123e47018a016a5e4c9f5db0a9021d 100644 (file)
--- 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 3698f5887481509cda5548780d4114e7e43fea4e..934424b5752dbde1a76e4aea42712bcf24f449ff 100644 (file)
--- 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 6a15805ecc45d1fb60cf96061274da494ea053bf..e5541797b6fc5f4f4b5f9e95807314c26909c822 100644 (file)
--- 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 9969544da53a1b52270db9d3dd7af6ceb7ed1855..768291055e381586484c09b5c821efd63bf93ff4 100644 (file)
--- 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 b91a38dc4c8badcfa0bf95d6c597d716b3d81b0f..a9fbfb19cfd9713722a11a5ff7c7e0bef250ff31 100644 (file)
--- 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 86160bb00fddd25bac799de1b92603f7968eaaeb..3c6f5a647bc0c82d2180909fbf6e96155f047c5d 100644 (file)
--- 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 8abc3703b8b3bc0a35cff2a7f9d17b3a81447445..bbbb6a367d0d09935b1173b5f132ed5398706713 100644 (file)
--- 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 172e8ee049d739ee92faeee23c11d4fffe5641b2..d8db3bb1e603d8d6bd11327cf559f91aa0782c9c 100644 (file)
--- 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 b211f34f1d89a6fadd508f97d6091a3384b03421..c515d27ee37667644dcfceee8471234afdcecce4 100644 (file)
--- 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 88a02a4fc7dfd3298309a1a7b515cff9b4591821..400ce86aea2f11182256f8a759899e9611f6852f 100644 (file)
--- 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 ea0bc66e036ebf01f6cd81153cf48f70d3550252..71fc3cd63df1649326ae3bdf1daab424504426ae 100644 (file)
--- 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 3690860ef0f0c15bbf558f241b0e7bb7b9d6589a..87ba69cb02da5595eb5c23bf082abf666b98c453 100644 (file)
--- 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 60861acb82ab6a557c98517df09ecc9fbe138fea..7e9c91dcdef460f4bf804df0a59b70085b796232 100644 (file)
--- 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
+}