aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-06-20 20:56:02 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-06-20 20:56:02 +0000
commit4dd500a575ac76ee324714cd7e5a7ec88c44f01d (patch)
tree96f250712f2eda5729a381a8acb6f2f5ecc1d954 /phpBB
parent29ba71e5aa641129671d8e2c8b6e92a018ae21cd (diff)
downloadforums-4dd500a575ac76ee324714cd7e5a7ec88c44f01d.tar
forums-4dd500a575ac76ee324714cd7e5a7ec88c44f01d.tar.gz
forums-4dd500a575ac76ee324714cd7e5a7ec88c44f01d.tar.bz2
forums-4dd500a575ac76ee324714cd7e5a7ec88c44f01d.tar.xz
forums-4dd500a575ac76ee324714cd7e5a7ec88c44f01d.zip
Various minorish updates
git-svn-id: file:///svn/phpbb/trunk@518 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/db/mysql_basic.sql4
-rw-r--r--phpBB/db/mysql_schema.sql46
-rw-r--r--phpBB/db/postgres_schema.sql22
3 files changed, 31 insertions, 41 deletions
diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql
index 41f20e790c..ad1cd0d004 100644
--- a/phpBB/db/mysql_basic.sql
+++ b/phpBB/db/mysql_basic.sql
@@ -10,7 +10,7 @@ INSERT INTO phpbb_config (config_id, sitename, allow_html, allow_bbcode, allow_s
INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 1);
# -- Forums
-INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_votecreate, auth_vote) VALUES (1, 'Test Forum 1', 'This is just a test forum, nothing special here.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_votecreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum, nothing special here.', 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 3, 3, 3, 3);
# -- Users (admin is set as that, an admin ... password is null, change it once online!)
INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_autologin_key, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_theme, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active, user_template) VALUES ( '-1', 'Anonymous', '0', '972086460', '', '', '', '', '', '', '', '', '', '0', '0', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '0', '0', '');
@@ -32,7 +32,7 @@ INSERT INTO phpbb_user_group (group_id, user_id) VALUES (1, -1);
INSERT INTO phpbb_user_group (group_id, user_id) VALUES (2, 2);
# -- User Access (admin is set as ... an admin)
-INSERT INTO phpbb_auth_access (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_votecreate, auth_vote, auth_mod, auth_admin) VALUES (2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1);
+INSERT INTO phpbb_auth_access (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_votecreate, auth_vote, auth_mod) VALUES (2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
# -- Demo Topic
INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_notify, topic_last_post_id) VALUES (1, 'Demo Topic', 2, NOW(), 0, 0, 1, 0, 0, 0, 1);
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index a3c3addef8..b69129702a 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -23,8 +23,7 @@ CREATE TABLE phpbb_auth_access (
auth_votecreate tinyint(1) DEFAULT '0' NOT NULL,
auth_attachments tinyint(1) DEFAULT '0' NOT NULL,
auth_vote tinyint(1) DEFAULT '0' NOT NULL,
- auth_mod tinyint(1) DEFAULT '0' NOT NULL,
- auth_admin tinyint(1) DEFAULT '0' NOT NULL
+ auth_mod tinyint(1) DEFAULT '0' NOT NULL
);
#
@@ -34,7 +33,8 @@ CREATE TABLE phpbb_auth_access (
DROP TABLE IF EXISTS phpbb_user_group;
CREATE TABLE phpbb_user_group (
group_id int(11) DEFAULT '0' NOT NULL,
- user_id int(11) DEFAULT '0' NOT NULL
+ user_id int(11) DEFAULT '0' NOT NULL,
+ user_pending tinyint(1)
);
#
@@ -88,7 +88,8 @@ DROP TABLE IF EXISTS phpbb_config;
CREATE TABLE phpbb_config (
config_id int(10) NOT NULL auto_increment,
- selected int(2) DEFAULT '0' NOT NULL,
+ selected int(2) DEFAULT '0' NOT NULL,
+ board_disable tinyint(1) DEFAULT '0' NOT NULL,
sitename varchar(100),
allow_html tinyint(1),
allow_bbcode tinyint(1),
@@ -115,7 +116,7 @@ CREATE TABLE phpbb_config (
system_timezone int(11) DEFAULT '0' NOT NULL,
sys_template varchar(100) DEFAULT 'Default' NOT NULL,
prune_enable tinyint(1) DEFAULT '1' NOT NULL,
- PRIMARY KEY (config_id),
+ PRIMARY KEY (config_id),
UNIQUE selected (selected)
);
@@ -135,19 +136,6 @@ CREATE TABLE phpbb_disallow (
# --------------------------------------------------------
#
-# Table structure for table 'phpbb_forum_access'
-#
-DROP TABLE IF EXISTS phpbb_forum_access;
-
-CREATE TABLE phpbb_forum_access (
- forum_id int(10) DEFAULT '0' NOT NULL,
- user_id int(10) DEFAULT '0' NOT NULL,
- can_post tinyint(1) DEFAULT '0' NOT NULL,
- PRIMARY KEY (forum_id, user_id)
-);
-
-# --------------------------------------------------------
-#
# Table structure for table 'phpbb_forum_prune'
#
DROP TABLE IF EXISTS phpbb_forum_prune;
@@ -177,6 +165,8 @@ CREATE TABLE phpbb_forums (
forum_posts int(11) DEFAULT '0' NOT NULL,
forum_topics tinyint(4) DEFAULT '0' NOT NULL,
forum_last_post_id int(11) DEFAULT '0' NOT NULL,
+ prune_next int(11),
+ prune_enable tinyint(1) DEFAULT '1' NOT NULL,
auth_view tinyint(4) DEFAULT '0' NOT NULL,
auth_read tinyint(4) DEFAULT '0' NOT NULL,
auth_post tinyint(4) DEFAULT '0' NOT NULL,
@@ -188,9 +178,7 @@ CREATE TABLE phpbb_forums (
auth_votecreate tinyint(4) DEFAULT '0' NOT NULL,
auth_vote tinyint(4) DEFAULT '0' NOT NULL,
auth_attachments tinyint(4) DEFAULT '0' NOT NULL,
- prune_next int(11),
- prune_enable tinyint(1) DEFAULT '1' NOT NULL,
- PRIMARY KEY (forum_id),
+ PRIMARY KEY (forum_id),
KEY forum_id (forum_id),
KEY forums_order (forum_order),
KEY cat_id (cat_id)
@@ -311,21 +299,6 @@ CREATE TABLE phpbb_session (
# --------------------------------------------------------
#
-# Table structure for table 'phpbb_session_keys'
-#
-DROP TABLE IF EXISTS phpbb_session_keys;
-
-CREATE TABLE phpbb_session_keys (
- key_user_id int(11) DEFAULT '0' NOT NULL,
- key_ip char(8) NOT NULL,
- key_login varchar(32) NOT NULL,
- PRIMARY KEY (key_user_id),
- KEY key_ip (key_ip)
-);
-
-
-# --------------------------------------------------------
-#
# Table structure for table 'phpbb_smilies'
#
DROP TABLE IF EXISTS phpbb_smilies;
@@ -464,6 +437,7 @@ CREATE TABLE phpbb_users (
user_allowhtml tinyint(1),
user_allowbbcode tinyint(1),
user_allowsmile tinyint(1),
+ user_allowavatar tinyint(1) DEFAULT '1' NOT NULL,
user_allow_pm tinyint(1) DEFAULT '1' NOT NULL,
user_notify_pm tinyint(1) DEFAULT '1' NOT NULL,
user_regdate int(11) DEFAULT '0' NOT NULL,
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index a25d7cb9ed..b433a191da 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -84,6 +84,8 @@ CREATE TABLE phpbb_categories (
-------------------------------------------------------- */
CREATE TABLE phpbb_config (
config_id int2 NOT NULL,
+ selected int2 NOT NULL,
+ disable_board int2 DEFAULT '0' NOT NULL,
sitename varchar(100) NOT NULL,
allow_html int2 NOT NULL,
allow_bbcode int2 NOT NULL,
@@ -110,8 +112,7 @@ CREATE TABLE phpbb_config (
avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
override_themes int2 NOT NULL,
flood_interval int NOT NULL,
- selected int2 NOT NULL,
- disable_board int2 DEFAULT '0' NOT NULL,
+ prune_enable int2 DEFAULT '1' NOT NULL,
CONSTRAINT phpbb_config_pkey PRIMARY KEY (config_id)
);
@@ -157,6 +158,20 @@ CREATE INDEX forums_order_phpbb_forums_index ON phpbb_forums (forum_order);
/* --------------------------------------------------------
+ Table structure for table phpbb_forum_prune
+-------------------------------------------------------- */
+CREATE TABLE phpbb_forum_prune (
+ prune_id int4 NOT NULL auto_increment,
+ forum_id int4 NOT NULL,
+ prune_days int4 NOT NULL,
+ prune_freq int4 NOT NULL,
+ CONSTRAINT phpbb_forum_prune_pkey PRIMARY KEY (prune_id)
+);
+CREATE INDEX prune_id_phpbb_forum_prune_index ON phpbb_forum_prune (cat_id);
+CREATE INDEX forum_id_phpbb_forum_prune_index ON phpbb_forum_prune (forum_id);
+
+
+/* --------------------------------------------------------
Table structure for table phpbb_groups
-------------------------------------------------------- */
CREATE TABLE phpbb_groups (
@@ -373,7 +388,8 @@ CREATE INDEX forum_id_phpbb_topics_index ON phpbb_topics (forum_id);
-------------------------------------------------------- */
CREATE TABLE phpbb_user_group (
group_id int DEFAULT '0' NOT NULL,
- user_id int DEFAULT '0' NOT NULL
+ user_id int DEFAULT '0' NOT NULL,
+ user_pending int2
);
CREATE INDEX group_id_phpbb_user_group_index ON phpbb_user_group (group_id);
CREATE INDEX user_id_phpbb_user_group_index ON phpbb_user_group (user_id);