diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
| commit | 6decffb00c00fabcb4ef581084eaca038e340686 (patch) | |
| tree | 34471f015e0b33007ad40059dfdd09c83a768fbb /include/auth.php | |
| parent | 1dc795722a8e748ebb98e8fab778cd4686a0654f (diff) | |
| parent | 6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (diff) | |
| download | volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.gz volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.bz2 volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'include/auth.php')
| -rw-r--r-- | include/auth.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php index 6f5e58361..844566919 100644 --- a/include/auth.php +++ b/include/auth.php @@ -37,6 +37,7 @@ require_once('include/security.php'); function account_verify_password($login, $pass) { $ret = [ 'account' => null, 'channel' => null, 'xchan' => null ]; + $login = punify($login); $email_verify = get_config('system', 'verify_email'); $register_policy = get_config('system', 'register_policy'); @@ -235,7 +236,7 @@ else { $record = null; $addon_auth = array( - 'username' => trim($_POST['username']), + 'username' => punify(trim($_POST['username'])), 'password' => trim($_POST['password']), 'authenticated' => 0, 'user_record' => null @@ -261,7 +262,7 @@ else { $verify = account_verify_password($_POST['username'], $_POST['password']); if($verify && array_key_exists('reason',$verify) && $verify['reason'] === 'unvalidated') { 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) { $atoken = $verify['xchan']; |