makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change way error is returned to validate email/username, fixes problem with lack of language support for error output and subsequent doubled username, etc. issues

Browse source 
git-svn-id: file:///svn/phpbb/trunk@2112 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-02-12 17:14:01 +00:00
parent db2910a24e
commit 19928f6a48
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/profile.php
View file

@ -92,9 +92,9 @@ function validate_email($email)
{ {
global $db, $lang; global $db, $lang;
if($email != "") if ( $email != "" )
{ {
if( preg_match("/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is", $email) ) if ( preg_match("/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is", $email) )
{ {
$sql = "SELECT ban_email $sql = "SELECT ban_email
FROM " . BANLIST_TABLE; FROM " . BANLIST_TABLE;
@ -105,7 +105,7 @@ function validate_email($email)
$match_email = str_replace("*@", ".*@", $row['ban_email']); $match_email = str_replace("*@", ".*@", $row['ban_email']);
if ( preg_match("/^" . $match_email . "$/is", $email) ) if ( preg_match("/^" . $match_email . "$/is", $email) )
{ {
return array('error' => $lang['Email_banned']); return array('error' => true, 'error_msg' => $lang['Email_banned']);
} }
} }
} }
@ -120,14 +120,14 @@ function validate_email($email)
if ( $email_taken = $db->sql_fetchrow($result) ) if ( $email_taken = $db->sql_fetchrow($result) )
{ {
return array('error' => $lang['Email_taken']); return array('error' => true, 'error_msg' => $lang['Email_taken']);
} }
return array('error' => ''); return array('error' => false, 'error_msg' => '');
} }
} }
return array('error' => $lang['Email_invalid']); return array('error' => true, 'error_msg' => $lang['Email_invalid']);
} }
// //
@ -234,12 +234,11 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
// //
if ( $mode == "viewprofile" ) if ( $mode == "viewprofile" )
{ {
if ( empty($HTTP_GET_VARS[POST_USERS_URL]) || $HTTP_GET_VARS[POST_USERS_URL] == ANONYMOUS ) if ( empty($HTTP_GET_VARS[POST_USERS_URL]) || $HTTP_GET_VARS[POST_USERS_URL] == ANONYMOUS )
{ {
message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']); message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
} }
$profiledata = get_userdata_from_id(intval($HTTP_GET_VARS[POST_USERS_URL])); $profiledata = get_userdata(intval($HTTP_GET_VARS[POST_USERS_URL]));
$sql = "SELECT * $sql = "SELECT *
FROM " . RANKS_TABLE . " FROM " . RANKS_TABLE . "
@ -670,7 +669,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
if( $email != $userdata['user_email'] || $mode == "register" ) if( $email != $userdata['user_email'] || $mode == "register" )
{ {
$result = validate_email($email); $result = validate_email($email);
if( $result['error'] != '' ) if( $result['error'] )
{ {
$email = $userdata['user_email']; $email = $userdata['user_email'];
@ -679,7 +678,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
{ {
$error_msg .= "<br />"; $error_msg .= "<br />";
} }
$error_msg .= $result['error']; $error_msg .= $result['error_msg'];
} }
if ( $mode == "editprofile" ) if ( $mode == "editprofile" )
@ -712,14 +711,14 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
if( $username != $userdata['username'] || $mode == "register" ) if( $username != $userdata['username'] || $mode == "register" )
{ {
$result = validate_username($username); $result = validate_username($username);
if( $result['error'] != '' ) if( $result['error'] )
{ {
$error = TRUE; $error = TRUE;
if(isset($error_msg)) if(isset($error_msg))
{ {
$error_msg .= "<br />"; $error_msg .= "<br />";
} }
$error_msg .= $result['error']; $error_msg .= $result['error_msg'];
} }
else else
{ {