Another fix for registration issues

Addresses #330
This commit is contained in:
Sebastian Grewe 2013-07-15 13:46:20 +02:00
parent 8f72062558
commit 0f00f7d322
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@ if (!defined('SECURITY')) die('Hacking attempt');
if ($setting->getValue('lock_registration') && $setting->getValue('disable_invitations')) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
$smarty->assign("CONTENT", "disabled.tpl");
} else if (!$setting->getValue('disable_invitations') && !isset($_GET['token'])) {
} else if ($setting->getValue('lock_registration') && !$setting->getValue('disable_invitations') && !isset($_GET['token'])) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Only invited users are allowed to register.', 'TYPE' => 'errormsg');
$smarty->assign("CONTENT", "disabled.tpl");
} else {

View File

@ -15,7 +15,7 @@ if ($config['recaptcha']['enabled']) {
if ($setting->getValue('disable_invitations') && $setting->getValue('lock_registration')) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Account registration is currently disabled. Please try again later.', 'TYPE' => 'errormsg');
} else if (!$setting->getValue('disable_invitations') && !isset($_POST['token'])) {
} else if ($setting->getValue('lock_registration') && !$setting->getValue('disable_invitations') && !isset($_POST['token'])) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Only invited users are allowed to register.', 'TYPE' => 'errormsg');
} else {
// Check if recaptcha is enabled, process form data if valid