harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

register workflow was getting over-ridden in include/security

Browse Source
This commit is contained in:
zotlabs 2017-10-19 18:48:11 -07:00
parent 7d92e9026e
commit 400441d56b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/New_channel.php
View File

@ -9,7 +9,7 @@ require_once('include/permissions.php');
class New_channel extends \Zotlabs\Web\Controller {
function init() {
$cmd = ((argc() > 1) ? argv(1) : '');
if($cmd === 'autofill.json') {

9
Zotlabs/Module/Register.php
View File

@ -123,13 +123,13 @@ class Register extends \Zotlabs\Web\Controller {
if($policy == REGISTER_OPEN ) {
if($email_verify) {
$res = verify_email_address($result);
if($res) {
info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
}
}
else {
$res = send_register_success_email($result['email'],$result['password']);
}
if($res) {
info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
}
}
elseif($policy == REGISTER_APPROVE) {
$res = send_reg_approval_email($result);
@ -167,7 +167,8 @@ class Register extends \Zotlabs\Web\Controller {
$next_page = $x;
$_SESSION['workflow'] = true;
}
unset($_SESSION['login_return_url']);
goaway(z_root() . '/' . $next_page);
}