aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-03-09 13:37:35 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-03-09 13:37:35 +0000
commitaa718d4a027259997f7a5732d8a0fdd328315bd7 (patch)
tree338e57fbf30ac6bda56972279b79b5a0bd8d422d
parent2c9ff9686ca1ec0a949e17ac3c2f73358f1f5000 (diff)
downloadforums-aa718d4a027259997f7a5732d8a0fdd328315bd7.tar
forums-aa718d4a027259997f7a5732d8a0fdd328315bd7.tar.gz
forums-aa718d4a027259997f7a5732d8a0fdd328315bd7.tar.bz2
forums-aa718d4a027259997f7a5732d8a0fdd328315bd7.tar.xz
forums-aa718d4a027259997f7a5732d8a0fdd328315bd7.zip
Minor schema adjustments, additional/altered config and acl options, added u_ options to basic (initial) group auth setup
git-svn-id: file:///svn/phpbb/trunk@3621 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/install/schemas/mysql_basic.sql19
-rw-r--r--phpBB/install/schemas/mysql_schema.sql15
2 files changed, 18 insertions, 16 deletions
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index 5fcd0226b1..45077a51be 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -63,6 +63,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','youraddress@yourdomain.com');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host','');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port','25');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password','');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0');
@@ -178,6 +179,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('u_chgcolor', 1);
INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('u_chgemail', 1);
INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('u_chgname', 1);
INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('u_chgpasswd', 1);
+INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('u_search', 1);
# -- phpbb_styles
@@ -239,14 +241,23 @@ INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_de
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('f_list', 'f_read', 'f_post', 'f_reply', 'f_quote', 'f_bbcode', 'f_search', 'f_print');
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('f_list', 'f_read', 'f_post', 'f_reply', 'f_quote', 'f_bbcode', 'f_search', 'f_print');
-INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('f_', 'f_list', 'f_read', 'f_post', 'f_reply', 'f_quote', 'f_edit', 'f_delete', 'f_vote', 'f_download', 'f_bbcode', 'f_smilies', 'f_sigs', 'f_search', 'f_email', 'f_print');
-INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 1, auth_option_id, 2 FROM phpbb_auth_options WHERE auth_value IN ('f_img', 'f_flash', 'f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html', 'f_rate');
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('f_', 'f_list', 'f_read', 'f_post', 'f_reply', 'f_quote', 'f_edit', 'f_delete', 'f_vote', 'f_download', 'f_bbcode', 'f_smilies', 'f_img', 'f_flash', 'f_sigs', 'f_search', 'f_email', 'f_print', 'f_postcount');
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 1, auth_option_id, 2 FROM phpbb_auth_options WHERE auth_value IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html', 'f_rate');
-INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('f_', 'f_list', 'f_read', 'f_post', 'f_reply', 'f_quote', 'f_edit', 'f_delete', 'f_vote', 'f_download', 'f_bbcode', 'f_smilies', 'f_img', 'f_flash', 'f_sigs', 'f_search', 'f_email', 'f_print');
-INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 2, auth_option_id, 2 FROM phpbb_auth_options WHERE auth_value IN ('f_img', 'f_flash', 'f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html', 'f_rate');
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('f_', 'f_list', 'f_read', 'f_post', 'f_reply', 'f_quote', 'f_edit', 'f_delete', 'f_vote', 'f_download', 'f_bbcode', 'f_smilies', 'f_img', 'f_flash', 'f_sigs', 'f_search', 'f_email', 'f_print', 'f_postcount');
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 2, auth_option_id, 2 FROM phpbb_auth_options WHERE auth_value IN ('f_poll', 'f_announce', 'f_sticky', 'f_attach', 'f_html', 'f_rate');
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 5, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value LIKE 'a_%';
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 1, 0, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_value IN ('u_%');
+
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 2, 0, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_value IN ('u_%');
+
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('u_', 'u_sendemail', 'u_readpm', 'u_sendpm', 'u_viewprofile', 'u_chgavatar', 'u_chgemail', 'u_chgpasswd', 'u_search');
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 3, 2, auth_option_id, 2 FROM phpbb_auth_options WHERE auth_value IN ('u_viewonline', 'u_chgcolor', 'u_chgname');
+
+INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_allow_deny) SELECT 5, 0, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_value IN ('u_%');
+
# -- Moderator cache
INSERT INTO phpbb_moderator_cache (user_id, forum_id, username) VALUES (2, 2, 'Admin');
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index d997a84b00..50c57d4602 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -371,6 +371,8 @@ CREATE TABLE phpbb_privmsgs (
privmsgs_enable_html tinyint(1) DEFAULT '0' NOT NULL,
privmsgs_enable_smilies tinyint(1) DEFAULT '1' NOT NULL,
privmsgs_attach_sig tinyint(1) DEFAULT '1' NOT NULL,
+ privmsgs_text text,
+ privmsgs_bbcode_uid varchar(10) DEFAULT '0' NOT NULL,
PRIMARY KEY (privmsgs_id),
KEY privmsgs_from_userid (privmsgs_from_userid),
KEY privmsgs_to_userid (privmsgs_to_userid)
@@ -379,18 +381,6 @@ CREATE TABLE phpbb_privmsgs (
# --------------------------------------------------------
#
-# Table structure for table 'phpbb_privmsgs_text'
-#
-CREATE TABLE phpbb_privmsgs_text (
- privmsgs_text_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- privmsgs_bbcode_uid varchar(10) DEFAULT '0' NOT NULL,
- privmsgs_text text,
- PRIMARY KEY (privmsgs_text_id)
-);
-
-
-# --------------------------------------------------------
-#
# Table structure for table 'phpbb_ranks'
#
CREATE TABLE phpbb_ranks (
@@ -496,6 +486,7 @@ CREATE TABLE phpbb_sessions (
session_ip varchar(40) DEFAULT '0' NOT NULL,
session_browser varchar(100) DEFAULT '' NULL,
session_page varchar(100) DEFAULT '0' NOT NULL,
+ session_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL,
PRIMARY KEY (session_id),
KEY session_time (session_time)
);