From 7682706a46a20e3e58a9afd8ba208d5b0c040499 Mon Sep 17 00:00:00 2001
From: nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 7 May 2010 21:49:19 +0000
Subject: Adding an option to restrict new user registration in advanced site
 settings.

This is the first step in fully merging "Walled Garden" plugin into core Elgg engine.


git-svn-id: http://code.elgg.org/elgg/trunk@5981 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/site/update_advanced.php | 7 +++++++
 actions/register.php                   | 2 +-
 actions/systemsettings/install.php     | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'actions')

diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
index c9b78c261..7e6bd0cc6 100644
--- a/actions/admin/site/update_advanced.php
+++ b/actions/admin/site/update_advanced.php
@@ -49,6 +49,13 @@ if (datalist_get('default_site')) {
 	} else {
 		unset_config('debug', $site->getGUID());
 	}
+	
+	// allow new user registration?
+	if (get_input('allow_registration', FALSE)) {
+		set_config('allow_registration', TRUE, $site->getGUID());
+	} else {
+		set_config('allow_registration', FALSE, $site->getGUID());
+	}
 
 	$https_login = get_input('https_login');
 	if ($https_login) {
diff --git a/actions/register.php b/actions/register.php
index 081a4e454..556bad4cd 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -24,7 +24,7 @@ if (is_array($admin)) {
 	$admin = $admin[0];
 }
 
-if (!$CONFIG->disable_registration) {
+if ($CONFIG->allow_registration) {
 // For now, just try and register the user
 	try {
 		$guid = register_user($username, $password, $name, $email, false, $friend_guid, $invitecode);
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 589e3a06c..3516a2ff2 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -68,6 +68,7 @@ if (get_input('settings') == 'go') {
 		set_config('view', get_input('view'), $site->getGUID());
 		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());
 
 		$debug = get_input('debug');
 		if ($debug) {
-- 
cgit v1.2.3