Enforce systen.register_policy value type

diff --git a/include/api.php b/include/api.php
index d307afa953639ed65a4bbe15e015f090cc23cda0..58f086c012d829734b40d11bb54c5bfe41416e7d 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -3345,7 +3345,7 @@ function api_statusnet_config($type)
        $server    = $a->get_hostname();
        $logo      = System::baseUrl() . '/images/friendica-64.png';
        $email     = Config::get('config', 'admin_email');
-       $closed    = Config::get('config', 'register_policy') == REGISTER_CLOSED ? 'true' : 'false';
+       $closed    = intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 'true' : 'false';
        $private   = Config::get('system', 'block_public') ? 'true' : 'false';
        $textlimit = (string) Config::get('config', 'api_import_size', Config::get('config', 'max_import_size', 200000));
        $ssl       = Config::get('system', 'have_ssl') ? 'true' : 'false';

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 88097eb91006ba072942641683c4426420ac4586..a26757740a3daf6625e4edce488951fef8e8c789 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -22,7 +22,7 @@ function bookmarklet_content(App $a)
 {
        if (!local_user()) {
                $o = '<h2>' . L10n::t('Login') . '</h2>';
-               $o .= Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? false : true);
+               $o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? false : true);
                return $o;
        }
 

diff --git a/mod/friendica.php b/mod/friendica.php
index b3cea56dc61e0202f53e5957124b869d3c4df124..f1b0fb4761b83fe782df41f379b8cf2c3a8e0d61 100644 (file)
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -58,7 +58,7 @@ function friendica_init(App $a)
                        'url'             => System::baseUrl(),
                        'addons'          => $visible_addons,
                        'locked_features' => $locked_features,
-                       'register_policy' => $register_policy[Config::get('config', 'register_policy')],
+                       'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
                        'admin'           => $admin,
                        'site_name'       => Config::get('config', 'sitename'),
                        'platform'        => FRIENDICA_PLATFORM,

diff --git a/mod/home.php b/mod/home.php
index c386763ca3aaae556ccfd1058d95cfa99b7e6006..d28bf3cb43a9fc62b694fae2c2af0d59806b6c97 100644 (file)
--- a/mod/home.php
+++ b/mod/home.php
@@ -47,7 +47,7 @@ function home_content(App $a) {
                }
        }
 
-       $login = Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? 0 : 1);
+       $login = Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
 
        $content = '';
        Addon::callHooks("home_content",$content);

diff --git a/mod/invite.php b/mod/invite.php
index bea479a8f7b13d1798e759c94ec8f8e7960017aa..d8d98bec28eb0bcd40b4f2bbea1b25845a52ed0f 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -126,14 +126,14 @@ function invite_content(App $a) {
 
        $dirloc = Config::get('system', 'directory');
        if (strlen($dirloc)) {
-               if (Config::get('config', 'register_policy') === REGISTER_CLOSED) {
+               if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
                        $linktxt = L10n::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.', $dirloc . '/servers');
                } else {
                        $linktxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', System::baseUrl())
                        . "\r\n" . "\r\n" . L10n::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.', $dirloc . '/servers');
                }
        } else { // there is no global directory URL defined
-               if (Config::get('config', 'register_policy') === REGISTER_CLOSED) {
+               if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
                        $o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
                        return $o;
                } else {

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 74645bc66d4fea5bf3b599252f23b6869f8b50f8..fad7246075938e6f12f70a9098d24a909396b783 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -61,7 +61,7 @@ function nodeinfo_init(App $a) {
 
        $nodeinfo['usage'] = [];
 
-       $nodeinfo['openRegistrations'] = Config::get('config', 'register_policy') !== REGISTER_CLOSED;
+       $nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED;
 
        $nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')];
 

diff --git a/mod/openid.php b/mod/openid.php
index 7be8544cd974f7c6cf3c39d0985180e79a8e3ed1..3baeec28d04feab6ed8d06ff1439b7e38131121b 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -62,7 +62,7 @@ function openid_content(App $a) {
                        // Successful OpenID login - but we can't match it to an existing account.
                        // New registration?
 
-                       if (Config::get('config', 'register_policy') === REGISTER_CLOSED) {
+                       if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
                                notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
                                goaway(System::baseUrl());
                        }

diff --git a/mod/ping.php b/mod/ping.php
index 47c8cb40d7009e3e85c885bbf1588264241ec6a8..f68040a2cb7da3acd6c6d01e716090d043b890d4 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -201,7 +201,7 @@ function ping_init(App $a)
                );
                $mail_count = count($mails);
 
-               if (Config::get('config', 'register_policy') === REGISTER_APPROVE && is_site_admin()) {
+               if (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE && is_site_admin()) {
                        $regs = q(
                                "SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`
                                FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`

diff --git a/mod/register.php b/mod/register.php
index 53bca684050991ac76ae0f3b7e526d26d03ab0af..aa0f2f59bc1ece7c3f48562455ab9f7e0046f734 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -74,7 +74,7 @@ function register_post(App $a)
 
        $user = $result['user'];
 
-       if ($netpublish && Config::get('config', 'register_policy') !== REGISTER_APPROVE) {
+       if ($netpublish && intval(Config::get('config', 'register_policy')) !== REGISTER_APPROVE) {
                $url = System::baseUrl() . '/profile/' . $user['nickname'];
                Worker::add(PRIORITY_LOW, "Directory", $url);
        }
@@ -83,7 +83,7 @@ function register_post(App $a)
        $num_invites   = Config::get('system', 'number_invites');
        $invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
 
-       if (Config::get('config', 'register_policy') === REGISTER_OPEN) {
+       if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
                if ($using_invites && $invite_id) {
                        q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
                        PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
@@ -109,7 +109,7 @@ function register_post(App $a)
                        info(L10n::t('Registration successful.') . EOL);
                        goaway(System::baseUrl());
                }
-       } elseif (Config::get('config', 'register_policy') === REGISTER_APPROVE) {
+       } elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) {
                if (!strlen(Config::get('config', 'admin_email'))) {
                        notice(L10n::t('Your registration can not be processed.') . EOL);
                        goaway(System::baseUrl());
@@ -177,7 +177,7 @@ function register_content(App $a)
                return;
        }
 
-       if ((!local_user()) && (Config::get('config', 'register_policy') === REGISTER_CLOSED)) {
+       if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) {
                notice("Permission denied." . EOL);
                return;
        }
@@ -256,7 +256,7 @@ function register_content(App $a)
        $o = replace_macros($tpl, [
                '$oidhtml' => $oidhtml,
                '$invitations' => Config::get('system', 'invitation_only'),
-               '$permonly'    => Config::get('config', 'register_policy') === REGISTER_APPROVE,
+               '$permonly'    => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
                '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
                '$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
                '$invite_label' => L10n::t('Your invitation code: '),

diff --git a/mod/regmod.php b/mod/regmod.php
index 2a418fcda053def513c06560d68866b73572fa21..2b7df0bd13dcdba7d320f82528bb6500a16d8c9e 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -99,7 +99,7 @@ function regmod_content(App $a)
 {
        if (!local_user()) {
                info(L10n::t('Please login.') . EOL);
-               $o = '<br /><br />' . Login::form($a->query_string, Config::get('config', 'register_policy') === REGISTER_CLOSED ? 0 : 1);
+               $o = '<br /><br />' . Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
                return $o;
        }
 

diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index 0dbe0ea492c6930b47f9adacb68edbc633ad6305..c197060ff5471dc24c38d3aae54232956bac71e7 100644 (file)
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -20,7 +20,7 @@ function statistics_json_init(App $a) {
                "name" => Config::get('config', 'sitename'),
                "network" => FRIENDICA_PLATFORM,
                "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION,
-               "registrations_open" => Config::get('config', 'register_policy') !== REGISTER_CLOSED,
+               "registrations_open" => intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED,
                "total_users" => Config::get('nodeinfo', 'total_users'),
                "active_users_halfyear" => Config::get('nodeinfo', 'active_users_halfyear'),
                "active_users_monthly" => Config::get('nodeinfo', 'active_users_monthly'),

diff --git a/mod/uimport.php b/mod/uimport.php
index 660544b471057f684151229dfe9ff5e41e7f3fd2..1dbc571e2f4bab499b3df810b8afa8d19ec9cb42 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -42,7 +42,7 @@ function uimport_post(App $a)
 
 function uimport_content(App $a) {
 
-       if ((!local_user()) && (Config::get('config', 'register_policy') === REGISTER_CLOSED)) {
+       if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) {
                notice("Permission denied." . EOL);
                return;
        }

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 93090c06ecdfd1a6222aad6efbce5aef55da69ca..92ca714df876bec43ca25f13d646568b4c3a97c7 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -124,7 +124,7 @@ class Nav
                        $nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')];
                }
 
-               if ((Config::get('config', 'register_policy') === REGISTER_OPEN) && (! local_user()) && (! remote_user())) {
+               if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN && !local_user() && !remote_user()) {
                        $nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')];
                }
 

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 46cb3a85d276ada47bd4452d74b299435ddb213e..06d724bb2adc5eac1b48871ecd515c3fef665e99 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -43,7 +43,7 @@ class Login extends BaseModule
                        goaway(self::getApp()->get_baseurl());
                }
 
-               return self::form(self::getApp()->get_baseurl(), Config::get('config', 'register_policy') !== REGISTER_CLOSED);
+               return self::form(self::getApp()->get_baseurl(), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
        }
 
        public static function post()