- Display coloured usernames in ACP groups management screens

- Changed behaviour of group_create() function to support specifying additional group columns - New groups option to excempt group leaders from group permissions git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2009-06-19 09:51:50 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2009-06-19 09:51:50 +0000
commit: d7d96223e7bae7cd60b13c6e7896d95838c3633c (patch)
tree: 7040375c914b885a97b0787727535737f4193014 /phpBB/install
parent: ac1fd3c740bf396e27e882877b94ae246caedac6 (diff)
download: forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar
forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.gz
forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.bz2
forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.xz
forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.zip
8 files changed, 238 insertions, 218 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7f1edf2e28..6f7216f82b 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -13,6 +13,9 @@ $updates_to_version = '3.0.6-dev';
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
 
+// Which oldest version does this updater supports?
+$oldest_from_version = '3.0.0';
+
 // Return if we "just include it" to find out for which version the database update is responsible for
 if (defined('IN_PHPBB') && defined('IN_INSTALL'))
 {
@@ -685,6 +688,11 @@ function database_update_info()
 					'log_time'		=> array('log_time'),
 				),
 			),
+			'add_columns'		=> array(
+				GROUPS_TABLE			=> array(
+					'group_skip_auth'		=> array('BOOL', 0, 'after' => 'group_founder_manage'),
+				),
+			),
 		),
 	);
 }
@@ -1991,23 +1999,28 @@ class updater_db_tools
 		switch ($this->sql_layer)
 		{
 			case 'firebird':
+				// Does not support AFTER statement, only POSITION (and there you need the column position)
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD "' . strtoupper($column_name) . '" ' . $column_data['column_type_sql'];
 			break;
 
 			case 'mssql':
+				// Does not support AFTER, only through temporary table
 				$statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default'];
 			break;
 
 			case 'mysql_40':
 			case 'mysql_41':
-				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'];
+				$after = (!empty($column_data['after'])) ? ' AFTER ' . $column_data['after'] : '';
+				$statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql'] . $after;
 			break;
 
 			case 'oracle':
+				// Does not support AFTER, only through temporary table
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql'];
 			break;
 
 			case 'postgres':
+				// Does not support AFTER, only through temporary table
 				$statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql'];
 			break;
 
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index e6041e6c32..c37a038b3a 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -425,6 +425,7 @@ CREATE TABLE phpbb_groups (
 	group_id INTEGER NOT NULL,
 	group_type INTEGER DEFAULT 1 NOT NULL,
 	group_founder_manage INTEGER DEFAULT 0 NOT NULL,
+	group_skip_auth INTEGER DEFAULT 0 NOT NULL,
 	group_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
 	group_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
 	group_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 43c4c06d2d..953dc3d67c 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,15 +82,15 @@ 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  UNIQUE  INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY]
@@ -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
 
@@ -530,6 +530,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[group_type] [int] DEFAULT (1) NOT NULL ,
 	[group_founder_manage] [int] DEFAULT (0) NOT NULL ,
+	[group_skip_auth] [int] DEFAULT (0) NOT NULL ,
 	[group_name] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[group_desc] [varchar] (4000) DEFAULT ('') NOT NULL ,
 	[group_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -546,15 +547,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 +571,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 +595,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 +623,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]
@@ -661,7 +662,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
 
@@ -686,15 +687,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]
@@ -714,7 +715,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
 
@@ -732,7 +733,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
 
@@ -775,15 +776,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]
@@ -829,15 +830,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]
@@ -860,15 +861,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]
@@ -887,15 +888,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]
@@ -915,7 +916,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
 
@@ -949,15 +950,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]
@@ -971,15 +972,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
 
 
@@ -991,17 +992,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
 
 
@@ -1013,16 +1014,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
 
 
@@ -1034,15 +1035,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
 
 
@@ -1057,15 +1058,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
 
 
@@ -1076,15 +1077,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
 
 
@@ -1095,15 +1096,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
 
 
@@ -1114,15 +1115,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]
@@ -1138,7 +1139,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
 
@@ -1168,15 +1169,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]
@@ -1196,16 +1197,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]
@@ -1219,15 +1220,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
 
 
@@ -1242,15 +1243,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]
@@ -1267,15 +1268,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]
@@ -1302,15 +1303,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]
@@ -1325,7 +1326,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
 
@@ -1346,15 +1347,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]
@@ -1368,15 +1369,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]
@@ -1393,15 +1394,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]
@@ -1445,15 +1446,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]
@@ -1482,16 +1483,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]
@@ -1504,16 +1505,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
 
 
@@ -1523,7 +1524,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
 
@@ -1544,7 +1545,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
 
@@ -1634,15 +1635,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]
@@ -1666,15 +1667,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
 
 
@@ -1684,15 +1685,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
 
 
@@ -1703,16 +1704,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 5d3e4db7de..5b78dde036 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -297,6 +297,7 @@ CREATE TABLE phpbb_groups (
 	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	group_type tinyint(4) DEFAULT '1' NOT NULL,
 	group_founder_manage tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	group_skip_auth tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_name blob NOT NULL,
 	group_desc blob NOT NULL,
 	group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index f4e6fdefdc..0e8bb96652 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -297,6 +297,7 @@ CREATE TABLE phpbb_groups (
 	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	group_type tinyint(4) DEFAULT '1' NOT NULL,
 	group_founder_manage tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+	group_skip_auth tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_name varchar(255) DEFAULT '' NOT NULL,
 	group_desc text NOT NULL,
 	group_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 64e1f8b8c0..dbe92650ac 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -586,6 +586,7 @@ CREATE TABLE phpbb_groups (
 	group_id number(8) NOT NULL,
 	group_type number(4) DEFAULT '1' NOT NULL,
 	group_founder_manage number(1) DEFAULT '0' NOT NULL,
+	group_skip_auth number(1) DEFAULT '0' NOT NULL,
 	group_name varchar2(255) DEFAULT '' ,
 	group_desc clob DEFAULT '' ,
 	group_desc_bitfield varchar2(255) DEFAULT '' ,
@@ -822,7 +823,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 '' 
 )
 /
 
@@ -1466,7 +1467,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 7eccad2585..6eb2aa4ffb 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -440,6 +440,7 @@ CREATE TABLE phpbb_groups (
 	group_id INT4 DEFAULT nextval('phpbb_groups_seq'),
 	group_type INT2 DEFAULT '1' NOT NULL,
 	group_founder_manage INT2 DEFAULT '0' NOT NULL CHECK (group_founder_manage >= 0),
+	group_skip_auth INT2 DEFAULT '0' NOT NULL CHECK (group_skip_auth >= 0),
 	group_name varchar_ci DEFAULT '' NOT NULL,
 	group_desc varchar(4000) DEFAULT '' NOT NULL,
 	group_desc_bitfield varchar(255) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 43f83fc989..1741eae5f2 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -289,6 +289,7 @@ CREATE TABLE phpbb_groups (
 	group_id INTEGER PRIMARY KEY NOT NULL ,
 	group_type tinyint(4) NOT NULL DEFAULT '1',
 	group_founder_manage INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	group_skip_auth INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_name varchar(255) NOT NULL DEFAULT '',
 	group_desc text(65535) NOT NULL DEFAULT '',
 	group_desc_bitfield varchar(255) NOT NULL DEFAULT '',
author	Meik Sievertsen <acydburn@phpbb.com>	2009-06-19 09:51:50 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2009-06-19 09:51:50 +0000
commit	d7d96223e7bae7cd60b13c6e7896d95838c3633c (patch)
tree	7040375c914b885a97b0787727535737f4193014 /phpBB/install
parent	ac1fd3c740bf396e27e882877b94ae246caedac6 (diff)
download	forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.gz forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.bz2 forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.tar.xz forums-d7d96223e7bae7cd60b13c6e7896d95838c3633c.zip