aboutsummaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authornickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-11 21:37:12 +0000
committernickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-11 21:37:12 +0000
commit25c192e75d52f5bd7db4da22bb9213421fa36b4c (patch)
treee2ef3042e4b048714a08d273700a426ac6020b1a /actions
parente210f797ff2dda5785e64380234f1ee876bc5c12 (diff)
downloadelgg-25c192e75d52f5bd7db4da22bb9213421fa36b4c.tar.gz
elgg-25c192e75d52f5bd7db4da22bb9213421fa36b4c.tar.bz2
Do not display site pages when in Walled Garden mode, excepting system-defined whitelist.
git-svn-id: http://code.elgg.org/elgg/trunk@6004 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions')
-rw-r--r--actions/admin/site/update_advanced.php7
-rw-r--r--actions/systemsettings/install.php1
2 files changed, 8 insertions, 0 deletions
diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
index 7e6bd0cc6..e65919ce1 100644
--- a/actions/admin/site/update_advanced.php
+++ b/actions/admin/site/update_advanced.php
@@ -56,6 +56,13 @@ if (datalist_get('default_site')) {
} else {
set_config('allow_registration', FALSE, $site->getGUID());
}
+
+ // setup walled garden
+ if (get_input('walled_garden', FALSE)) {
+ set_config('walled_garden', TRUE, $site->getGUID());
+ } else {
+ set_config('walled_garden', FALSE, $site->getGUID());
+ }
$https_login = get_input('https_login');
if ($https_login) {
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 3b841caf9..6f3b75a3d 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -69,6 +69,7 @@ if (get_input('settings') == 'go') {
set_config('language', get_input('language'), $site->getGUID());
set_config('default_access', get_input('default_access'), $site->getGUID());
set_config('allow_registration', TRUE, $site->getGUID());
+ set_config('walled_garden', FALSE, $site->getGUID());
$debug = get_input('debug');
if ($debug) {