aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-03-22 15:55:45 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-03-22 15:55:45 +0000
commitb9c998495571897ac4c01acea2fa2221314928d7 (patch)
treec629b3d8ffc9b6a5bc90741b3d8350f3bdade8b5
parent8357b81a1ec2d0fb6d383966e7883ed9bc8c0d63 (diff)
downloadforums-b9c998495571897ac4c01acea2fa2221314928d7.tar
forums-b9c998495571897ac4c01acea2fa2221314928d7.tar.gz
forums-b9c998495571897ac4c01acea2fa2221314928d7.tar.bz2
forums-b9c998495571897ac4c01acea2fa2221314928d7.tar.xz
forums-b9c998495571897ac4c01acea2fa2221314928d7.zip
erm... aspx is forbidden too, reactivate transaction.
git-svn-id: file:///svn/phpbb/trunk@3698 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions_posting.php2
-rw-r--r--phpBB/install/schemas/firebird_basic.sql51
-rw-r--r--phpBB/install/schemas/mysql_basic.sql1
3 files changed, 52 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index da4e939b50..12c85a1e16 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -891,7 +891,7 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
$mark_mode = ($mode == 'reply' || $mode == 'quote') ? 'post' : 'topic';
markread($mark_mode, $post_data['forum_id'], $post_data['topic_id'], $post_data['post_id']);
-// $db->sql_transaction('commit');
+ $db->sql_transaction('commit');
// Send Notifications
if (($mode != 'edit') && ($mode != 'delete'))
diff --git a/phpBB/install/schemas/firebird_basic.sql b/phpBB/install/schemas/firebird_basic.sql
index 82025c8a2b..377e72af19 100644
--- a/phpBB/install/schemas/firebird_basic.sql
+++ b/phpBB/install/schemas/firebird_basic.sql
@@ -358,4 +358,53 @@ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1
# -- reasons
INSERT INTO phpbb_reports_reasons (reason_id, reason_priority, reason_name, reason_description) VALUES ( 1, 0, 'warez', 'The reported post contains links to pirated or illegal software.' );
-INSERT INTO phpbb_reports_reasons (reason_id, reason_priority, reason_name, reason_description) VALUES ( 2, 1, 'other', 'The reported post does not fit into any other category, please use the description field.' ); \ No newline at end of file
+INSERT INTO phpbb_reports_reasons (reason_id, reason_priority, reason_name, reason_description) VALUES ( 2, 1, 'other', 'The reported post does not fit into any other category, please use the description field.' );
+
+# -- forbidden_extensions
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (1,'php');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (2,'php3');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (3,'php4');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (4,'phtml');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (5,'pl');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (6,'asp');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (7,'cgi');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (7,'aspx');
+
+# -- extension_groups
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (1,'Images',1,1,1,0);
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (2,'Archives',0,1,1,0);
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (3,'Plain Text',0,0,1,0);
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (4,'Documents',0,0,1,0);
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (5,'Real Media',0,0,2,0);
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (6,'Streams',2,0,1,0);
+INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (7,'Flash Files',3,0,1,0);
+
+# -- extensions
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (1, 1,'gif', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (2, 1,'png', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (3, 1,'jpeg', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (4, 1,'jpg', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (5, 1,'tif', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (6, 1,'tga', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (7, 2,'gtar', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (8, 2,'gz', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (9, 2,'tar', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (10, 2,'zip', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (11, 2,'rar', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (12, 2,'ace', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (13, 3,'txt', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (14, 3,'c', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (15, 3,'h', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (16, 3,'cpp', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (17, 3,'hpp', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (18, 3,'diz', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (19, 4,'xls', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (20, 4,'doc', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (21, 4,'dot', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (22, 4,'pdf', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (23, 4,'ai', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (24, 4,'ps', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (25, 4,'ppt', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (26, 5,'rm', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (27, 6,'wma', '');
+INSERT INTO phpbb_extensions (extension_id, group_id, extension, comment) VALUES (28, 7,'swf', '');
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index d36f91b022..be5af829f0 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -360,6 +360,7 @@ INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (4,'phtm
INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (5,'pl');
INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (6,'asp');
INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (7,'cgi');
+INSERT INTO phpbb_forbidden_extensions (extension_id, extension) VALUES (7,'aspx');
# -- extension_groups
INSERT INTO phpbb_extension_groups (group_id, group_name, cat_id, allow_group, download_mode, max_filesize) VALUES (1,'Images',1,1,1,0);