aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-05-02 13:06:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-05-02 13:06:57 +0000
commit729c3abd02fc564fb99be53ba5fba450a073197f (patch)
tree625496783aefb4310826381bcb69aec6558858ad /phpBB/install
parent67d2ac36679f6c38fecaf157d2bc837daa237c41 (diff)
downloadforums-729c3abd02fc564fb99be53ba5fba450a073197f.tar
forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.gz
forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.bz2
forums-729c3abd02fc564fb99be53ba5fba450a073197f.tar.xz
forums-729c3abd02fc564fb99be53ba5fba450a073197f.zip
fix some issues with oop, fixing small bugs and prepare the next steps...
NOTE TO DEVS: have a look at adm/admin_board.php (new config layout) git-svn-id: file:///svn/phpbb/trunk@4883 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/schemas/mysql_schema.sql39
-rw-r--r--phpBB/install/schemas/schema_data.sql48
2 files changed, 48 insertions, 39 deletions
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 980d1263c2..175df87886 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -7,8 +7,9 @@
# Table: phpbb_attachments
CREATE TABLE phpbb_attachments (
attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
- post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ post_msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ in_message tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
physical_filename varchar(255) NOT NULL,
real_filename varchar(255) NOT NULL,
@@ -172,6 +173,7 @@ CREATE TABLE phpbb_extension_groups (
upload_icon varchar(100) DEFAULT '' NOT NULL,
max_filesize int(20) DEFAULT '0' NOT NULL,
allowed_forums text NOT NULL,
+ allow_in_pm tinyint(1) DEFAULT '0' NOT NULL,
PRIMARY KEY (group_id)
);
@@ -251,7 +253,8 @@ CREATE TABLE phpbb_groups (
group_rank smallint(5) DEFAULT '-1' NOT NULL,
group_colour varchar(6) DEFAULT '' NOT NULL,
group_sig_chars mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- group_pm_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ group_receive_pm tinyint(1) DEFAULT '0' NOT NULL,
+ group_message_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
group_chgpass smallint(6) DEFAULT '0' NOT NULL,
group_description varchar(255) DEFAULT '' NOT NULL,
group_legend tinyint(1) DEFAULT '1' NOT NULL,
@@ -387,25 +390,6 @@ CREATE TABLE phpbb_posts (
);
# Table: 'phpbb_privmsgs'
-CREATE TABLE phpbb_privmsgs (
- privmsgs_id mediumint(8) UNSIGNED NOT NULL auto_increment,
- privmsgs_attachment tinyint(1) DEFAULT '0' NOT NULL,
- privmsgs_type tinyint(4) DEFAULT '0' NOT NULL,
- privmsgs_subject varchar(60) DEFAULT '0' NOT NULL,
- privmsgs_from_userid mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- privmsgs_to_userid mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- privmsgs_date int(11) DEFAULT '0' NOT NULL,
- privmsgs_ip varchar(40) NOT NULL,
- privmsgs_enable_bbcode tinyint(1) DEFAULT '1' NOT NULL,
- 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)
-);
# Table: 'phpbb_profile_fields'
CREATE TABLE phpbb_profile_fields (
@@ -489,6 +473,7 @@ CREATE TABLE phpbb_reports (
report_id smallint(5) UNSIGNED NOT NULL auto_increment,
reason_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+ msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_notify tinyint(1) DEFAULT '0' NOT NULL,
report_time int(10) UNSIGNED DEFAULT '0' NOT NULL,
@@ -758,16 +743,6 @@ CREATE TABLE phpbb_topics_watch (
KEY notify_status (notify_status)
);
-# Table: 'phpbb_ucp_modules'
-CREATE TABLE phpbb_ucp_modules (
- module_id mediumint(8) DEFAULT '0' AUTO_INCREMENT NOT NULL,
- module_title varchar(50) NOT NULL,
- module_filename varchar(50) NOT NULL,
- module_order mediumint(4) DEFAULT '0' NOT NULL,
- KEY module_order (module_order),
- PRIMARY KEY (module_id)
-);
-
# Table: 'phpbb_user_group'
CREATE TABLE phpbb_user_group (
group_id mediumint(8) DEFAULT '0' NOT NULL,
@@ -810,6 +785,8 @@ CREATE TABLE phpbb_users (
user_new_privmsg tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
user_unread_privmsg tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
user_last_privmsg int(11) DEFAULT '0' NOT NULL,
+ user_message_rules tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+ user_full_folder int(11) DEFAULT '-3' NOT NULL,
user_emailtime int(11) DEFAULT '0' NOT NULL,
user_sortby_type varchar(1) DEFAULT '' NOT NULL,
user_sortby_dir varchar(1) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index ab10f9eacd..9a951e061f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -53,7 +53,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path','image
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path','images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path','images/ranks');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable','1');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg','1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
@@ -87,8 +87,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','25
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_chars','3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_search_chars','10');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes','4');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs','50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management');
@@ -145,6 +143,25 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height','
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail','0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize','12000');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_html_pm', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_smilies_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_download_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_karma_pm', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_report_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_quote_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('forward_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_mass_pm', '1');
+
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_users', '0', 1);
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_date', '0', 1);
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_user_id', '2', 1);
@@ -263,6 +280,20 @@ INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_savedrafts',
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_pm_attach', 1);
+INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_html', 1);
+INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_bbcode', 1);
+INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_smilies', 1);
+INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_download', 1);
+INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_sig', 1);
+INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_report', 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);
# MSSQL IDENTITY phpbb_styles ON #
@@ -377,12 +408,13 @@ INSERT INTO phpbb_bots (bot_id, bot_active, bot_name, user_id, bot_agent, bot_ip
# MSSQL IDENTITY phpbb_modules OFF #
# -- Modules
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('mcp', 'MAIN', 'main', 1, 1, 'front\r\nforum_view\r\ntopic_view\r\npost_details', '');
INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'MAIN', 'main', 1, 1, 'front\r\nsubscribed\r\ndrafts', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PROFILE', 'profile', 2, 1, 'profile_info\r\nreg_details\r\nsignature\r\navatar', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PREFS', 'prefs', 3, 1, 'personal\r\nview\r\npost', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'ZEBRA', 'zebra', 4, 1, 'friends\r\nfoes', '');
-INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'ATTACHMENTS', 'attachments', 5, 1, '', 'acl_u_attach && cfg_allow_attachments');
+INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PM', 'pm', 2, 1, 'view_messages\r\ncompose\r\nunread\r\ndrafts\r\noptions', 'cfg_allow_privmsg');
+INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PROFILE', 'profile', 3, 1, 'profile_info\r\nreg_details\r\nsignature\r\navatar', '');
+INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'PREFS', 'prefs', 4, 1, 'personal\r\nview\r\npost', '');
+INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'ZEBRA', 'zebra', 5, 1, 'friends\r\nfoes', '');
+INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('ucp', 'ATTACHMENTS', 'attachments', 6, 1, '', 'acl_u_attach && cfg_allow_attachments');
+INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('mcp', 'MAIN', 'main', 1, 1, 'front\r\nforum_view\r\ntopic_view\r\npost_details', '');
INSERT INTO phpbb_modules (module_type, module_title, module_filename, module_order, module_enabled, module_subs, module_acl) VALUES ('mcp', 'QUEUE', 'queue', 2, 1, 'unapproved_topics\r\nunapproved_posts', 'acl_m_approve');
# MSSQL IDENTITY phpbb_modules OFF #