More fixes

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

phpBB/docs/CHANGELOG.html

@@ -163,6 +163,8 @@ p,ul,td {font-size:10pt;}
 <li>Fixed bbcode quote breaking when username contained ] before [</li>
 <li>Fixed duplicate group_id error during upgrade of users from phpBB 1.x</li>
 <li>Fixed stripslashes() problem with the conversion of the config table from phpBB 1.x</li>
+<li>Rejiggled validation code, may eliminate "Username disallowed" issues</li>
+<li></li>
 <li></li>
 </ul>
 

phpBB/includes/functions_validate.php

@@ -18,7 +18,6 @@
  *   the Free Software Foundation; either version 2 of the License, or
  *   (at your option) any later version.
  *
- *
  ***************************************************************************/
 
 //
@@ -41,10 +40,12 @@ function validate_username($username)
 		{
 			if (($userdata['session_logged_in'] && $row['username'] != $userdata['username']) || !$userdata['session_logged_in'])
 			{
+				$db->sql_freeresult($result);
 				return array('error' => true, 'error_msg' => $lang['Username_taken']);
 			}
 		}
 	}
+	$db->sql_freeresult($result);
 
 	$sql = "SELECT group_name
 		FROM " . GROUPS_TABLE . " 
@@ -53,35 +54,49 @@ function validate_username($username)
 	{
 		if ($row = $db->sql_fetchrow($result))
 		{
+			$db->sql_freeresult($result);
 			return array('error' => true, 'error_msg' => $lang['Username_taken']);
 		}
 	}
+	$db->sql_freeresult($result);
 
 	$sql = "SELECT disallow_username
 		FROM " . DISALLOW_TABLE;
 	if ($result = $db->sql_query($sql))
 	{
-		while( $row = $db->sql_fetchrow($result) )
+		if ($row = $db->sql_fetchrow($result))
+		{
+			do
 			{
 				if (preg_match("#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($row['disallow_username'], '#')) . ")\b#i", $username))
 				{
+					$db->sql_freeresult($result);
 					return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
 				}
 			}
+			while($row = $db->sql_fetchrow($result));
 		}
+	}
+	$db->sql_freeresult($result);
 
 	$sql = "SELECT word 
 		FROM  " . WORDS_TABLE;
 	if ($result = $db->sql_query($sql))
 	{
-		while( $row = $db->sql_fetchrow($result) )
+		if ($row = $db->sql_fetchrow($result))
+		{
+			do
 			{
 				if (preg_match("#\b(" . str_replace("\*", ".*?", phpbb_preg_quote($row['word'], '#')) . ")\b#i", $username))
 				{
+					$db->sql_freeresult($result);
 					return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
 				}
 			}
+			while ($row = $db->sql_fetchrow($result));
 		}
+	}
+	$db->sql_freeresult($result);
 
 	// Don't allow " in username.
 	if (strstr($username, '"'))
@@ -108,15 +123,21 @@ function validate_email($email)
 				FROM " . BANLIST_TABLE;
 			if ($result = $db->sql_query($sql))
 			{
-				while( $row = $db->sql_fetchrow($result) )
+				if ($row = $db->sql_fetchrow($result))
+				{
+					do
 					{
 						$match_email = str_replace('*', '.*?', $row['ban_email']);
 						if (preg_match('/^' . $match_email . '$/is', $email))
 						{
+							$db->sql_freeresult($result);
 							return array('error' => true, 'error_msg' => $lang['Email_banned']);
 						}
 					}
+					while($row = $db->sql_fetchrow($result))
 				}
+			}
+			$db->sql_freeresult($result);
 
 			$sql = "SELECT user_email
 				FROM " . USERS_TABLE . "
@@ -130,6 +151,7 @@ function validate_email($email)
 			{
 				return array('error' => true, 'error_msg' => $lang['Email_taken']);
 			}
+			$db->sql_freeresult($result);
 
 			return array('error' => false, 'error_msg' => '');
 		}

phpBB/install/schemas/mysql_schema.sql

@@ -97,7 +97,7 @@ CREATE TABLE phpbb_config (
 #
 CREATE TABLE phpbb_disallow (
    disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-   disallow_username varchar(25),
+   disallow_username varchar(25) DEFAULT '' NOT NULL,
    PRIMARY KEY (disallow_id)
 );
 
@@ -285,11 +285,6 @@ CREATE TABLE phpbb_search_wordmatch (
 # is likely to be noticeably faster than continually
 # writing to disk ...
 #
-# I must admit I read about this type on vB's board.
-# Hey, I never said you cannot get basic ideas from
-# competing boards, just that I find it's best not to
-# look at any code ... !
-#
 CREATE TABLE phpbb_sessions (
    session_id char(32) DEFAULT '' NOT NULL,
    session_user_id mediumint(8) DEFAULT '0' NOT NULL,