X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffriendica.php;h=d10deb2e88452ce94cbdf4704b35f98053a789ea;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=0e647eb5ea18ae31bc28035d54165f83af7b3eef;hpb=0441a169a932c3ba19a2fedc16b4db895cdec127;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index 0e647eb5ea..d10deb2e88 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -6,17 +6,30 @@
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Module\Register;
 
 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_CLOSED',
+			Register::APPROVE => 'REGISTER_APPROVE',
+			Register::OPEN    => 'REGISTER_OPEN'
+		];
+
+		$register_policy_int = intval(Config::get('config', 'register_policy'));
+		if ($register_policy_int !== Register::CLOSED && Config::get('config', 'invitation_only')) {
+			$register_policy = 'REGISTER_INVITATION';
+		} else {
+			$register_policy = $register_policies[$register_policy_int];
+		}
 
 		$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 +48,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 +65,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,
@@ -62,7 +75,7 @@ function friendica_init(App $a)
 
 		header('Content-type: application/json; charset=utf-8');
 		echo json_encode($data);
-		killme();
+		exit();
 	}
 }
 
@@ -120,7 +133,7 @@ function friendica_content(App $a)
 		$o .= '</tbody></table></div>' . PHP_EOL;
 	}
 
-	Addon::callHooks('about_hook', $o);
+	Hook::callAll('about_hook', $o);
 
 	return $o;
 }