aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rwxr-xr-xboot.php46
5 files changed, 43 insertions, 18 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()) {
diff --git a/boot.php b/boot.php
index b2186246d..b19817197 100755
--- a/boot.php
+++ b/boot.php
@@ -1559,17 +1559,43 @@ function fix_system_urls($oldurl, $newurl) {
* @return string Parsed HTML code.
*/
function login($register = false, $form_id = 'main-login', $hiddens = false, $login_page = true) {
+
$o = '';
- $reg = false;
- $reglink = get_config('system', 'register_link');
- if(! strlen($reglink))
- $reglink = 'register';
-
- $reg = array(
- 'title' => t('Create an account to access services and applications'),
- 'desc' => t('Register'),
- 'link' => (($register) ? $reglink : 'pubsites')
- );
+ $reg = null;
+
+ // Here's the current description of how the register link works (2018-05-15)
+
+ // Register links are enabled on the site home page and login page and navbar.
+ // They are not shown by default on other pages which may require login.
+
+ // If the register link is enabled and registration is closed, the request is directed
+ // to /pubsites. If registration is allowed, /register is the default destination
+
+ // system.register_link can over-ride the default behaviour and redirect to an arbitrary
+ // webpage for paid/custom or organisational registrations, regardless of whether
+ // registration is allowed.
+
+ // system.register_link may or may not be the same destination as system.sellpage
+
+ // system.sellpage is the destination linked from the /pubsites page on other sites. If
+ // system.sellpage is not set, the 'register' link in /pubsites will go to 'register' on your
+ // site.
+
+ // If system.register_link is set to the word 'none', no registration link will be shown on
+ // your site.
+
+
+ $register_policy = get_config('system','register_policy');
+
+ $reglink = get_config('system', 'register_link', z_root() . '/' . ((intval($register_policy) === REGISTER_CLOSED) ? 'pubsites' : 'register'));
+
+ if($reglink !== 'none') {
+ $reg = [
+ 'title' => t('Create an account to access services and applications'),
+ 'desc' => t('Register'),
+ 'link' => $reglink
+ ];
+ }
$dest_url = z_root() . '/' . App::$query_string;