diff options
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 8 | ||||
-rw-r--r-- | phpBB/install/schemas/mssql_schema.sql | 11 | ||||
-rw-r--r-- | phpBB/install/schemas/mysql_schema.sql | 6 | ||||
-rw-r--r-- | phpBB/install/schemas/oracle_schema.sql | 6 | ||||
-rw-r--r-- | phpBB/install/schemas/postgres_schema.sql | 5 | ||||
-rw-r--r-- | phpBB/install/schemas/schema_data.sql | 14 | ||||
-rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 5 |
7 files changed, 29 insertions, 26 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 89abbf98bd..560b402222 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -81,6 +81,7 @@ CREATE TABLE phpbb_banlist ( CREATE TABLE phpbb_bbcodes ( bbcode_id INTEGER DEFAULT 0 NOT NULL, bbcode_tag VARCHAR(16) NOT NULL, + display_on_posting INTEGER DEFAULT 0 NOT NULL, bbcode_match VARCHAR(255) NOT NULL, bbcode_tpl BLOB SUB_TYPE TEXT NOT NULL, first_pass_match VARCHAR(255) NOT NULL, @@ -331,7 +332,6 @@ CREATE TABLE phpbb_posts ( post_approved INTEGER DEFAULT 1 NOT NULL, post_reported INTEGER DEFAULT 0 NOT NULL, enable_bbcode INTEGER DEFAULT 1 NOT NULL, - enable_html INTEGER DEFAULT 0 NOT NULL, enable_smilies INTEGER DEFAULT 1 NOT NULL, enable_magic_url INTEGER DEFAULT 1 NOT NULL, enable_sig INTEGER DEFAULT 1 NOT NULL, @@ -360,7 +360,6 @@ CREATE TABLE phpbb_privmsgs ( message_time INTEGER DEFAULT 0 NOT NULL, message_reported INTEGER DEFAULT 0 NOT NULL, enable_bbcode INTEGER DEFAULT 1 NOT NULL, - enable_html INTEGER DEFAULT 0 NOT NULL, enable_smilies INTEGER DEFAULT 1 NOT NULL, enable_magic_url INTEGER DEFAULT 1 NOT NULL, enable_sig INTEGER DEFAULT 1 NOT NULL, @@ -956,6 +955,11 @@ ADD PRIMARY KEY ( confirm_id );; +CREATE INDEX display_on_posting +ON phpbb_bbcodes( + display_on_posting +);; + ALTER TABLE phpbb_disallow ADD PRIMARY KEY ( disallow_id diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index d67c2e3e8f..945bf97f6c 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -86,6 +86,7 @@ GO CREATE TABLE [phpbb_bbcodes] ( [bbcode_id] [int] NOT NULL , [bbcode_tag] [varchar] (16) NOT NULL , + [display_on_posting] [int] NOT NULL , [bbcode_match] [varchar] (255) NOT NULL , [bbcode_tpl] [text] NOT NULL , [first_pass_match] [varchar] (255) NOT NULL , @@ -336,7 +337,6 @@ CREATE TABLE [phpbb_posts] ( [post_approved] [int] NOT NULL , [post_reported] [int] NOT NULL , [enable_bbcode] [int] NOT NULL , - [enable_html] [int] NOT NULL , [enable_smilies] [int] NOT NULL , [enable_magic_url] [int] NOT NULL , [enable_sig] [int] NOT NULL , @@ -365,7 +365,6 @@ CREATE TABLE [phpbb_privmsgs] ( [message_time] [int] NOT NULL , [message_reported] [int] NOT NULL , [enable_bbcode] [int] NOT NULL , - [enable_html] [int] NOT NULL , [enable_smilies] [int] NOT NULL , [enable_magic_url] [int] NOT NULL , [enable_sig] [int] NOT NULL , @@ -1228,7 +1227,8 @@ ALTER TABLE [phpbb_banlist] WITH NOCHECK ADD GO ALTER TABLE [phpbb_bbcodes] WITH NOCHECK ADD - CONSTRAINT [DF_bbcode_bbcode_id] DEFAULT (0) FOR [bbcode_id] + CONSTRAINT [DF_bbcode_bbcode_id] DEFAULT (0) FOR [bbcode_id], + CONSTRAINT [DF_bbcode_display_on_posting] DEFAULT (0) FOR [display_on_posting] GO ALTER TABLE [phpbb_bookmarks] WITH NOCHECK ADD @@ -1377,7 +1377,6 @@ ALTER TABLE [phpbb_posts] WITH NOCHECK ADD CONSTRAINT [DF_posts__post_approved] DEFAULT (1) FOR [post_approved], CONSTRAINT [DF_posts__post_reported] DEFAULT (0) FOR [post_reported], CONSTRAINT [DF_posts__enable_bbcode] DEFAULT (1) FOR [enable_bbcode], - CONSTRAINT [DF_posts__enable_html] DEFAULT (0) FOR [enable_html], CONSTRAINT [DF_posts__enable_smilies] DEFAULT (1) FOR [enable_smilies], CONSTRAINT [DF_posts__enable_magic_url] DEFAULT (1) FOR [enable_magic_url], CONSTRAINT [DF_posts__enable_sig] DEFAULT (1) FOR [enable_sig], @@ -1397,7 +1396,6 @@ ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD CONSTRAINT [DF_privms_message_time] DEFAULT (0) FOR [message_time], CONSTRAINT [DF_privms_message_reported] DEFAULT (0) FOR [message_reported], CONSTRAINT [DF_privms_enable_bbcode] DEFAULT (1) FOR [enable_bbcode], - CONSTRAINT [DF_privms_enable_html] DEFAULT (0) FOR [enable_html], CONSTRAINT [DF_privms_enable_smilies] DEFAULT (1) FOR [enable_smilies], CONSTRAINT [DF_privms_enable_magic_url] DEFAULT (1) FOR [enable_magic_url], CONSTRAINT [DF_privms_enable_sig] DEFAULT (1) FOR [enable_sig], @@ -1698,6 +1696,9 @@ GO CREATE INDEX [is_dynamic] ON [phpbb_config]([is_dynamic]) ON [PRIMARY] GO +CREATE INDEX [display_on_posting] ON [phpbb_bbcodes]([display_on_posting]) ON [PRIMARY] +GO + CREATE INDEX [save_time] ON [phpbb_drafts]([save_time]) ON [PRIMARY] GO diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index b13a2092f3..9fb2e4b302 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -98,13 +98,15 @@ CREATE TABLE phpbb_banlist ( CREATE TABLE phpbb_bbcodes ( bbcode_id tinyint(3) UNSIGNED DEFAULT '0' NOT NULL, bbcode_tag varchar(16) DEFAULT '' NOT NULL, + display_on_posting tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, bbcode_match varchar(255) DEFAULT '' NOT NULL, bbcode_tpl text DEFAULT '' NOT NULL, first_pass_match varchar(255) DEFAULT '' NOT NULL, first_pass_replace varchar(255) DEFAULT '' NOT NULL, second_pass_match varchar(255) DEFAULT '' NOT NULL, second_pass_replace text DEFAULT '' NOT NULL, - PRIMARY KEY (bbcode_id) + PRIMARY KEY (bbcode_id), + KEY display_in_posting (display_on_posting) ); # Table: 'phpbb_bookmarks' @@ -390,7 +392,6 @@ CREATE TABLE phpbb_posts ( post_approved tinyint(1) DEFAULT '1' NOT NULL, post_reported tinyint(1) DEFAULT '0' NOT NULL, enable_bbcode tinyint(1) DEFAULT '1' NOT NULL, - enable_html tinyint(1) DEFAULT '0' NOT NULL, enable_smilies tinyint(1) DEFAULT '1' NOT NULL, enable_magic_url tinyint(1) DEFAULT '1' NOT NULL, enable_sig tinyint(1) DEFAULT '1' NOT NULL, @@ -426,7 +427,6 @@ CREATE TABLE phpbb_privmsgs ( message_time int(11) DEFAULT '0' NOT NULL, message_reported tinyint(1) DEFAULT '0' NOT NULL, enable_bbcode tinyint(1) DEFAULT '1' NOT NULL, - enable_html tinyint(1) DEFAULT '0' NOT NULL, enable_smilies tinyint(1) DEFAULT '1' NOT NULL, enable_magic_url tinyint(1) DEFAULT '1' NOT NULL, enable_sig tinyint(1) DEFAULT '1' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index b4bf0afb05..080393632c 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -233,6 +233,7 @@ END; CREATE TABLE phpbb_bbcodes ( bbcode_id number(3) DEFAULT '0' NOT NULL, bbcode_tag varchar2(16) DEFAULT '', + display_on_posting number(1) DEFAULT '0' NOT NULL, bbcode_match varchar2(255) DEFAULT '', bbcode_tpl clob DEFAULT '', first_pass_match varchar2(255) DEFAULT '', @@ -243,6 +244,9 @@ CREATE TABLE phpbb_bbcodes ( ) / +CREATE INDEX display_on_posting on phpbb_bbcodes (display_on_posting) +/ + /* Table: phpbb_bookmarks */ @@ -793,7 +797,6 @@ CREATE TABLE phpbb_posts ( post_approved number(1) DEFAULT '1' NOT NULL, post_reported number(1) DEFAULT '0' NOT NULL, enable_bbcode number(1) DEFAULT '1' NOT NULL, - enable_html number(1) DEFAULT '0' NOT NULL, enable_smilies number(1) DEFAULT '1' NOT NULL, enable_magic_url number(1) DEFAULT '1' NOT NULL, enable_sig number(1) DEFAULT '1' NOT NULL, @@ -854,7 +857,6 @@ CREATE TABLE phpbb_privmsgs ( message_time number(11) DEFAULT '0' NOT NULL, message_reported number(1) DEFAULT '0' NOT NULL, enable_bbcode number(1) DEFAULT '1' NOT NULL, - enable_html number(1) DEFAULT '0' NOT NULL, enable_smilies number(1) DEFAULT '1' NOT NULL, enable_magic_url number(1) DEFAULT '1' NOT NULL, enable_sig number(1) DEFAULT '1' NOT NULL, diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 640bde0d52..3ab8c4a711 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -130,6 +130,7 @@ SELECT SETVAL('phpbb_banlist_ban_id_seq',(select case when max(ban_id)>0 then ma CREATE TABLE phpbb_bbcodes ( bbcode_id INT2 DEFAULT '0' NOT NULL, bbcode_tag varchar(16) DEFAULT '' NOT NULL, + display_on_posting INT2 DEFAULT '0' NOT NULL, bbcode_match varchar(255) DEFAULT '' NOT NULL, bbcode_tpl text DEFAULT '' NOT NULL, first_pass_match varchar(255) DEFAULT '' NOT NULL, @@ -140,6 +141,8 @@ CREATE TABLE phpbb_bbcodes ( CHECK (bbcode_id>=0) ); +CREATE INDEX display_on_posting_phpbb_bbcodes_index ON phpbb_bbcodes (display_on_posting); + /* Table: phpbb_bookmarks */ CREATE TABLE phpbb_bookmarks ( topic_id INT4 DEFAULT '0' NOT NULL, @@ -521,7 +524,6 @@ CREATE TABLE phpbb_posts ( post_approved INT2 DEFAULT '1' NOT NULL, post_reported INT2 DEFAULT '0' NOT NULL, enable_bbcode INT2 DEFAULT '1' NOT NULL, - enable_html INT2 DEFAULT '0' NOT NULL, enable_smilies INT2 DEFAULT '1' NOT NULL, enable_magic_url INT2 DEFAULT '1' NOT NULL, enable_sig INT2 DEFAULT '1' NOT NULL, @@ -571,7 +573,6 @@ CREATE TABLE phpbb_privmsgs ( message_time INT4 DEFAULT '0' NOT NULL, message_reported INT2 DEFAULT '0' NOT NULL, enable_bbcode INT2 DEFAULT '1' NOT NULL, - enable_html INT2 DEFAULT '0' NOT NULL, enable_smilies INT2 DEFAULT '1' NOT NULL, enable_magic_url INT2 DEFAULT '1' NOT NULL, enable_sig INT2 DEFAULT '1' NOT NULL, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 591a254f78..099c13497d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -17,8 +17,6 @@ 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'); @@ -28,7 +26,6 @@ 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_pm', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_smilies', '1'); @@ -38,7 +35,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota', 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_quote_pm', '1'); @@ -231,7 +227,6 @@ INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_sticky', 1); INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_attach', 1); INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_download', 1); INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_icons', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_html', 1); INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_bbcode', 1); INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_smilies', 1); INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_img', 1); @@ -321,7 +316,6 @@ INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_attach', 1); INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sig', 1); INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_attach', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_html', 1); INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_bbcode', 1); INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_smilies', 1); INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_download', 1); @@ -621,8 +615,8 @@ INSERT INTO phpbb_modules (module_id, module_enabled, module_display, module_nam # Default user - admin rights INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%'; INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%'; -INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html'); -INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html'); +INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach'); +INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach'); # Default user - moderation rights INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%'; @@ -631,8 +625,8 @@ INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_setting) S # ADMINISTRATOR group - admin and forum rights INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 7, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%'; INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 7, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%'; -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 7, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html'); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 7, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html'); +INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 7, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach'); +INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 7, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach'); # SUPER MODERATOR group - moderator rights INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_setting) SELECT 6, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_chggrp', 'u_chgname'); diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index b9fe4091b2..355ee9623d 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -101,6 +101,7 @@ CREATE TABLE phpbb_banlist ( CREATE TABLE phpbb_bbcodes ( bbcode_id INTEGER PRIMARY KEY NOT NULL DEFAULT '0', bbcode_tag varchar(16) NOT NULL DEFAULT '', + display_on_posting tinyint(1) NOT NULL DEFAULT '0', bbcode_match varchar(255) NOT NULL DEFAULT '', bbcode_tpl text(65535) NOT NULL DEFAULT '', first_pass_match varchar(255) NOT NULL DEFAULT '', @@ -109,6 +110,8 @@ CREATE TABLE phpbb_bbcodes ( second_pass_replace text(65535) NOT NULL DEFAULT '' ); +CREATE INDEX display_on_posting_phpbb_bbcodes on phpbb_bbcodes (display_on_posting); + # Table: phpbb_bookmarks CREATE TABLE phpbb_bookmarks ( topic_id mediumint(8) NOT NULL DEFAULT '0', @@ -393,7 +396,6 @@ CREATE TABLE phpbb_posts ( post_approved tinyint(1) NOT NULL DEFAULT '1', post_reported tinyint(1) NOT NULL DEFAULT '0', enable_bbcode tinyint(1) NOT NULL DEFAULT '1', - enable_html tinyint(1) NOT NULL DEFAULT '0', enable_smilies tinyint(1) NOT NULL DEFAULT '1', enable_magic_url tinyint(1) NOT NULL DEFAULT '1', enable_sig tinyint(1) NOT NULL DEFAULT '1', @@ -429,7 +431,6 @@ CREATE TABLE phpbb_privmsgs ( message_time int(11) NOT NULL DEFAULT '0', message_reported tinyint(1) NOT NULL DEFAULT '0', enable_bbcode tinyint(1) NOT NULL DEFAULT '1', - enable_html tinyint(1) NOT NULL DEFAULT '0', enable_smilies tinyint(1) NOT NULL DEFAULT '1', enable_magic_url tinyint(1) NOT NULL DEFAULT '1', enable_sig tinyint(1) NOT NULL DEFAULT '1', |