aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-14 19:19:25 -0700
committerzotlabs <mike@macgirvin.com>2018-05-14 19:19:25 -0700
commitc8fc3ad7cd47a1545da030109ba743105417c047 (patch)
treebed9412fa300d325bd9f69fbdac38f585c5cc592 /Zotlabs
parent301e405769ad9fbe80955cdad7d9d9192cbfe5b6 (diff)
downloadvolse-hubzilla-c8fc3ad7cd47a1545da030109ba743105417c047.tar.gz
volse-hubzilla-c8fc3ad7cd47a1545da030109ba743105417c047.tar.bz2
volse-hubzilla-c8fc3ad7cd47a1545da030109ba743105417c047.zip
refactor the 'where does the register link point?' logic
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Home.php4
-rw-r--r--Zotlabs/Module/Login.php2
-rw-r--r--Zotlabs/Module/Register.php6
-rw-r--r--Zotlabs/Module/Regmod.php3
4 files changed, 7 insertions, 8 deletions
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php
index 79449c3b2..4b3e596a9 100644
--- a/Zotlabs/Module/Home.php
+++ b/Zotlabs/Module/Home.php
@@ -89,11 +89,11 @@ class Home extends \Zotlabs\Web\Controller {
$sitename = get_config('system','sitename');
if($sitename)
- $o .= '<h1 class="home-welcome">' . sprintf( t("Welcome to %s") ,$sitename) . '</h1>';
+ $o .= '<h1 class="home-welcome">' . sprintf( t('Welcome to %s') ,$sitename) . '</h1>';
$loginbox = get_config('system','login_on_homepage');
if(intval($loginbox) || $loginbox === false)
- $o .= login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+ $o .= login(true);
return $o;
diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php
index ae35b922f..6430939b4 100644
--- a/Zotlabs/Module/Login.php
+++ b/Zotlabs/Module/Login.php
@@ -10,7 +10,7 @@ class Login extends \Zotlabs\Web\Controller {
if(remote_channel() && $_SESSION['atoken'])
goaway(z_root());
- return login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? false : true);
+ return login(true);
}
}
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 4ab1ccd81..3dded19c7 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -187,8 +187,8 @@ class Register extends \Zotlabs\Web\Controller {
$registration_is = '';
$other_sites = '';
- if(get_config('system','register_policy') == REGISTER_CLOSED) {
- if(get_config('system','directory_mode') == DIRECTORY_MODE_STANDALONE) {
+ if(intval(get_config('system','register_policy')) === REGISTER_CLOSED) {
+ if(intval(get_config('system','directory_mode')) === DIRECTORY_MODE_STANDALONE) {
notice( t('Registration on this hub is disabled.') . EOL);
return;
}
@@ -197,7 +197,7 @@ class Register extends \Zotlabs\Web\Controller {
return $mod->get();
}
- if(get_config('system','register_policy') == REGISTER_APPROVE) {
+ if(intval(get_config('system','register_policy')) == REGISTER_APPROVE) {
$registration_is = t('Registration on this hub is by approval only.');
$other_sites = t('<a href="pubsites">Register at another affiliated hub.</a>');
}
diff --git a/Zotlabs/Module/Regmod.php b/Zotlabs/Module/Regmod.php
index 70635d707..6fe89ca90 100644
--- a/Zotlabs/Module/Regmod.php
+++ b/Zotlabs/Module/Regmod.php
@@ -13,8 +13,7 @@ class Regmod extends \Zotlabs\Web\Controller {
if(! local_channel()) {
info( t('Please login.') . EOL);
- $o .= '<br /><br />' . login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
- return $o;
+ return login();
}
if(! is_site_admin()) {