diff options
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 92 | ||||
| -rw-r--r-- | phpBB/install/schemas/mssql_schema.sql | 152 | ||||
| -rw-r--r-- | phpBB/install/schemas/mysql_schema.sql | 40 | ||||
| -rw-r--r-- | phpBB/install/schemas/oracle_schema.sql | 94 | ||||
| -rw-r--r-- | phpBB/install/schemas/postgres_schema.sql | 74 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 366 | ||||
| -rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 64 |
7 files changed, 441 insertions, 441 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index e33efd71a9..e74dff0f22 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -40,8 +40,8 @@ BEGIN END;; -# phpbb_auth_groups -CREATE TABLE phpbb_auth_groups ( +# phpbb_acl_groups +CREATE TABLE phpbb_acl_groups ( group_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL, auth_option_id INTEGER DEFAULT 0 NOT NULL, @@ -49,12 +49,12 @@ CREATE TABLE phpbb_auth_groups ( auth_setting INTEGER DEFAULT 0 NOT NULL );; -CREATE INDEX phpbb_auth_groups_auth_opt_id ON phpbb_auth_groups(auth_option_id);; -CREATE INDEX phpbb_auth_groups_group_id ON phpbb_auth_groups(group_id);; +CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups(auth_option_id);; +CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups(group_id);; -# phpbb_auth_options -CREATE TABLE phpbb_auth_options ( +# phpbb_acl_options +CREATE TABLE phpbb_acl_options ( auth_option_id INTEGER NOT NULL, auth_option VARCHAR(20) NOT NULL, is_global INTEGER DEFAULT 0 NOT NULL, @@ -62,23 +62,23 @@ CREATE TABLE phpbb_auth_options ( founder_only INTEGER DEFAULT 0 NOT NULL );; -ALTER TABLE phpbb_auth_options ADD PRIMARY KEY (auth_option_id);; +ALTER TABLE phpbb_acl_options ADD PRIMARY KEY (auth_option_id);; -CREATE INDEX phpbb_auth_options_auth_option ON phpbb_auth_options(auth_option);; +CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options(auth_option);; -CREATE GENERATOR phpbb_auth_options_gen;; -SET GENERATOR phpbb_auth_options_gen TO 0;; +CREATE GENERATOR phpbb_acl_options_gen;; +SET GENERATOR phpbb_acl_options_gen TO 0;; -CREATE TRIGGER t_phpbb_auth_options_gen FOR phpbb_auth_options +CREATE TRIGGER t_phpbb_acl_options_gen FOR phpbb_acl_options BEFORE INSERT AS BEGIN - NEW.auth_option_id = GEN_ID(phpbb_auth_options_gen, 1); + NEW.auth_option_id = GEN_ID(phpbb_acl_options_gen, 1); END;; -# phpbb_auth_roles -CREATE TABLE phpbb_auth_roles ( +# phpbb_acl_roles +CREATE TABLE phpbb_acl_roles ( role_id INTEGER NOT NULL, role_name VARCHAR(255) DEFAULT '' NOT NULL, role_description BLOB SUB_TYPE TEXT, @@ -86,34 +86,34 @@ CREATE TABLE phpbb_auth_roles ( role_order INTEGER DEFAULT 0 NOT NULL );; -ALTER TABLE phpbb_auth_roles ADD PRIMARY KEY (role_id);; +ALTER TABLE phpbb_acl_roles ADD PRIMARY KEY (role_id);; -CREATE INDEX phpbb_auth_roles_role_type ON phpbb_auth_roles(role_type);; -CREATE INDEX phpbb_auth_roles_role_order ON phpbb_auth_roles(role_order);; +CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles(role_type);; +CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles(role_order);; -CREATE GENERATOR phpbb_auth_roles_gen;; -SET GENERATOR phpbb_auth_roles_gen TO 0;; +CREATE GENERATOR phpbb_acl_roles_gen;; +SET GENERATOR phpbb_acl_roles_gen TO 0;; -CREATE TRIGGER t_phpbb_auth_roles_gen FOR phpbb_auth_roles +CREATE TRIGGER t_phpbb_acl_roles_gen FOR phpbb_acl_roles BEFORE INSERT AS BEGIN - NEW.role_id = GEN_ID(phpbb_auth_roles_gen, 1); + NEW.role_id = GEN_ID(phpbb_acl_roles_gen, 1); END;; -# phpbb_auth_roles_data -CREATE TABLE phpbb_auth_roles_data ( +# phpbb_acl_roles_data +CREATE TABLE phpbb_acl_roles_data ( role_id INTEGER DEFAULT 0 NOT NULL, auth_option_id INTEGER DEFAULT 0 NOT NULL, auth_setting INTEGER DEFAULT 0 NOT NULL );; -ALTER TABLE phpbb_auth_roles_data ADD PRIMARY KEY (role_id, auth_option_id);; +ALTER TABLE phpbb_acl_roles_data ADD PRIMARY KEY (role_id, auth_option_id);; -# phpbb_auth_users -CREATE TABLE phpbb_auth_users ( +# phpbb_acl_users +CREATE TABLE phpbb_acl_users ( user_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL, auth_option_id INTEGER DEFAULT 0 NOT NULL, @@ -121,8 +121,8 @@ CREATE TABLE phpbb_auth_users ( auth_setting INTEGER DEFAULT 0 NOT NULL );; -CREATE INDEX phpbb_auth_users_auth_opt_id ON phpbb_auth_users(auth_option_id);; -CREATE INDEX phpbb_auth_users_user_id ON phpbb_auth_users(user_id);; +CREATE INDEX phpbb_acl_users_auth_opt_id ON phpbb_acl_users(auth_option_id);; +CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users(user_id);; # phpbb_banlist @@ -384,24 +384,24 @@ BEGIN END;; -# phpbb_forum_access -CREATE TABLE phpbb_forum_access ( +# phpbb_forums_access +CREATE TABLE phpbb_forums_access ( forum_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL, session_id VARCHAR(32) DEFAULT '' NOT NULL );; -ALTER TABLE phpbb_forum_access ADD PRIMARY KEY (forum_id, user_id, session_id);; +ALTER TABLE phpbb_forums_access ADD PRIMARY KEY (forum_id, user_id, session_id);; -# phpbb_forums_marking -CREATE TABLE phpbb_forums_marking ( +# phpbb_forums_track +CREATE TABLE phpbb_forums_track ( user_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL, mark_time INTEGER DEFAULT 0 NOT NULL );; -ALTER TABLE phpbb_forums_marking ADD PRIMARY KEY (user_id, forum_id);; +ALTER TABLE phpbb_forums_track ADD PRIMARY KEY (user_id, forum_id);; # phpbb_forums_watch @@ -577,28 +577,28 @@ BEGIN END;; -# phpbb_poll_results -CREATE TABLE phpbb_poll_results ( +# phpbb_poll_options +CREATE TABLE phpbb_poll_options ( poll_option_id INTEGER DEFAULT 0 NOT NULL, topic_id INTEGER NOT NULL, poll_option_text BLOB SUB_TYPE TEXT, poll_option_total INTEGER DEFAULT 0 NOT NULL );; -CREATE INDEX phpbb_poll_results_poll_opt_id ON phpbb_poll_results(poll_option_id);; -CREATE INDEX phpbb_poll_results_topic_id ON phpbb_poll_results(topic_id);; +CREATE INDEX phpbb_poll_options_poll_opt_id ON phpbb_poll_options(poll_option_id);; +CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options(topic_id);; -# phpbb_poll_voters -CREATE TABLE phpbb_poll_voters ( +# phpbb_poll_votes +CREATE TABLE phpbb_poll_votes ( topic_id INTEGER DEFAULT 0 NOT NULL, poll_option_id INTEGER DEFAULT 0 NOT NULL, vote_user_id INTEGER DEFAULT 0 NOT NULL, vote_user_ip VARCHAR(40) NOT NULL );; -CREATE INDEX phpbb_poll_voters_vote_user_id ON phpbb_poll_voters(vote_user_id);; -CREATE INDEX phpbb_poll_voters_vote_user_ip ON phpbb_poll_voters(vote_user_ip);; +CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes(vote_user_id);; +CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes(vote_user_ip);; # phpbb_posts @@ -1263,17 +1263,17 @@ BEGIN END;; -# phpbb_topics_marking -CREATE TABLE phpbb_topics_marking ( +# phpbb_topics_track +CREATE TABLE phpbb_topics_track ( user_id INTEGER DEFAULT 0 NOT NULL, topic_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL, mark_time INTEGER DEFAULT 0 NOT NULL );; -ALTER TABLE phpbb_topics_marking ADD PRIMARY KEY (user_id, topic_id);; +ALTER TABLE phpbb_topics_track ADD PRIMARY KEY (user_id, topic_id);; -CREATE INDEX phpbb_topics_marking_forum_id ON phpbb_topics_marking(forum_id);; +CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track(forum_id);; # phpbb_topics_posted diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 49dc1f22b0..937c9bf77b 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -67,9 +67,9 @@ GO /* - Table: phpbb_auth_groups + Table: phpbb_acl_groups */ -CREATE TABLE [phpbb_auth_groups] ( +CREATE TABLE [phpbb_acl_groups] ( [group_id] [int] NOT NULL , [forum_id] [int] NOT NULL , [auth_option_id] [int] NOT NULL , @@ -78,25 +78,25 @@ CREATE TABLE [phpbb_auth_groups] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_groups] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_auth_g_group_id] DEFAULT (0) FOR [group_id], - CONSTRAINT [DF_phpbb_auth_g_forum_id] DEFAULT (0) FOR [forum_id], - CONSTRAINT [DF_phpbb_auth_g_auth_option_id] DEFAULT (0) FOR [auth_option_id], - CONSTRAINT [DF_phpbb_auth_g_auth_role_id] DEFAULT (0) FOR [auth_role_id], - CONSTRAINT [DF_phpbb_auth_g_auth_setting] DEFAULT (0) FOR [auth_setting] +ALTER TABLE [phpbb_acl_groups] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_acl_g_group_id] DEFAULT (0) FOR [group_id], + CONSTRAINT [DF_phpbb_acl_g_forum_id] DEFAULT (0) FOR [forum_id], + CONSTRAINT [DF_phpbb_acl_g_auth_option_id] DEFAULT (0) FOR [auth_option_id], + CONSTRAINT [DF_phpbb_acl_g_auth_role_id] DEFAULT (0) FOR [auth_role_id], + CONSTRAINT [DF_phpbb_acl_g_auth_setting] DEFAULT (0) FOR [auth_setting] GO -CREATE INDEX [group_id] ON [phpbb_auth_groups]([group_id]) ON [PRIMARY] +CREATE INDEX [group_id] ON [phpbb_acl_groups]([group_id]) ON [PRIMARY] GO -CREATE INDEX [auth_option_id] ON [phpbb_auth_groups]([auth_option_id]) ON [PRIMARY] +CREATE INDEX [auth_option_id] ON [phpbb_acl_groups]([auth_option_id]) ON [PRIMARY] GO /* - Table: phpbb_auth_options + Table: phpbb_acl_options */ -CREATE TABLE [phpbb_auth_options] ( +CREATE TABLE [phpbb_acl_options] ( [auth_option_id] [int] IDENTITY (1, 1) NOT NULL , [auth_option] [varchar] (20) NOT NULL , [is_global] [int] NOT NULL , @@ -105,27 +105,27 @@ CREATE TABLE [phpbb_auth_options] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_options] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_auth_options] PRIMARY KEY CLUSTERED +ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_acl_options] PRIMARY KEY CLUSTERED ( [auth_option_id] ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_options] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_auth_o_is_global] DEFAULT (0) FOR [is_global], - CONSTRAINT [DF_phpbb_auth_o_is_local] DEFAULT (0) FOR [is_local], - CONSTRAINT [DF_phpbb_auth_o_founder_only] DEFAULT (0) FOR [founder_only] +ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_acl_o_is_global] DEFAULT (0) FOR [is_global], + CONSTRAINT [DF_phpbb_acl_o_is_local] DEFAULT (0) FOR [is_local], + CONSTRAINT [DF_phpbb_acl_o_founder_only] DEFAULT (0) FOR [founder_only] GO -CREATE INDEX [auth_option] ON [phpbb_auth_options]([auth_option]) ON [PRIMARY] +CREATE INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY] GO /* - Table: phpbb_auth_roles + Table: phpbb_acl_roles */ -CREATE TABLE [phpbb_auth_roles] ( +CREATE TABLE [phpbb_acl_roles] ( [role_id] [int] IDENTITY (1, 1) NOT NULL , [role_name] [varchar] (255) NOT NULL , [role_description] [varchar] (8000) , @@ -134,55 +134,55 @@ CREATE TABLE [phpbb_auth_roles] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_roles] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_auth_roles] PRIMARY KEY CLUSTERED +ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_acl_roles] PRIMARY KEY CLUSTERED ( [role_id] ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_roles] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_auth_p_role_role_order] DEFAULT (0) FOR [role_order], - CONSTRAINT [DF_phpbb_auth_p_role_role_type] DEFAULT ('') FOR [role_type], - CONSTRAINT [DF_phpbb_auth_p_role_role_name] DEFAULT ('') FOR [role_name] +ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_acl_p_role_role_order] DEFAULT (0) FOR [role_order], + CONSTRAINT [DF_phpbb_acl_p_role_role_type] DEFAULT ('') FOR [role_type], + CONSTRAINT [DF_phpbb_acl_p_role_role_name] DEFAULT ('') FOR [role_name] GO -CREATE INDEX [role_type] ON [phpbb_auth_roles]([role_type]) ON [PRIMARY] +CREATE INDEX [role_type] ON [phpbb_acl_roles]([role_type]) ON [PRIMARY] GO -CREATE INDEX [role_order] ON [phpbb_auth_roles]([role_order]) ON [PRIMARY] +CREATE INDEX [role_order] ON [phpbb_acl_roles]([role_order]) ON [PRIMARY] GO /* - Table: phpbb_auth_roles_data + Table: phpbb_acl_roles_data */ -CREATE TABLE [phpbb_auth_roles_data] ( +CREATE TABLE [phpbb_acl_roles_data] ( [role_id] [int] NOT NULL , [auth_option_id] [int] NOT NULL , [auth_setting] [int] NOT NULL ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_roles_data] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_auth_roles_data] PRIMARY KEY CLUSTERED +ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_acl_roles_data] PRIMARY KEY CLUSTERED ( [role_id], [auth_option_id] ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_roles_data] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_auth_d_role_id] DEFAULT (0) FOR [role_id], - CONSTRAINT [DF_phpbb_auth_d_auth_option_id] DEFAULT (0) FOR [auth_option_id], - CONSTRAINT [DF_phpbb_auth_d_auth_setting] DEFAULT (0) FOR [auth_setting] +ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_acl_d_role_id] DEFAULT (0) FOR [role_id], + CONSTRAINT [DF_phpbb_acl_d_auth_option_id] DEFAULT (0) FOR [auth_option_id], + CONSTRAINT [DF_phpbb_acl_d_auth_setting] DEFAULT (0) FOR [auth_setting] GO /* - Table: phpbb_auth_users + Table: phpbb_acl_users */ -CREATE TABLE [phpbb_auth_users] ( +CREATE TABLE [phpbb_acl_users] ( [user_id] [int] NOT NULL , [forum_id] [int] NOT NULL , [auth_option_id] [int] NOT NULL , @@ -191,18 +191,18 @@ CREATE TABLE [phpbb_auth_users] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_auth_users] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_auth_u_user_id] DEFAULT (0) FOR [user_id], - CONSTRAINT [DF_phpbb_auth_u_forum_id] DEFAULT (0) FOR [forum_id], - CONSTRAINT [DF_phpbb_auth_u_auth_option_id] DEFAULT (0) FOR [auth_option_id], - CONSTRAINT [DF_phpbb_auth_u_auth_role_id] DEFAULT (0) FOR [auth_role_id], - CONSTRAINT [DF_phpbb_auth_u_auth_setting] DEFAULT (0) FOR [auth_setting] +ALTER TABLE [phpbb_acl_users] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_acl_u_user_id] DEFAULT (0) FOR [user_id], + CONSTRAINT [DF_phpbb_acl_u_forum_id] DEFAULT (0) FOR [forum_id], + CONSTRAINT [DF_phpbb_acl_u_auth_option_id] DEFAULT (0) FOR [auth_option_id], + CONSTRAINT [DF_phpbb_acl_u_auth_role_id] DEFAULT (0) FOR [auth_role_id], + CONSTRAINT [DF_phpbb_acl_u_auth_setting] DEFAULT (0) FOR [auth_setting] GO -CREATE INDEX [user_id] ON [phpbb_auth_users]([user_id]) ON [PRIMARY] +CREATE INDEX [user_id] ON [phpbb_acl_users]([user_id]) ON [PRIMARY] GO -CREATE INDEX [auth_option_id] ON [phpbb_auth_users]([auth_option_id]) ON [PRIMARY] +CREATE INDEX [auth_option_id] ON [phpbb_acl_users]([auth_option_id]) ON [PRIMARY] GO @@ -598,17 +598,17 @@ GO /* - Table: phpbb_forum_access + Table: phpbb_forums_access */ -CREATE TABLE [phpbb_forum_access] ( +CREATE TABLE [phpbb_forums_access] ( [forum_id] [int] NOT NULL , [user_id] [int] NOT NULL , [session_id] [varchar] (32) NOT NULL ) ON [PRIMARY] GO -ALTER TABLE [phpbb_forum_access] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_forum_access] PRIMARY KEY CLUSTERED +ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_forums_access] PRIMARY KEY CLUSTERED ( [forum_id], [user_id], @@ -616,7 +616,7 @@ ALTER TABLE [phpbb_forum_access] WITH NOCHECK ADD ) ON [PRIMARY] GO -ALTER TABLE [phpbb_forum_access] WITH NOCHECK ADD +ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD CONSTRAINT [DF_phpbb_forum__forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_forum__user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_forum__session_id] DEFAULT ('') FOR [session_id] @@ -624,24 +624,24 @@ GO /* - Table: phpbb_forums_marking + Table: phpbb_forums_track */ -CREATE TABLE [phpbb_forums_marking] ( +CREATE TABLE [phpbb_forums_track] ( [user_id] [int] NOT NULL , [forum_id] [int] NOT NULL , [mark_time] [int] NOT NULL ) ON [PRIMARY] GO -ALTER TABLE [phpbb_forums_marking] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_forums_marking] PRIMARY KEY CLUSTERED +ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_forums_track] PRIMARY KEY CLUSTERED ( [user_id], [forum_id] ) ON [PRIMARY] GO -ALTER TABLE [phpbb_forums_marking] WITH NOCHECK ADD +ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD CONSTRAINT [DF_phpbb_forumm_user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_forumm_forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_forumm_mark_time] DEFAULT (0) FOR [mark_time] @@ -897,9 +897,9 @@ GO /* - Table: phpbb_poll_results + Table: phpbb_poll_options */ -CREATE TABLE [phpbb_poll_results] ( +CREATE TABLE [phpbb_poll_options] ( [poll_option_id] [int] NOT NULL , [topic_id] [int] NOT NULL , [poll_option_text] [varchar] (3000) , @@ -907,22 +907,22 @@ CREATE TABLE [phpbb_poll_results] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_poll_results] WITH NOCHECK ADD - CONSTRAINT [DF_phpbb_poll_r_poll_option_id] DEFAULT (0) FOR [poll_option_id], - CONSTRAINT [DF_phpbb_poll_r_poll_option_total] DEFAULT (0) FOR [poll_option_total] +ALTER TABLE [phpbb_poll_options] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_poll_o_poll_option_id] DEFAULT (0) FOR [poll_option_id], + CONSTRAINT [DF_phpbb_poll_o_poll_option_total] DEFAULT (0) FOR [poll_option_total] GO -CREATE INDEX [poll_option_id] ON [phpbb_poll_results]([poll_option_id]) ON [PRIMARY] +CREATE INDEX [poll_option_id] ON [phpbb_poll_options]([poll_option_id]) ON [PRIMARY] GO -CREATE INDEX [topic_id] ON [phpbb_poll_results]([topic_id]) ON [PRIMARY] +CREATE INDEX [topic_id] ON [phpbb_poll_options]([topic_id]) ON [PRIMARY] GO /* - Table: phpbb_poll_voters + Table: phpbb_poll_votes */ -CREATE TABLE [phpbb_poll_voters] ( +CREATE TABLE [phpbb_poll_votes] ( [topic_id] [int] NOT NULL , [poll_option_id] [int] NOT NULL , [vote_user_id] [int] NOT NULL , @@ -930,19 +930,19 @@ CREATE TABLE [phpbb_poll_voters] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_poll_voters] WITH NOCHECK ADD +ALTER TABLE [phpbb_poll_votes] WITH NOCHECK ADD CONSTRAINT [DF_phpbb_poll_v_topic_id] DEFAULT (0) FOR [topic_id], CONSTRAINT [DF_phpbb_poll_v_poll_option_id] DEFAULT (0) FOR [poll_option_id], CONSTRAINT [DF_phpbb_poll_v_vote_user_id] DEFAULT (0) FOR [vote_user_id] GO -CREATE INDEX [topic_id] ON [phpbb_poll_voters]([topic_id]) ON [PRIMARY] +CREATE INDEX [topic_id] ON [phpbb_poll_votes]([topic_id]) ON [PRIMARY] GO -CREATE INDEX [vote_user_id] ON [phpbb_poll_voters]([vote_user_id]) ON [PRIMARY] +CREATE INDEX [vote_user_id] ON [phpbb_poll_votes]([vote_user_id]) ON [PRIMARY] GO -CREATE INDEX [vote_user_ip] ON [phpbb_poll_voters]([vote_user_ip]) ON [PRIMARY] +CREATE INDEX [vote_user_ip] ON [phpbb_poll_votes]([vote_user_ip]) ON [PRIMARY] GO @@ -1999,9 +1999,9 @@ GO /* - Table: phpbb_topics_marking + Table: phpbb_topics_track */ -CREATE TABLE [phpbb_topics_marking] ( +CREATE TABLE [phpbb_topics_track] ( [user_id] [int] NOT NULL , [topic_id] [int] NOT NULL , [forum_id] [int] NOT NULL , @@ -2009,22 +2009,22 @@ CREATE TABLE [phpbb_topics_marking] ( ) ON [PRIMARY] GO -ALTER TABLE [phpbb_topics_marking] WITH NOCHECK ADD - CONSTRAINT [PK_phpbb_topics_marking] PRIMARY KEY CLUSTERED +ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_topics_track] PRIMARY KEY CLUSTERED ( [user_id], [topic_id] ) ON [PRIMARY] GO -ALTER TABLE [phpbb_topics_marking] WITH NOCHECK ADD +ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD CONSTRAINT [DF_phpbb_tmarki_user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_tmarki_topic_id] DEFAULT (0) FOR [topic_id], CONSTRAINT [DF_phpbb_tmarki_forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_tmarki_mark_time] DEFAULT (0) FOR [mark_time] GO -CREATE INDEX [forum_id] ON [phpbb_topics_marking]([forum_id]) ON [PRIMARY] +CREATE INDEX [forum_id] ON [phpbb_topics_track]([forum_id]) ON [PRIMARY] GO diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index b3de43cf50..f03f704820 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -29,8 +29,8 @@ CREATE TABLE phpbb_attachments ( KEY filesize (filesize) ); -# Table: 'phpbb_auth_groups' -CREATE TABLE phpbb_auth_groups ( +# Table: 'phpbb_acl_groups' +CREATE TABLE phpbb_acl_groups ( group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -40,8 +40,8 @@ CREATE TABLE phpbb_auth_groups ( KEY auth_option_id (auth_option_id) ); -# Table: 'phpbb_auth_options' -CREATE TABLE phpbb_auth_options ( +# Table: 'phpbb_acl_options' +CREATE TABLE phpbb_acl_options ( auth_option_id mediumint(8) UNSIGNED NOT NULL auto_increment, auth_option varchar(20) NOT NULL, is_global tinyint(1) DEFAULT '0' NOT NULL, @@ -51,8 +51,8 @@ CREATE TABLE phpbb_auth_options ( KEY auth_option (auth_option) ); -# Table: 'phpbb_auth_roles' -CREATE TABLE phpbb_auth_roles ( +# Table: 'phpbb_acl_roles' +CREATE TABLE phpbb_acl_roles ( role_id mediumint(8) UNSIGNED NOT NULL auto_increment, role_name varchar(255) DEFAULT '' NOT NULL, role_description text, @@ -63,16 +63,16 @@ CREATE TABLE phpbb_auth_roles ( KEY role_order (role_order) ); -# Table: 'phpbb_auth_roles_data' -CREATE TABLE phpbb_auth_roles_data ( +# Table: 'phpbb_acl_roles_data' +CREATE TABLE phpbb_acl_roles_data ( role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_setting tinyint(2) DEFAULT '0' NOT NULL, PRIMARY KEY (role_id, auth_option_id) ); -# Table: 'phpbb_auth_users' -CREATE TABLE phpbb_auth_users ( +# Table: 'phpbb_acl_users' +CREATE TABLE phpbb_acl_users ( user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -243,16 +243,16 @@ CREATE TABLE phpbb_forums ( KEY forum_last_post_id (forum_last_post_id) ); -# Table: 'phpbb_forum_access' -CREATE TABLE phpbb_forum_access ( +# Table: 'phpbb_forums_access' +CREATE TABLE phpbb_forums_access ( forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, session_id varchar(32) DEFAULT '' NOT NULL, PRIMARY KEY (forum_id, user_id, session_id) ); -# Table: 'phpbb_forums_marking' -CREATE TABLE phpbb_forums_marking ( +# Table: 'phpbb_forums_track' +CREATE TABLE phpbb_forums_track ( user_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL, mark_time int(11) DEFAULT '0' NOT NULL, @@ -365,8 +365,8 @@ CREATE TABLE phpbb_modules ( KEY module_enabled (module_enabled) ); -# Table: 'phpbb_poll_results' -CREATE TABLE phpbb_poll_results ( +# Table: 'phpbb_poll_options' +CREATE TABLE phpbb_poll_options ( poll_option_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, topic_id mediumint(8) UNSIGNED NOT NULL, poll_option_text text, @@ -375,8 +375,8 @@ CREATE TABLE phpbb_poll_results ( KEY topic_id (topic_id) ); -# Table: 'phpbb_poll_voters' -CREATE TABLE phpbb_poll_voters ( +# Table: 'phpbb_poll_votes' +CREATE TABLE phpbb_poll_votes ( topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, poll_option_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, vote_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, @@ -829,8 +829,8 @@ CREATE TABLE phpbb_topics ( KEY topic_last_post_time (topic_last_post_time) ); -# Table: 'phpbb_topic_marking' -CREATE TABLE phpbb_topics_marking ( +# Table: 'phpbb_topics_track' +CREATE TABLE phpbb_topics_track ( user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 20805d4633..0137f98f5a 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -91,9 +91,9 @@ CREATE INDEX phpbb_attachments_filesize on phpbb_attachments (filesize) /* - Table: phpbb_auth_groups + Table: phpbb_acl_groups */ -CREATE TABLE phpbb_auth_groups ( +CREATE TABLE phpbb_acl_groups ( group_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL, @@ -102,94 +102,94 @@ CREATE TABLE phpbb_auth_groups ( ) / -CREATE INDEX phpbb_auth_groups_group_id on phpbb_auth_groups (group_id) +CREATE INDEX phpbb_acl_groups_group_id on phpbb_acl_groups (group_id) / -CREATE INDEX phpbb_auth_groups_auth_opt_id on phpbb_auth_groups (auth_option_id) +CREATE INDEX phpbb_acl_groups_auth_opt_id on phpbb_acl_groups (auth_option_id) / /* - Table: phpbb_auth_options + Table: phpbb_acl_options */ -CREATE TABLE phpbb_auth_options ( +CREATE TABLE phpbb_acl_options ( auth_option_id number(8) NOT NULL, auth_option varchar2(20) NOT NULL, is_global number(1) DEFAULT '0' NOT NULL, is_local number(1) DEFAULT '0' NOT NULL, founder_only number(1) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_auth_options PRIMARY KEY (auth_option_id) + CONSTRAINT pk_phpbb_acl_options PRIMARY KEY (auth_option_id) ) / -CREATE SEQUENCE phpbb_auth_options_seq +CREATE SEQUENCE phpbb_acl_options_seq / -CREATE OR REPLACE TRIGGER ai_phpbb_auth_options_seq -BEFORE INSERT ON phpbb_auth_options +CREATE OR REPLACE TRIGGER ai_phpbb_acl_options_seq +BEFORE INSERT ON phpbb_acl_options FOR EACH ROW WHEN ( new.auth_option_id IS NULL OR new.auth_option_id = 0 ) BEGIN - SELECT phpbb_auth_options_seq.nextval + SELECT phpbb_acl_options_seq.nextval INTO :new.auth_option_id FROM dual; END; / -CREATE INDEX phpbb_auth_options_auth_option on phpbb_auth_options (auth_option) +CREATE INDEX phpbb_acl_options_auth_option on phpbb_acl_options (auth_option) / /* - Table: phpbb_auth_roles + Table: phpbb_acl_roles */ -CREATE TABLE phpbb_auth_roles ( +CREATE TABLE phpbb_acl_roles ( role_id number(8) NOT NULL, role_name varchar2(255) DEFAULT '', role_description clob, role_type varchar2(10) DEFAULT '', role_order number(4) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_auth_roles PRIMARY KEY (role_id) + CONSTRAINT pk_phpbb_acl_roles PRIMARY KEY (role_id) ) / -CREATE SEQUENCE phpbb_auth_roles_seq +CREATE SEQUENCE phpbb_acl_roles_seq / -CREATE OR REPLACE TRIGGER ai_phpbb_auth_roles_seq -BEFORE INSERT ON phpbb_auth_roles +CREATE OR REPLACE TRIGGER ai_phpbb_acl_roles_seq +BEFORE INSERT ON phpbb_acl_roles FOR EACH ROW WHEN ( new.role_id IS NULL OR new.role_id = 0 ) BEGIN - SELECT phpbb_auth_roles_seq.nextval + SELECT phpbb_acl_roles_seq.nextval INTO :new.role_id FROM dual; END; / -CREATE INDEX phpbb_auth_roles_role_type on phpbb_auth_roles (role_type) +CREATE INDEX phpbb_acl_roles_role_type on phpbb_acl_roles (role_type) / -CREATE INDEX phpbb_auth_roles_role_order on phpbb_auth_roles (role_order) +CREATE INDEX phpbb_acl_roles_role_order on phpbb_acl_roles (role_order) / /* - Table: phpbb_auth_roles_data + Table: phpbb_acl_roles_data */ -CREATE TABLE phpbb_auth_roles_data ( +CREATE TABLE phpbb_acl_roles_data ( role_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL, auth_setting number(2) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_auth_roles_data PRIMARY KEY (role_id, auth_option_id) + CONSTRAINT pk_phpbb_acl_roles_data PRIMARY KEY (role_id, auth_option_id) ) / /* - Table: phpbb_auth_users + Table: phpbb_acl_users */ -CREATE TABLE phpbb_auth_users ( +CREATE TABLE phpbb_acl_users ( user_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL, @@ -198,9 +198,9 @@ CREATE TABLE phpbb_auth_users ( ) / -CREATE INDEX phpbb_auth_users_user_id on phpbb_auth_users (user_id) +CREATE INDEX phpbb_acl_users_user_id on phpbb_acl_users (user_id) / -CREATE INDEX phpbb_auth_users_auth_opt_id on phpbb_auth_users (auth_option_id) +CREATE INDEX phpbb_acl_users_auth_opt_id on phpbb_acl_users (auth_option_id) / @@ -533,25 +533,25 @@ CREATE INDEX phpbb_forums_forum_last_pst_id on phpbb_forums (forum_last_post_id) /* - Table: phpbb_forum_access + Table: phpbb_forums_access */ -CREATE TABLE phpbb_forum_access ( +CREATE TABLE phpbb_forums_access ( forum_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL, session_id varchar2(32) DEFAULT '', - CONSTRAINT pk_phpbb_forum_access PRIMARY KEY (forum_id, user_id, session_id) + CONSTRAINT pk_phpbb_forums_access PRIMARY KEY (forum_id, user_id, session_id) ) / /* - Table: phpbb_forums_marking + Table: phpbb_forums_track */ -CREATE TABLE phpbb_forums_marking ( +CREATE TABLE phpbb_forums_track ( user_id number(9) DEFAULT '0' NOT NULL, forum_id number(9) DEFAULT '0' NOT NULL, mark_time number(11) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_forums_marking PRIMARY KEY (user_id, forum_id) + CONSTRAINT pk_phpbb_forums_track PRIMARY KEY (user_id, forum_id) ) / @@ -784,9 +784,9 @@ CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id) /* - Table: phpbb_poll_results + Table: phpbb_poll_options */ -CREATE TABLE phpbb_poll_results ( +CREATE TABLE phpbb_poll_options ( poll_option_id number(4) DEFAULT '0' NOT NULL, topic_id number(8) NOT NULL, poll_option_text varchar2(3000), @@ -794,16 +794,16 @@ CREATE TABLE phpbb_poll_results ( ) / -CREATE INDEX phpbb_poll_results_poll_opt_id on phpbb_poll_results (poll_option_id) +CREATE INDEX phpbb_poll_options_poll_opt_id on phpbb_poll_options (poll_option_id) / -CREATE INDEX phpbb_poll_results_topic_id on phpbb_poll_results (topic_id) +CREATE INDEX phpbb_poll_options_topic_id on phpbb_poll_options (topic_id) / /* - Table: phpbb_poll_voters + Table: phpbb_poll_votes */ -CREATE TABLE phpbb_poll_voters ( +CREATE TABLE phpbb_poll_votes ( topic_id number(8) DEFAULT '0' NOT NULL, poll_option_id number(4) DEFAULT '0' NOT NULL, vote_user_id number(8) DEFAULT '0' NOT NULL, @@ -811,11 +811,11 @@ CREATE TABLE phpbb_poll_voters ( ) / -CREATE INDEX phpbb_poll_voters_topic_id on phpbb_poll_voters (topic_id) +CREATE INDEX phpbb_poll_votes_topic_id on phpbb_poll_votes (topic_id) / -CREATE INDEX phpbb_poll_voters_vote_user_id on phpbb_poll_voters (vote_user_id) +CREATE INDEX phpbb_poll_votes_vote_user_id on phpbb_poll_votes (vote_user_id) / -CREATE INDEX phpbb_poll_voters_vote_user_ip on phpbb_poll_voters (vote_user_ip) +CREATE INDEX phpbb_poll_votes_vote_user_ip on phpbb_poll_votes (vote_user_ip) / @@ -1643,18 +1643,18 @@ CREATE INDEX phpbb_topics_last_post_time on phpbb_topics (topic_last_post_time) /* - Table: phpbb_topics_marking + Table: phpbb_topics_track */ -CREATE TABLE phpbb_topics_marking ( +CREATE TABLE phpbb_topics_track ( user_id number(8) DEFAULT '0' NOT NULL, topic_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL, mark_time number(11) DEFAULT '0' NOT NULL, - CONSTRAINT pk_phpbb_topics_marking PRIMARY KEY (user_id, topic_id) + CONSTRAINT pk_phpbb_topics_track PRIMARY KEY (user_id, topic_id) ) / -CREATE INDEX phpbb_topics_marking_forum_id on phpbb_topics_marking (forum_id) +CREATE INDEX phpbb_topics_track_forum_id on phpbb_topics_track (forum_id) / diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 7191e442eb..d24cefacc7 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -118,8 +118,8 @@ CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize); -/* Table: phpbb_auth_groups */ -CREATE TABLE phpbb_auth_groups ( +/* Table: phpbb_acl_groups */ +CREATE TABLE phpbb_acl_groups ( group_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL, auth_option_id INT4 DEFAULT '0' NOT NULL, @@ -127,15 +127,15 @@ CREATE TABLE phpbb_auth_groups ( auth_setting INT2 DEFAULT '0' NOT NULL ); -CREATE INDEX phpbb_auth_groups_group_id ON phpbb_auth_groups (group_id); -CREATE INDEX phpbb_auth_groups_auth_option_id ON phpbb_auth_groups (auth_option_id); +CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups (group_id); +CREATE INDEX phpbb_acl_groups_auth_option_id ON phpbb_acl_groups (auth_option_id); -/* Table: phpbb_auth_options */ -CREATE SEQUENCE phpbb_auth_options_seq; +/* Table: phpbb_acl_options */ +CREATE SEQUENCE phpbb_acl_options_seq; -CREATE TABLE phpbb_auth_options ( - auth_option_id INT4 DEFAULT nextval('phpbb_auth_options_seq'), +CREATE TABLE phpbb_acl_options ( + auth_option_id INT4 DEFAULT nextval('phpbb_acl_options_seq'), auth_option varchar(20) NOT NULL, is_global INT2 DEFAULT '0' NOT NULL, is_local INT2 DEFAULT '0' NOT NULL, @@ -143,16 +143,16 @@ CREATE TABLE phpbb_auth_options ( PRIMARY KEY (auth_option_id) ); -CREATE INDEX phpbb_auth_options_auth_option ON phpbb_auth_options (auth_option); +CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option); -/* Table: phpbb_auth_roles */ -CREATE SEQUENCE phpbb_auth_roles_seq; +/* Table: phpbb_acl_roles */ +CREATE SEQUENCE phpbb_acl_roles_seq; -CREATE TABLE phpbb_auth_roles ( - role_id INT4 DEFAULT nextval('phpbb_auth_roles_seq'), +CREATE TABLE phpbb_acl_roles ( + role_id INT4 DEFAULT nextval('phpbb_acl_roles_seq'), role_name varchar(255) DEFAULT '' NOT NULL, role_description varchar(8000), role_type varchar(10) DEFAULT '' NOT NULL, @@ -160,14 +160,14 @@ CREATE TABLE phpbb_auth_roles ( PRIMARY KEY (role_id) ); -CREATE INDEX phpbb_auth_roles_role_type ON phpbb_auth_roles (role_type); -CREATE INDEX phpbb_auth_roles_role_order ON phpbb_auth_roles (role_order); +CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles (role_type); +CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles (role_order); -/* Table: phpbb_auth_roles_data */ -CREATE TABLE phpbb_auth_roles_data ( +/* Table: phpbb_acl_roles_data */ +CREATE TABLE phpbb_acl_roles_data ( role_id INT4 DEFAULT '0' NOT NULL, auth_option_id INT4 DEFAULT '0' NOT NULL, auth_setting INT2 DEFAULT '0' NOT NULL, @@ -175,8 +175,8 @@ CREATE TABLE phpbb_auth_roles_data ( ); -/* Table: phpbb_auth_users */ -CREATE TABLE phpbb_auth_users ( +/* Table: phpbb_acl_users */ +CREATE TABLE phpbb_acl_users ( user_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL, auth_option_id INT4 DEFAULT '0' NOT NULL, @@ -184,8 +184,8 @@ CREATE TABLE phpbb_auth_users ( auth_setting INT2 DEFAULT '0' NOT NULL ); -CREATE INDEX phpbb_auth_users_user_id ON phpbb_auth_users (user_id); -CREATE INDEX phpbb_auth_users_auth_option_id ON phpbb_auth_users (auth_option_id); +CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id); +CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id); /* Table: phpbb_banlist */ @@ -420,8 +420,8 @@ CREATE INDEX phpbb_forums_forum_last_post_id ON phpbb_forums (forum_last_post_id -/* Table: phpbb_forum_access */ -CREATE TABLE phpbb_forum_access ( +/* Table: phpbb_forums_access */ +CREATE TABLE phpbb_forums_access ( forum_id INT4 DEFAULT '0' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL, session_id varchar(32) DEFAULT '' NOT NULL, @@ -431,8 +431,8 @@ CREATE TABLE phpbb_forum_access ( ); -/* Table: phpbb_forums_marking */ -CREATE TABLE phpbb_forums_marking ( +/* Table: phpbb_forums_track */ +CREATE TABLE phpbb_forums_track ( user_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL, mark_time INT4 DEFAULT '0' NOT NULL, @@ -594,29 +594,29 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id); -/* Table: phpbb_poll_results */ -CREATE TABLE phpbb_poll_results ( +/* Table: phpbb_poll_options */ +CREATE TABLE phpbb_poll_options ( poll_option_id INT2 DEFAULT '0' NOT NULL, topic_id INT4 NOT NULL, poll_option_text varchar(3000), poll_option_total INT4 DEFAULT '0' NOT NULL ); -CREATE INDEX phpbb_poll_results_poll_option_id ON phpbb_poll_results (poll_option_id); -CREATE INDEX phpbb_poll_results_topic_id ON phpbb_poll_results (topic_id); +CREATE INDEX phpbb_poll_options_poll_option_id ON phpbb_poll_options (poll_option_id); +CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id); -/* Table: phpbb_poll_voters */ -CREATE TABLE phpbb_poll_voters ( +/* Table: phpbb_poll_votes */ +CREATE TABLE phpbb_poll_votes ( 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 ); -CREATE INDEX phpbb_poll_voters_topic_id ON phpbb_poll_voters (topic_id); -CREATE INDEX phpbb_poll_voters_vote_user_id ON phpbb_poll_voters (vote_user_id); -CREATE INDEX phpbb_poll_voters_vote_user_ip ON phpbb_poll_voters (vote_user_ip); +CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id); +CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id); +CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip); /* Table: phpbb_posts */ @@ -1232,8 +1232,8 @@ CREATE INDEX phpbb_topics_topic_last_post_time ON phpbb_topics (topic_last_post_ -/* Table: phpbb_topics_marking */ -CREATE TABLE phpbb_topics_marking ( +/* Table: phpbb_topics_track */ +CREATE TABLE phpbb_topics_track ( user_id INT4 DEFAULT '0' NOT NULL, topic_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL, @@ -1244,7 +1244,7 @@ CREATE TABLE phpbb_topics_marking ( CHECK (forum_id>=0) ); -CREATE INDEX phpbb_topics_marking_forum_id ON phpbb_topics_marking (forum_id); +CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id); /* Table: phpbb_topics_posted */ diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 78197db1fb..2dbdc03ac9 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -227,154 +227,154 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnings_last_gc', '0', 1); # -- Forum related auth options -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_announce', 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_bbcode', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_bump', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_delete', 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_edit', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_email', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_flash', 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_ignoreflood', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_img', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_list', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_noapprove', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_print', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_poll', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_post', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_postcount', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_read', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_reply', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_report', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_search', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_sigs', 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_sticky', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_subscribe', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_user_lock', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_vote', 1); -INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_votechg', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_announce', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_attach', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_bbcode', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_bump', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_delete', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_download', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_edit', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_email', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_flash', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_icons', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_ignoreflood', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_img', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_list', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_noapprove', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_print', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_poll', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_post', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_postcount', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_read', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_reply', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_report', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_search', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_sigs', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_smilies', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_sticky', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_subscribe', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_user_lock', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_vote', 1); +INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_votechg', 1); # -- Moderator related auth options -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_approve', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_chgposter', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_delete', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_edit', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_info', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_lock', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_merge', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_move', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_report', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_split', 1, 1); -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_warn', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_approve', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_chgposter', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_delete', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_edit', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_info', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_lock', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_merge', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_move', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_report', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_split', 1, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_warn', 1, 1); # -- Global moderator auth option (not a local option) -INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_ban', 0, 1); +INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_ban', 0, 1); # -- Admin related auth options -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_aauth', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_attach', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_authgroups', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_authusers', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_backup', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_ban', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_bbcode', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_board', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_bots', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_clearlogs', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_email', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_fauth', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_forum', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_forumadd', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_forumdel', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_group', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_groupadd', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_groupdel', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_icons', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_jabber', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_language', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_mauth', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_modules', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_names', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_phpinfo', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_profile', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_prune', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_ranks', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_reasons', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_roles', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_search', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_server', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_styles', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_switchperm', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_uauth', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_user', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_userdel', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_viewauth', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_viewlogs', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_words', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_aauth', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_attach', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_authgroups', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_authusers', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_backup', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_ban', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bbcode', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_board', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bots', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_clearlogs', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_email', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_fauth', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forum', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumadd', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumdel', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_group', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupadd', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupdel', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_icons', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_jabber', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_language', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_mauth', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_modules', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_names', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_phpinfo', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_profile', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_prune', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_ranks', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_reasons', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_roles', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_search', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_server', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_styles', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_switchperm', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_uauth', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_user', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_userdel', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_viewauth', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_viewlogs', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_words', 1); # -- User related auth options -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sendemail', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_readpm', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sendpm', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sendim', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_ignoreflood', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_hideonline', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_viewonline', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_viewprofile', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgavatar', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chggrp', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgemail', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgname', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgpasswd', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgcensors', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_search', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_savedrafts', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_download', 1); -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_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); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_edit', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_printpm', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_emailpm', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_forward', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_delete', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_img', 1); -INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_flash', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendemail', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendpm', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendim', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_ignoreflood', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_hideonline', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewonline', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewprofile', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgavatar', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chggrp', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgemail', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgname', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgpasswd', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgcensors', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_search', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_savedrafts', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_download', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_attach', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sig', 1); + +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_attach', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_bbcode', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_smilies', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_download', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_edit', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_printpm', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_emailpm', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_forward', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_delete', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_img', 1); +INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_flash', 1); # -- standard auth roles -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Admin', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Forum Admin', 'ROLE_DESCRIPTION_ADMIN_FORUM', 'a_', 3); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('User and Groups Admin', 'ROLE_DESCRIPTION_ADMIN_USERGROUP', 'a_', 4); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Full Admin', 'ROLE_DESCRIPTION_ADMIN_FULL', 'a_', 2); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('All Features', 'ROLE_DESCRIPTION_USER_FULL', 'u_', 3); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Features', 'ROLE_DESCRIPTION_USER_STANDARD', 'u_', 1); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Features', 'ROLE_DESCRIPTION_USER_LIMITED', 'u_', 2); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('No Private Messages', 'ROLE_DESCRIPTION_USER_NOPM', 'u_', 4); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('No Avatar', 'ROLE_DESCRIPTION_USER_NOAVATAR', 'u_', 5); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Full Moderator', 'ROLE_DESCRIPTION_MOD_FULL', 'm_', 3); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Moderator', 'ROLE_DESCRIPTION_MOD_STANDARD', 'm_', 1); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Simple Moderator', 'ROLE_DESCRIPTION_MOD_SIMPLE', 'm_', 2); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Queue Moderator', 'ROLE_DESCRIPTION_MOD_QUEUE', 'm_', 4); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Full Access', 'ROLE_DESCRIPTION_FORUM_FULL', 'f_', 6); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access', 'ROLE_DESCRIPTION_FORUM_STANDARD', 'f_', 4); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('No Access', 'ROLE_DESCRIPTION_FORUM_NOACCESS', 'f_', 1); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Read Only Access', 'ROLE_DESCRIPTION_FORUM_READONLY', 'f_', 2); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Access', 'ROLE_DESCRIPTION_FORUM_LIMITED', 'f_', 3); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Bot Access', 'ROLE_DESCRIPTION_FORUM_BOT', 'f_', 8); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('On Moderation Queue', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 7); -INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access + Polls', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 5); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Admin', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Forum Admin', 'ROLE_DESCRIPTION_ADMIN_FORUM', 'a_', 3); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('User and Groups Admin', 'ROLE_DESCRIPTION_ADMIN_USERGROUP', 'a_', 4); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Full Admin', 'ROLE_DESCRIPTION_ADMIN_FULL', 'a_', 2); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('All Features', 'ROLE_DESCRIPTION_USER_FULL', 'u_', 3); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Features', 'ROLE_DESCRIPTION_USER_STANDARD', 'u_', 1); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Features', 'ROLE_DESCRIPTION_USER_LIMITED', 'u_', 2); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('No Private Messages', 'ROLE_DESCRIPTION_USER_NOPM', 'u_', 4); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('No Avatar', 'ROLE_DESCRIPTION_USER_NOAVATAR', 'u_', 5); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Full Moderator', 'ROLE_DESCRIPTION_MOD_FULL', 'm_', 3); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Moderator', 'ROLE_DESCRIPTION_MOD_STANDARD', 'm_', 1); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Simple Moderator', 'ROLE_DESCRIPTION_MOD_SIMPLE', 'm_', 2); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Queue Moderator', 'ROLE_DESCRIPTION_MOD_QUEUE', 'm_', 4); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Full Access', 'ROLE_DESCRIPTION_FORUM_FULL', 'f_', 6); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access', 'ROLE_DESCRIPTION_FORUM_STANDARD', 'f_', 4); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('No Access', 'ROLE_DESCRIPTION_FORUM_NOACCESS', 'f_', 1); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Read Only Access', 'ROLE_DESCRIPTION_FORUM_READONLY', 'f_', 2); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Access', 'ROLE_DESCRIPTION_FORUM_LIMITED', 'f_', 3); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Bot Access', 'ROLE_DESCRIPTION_FORUM_BOT', 'f_', 8); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('On Moderation Queue', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 7); +INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access + Polls', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 5); # -- phpbb_styles @@ -440,122 +440,122 @@ INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES # -- Roles data # Standard Admin (a_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles'); # Forum admin (a_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs'); # User and Groups Admin (a_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 3, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_ban', 'a_group', 'a_groupadd', 'a_groupdel', 'a_ranks', 'a_uauth', 'a_user', 'a_viewauth', 'a_viewlogs'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 3, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_ban', 'a_group', 'a_groupadd', 'a_groupdel', 'a_ranks', 'a_uauth', 'a_user', 'a_viewauth', 'a_viewlogs'); # Full Admin (a_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 4, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%'; +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 4, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%'; # All Features (u_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 5, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%'; +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 5, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%'; # Standard Features (u_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_flash', 'u_pm_forward'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_flash', 'u_pm_forward'); # Limited Features (u_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); # No Private Messages (u_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewonline', 'u_viewprofile'); -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewonline', 'u_viewprofile'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm'); # No Avatar (u_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar'); # Full Moderator (m_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%'; +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%'; # Standard Moderator (m_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_delete', 'm_edit', 'm_info', 'm_report', 'm_warn'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_delete', 'm_edit', 'm_info', 'm_report', 'm_warn'); # Simple Moderator (m_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_approve', 'm_ban', 'm_chgposter', 'm_delete', 'm_warn'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_approve', 'm_ban', 'm_chgposter', 'm_delete', 'm_warn'); # Queue Moderator (m_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit'); # Full Access (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 14, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%'; +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 14, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%'; # Standard Access (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock'); # No Access (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option = 'f_'; +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option = 'f_'; # Read Only Access (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe'); # Limited Access (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 18, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 18, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg'); # Bot Access (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read'); # On Moderation Queue (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove'); -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove'); # Standard Access + Polls (f_) -INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_sticky', 'f_user_lock'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_sticky', 'f_user_lock'); # Permissions # Admin user - full user features -INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 0, 0, 5, 0); +INSERT INTO phpbb_acl_users (user_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 0, 0, 5, 0); # ADMINISTRATOR Group - full user features -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 5, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 5, 0); # ADMINISTRATOR Group - standard admin -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 1, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 1, 0); # REGISTERED and REGISTERED_COPPA having standard user features -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 0, 0, 6, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 0, 0, 6, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 0, 0, 6, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 0, 0, 6, 0); # GLOBAL_MODERATORS having full user features -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 5, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 5, 0); # GLOBAL_MODERATORS having full global moderator access -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 10, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 10, 0); # Giving all groups read only access to the first category # since administrators and moderators are already within the registered users group we do not need to set them here -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 1, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 1, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 1, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 1, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 1, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 1, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 1, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 1, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 1, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 1, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 1, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 1, 0, 17, 0); # Giving access to the first forum # guests, inactive and inactive_coppa having read only access -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 2, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 2, 0, 17, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 2, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 2, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 2, 0, 17, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 2, 0, 17, 0); # registered and registered_coppa having standard access -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 2, 0, 15, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 2, 0, 15, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 2, 0, 15, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 2, 0, 15, 0); # global moderators having standard access + polls -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 2, 0, 21, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 2, 0, 21, 0); # administrators having full forum and full moderator access -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 14, 0); -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 10, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 14, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 10, 0); # Bots having bot access -INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 2, 0, 19, 0); +INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 2, 0, 19, 0); # -- Demo Topic diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 32808cf5e5..c989bbd1ef 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -32,8 +32,8 @@ CREATE INDEX phpbb_attachments_physical_filename on phpbb_attachments (physical_ CREATE INDEX phpbb_attachments_filesize on phpbb_attachments (filesize); -# Table: phpbb_auth_groups -CREATE TABLE phpbb_auth_groups ( +# Table: phpbb_acl_groups +CREATE TABLE phpbb_acl_groups ( group_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0', auth_option_id mediumint(8) NOT NULL DEFAULT '0', @@ -41,12 +41,12 @@ CREATE TABLE phpbb_auth_groups ( auth_setting tinyint(2) NOT NULL DEFAULT '0' ); -CREATE INDEX phpbb_auth_groups_group_id on phpbb_auth_groups (group_id); -CREATE INDEX phpbb_auth_groups_auth_option_id on phpbb_auth_groups (auth_option_id); +CREATE INDEX phpbb_acl_groups_group_id on phpbb_acl_groups (group_id); +CREATE INDEX phpbb_acl_groups_auth_option_id on phpbb_acl_groups (auth_option_id); -# Table: phpbb_auth_options -CREATE TABLE phpbb_auth_options ( +# Table: phpbb_acl_options +CREATE TABLE phpbb_acl_options ( auth_option_id INTEGER PRIMARY KEY NOT NULL, auth_option varchar(20) NOT NULL, is_global tinyint(1) NOT NULL DEFAULT '0', @@ -54,11 +54,11 @@ CREATE TABLE phpbb_auth_options ( founder_only tinyint(1) NOT NULL DEFAULT '0' ); -CREATE INDEX phpbb_auth_options_auth_option on phpbb_auth_options (auth_option); +CREATE INDEX phpbb_acl_options_auth_option on phpbb_acl_options (auth_option); -# Table: phpbb_auth_roles -CREATE TABLE phpbb_auth_roles ( +# Table: phpbb_acl_roles +CREATE TABLE phpbb_acl_roles ( role_id INTEGER PRIMARY KEY NOT NULL, role_name varchar(255) NOT NULL DEFAULT '', role_description text(65535), @@ -66,12 +66,12 @@ CREATE TABLE phpbb_auth_roles ( role_order smallint(4) NOT NULL DEFAULT '0' ); -CREATE INDEX phpbb_auth_roles_role_type on phpbb_auth_roles (role_type); -CREATE INDEX phpbb_auth_roles_role_order on phpbb_auth_roles (role_order); +CREATE INDEX phpbb_acl_roles_role_type on phpbb_acl_roles (role_type); +CREATE INDEX phpbb_acl_roles_role_order on phpbb_acl_roles (role_order); -# Table: phpbb_auth_roles_data -CREATE TABLE phpbb_auth_roles_data ( +# Table: phpbb_acl_roles_data +CREATE TABLE phpbb_acl_roles_data ( role_id mediumint(8) NOT NULL DEFAULT '0', auth_option_id mediumint(8) NOT NULL DEFAULT '0', auth_setting tinyint(2) NOT NULL DEFAULT '0', @@ -79,8 +79,8 @@ CREATE TABLE phpbb_auth_roles_data ( ); -# Table: phpbb_auth_users -CREATE TABLE phpbb_auth_users ( +# Table: phpbb_acl_users +CREATE TABLE phpbb_acl_users ( user_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0', auth_option_id mediumint(8) NOT NULL DEFAULT '0', @@ -88,8 +88,8 @@ CREATE TABLE phpbb_auth_users ( auth_setting tinyint(2) NOT NULL DEFAULT '0' ); -CREATE INDEX phpbb_auth_users_user_id on phpbb_auth_users (user_id); -CREATE INDEX phpbb_auth_users_auth_option_id on phpbb_auth_users (auth_option_id); +CREATE INDEX phpbb_acl_users_user_id on phpbb_acl_users (user_id); +CREATE INDEX phpbb_acl_users_auth_option_id on phpbb_acl_users (auth_option_id); # Table: phpbb_banlist @@ -263,8 +263,8 @@ CREATE INDEX phpbb_forums_left_right_id on phpbb_forums (left_id, right_id); CREATE INDEX phpbb_forums_forum_last_post_id on phpbb_forums (forum_last_post_id); -# Table: phpbb_forum_access -CREATE TABLE phpbb_forum_access ( +# Table: phpbb_forums_access +CREATE TABLE phpbb_forums_access ( forum_id mediumint(8) NOT NULL DEFAULT '0', user_id mediumint(8) NOT NULL DEFAULT '0', session_id varchar(32) NOT NULL DEFAULT '', @@ -272,8 +272,8 @@ CREATE TABLE phpbb_forum_access ( ); -# Table: phpbb_forums_marking -CREATE TABLE phpbb_forums_marking ( +# Table: phpbb_forums_track +CREATE TABLE phpbb_forums_track ( user_id mediumint(9) NOT NULL DEFAULT '0', forum_id mediumint(9) NOT NULL DEFAULT '0', mark_time int(11) NOT NULL DEFAULT '0', @@ -394,29 +394,29 @@ CREATE INDEX phpbb_modules_module_enabled on phpbb_modules (module_enabled); CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id); -# Table: phpbb_poll_results -CREATE TABLE phpbb_poll_results ( +# Table: phpbb_poll_options +CREATE TABLE phpbb_poll_options ( poll_option_id tinyint(4) NOT NULL DEFAULT '0', topic_id mediumint(8) NOT NULL, poll_option_text text(65535), poll_option_total mediumint(8) NOT NULL DEFAULT '0' ); -CREATE INDEX phpbb_poll_results_poll_option_id on phpbb_poll_results (poll_option_id); -CREATE INDEX phpbb_poll_results_topic_id on phpbb_poll_results (topic_id); +CREATE INDEX phpbb_poll_options_poll_option_id on phpbb_poll_options (poll_option_id); +CREATE INDEX phpbb_poll_options_topic_id on phpbb_poll_options (topic_id); -# Table: phpbb_poll_voters -CREATE TABLE phpbb_poll_voters ( +# Table: phpbb_poll_votes +CREATE TABLE phpbb_poll_votes ( topic_id mediumint(8) NOT NULL DEFAULT '0', poll_option_id tinyint(4) NOT NULL DEFAULT '0', vote_user_id mediumint(8) NOT NULL DEFAULT '0', vote_user_ip varchar(40) NOT NULL ); -CREATE INDEX phpbb_poll_voters_topic_id on phpbb_poll_voters (topic_id); -CREATE INDEX phpbb_poll_voters_vote_user_id on phpbb_poll_voters (vote_user_id); -CREATE INDEX phpbb_poll_voters_vote_user_ip on phpbb_poll_voters (vote_user_ip); +CREATE INDEX phpbb_poll_votes_topic_id on phpbb_poll_votes (topic_id); +CREATE INDEX phpbb_poll_votes_vote_user_id on phpbb_poll_votes (vote_user_id); +CREATE INDEX phpbb_poll_votes_vote_user_ip on phpbb_poll_votes (vote_user_ip); # Table: phpbb_posts @@ -886,8 +886,8 @@ CREATE INDEX phpbb_topics_forum_topic_type on phpbb_topics (forum_id, topic_type CREATE INDEX phpbb_topics_topic_last_post_time on phpbb_topics (topic_last_post_time); -# Table: phpbb_topics_marking -CREATE TABLE phpbb_topics_marking ( +# Table: phpbb_topics_track +CREATE TABLE phpbb_topics_track ( user_id mediumint(8) NOT NULL DEFAULT '0', topic_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0', |