Make frio more consistent by replacing textual links with icons everywhere. (#5415)

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 75f2ec8532eab6428d565d95fc779ebf006fded3..aa0f2f59bc1ece7c3f48562455ab9f7e0046f734 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -21,8 +21,6 @@ function register_post(App $a)
 {
        check_form_security_token_redirectOnErr('/register', 'register');
 
-       global $lang;
-
        $verified = 0;
        $blocked  = 1;
 
@@ -76,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);
        }
@@ -85,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);
@@ -111,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());
@@ -123,7 +121,7 @@ function register_post(App $a)
                        dbesc(DateTimeFormat::utcNow()),
                        intval($user['uid']),
                        dbesc($result['password']),
-                       dbesc($lang),
+                       dbesc(Config::get('system', 'language')),
                        dbesc($_POST['permonlybox'])
                );
 
@@ -179,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;
        }
@@ -258,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: '),