8 files changed, 289 insertions, 228 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index ca94bf03a9..3ad01f62bb 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -894,10 +894,10 @@ function change_database_data(&$no_updates, $version)
 			set_config('captcha_gd_wave', 0);
 			set_config('captcha_gd_3d_noise', 1);
 			set_config('captcha_gd_fonts', 1);
-			set_config('confirm_refresh', 1);
-
 
+			set_config('confirm_refresh', 1);
 
+			// Hash old MD5 passwords
 			$sql = 'SELECT user_id, user_password
 					FROM ' . USERS_TABLE . '
 					WHERE user_pass_convert = 1';
@@ -916,11 +916,73 @@ function change_database_data(&$no_updates, $version)
 			}
 			$db->sql_freeresult($result);
 
+			// Adjust bot entry
 			$sql = 'UPDATE ' . BOTS_TABLE . "
 				SET bot_agent = 'ichiro/'
 				WHERE bot_agent = 'ichiro/2'";
 			_sql($sql, $errored, $error_ary);
 
+			// Before we are able to add a unique key to auth_option, we need to remove duplicate entries
+
+			// We get duplicate entries first
+			$sql = 'SELECT auth_option
+				FROM ' . ACL_OPTIONS_TABLE . '
+				GROUP BY auth_option
+				HAVING COUNT(*) >= 1';
+			$result = $db->sql_query($sql);
+
+			$auth_options = array();
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$auth_options[] = $row['auth_option'];
+			}
+			$db->sql_freeresult($result);
+
+			// Remove specific auth options
+			if (!empty($auth_options))
+			{
+				foreach ($auth_options as $option)
+				{
+					// Select auth_option_ids... the largest id will be preserved
+					$sql = 'SELECT auth_option_id
+						FROM ' . ACL_OPTIONS_TABLE . "
+						WHERE auth_option = '" . $db->sql_escape($option) . "'
+						ORDER BY auth_option_id DESC";
+					$result = $db->sql_query_limit($sql, 0, 1);
+
+					while ($row = $db->sql_fetchrow($result))
+					{
+						// Ok, remove this auth option...
+						_sql('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+						_sql('DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+						_sql('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+						_sql('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id = ' . $row['auth_option_id'], $errored, $error_ary);
+					}
+					$db->sql_freeresult($result);
+				}
+			}
+
+			// Now make auth_option UNIQUE, by dropping the old index and adding a UNIQUE one.
+			$changes = array(
+				'drop_keys'			=> array(
+					ACL_OPTIONS_TABLE		=> array('auth_option'),
+				),
+				'add_unique_index'	=> array(
+					ACL_OPTIONS_TABLE		=> array(
+						'auth_option'		=> array('auth_option'),
+					),
+				),
+			);
+
+			global $db_tools;
+
+			$statements = $db_tools->perform_schema_changes($changes);
+
+			foreach ($statements as $sql)
+			{
+				_sql($sql, $errored, $error_ary);
+			}
+
 			$no_updates = false;
 
 		break;
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 8ac371b9ed..fecbc61dc1 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -65,7 +65,7 @@ CREATE TABLE phpbb_acl_options (
 
 ALTER TABLE phpbb_acl_options ADD PRIMARY KEY (auth_option_id);;
 
-CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options(auth_option);;
+CREATE UNIQUE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options(auth_option);;
 
 CREATE GENERATOR phpbb_acl_options_gen;;
 SET GENERATOR phpbb_acl_options_gen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 445a0eda08..8600fdb1e0 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -25,15 +25,15 @@ CREATE TABLE [phpbb_attachments] (
 	[mimetype] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[filesize] [int] DEFAULT (0) NOT NULL ,
 	[filetime] [int] DEFAULT (0) NOT NULL ,
-	[thumbnail] [int] DEFAULT (0) NOT NULL 
+	[thumbnail] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_attachments] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_attachments] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_attachments] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_attachments] PRIMARY KEY  CLUSTERED
 	(
 		[attach_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [filetime] ON [phpbb_attachments]([filetime]) ON [PRIMARY]
@@ -60,7 +60,7 @@ CREATE TABLE [phpbb_acl_groups] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[auth_option_id] [int] DEFAULT (0) NOT NULL ,
 	[auth_role_id] [int] DEFAULT (0) NOT NULL ,
-	[auth_setting] [int] DEFAULT (0) NOT NULL 
+	[auth_setting] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -82,18 +82,18 @@ CREATE TABLE [phpbb_acl_options] (
 	[auth_option] [varchar] (50) DEFAULT ('') NOT NULL ,
 	[is_global] [int] DEFAULT (0) NOT NULL ,
 	[is_local] [int] DEFAULT (0) NOT NULL ,
-	[founder_only] [int] DEFAULT (0) NOT NULL 
+	[founder_only] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_acl_options] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_acl_options] PRIMARY KEY  CLUSTERED
 	(
 		[auth_option_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
-CREATE  INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY]
+CREATE  UNIQUE  INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY]
 GO
 
 
@@ -105,15 +105,15 @@ CREATE TABLE [phpbb_acl_roles] (
 	[role_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[role_description] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[role_type] [varchar] (10) DEFAULT ('') NOT NULL ,
-	[role_order] [int] DEFAULT (0) NOT NULL 
+	[role_order] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_acl_roles] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_acl_roles] PRIMARY KEY  CLUSTERED
 	(
 		[role_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [role_type] ON [phpbb_acl_roles]([role_type]) ON [PRIMARY]
@@ -129,16 +129,16 @@ GO
 CREATE TABLE [phpbb_acl_roles_data] (
 	[role_id] [int] DEFAULT (0) NOT NULL ,
 	[auth_option_id] [int] DEFAULT (0) NOT NULL ,
-	[auth_setting] [int] DEFAULT (0) NOT NULL 
+	[auth_setting] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_acl_roles_data] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_acl_roles_data] PRIMARY KEY  CLUSTERED
 	(
 		[role_id],
 		[auth_option_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [ath_op_id] ON [phpbb_acl_roles_data]([auth_option_id]) ON [PRIMARY]
@@ -153,7 +153,7 @@ CREATE TABLE [phpbb_acl_users] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[auth_option_id] [int] DEFAULT (0) NOT NULL ,
 	[auth_role_id] [int] DEFAULT (0) NOT NULL ,
-	[auth_setting] [int] DEFAULT (0) NOT NULL 
+	[auth_setting] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -179,15 +179,15 @@ CREATE TABLE [phpbb_banlist] (
 	[ban_end] [int] DEFAULT (0) NOT NULL ,
 	[ban_exclude] [int] DEFAULT (0) NOT NULL ,
 	[ban_reason] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[ban_give_reason] [varchar] (255) DEFAULT ('') NOT NULL 
+	[ban_give_reason] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_banlist] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_banlist] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_banlist] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_banlist] PRIMARY KEY  CLUSTERED
 	(
 		[ban_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [ban_end] ON [phpbb_banlist]([ban_end]) ON [PRIMARY]
@@ -216,15 +216,15 @@ CREATE TABLE [phpbb_bbcodes] (
 	[first_pass_match] [text] DEFAULT ('') NOT NULL ,
 	[first_pass_replace] [text] DEFAULT ('') NOT NULL ,
 	[second_pass_match] [text] DEFAULT ('') NOT NULL ,
-	[second_pass_replace] [text] DEFAULT ('') NOT NULL 
+	[second_pass_replace] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_bbcodes] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_bbcodes] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_bbcodes] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_bbcodes] PRIMARY KEY  CLUSTERED
 	(
 		[bbcode_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [display_on_post] ON [phpbb_bbcodes]([display_on_posting]) ON [PRIMARY]
@@ -236,16 +236,16 @@ GO
 */
 CREATE TABLE [phpbb_bookmarks] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
-	[user_id] [int] DEFAULT (0) NOT NULL 
+	[user_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_bookmarks] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_bookmarks] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_bookmarks] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_bookmarks] PRIMARY KEY  CLUSTERED
 	(
 		[topic_id],
 		[user_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -258,15 +258,15 @@ CREATE TABLE [phpbb_bots] (
 	[bot_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[bot_agent] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[bot_ip] [varchar] (255) DEFAULT ('') NOT NULL 
+	[bot_ip] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_bots] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_bots] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_bots] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_bots] PRIMARY KEY  CLUSTERED
 	(
 		[bot_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [bot_active] ON [phpbb_bots]([bot_active]) ON [PRIMARY]
@@ -279,15 +279,15 @@ GO
 CREATE TABLE [phpbb_config] (
 	[config_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[config_value] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[is_dynamic] [int] DEFAULT (0) NOT NULL 
+	[is_dynamic] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_config] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_config] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_config] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_config] PRIMARY KEY  CLUSTERED
 	(
 		[config_name]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [is_dynamic] ON [phpbb_config]([is_dynamic]) ON [PRIMARY]
@@ -302,16 +302,16 @@ CREATE TABLE [phpbb_confirm] (
 	[session_id] [char] (32) DEFAULT ('') NOT NULL ,
 	[confirm_type] [int] DEFAULT (0) NOT NULL ,
 	[code] [varchar] (8) DEFAULT ('') NOT NULL ,
-	[seed] [int] DEFAULT (0) NOT NULL 
+	[seed] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_confirm] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_confirm] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_confirm] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_confirm] PRIMARY KEY  CLUSTERED
 	(
 		[session_id],
 		[confirm_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [confirm_type] ON [phpbb_confirm]([confirm_type]) ON [PRIMARY]
@@ -323,15 +323,15 @@ GO
 */
 CREATE TABLE [phpbb_disallow] (
 	[disallow_id] [int] IDENTITY (1, 1) NOT NULL ,
-	[disallow_username] [varchar] (255) DEFAULT ('') NOT NULL 
+	[disallow_username] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_disallow] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_disallow] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_disallow] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_disallow] PRIMARY KEY  CLUSTERED
 	(
 		[disallow_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -345,15 +345,15 @@ CREATE TABLE [phpbb_drafts] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[save_time] [int] DEFAULT (0) NOT NULL ,
 	[draft_subject] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[draft_message] [text] DEFAULT ('') NOT NULL 
+	[draft_message] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_drafts] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_drafts] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_drafts] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_drafts] PRIMARY KEY  CLUSTERED
 	(
 		[draft_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [save_time] ON [phpbb_drafts]([save_time]) ON [PRIMARY]
@@ -366,15 +366,15 @@ GO
 CREATE TABLE [phpbb_extensions] (
 	[extension_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[group_id] [int] DEFAULT (0) NOT NULL ,
-	[extension] [varchar] (100) DEFAULT ('') NOT NULL 
+	[extension] [varchar] (100) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_extensions] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_extensions] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_extensions] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_extensions] PRIMARY KEY  CLUSTERED
 	(
 		[extension_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -390,15 +390,15 @@ CREATE TABLE [phpbb_extension_groups] (
 	[upload_icon] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[max_filesize] [int] DEFAULT (0) NOT NULL ,
 	[allowed_forums] [varchar] (8000) DEFAULT ('') NOT NULL ,
-	[allow_in_pm] [int] DEFAULT (0) NOT NULL 
+	[allow_in_pm] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_extension_groups] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_extension_groups] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_extension_groups] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_extension_groups] PRIMARY KEY  CLUSTERED
 	(
 		[group_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -446,15 +446,15 @@ CREATE TABLE [phpbb_forums] (
 	[prune_next] [int] DEFAULT (0) NOT NULL ,
 	[prune_days] [int] DEFAULT (0) NOT NULL ,
 	[prune_viewed] [int] DEFAULT (0) NOT NULL ,
-	[prune_freq] [int] DEFAULT (0) NOT NULL 
+	[prune_freq] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_forums] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_forums] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_forums] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_forums] PRIMARY KEY  CLUSTERED
 	(
 		[forum_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [left_right_id] ON [phpbb_forums]([left_id], [right_id]) ON [PRIMARY]
@@ -470,17 +470,17 @@ GO
 CREATE TABLE [phpbb_forums_access] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[session_id] [char] (32) DEFAULT ('') NOT NULL 
+	[session_id] [char] (32) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_forums_access] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_forums_access] PRIMARY KEY  CLUSTERED
 	(
 		[forum_id],
 		[user_id],
 		[session_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -490,16 +490,16 @@ GO
 CREATE TABLE [phpbb_forums_track] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
-	[mark_time] [int] DEFAULT (0) NOT NULL 
+	[mark_time] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_forums_track] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_forums_track] PRIMARY KEY  CLUSTERED
 	(
 		[user_id],
 		[forum_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -509,7 +509,7 @@ GO
 CREATE TABLE [phpbb_forums_watch] (
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[notify_status] [int] DEFAULT (0) NOT NULL 
+	[notify_status] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -546,15 +546,15 @@ CREATE TABLE [phpbb_groups] (
 	[group_receive_pm] [int] DEFAULT (0) NOT NULL ,
 	[group_message_limit] [int] DEFAULT (0) NOT NULL ,
 	[group_max_recipients] [int] DEFAULT (0) NOT NULL ,
-	[group_legend] [int] DEFAULT (1) NOT NULL 
+	[group_legend] [int] DEFAULT (1) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_groups] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_groups] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_groups] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_groups] PRIMARY KEY  CLUSTERED
 	(
 		[group_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [group_legend_name] ON [phpbb_groups]([group_legend], [group_name]) ON [PRIMARY]
@@ -570,15 +570,15 @@ CREATE TABLE [phpbb_icons] (
 	[icons_width] [int] DEFAULT (0) NOT NULL ,
 	[icons_height] [int] DEFAULT (0) NOT NULL ,
 	[icons_order] [int] DEFAULT (0) NOT NULL ,
-	[display_on_posting] [int] DEFAULT (1) NOT NULL 
+	[display_on_posting] [int] DEFAULT (1) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_icons] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_icons] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_icons] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_icons] PRIMARY KEY  CLUSTERED
 	(
 		[icons_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [display_on_posting] ON [phpbb_icons]([display_on_posting]) ON [PRIMARY]
@@ -594,15 +594,15 @@ CREATE TABLE [phpbb_lang] (
 	[lang_dir] [varchar] (30) DEFAULT ('') NOT NULL ,
 	[lang_english_name] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[lang_local_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[lang_author] [varchar] (255) DEFAULT ('') NOT NULL 
+	[lang_author] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_lang] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_lang] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_lang] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_lang] PRIMARY KEY  CLUSTERED
 	(
 		[lang_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [lang_iso] ON [phpbb_lang]([lang_iso]) ON [PRIMARY]
@@ -622,15 +622,15 @@ CREATE TABLE [phpbb_log] (
 	[log_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[log_time] [int] DEFAULT (0) NOT NULL ,
 	[log_operation] [varchar] (4000) DEFAULT ('') NOT NULL ,
-	[log_data] [text] DEFAULT ('') NOT NULL 
+	[log_data] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_log] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_log] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_log] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_log] PRIMARY KEY  CLUSTERED
 	(
 		[log_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [log_type] ON [phpbb_log]([log_type]) ON [PRIMARY]
@@ -658,7 +658,7 @@ CREATE TABLE [phpbb_moderator_cache] (
 	[username] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[group_id] [int] DEFAULT (0) NOT NULL ,
 	[group_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[display_on_index] [int] DEFAULT (1) NOT NULL 
+	[display_on_index] [int] DEFAULT (1) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -683,15 +683,15 @@ CREATE TABLE [phpbb_modules] (
 	[right_id] [int] DEFAULT (0) NOT NULL ,
 	[module_langname] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[module_mode] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[module_auth] [varchar] (255) DEFAULT ('') NOT NULL 
+	[module_auth] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_modules] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_modules] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_modules] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_modules] PRIMARY KEY  CLUSTERED
 	(
 		[module_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [left_right_id] ON [phpbb_modules]([left_id], [right_id]) ON [PRIMARY]
@@ -711,7 +711,7 @@ CREATE TABLE [phpbb_poll_options] (
 	[poll_option_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[poll_option_text] [varchar] (4000) DEFAULT ('') NOT NULL ,
-	[poll_option_total] [int] DEFAULT (0) NOT NULL 
+	[poll_option_total] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -729,7 +729,7 @@ CREATE TABLE [phpbb_poll_votes] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[poll_option_id] [int] DEFAULT (0) NOT NULL ,
 	[vote_user_id] [int] DEFAULT (0) NOT NULL ,
-	[vote_user_ip] [varchar] (40) DEFAULT ('') NOT NULL 
+	[vote_user_ip] [varchar] (40) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -772,15 +772,15 @@ CREATE TABLE [phpbb_posts] (
 	[post_edit_reason] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[post_edit_user] [int] DEFAULT (0) NOT NULL ,
 	[post_edit_count] [int] DEFAULT (0) NOT NULL ,
-	[post_edit_locked] [int] DEFAULT (0) NOT NULL 
+	[post_edit_locked] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_posts] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_posts] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_posts] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_posts] PRIMARY KEY  CLUSTERED
 	(
 		[post_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [forum_id] ON [phpbb_posts]([forum_id]) ON [PRIMARY]
@@ -826,15 +826,15 @@ CREATE TABLE [phpbb_privmsgs] (
 	[message_edit_time] [int] DEFAULT (0) NOT NULL ,
 	[message_edit_count] [int] DEFAULT (0) NOT NULL ,
 	[to_address] [varchar] (4000) DEFAULT ('') NOT NULL ,
-	[bcc_address] [varchar] (4000) DEFAULT ('') NOT NULL 
+	[bcc_address] [varchar] (4000) DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_privmsgs] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_privmsgs] PRIMARY KEY  CLUSTERED
 	(
 		[msg_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [author_ip] ON [phpbb_privmsgs]([author_ip]) ON [PRIMARY]
@@ -857,15 +857,15 @@ CREATE TABLE [phpbb_privmsgs_folder] (
 	[folder_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[folder_name] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[pm_count] [int] DEFAULT (0) NOT NULL 
+	[pm_count] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_privmsgs_folder] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_privmsgs_folder] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_privmsgs_folder] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_privmsgs_folder] PRIMARY KEY  CLUSTERED
 	(
 		[folder_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [user_id] ON [phpbb_privmsgs_folder]([user_id]) ON [PRIMARY]
@@ -884,15 +884,15 @@ CREATE TABLE [phpbb_privmsgs_rules] (
 	[rule_user_id] [int] DEFAULT (0) NOT NULL ,
 	[rule_group_id] [int] DEFAULT (0) NOT NULL ,
 	[rule_action] [int] DEFAULT (0) NOT NULL ,
-	[rule_folder_id] [int] DEFAULT (0) NOT NULL 
+	[rule_folder_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_privmsgs_rules] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_privmsgs_rules] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_privmsgs_rules] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_privmsgs_rules] PRIMARY KEY  CLUSTERED
 	(
 		[rule_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [user_id] ON [phpbb_privmsgs_rules]([user_id]) ON [PRIMARY]
@@ -912,7 +912,7 @@ CREATE TABLE [phpbb_privmsgs_to] (
 	[pm_replied] [int] DEFAULT (0) NOT NULL ,
 	[pm_marked] [int] DEFAULT (0) NOT NULL ,
 	[pm_forwarded] [int] DEFAULT (0) NOT NULL ,
-	[folder_id] [int] DEFAULT (0) NOT NULL 
+	[folder_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -946,15 +946,15 @@ CREATE TABLE [phpbb_profile_fields] (
 	[field_hide] [int] DEFAULT (0) NOT NULL ,
 	[field_no_view] [int] DEFAULT (0) NOT NULL ,
 	[field_active] [int] DEFAULT (0) NOT NULL ,
-	[field_order] [int] DEFAULT (0) NOT NULL 
+	[field_order] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_profile_fields] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_profile_fields] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_profile_fields] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_profile_fields] PRIMARY KEY  CLUSTERED
 	(
 		[field_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [fld_type] ON [phpbb_profile_fields]([field_type]) ON [PRIMARY]
@@ -968,15 +968,15 @@ GO
 	Table: 'phpbb_profile_fields_data'
 */
 CREATE TABLE [phpbb_profile_fields_data] (
-	[user_id] [int] DEFAULT (0) NOT NULL 
+	[user_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_profile_fields_data] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_profile_fields_data] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_profile_fields_data] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_profile_fields_data] PRIMARY KEY  CLUSTERED
 	(
 		[user_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -988,17 +988,17 @@ CREATE TABLE [phpbb_profile_fields_lang] (
 	[lang_id] [int] DEFAULT (0) NOT NULL ,
 	[option_id] [int] DEFAULT (0) NOT NULL ,
 	[field_type] [int] DEFAULT (0) NOT NULL ,
-	[lang_value] [varchar] (255) DEFAULT ('') NOT NULL 
+	[lang_value] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_profile_fields_lang] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_profile_fields_lang] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_profile_fields_lang] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_profile_fields_lang] PRIMARY KEY  CLUSTERED
 	(
 		[field_id],
 		[lang_id],
 		[option_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1010,16 +1010,16 @@ CREATE TABLE [phpbb_profile_lang] (
 	[lang_id] [int] DEFAULT (0) NOT NULL ,
 	[lang_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[lang_explain] [varchar] (4000) DEFAULT ('') NOT NULL ,
-	[lang_default_value] [varchar] (255) DEFAULT ('') NOT NULL 
+	[lang_default_value] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_profile_lang] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_profile_lang] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_profile_lang] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_profile_lang] PRIMARY KEY  CLUSTERED
 	(
 		[field_id],
 		[lang_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1031,15 +1031,15 @@ CREATE TABLE [phpbb_ranks] (
 	[rank_title] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[rank_min] [int] DEFAULT (0) NOT NULL ,
 	[rank_special] [int] DEFAULT (0) NOT NULL ,
-	[rank_image] [varchar] (255) DEFAULT ('') NOT NULL 
+	[rank_image] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_ranks] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_ranks] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_ranks] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_ranks] PRIMARY KEY  CLUSTERED
 	(
 		[rank_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1054,15 +1054,15 @@ CREATE TABLE [phpbb_reports] (
 	[user_notify] [int] DEFAULT (0) NOT NULL ,
 	[report_closed] [int] DEFAULT (0) NOT NULL ,
 	[report_time] [int] DEFAULT (0) NOT NULL ,
-	[report_text] [text] DEFAULT ('') NOT NULL 
+	[report_text] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_reports] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_reports] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_reports] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_reports] PRIMARY KEY  CLUSTERED
 	(
 		[report_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1073,15 +1073,15 @@ CREATE TABLE [phpbb_reports_reasons] (
 	[reason_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[reason_title] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[reason_description] [text] DEFAULT ('') NOT NULL ,
-	[reason_order] [int] DEFAULT (0) NOT NULL 
+	[reason_order] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_reports_reasons] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_reports_reasons] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_reports_reasons] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_reports_reasons] PRIMARY KEY  CLUSTERED
 	(
 		[reason_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1092,15 +1092,15 @@ CREATE TABLE [phpbb_search_results] (
 	[search_key] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[search_time] [int] DEFAULT (0) NOT NULL ,
 	[search_keywords] [text] DEFAULT ('') NOT NULL ,
-	[search_authors] [text] DEFAULT ('') NOT NULL 
+	[search_authors] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_search_results] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_search_results] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_search_results] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_search_results] PRIMARY KEY  CLUSTERED
 	(
 		[search_key]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1111,15 +1111,15 @@ CREATE TABLE [phpbb_search_wordlist] (
 	[word_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[word_text] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[word_common] [int] DEFAULT (0) NOT NULL ,
-	[word_count] [int] DEFAULT (0) NOT NULL 
+	[word_count] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_search_wordlist] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_search_wordlist] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_search_wordlist] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_search_wordlist] PRIMARY KEY  CLUSTERED
 	(
 		[word_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  UNIQUE  INDEX [wrd_txt] ON [phpbb_search_wordlist]([word_text]) ON [PRIMARY]
@@ -1135,7 +1135,7 @@ GO
 CREATE TABLE [phpbb_search_wordmatch] (
 	[post_id] [int] DEFAULT (0) NOT NULL ,
 	[word_id] [int] DEFAULT (0) NOT NULL ,
-	[title_match] [int] DEFAULT (0) NOT NULL 
+	[title_match] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -1165,15 +1165,15 @@ CREATE TABLE [phpbb_sessions] (
 	[session_page] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[session_viewonline] [int] DEFAULT (1) NOT NULL ,
 	[session_autologin] [int] DEFAULT (0) NOT NULL ,
-	[session_admin] [int] DEFAULT (0) NOT NULL 
+	[session_admin] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_sessions] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_sessions] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_sessions] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_sessions] PRIMARY KEY  CLUSTERED
 	(
 		[session_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [session_time] ON [phpbb_sessions]([session_time]) ON [PRIMARY]
@@ -1193,16 +1193,16 @@ CREATE TABLE [phpbb_sessions_keys] (
 	[key_id] [char] (32) DEFAULT ('') NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[last_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
-	[last_login] [int] DEFAULT (0) NOT NULL 
+	[last_login] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_sessions_keys] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_sessions_keys] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_sessions_keys] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_sessions_keys] PRIMARY KEY  CLUSTERED
 	(
 		[key_id],
 		[user_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [last_login] ON [phpbb_sessions_keys]([last_login]) ON [PRIMARY]
@@ -1216,15 +1216,15 @@ CREATE TABLE [phpbb_sitelist] (
 	[site_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[site_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
 	[site_hostname] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[ip_exclude] [int] DEFAULT (0) NOT NULL 
+	[ip_exclude] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_sitelist] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_sitelist] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_sitelist] PRIMARY KEY  CLUSTERED
 	(
 		[site_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1239,15 +1239,15 @@ CREATE TABLE [phpbb_smilies] (
 	[smiley_width] [int] DEFAULT (0) NOT NULL ,
 	[smiley_height] [int] DEFAULT (0) NOT NULL ,
 	[smiley_order] [int] DEFAULT (0) NOT NULL ,
-	[display_on_posting] [int] DEFAULT (1) NOT NULL 
+	[display_on_posting] [int] DEFAULT (1) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY  CLUSTERED
 	(
 		[smiley_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [display_on_post] ON [phpbb_smilies]([display_on_posting]) ON [PRIMARY]
@@ -1264,15 +1264,15 @@ CREATE TABLE [phpbb_styles] (
 	[style_active] [int] DEFAULT (1) NOT NULL ,
 	[template_id] [int] DEFAULT (0) NOT NULL ,
 	[theme_id] [int] DEFAULT (0) NOT NULL ,
-	[imageset_id] [int] DEFAULT (0) NOT NULL 
+	[imageset_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_styles] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_styles] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_styles] PRIMARY KEY  CLUSTERED
 	(
 		[style_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  UNIQUE  INDEX [style_name] ON [phpbb_styles]([style_name]) ON [PRIMARY]
@@ -1299,15 +1299,15 @@ CREATE TABLE [phpbb_styles_template] (
 	[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
 	[template_storedb] [int] DEFAULT (0) NOT NULL ,
 	[template_inherits_id] [int] DEFAULT (0) NOT NULL ,
-	[template_inherit_path] [varchar] (255) DEFAULT ('') NOT NULL 
+	[template_inherit_path] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_template] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_styles_template] PRIMARY KEY  CLUSTERED
 	(
 		[template_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  UNIQUE  INDEX [tmplte_nm] ON [phpbb_styles_template]([template_name]) ON [PRIMARY]
@@ -1322,7 +1322,7 @@ CREATE TABLE [phpbb_styles_template_data] (
 	[template_filename] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[template_included] [varchar] (8000) DEFAULT ('') NOT NULL ,
 	[template_mtime] [int] DEFAULT (0) NOT NULL ,
-	[template_data] [text] DEFAULT ('') NOT NULL 
+	[template_data] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
@@ -1343,15 +1343,15 @@ CREATE TABLE [phpbb_styles_theme] (
 	[theme_path] [varchar] (100) DEFAULT ('') NOT NULL ,
 	[theme_storedb] [int] DEFAULT (0) NOT NULL ,
 	[theme_mtime] [int] DEFAULT (0) NOT NULL ,
-	[theme_data] [text] DEFAULT ('') NOT NULL 
+	[theme_data] [text] DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_styles_theme] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_theme] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_styles_theme] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_styles_theme] PRIMARY KEY  CLUSTERED
 	(
 		[theme_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  UNIQUE  INDEX [theme_name] ON [phpbb_styles_theme]([theme_name]) ON [PRIMARY]
@@ -1365,15 +1365,15 @@ CREATE TABLE [phpbb_styles_imageset] (
 	[imageset_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[imageset_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[imageset_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[imageset_path] [varchar] (100) DEFAULT ('') NOT NULL 
+	[imageset_path] [varchar] (100) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_styles_imageset] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_imageset] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_styles_imageset] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_styles_imageset] PRIMARY KEY  CLUSTERED
 	(
 		[imageset_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  UNIQUE  INDEX [imgset_nm] ON [phpbb_styles_imageset]([imageset_name]) ON [PRIMARY]
@@ -1390,15 +1390,15 @@ CREATE TABLE [phpbb_styles_imageset_data] (
 	[image_lang] [varchar] (30) DEFAULT ('') NOT NULL ,
 	[image_height] [int] DEFAULT (0) NOT NULL ,
 	[image_width] [int] DEFAULT (0) NOT NULL ,
-	[imageset_id] [int] DEFAULT (0) NOT NULL 
+	[imageset_id] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_styles_imageset_data] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_styles_imageset_data] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_styles_imageset_data] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_styles_imageset_data] PRIMARY KEY  CLUSTERED
 	(
 		[image_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [i_d] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY]
@@ -1442,15 +1442,15 @@ CREATE TABLE [phpbb_topics] (
 	[poll_length] [int] DEFAULT (0) NOT NULL ,
 	[poll_max_options] [int] DEFAULT (1) NOT NULL ,
 	[poll_last_vote] [int] DEFAULT (0) NOT NULL ,
-	[poll_vote_change] [int] DEFAULT (0) NOT NULL 
+	[poll_vote_change] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_topics] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_topics] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_topics] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_topics] PRIMARY KEY  CLUSTERED
 	(
 		[topic_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [forum_id] ON [phpbb_topics]([forum_id]) ON [PRIMARY]
@@ -1479,16 +1479,16 @@ CREATE TABLE [phpbb_topics_track] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[forum_id] [int] DEFAULT (0) NOT NULL ,
-	[mark_time] [int] DEFAULT (0) NOT NULL 
+	[mark_time] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_topics_track] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_topics_track] PRIMARY KEY  CLUSTERED
 	(
 		[user_id],
 		[topic_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [forum_id] ON [phpbb_topics_track]([forum_id]) ON [PRIMARY]
@@ -1501,16 +1501,16 @@ GO
 CREATE TABLE [phpbb_topics_posted] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
-	[topic_posted] [int] DEFAULT (0) NOT NULL 
+	[topic_posted] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_topics_posted] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_topics_posted] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_topics_posted] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_topics_posted] PRIMARY KEY  CLUSTERED
 	(
 		[user_id],
 		[topic_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1520,7 +1520,7 @@ GO
 CREATE TABLE [phpbb_topics_watch] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
-	[notify_status] [int] DEFAULT (0) NOT NULL 
+	[notify_status] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -1541,7 +1541,7 @@ CREATE TABLE [phpbb_user_group] (
 	[group_id] [int] DEFAULT (0) NOT NULL ,
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[group_leader] [int] DEFAULT (0) NOT NULL ,
-	[user_pending] [int] DEFAULT (1) NOT NULL 
+	[user_pending] [int] DEFAULT (1) NOT NULL
 ) ON [PRIMARY]
 GO
 
@@ -1631,15 +1631,15 @@ CREATE TABLE [phpbb_users] (
 	[user_interests] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[user_actkey] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[user_newpasswd] [varchar] (40) DEFAULT ('') NOT NULL ,
-	[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL 
+	[user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_users] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_users] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_users] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_users] PRIMARY KEY  CLUSTERED
 	(
 		[user_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 CREATE  INDEX [user_birthday] ON [phpbb_users]([user_birthday]) ON [PRIMARY]
@@ -1663,15 +1663,15 @@ CREATE TABLE [phpbb_warnings] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[post_id] [int] DEFAULT (0) NOT NULL ,
 	[log_id] [int] DEFAULT (0) NOT NULL ,
-	[warning_time] [int] DEFAULT (0) NOT NULL 
+	[warning_time] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_warnings] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_warnings] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_warnings] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_warnings] PRIMARY KEY  CLUSTERED
 	(
 		[warning_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1681,15 +1681,15 @@ GO
 CREATE TABLE [phpbb_words] (
 	[word_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[word] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[replacement] [varchar] (255) DEFAULT ('') NOT NULL 
+	[replacement] [varchar] (255) DEFAULT ('') NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_words] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_words] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_words] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_words] PRIMARY KEY  CLUSTERED
 	(
 		[word_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
@@ -1700,16 +1700,16 @@ CREATE TABLE [phpbb_zebra] (
 	[user_id] [int] DEFAULT (0) NOT NULL ,
 	[zebra_id] [int] DEFAULT (0) NOT NULL ,
 	[friend] [int] DEFAULT (0) NOT NULL ,
-	[foe] [int] DEFAULT (0) NOT NULL 
+	[foe] [int] DEFAULT (0) NOT NULL
 ) ON [PRIMARY]
 GO
 
-ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD 
-	CONSTRAINT [PK_phpbb_zebra] PRIMARY KEY  CLUSTERED 
+ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD
+	CONSTRAINT [PK_phpbb_zebra] PRIMARY KEY  CLUSTERED
 	(
 		[user_id],
 		[zebra_id]
-	)  ON [PRIMARY] 
+	)  ON [PRIMARY]
 GO
 
 
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index a18b99eecd..146c58904c 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -49,7 +49,7 @@ CREATE TABLE phpbb_acl_options (
 	is_local tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	founder_only tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (auth_option_id),
-	KEY auth_option (auth_option)
+	UNIQUE auth_option (auth_option)
 );
 
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 8b001f4d1b..81f8266f4d 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -49,7 +49,7 @@ CREATE TABLE phpbb_acl_options (
 	is_local tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	founder_only tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (auth_option_id),
-	KEY auth_option (auth_option)
+	UNIQUE auth_option (auth_option)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
 
 
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 401106ac83..50f3ee1f80 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -119,12 +119,11 @@ CREATE TABLE phpbb_acl_options (
 	is_global number(1) DEFAULT '0' NOT NULL,
 	is_local number(1) DEFAULT '0' NOT NULL,
 	founder_only number(1) DEFAULT '0' NOT NULL,
-	CONSTRAINT pk_phpbb_acl_options PRIMARY KEY (auth_option_id)
+	CONSTRAINT pk_phpbb_acl_options PRIMARY KEY (auth_option_id),
+	CONSTRAINT u_phpbb_auth_option UNIQUE (auth_option)
 )
 /
 
-CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option)
-/
 
 CREATE SEQUENCE phpbb_acl_options_seq
 /
@@ -821,7 +820,7 @@ CREATE TABLE phpbb_poll_votes (
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	poll_option_id number(4) DEFAULT '0' NOT NULL,
 	vote_user_id number(8) DEFAULT '0' NOT NULL,
-	vote_user_ip varchar2(40) DEFAULT '' 
+	vote_user_ip varchar2(40) DEFAULT ''
 )
 /
 
@@ -1465,7 +1464,7 @@ CREATE TABLE phpbb_styles_template_data (
 	template_filename varchar2(100) DEFAULT '' ,
 	template_included clob DEFAULT '' ,
 	template_mtime number(11) DEFAULT '0' NOT NULL,
-	template_data clob DEFAULT '' 
+	template_data clob DEFAULT ''
 )
 /
 
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 077078c40f..9736363104 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -140,7 +140,7 @@ CREATE TABLE phpbb_acl_options (
 	PRIMARY KEY (auth_option_id)
 );
 
-CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
+CREATE UNIQUE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
 
 /*
 	Table: 'phpbb_acl_roles'
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index e60a194839..36686955a9 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -51,7 +51,7 @@ CREATE TABLE phpbb_acl_options (
 	founder_only INTEGER UNSIGNED NOT NULL DEFAULT '0'
 );
 
-CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
+CREATE UNIQUE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
 
 # Table: 'phpbb_acl_roles'
 CREATE TABLE phpbb_acl_roles (