From 746013729e6377357efb68de8d7f2fd93e25a07c Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 16 Aug 2005 00:43:35 +0000 Subject: Bug 304653: remove 'use Bugzilla::Error' from Util.pm - Patch by Frédéric Buclin r=mkanat a=myk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- editusers.cgi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'editusers.cgi') diff --git a/editusers.cgi b/editusers.cgi index bada71af7..56c0a7635 100755 --- a/editusers.cgi +++ b/editusers.cgi @@ -169,9 +169,10 @@ if ($action eq 'search') { # Validity checks $login || ThrowUserError('user_login_required'); - check_email_syntax($login); - is_available_username($login) || ThrowUserError('account_exists', - {'email' => $login}); + validate_email_syntax($login) + || ThrowUserError('illegal_email_address', {addr => $login}); + is_available_username($login) + || ThrowUserError('account_exists', {email => $login}); ValidatePassword($password); # Login and password are validated now, and realname and disabledtext @@ -245,9 +246,11 @@ if ($action eq 'search') { if ($login ne $loginold) { # Validate, then trick_taint. $login || ThrowUserError('user_login_required'); - check_email_syntax($login); - is_available_username($login) || ThrowUserError('account_exists', - {'email' => $login}); + validate_email_syntax($login) + || ThrowUserError('illegal_email_address', {addr => $login}); + is_available_username($login) + || ThrowUserError('account_exists', {email => $login}); + trick_taint($login); push(@changedFields, 'login_name'); push(@values, $login); -- cgit v1.2.3-24-g4f1b