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

hubzilla issue #1015 - login with unicode domain name

Browse Source
This commit is contained in:
zotlabs 2018-03-28 19:25:11 -07:00
parent 1cf0de568d
commit cd485b0fdf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/account.php
View File

@ -23,6 +23,7 @@ function get_account_by_id($account_id) {
function check_account_email($email) { function check_account_email($email) {
$email = punify($email);
$result = array('error' => false, 'message' => ''); $result = array('error' => false, 'message' => '');
// Caution: empty email isn't counted as an error in this function. // Caution: empty email isn't counted as an error in this function.
@ -139,7 +140,7 @@ function create_account($arr) {
$result = array('success' => false, 'email' => '', 'password' => '', 'message' => ''); $result = array('success' => false, 'email' => '', 'password' => '', 'message' => '');
$invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : ''); $invite_code = ((x($arr,'invite_code')) ? notags(trim($arr['invite_code'])) : '');
$email = ((x($arr,'email')) ? notags(trim($arr['email'])) : ''); $email = ((x($arr,'email')) ? notags(punify(trim($arr['email']))) : '');
$password = ((x($arr,'password')) ? trim($arr['password']) : ''); $password = ((x($arr,'password')) ? trim($arr['password']) : '');
$password2 = ((x($arr,'password2')) ? trim($arr['password2']) : ''); $password2 = ((x($arr,'password2')) ? trim($arr['password2']) : '');
$parent = ((x($arr,'parent')) ? intval($arr['parent']) : 0 ); $parent = ((x($arr,'parent')) ? intval($arr['parent']) : 0 );

5
include/auth.php
View File

@ -37,6 +37,7 @@ require_once('include/security.php');
function account_verify_password($login, $pass) { function account_verify_password($login, $pass) {
$ret = [ 'account' => null, 'channel' => null, 'xchan' => null ]; $ret = [ 'account' => null, 'channel' => null, 'xchan' => null ];
$login = punify($login);
$email_verify = get_config('system', 'verify_email'); $email_verify = get_config('system', 'verify_email');
$register_policy = get_config('system', 'register_policy'); $register_policy = get_config('system', 'register_policy');
@ -235,7 +236,7 @@ else {
$record = null; $record = null;
$addon_auth = array( $addon_auth = array(
'username' => trim($_POST['username']), 'username' => punify(trim($_POST['username'])),
'password' => trim($_POST['password']), 'password' => trim($_POST['password']),
'authenticated' => 0, 'authenticated' => 0,
'user_record' => null 'user_record' => null
@ -261,7 +262,7 @@ else {
$verify = account_verify_password($_POST['username'], $_POST['password']); $verify = account_verify_password($_POST['username'], $_POST['password']);
if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') { if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') {
notice( t('Email validation is incomplete. Please check your email.')); notice( t('Email validation is incomplete. Please check your email.'));
goaway(z_root() . '/email_validation/' . bin2hex(trim(escape_tags($_POST['username'])))); goaway(z_root() . '/email_validation/' . bin2hex(punify(trim(escape_tags($_POST['username'])))));
} }
elseif($verify) { elseif($verify) {
$atoken = $verify['xchan']; $atoken = $verify['xchan'];