X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=81275df6fb7a0053be199acd0c699a30febfdffc;hb=0cdf0ba422076f731a5801708879d5344439494a;hp=2629a0a19e3c3bdd4b89f4745edb4b7d43248015;hpb=81e81bd8c8c01389a11a268407c15e56c36d9db3;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index 2629a0a19e..81275df6fb 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -13,10 +13,16 @@ use Friendica\Database\DBA;
 function friendica_init(App $a)
 {
 	if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
-		$register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
+		$register_policies = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
+
+		$register_policy = $register_policies[intval(Config::get('config', 'register_policy'))];
+
+		if ($register_policy == 'REGISTER_OPEN' && Config::get('config', 'invitation_only')) {
+			$register_policy = 'REGISTER_INVITATION';
+		}
 
 		$sql_extra = '';
-		if (x($a->config, 'admin_nickname')) {
+		if (!empty($a->config['admin_nickname'])) {
 			$sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
 		}
 		if (!empty(Config::get('config', 'admin_email'))) {
@@ -35,7 +41,7 @@ function friendica_init(App $a)
 
 		Config::load('feature_lock');
 		$locked_features = [];
-		if (!empty($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+		if (!empty($a->config['feature_lock'])) {
 			foreach ($a->config['feature_lock'] as $k => $v) {
 				if ($k === 'config_loaded') {
 					continue;
@@ -52,7 +58,7 @@ function friendica_init(App $a)
 			'locked_features'  => $locked_features,
 			'explicit_content' => (int)Config::get('system', 'explicit_content', false),
 			'language'         => Config::get('system','language'),
-			'register_policy ' => $register_policy[intval(Config::get('config', 'register_policy'))],
+			'register_policy'  => $register_policy,
 			'admin'            => $admin,
 			'site_name'        => Config::get('config', 'sitename'),
 			'platform'         => FRIENDICA_PLATFORM,