6 files changed, 135 insertions, 133 deletions
diff --git a/phpBB/db/mssql_basic.sql b/phpBB/db/mssql_basic.sql
index 1a16a50704..41f95fe10c 100644
--- a/phpBB/db/mssql_basic.sql
+++ b/phpBB/db/mssql_basic.sql
@@ -11,7 +11,48 @@ BEGIN TRANSACTION;
 /*
   -- Config
 */
-INSERT INTO phpbb_config (config_id, board_disable, board_startdate, sitename, cookie_name, cookie_path, cookie_domain, cookie_secure, session_length, allow_html, allow_html_tags, allow_bbcode, allow_smilies, allow_sig, allow_namechange, allow_theme_create, allow_avatar_local, allow_avatar_remote, allow_avatar_upload, override_themes, posts_per_page, topics_per_page, hot_threshold, email_sig, email_from, smtp_delivery, smtp_host, require_activation, flood_interval, max_poll_options, avatar_filesize, avatar_max_width, avatar_max_height, avatar_path, smilies_path, default_theme, default_lang, default_dateformat, system_timezone, sys_template, prune_enable, gzip_compress) VALUES (1, '', '', 'yourdomain.com', 'phpbb2mssql', '/', '', '', 600, '', 'b, u, i, pre, font color', 1, 1, 1, '', '', '', '', '', '', 10, 25, 10, '', '', '', '', '', 10, 10, 6144, 70, 70, 'images/avatars', 'images/smiles', 2, 'english', 'd M Y H:i', '', 'PSO', 1, '');
+INSERT INTO phpbb_config VALUES ('config_id','1');
+INSERT INTO phpbb_config VALUES ('board_disable','0');
+INSERT INTO phpbb_config VALUES ('board_startdate','994190324');
+INSERT INTO phpbb_config VALUES ('sitename','yourdomain.com');
+INSERT INTO phpbb_config VALUES ('cookie_name','phpbb2mysql');
+INSERT INTO phpbb_config VALUES ('cookie_path','/');
+INSERT INTO phpbb_config VALUES ('cookie_domain','');
+INSERT INTO phpbb_config VALUES ('cookie_secure','0');
+INSERT INTO phpbb_config VALUES ('session_length','900');
+INSERT INTO phpbb_config VALUES ('allow_html','0');
+INSERT INTO phpbb_config VALUES ('allow_html_tags','b,i,u,pre');
+INSERT INTO phpbb_config VALUES ('allow_bbcode','1');
+INSERT INTO phpbb_config VALUES ('allow_smilies','1');
+INSERT INTO phpbb_config VALUES ('allow_sig','1');
+INSERT INTO phpbb_config VALUES ('allow_namechange','0');
+INSERT INTO phpbb_config VALUES ('allow_theme_create','0');
+INSERT INTO phpbb_config VALUES ('allow_avatar_local','0');
+INSERT INTO phpbb_config VALUES ('allow_avatar_remote','1');
+INSERT INTO phpbb_config VALUES ('allow_avatar_upload','1');
+INSERT INTO phpbb_config VALUES ('override_themes','0');
+INSERT INTO phpbb_config VALUES ('posts_per_page','15');
+INSERT INTO phpbb_config VALUES ('topics_per_page','50');
+INSERT INTO phpbb_config VALUES ('hot_threshold','25');
+INSERT INTO phpbb_config VALUES ('max_poll_options','10');
+INSERT INTO phpbb_config VALUES ('email_sig','Thanks, The Management');
+INSERT INTO phpbb_config VALUES ('email_from','youraddress@yourdomain.com');
+INSERT INTO phpbb_config VALUES ('smtp_delivery','0');
+INSERT INTO phpbb_config VALUES ('smtp_host','');
+INSERT INTO phpbb_config VALUES ('require_activation','0');
+INSERT INTO phpbb_config VALUES ('flood_interval','15');
+INSERT INTO phpbb_config VALUES ('avatar_filesize','6144');
+INSERT INTO phpbb_config VALUES ('avatar_max_width','80');
+INSERT INTO phpbb_config VALUES ('avatar_max_height','80');
+INSERT INTO phpbb_config VALUES ('avatar_path','images/avatars');
+INSERT INTO phpbb_config VALUES ('smilies_path','images/smiles');
+INSERT INTO phpbb_config VALUES ('default_theme','2');
+INSERT INTO phpbb_config VALUES ('default_lang','english');
+INSERT INTO phpbb_config VALUES ('default_dateformat','D M d, Y g:i a');
+INSERT INTO phpbb_config VALUES ('board_timezone','-8');
+INSERT INTO phpbb_config VALUES ('board_template','PSO');
+INSERT INTO phpbb_config VALUES ('prune_enable','1');
+INSERT INTO phpbb_config VALUES ('gzip_compress','1');
 
 /*
   -- Categories
diff --git a/phpBB/db/mssql_schema.sql b/phpBB/db/mssql_schema.sql
index 1b2afc47b4..48a9bbee58 100644
--- a/phpBB/db/mssql_schema.sql
+++ b/phpBB/db/mssql_schema.sql
@@ -168,48 +168,8 @@ CREATE TABLE [phpbb_categories] (
 GO
 
 CREATE TABLE [phpbb_config] (
-	[config_id] [int] NULL ,
-	[board_disable] [smallint] NOT NULL ,
-	[board_startdate] [int] NULL ,
-	[sitename] [varchar] (100) NOT NULL ,
-	[cookie_name] [varchar] (25) NULL ,
-	[cookie_path] [varchar] (50) NULL ,
-	[cookie_domain] [varchar] (100) NULL ,
-	[cookie_secure] [smallint] NULL ,
-	[session_length] [int] NULL ,
-	[allow_html] [smallint] NULL ,
-	[allow_html_tags] [varchar] (255) NULL ,
-	[allow_bbcode] [smallint] NULL ,
-	[allow_smilies] [smallint] NULL ,
-	[allow_sig] [smallint] NULL ,
-	[allow_namechange] [smallint] NULL ,
-	[allow_theme_create] [smallint] NULL ,
-	[allow_avatar_local] [smallint] NULL ,
-	[allow_avatar_remote] [smallint] NULL ,
-	[allow_avatar_upload] [smallint] NULL ,
-	[override_themes] [smallint] NULL ,
-	[posts_per_page] [int] NULL ,
-	[topics_per_page] [int] NULL ,
-	[hot_threshold] [int] NULL ,
-	[email_sig] [varchar] (255) NULL ,
-	[email_from] [varchar] (255) NULL ,
-	[smtp_delivery] [smallint] NULL ,
-	[smtp_host] [varchar] (100) NULL ,
-	[require_activation] [smallint] NULL ,
-	[flood_interval] [int] NULL ,
-	[max_poll_options] [int] NULL ,
-	[avatar_filesize] [int] NULL ,
-	[avatar_max_width] [smallint] NULL ,
-	[avatar_max_height] [smallint] NULL ,
-	[avatar_path] [varchar] (50) NULL ,
-	[smilies_path] [varchar] (50) NULL ,
-	[default_theme] [int] NULL ,
-	[default_lang] [varchar] (50) NULL ,
-	[default_dateformat] [varchar] (15) NULL ,
-	[system_timezone] [int] NULL ,
-	[sys_template] [varchar] (50) NULL ,
-	[prune_enable] [smallint] NULL ,
-	[gzip_compress] [smallint] NULL 
+	[config_name] [varchar] (255) NULL ,
+	[config_value] [varchar] (255) NULL
 ) ON [PRIMARY]
 GO
 
diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql
index 055fedc285..2115727d51 100644
--- a/phpBB/db/mysql_basic.sql
+++ b/phpBB/db/mysql_basic.sql
@@ -4,7 +4,48 @@
 # $Id$
 
 # -- Config
-INSERT INTO phpbb_config (config_id, board_disable, sitename, cookie_name, cookie_path, cookie_domain, cookie_secure, session_length, allow_html, allow_html_tags, allow_bbcode, allow_smilies, allow_sig, allow_namechange, allow_theme_create, allow_avatar_local, allow_avatar_remote, allow_avatar_upload, override_themes, posts_per_page, topics_per_page, hot_threshold, max_poll_options, email_sig, email_from, require_activation, flood_interval, avatar_filesize, avatar_max_width, avatar_max_height, avatar_path, smilies_path, default_theme, default_lang, default_dateformat, system_timezone, sys_template, prune_enable, gzip_compress, board_startdate, smtp_delivery, smtp_host) VALUES (1,0,'yourdomain.com','phpbb2mysql','/','','',900,'','b,i,u,pre',1,1,1,'','','',1,1,'',15,50,25,10,'Thanks, The Management','youraddress@yourdomain.com','',15,6144,80,80,'images/avatars','images/smiles',2,'english','D M d, Y g:i a',-8,'PSO',1,1,994190324,'','');
+INSERT INTO phpbb_config VALUES ('config_id','1');
+INSERT INTO phpbb_config VALUES ('board_disable','0');
+INSERT INTO phpbb_config VALUES ('board_startdate','994190324');
+INSERT INTO phpbb_config VALUES ('sitename','yourdomain.com');
+INSERT INTO phpbb_config VALUES ('cookie_name','phpbb2mysql');
+INSERT INTO phpbb_config VALUES ('cookie_path','/');
+INSERT INTO phpbb_config VALUES ('cookie_domain','');
+INSERT INTO phpbb_config VALUES ('cookie_secure','0');
+INSERT INTO phpbb_config VALUES ('session_length','900');
+INSERT INTO phpbb_config VALUES ('allow_html','0');
+INSERT INTO phpbb_config VALUES ('allow_html_tags','b,i,u,pre');
+INSERT INTO phpbb_config VALUES ('allow_bbcode','1');
+INSERT INTO phpbb_config VALUES ('allow_smilies','1');
+INSERT INTO phpbb_config VALUES ('allow_sig','1');
+INSERT INTO phpbb_config VALUES ('allow_namechange','0');
+INSERT INTO phpbb_config VALUES ('allow_theme_create','0');
+INSERT INTO phpbb_config VALUES ('allow_avatar_local','0');
+INSERT INTO phpbb_config VALUES ('allow_avatar_remote','1');
+INSERT INTO phpbb_config VALUES ('allow_avatar_upload','1');
+INSERT INTO phpbb_config VALUES ('override_themes','0');
+INSERT INTO phpbb_config VALUES ('posts_per_page','15');
+INSERT INTO phpbb_config VALUES ('topics_per_page','50');
+INSERT INTO phpbb_config VALUES ('hot_threshold','25');
+INSERT INTO phpbb_config VALUES ('max_poll_options','10');
+INSERT INTO phpbb_config VALUES ('email_sig','Thanks, The Management');
+INSERT INTO phpbb_config VALUES ('email_from','youraddress@yourdomain.com');
+INSERT INTO phpbb_config VALUES ('smtp_delivery','0');
+INSERT INTO phpbb_config VALUES ('smtp_host','');
+INSERT INTO phpbb_config VALUES ('require_activation','0');
+INSERT INTO phpbb_config VALUES ('flood_interval','15');
+INSERT INTO phpbb_config VALUES ('avatar_filesize','6144');
+INSERT INTO phpbb_config VALUES ('avatar_max_width','80');
+INSERT INTO phpbb_config VALUES ('avatar_max_height','80');
+INSERT INTO phpbb_config VALUES ('avatar_path','images/avatars');
+INSERT INTO phpbb_config VALUES ('smilies_path','images/smiles');
+INSERT INTO phpbb_config VALUES ('default_theme','2');
+INSERT INTO phpbb_config VALUES ('default_lang','english');
+INSERT INTO phpbb_config VALUES ('default_dateformat','D M d, Y g:i a');
+INSERT INTO phpbb_config VALUES ('board_timezone','-8');
+INSERT INTO phpbb_config VALUES ('board_template','PSO');
+INSERT INTO phpbb_config VALUES ('prune_enable','1');
+INSERT INTO phpbb_config VALUES ('gzip_compress','1');
 
 # -- Categories
 INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 1);
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index 2f91f023f3..8baf9d38d8 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -91,52 +91,11 @@ CREATE TABLE phpbb_categories (
 #
 DROP TABLE IF EXISTS phpbb_config;
 CREATE TABLE phpbb_config (
-   config_id int(11) NOT NULL auto_increment,
-   board_disable tinyint(1) DEFAULT '0' NOT NULL, 
-   board_startdate int(11), 
-   sitename varchar(100),
-   cookie_name char(20),
-   cookie_path char(25),
-   cookie_domain char(50), 
-   cookie_secure tinyint(1), 
-   session_length int(11), 
-   allow_html tinyint(1),
-   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL, 
-   allow_bbcode tinyint(1),
-   allow_smilies tinyint(1),
-   allow_sig tinyint(1),
-   allow_namechange tinyint(1),
-   allow_theme_create tinyint(1),
-   allow_avatar_local tinyint(1) DEFAULT '0' NOT NULL, 
-   allow_avatar_remote tinyint(1) DEFAULT '0' NOT NULL, 
-   allow_avatar_upload tinyint(1) DEFAULT '0' NOT NULL,
-   override_themes tinyint(3),
-   posts_per_page int(11),
-   topics_per_page int(11),
-   hot_threshold int(11),
-   max_poll_options int(11), 
-   email_sig varchar(255),
-   email_from varchar(100), 
-   smtp_delivery tinyint(1) DEFAULT '0' NOT NULL, 
-   smtp_host varchar(50), 
-   require_activation tinyint(1) DEFAULT '0' NOT NULL, 
-   flood_interval int(4) NOT NULL,
-   avatar_filesize int(11) DEFAULT '6144' NOT NULL,
-   avatar_max_width smallint(6) DEFAULT '70' NOT NULL, 
-   avatar_max_height smallint(6) DEFAULT '70' NOT NULL, 
-   avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
-   smilies_path char(100) DEFAULT 'images/smiles' NOT NULL, 
-   default_theme int(11) DEFAULT '1' NOT NULL,
-   default_lang varchar(255),
-   default_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
-   system_timezone int(11) DEFAULT '0' NOT NULL,
-   sys_template varchar(100) DEFAULT 'Default' NOT NULL,
-   prune_enable tinyint(1) DEFAULT '1' NOT NULL, 
-   gzip_compress tinyint(1) DEFAULT '0' NOT NULL, 
-   PRIMARY KEY (config_id)
+   config_name varchar(255) NOT NULL,
+   config_value varchar(255) NOT NULL,
+   PRIMARY KEY (config_name)
 );
 
-
 # --------------------------------------------------------
 #
 # Table structure for table 'phpbb_disallow'
@@ -570,4 +529,4 @@ CREATE TABLE phpbb_words (
    word varchar(100) NOT NULL,
    replacement varchar(100) NOT NULL,
    PRIMARY KEY (word_id)
-);
-\ No newline at end of file
+);
diff --git a/phpBB/db/postgres_basic.sql b/phpBB/db/postgres_basic.sql
index 6a403e52fa..849d984259 100755
--- a/phpBB/db/postgres_basic.sql
+++ b/phpBB/db/postgres_basic.sql
@@ -5,7 +5,48 @@
 */
 
 -- Config
-INSERT INTO phpbb_config (config_id, board_disable, sitename, cookie_name, cookie_path, cookie_domain, cookie_secure, session_length, allow_html, allow_bbcode, allow_smilies, allow_sig, allow_namechange, posts_per_page, hot_threshold, topics_per_page, flood_interval, allow_theme_create, override_themes, email_sig, email_from, default_theme, default_lang, default_dateformat, system_timezone, sys_template, avatar_filesize, avatar_path, allow_avatar_upload, avatar_max_width, avatar_max_height, allow_avatar_local, allow_avatar_remote, max_poll_options) VALUES ( '1', '0', 'phpbb.com', 'phpbb2mysql', '/', '', '0', 600, '0', '1', '1', '1', '0', '10', '10', '25', '10', '0', '0', '', '', '2', 'english', 'd M Y H:i', '0', 'PSO', '6144', 'images/avatars', '0', '70', '70', '0', '0', '10');
+INSERT INTO phpbb_config VALUES ('config_id','1');
+INSERT INTO phpbb_config VALUES ('board_disable','0');
+INSERT INTO phpbb_config VALUES ('board_startdate','994190324');
+INSERT INTO phpbb_config VALUES ('sitename','yourdomain.com');
+INSERT INTO phpbb_config VALUES ('cookie_name','phpbb2mysql');
+INSERT INTO phpbb_config VALUES ('cookie_path','/');
+INSERT INTO phpbb_config VALUES ('cookie_domain','');
+INSERT INTO phpbb_config VALUES ('cookie_secure','0');
+INSERT INTO phpbb_config VALUES ('session_length','900');
+INSERT INTO phpbb_config VALUES ('allow_html','0');
+INSERT INTO phpbb_config VALUES ('allow_html_tags','b,i,u,pre');
+INSERT INTO phpbb_config VALUES ('allow_bbcode','1');
+INSERT INTO phpbb_config VALUES ('allow_smilies','1');
+INSERT INTO phpbb_config VALUES ('allow_sig','1');
+INSERT INTO phpbb_config VALUES ('allow_namechange','0');
+INSERT INTO phpbb_config VALUES ('allow_theme_create','0');
+INSERT INTO phpbb_config VALUES ('allow_avatar_local','0');
+INSERT INTO phpbb_config VALUES ('allow_avatar_remote','1');
+INSERT INTO phpbb_config VALUES ('allow_avatar_upload','1');
+INSERT INTO phpbb_config VALUES ('override_themes','0');
+INSERT INTO phpbb_config VALUES ('posts_per_page','15');
+INSERT INTO phpbb_config VALUES ('topics_per_page','50');
+INSERT INTO phpbb_config VALUES ('hot_threshold','25');
+INSERT INTO phpbb_config VALUES ('max_poll_options','10');
+INSERT INTO phpbb_config VALUES ('email_sig','Thanks, The Management');
+INSERT INTO phpbb_config VALUES ('email_from','youraddress@yourdomain.com');
+INSERT INTO phpbb_config VALUES ('smtp_delivery','0');
+INSERT INTO phpbb_config VALUES ('smtp_host','');
+INSERT INTO phpbb_config VALUES ('require_activation','0');
+INSERT INTO phpbb_config VALUES ('flood_interval','15');
+INSERT INTO phpbb_config VALUES ('avatar_filesize','6144');
+INSERT INTO phpbb_config VALUES ('avatar_max_width','80');
+INSERT INTO phpbb_config VALUES ('avatar_max_height','80');
+INSERT INTO phpbb_config VALUES ('avatar_path','images/avatars');
+INSERT INTO phpbb_config VALUES ('smilies_path','images/smiles');
+INSERT INTO phpbb_config VALUES ('default_theme','2');
+INSERT INTO phpbb_config VALUES ('default_lang','english');
+INSERT INTO phpbb_config VALUES ('default_dateformat','D M d, Y g:i a');
+INSERT INTO phpbb_config VALUES ('board_timezone','-8');
+INSERT INTO phpbb_config VALUES ('board_template','PSO');
+INSERT INTO phpbb_config VALUES ('prune_enable','1');
+INSERT INTO phpbb_config VALUES ('gzip_compress','1');
 
 -- Categories
 INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 1);
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index 162eab39a1..c4e37ea370 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -87,49 +87,9 @@ CREATE TABLE phpbb_categories (
   Table structure for table phpbb_config
 -------------------------------------------------------- */
 CREATE TABLE phpbb_config (
-   config_id int2 NOT NULL,
-   board_disable int2 DEFAULT '0' NOT NULL,
-   board_startdate int4,
-   sitename varchar(100) NOT NULL,
-   cookie_name varchar(20),
-   cookie_path varchar(25),
-   cookie_domain varchar(50),
-   cookie_secure int2,
-   session_length int4,
-   allow_html int2 NOT NULL,
-   allow_html_tags char(255) DEFAULT 'b,u,i,pre,font color' NOT NULL,
-   allow_bbcode int2 NOT NULL,
-   allow_smilies int2 NOT NULL,
-   allow_sig int2 NOT NULL,
-   allow_namechange int2 NOT NULL,
-   allow_theme_create int2 NOT NULL,
-   allow_avatar_local int2 DEFAULT '0' NOT NULL,
-   allow_avatar_remote int2 DEFAULT '0' NOT NULL,
-   allow_avatar_upload int2 DEFAULT '0' NOT NULL,
-   posts_per_page int2 NOT NULL,
-   topics_per_page int2 NOT NULL,
-   hot_threshold int2 NOT NULL,
-   max_poll_options int,
-   email_sig varchar(255) NOT NULL,
-   email_from varchar(100) NOT NULL,
-   smtp_delivery int2 DEFAULT '0' NOT NULL,
-   smtp_host varchar(50),
-   require_activation int2 DEFAULT '0' NOT NULL,
-   default_theme int4 NOT NULL,
-   default_dateformat varchar(20) NOT NULL,
-   default_lang varchar(50) NOT NULL,
-   system_timezone int4 NOT NULL,
-   sys_template varchar(50) NOT NULL,
-   avatar_filesize int4 DEFAULT '6144' NOT NULL,
-   avatar_max_width int2 DEFAULT '70' NOT NULL,
-   avatar_max_height int2 DEFAULT '70' NOT NULL,
-   avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
-   smilies_path varchar(50) DEFAULT 'images/smiles' NOT NULL,
-   override_themes int2 NOT NULL,
-   flood_interval int NOT NULL,
-   prune_enable int2 DEFAULT '0' NOT NULL,
-   gzip_compress int2 DEFAULT '0' NOT NULL,
-   CONSTRAINT phpbb_config_pkey PRIMARY KEY (config_id)
+   config_name varchar(255) NOT NULL,
+   config_value varchar(255) NOT NULL,
+   CONSTRAINT phpbb_config_pkey PRIMARY KEY (config_name)
 );