fix register_policy globally

7 files changed, 10 insertions, 10 deletions

diff --git a/mod/admin.php b/mod/admin.php
index fab96ae9a..d0c904b02 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -300,9 +300,9 @@ function admin_page_site_post(&$a){
 	set_config('system','theme', $theme);
 	set_config('system','maximagesize', $maximagesize);
 	
-	set_config('config','register_policy', $register_policy);
+	set_config('system','register_policy', $register_policy);
 	set_config('system','account_abandon_days', $abandon_days);
-	set_config('config','register_text', $register_text);
+	set_config('system','register_text', $register_text);
 	set_config('system','allowed_sites', $allowed_sites);
 	set_config('system','allowed_email', $allowed_email);
 	set_config('system','block_public', $block_public);
@@ -403,7 +403,7 @@ function admin_page_site(&$a) {
 		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
 		'$ssl_policy'       => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
 		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
-		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
+		'$register_policy'	=> array('register_policy', t("Register policy"), $a->config['system']['register_policy'], "", $register_choices),
 		'$register_text'	=> array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
 		'$abandon_days'     => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
 		'$allowed_sites'	=> array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
diff --git a/mod/invite.php b/mod/invite.php
index f5cf090e0..5eb5f6646 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -96,9 +96,9 @@ function invite_content(&$a) {
 
 	$dirloc = get_config('system','directory_submit_url');
 	if(strlen($dirloc)) {
-		if($a->config['register_policy'] == REGISTER_CLOSED)
+		if($a->config['system']['register_policy'] == REGISTER_CLOSED)
 			$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
-		elseif($a->config['register_policy'] != REGISTER_CLOSED)
+		elseif($a->config['system']['register_policy'] != REGISTER_CLOSED)
 			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
 			. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo');
 	}
diff --git a/mod/ping.php b/mod/ping.php
index 6b76c33ca..76d139711 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -202,7 +202,7 @@ function ping_init(&$a) {
 	if($mails)
 		$result['mail'] = intval($mails[0]['total']);
 		
-	if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()){
+	if ($a->config['system']['register_policy'] == REGISTER_APPROVE && is_site_admin()){
 		$regs = q("SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`, COUNT(*) as `total` FROM `contact` RIGHT JOIN `register` ON `register`.`uid`=`contact`.`uid` WHERE `contact`.`self`=1");
 		if($regs)
 			$result['register'] = intval($regs[0]['total']);
diff --git a/mod/register.php b/mod/register.php
index 88fe69039..dbf8d25b7 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -42,7 +42,7 @@ function register_post(&$a) {
 		return;
 	}
 
-	$policy = get_config('config','register_policy');
+	$policy = get_config('system','register_policy');
 
 	switch($policy) {
 
diff --git a/mod/regmod.php b/mod/regmod.php
index 120d21cae..3da1575d3 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -108,7 +108,7 @@ function regmod_content(&$a) {
 
 	if(! local_user()) {
 		info( t('Please login.') . EOL);
-		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+		$o .= '<br /><br />' . login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 		return $o;
 	}
 
diff --git a/mod/settings.php b/mod/settings.php
index fa4b4ee7c..db204bc50 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -519,7 +519,7 @@ function settings_post(&$a) {
 //	}
 
 	//$_SESSION['theme'] = $theme;
-	if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
+	if($email_changed && $a->config['system']['register_policy'] == REGISTER_VERIFY) {
 
 		// FIXME - set to un-verified, blocked and redirect to logout
 		// Why? Are we verifying people or email addresses?
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index cb924d808..0cd569d20 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -31,7 +31,7 @@ function siteinfo_init(&$a) {
 			'version' => FRIENDICA_VERSION,
 			'url' => z_root(),
 			'plugins' => $visible_plugins,
-			'register_policy' =>  $register_policy[$a->config['register_policy']],
+			'register_policy' =>  $register_policy[$a->config['system']['register_policy']],
 			'admin' => $admin,
 			'site_name' => $a->config['sitename'],
 			'platform' => FRIENDICA_PLATFORM,