From 20e7e7e3acd69a1371e31d107d42017a3c430bd3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 21 Nov 2018 22:27:28 -0500 Subject: [PATCH 1/2] Add new REGISTER_INVITATION value to mod/friendica output --- mod/friendica.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mod/friendica.php b/mod/friendica.php index 0e647eb5ea..77adccbfb6 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -13,7 +13,13 @@ 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')) { @@ -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, From c91a87bc075227f6f236dc8300bfae6dba0332cf Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 21 Nov 2018 22:27:57 -0500 Subject: [PATCH 2/2] Fix typo in comment in mod/redir --- mod/redir.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/redir.php b/mod/redir.php index f22af545f7..701b85953c 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -43,7 +43,7 @@ function redir_init(App $a) { if ($contact['uid'] == 0 && local_user()) { // Let's have a look if there is an established connection - // between the puplic contact we have found and the local user. + // between the public contact we have found and the local user. $contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]); if (DBA::isResult($contact)) {