7 files changed, 229 insertions, 285 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index c49109c2c0..b9bb36276e 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -1088,8 +1088,12 @@ if ($stage == 3)
 				$sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', 'SET IDENTITY_INSERT \1 \2', $sql_query);
 				break;
 
+			case 'postgres':
+				$sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query);
+				break;
+
 			default:
-				$sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', '', $sql_query);
+				//$sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', '', $sql_query);
 		}
 
 		$sql_query = preg_replace('#phpbb_#', $table_prefix, $sql_query);
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index de3a3eb35f..89cc164e77 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -455,13 +455,6 @@ CREATE TABLE phpbb_ranks (
   rank_image VARCHAR(100)
 );;
 
-# phpbb_ratings
-CREATE TABLE phpbb_ratings (
-  post_id INTEGER DEFAULT 0  NOT NULL,
-  user_id INTEGER DEFAULT 0  NOT NULL,
-  rating INTEGER DEFAULT 0  NOT NULL
-);;
-
 # phpbb_reports
 CREATE TABLE phpbb_reports (
   report_id INTEGER NOT NULL,
@@ -530,7 +523,7 @@ CREATE TABLE phpbb_sitelist (
 CREATE TABLE phpbb_smilies (
   smiley_id INTEGER NOT NULL,
   code VARCHAR(10),
-  smiley VARCHAR(50),
+  emotion VARCHAR(50),
   smiley_url VARCHAR(50),
   smiley_width INTEGER DEFAULT 0  NOT NULL,
   smiley_height INTEGER DEFAULT 0  NOT NULL,
@@ -1213,16 +1206,6 @@ ADD PRIMARY KEY (
   rank_id
 );;
 
-CREATE INDEX post_id52
-ON phpbb_ratings(
-  post_id
-);;
-
-CREATE INDEX user_id53
-ON phpbb_ratings(
-  user_id
-);;
-
 ALTER TABLE phpbb_reports
 ADD PRIMARY KEY (
   report_id
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 851a85eac4..789505768b 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -461,13 +461,6 @@ CREATE TABLE [phpbb_ranks] (
 ) ON [PRIMARY]
 GO
 
-CREATE TABLE [phpbb_ratings] (
-	[post_id] [int] NOT NULL ,
-	[user_id] [int] NOT NULL ,
-	[rating] [int] NOT NULL 
-) ON [PRIMARY]
-GO
-
 CREATE TABLE [phpbb_reports] (
 	[report_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[reason_id] [int] NOT NULL ,
@@ -535,7 +528,7 @@ GO
 CREATE TABLE [phpbb_smilies] (
 	[smiley_id] [int] IDENTITY (1, 1) NOT NULL ,
 	[code] [varchar] (10) NULL ,
-	[smiley] [varchar] (50) NULL ,
+	[emotion] [varchar] (50) NULL ,
 	[smiley_url] [varchar] (50) NULL ,
 	[smiley_width] [int] NOT NULL ,
 	[smiley_height] [int] NOT NULL ,
@@ -1737,12 +1730,6 @@ GO
 CREATE  INDEX [field_order] ON [phpbb_profile_fields]([field_order]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [post_id] ON [phpbb_ratings]([post_id]) ON [PRIMARY]
-GO
-
-CREATE  INDEX [user_id] ON [phpbb_ratings]([user_id]) ON [PRIMARY]
-GO
-
 CREATE  INDEX [session_id] ON [phpbb_search_results]([session_id]) ON [PRIMARY]
 GO
 
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index e92fc45c90..caf8ae7436 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -536,15 +536,6 @@ CREATE TABLE phpbb_ranks (
    PRIMARY KEY (rank_id)
 );
 
-# Table: 'phpbb_ratings'
-CREATE TABLE phpbb_ratings (
-  post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-  user_id tinyint(4) UNSIGNED UNSIGNED DEFAULT '0' NOT NULL,
-  rating tinyint(4) DEFAULT '0' NOT NULL,
-  KEY post_id (post_id),
-  KEY user_id (user_id)
-);
-
 # Table: 'phpbb_reports_reasons'
 CREATE TABLE phpbb_reports_reasons (
   reason_id smallint(6) NOT NULL auto_increment,
@@ -624,7 +615,7 @@ CREATE TABLE phpbb_sitelist (
 CREATE TABLE phpbb_smilies (
    smiley_id tinyint(4) UNSIGNED NOT NULL auto_increment,
    code char(10),
-   smiley char(50),
+   emotion char(50),
    smiley_url char(50),
    smiley_width tinyint(4) UNSIGNED NOT NULL,
    smiley_height tinyint(4) UNSIGNED NOT NULL,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index dc9e5dad9e..9879515815 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -50,7 +50,7 @@ CREATE TABLE phpbb_auth_groups (
   group_id INT4  DEFAULT '0' NOT NULL,
   forum_id INT4  DEFAULT '0' NOT NULL,
   auth_option_id INT2  DEFAULT '0' NOT NULL,
-  auth_setting INT2 DEFAULT '0' NOT NULL,
+  auth_setting INT2 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX group_id_phpbb_auth_groups_index ON phpbb_auth_groups (group_id);
@@ -61,7 +61,7 @@ CREATE SEQUENCE phpbb_auth_options_auth_opti;
 
 CREATE TABLE phpbb_auth_options (
   auth_option_id INT2 DEFAULT nextval('phpbb_auth_options_auth_opti'),
-  auth_option char(20) NOT NULL,
+  auth_option varchar(20) NOT NULL,
   is_global INT2 DEFAULT '0' NOT NULL,
   is_local INT2 DEFAULT '0' NOT NULL,
   founder_only INT2 DEFAULT '0' NOT NULL,
@@ -94,7 +94,7 @@ CREATE TABLE phpbb_auth_users (
   user_id INT4  DEFAULT '0' NOT NULL,
   forum_id INT4  DEFAULT '0' NOT NULL,
   auth_option_id INT2  DEFAULT '0' NOT NULL,
-  auth_setting INT2 DEFAULT '0' NOT NULL,
+  auth_setting INT2 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX user_id_phpbb_auth_users_index ON phpbb_auth_users (user_id);
@@ -137,7 +137,7 @@ CREATE TABLE phpbb_bbcodes (
 CREATE TABLE phpbb_bookmarks (
    topic_id INT4  DEFAULT '0' NOT NULL,
    user_id INT4  DEFAULT '0' NOT NULL,
-   order_id INT4  DEFAULT '0' NOT NULL,
+   order_id INT4  DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX order_id_phpbb_bookmarks_index ON phpbb_bookmarks (order_id);
@@ -182,9 +182,9 @@ CREATE INDEX is_dynamic_phpbb_config_index ON phpbb_config (is_dynamic);
 
 /* Table: phpbb_confirm */
 CREATE TABLE phpbb_confirm (
-  confirm_id char(32) DEFAULT '' NOT NULL,
-  session_id char(32) DEFAULT '' NOT NULL,
-  code char(6) DEFAULT '' NOT NULL,
+  confirm_id varchar(32) DEFAULT '' NOT NULL,
+  session_id varchar(32) DEFAULT '' NOT NULL,
+  code varchar(6) DEFAULT '' NOT NULL,
   PRIMARY KEY (session_id,confirm_id)
 );
 
@@ -239,7 +239,7 @@ CREATE SEQUENCE phpbb_extension_groups_group;
 
 CREATE TABLE phpbb_extension_groups (
   group_id INT4 DEFAULT nextval('phpbb_extension_groups_group'),
-  group_name char(20) NOT NULL,
+  group_name varchar(20) NOT NULL,
   cat_id INT2 DEFAULT '0' NOT NULL,
   allow_group INT2 DEFAULT '0' NOT NULL,
   download_mode INT2  DEFAULT '1' NOT NULL,
@@ -319,7 +319,7 @@ SELECT SETVAL('phpbb_forums_forum_id_seq',(select case when max(forum_id)>0 then
 CREATE TABLE phpbb_forum_access (
   forum_id INT4  DEFAULT '0' NOT NULL,
   user_id INT4  DEFAULT '0' NOT NULL,
-  session_id char(32) DEFAULT '' NOT NULL,
+  session_id varchar(32) DEFAULT '' NOT NULL,
   PRIMARY KEY (forum_id,user_id,session_id),
   CHECK (forum_id>=0),
   CHECK (user_id>=0)
@@ -339,7 +339,7 @@ CREATE TABLE phpbb_forums_marking (
 CREATE TABLE phpbb_forums_watch (
   forum_id INT2  DEFAULT '0' NOT NULL,
   user_id INT4 DEFAULT '0' NOT NULL,
-  notify_status INT2 DEFAULT '0' NOT NULL,
+  notify_status INT2 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX forum_id_phpbb_forums_watch_index ON phpbb_forums_watch (forum_id);
@@ -444,10 +444,10 @@ SELECT SETVAL('phpbb_log_log_id_seq',(select case when max(log_id)>0 then max(lo
 CREATE TABLE phpbb_moderator_cache (
   forum_id INT4  NOT NULL,
   user_id INT4  DEFAULT '0' NOT NULL,
-  username char(30) DEFAULT '' NOT NULL,
+  username varchar(30) DEFAULT '' NOT NULL,
   group_id INT4  DEFAULT '0' NOT NULL,
-  groupname char(30) DEFAULT '' NOT NULL,
-  display_on_index INT2  DEFAULT '1' NOT NULL,
+  groupname varchar(30) DEFAULT '' NOT NULL,
+  display_on_index INT2  DEFAULT '1' NOT NULL
 );
 
 CREATE INDEX display_on_index_phpbb_moderator_cache_index ON phpbb_moderator_cache (display_on_index);
@@ -458,7 +458,7 @@ CREATE SEQUENCE phpbb_modules_module_id_seq;
 
 CREATE TABLE phpbb_modules (
   module_id INT4 DEFAULT nextval('phpbb_modules_module_id_seq'),
-  module_type char(3) DEFAULT '' NOT NULL,
+  module_type varchar(3) DEFAULT '' NOT NULL,
   module_title varchar(50) DEFAULT '' NOT NULL,
   module_filename varchar(50) DEFAULT '' NOT NULL,
   module_order INT4 DEFAULT '0' NOT NULL,
@@ -478,7 +478,7 @@ CREATE TABLE phpbb_poll_results (
   poll_option_id INT2  DEFAULT '0' NOT NULL,
   topic_id INT4  NOT NULL,
   poll_option_text varchar(255) NOT NULL,
-  poll_option_total INT4  DEFAULT '0' NOT NULL,
+  poll_option_total INT4  DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX poll_option_id_phpbb_poll_results_index ON phpbb_poll_results (poll_option_id);
@@ -489,7 +489,7 @@ CREATE TABLE phpbb_poll_voters (
   topic_id INT4  DEFAULT '0' NOT NULL,
   poll_option_id INT2  DEFAULT '0' NOT NULL,
   vote_user_id INT4  DEFAULT '0' NOT NULL,
-  vote_user_ip varchar(40) NOT NULL,
+  vote_user_ip varchar(40) NOT NULL
 );
 
 CREATE INDEX topic_id_phpbb_poll_voters_index ON phpbb_poll_voters (topic_id);
@@ -642,12 +642,12 @@ CREATE TABLE phpbb_privmsgs_to (
    user_id INT4  DEFAULT '0' NOT NULL,
    author_id INT4  DEFAULT '0' NOT NULL,
    deleted INT2  DEFAULT '0' NOT NULL,
-   new INT2  DEFAULT '1' NOT NULL,
+   "new" INT2  DEFAULT '1' NOT NULL,
    unread INT2  DEFAULT '1' NOT NULL,
    replied INT2  DEFAULT '0' NOT NULL,
    marked INT2  DEFAULT '0' NOT NULL,
    forwarded INT2  DEFAULT '0' NOT NULL,
-   folder_id INT4 DEFAULT '0' NOT NULL,
+   folder_id INT4 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX msg_id_phpbb_privmsgs_to_index ON phpbb_privmsgs_to (msg_id);
@@ -733,16 +733,6 @@ CREATE TABLE phpbb_ranks (
 
 SELECT SETVAL('phpbb_ranks_rank_id_seq',(select case when max(rank_id)>0 then max(rank_id)+1 else 1 end from phpbb_ranks));
 
-/* Table: phpbb_ratings */
-CREATE TABLE phpbb_ratings (
-  post_id INT4  DEFAULT '0' NOT NULL,
-  user_id INT2  UNSIGNED DEFAULT '0' NOT NULL,
-  rating INT2 DEFAULT '0' NOT NULL,
-);
-
-CREATE INDEX post_id_phpbb_ratings_index ON phpbb_ratings (post_id);
-CREATE INDEX user_id_phpbb_ratings_index ON phpbb_ratings (user_id);
-
 /* Table: phpbb_reports_reasons */
 CREATE SEQUENCE phpbb_reports_reasons_reason;
 
@@ -794,7 +784,7 @@ CREATE INDEX session_id_phpbb_search_results_index ON phpbb_search_results (sess
 CREATE SEQUENCE phpbb_search_wordlist_word_i;
 
 CREATE TABLE phpbb_search_wordlist (
-  word_text varchar(50) BINARY DEFAULT '' NOT NULL,
+  word_text varchar(50) DEFAULT '' NOT NULL,
   word_id INT4 DEFAULT nextval('phpbb_search_wordlist_word_i'),
   word_common INT2  DEFAULT '0' NOT NULL,
   PRIMARY KEY (word_text),
@@ -809,7 +799,7 @@ SELECT SETVAL('phpbb_search_wordlist_word_i',(select case when max(word_id)>0 th
 CREATE TABLE phpbb_search_wordmatch (
   post_id INT4  DEFAULT '0' NOT NULL,
   word_id INT4  DEFAULT '0' NOT NULL,
-  title_match INT2 DEFAULT '0' NOT NULL,
+  title_match INT2 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX word_id_phpbb_search_wordmatch_index ON phpbb_search_wordmatch (word_id);
@@ -851,9 +841,9 @@ CREATE SEQUENCE phpbb_smilies_smiley_id_seq;
 
 CREATE TABLE phpbb_smilies (
    smiley_id INT2 DEFAULT nextval('phpbb_smilies_smiley_id_seq'),
-   code char(10),
-   smiley char(50),
-   smiley_url char(50),
+   code varchar(10),
+   emotion varchar(50),
+   smiley_url varchar(50),
    smiley_width INT2  NOT NULL,
    smiley_height INT2  NOT NULL,
    smiley_order INT2  NOT NULL,
@@ -879,13 +869,10 @@ CREATE TABLE phpbb_styles (
    theme_id INT2  NOT NULL,
    imageset_id INT2  NOT NULL,
    PRIMARY KEY (style_id),
+
   CHECK (template_id>=0),
   CHECK (theme_id>=0),
   CHECK (imageset_id>=0)
-
-   KEY (template_id),
-   KEY (theme_id),
-   KEY (imageset_id)
 );
 
 CREATE UNIQUE INDEX style_name_phpbb_styles_index ON phpbb_styles (style_name);
@@ -916,9 +903,7 @@ CREATE TABLE phpbb_styles_template_data (
    template_filename varchar(50) DEFAULT '' NOT NULL,
    template_included TEXT DEFAULT '' NOT NULL,
    template_mtime INT4 DEFAULT '0' NOT NULL,
-   template_data text,
-   KEY (template_id),
-   KEY (template_filename)
+   template_data text
 );
 
 /* Table: phpbb_styles_theme */
@@ -1109,7 +1094,7 @@ CREATE TABLE phpbb_topics_marking (
 CREATE TABLE phpbb_topics_watch (
   topic_id INT4  DEFAULT '0' NOT NULL,
   user_id INT4  DEFAULT '0' NOT NULL,
-  notify_status INT2 DEFAULT '0' NOT NULL,
+  notify_status INT2 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX topic_id_phpbb_topics_watch_index ON phpbb_topics_watch (topic_id);
@@ -1121,7 +1106,7 @@ CREATE TABLE phpbb_user_group (
    group_id INT4 DEFAULT '0' NOT NULL,
    user_id INT4  DEFAULT '0' NOT NULL,
    group_leader INT2 DEFAULT '0' NOT NULL,
-   user_pending INT2,
+   user_pending INT2
 );
 
 CREATE INDEX group_id_phpbb_user_group_index ON phpbb_user_group (group_id);
@@ -1218,8 +1203,8 @@ CREATE SEQUENCE phpbb_words_word_id_seq;
 
 CREATE TABLE phpbb_words (
    word_id INT4 DEFAULT nextval('phpbb_words_word_id_seq'),
-   word char(100) NOT NULL,
-   replacement char(100) NOT NULL,
+   word varchar(100) NOT NULL,
+   replacement varchar(100) NOT NULL,
    PRIMARY KEY (word_id)
 );
 
@@ -1230,7 +1215,7 @@ CREATE TABLE phpbb_zebra (
   user_id INT4  DEFAULT '0' NOT NULL,
   zebra_id INT4  DEFAULT '0' NOT NULL,
   friend INT2 DEFAULT '0' NOT NULL,
-  foe INT2 DEFAULT '0' NOT NULL,
+  foe INT2 DEFAULT '0' NOT NULL
 );
 
 CREATE INDEX user_id_phpbb_zebra_index ON phpbb_zebra (user_id);
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index c87d165e33..18c0576547 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -4,190 +4,192 @@
 # $Id$
 #
 
+# POSTGRES BEGIN #
+
 # -- Config
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_attachments','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_html','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html_tags','b,i,u,pre');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_smilies','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_img','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_topic_notify','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_emailreuse','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bookmarks','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars','.*');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable_msg','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_dst','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_hide_emails','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb22');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars','3');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars','30');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars','6');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars','30');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_reg_attempts','5');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts','3');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_ratings','10');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length','3600');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','10');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','25');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars/upload');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smilies');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','images/icons');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path','images/upload_icons');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path','images/ranks');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passremind', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_attachments', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bookmarks', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_emailreuse', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html_tags', 'b,i,u,pre');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_mass_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars', '.*');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_html', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_img', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_smilies', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_topic_notify', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota', '52428800');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_download_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_html_pm', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method', 'db');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_report_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_smilies_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize', '6144');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path', 'images/avatars/gallery');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height', '90');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width', '90');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_height', '20');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_width', '20');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path', 'images/avatars/upload');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', 'contact@yourdomain.tld');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable_msg', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_dst', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', 'address@yourdomain.tld');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig', 'Thanks, The Management');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_hide_emails', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passremind', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb22');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size', '50');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval', '15');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('forward_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('full_folder_action', '2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '25');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_port', '5222');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_resource', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('lastread', '432000');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_uid', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', '5');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_guests', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_birthdays', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search_upd', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search_phr', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_guests', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', '5');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search_phr', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search_upd', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '4');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '2.1.2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize', '262144');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize_pm', '262144');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars', '30');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars', '30');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_smilies', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_smilies', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_urls', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_quote_depth', '3');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_chars','3');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_search_chars','10');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','address@yourdomain.tld');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact','contact@yourdomain.tld');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name','mail');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size','50');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port','25');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_auth_method', 'PLAIN');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_port','5222');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_resource','');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval','10');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type','d');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_width','20');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_height','20');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','90');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','90');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method','db');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_uid', '');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('lastread', '432000');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize', '262144');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize_pm','262144');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota', '52428800');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail','0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize','12000');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_reg_attempts', '5');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_search_chars', '10');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars', '255');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_smilies', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars', '6');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_chars', '3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('full_folder_action', '2');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_html_pm', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_smilies_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_download_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_report_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page', '10');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('forward_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_mass_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path', 'images/ranks');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length', '3600');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', 'A _little_ text to describe your forum');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', 'yourdomain.com');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_auth_method', 'PLAIN');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', '25');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '2.1.2');
 
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_users', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_date', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('database_last_gc', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('last_queue_run', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_user_id', '2', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_username', '', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_users', '1', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_files', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_posts', '1', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_topics', '1', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_files', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload_dir_size', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('session_last_gc', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_users', '1', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_date', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_users', '0', 1);
 INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('search_last_gc', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1);
-INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('last_queue_run', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('session_last_gc', '0', 1);
+INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload_dir_size', '0', 1);
 
 # -- auth options
 INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_', 1);
@@ -351,9 +353,9 @@ INSERT INTO phpbb_lang (lang_id, lang_iso, lang_dir, lang_english_name, lang_loc
 # MSSQL IDENTITY phpbb_forums ON #
 
 # -- Forums
-INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_bbcode_uid) VALUES (1, 'My first Category', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '');
+INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_bbcode_uid, prune_days, prune_viewed) VALUES (1, 'My first Category', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '', 0, 0);
 
-INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_bbcode_uid) VALUES (2, 'Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '');
+INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_bbcode_uid, prune_days, prune_viewed) VALUES (2, 'Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '', 0, 0);
 
 # MSSQL IDENTITY phpbb_forums OFF #
 
@@ -496,29 +498,29 @@ INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post
 
 
 # -- Smilies
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':(', 'icon_sad.gif', 'Sad', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':o', 'icon_surprised.gif', 'Surprised', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':eek:', 'icon_surprised.gif', 'Surprised', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES ('8O', 'icon_eek.gif', 'Shocked', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':?', 'icon_confused.gif', 'Confused', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES ('8)', 'icon_cool.gif', 'Cool', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':lol:', 'icon_lol.gif', 'Laughing', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':x', 'icon_mad.gif', 'Mad', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':roll:', 'icon_rolleyes.gif', 'Rolling Eyes', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (';)', 'icon_wink.gif', 'Wink', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':!:', 'icon_exclaim.gif', 'Exclamation', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':?:', 'icon_question.gif', 'Question', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':idea:', 'icon_idea.gif', 'Idea', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':arrow:', 'icon_arrow.gif', 'Arrow', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':|', 'icon_neutral.gif', 'Neutral', 15, 15);
-INSERT INTO phpbb_smilies (code, smiley_url, smiley, smiley_width, smiley_height) VALUES (':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green', 15, 15);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15, 1);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15, 2);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_sad.gif', 'Sad', 15, 15, 3);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_surprised.gif', 'Surprised', 15, 15, 4);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_surprised.gif', 'Surprised', 15, 15, 4);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8O', 'icon_eek.gif', 'Shocked', 15, 15, 5);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_confused.gif', 'Confused', 15, 15, 6);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8)', 'icon_cool.gif', 'Cool', 15, 15, 7);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.gif', 'Laughing', 15, 15, 8);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.gif', 'Mad', 15, 15, 9);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', 'Razz', 15, 15, 10);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', 'Embarassed', 15, 15, 11);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', 'Crying or Very sad', 15, 15, 12);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', 'Evil or Very Mad', 15, 15, 13);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', 'Twisted Evil', 15, 15, 14);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.gif', 'Rolling Eyes', 15, 15, 15);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';)', 'icon_wink.gif', 'Wink', 15, 15, 16);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.gif', 'Exclamation', 15, 15, 17);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.gif', 'Question', 15, 15, 18);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.gif', 'Idea', 15, 15, 19);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.gif', 'Arrow', 15, 15, 20);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.gif', 'Neutral', 15, 15, 21);
+INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green', 15, 15, 22);
 
 
 # -- icons ... these are just some of those in CVS
@@ -625,3 +627,5 @@ INSERT INTO phpbb_extensions (extension_id, group_id, extension) VALUES (27, 6,
 INSERT INTO phpbb_extensions (extension_id, group_id, extension) VALUES (28, 6, 'wmv');
 
 # MSSQL IDENTITY phpbb_extensions OFF #
+
+# POSTGRES COMMIT #
+\ No newline at end of file
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index bba8ae12b9..c0385261c2 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -376,16 +376,6 @@ CREATE TABLE phpbb_ranks (
    PRIMARY KEY (rank_id) 
 );
 
--- Table: 'phpbb_ratings'
-CREATE TABLE phpbb_ratings (
-  post_id INTEGER DEFAULT 0 NOT NULL,
-  user_id INTEGER DEFAULT 0 NOT NULL,
-  rating INTEGER DEFAULT 0 NOT NULL
-);
-
-CREATE INDEX post_id ON phpbb_ratings (post_id);
-CREATE INDEX user_id4 ON phpbb_ratings (user_id);
-
 -- Table: 'phpbb_reports_reasons'
 CREATE TABLE phpbb_reports_reasons (
   reason_id INTEGER NOT NULL,