5 files changed, 236 insertions, 210 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index bc8cf254c4..cd530e7c9d 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -1058,7 +1058,7 @@ if ($stage == 3)
 
 		foreach ($sql_query as $sql)
 		{
-			$sql = trim($sql);
+			$sql = trim(str_replace('|', ';', $sql));
 			if (!$db->sql_query($sql))
 			{
 				$error = $db->sql_error();
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index feb7323016..f867aae8fd 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -14,7 +14,6 @@ CREATE TABLE phpbb_attachments (
 ); 
 
 CREATE INDEX phpbb_attachments_attach_id ON phpbb_attachments (attach_id);
-CREATE INDEX phpbb_attachments_post_id ON phpbb_attachments (post_id);
 CREATE INDEX phpbb_attachments_privmsgs_id ON phpbb_attachments (privmsgs_id);
 
 # Table: phpbb_attach_desc
@@ -35,7 +34,6 @@ CREATE TABLE phpbb_attach_desc (
 CREATE GENERATOR phpbb_attach_desc_gen;
 SET GENERATOR phpbb_attach_desc_gen TO 0;
 CREATE INDEX phpbb_attach_desc_filetime ON phpbb_attach_desc (filetime);
-CREATE INDEX phpbb_attach_desc_physical_filename ON phpbb_attach_desc (physical_filename);
 CREATE INDEX phpbb_attach_desc_filesize ON phpbb_attach_desc (filesize);
 
 CREATE TRIGGER phpbb_attach_desc_trig 
@@ -50,7 +48,7 @@ CREATE TABLE phpbb_auth_groups (
   group_id INTEGER DEFAULT 0 NOT NULL,
   forum_id INTEGER DEFAULT 0 NOT NULL,
   auth_option_id SMALLINT DEFAULT 0 NOT NULL,
-  auth_allow_deny SMALLINT DEFAULT 1 NOT NULL
+  auth_setting SMALLINT DEFAULT 0 NOT NULL
 );
 
 CREATE INDEX phpbb_auth_groups_group_id ON phpbb_auth_groups (group_id);
@@ -59,7 +57,7 @@ CREATE INDEX phpbb_auth_groups_option_id ON phpbb_auth_groups (auth_option_id);
 # Table: phpbb_auth_options
 CREATE TABLE phpbb_auth_options (
   auth_option_id SMALLINT NOT NULL,
-  auth_value CHAR(20) NOT NULL,
+  auth_option CHAR(20) NOT NULL,
   is_global SMALLINT DEFAULT 0 NOT NULL,
   is_local SMALLINT DEFAULT 0 NOT NULL,
   founder_only SMALLINT DEFAULT 0 NOT NULL, 
@@ -68,7 +66,7 @@ CREATE TABLE phpbb_auth_options (
 
 CREATE GENERATOR phpbb_auth_options_gen;
 SET GENERATOR phpbb_auth_options_gen TO 0;
-CREATE INDEX phpbb_auth_options_auth_value ON phpbb_auth_options (auth_value);
+CREATE INDEX phpbb_auth_options_auth_option ON phpbb_auth_options (auth_option);
 
 CREATE TRIGGER phpbb_auth_options_trig 
 	FOR phpbb_auth_options BEFORE INSERT
@@ -103,7 +101,7 @@ CREATE TABLE phpbb_auth_users (
   user_id INTEGER DEFAULT 0 NOT NULL,
   forum_id INTEGER DEFAULT 0 NOT NULL,
   auth_option_id SMALLINT DEFAULT 0 NOT NULL,
-  auth_allow_deny SMALLINT DEFAULT 1 NOT NULL
+  auth_setting SMALLINT DEFAULT 0 NOT NULL
 );
 
 CREATE INDEX phpbb_auth_users_user_id ON phpbb_auth_users (user_id);
@@ -112,13 +110,14 @@ CREATE INDEX phpbb_auth_users_option_id ON phpbb_auth_users (auth_option_id);
 # Table: 'phpbb_banlist'
 CREATE TABLE phpbb_banlist (
    ban_id INTEGER NOT NULL,
-   ban_userid INTEGER,
-   ban_ip VARCHAR(40),
-   ban_email VARCHAR(50),
-   ban_start INTEGER,
-   ban_end INTEGER,
+   ban_userid INTEGER DEFAULT 0 NOT NULL,
+   ban_ip VARCHAR(40) DEFAULT '' NOT NULL,
+   ban_email VARCHAR(50) DEFAULT '' NOT NULL,
+   ban_start INTEGER DEFAULT 0 NOT NULL,
+   ban_end INTEGER DEFAULT 0 NOT NULL,
    ban_exclude SMALLINT DEFAULT 0 NOT NULL, 
-   ban_reason VARCHAR(255), 
+   ban_reason VARCHAR(255),
+   ban_give_reason VARCHAR(255) DEFAULT '' NOT NULL, 
    PRIMARY KEY (ban_id) 
 );
 
@@ -172,8 +171,8 @@ CREATE TRIGGER phpbb_disallow_trig
 CREATE TABLE phpbb_extensions (
   extension_id INTEGER NOT NULL,
   group_id INTEGER DEFAULT 0 NOT NULL,
-  extension VARCHAR(100) NOT NULL,
-  comment VARCHAR(100),
+  extension VARCHAR(100) DEFAULT '' NOT NULL,
+  comment VARCHAR(100) DEFAULT '' NOT NULL,
   PRIMARY KEY (extension_id)
 );
 
@@ -190,10 +189,11 @@ CREATE TRIGGER phpbb_extensions_trig
 # Table: 'phpbb_extension_groups'
 CREATE TABLE phpbb_extension_groups (
   group_id INTEGER NOT NULL,
-  group_name VARCHAR(20) NOT NULL,
+  group_name VARCHAR(20) DEFAULT '' NOT NULL,
   cat_id SMALLINT DEFAULT 0 NOT NULL, 
   allow_group SMALLINT DEFAULT 0 NOT NULL,
-  download_mode SMALLINT UNSIGNED DEFAULT 1 NOT NULL,
+  download_mode SMALLINT DEFAULT 1 NOT NULL,
+  upload_icon VARCHAR(100) DEFAULT '' NOT NULL,
   max_filesize INTEGER DEFAULT 0 NOT NULL,
   PRIMARY KEY (group_id)
 );
@@ -234,17 +234,21 @@ CREATE TABLE phpbb_forums (
    forum_parents BLOB SUB_TYPE 1,
    forum_name VARCHAR(150) NOT NULL,
    forum_desc BLOB SUB_TYPE 1,
+   forum_link VARCHAR(200) DEFAULT '' NOT NULL,
    forum_password VARCHAR(32) DEFAULT '' NOT NULL, 
-   forum_style SMALLINT,
-   forum_image VARCHAR(50),
+   forum_style SMALLINT DEFAULT 0 NOT NULL,
+   forum_image VARCHAR(50) DEFAULT '' NOT NULL,
+   forum_topics_per_page SMALLINT DEFAULT 0 NOT NULL,
+   forum_type SMALLINT DEFAULT 0 NOT NULL,
    forum_status SMALLINT DEFAULT 0 NOT NULL,
-   forum_postable SMALLINT DEFAULT 0 NOT NULL,
    forum_posts INTEGER DEFAULT 0 NOT NULL,
    forum_topics INTEGER DEFAULT 0 NOT NULL,
+   forum_topics_real INTEGER DEFAULT 0 NOT NULL,
    forum_last_post_id INTEGER DEFAULT 0 NOT NULL,
    forum_last_poster_id INTEGER DEFAULT 0 NOT NULL,
    forum_last_post_time INTEGER DEFAULT 0 NOT NULL,
    forum_last_poster_name VARCHAR(30) DEFAULT '' NOT NULL,
+   forum_flags SMALLINT DEFAULT 0 NOT NULL,
    display_on_index SMALLINT DEFAULT 1 NOT NULL,
    enable_icons SMALLINT DEFAULT 1 NOT NULL, 
    enable_prune SMALLINT DEFAULT 0 NOT NULL, 
@@ -266,6 +270,22 @@ CREATE TRIGGER phpbb_forums_trig
 			NEW.forum_id = GEN_ID(phpbb_forums_gen, 1)|
 	END;
 
+# Table: phpbb_forum_access
+CREATE TABLE phpbb_forum_access (
+  forum_id INTEGER DEFAULT 0 NOT NULL,
+  user_id INTEGER DEFAULT 0 NOT NULL,
+  session_id CHAR(32) DEFAULT '' NOT NULL,
+  PRIMARY KEY  (forum_id,user_id,session_id)
+);
+
+# Table: 'phpbb_forums_marking'
+CREATE TABLE phpbb_forums_marking (
+   user_id INTEGER DEFAULT 0 NOT NULL,
+   forum_id INTEGER DEFAULT 0 NOT NULL,
+   mark_time INTEGER DEFAULT 0 NOT NULL,
+   PRIMARY KEY (user_id, forum_id)
+);
+
 # Table: 'phpbb_forums_watch'
 CREATE TABLE phpbb_forums_watch (
   forum_id SMALLINT DEFAULT 0 NOT NULL,
@@ -349,16 +369,6 @@ CREATE TRIGGER phpbb_lang_trig
 			NEW.lang_id = GEN_ID(phpbb_lang_gen, 1)|
 	END;
 
-# Table: 'phpbb_lastread'
-CREATE TABLE phpbb_lastread (
-   user_id INTEGER DEFAULT 0 NOT NULL,
-   lastread_type SMALLINT DEFAULT 0 NOT NULL,
-   forum_id INTEGER DEFAULT 0 NOT NULL,
-   topic_id INTEGER DEFAULT 0 NOT NULL,
-   lastread_time INTEGER DEFAULT 0 NOT NULL,
-   PRIMARY KEY (user_id, topic_id)
-);
-
 # Table: 'phpbb_log_moderator'
 CREATE TABLE phpbb_log_moderator (
   log_id INTEGER DEFAULT 0 NOT NULL,
@@ -423,8 +433,8 @@ CREATE INDEX phpbb_mod_cache_forum ON phpbb_moderator_cache (forum_id);
 # Table: 'phpbb_vote_results'
 CREATE TABLE phpbb_poll_results (
   poll_option_id SMALLINT DEFAULT 0 NOT NULL,
-  topic_id INTEGER NOT NULL,
-  poll_option_text VARCHAR(255) NOT NULL,
+  topic_id INTEGER DEFAULT 0 NOT NULL,
+  poll_option_text VARCHAR(255) DEFAULT '' NOT NULL,
   poll_option_total INTEGER DEFAULT 0 NOT NULL 
 );
 
@@ -436,7 +446,7 @@ CREATE TABLE phpbb_poll_voters (
   topic_id INTEGER DEFAULT 0 NOT NULL,
   poll_option_id SMALLINT DEFAULT 0 NOT NULL,
   vote_user_id INTEGER DEFAULT 0 NOT NULL,
-  vote_user_ip VARCHAR(40) NOT NULL 
+  vote_user_ip VARCHAR(40) DEFAULT '' NOT NULL 
 );
 
 CREATE INDEX phpbb_poll_voters_topic ON phpbb_poll_voters (topic_id);
@@ -469,14 +479,17 @@ CREATE TABLE phpbb_posts (
    bbcode_uid VARCHAR(10) DEFAULT '' NOT NULL,
    post_edit_time INTEGER DEFAULT 0 NOT NULL,
    post_edit_count SMALLINT DEFAULT 0 NOT NULL,
+   post_edit_locked SMALLINT DEFAULT 0 NOT NULL,
    PRIMARY KEY (post_id) 
 );
 
 CREATE GENERATOR phpbb_posts_gen;
 SET GENERATOR phpbb_posts_gen TO 0;
+CREATE INDEX phpbb_posts_forum_id ON phpbb_posts (forum_id);
 CREATE INDEX phpbb_posts_topic_id ON phpbb_posts (topic_id);
 CREATE INDEX phpbb_posts_poster_ip ON phpbb_posts (poster_ip);
 CREATE INDEX phpbb_posts_poster_id ON phpbb_posts (poster_id);
+CREATE INDEX phpbb_posts_post_apv ON phpbb_posts (post_approved);
 
 CREATE TRIGGER phpbb_posts_trig 
 	FOR phpbb_posts BEFORE INSERT
@@ -523,7 +536,6 @@ CREATE TABLE phpbb_ranks (
    rank_min INTEGER DEFAULT 0 NOT NULL,
    rank_special SMALLINT DEFAULT 0,
    rank_image VARCHAR(100),
-   rank_colour VARCHAR(6), 
    PRIMARY KEY (rank_id) 
 );
 
@@ -541,10 +553,10 @@ CREATE TRIGGER phpbb_ranks_trig
 CREATE TABLE phpbb_ratings (
   post_id INTEGER DEFAULT 0 NOT NULL,
   user_id SMALLINT DEFAULT 0 NOT NULL,
-  rating SMALLINT NOT NULL, 
-  PRIMARY KEY (post_id, user_id) 
+  rating SMALLINT DEFAULT 0 NOT NULL
 );
 
+CREATE INDEX phpbb_ratings_post_id ON phpbb_ratings (post_id);
 CREATE INDEX phpbb_ratings_user_id ON phpbb_ratings (user_id);
 
 # Table: 'phpbb_reports_reasons'
@@ -572,6 +584,7 @@ CREATE TABLE phpbb_reports (
   reason_id SMALLINT DEFAULT 0 NOT NULL,
   post_id INTEGER DEFAULT 0 NOT NULL,
   user_id INTEGER DEFAULT 0 NOT NULL,
+  user_notify SMALLINT DEFAULT 0 NOT NULL,
   report_time INTEGER DEFAULT 0 NOT NULL,
   report_text BLOB SUB_TYPE 1 NOT NULL, 
   PRIMARY KEY (report_id)
@@ -637,12 +650,12 @@ CREATE INDEX phpbb_sessions_session_time ON phpbb_sessions (session_time);
 # Table: 'phpbb_smilies'
 CREATE TABLE phpbb_smilies (
    smile_id SMALLINT NOT NULL,
-   code CHAR(10),
-   emoticon CHAR(50),
-   smile_url CHAR(50),
-   smile_width SMALLINT NOT NULL,
-   smile_height SMALLINT NOT NULL,
-   smile_order SMALLINT NOT NULL,
+   code CHAR(10) DEFAULT '' NOT NULL,
+   emoticon CHAR(50) DEFAULT '' NOT NULL,
+   smile_url CHAR(50) DEFAULT '' NOT NULL,
+   smile_width SMALLINT DEFAULT 0 NOT NULL,
+   smile_height SMALLINT DEFAULT 0 NOT NULL,
+   smile_order SMALLINT DEFAULT 1 NOT NULL,
    display_on_posting SMALLINT DEFAULT 1 NOT NULL, 
    PRIMARY KEY (smile_id)
 );
@@ -660,10 +673,10 @@ CREATE TRIGGER phpbb_smilies_trig
 # Table: 'phpbb_styles'
 CREATE TABLE phpbb_styles (
    style_id SMALLINT NOT NULL,
-   template_id CHAR(50) NOT NULL,
-   theme_id SMALLINT NOT NULL,
-   imageset_id SMALLINT NOT NULL,
-   style_name CHAR(30) NOT NULL, 
+   template_id CHAR(50) DEFAULT '' NOT NULL,
+   theme_id SMALLINT DEFAULT 0 NOT NULL,
+   imageset_id SMALLINT DEFAULT 0 NOT NULL,
+   style_name CHAR(30) DEFAULT '' NOT NULL, 
    PRIMARY KEY (style_id) 
 );
 
@@ -683,10 +696,11 @@ CREATE TRIGGER phpbb_styles_trig
 # Table: 'phpbb_styles_template'
 CREATE TABLE phpbb_styles_template (
    template_id SMALLINT NOT NULL,
-   template_name VARCHAR(30) NOT NULL,
-   template_path VARCHAR(50) NOT NULL,
-   poll_length SMALLINT NOT NULL,
-   pm_box_length SMALLINT NOT NULL, 
+   template_name CHAR(30) DEFAULT '' NOT NULL,
+   template_path CHAR(50) DEFAULT '' NOT NULL,
+   poll_length SMALLINT DEFAULT 0 NOT NULL,
+   pm_box_length SMALLINT DEFAULT 0 NOT NULL, 
+   bbcode_bitfield INT DEFAULT 0 NOT NULL,
    PRIMARY KEY (template_id)
 );
 
@@ -703,8 +717,8 @@ CREATE TRIGGER phpbb_styles_template_trig
 # Table: 'phpbb_styles_theme'
 CREATE TABLE phpbb_styles_theme (
    theme_id SMALLINT NOT NULL,
-   theme_name VARCHAR(60),
-   css_external VARCHAR(100),
+   theme_name CHAR(60) DEFAULT '' NOT NULL,
+   css_external CHAR(100) DEFAULT '' NOT NULL,
    css_data BLOB SUB_TYPE 1, 
    PRIMARY KEY (theme_id)
 );
@@ -722,70 +736,67 @@ CREATE TRIGGER phpbb_styles_theme_trig
 # Table: 'phpbb_styles_imageset'
 CREATE TABLE phpbb_styles_imageset (
   imageset_id SMALLINT NOT NULL,
-  imageset_name VARCHAR(100),
-  imageset_path VARCHAR(30),
-  post_new VARCHAR(200) DEFAULT '',
-  post_locked VARCHAR(200) DEFAULT '',
-  post_pm VARCHAR(200) DEFAULT '',
-  reply_new VARCHAR(200) DEFAULT '',
-  reply_pm VARCHAR(200) DEFAULT '',
-  reply_locked VARCHAR(200) DEFAULT '',
-  icon_profile VARCHAR(200) DEFAULT '',
-  icon_pm VARCHAR(200) DEFAULT '',
-  icon_delete VARCHAR(200) DEFAULT '',
-  icon_ip VARCHAR(200) DEFAULT '',
-  icon_quote VARCHAR(200) DEFAULT '',
-  icon_search VARCHAR(200) DEFAULT '',
-  icon_edit VARCHAR(200) DEFAULT '',
-  icon_email VARCHAR(200) DEFAULT '',
-  icon_www VARCHAR(200) DEFAULT '',
-  icon_icq VARCHAR(200) DEFAULT '',
-  icon_aim VARCHAR(200) DEFAULT '',
-  icon_yim VARCHAR(200) DEFAULT '',
-  icon_msnm VARCHAR(200) DEFAULT '',
-  icon_no_email VARCHAR(200) DEFAULT '',
-  icon_no_www VARCHAR(200) DEFAULT '',
-  icon_no_icq VARCHAR(200) DEFAULT '',
-  icon_no_aim VARCHAR(200) DEFAULT '',
-  icon_no_yim VARCHAR(200) DEFAULT '',
-  icon_no_msnm VARCHAR(200) DEFAULT '',
-  item_approved VARCHAR(200) DEFAULT '',
-  item_reported VARCHAR(200) DEFAULT '',
-  goto_post VARCHAR(200) DEFAULT '',
-  goto_post_new VARCHAR(200) DEFAULT '',
-  goto_post_latest VARCHAR(200) DEFAULT '',
-  goto_post_newest VARCHAR(200) DEFAULT '',
-  forum VARCHAR(200) DEFAULT '',
-  forum_new VARCHAR(200) DEFAULT '',
-  forum_locked VARCHAR(200) DEFAULT '',
-  sub_forum VARCHAR(200) DEFAULT '',
-  sub_forum_new VARCHAR(200) DEFAULT '',
-  folder VARCHAR(200) DEFAULT '',
-  folder_posted VARCHAR(200) DEFAULT '',
-  folder_new VARCHAR(200) DEFAULT '',
-  folder_new_posted VARCHAR(200) DEFAULT '',
-  folder_hot VARCHAR(200) DEFAULT '',
-  folder_hot_posted VARCHAR(200) DEFAULT '',
-  folder_hot_new VARCHAR(200) DEFAULT '',
-  folder_hot_new_posted VARCHAR(200) DEFAULT '',
-  folder_locked VARCHAR(200) DEFAULT '',
-  folder_locked_posted VARCHAR(200) DEFAULT '',
-  folder_locked_new VARCHAR(200) DEFAULT '',
-  folder_locked_new_posted VARCHAR(200) DEFAULT '',
-  folder_sticky VARCHAR(200) DEFAULT '',
-  folder_sticky_posted VARCHAR(200) DEFAULT '',
-  folder_sticky_new VARCHAR(200) DEFAULT '',
-  folder_sticky_new_posted VARCHAR(200) DEFAULT '',
-  folder_announce VARCHAR(200) DEFAULT '',
-  folder_announce_posted  VARCHAR(200) DEFAULT '',
-  folder_announce_new VARCHAR(200) DEFAULT '',
-  folder_announce_new_posted VARCHAR(200) DEFAULT '',
-  topic_watch VARCHAR(200) DEFAULT '',
-  topic_unwatch VARCHAR(200) DEFAULT '',
-  poll_left VARCHAR(200) DEFAULT '',
-  poll_center VARCHAR(200) DEFAULT '',
-  poll_right VARCHAR(200) DEFAULT '',
-  rating VARCHAR(200) DEFAULT '', 
+  imageset_name CHAR(100),
+  imageset_path CHAR(30),
+  btn_post CHAR(200) DEFAULT '' NOT NULL,
+  btn_post_pm CHAR(200) DEFAULT '' NOT NULL,
+  btn_reply CHAR(200) DEFAULT '' NOT NULL,
+  btn_reply_pm CHAR(200) DEFAULT '' NOT NULL,
+  btn_locked CHAR(200) DEFAULT '' NOT NULL,
+  btn_profile CHAR(200) DEFAULT '' NOT NULL,
+  btn_pm CHAR(200) DEFAULT '' NOT NULL,
+  btn_delete CHAR(200) DEFAULT '' NOT NULL,
+  btn_ip CHAR(200) DEFAULT '' NOT NULL,
+  btn_quote CHAR(200) DEFAULT '' NOT NULL,
+  btn_search CHAR(200) DEFAULT '' NOT NULL,
+  btn_edit CHAR(200) DEFAULT '' NOT NULL,
+  btn_report CHAR(200) DEFAULT '' NOT NULL,
+  btn_email CHAR(200) DEFAULT '' NOT NULL,
+  btn_www CHAR(200) DEFAULT '' NOT NULL,
+  btn_icq CHAR(200) DEFAULT '' NOT NULL,
+  btn_aim CHAR(200) DEFAULT '' NOT NULL,
+  btn_yim CHAR(200) DEFAULT '' NOT NULL,
+  btn_msnm CHAR(200) DEFAULT '' NOT NULL,
+  btn_jabber CHAR(200) DEFAULT '' NOT NULL,
+  btn_online CHAR(200) DEFAULT '' NOT NULL,
+  btn_offline CHAR(200) DEFAULT '' NOT NULL,
+  btn_topic_watch CHAR(200) DEFAULT '' NOT NULL,
+  btn_topic_unwatch CHAR(200) DEFAULT '' NOT NULL,
+  icon_unapproved CHAR(200) DEFAULT '' NOT NULL,
+  icon_reported CHAR(200) DEFAULT '' NOT NULL,
+  icon_attach CHAR(200) DEFAULT '' NOT NULL,
+  icon_post CHAR(200) DEFAULT '' NOT NULL,
+  icon_post_new CHAR(200) DEFAULT '' NOT NULL,
+  icon_post_latest CHAR(200) DEFAULT '' NOT NULL,
+  icon_post_newest CHAR(200) DEFAULT '' NOT NULL,
+  forum CHAR(200) DEFAULT '' NOT NULL,
+  forum_new CHAR(200) DEFAULT '' NOT NULL,
+  forum_locked CHAR(200) DEFAULT '' NOT NULL,
+  sub_forum CHAR(200) DEFAULT '' NOT NULL,
+  sub_forum_new CHAR(200) DEFAULT '' NOT NULL,
+  folder CHAR(200) DEFAULT '' NOT NULL,
+  folder_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_new CHAR(200) DEFAULT '' NOT NULL,
+  folder_new_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_hot CHAR(200) DEFAULT '' NOT NULL,
+  folder_hot_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_hot_new CHAR(200) DEFAULT '' NOT NULL,
+  folder_hot_new_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_locked CHAR(200) DEFAULT '' NOT NULL,
+  folder_locked_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_locked_new CHAR(200) DEFAULT '' NOT NULL,
+  folder_locked_new_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_sticky CHAR(200) DEFAULT '' NOT NULL,
+  folder_sticky_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_sticky_new CHAR(200) DEFAULT '' NOT NULL,
+  folder_sticky_new_posted CHAR(200) DEFAULT '' NOT NULL,
+  folder_announce CHAR(200) DEFAULT '' NOT NULL,
+  folder_announce_posted  CHAR(200) DEFAULT '' NOT NULL,
+  folder_announce_new CHAR(200) DEFAULT '' NOT NULL,
+  folder_announce_new_posted CHAR(200) DEFAULT '' NOT NULL,
+  poll_left CHAR(200) DEFAULT '' NOT NULL,
+  poll_center CHAR(200) DEFAULT '' NOT NULL,
+  poll_right CHAR(200) DEFAULT '' NOT NULL,
   PRIMARY KEY (imageset_id) 
 );
 
@@ -810,9 +821,9 @@ CREATE TABLE phpbb_topics (
    topic_title VARCHAR(60) NOT NULL,
    topic_poster INTEGER DEFAULT 0 NOT NULL,
    topic_time INTEGER DEFAULT 0 NOT NULL,
-   topic_rating SMALLINT DEFAULT 0 NOT NULL,
    topic_views INTEGER DEFAULT 0 NOT NULL,
    topic_replies INTEGER DEFAULT 0 NOT NULL,
+   topic_replies_real INTEGER DEFAULT 0 NOT NULL,
    topic_status SMALLINT DEFAULT 0 NOT NULL,
    topic_type SMALLINT DEFAULT 0 NOT NULL,
    topic_first_post_id INTEGER DEFAULT 0 NOT NULL,
@@ -825,6 +836,7 @@ CREATE TABLE phpbb_topics (
    poll_title VARCHAR(255) DEFAULT '' NOT NULL,
    poll_start INTEGER DEFAULT 0 NOT NULL,
    poll_length INTEGER DEFAULT 0 NOT NULL,
+   poll_max_options SMALLINT DEFAULT 1 NOT NULL,
    poll_last_vote INTEGER, 
    PRIMARY KEY (topic_id) 
 );
@@ -834,6 +846,7 @@ SET GENERATOR phpbb_topics_gen TO 0;
 CREATE INDEX phpbb_topics_forum_id ON phpbb_topics (forum_id);
 CREATE INDEX phpbb_topics_moved_id ON phpbb_topics (topic_moved_id);
 CREATE INDEX phpbb_topics_last_post_time ON phpbb_topics (topic_last_post_time);
+CREATE INDEX phpbb_topics_last_poll_vote ON phpbb_topics (poll_last_vote);
 CREATE INDEX phpbb_topics_type ON phpbb_topics (topic_type);
 
 CREATE TRIGGER phpbb_topics_trig 
@@ -843,6 +856,15 @@ CREATE TRIGGER phpbb_topics_trig
 			NEW.topic_id = GEN_ID(phpbb_topics_gen, 1)|
 	END;
 
+# Table: 'phpbb_topic_marking'
+CREATE TABLE phpbb_topics_marking (
+   user_id INTEGER DEFAULT 0 NOT NULL,
+   topic_id INTEGER DEFAULT 0 NOT NULL,
+   mark_type SMALLINT DEFAULT 0 NOT NULL,
+   mark_time INTEGER DEFAULT 0 NOT NULL,
+   PRIMARY KEY (user_id, topic_id)
+);
+
 # Table: 'phpbb_topics_watch'
 CREATE TABLE phpbb_topics_watch (
   topic_id INTEGER DEFAULT 0 NOT NULL,
@@ -857,8 +879,8 @@ CREATE INDEX phpbb_topics_watch_status ON phpbb_topics_watch (notify_status);
 # Table: 'phpbb_ucp_modules'
 CREATE TABLE phpbb_ucp_modules (
 	module_id INTEGER DEFAULT 0 NOT NULL,
-	module_langname VARCHAR(50) NOT NULL,
-	module_filename VARCHAR(50) NOT NULL,
+	module_title VARCHAR(50) DEFAULT ''  NOT NULL,
+	module_filename VARCHAR(50) DEFAULT '' NOT NULL,
 	module_order INTEGER DEFAULT 0 NOT NULL, 
 	PRIMARY KEY (module_id)
 );
@@ -889,69 +911,77 @@ CREATE TABLE phpbb_users (
    user_id INTEGER NOT NULL,
    user_active SMALLINT DEFAULT 1,
    user_founder SMALLINT DEFAULT 0 NOT NULL,
+   group_id INTEGER DEFAULT 0 NOT NULL,
    user_permissions BLOB SUB_TYPE 1 DEFAULT '',
    user_ip VARCHAR(40),
    user_regdate INTEGER DEFAULT 0 NOT NULL,
    username VARCHAR(30) NOT NULL,
    user_password VARCHAR(32) NOT NULL,
    user_email VARCHAR(60),
-   user_session_time INTEGER DEFAULT 0 NOT NULL,
-   user_session_page SMALLINT DEFAULT 0 NOT NULL,
+   user_birthday VARCHAR(10) DEFAULT '' NOT NULL,
    user_lastvisit INTEGER DEFAULT 0 NOT NULL,
+   user_lastpage VARCHAR(100) DEFAULT '' NOT NULL,
    user_karma SMALLINT DEFAULT 3 NOT NULL, 
-   user_min_karma SMALLINT DEFAULT 3 NOT NULL, 
+   user_min_karma SMALLINT DEFAULT -5 NOT NULL, 
    user_startpage VARCHAR(100) DEFAULT '',
    user_colour VARCHAR(6) DEFAULT '' NOT NULL,
    user_posts INTEGER DEFAULT 0 NOT NULL,
-   user_lang VARCHAR(30),
+   user_lang VARCHAR(30) DEFAULT '' NOT NULL,
    user_timezone decimal(5,2) DEFAULT 0 NOT NULL,
    user_dst SMALLINT DEFAULT 0 NOT NULL,
    user_dateformat VARCHAR(15) DEFAULT 'd M Y H:i' NOT NULL,
-   user_style SMALLINT,
-   user_rank INTEGER DEFAULT 0,
+   user_style SMALLINT DEFAULT 1 NOT NULL,
+   user_rank INTEGER DEFAULT 0 NOT NULL,
    user_new_privmsg SMALLINT DEFAULT 0 NOT NULL,
    user_unread_privmsg SMALLINT DEFAULT 0 NOT NULL,
    user_last_privmsg INTEGER DEFAULT 0 NOT NULL,
    user_emailtime INTEGER,
-   user_sortby_type VARCHAR(1) DEFAULT 'l' NOT NULL,
-   user_sortby_dir VARCHAR(1) DEFAULT 'd' NOT NULL,
+   user_sortby_type VARCHAR(1) DEFAULT '' NOT NULL,
+   user_sortby_dir VARCHAR(1) DEFAULT '' NOT NULL,
    user_show_days SMALLINT DEFAULT 0 NOT NULL,
-   user_viewemail SMALLINT DEFAULT 1 NOT NULL,
+   user_viewimg SMALLINT DEFAULT 1 NOT NULL,
+   user_notify SMALLINT DEFAULT 0 NOT NULL,
+   user_notify_pm SMALLINT DEFAULT 1 NOT NULL,
+   user_popup_pm SMALLINT DEFAULT 0 NOT NULL,
+   user_viewflash SMALLINT DEFAULT 1 NOT NULL,
+   user_viewsmilies SMALLINT DEFAULT 1 NOT NULL,
    user_viewsigs SMALLINT DEFAULT 1 NOT NULL,
    user_viewavatars SMALLINT DEFAULT 1 NOT NULL,
-   user_viewimg SMALLINT DEFAULT 1 NOT NULL,
-   user_attachsig SMALLINT,
-   user_allowhtml SMALLINT DEFAULT 1,
-   user_allowbbcode SMALLINT DEFAULT 1,
-   user_allowsmile SMALLINT DEFAULT 1,
+   user_viewcensors SMALLINT DEFAULT 1 NOT NULL,
+   user_attachsig SMALLINT DEFAULT 1 NOT NULL,
+   user_allowhtml SMALLINT DEFAULT 1 NOT NULL,
+   user_allowbbcode SMALLINT DEFAULT 1 NOT NULL,
+   user_allowsmile SMALLINT DEFAULT 1 NOT NULL,
    user_allowavatar SMALLINT DEFAULT 1 NOT NULL,
    user_allow_pm SMALLINT DEFAULT 1 NOT NULL,
    user_allow_email SMALLINT DEFAULT 1 NOT NULL,
    user_allow_viewonline SMALLINT DEFAULT 1 NOT NULL,
-   user_notify SMALLINT DEFAULT 1 NOT NULL,
-   user_notify_pm SMALLINT DEFAULT 1 NOT NULL,
-   user_popup_pm SMALLINT DEFAULT 0 NOT NULL,
-   user_avatar CHAR(100),
-   user_avatar_type SMALLINT DEFAULT 0,
-   user_avatar_width SMALLINT,
-   user_avatar_height SMALLINT,
+   user_allow_viewemail SMALLINT DEFAULT 1 NOT NULL,
+   user_allow_massemail SMALLINT DEFAULT 1 NOT NULL,
+   user_avatar VARCHAR(100) DEFAULT '' NOT NULL,
+   user_avatar_type SMALLINT DEFAULT 0 NOT NULL,
+   user_avatar_width SMALLINT DEFAULT 0 NOT NULL,
+   user_avatar_height SMALLINT DEFAULT 0 NOT NULL,
    user_sig BLOB SUB_TYPE 1,
-   user_sig_bbcode_uid VARCHAR(10),
-   user_from VARCHAR(100),
-   user_icq VARCHAR(15),
-   user_aim VARCHAR(255),
-   user_yim VARCHAR(255),
-   user_msnm VARCHAR(255),
-   user_website VARCHAR(100),
-   user_actkey VARCHAR(32),
-   user_newpasswd VARCHAR(32),
-   user_occ VARCHAR(100),
-   user_interests VARCHAR(255), 
+   user_sig_bbcode_uid VARCHAR(5) DEFAULT '' NOT NULL,
+   user_sig_bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
+   user_from VARCHAR(100) 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_website VARCHAR(100) DEFAULT '' NOT NULL,
+   user_actkey VARCHAR(32) DEFAULT '' NOT NULL,
+   user_newpasswd VARCHAR(32) DEFAULT '' NOT NULL,
+   user_occ VARCHAR(255) DEFAULT '' NOT NULL,
+   user_interests VARCHAR(255) DEFAULT '' NOT NULL,
    PRIMARY KEY (user_id) 
 );
 
 CREATE GENERATOR phpbb_users_gen;
 SET GENERATOR phpbb_users_gen TO 0;
+CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
 
 CREATE TRIGGER phpbb_users_trig 
 	FOR phpbb_users BEFORE INSERT
@@ -963,8 +993,8 @@ CREATE TRIGGER phpbb_users_trig
 # Table: 'phpbb_words'
 CREATE TABLE phpbb_words (
    word_id INTEGER NOT NULL,
-   word CHAR(100) NOT NULL,
-   replacement CHAR(100) NOT NULL, 
+   word CHAR(100) DEFAULT '' NOT NULL,
+   replacement CHAR(100) DEFAULT '' NOT NULL, 
    PRIMARY KEY (word_id) 
 );
 
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 4073ba2902..c886e67d8c 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -6,13 +6,13 @@
 
 # Table: phpbb_attachments
 CREATE TABLE phpbb_attachments (
-  attach_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
-  post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, 
+  attach_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+  post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   privmsgs_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   user_id_from mediumint(8) NOT NULL,
   user_id_to mediumint(8) NOT NULL,
   KEY attach_id (attach_id)
-); 
+);
 
 # Table: phpbb_attachments_desc
 CREATE TABLE phpbb_attach_desc (
@@ -37,7 +37,7 @@ CREATE TABLE phpbb_auth_groups (
   group_id mediumint(8) unsigned NOT NULL default '0',
   forum_id mediumint(8) unsigned NOT NULL default '0',
   auth_option_id smallint(5) unsigned NOT NULL default '0',
-  auth_setting tinyint(4) NOT NULL default '1',
+  auth_setting tinyint(4) NOT NULL default '0',
   KEY group_id (group_id),
   KEY auth_option_id (auth_option_id)
 );
@@ -55,10 +55,10 @@ CREATE TABLE phpbb_auth_options (
 
 # Table: phpbb_auth_presets
 CREATE TABLE phpbb_auth_presets (
-  preset_id tinyint(4) NOT NULL auto_increment, 
-  preset_name varchar(50) DEFAULT '' NOT NULL, 
-  preset_user_id mediumint(5) UNSIGNED DEFAULT '0' NOT NULL, 
-  preset_type varchar(2) DEFAULT '' NOT NULL, 
+  preset_id tinyint(4) NOT NULL auto_increment,
+  preset_name varchar(50) DEFAULT '' NOT NULL,
+  preset_user_id mediumint(5) UNSIGNED DEFAULT '0' NOT NULL,
+  preset_type varchar(2) DEFAULT '' NOT NULL,
   preset_data text DEFAULT '' NOT NULL,
   PRIMARY KEY (preset_id),
   KEY preset_type (preset_type)
@@ -69,7 +69,7 @@ CREATE TABLE phpbb_auth_users (
   user_id mediumint(8) UNSIGNED NOT NULL default '0',
   forum_id mediumint(8) UNSIGNED NOT NULL default '0',
   auth_option_id smallint(5) UNSIGNED NOT NULL default '0',
-  auth_setting tinyint(4) NOT NULL default '1',
+  auth_setting tinyint(4) NOT NULL default '0',
   KEY user_id (user_id),
   KEY auth_option_id (auth_option_id)
 );
@@ -82,9 +82,9 @@ CREATE TABLE phpbb_banlist (
    ban_email varchar(50) DEFAULT '' NOT NULL,
    ban_start int(11) DEFAULT '0' NOT NULL,
    ban_end int(11) DEFAULT '0' NOT NULL,
-   ban_exclude tinyint(1) DEFAULT '0' NOT NULL, 
-   ban_reason varchar(255) DEFAULT '' NOT NULL, 
-   ban_give_reason varchar(255) DEFAULT '' NOT NULL, 
+   ban_exclude tinyint(1) DEFAULT '0' NOT NULL,
+   ban_reason varchar(255) DEFAULT '' NOT NULL,
+   ban_give_reason varchar(255) DEFAULT '' NOT NULL,
    PRIMARY KEY (ban_id)
 );
 
@@ -101,10 +101,8 @@ CREATE TABLE phpbb_config (
 CREATE TABLE phpbb_confirm (
   confirm_id char(32) DEFAULT '' NOT NULL,
   session_id char(32) DEFAULT '' NOT NULL,
-  code char(6) DEFAULT '' NOT NULL, 
-  time int(11) DEFAULT '0' NOT NULL, 
-  PRIMARY KEY  (session_id,confirm_id),
-  KEY time (time)
+  code char(6) DEFAULT '' NOT NULL,
+  PRIMARY KEY  (session_id,confirm_id)
 );
 
 # Table: 'phpbb_disallow'
@@ -127,7 +125,7 @@ CREATE TABLE phpbb_extensions (
 CREATE TABLE phpbb_extension_groups (
   group_id mediumint(8) NOT NULL auto_increment,
   group_name char(20) NOT NULL,
-  cat_id tinyint(2) DEFAULT '0' NOT NULL, 
+  cat_id tinyint(2) DEFAULT '0' NOT NULL,
   allow_group tinyint(1) DEFAULT '0' NOT NULL,
   download_mode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
   upload_icon varchar(100) DEFAULT '' NOT NULL,
@@ -137,8 +135,8 @@ CREATE TABLE phpbb_extension_groups (
 
 # Table: 'phpbb_forbidden_extensions'
 CREATE TABLE phpbb_forbidden_extensions (
-  extension_id mediumint(8) UNSIGNED NOT NULL auto_increment, 
-  extension varchar(100) NOT NULL, 
+  extension_id mediumint(8) UNSIGNED NOT NULL auto_increment,
+  extension varchar(100) NOT NULL,
   PRIMARY KEY (extension_id)
 );
 
@@ -151,8 +149,8 @@ CREATE TABLE phpbb_forums (
    forum_parents text,
    forum_name varchar(150) NOT NULL,
    forum_desc text,
-   forum_link varchar(200) DEFAULT '' NOT NULL, 
-   forum_password varchar(32) DEFAULT '' NOT NULL, 
+   forum_link varchar(200) DEFAULT '' NOT NULL,
+   forum_password varchar(32) DEFAULT '' NOT NULL,
    forum_style tinyint(4) UNSIGNED,
    forum_image varchar(50) DEFAULT '' NOT NULL,
    forum_topics_per_page tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
@@ -165,10 +163,10 @@ CREATE TABLE phpbb_forums (
    forum_last_poster_id mediumint(8) DEFAULT '0' NOT NULL,
    forum_last_post_time int(11) DEFAULT '0' NOT NULL,
    forum_last_poster_name varchar(30),
-   forum_flags tinyint(4) DEFAULT '0' NOT NULL, 
+   forum_flags tinyint(4) DEFAULT '0' NOT NULL,
    display_on_index tinyint(1) DEFAULT '1' NOT NULL,
-   enable_icons tinyint(1) DEFAULT '1' NOT NULL, 
-   enable_prune tinyint(1) DEFAULT '0' NOT NULL, 
+   enable_icons tinyint(1) DEFAULT '1' NOT NULL,
+   enable_prune tinyint(1) DEFAULT '0' NOT NULL,
    prune_next int(11) UNSIGNED,
    prune_days tinyint(4) UNSIGNED NOT NULL,
    prune_freq tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
@@ -208,7 +206,7 @@ CREATE TABLE phpbb_groups (
    group_id mediumint(8) NOT NULL auto_increment,
    group_type tinyint(4) DEFAULT '1' NOT NULL,
    group_name varchar(40) NOT NULL,
-   group_display tinyint(1) DEFAULT '0' NOT NULL, 
+   group_display tinyint(1) DEFAULT '0' NOT NULL,
    group_avatar varchar(100),
    group_avatar_type tinyint(4),
    group_rank int(11) DEFAULT '0',
@@ -237,11 +235,11 @@ CREATE TABLE phpbb_icons (
 # Table: 'phpbb_lang'
 CREATE TABLE phpbb_lang (
    lang_id tinyint(4) UNSIGNED NOT NULL auto_increment,
-   lang_iso varchar(5) NOT NULL, 
-   lang_dir varchar(30) NOT NULL, 
-   lang_english_name varchar(30), 
-   lang_local_name varchar(100), 
-   lang_author varchar(100), 
+   lang_iso varchar(5) NOT NULL,
+   lang_dir varchar(30) NOT NULL,
+   lang_english_name varchar(30),
+   lang_local_name varchar(100),
+   lang_author varchar(100),
    PRIMARY KEY (lang_id)
 );
 
@@ -326,7 +324,7 @@ CREATE TABLE phpbb_posts (
    post_subject varchar(60),
    post_text text,
    post_checksum varchar(32) NOT NULL,
-   post_encoding varchar(11) DEFAULT 'iso-8859-15' NOT NULL, 
+   post_encoding varchar(11) DEFAULT 'iso-8859-15' NOT NULL,
    post_attachment tinyint(1) DEFAULT '0' NOT NULL,
    bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
    bbcode_uid varchar(5) NOT NULL,
@@ -369,7 +367,6 @@ CREATE TABLE phpbb_ranks (
    rank_min mediumint(8) DEFAULT '0' NOT NULL,
    rank_special tinyint(1) DEFAULT '0',
    rank_image varchar(100),
-   rank_colour varchar(6),
    PRIMARY KEY (rank_id)
 );
 
@@ -377,8 +374,8 @@ CREATE TABLE phpbb_ranks (
 CREATE TABLE phpbb_ratings (
   post_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0',
   user_id tinyint(4) UNSIGNED UNSIGNED NOT NULL DEFAULT '0',
-  rating tinyint(4) NOT NULL,  
-  KEY post_id (post_id), 
+  rating tinyint(4) DEFAULT '0' NOT NULL,
+  KEY post_id (post_id),
   KEY user_id (user_id)
 );
 
@@ -439,7 +436,7 @@ CREATE TABLE phpbb_sessions (
    session_ip varchar(40) DEFAULT '0' NOT NULL,
    session_browser varchar(100) DEFAULT '' NULL,
    session_page varchar(100) DEFAULT '' NOT NULL,
-   session_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, 
+   session_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL,
    PRIMARY KEY (session_id),
    KEY session_time (session_time)
 );
@@ -475,9 +472,9 @@ CREATE TABLE phpbb_styles_template (
    template_id tinyint(4) UNSIGNED NOT NULL auto_increment,
    template_name varchar(30) NOT NULL,
    template_path varchar(50) NOT NULL,
-   poll_length smallint(5) UNSIGNED NOT NULL, 
+   poll_length smallint(5) UNSIGNED NOT NULL,
    pm_box_length smallint(5) UNSIGNED NOT NULL,
-   bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, 
+   bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
    PRIMARY KEY (template_id)
 );
 
@@ -516,12 +513,12 @@ CREATE TABLE phpbb_styles_imageset (
   btn_msnm varchar(200) DEFAULT '' NOT NULL,
   btn_jabber varchar(200) DEFAULT '' NOT NULL,
   btn_online varchar(200) DEFAULT '' NOT NULL,
-  btn_offline varchar(200) DEFAULT '' NOT NULL, 
+  btn_offline varchar(200) DEFAULT '' NOT NULL,
   btn_topic_watch varchar(200) DEFAULT '' NOT NULL,
   btn_topic_unwatch varchar(200) DEFAULT '' NOT NULL,
   icon_unapproved varchar(200) DEFAULT '' NOT NULL,
   icon_reported varchar(200) DEFAULT '' NOT NULL,
-  icon_attach varchar(200) DEFAULT '' NOT NULL, 
+  icon_attach varchar(200) DEFAULT '' NOT NULL,
   icon_post varchar(200) DEFAULT '' NOT NULL,
   icon_post_new varchar(200) DEFAULT '' NOT NULL,
   icon_post_latest varchar(200) DEFAULT '' NOT NULL,
@@ -568,7 +565,6 @@ CREATE TABLE phpbb_topics (
    topic_title varchar(60) NOT NULL,
    topic_poster mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    topic_time int(11) DEFAULT '0' NOT NULL,
-   topic_rating tinyint(4) DEFAULT '0' NOT NULL,
    topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    topic_replies mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    topic_replies_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -583,8 +579,8 @@ CREATE TABLE phpbb_topics (
    topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    poll_title varchar(255) NOT NULL,
    poll_start int(11) NOT NULL DEFAULT '0',
-   poll_length int(11) NOT NULL DEFAULT '0', 
-   poll_max_options tinyint(4) UNSIGNED NOT NULL DEFAULT '1', 
+   poll_length int(11) NOT NULL DEFAULT '0',
+   poll_max_options tinyint(4) UNSIGNED NOT NULL DEFAULT '1',
    poll_last_vote int(11),
    PRIMARY KEY (topic_id),
    KEY forum_id (forum_id),
@@ -616,7 +612,7 @@ CREATE TABLE phpbb_topics_watch (
 # Table: 'phpbb_ucp_modules'
 CREATE TABLE phpbb_ucp_modules (
 	module_id mediumint(8) DEFAULT '0' AUTO_INCREMENT NOT NULL,
-	module_name varchar(50) NOT NULL,
+	module_title varchar(50) NOT NULL,
 	module_filename varchar(50) NOT NULL,
 	module_order mediumint(4) DEFAULT '0' NOT NULL,
 	KEY module_order (module_order),
@@ -644,11 +640,11 @@ CREATE TABLE phpbb_users (
    username varchar(30) DEFAULT '' NOT NULL,
    user_password varchar(32) DEFAULT '' NOT NULL,
    user_email varchar(60) DEFAULT '' NOT NULL,
-   user_birthday varchar(10) DEFAULT '' NOT NULL, 
+   user_birthday varchar(10) DEFAULT '' NOT NULL,
    user_lastvisit int(11) DEFAULT '0' NOT NULL,
    user_lastpage varchar(100) DEFAULT '' NOT NULL,
-   user_karma tinyint(1) DEFAULT '3' NOT NULL, 
-   user_min_karma tinyint(1) DEFAULT '3' NOT NULL, 
+   user_karma tinyint(1) DEFAULT '3' NOT NULL,
+   user_min_karma tinyint(1) DEFAULT '-5' NOT NULL,
    user_colour varchar(6) DEFAULT '' NOT NULL,
    user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    user_lang varchar(30) DEFAULT '' NOT NULL,
@@ -665,7 +661,7 @@ CREATE TABLE phpbb_users (
    user_sortby_dir varchar(1) DEFAULT '' NOT NULL,
    user_show_days tinyint(1) DEFAULT '' NOT NULL,
    user_viewimg tinyint(1) DEFAULT '1' NOT NULL,
-   user_notify tinyint(1) DEFAULT '0' NOT NULL, 
+   user_notify tinyint(1) DEFAULT '0' NOT NULL,
    user_notify_pm tinyint(1) DEFAULT '1' NOT NULL,
    user_popup_pm tinyint(1) DEFAULT '0' NOT NULL,
    user_viewflash tinyint(1) DEFAULT '1' NOT NULL,
@@ -684,7 +680,7 @@ CREATE TABLE phpbb_users (
    user_allow_viewemail tinyint(1) DEFAULT '1' NOT NULL,
    user_allow_massemail tinyint(1) DEFAULT '1' NOT NULL,
    user_avatar varchar(100) DEFAULT '' NOT NULL,
-   user_avatar_type tinyint(2) DEFAULT '0' NOT NULL, 
+   user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
    user_avatar_width tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
    user_avatar_height tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
    user_sig text DEFAULT '' NOT NULL,
@@ -695,7 +691,7 @@ CREATE TABLE phpbb_users (
    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_jabber varchar(255) DEFAULT '' NOT NULL,
    user_website varchar(100) DEFAULT '' NOT NULL,
    user_actkey varchar(32) DEFAULT '' NOT NULL,
    user_newpasswd varchar(32) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 84cb791f5c..5d42cc2e09 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -265,7 +265,7 @@ INSERT INTO phpbb_styles_template (template_id, template_name, template_path, po
 # MSSQL IDENTITY phpbb_styles_theme ON #
 
 # -- phpbb_styles_theme
-INSERT INTO phpbb_styles_theme (theme_id, css_data, css_external) VALUES (1, 'body {background: white url(\'templates/subSilver/images/background.png\') repeat-x;}\nth { background-image: url(\'templates/subSilver/images/cellpic3.gif\') }\ntd.cat { background-image: url(\'templates/subSilver/images/cellpic1.gif\') }\ntd.rowpic { background-image: url(\'templates/subSilver/images/cellpic2.jpg\'); background-repeat: repeat-y }\ntd.icqback { background-image: url(\'templates/subSilver/images/icon_icq_add.gif\'); background-repeat: no-repeat }', 'subSilver/subSilver.css');
+INSERT INTO phpbb_styles_theme (theme_id, css_data, css_external) VALUES (1, 'body {background: white url(''templates/subSilver/images/background.png'') repeat-x;}\nth { background-image: url(''templates/subSilver/images/cellpic3.gif'') }\ntd.cat { background-image: url(''templates/subSilver/images/cellpic1.gif'') }\ntd.rowpic { background-image: url(''templates/subSilver/images/cellpic2.jpg''); background-repeat: repeat-y }\ntd.icqback { background-image: url(''templates/subSilver/images/icon_icq_add.gif''); background-repeat: no-repeat }', 'subSilver/subSilver.css');
 
 # MSSQL IDENTITY phpbb_styles_theme OFF #
 
@@ -415,11 +415,11 @@ INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, disp
 
     
 # -- ucp modules
-INSERT INTO phpbb_ucp_modules (module_id, module_name, module_filename, module_order) VALUES (1, 'MAIN', 'main', 1);
-INSERT INTO phpbb_ucp_modules (module_id, module_name, module_filename, module_order) VALUES (2, 'PROFILE', 'profile', 2);
-INSERT INTO phpbb_ucp_modules (module_id, module_name, module_filename, module_order) VALUES (3, 'PREFERENCES', 'prefs', 3);
-INSERT INTO phpbb_ucp_modules (module_id, module_name, module_filename, module_order) VALUES (4, 'MESSAGING', 'pm', 4);
-INSERT INTO phpbb_ucp_modules (module_id, module_name, module_filename, module_order) VALUES (5, 'LISTS', 'zebra', 5);
+INSERT INTO phpbb_ucp_modules (module_id, module_title, module_filename, module_order) VALUES (1, 'MAIN', 'main', 1);
+INSERT INTO phpbb_ucp_modules (module_id, module_title, module_filename, module_order) VALUES (2, 'PROFILE', 'profile', 2);
+INSERT INTO phpbb_ucp_modules (module_id, module_title, module_filename, module_order) VALUES (3, 'PREFERENCES', 'prefs', 3);
+INSERT INTO phpbb_ucp_modules (module_id, module_title, module_filename, module_order) VALUES (4, 'MESSAGING', 'pm', 4);
+INSERT INTO phpbb_ucp_modules (module_id, module_title, module_filename, module_order) VALUES (5, 'LISTS', 'zebra', 5);
 
 
 # MSSQL IDENTITY phpbb_search_wordlist ON #
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index ce5b34476c..28b1a13287 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -135,7 +135,7 @@ obtain_word_list($censors);
 
 
 // Grab the other enabled UCP modules
-$sql = "SELECT module_id, module_name, module_filename 
+$sql = "SELECT module_id, module_title, module_filename 
 	FROM " . UCP_MODULES_TABLE . " 
 	ORDER BY module_order ASC";
 $result = $db->sql_query($sql);
@@ -143,7 +143,7 @@ $result = $db->sql_query($sql);
 while ($row = $db->sql_fetchrow($result))
 {
 	$template->assign_block_vars('ucp_sections', array(
-		'SECTION'	=> $user->lang['UCP_' . $row['module_name']], 
+		'SECTION'	=> $user->lang['UCP_' . $row['module_title']], 
 
 		'U_SECTION'	=> "ucp.$phpEx$SID&amp;i=" . $row['module_id'],