7 files changed, 68 insertions, 54 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 25dd4dcf33..0237ea838f 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -352,7 +352,7 @@ CREATE TABLE phpbb_forums (
 	forum_name BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	forum_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	forum_desc_bitfield VARCHAR(252) DEFAULT '' NOT NULL,
-	forum_desc_options INTEGER DEFAULT 0 NOT NULL,
+	forum_desc_options INTEGER DEFAULT 7 NOT NULL,
 	forum_desc_uid VARCHAR(5) DEFAULT '' NOT NULL,
 	forum_link VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL,
 	forum_password VARCHAR(14) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL,
@@ -361,7 +361,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	forum_rules_link VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL,
 	forum_rules_bitfield VARCHAR(252) DEFAULT '' NOT NULL,
-	forum_rules_options INTEGER DEFAULT 0 NOT NULL,
+	forum_rules_options INTEGER DEFAULT 7 NOT NULL,
 	forum_rules_uid VARCHAR(5) DEFAULT '' NOT NULL,
 	forum_topics_per_page INTEGER DEFAULT 0 NOT NULL,
 	forum_type INTEGER DEFAULT 0 NOT NULL,
@@ -440,7 +440,7 @@ CREATE TABLE phpbb_groups (
 	group_name VARCHAR(84) CHARACTER SET UNICODE_FSS DEFAULT '' NOT NULL,
 	group_desc BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	group_desc_bitfield VARCHAR(252) DEFAULT '' NOT NULL,
-	group_desc_options INTEGER DEFAULT 0 NOT NULL,
+	group_desc_options INTEGER DEFAULT 7 NOT NULL,
 	group_desc_uid VARCHAR(5) DEFAULT '' NOT NULL,
 	group_display INTEGER DEFAULT 0 NOT NULL,
 	group_avatar VARCHAR(255) DEFAULT '' NOT NULL,
@@ -1392,6 +1392,8 @@ CREATE TABLE phpbb_users (
 	user_warnings INTEGER DEFAULT 0 NOT NULL,
 	user_last_warning INTEGER DEFAULT 0 NOT NULL,
 	user_login_attempts INTEGER DEFAULT 0 NOT NULL,
+	user_inactive_reason INTEGER DEFAULT 0 NOT NULL,
+	user_inactive_time INTEGER DEFAULT 0 NOT NULL,
 	user_posts INTEGER DEFAULT 0 NOT NULL,
 	user_lang VARCHAR(30) DEFAULT '' NOT NULL,
 	user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 0b9b55824d..3e78b80161 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -404,7 +404,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_name] [text] DEFAULT ('') NOT NULL ,
 	[forum_desc] [text] DEFAULT ('') NOT NULL ,
 	[forum_desc_bitfield] [varchar] (252) DEFAULT ('') NOT NULL ,
-	[forum_desc_options] [int] DEFAULT (0) NOT NULL ,
+	[forum_desc_options] [int] DEFAULT (7) NOT NULL ,
 	[forum_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
 	[forum_link] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_password] [varchar] (40) DEFAULT ('') NOT NULL ,
@@ -413,7 +413,7 @@ CREATE TABLE [phpbb_forums] (
 	[forum_rules] [text] DEFAULT ('') NOT NULL ,
 	[forum_rules_link] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[forum_rules_bitfield] [varchar] (252) DEFAULT ('') NOT NULL ,
-	[forum_rules_options] [int] DEFAULT (0) NOT NULL ,
+	[forum_rules_options] [int] DEFAULT (7) NOT NULL ,
 	[forum_rules_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
 	[forum_topics_per_page] [int] DEFAULT (0) NOT NULL ,
 	[forum_type] [int] DEFAULT (0) NOT NULL ,
@@ -521,7 +521,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_name] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[group_desc] [text] DEFAULT ('') NOT NULL ,
 	[group_desc_bitfield] [varchar] (252) DEFAULT ('') NOT NULL ,
-	[group_desc_options] [int] DEFAULT (0) NOT NULL ,
+	[group_desc_options] [int] DEFAULT (7) NOT NULL ,
 	[group_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
 	[group_display] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -1619,6 +1619,8 @@ CREATE TABLE [phpbb_users] (
 	[user_warnings] [int] DEFAULT (0) NOT NULL ,
 	[user_last_warning] [int] DEFAULT (0) NOT NULL ,
 	[user_login_attempts] [int] DEFAULT (0) NOT NULL ,
+	[user_inactive_reason] [int] DEFAULT (0) NOT NULL ,
+	[user_inactive_time] [int] DEFAULT (0) NOT NULL ,
 	[user_posts] [int] DEFAULT (0) NOT NULL ,
 	[user_lang] [varchar] (30) DEFAULT ('') NOT NULL ,
 	[user_timezone] [float] DEFAULT (0) NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index f2be2243a2..54b569e9f7 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -57,7 +57,7 @@ CREATE TABLE phpbb_acl_options (
 # Table: 'phpbb_acl_roles'
 CREATE TABLE phpbb_acl_roles (
 	role_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	role_name varchar(255) DEFAULT '' NOT NULL,
+	role_name text DEFAULT '' NOT NULL,
 	role_description text DEFAULT '' NOT NULL,
 	role_type varchar(10) DEFAULT '' NOT NULL,
 	role_order smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
@@ -202,7 +202,7 @@ CREATE TABLE phpbb_extensions (
 # Table: 'phpbb_extension_groups'
 CREATE TABLE phpbb_extension_groups (
 	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	group_name varchar(255) DEFAULT '' NOT NULL,
+	group_name text DEFAULT '' NOT NULL,
 	cat_id tinyint(2) DEFAULT '0' NOT NULL,
 	allow_group tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	download_mode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
@@ -224,16 +224,16 @@ CREATE TABLE phpbb_forums (
 	forum_name text DEFAULT '' NOT NULL,
 	forum_desc text DEFAULT '' NOT NULL,
 	forum_desc_bitfield varchar(252) DEFAULT '' NOT NULL,
-	forum_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
 	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
-	forum_link varchar(255) DEFAULT '' NOT NULL,
+	forum_link text DEFAULT '' NOT NULL,
 	forum_password varchar(120) DEFAULT '' NOT NULL,
 	forum_style tinyint(4) DEFAULT '0' NOT NULL,
 	forum_image varchar(255) DEFAULT '' NOT NULL,
 	forum_rules text DEFAULT '' NOT NULL,
-	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
+	forum_rules_link text DEFAULT '' NOT NULL,
 	forum_rules_bitfield varchar(252) DEFAULT '' NOT NULL,
-	forum_rules_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
 	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
 	forum_type tinyint(4) DEFAULT '0' NOT NULL,
@@ -245,7 +245,7 @@ CREATE TABLE phpbb_forums (
 	forum_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	forum_last_post_subject text DEFAULT '' NOT NULL,
 	forum_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	forum_last_poster_name varchar(255) DEFAULT '' NOT NULL,
+	forum_last_poster_name text DEFAULT '' NOT NULL,
 	forum_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
 	forum_flags tinyint(4) DEFAULT '32' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
@@ -295,10 +295,10 @@ CREATE TABLE phpbb_forums_watch (
 CREATE TABLE phpbb_groups (
 	group_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	group_type tinyint(4) DEFAULT '1' NOT NULL,
-	group_name varchar(252) DEFAULT '' NOT NULL,
+	group_name text DEFAULT '' NOT NULL,
 	group_desc text DEFAULT '' NOT NULL,
 	group_desc_bitfield varchar(252) DEFAULT '' NOT NULL,
-	group_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
 	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
@@ -369,7 +369,7 @@ CREATE TABLE phpbb_moderator_cache (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	username text DEFAULT '' NOT NULL,
 	group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	group_name varchar(255) DEFAULT '' NOT NULL,
+	group_name text DEFAULT '' NOT NULL,
 	display_on_index tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	KEY disp_idx (display_on_index),
 	KEY forum_id (forum_id)
@@ -493,7 +493,7 @@ CREATE TABLE phpbb_privmsgs (
 CREATE TABLE phpbb_privmsgs_folder (
 	folder_id mediumint(8) UNSIGNED NOT NULL auto_increment,
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	folder_name varchar(255) DEFAULT '' NOT NULL,
+	folder_name text DEFAULT '' NOT NULL,
 	pm_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (folder_id),
 	KEY user_id (user_id)
@@ -506,7 +506,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 	user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_check mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_connection mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_string varchar(255) DEFAULT '' NOT NULL,
+	rule_string text DEFAULT '' NOT NULL,
 	rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -537,14 +537,14 @@ CREATE TABLE phpbb_privmsgs_to (
 # Table: 'phpbb_profile_fields'
 CREATE TABLE phpbb_profile_fields (
 	field_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	field_name varchar(255) DEFAULT '' NOT NULL,
+	field_name text DEFAULT '' NOT NULL,
 	field_type tinyint(4) DEFAULT '0' NOT NULL,
 	field_ident varchar(20) DEFAULT '' NOT NULL,
 	field_length varchar(20) DEFAULT '' NOT NULL,
 	field_minlen varchar(255) DEFAULT '' NOT NULL,
 	field_maxlen varchar(255) DEFAULT '' NOT NULL,
-	field_novalue varchar(255) DEFAULT '' NOT NULL,
-	field_default_value varchar(255) DEFAULT '' NOT NULL,
+	field_novalue text DEFAULT '' NOT NULL,
+	field_default_value text DEFAULT '' NOT NULL,
 	field_validation varchar(60) DEFAULT '' NOT NULL,
 	field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
@@ -571,7 +571,7 @@ CREATE TABLE phpbb_profile_fields_lang (
 	lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	field_type tinyint(4) DEFAULT '0' NOT NULL,
-	lang_value varchar(255) DEFAULT '' NOT NULL,
+	lang_value text DEFAULT '' NOT NULL,
 	PRIMARY KEY (field_id, lang_id, option_id)
 );
 
@@ -580,9 +580,9 @@ CREATE TABLE phpbb_profile_fields_lang (
 CREATE TABLE phpbb_profile_lang (
 	field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	lang_name varchar(255) DEFAULT '' NOT NULL,
+	lang_name text DEFAULT '' NOT NULL,
 	lang_explain text DEFAULT '' NOT NULL,
-	lang_default_value varchar(255) DEFAULT '' NOT NULL,
+	lang_default_value text DEFAULT '' NOT NULL,
 	PRIMARY KEY (field_id, lang_id)
 );
 
@@ -590,7 +590,7 @@ CREATE TABLE phpbb_profile_lang (
 # Table: 'phpbb_ranks'
 CREATE TABLE phpbb_ranks (
 	rank_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	rank_title varchar(255) DEFAULT '' NOT NULL,
+	rank_title text DEFAULT '' NOT NULL,
 	rank_min mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rank_special tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	rank_image varchar(255) DEFAULT '' NOT NULL,
@@ -615,7 +615,7 @@ CREATE TABLE phpbb_reports (
 # Table: 'phpbb_reports_reasons'
 CREATE TABLE phpbb_reports_reasons (
 	reason_id smallint(4) UNSIGNED NOT NULL auto_increment,
-	reason_title varchar(255) DEFAULT '' NOT NULL,
+	reason_title text DEFAULT '' NOT NULL,
 	reason_description mediumtext DEFAULT '' NOT NULL,
 	reason_order smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (reason_id)
@@ -635,7 +635,7 @@ CREATE TABLE phpbb_search_results (
 # Table: 'phpbb_search_wordlist'
 CREATE TABLE phpbb_search_wordlist (
 	word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	word_text varchar(255) DEFAULT '' NOT NULL,
+	word_text text DEFAULT '' NOT NULL,
 	word_common tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (word_id),
 	UNIQUE wrd_txt (word_text)
@@ -661,7 +661,7 @@ CREATE TABLE phpbb_sessions (
 	session_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	session_ip varchar(40) DEFAULT '' NOT NULL,
 	session_browser varchar(150) DEFAULT '' NOT NULL,
-	session_page varchar(255) DEFAULT '' NOT NULL,
+	session_page text DEFAULT '' NOT NULL,
 	session_viewonline tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	session_autologin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	session_admin tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
@@ -711,7 +711,7 @@ CREATE TABLE phpbb_smilies (
 CREATE TABLE phpbb_styles (
 	style_id tinyint(4) NOT NULL auto_increment,
 	style_name text DEFAULT '' NOT NULL,
-	style_copyright varchar(255) DEFAULT '' NOT NULL,
+	style_copyright text DEFAULT '' NOT NULL,
 	style_active tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	template_id tinyint(4) DEFAULT '0' NOT NULL,
 	theme_id tinyint(4) DEFAULT '0' NOT NULL,
@@ -728,7 +728,7 @@ CREATE TABLE phpbb_styles (
 CREATE TABLE phpbb_styles_template (
 	template_id tinyint(4) NOT NULL auto_increment,
 	template_name text DEFAULT '' NOT NULL,
-	template_copyright varchar(255) DEFAULT '' NOT NULL,
+	template_copyright text DEFAULT '' NOT NULL,
 	template_path varchar(100) DEFAULT '' NOT NULL,
 	bbcode_bitfield varchar(252) DEFAULT 'kNg=' NOT NULL,
 	template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
@@ -753,7 +753,7 @@ CREATE TABLE phpbb_styles_template_data (
 CREATE TABLE phpbb_styles_theme (
 	theme_id tinyint(4) NOT NULL auto_increment,
 	theme_name text DEFAULT '' NOT NULL,
-	theme_copyright varchar(255) DEFAULT '' NOT NULL,
+	theme_copyright text DEFAULT '' NOT NULL,
 	theme_path varchar(100) DEFAULT '' NOT NULL,
 	theme_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	theme_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL,
@@ -767,7 +767,7 @@ CREATE TABLE phpbb_styles_theme (
 CREATE TABLE phpbb_styles_imageset (
 	imageset_id tinyint(4) NOT NULL auto_increment,
 	imageset_name text DEFAULT '' NOT NULL,
-	imageset_copyright varchar(255) DEFAULT '' NOT NULL,
+	imageset_copyright text DEFAULT '' NOT NULL,
 	imageset_path varchar(100) DEFAULT '' NOT NULL,
 	site_logo varchar(200) DEFAULT '' NOT NULL,
 	upload_bar varchar(200) DEFAULT '' NOT NULL,
@@ -886,11 +886,11 @@ CREATE TABLE phpbb_topics (
 	topic_status tinyint(3) DEFAULT '0' NOT NULL,
 	topic_type tinyint(3) DEFAULT '0' NOT NULL,
 	topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_first_poster_name varchar(255) DEFAULT '' NOT NULL,
+	topic_first_poster_name text DEFAULT '' NOT NULL,
 	topic_first_poster_colour varchar(6) DEFAULT '' NOT NULL,
 	topic_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	topic_last_poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	topic_last_poster_name varchar(255) DEFAULT '' NOT NULL,
+	topic_last_poster_name text DEFAULT '' NOT NULL,
 	topic_last_poster_colour varchar(6) DEFAULT '' NOT NULL,
 	topic_last_post_subject text DEFAULT '' NOT NULL,
 	topic_last_post_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
@@ -964,7 +964,7 @@ CREATE TABLE phpbb_users (
 	user_perm_from mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_ip varchar(40) DEFAULT '' NOT NULL,
 	user_regdate int(11) UNSIGNED DEFAULT '0' NOT NULL,
-	username varchar(252) DEFAULT '' NOT NULL,
+	username text DEFAULT '' NOT NULL,
 	user_password varchar(120) DEFAULT '' NOT NULL,
 	user_passchg int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_email text DEFAULT '' NOT NULL,
@@ -979,6 +979,8 @@ CREATE TABLE phpbb_users (
 	user_warnings tinyint(4) DEFAULT '0' NOT NULL,
 	user_last_warning int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_login_attempts tinyint(4) DEFAULT '0' NOT NULL,
+	user_inactive_reason tinyint(2) DEFAULT '0' NOT NULL,
+	user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_lang varchar(30) DEFAULT '' NOT NULL,
 	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
@@ -1017,12 +1019,12 @@ CREATE TABLE phpbb_users (
 	user_sig_bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	user_from text DEFAULT '' NOT NULL,
 	user_icq varchar(15) DEFAULT '' NOT NULL,
-	user_aim varchar(255) DEFAULT '' NOT NULL,
-	user_yim varchar(255) DEFAULT '' NOT NULL,
-	user_msnm varchar(255) DEFAULT '' NOT NULL,
-	user_jabber varchar(255) DEFAULT '' NOT NULL,
+	user_aim text DEFAULT '' NOT NULL,
+	user_yim text DEFAULT '' NOT NULL,
+	user_msnm text DEFAULT '' NOT NULL,
+	user_jabber text DEFAULT '' NOT NULL,
 	user_website text DEFAULT '' NOT NULL,
-	user_occ varchar(255) DEFAULT '' NOT NULL,
+	user_occ text DEFAULT '' NOT NULL,
 	user_interests text DEFAULT '' NOT NULL,
 	user_actkey varchar(32) DEFAULT '' NOT NULL,
 	user_newpasswd varchar(96) DEFAULT '' NOT NULL,
@@ -1048,8 +1050,8 @@ CREATE TABLE phpbb_warnings (
 # Table: 'phpbb_words'
 CREATE TABLE phpbb_words (
 	word_id mediumint(8) UNSIGNED NOT NULL auto_increment,
-	word varchar(255) DEFAULT '' NOT NULL,
-	replacement varchar(255) DEFAULT '' NOT NULL,
+	word text DEFAULT '' NOT NULL,
+	replacement text DEFAULT '' NOT NULL,
 	PRIMARY KEY (word_id)
 );
 
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 593980ea9b..f907a49fbe 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -224,7 +224,7 @@ CREATE TABLE phpbb_forums (
 	forum_name text DEFAULT '' NOT NULL,
 	forum_desc text DEFAULT '' NOT NULL,
 	forum_desc_bitfield varchar(252) DEFAULT '' NOT NULL,
-	forum_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
 	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_link varchar(255) DEFAULT '' NOT NULL,
 	forum_password varchar(40) DEFAULT '' NOT NULL,
@@ -233,7 +233,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules text DEFAULT '' NOT NULL,
 	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_bitfield varchar(252) DEFAULT '' NOT NULL,
-	forum_rules_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
 	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL,
 	forum_type tinyint(4) DEFAULT '0' NOT NULL,
@@ -298,7 +298,7 @@ CREATE TABLE phpbb_groups (
 	group_name varchar(252) DEFAULT '' NOT NULL,
 	group_desc text DEFAULT '' NOT NULL,
 	group_desc_bitfield varchar(252) DEFAULT '' NOT NULL,
-	group_desc_options int(11) UNSIGNED DEFAULT '0' NOT NULL,
+	group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL,
 	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
@@ -979,6 +979,8 @@ CREATE TABLE phpbb_users (
 	user_warnings tinyint(4) DEFAULT '0' NOT NULL,
 	user_last_warning int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_login_attempts tinyint(4) DEFAULT '0' NOT NULL,
+	user_inactive_reason tinyint(2) DEFAULT '0' NOT NULL,
+	user_inactive_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
 	user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	user_lang varchar(30) DEFAULT '' NOT NULL,
 	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index adc86f7b26..a3665563e1 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -479,7 +479,7 @@ CREATE TABLE phpbb_forums (
 	forum_name varchar2(3000) DEFAULT '' ,
 	forum_desc clob DEFAULT '' ,
 	forum_desc_bitfield varchar2(252) DEFAULT '' ,
-	forum_desc_options number(11) DEFAULT '0' NOT NULL,
+	forum_desc_options number(11) DEFAULT '7' NOT NULL,
 	forum_desc_uid varchar2(5) DEFAULT '' ,
 	forum_link varchar2(255) DEFAULT '' ,
 	forum_password varchar2(40) DEFAULT '' ,
@@ -488,7 +488,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules clob DEFAULT '' ,
 	forum_rules_link varchar2(255) DEFAULT '' ,
 	forum_rules_bitfield varchar2(252) DEFAULT '' ,
-	forum_rules_options number(11) DEFAULT '0' NOT NULL,
+	forum_rules_options number(11) DEFAULT '7' NOT NULL,
 	forum_rules_uid varchar2(5) DEFAULT '' ,
 	forum_topics_per_page number(4) DEFAULT '0' NOT NULL,
 	forum_type number(4) DEFAULT '0' NOT NULL,
@@ -586,7 +586,7 @@ CREATE TABLE phpbb_groups (
 	group_name varchar2(252) DEFAULT '' ,
 	group_desc clob DEFAULT '' ,
 	group_desc_bitfield varchar2(252) DEFAULT '' ,
-	group_desc_options number(11) DEFAULT '0' NOT NULL,
+	group_desc_options number(11) DEFAULT '7' NOT NULL,
 	group_desc_uid varchar2(5) DEFAULT '' ,
 	group_display number(1) DEFAULT '0' NOT NULL,
 	group_avatar varchar2(255) DEFAULT '' ,
@@ -1788,6 +1788,8 @@ CREATE TABLE phpbb_users (
 	user_warnings number(4) DEFAULT '0' NOT NULL,
 	user_last_warning number(11) DEFAULT '0' NOT NULL,
 	user_login_attempts number(4) DEFAULT '0' NOT NULL,
+	user_inactive_reason number(2) DEFAULT '0' NOT NULL,
+	user_inactive_time number(11) DEFAULT '0' NOT NULL,
 	user_posts number(8) DEFAULT '0' NOT NULL,
 	user_lang varchar2(30) DEFAULT '' ,
 	user_timezone number(5, 2) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index a4e71e8acf..a7ea77c538 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -356,7 +356,7 @@ CREATE TABLE phpbb_forums (
 	forum_name varchar(3000) DEFAULT '' NOT NULL,
 	forum_desc varchar(8000) DEFAULT '' NOT NULL,
 	forum_desc_bitfield varchar(252) DEFAULT '' NOT NULL,
-	forum_desc_options INT4 DEFAULT '0' NOT NULL CHECK (forum_desc_options >= 0),
+	forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0),
 	forum_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_link varchar(255) DEFAULT '' NOT NULL,
 	forum_password varchar(40) DEFAULT '' NOT NULL,
@@ -365,7 +365,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules varchar(8000) DEFAULT '' NOT NULL,
 	forum_rules_link varchar(255) DEFAULT '' NOT NULL,
 	forum_rules_bitfield varchar(252) DEFAULT '' NOT NULL,
-	forum_rules_options INT4 DEFAULT '0' NOT NULL CHECK (forum_rules_options >= 0),
+	forum_rules_options INT4 DEFAULT '7' NOT NULL CHECK (forum_rules_options >= 0),
 	forum_rules_uid varchar(5) DEFAULT '' NOT NULL,
 	forum_topics_per_page INT2 DEFAULT '0' NOT NULL,
 	forum_type INT2 DEFAULT '0' NOT NULL,
@@ -440,7 +440,7 @@ CREATE TABLE phpbb_groups (
 	group_name varchar_ci DEFAULT '' NOT NULL,
 	group_desc varchar(8000) DEFAULT '' NOT NULL,
 	group_desc_bitfield varchar(252) DEFAULT '' NOT NULL,
-	group_desc_options INT4 DEFAULT '0' NOT NULL CHECK (group_desc_options >= 0),
+	group_desc_options INT4 DEFAULT '7' NOT NULL CHECK (group_desc_options >= 0),
 	group_desc_uid varchar(5) DEFAULT '' NOT NULL,
 	group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0),
 	group_avatar varchar(255) DEFAULT '' NOT NULL,
@@ -1239,6 +1239,8 @@ CREATE TABLE phpbb_users (
 	user_warnings INT2 DEFAULT '0' NOT NULL,
 	user_last_warning INT4 DEFAULT '0' NOT NULL CHECK (user_last_warning >= 0),
 	user_login_attempts INT2 DEFAULT '0' NOT NULL,
+	user_inactive_reason INT2 DEFAULT '0' NOT NULL,
+	user_inactive_time INT4 DEFAULT '0' NOT NULL CHECK (user_inactive_time >= 0),
 	user_posts INT4 DEFAULT '0' NOT NULL CHECK (user_posts >= 0),
 	user_lang varchar(30) DEFAULT '' NOT NULL,
 	user_timezone decimal(5,2) DEFAULT '0' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index adbffb4d0e..0d9e443e3a 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -217,7 +217,7 @@ CREATE TABLE phpbb_forums (
 	forum_name text(65535) NOT NULL DEFAULT '',
 	forum_desc text(65535) NOT NULL DEFAULT '',
 	forum_desc_bitfield varchar(252) NOT NULL DEFAULT '',
-	forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
 	forum_desc_uid varchar(5) NOT NULL DEFAULT '',
 	forum_link varchar(255) NOT NULL DEFAULT '',
 	forum_password varchar(40) NOT NULL DEFAULT '',
@@ -226,7 +226,7 @@ CREATE TABLE phpbb_forums (
 	forum_rules text(65535) NOT NULL DEFAULT '',
 	forum_rules_link varchar(255) NOT NULL DEFAULT '',
 	forum_rules_bitfield varchar(252) NOT NULL DEFAULT '',
-	forum_rules_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	forum_rules_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
 	forum_rules_uid varchar(5) NOT NULL DEFAULT '',
 	forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0',
 	forum_type tinyint(4) NOT NULL DEFAULT '0',
@@ -290,7 +290,7 @@ CREATE TABLE phpbb_groups (
 	group_name varchar(252) NOT NULL DEFAULT '',
 	group_desc text(65535) NOT NULL DEFAULT '',
 	group_desc_bitfield varchar(252) NOT NULL DEFAULT '',
-	group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7',
 	group_desc_uid varchar(5) NOT NULL DEFAULT '',
 	group_display INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	group_avatar varchar(255) NOT NULL DEFAULT '',
@@ -950,6 +950,8 @@ CREATE TABLE phpbb_users (
 	user_warnings tinyint(4) NOT NULL DEFAULT '0',
 	user_last_warning INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_login_attempts tinyint(4) NOT NULL DEFAULT '0',
+	user_inactive_reason tinyint(2) NOT NULL DEFAULT '0',
+	user_inactive_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_posts INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	user_lang varchar(30) NOT NULL DEFAULT '',
 	user_timezone decimal(5,2) NOT NULL DEFAULT '0',