Refs #2451: Removed gatekeeper/admin_gatekeeper() calls from core actions

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

34 files changed, 2 insertions, 76 deletions

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 9db5aec11..64994423f 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -11,8 +11,6 @@
  * @subpackage Administration.Site
  */
 
-admin_gatekeeper();
-
 $plugin = get_input('plugin');
 if (!is_array($plugin)) {
 	$plugin = array($plugin);
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index 21938727e..351ebf840 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -9,8 +9,6 @@
  * @subpackage Administration.Site
  */
 
-admin_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 d3ad5606d..ebabe7bc8 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -11,8 +11,6 @@
  * @subpackage Administration.Site
  */
 
-admin_gatekeeper();
-
 $plugin = get_input('plugin');
 
 if (!is_array($plugin)) {
diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php
index 9a2df00dc..04574f067 100644
--- a/actions/admin/plugins/enableall.php
+++ b/actions/admin/plugins/enableall.php
@@ -9,8 +9,6 @@
  * @subpackage Administration.Site
  */
 
-admin_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 2158653e1..29c4a7268 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -14,8 +14,6 @@
  * @subpackage Administration.Site
  */
 
-admin_gatekeeper();
-
 $mod = get_input('plugin');
 $mod = str_replace('.', '', $mod);
 $mod = str_replace('/', '', $mod);
diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
index 127fd38b6..523c64e3e 100644
--- a/actions/admin/site/update_advanced.php
+++ b/actions/admin/site/update_advanced.php
@@ -9,8 +9,6 @@
  * @subpackage Administration.Site
  */
 
-admin_gatekeeper();
-
 if (datalist_get('default_site')) {
 	$site = get_entity(datalist_get('default_site'));
 	if (!($site instanceof ElggSite)) {
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 94882cfd3..c809dc671 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -10,8 +10,6 @@
  * @subpackage Administration.Site
  */
 
-admin_gatekeeper();
-
 if (datalist_get('default_site')) {
 	$site = get_entity(datalist_get('default_site'));
 	if (!($site instanceof ElggSite)) {
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
index 5ad6c29c5..a8fa57925 100644
--- a/actions/admin/user/ban.php
+++ b/actions/admin/user/ban.php
@@ -9,8 +9,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index a5e1886ec..c6ed5b819 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -9,10 +9,6 @@
  * @subpackage Administration.User
  */
 
-// block non-admin users - require since this action is not registered
-// @todo why isn't this action registered?
-admin_gatekeeper();
-
 // Get the user
 $guid = get_input('guid');
 $user = get_entity($guid);
diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
index 19f365d62..54b0b7070 100644
--- a/actions/admin/user/makeadmin.php
+++ b/actions/admin/user/makeadmin.php
@@ -11,8 +11,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
index 97bfc396b..4466e925f 100644
--- a/actions/admin/user/removeadmin.php
+++ b/actions/admin/user/removeadmin.php
@@ -6,8 +6,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index 14de69cb6..e3f737974 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -14,8 +14,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
diff --git a/actions/admin/user/unban.php b/actions/admin/user/unban.php
index 883e074ed..7a772a0d3 100644
--- a/actions/admin/user/unban.php
+++ b/actions/admin/user/unban.php
@@ -6,8 +6,6 @@
  * @subpackage Administration.User
  */
 
-admin_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 11418a2e2..fde0a6f55 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -6,14 +6,9 @@
  * @subpackage Comments
  */
 
-// Make sure we're logged in; forward to the front page if not
-gatekeeper();
-
-// Get input
 $entity_guid = (int) get_input('entity_guid');
 $comment_text = get_input('generic_comment');
 
-// make sure comment is not empty
 if (empty($comment_text)) {
 	register_error(elgg_echo("generic_comment:blank"));
 	forward(REFERER);
diff --git a/actions/email/save.php b/actions/email/save.php
index 0dee6ee1e..13bc14d65 100644
--- a/actions/email/save.php
+++ b/actions/email/save.php
@@ -6,8 +6,6 @@
  * @subpackage Administration.Users
  */
 
-gatekeeper();
-
 $email = get_input('email');
 $user_id = get_input('guid');
 
diff --git a/actions/entities/delete.php b/actions/entities/delete.php
index 823e85c59..251e1f01c 100644
--- a/actions/entities/delete.php
+++ b/actions/entities/delete.php
@@ -6,8 +6,6 @@
  * @subpackage Core
  */
 
-gatekeeper();
-
 $guid = get_input('guid');
 $entity = get_entity($guid);
 
diff --git a/actions/friends/add.php b/actions/friends/add.php
index d0a0d3d7c..e6fa5b62e 100644
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -6,9 +6,6 @@
  * @subpackage Friends.Management
  */
 
-// Ensure we are logged in
-gatekeeper();
-
 // Get the GUID of the user to friend
 $friend_guid = get_input('friend');
 $friend = get_entity($friend_guid);
diff --git a/actions/friends/addcollection.php b/actions/friends/addcollection.php
index 8fdb2be87..92c78a2c1 100644
--- a/actions/friends/addcollection.php
+++ b/actions/friends/addcollection.php
@@ -6,9 +6,6 @@
  * @subpackage Friends.Collections
  */
 
-//must be logged in
-gatekeeper();
-
 $collection_name = get_input('collection_name');
 $friends = get_input('friends_collection');
 
diff --git a/actions/friends/deletecollection.php b/actions/friends/deletecollection.php
index b57802ce7..1c3d878a1 100644
--- a/actions/friends/deletecollection.php
+++ b/actions/friends/deletecollection.php
@@ -6,10 +6,6 @@
  * @subpackage Friends.Collections
  */
 
-// Make sure we're logged in (send us to the front page if not)
-gatekeeper();
-
-// Get input data
 $collection_id = (int) get_input('collection');
 
 // Check to see that the access collection exist and grab its owner
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 1230b12af..0a43c95bc 100644
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -6,9 +6,6 @@
  * @subpackage Friends.Management
  */
 
-// Ensure we are logged in
-gatekeeper();
-
 // Get the GUID of the user to friend
 $friend_guid = get_input('friend');
 $friend = get_entity($friend_guid);
diff --git a/actions/import/opendd.php b/actions/import/opendd.php
index 0bf748734..e63607145 100644
--- a/actions/import/opendd.php
+++ b/actions/import/opendd.php
@@ -9,13 +9,8 @@
  * @subpackage Core
  */
 
-// Safety
-admin_gatekeeper();
-
-// Get input
 $data = get_input('data', '', false);
 
-// Import
 $return = import($data);
 
 if ($return) {
diff --git a/actions/likes/add.php b/actions/likes/add.php
index b8c2f18b8..3de1ebc51 100644
--- a/actions/likes/add.php
+++ b/actions/likes/add.php
@@ -6,7 +6,6 @@
  * @subpackage Likes
  */
 
-gatekeeper();
 $entity_guid = (int) get_input('guid');
 
 //check to see if the user has already liked the item
diff --git a/actions/notifications/settings/usersettings/save.php b/actions/notifications/settings/usersettings/save.php
index da855c6b5..eaa01c3ad 100644
--- a/actions/notifications/settings/usersettings/save.php
+++ b/actions/notifications/settings/usersettings/save.php
@@ -6,9 +6,7 @@
  * @subpackage Core
  */
 
-// Method
 $method = get_input('method');
-gatekeeper();
 
 $current_settings = get_user_notification_settings();
 
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index 2edf58e5b..3fa45e0c1 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -15,8 +15,6 @@ if (!$plugin_info = load_plugin_manifest($plugin)) {
 
 $plugin_name = $plugin_info['name'];
 
-admin_gatekeeper();
-
 $result = false;
 
 $options = array(
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index 705871fac..ddf7e822e 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -9,8 +9,6 @@
 $params = get_input('params');
 $plugin = get_input('plugin');
 
-gatekeeper();
-
 $result = false;
 
 foreach ($params as $k => $v) {
diff --git a/actions/user/default_access.php b/actions/user/default_access.php
index ae489dcbe..0c2390842 100644
--- a/actions/user/default_access.php
+++ b/actions/user/default_access.php
@@ -9,8 +9,6 @@
 global $CONFIG;
 
 if ($CONFIG->allow_user_default_access) {
-	gatekeeper();
-
 	$default_access = get_input('default_access');
 	$user_id = get_input('guid');
 
diff --git a/actions/user/language.php b/actions/user/language.php
index 252263cd2..44c591d7a 100644
--- a/actions/user/language.php
+++ b/actions/user/language.php
@@ -6,8 +6,6 @@
  * @subpackage Core
  */
 
-gatekeeper();
-
 $language = get_input('language');
 $user_id = get_input('guid');
 
diff --git a/actions/user/name.php b/actions/user/name.php
index c3e79d725..e293d409c 100644
--- a/actions/user/name.php
+++ b/actions/user/name.php
@@ -6,8 +6,6 @@
  * @subpackage Core
  */
 
-gatekeeper();
-
 $name = strip_tags(get_input('name'));
 $user_id = get_input('guid');
 
diff --git a/actions/user/password.php b/actions/user/password.php
index 32b27bf74..bbeb0ea7f 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -6,8 +6,6 @@
  * @subpackage Core
  */
 
-gatekeeper();
-
 $current_password = get_input('current_password');
 $password = get_input('password');
 $password2 = get_input('password2');
diff --git a/actions/user/spotlight.php b/actions/user/spotlight.php
index 00525254b..390197e78 100644
--- a/actions/user/spotlight.php
+++ b/actions/user/spotlight.php
@@ -7,8 +7,6 @@
  * @todo This is deprecated in 1.8
  */
 
-gatekeeper();
-
 $closed = get_input('closed', 'true');
 if ($closed != 'true') {
 	$closed = false;
diff --git a/actions/useradd.php b/actions/useradd.php
index 82625ad1b..dd6edfe31 100644
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -6,8 +6,6 @@
  * @subpackage Core
  */
 
-admin_gatekeeper(); // Only admins can add a user
-
 // Get variables
 global $CONFIG;
 $username = get_input('username');
diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
index 6ee33ecd7..29cbebc1a 100644
--- a/actions/usersettings/save.php
+++ b/actions/usersettings/save.php
@@ -8,8 +8,6 @@
 
 global $CONFIG;
 
-gatekeeper();
-
 elgg_trigger_plugin_hook('usersettings:save', 'user');
 
 forward(REFERER);
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 8908dcfab..e75e6b34b 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -373,6 +373,7 @@ function notification_init() {
  */
 function notification_user_settings_save() {
 	global $CONFIG;
+	//@todo Wha??
 	include($CONFIG->path . "actions/notifications/settings/usersettings/save.php");
 }
 
diff --git a/engine/lib/users.php b/engine/lib/users.php
index cdabfddff..1d7359806 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1599,6 +1599,7 @@ function search_list_users_by_name($hook, $user, $returnvalue, $tag) {
  */
 function users_settings_save() {
 	global $CONFIG;
+	//@todo Wha??
 	include($CONFIG->path . "actions/user/name.php");
 	include($CONFIG->path . "actions/user/password.php");
 	include($CONFIG->path . "actions/email/save.php");