guess what ? yes, just fixed small glitches.

git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3705 89ea8834-ac86-4346-8a33-228a782c2dd0

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]);
 			}

phpBB/docs/CHANGELOG.html

@@ -58,6 +58,8 @@ p,ul,td {font-size:10pt;}
 <li>Fixed wrong path to database schema files within the upgrade script</li>
 <li>Fixed username validation - catch double quotes correctly</li>
 <li>Changed email validation (apersands are allowed within emails now)</li>
+<li>Fixed email validation for banned email addresses</li>
+<li>Removed underline from email domain validation</li>
 <li>Fixed redirection for PM Sentbox Folder, Installation and sending Email to another user</li>
 <li>Fixed poll deletion</li>
 <li>Fixed Mozilla navigation bar</li>
@@ -100,6 +102,7 @@ p,ul,td {font-size:10pt;}
 <li>Fixed disappearing post text if emoticon was inserted directly after pressing a BBCode button</li>
 <li>Display correct alt-tag for smilies within postings - emoticon instead of filename</li>
 <li>Prevented the ability to apply BBCode to website contents - we will find another EasterEgg</li>
+<li>Fixed problems with very long user passwords</li>
 </ul>
 
 <a name="203"></a><h3 class="h3">1.ii. Changes since 2.0.3</h3>

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;

phpBB/templates/subSilver/admin/user_edit_body.tpl

@@ -28,14 +28,14 @@
 	  <td class="row1"><span class="gen">{L_NEW_PASSWORD}: *</span><br />
 		<span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
 	  <td class="row2"> 
-		<input class="post" type="password" name="password" size="35" maxlength="100" value="" />
+		<input class="post" type="password" name="password" size="35" maxlength="32" value="" />
 	  </td>
 	</tr>
 	<tr> 
 	  <td class="row1"><span class="gen">{L_CONFIRM_PASSWORD}: * </span><br />
 		<span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td>
 	  <td class="row2"> 
-		<input class="post" type="password" name="password_confirm" size="35" maxlength="100" value="" />
+		<input class="post" type="password" name="password_confirm" size="35" maxlength="32" value="" />
 	  </td>
 	</tr>
 	<tr> 

phpBB/templates/subSilver/index_body.tpl

@@ -76,7 +76,7 @@
 	  <td class="row1" align="center" valign="middle" height="28"><span class="gensmall">{L_USERNAME}: 
 		<input class="post" type="text" name="username" size="10" />
 		&nbsp;&nbsp;&nbsp;{L_PASSWORD}: 
-		<input class="post" type="password" name="password" size="10" />
+		<input class="post" type="password" name="password" size="10" maxlength="32" />
 		&nbsp;&nbsp; &nbsp;&nbsp;{L_AUTO_LOGIN} 
 		<input class="text" type="checkbox" name="autologin" />
 		&nbsp;&nbsp;&nbsp; 

phpBB/templates/subSilver/login_body.tpl

@@ -25,7 +25,7 @@
 		  <tr> 
 			<td align="right"><span class="gen">{L_PASSWORD}:</span></td>
 			<td> 
-			  <input type="password" name="password" size="25" maxlength="25" />
+			  <input type="password" name="password" size="25" maxlength="32" />
 			</td>
 		  </tr>
 		  <tr align="center"> 

phpBB/templates/subSilver/profile_add_body.tpl

@@ -37,7 +37,7 @@
 	  <td class="row1"><span class="gen">{L_CURRENT_PASSWORD}: *</span><br />
 		<span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
 	  <td class="row2"> 
-		<input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="100" value="{CUR_PASSWORD}" />
+		<input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="32" value="{CUR_PASSWORD}" />
 	  </td>
 	</tr>
 	<!-- END switch_edit_profile -->
@@ -45,14 +45,14 @@
 	  <td class="row1"><span class="gen">{L_NEW_PASSWORD}: *</span><br />
 		<span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
 	  <td class="row2"> 
-		<input type="password" class="post" style="width: 200px" name="new_password" size="25" maxlength="100" value="{NEW_PASSWORD}" />
+		<input type="password" class="post" style="width: 200px" name="new_password" size="25" maxlength="32" value="{NEW_PASSWORD}" />
 	  </td>
 	</tr>
 	<tr> 
 	  <td class="row1"><span class="gen">{L_CONFIRM_PASSWORD}: * </span><br />
 		<span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td>
 	  <td class="row2"> 
-		<input type="password" class="post" style="width: 200px" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" />
+		<input type="password" class="post" style="width: 200px" name="password_confirm" size="25" maxlength="32" value="{PASSWORD_CONFIRM}" />
 	  </td>
 	</tr>
 	<!-- BEGIN switch_confirm -->