aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-11 12:52:17 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-11 12:52:17 +0000
commit0d824354c94d69b08345cdf8bf322aa07b4958c3 (patch)
treef16a06df7403072d9d27b0b4bf0af74814fbf8cb /actions
parent0a93b4d2dacd35c17ef998e50d7d60e53e720825 (diff)
downloadelgg-0d824354c94d69b08345cdf8bf322aa07b4958c3.tar.gz
elgg-0d824354c94d69b08345cdf8bf322aa07b4958c3.tar.bz2
Refs #210 & #211 : Some more core settings / admin pages moved to use admin_gatekeeper. Install script action now also refuses to be run if the site has already been installed.
git-svn-id: https://code.elgg.org/elgg/trunk@1824 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
-rw-r--r--actions/admin/site/update_basic.php1
-rw-r--r--actions/systemsettings/install.php4
-rw-r--r--actions/usersettings/save.php3
3 files changed, 6 insertions, 2 deletions
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 4a3fd775c..12d74a535 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -17,6 +17,7 @@
// block non-admin users
admin_gatekeeper();
+ action_gatekeeper();
if (get_input('settings') == 'go') {
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 061a2404e..4629d010d 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -11,7 +11,9 @@
* @author Curverider Ltd
* @copyright Curverider Ltd 2008
* @link http://elgg.org/
- */
+ */
+
+ if (is_installed()) gatekeeper();
if (get_input('settings') == 'go') {
diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
index 6322369bc..5b1b9f736 100644
--- a/actions/usersettings/save.php
+++ b/actions/usersettings/save.php
@@ -12,7 +12,8 @@
require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
global $CONFIG;
- gatekeeper();
+ gatekeeper();
+ action_gatekeeper();
trigger_plugin_hook('usersettings:save','user');