From 6526a83f52eac96a4c522c041ae5c0bfb24795d8 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 24 Jan 2010 15:57:49 +0000
Subject: Removing calls to engine/start.php in action files.

git-svn-id: http://code.elgg.org/elgg/trunk@3834 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/plugins/disable.php    | 4 +---
 actions/admin/plugins/disableall.php | 4 +---
 actions/admin/plugins/enable.php     | 4 +---
 actions/admin/plugins/enableall.php  | 4 +---
 actions/admin/plugins/reorder.php    | 2 --
 actions/admin/user/ban.php           | 3 +--
 actions/admin/user/delete.php        | 3 +--
 actions/admin/user/makeadmin.php     | 3 +--
 actions/admin/user/removeadmin.php   | 3 +--
 actions/admin/user/resetpassword.php | 3 +--
 actions/admin/user/unban.php         | 3 +--
 actions/email/save.php               | 3 +--
 actions/entities/delete.php          | 4 +---
 actions/register.php                 | 3 +--
 actions/user/default_access.php      | 3 +--
 actions/user/language.php            | 1 -
 actions/user/name.php                | 3 +--
 actions/user/password.php            | 3 +--
 actions/user/passwordreset.php       | 1 -
 actions/user/requestnewpassword.php  | 3 +--
 actions/useradd.php                  | 4 +---
 actions/usersettings/save.php        | 3 +--
 22 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/actions/admin/plugins/disable.php b/actions/admin/plugins/disable.php
index 810eb1c94..4726a47fa 100644
--- a/actions/admin/plugins/disable.php
+++ b/actions/admin/plugins/disable.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
 // block non-admin users
 admin_gatekeeper();
 
@@ -35,4 +33,4 @@ elgg_view_regenerate_simplecache();
 elgg_filepath_cache_reset();
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/plugins/disableall.php b/actions/admin/plugins/disableall.php
index b06961450..b48841047 100644
--- a/actions/admin/plugins/disableall.php
+++ b/actions/admin/plugins/disableall.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
 // block non-admin users
 admin_gatekeeper();
 
@@ -31,4 +29,4 @@ elgg_view_regenerate_simplecache();
 elgg_filepath_cache_reset();
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/plugins/enable.php b/actions/admin/plugins/enable.php
index 0a6631b65..6e4b98658 100644
--- a/actions/admin/plugins/enable.php
+++ b/actions/admin/plugins/enable.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
 // block non-admin users
 admin_gatekeeper();
 
@@ -35,4 +33,4 @@ elgg_view_regenerate_simplecache();
 elgg_filepath_cache_reset();
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/plugins/enableall.php b/actions/admin/plugins/enableall.php
index 92a44b7a7..d6cac3938 100644
--- a/actions/admin/plugins/enableall.php
+++ b/actions/admin/plugins/enableall.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
 // block non-admin users
 admin_gatekeeper();
 
@@ -32,4 +30,4 @@ elgg_view_regenerate_simplecache();
 elgg_filepath_cache_reset();
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/plugins/reorder.php b/actions/admin/plugins/reorder.php
index 67cb6f02b..45bcefc78 100644
--- a/actions/admin/plugins/reorder.php
+++ b/actions/admin/plugins/reorder.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
-
 // block non-admin users
 admin_gatekeeper();
 
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
index 9a0ad58bb..83e789615 100644
--- a/actions/admin/user/ban.php
+++ b/actions/admin/user/ban.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
 
 // block non-admin users
 admin_gatekeeper();
@@ -30,4 +29,4 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 }
 
 forward('pg/admin/user/');
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index 7d9249424..3cd0aaecf 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
 
 // block non-admin users
 admin_gatekeeper();
@@ -29,4 +28,4 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 }
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
index b3e5ae8fc..e3fbac7e7 100644
--- a/actions/admin/user/makeadmin.php
+++ b/actions/admin/user/makeadmin.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
 global $CONFIG;
 
 // block non-admin users
@@ -30,4 +29,4 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 	register_error(elgg_echo('admin:user:makeadmin:no'));
 }
 
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
index 2e1bbe180..33d719adc 100644
--- a/actions/admin/user/removeadmin.php
+++ b/actions/admin/user/removeadmin.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
 global $CONFIG;
 
 // block non-admin users
@@ -30,4 +29,4 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 	register_error(elgg_echo('admin:user:removeadmin:no'));
 }
 
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index 50bdcb1ac..d168ab9cc 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
 global $CONFIG;
 
 // block non-admin users
@@ -42,4 +41,4 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 }
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/admin/user/unban.php b/actions/admin/user/unban.php
index f78d291c5..208ffb5db 100644
--- a/actions/admin/user/unban.php
+++ b/actions/admin/user/unban.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
 
 // block non-admin users
 admin_gatekeeper();
@@ -35,4 +34,4 @@ if (($obj instanceof ElggUser) && ($obj->canEdit())) {
 access_show_hidden_entities($access_status);
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/email/save.php b/actions/email/save.php
index 046ac6a9d..006445b99 100644
--- a/actions/email/save.php
+++ b/actions/email/save.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 gatekeeper();
@@ -46,4 +45,4 @@ if ($user) {
 
 //forward($_SERVER['HTTP_REFERER']);
 //exit;
-?>
\ No newline at end of file
+?>
diff --git a/actions/entities/delete.php b/actions/entities/delete.php
index 4f0e3b7ba..dab964ddd 100644
--- a/actions/entities/delete.php
+++ b/actions/entities/delete.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
 gatekeeper();
 
 $guid = get_input('guid');
@@ -25,4 +23,4 @@ if (($entity) && ($entity->canEdit())) {
 	register_error(sprintf(elgg_echo('entity:delete:fail'), $guid));
 }
 
-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 5abd55a4b..b211f34f1 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
 global $CONFIG;
 
 action_gatekeeper();
@@ -71,4 +70,4 @@ $qs = explode('?',$_SERVER['HTTP_REFERER']);
 $qs = $qs[0];
 $qs .= "?u=" . urlencode($username) . "&e=" . urlencode($email) . "&n=" . urlencode($name) . "&friend_guid=" . $friend_guid;
 
-forward($qs);
\ No newline at end of file
+forward($qs);
diff --git a/actions/user/default_access.php b/actions/user/default_access.php
index 2e08631a1..ee8fb9efa 100644
--- a/actions/user/default_access.php
+++ b/actions/user/default_access.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 if ($CONFIG->allow_user_default_access) {
@@ -36,4 +35,4 @@ if ($CONFIG->allow_user_default_access) {
 	} else {
 		register_error(elgg_echo('user:default_access:fail'));
 	}
-}
\ No newline at end of file
+}
diff --git a/actions/user/language.php b/actions/user/language.php
index f0837e1e5..1165b196e 100644
--- a/actions/user/language.php
+++ b/actions/user/language.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 gatekeeper();
diff --git a/actions/user/name.php b/actions/user/name.php
index 19a3422e8..bc14d3184 100644
--- a/actions/user/name.php
+++ b/actions/user/name.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 gatekeeper();
@@ -34,4 +33,4 @@ if (($user) && ($name)) {
 	}
 } else {
 	register_error(elgg_echo('user:name:fail'));
-}
\ No newline at end of file
+}
diff --git a/actions/user/password.php b/actions/user/password.php
index d2fcb95d8..6e3ff9447 100644
--- a/actions/user/password.php
+++ b/actions/user/password.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 gatekeeper();
@@ -40,4 +39,4 @@ if (($user) && ($password!="")) {
 	} else {
 		register_error(elgg_echo('user:password:fail:tooshort'));
 	}
-}
\ No newline at end of file
+}
diff --git a/actions/user/passwordreset.php b/actions/user/passwordreset.php
index c6d8a70b1..b801cbc22 100644
--- a/actions/user/passwordreset.php
+++ b/actions/user/passwordreset.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 $user_guid = get_input('u');
diff --git a/actions/user/requestnewpassword.php b/actions/user/requestnewpassword.php
index d951e2ede..88a02a4fc 100644
--- a/actions/user/requestnewpassword.php
+++ b/actions/user/requestnewpassword.php
@@ -8,7 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 action_gatekeeper();
@@ -37,4 +36,4 @@ if ($user) {
 
 access_show_hidden_entities($access_status);
 forward();
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/useradd.php b/actions/useradd.php
index 2a8f64fd5..71b8d826d 100644
--- a/actions/useradd.php
+++ b/actions/useradd.php
@@ -8,8 +8,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
 admin_gatekeeper(); // Only admins can add a user
 action_gatekeeper();
 
@@ -50,4 +48,4 @@ try {
 }
 
 forward($_SERVER['HTTP_REFERER']);
-exit;
\ No newline at end of file
+exit;
diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
index cf551cc7c..3690860ef 100644
--- a/actions/usersettings/save.php
+++ b/actions/usersettings/save.php
@@ -7,7 +7,6 @@
  * @link http://elgg.org/
  */
 
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 gatekeeper();
@@ -15,4 +14,4 @@ action_gatekeeper();
 
 trigger_plugin_hook('usersettings:save','user');
 
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
-- 
cgit v1.2.3