diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php index 8e2a5ad4ed..230bb28bf1 100644 --- a/phpBB/admin/admin_user_ban.php +++ b/phpBB/admin/admin_user_ban.php @@ -155,7 +155,7 @@ if ( isset($HTTP_POST_VARS['submit']) ) // contained in the annotated php manual at php.com (ereg // section) // - if ( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) ) + if (preg_match('#^(([a-z0-9&.-_+])|(\*))+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*?[a-z]+$#is', trim($email_list_temp[$i]))) { $email_list[] = trim($email_list_temp[$i]); } diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 067db48e3a..944abe9332 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -58,6 +58,8 @@ p,ul,td {font-size:10pt;}
  • Fixed wrong path to database schema files within the upgrade script
  • Fixed username validation - catch double quotes correctly
  • Changed email validation (apersands are allowed within emails now)
    • +
  • Fixed email validation for banned email addresses
    • +
  • Removed underline from email domain validation
  • Fixed redirection for PM Sentbox Folder, Installation and sending Email to another user
  • Fixed poll deletion
  • Fixed Mozilla navigation bar
    • @@ -100,6 +102,7 @@ p,ul,td {font-size:10pt;}
  • Fixed disappearing post text if emoticon was inserted directly after pressing a BBCode button
  • Display correct alt-tag for smilies within postings - emoticon instead of filename
  • Prevented the ability to apply BBCode to website contents - we will find another EasterEgg
    • +
  • Fixed problems with very long user passwords

    • 1.ii. Changes since 2.0.3

    diff --git a/phpBB/includes/functions_validate.php b/phpBB/includes/functions_validate.php index a1c771b351..327ac47170 100644 --- a/phpBB/includes/functions_validate.php +++ b/phpBB/includes/functions_validate.php @@ -117,7 +117,7 @@ function validate_email($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 FROM " . BANLIST_TABLE; diff --git a/phpBB/templates/subSilver/admin/user_edit_body.tpl b/phpBB/templates/subSilver/admin/user_edit_body.tpl index db68b1cea7..359bdeb374 100644 --- a/phpBB/templates/subSilver/admin/user_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/user_edit_body.tpl @@ -28,14 +28,14 @@ {L_NEW_PASSWORD}: *
    {L_PASSWORD_IF_CHANGED} - + {L_CONFIRM_PASSWORD}: *
    {L_PASSWORD_CONFIRM_IF_CHANGED} - + diff --git a/phpBB/templates/subSilver/index_body.tpl b/phpBB/templates/subSilver/index_body.tpl index 705fb108f7..618ea68095 100644 --- a/phpBB/templates/subSilver/index_body.tpl +++ b/phpBB/templates/subSilver/index_body.tpl @@ -76,7 +76,7 @@ {L_USERNAME}:    {L_PASSWORD}: - +      {L_AUTO_LOGIN}     diff --git a/phpBB/templates/subSilver/login_body.tpl b/phpBB/templates/subSilver/login_body.tpl index 45c279ce81..a08e4032b6 100644 --- a/phpBB/templates/subSilver/login_body.tpl +++ b/phpBB/templates/subSilver/login_body.tpl @@ -25,7 +25,7 @@ {L_PASSWORD}: - + diff --git a/phpBB/templates/subSilver/profile_add_body.tpl b/phpBB/templates/subSilver/profile_add_body.tpl index 758396e9cb..600b2cb4a6 100644 --- a/phpBB/templates/subSilver/profile_add_body.tpl +++ b/phpBB/templates/subSilver/profile_add_body.tpl @@ -37,7 +37,7 @@ {L_CURRENT_PASSWORD}: *
    {L_CONFIRM_PASSWORD_EXPLAIN} - + @@ -45,14 +45,14 @@ {L_NEW_PASSWORD}: *
    {L_PASSWORD_IF_CHANGED} - + {L_CONFIRM_PASSWORD}: *
    {L_PASSWORD_CONFIRM_IF_CHANGED} - +