From b568a0fee40cca8d56b7a6b7d95a919451becc77 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Thu, 12 Nov 2015 16:23:46 -0500 Subject: [PATCH] make admin_users compatible with login --- admin_users.php | 2 +- login.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin_users.php b/admin_users.php index ba3a46c..624b6b0 100644 --- a/admin_users.php +++ b/admin_users.php @@ -33,7 +33,7 @@ function admin_users_get_fields() { $data['role'] = format_options(_REQUEST_cut('role'), 'role'); $data['name'] = format_oneline(trim(_REQUEST_cut('name'))); - $data['username'] = format_oneline(trim(_REQUEST_cut('username'))); + $data['username'] = format_auth_username(trim(_REQUEST_cut('username'))); $data['pass1'] = format_oneline(trim(_REQUEST_cut('pass1'))); $data['pass2'] = format_oneline(trim(_REQUEST_cut('pass2'))); diff --git a/login.php b/login.php index 4ec1344..e632334 100644 --- a/login.php +++ b/login.php @@ -5,7 +5,7 @@ function login_get_fields() { $data = array(); $data['after_login_url'] = format_oneline(_REQUEST_cut('after_login_url')); - $data['username'] = format_oneline(trim(_REQUEST_cut('username'))); + $data['username'] = format_auth_username(trim(_REQUEST_cut('username'))); $data['password'] = format_oneline(trim(_REQUEST_cut('password'))); return $data; @@ -14,7 +14,7 @@ function login_get_fields() { function login_main() { $data = login_get_fields(); if (strlen($data['username']) && strlen($data['password'])) { - $row = db_get_assoc('users', 'id,name,role,password', 'where username=%"', format_auth_username($data['username'])); + $row = db_get_assoc('users', 'id,name,role,password', 'where username=%"', $data['username']); if ($row) # && if (strlen($row['password'])) { $needs_rehash = false; -- 1.7.10.4