aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-05-21 19:10:04 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-05-21 19:10:04 +0000
commit394b2d160a33d8545592cc3ec776a39f5876051b (patch)
tree60a5f57a0e62a03430b6f48c144c61bc57bd53d8
parentdb4f5c970b9f2fb8664a151bc14d387c2c95ef5c (diff)
downloadforums-394b2d160a33d8545592cc3ec776a39f5876051b.tar
forums-394b2d160a33d8545592cc3ec776a39f5876051b.tar.gz
forums-394b2d160a33d8545592cc3ec776a39f5876051b.tar.bz2
forums-394b2d160a33d8545592cc3ec776a39f5876051b.tar.xz
forums-394b2d160a33d8545592cc3ec776a39f5876051b.zip
Added max_quote_depth limiter to prevent users from nesting a hell lot of quotes
git-svn-id: file:///svn/phpbb/trunk@4041 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/adm/admin_board.php4
-rw-r--r--phpBB/install/schemas/mysql_basic.sql1
-rw-r--r--phpBB/language/en/lang_admin.php2
3 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php
index 4e65f4188c..d152b43ffc 100644
--- a/phpBB/adm/admin_board.php
+++ b/phpBB/adm/admin_board.php
@@ -270,6 +270,10 @@ switch ($mode)
<td class="row2"><input type="text" size="4" maxlength="4" name="max_post_smilies" value="<?php echo $new['max_post_smilies']; ?>" /></td>
</tr>
<tr>
+ <td class="row1"><?php echo $user->lang['QUOTE_DEPTH_LIMIT']; ?>: <br /><span class="gensmall"><?php echo $user->lang['QUOTE_DEPTH_LIMIT_EXPLAIN']; ?></span</td>
+ <td class="row2"><input type="text" size="4" maxlength="4" name="max_quote_depth" value="<?php echo $new['max_quote_depth']; ?>" /></td>
+ </tr>
+ <tr>
<td class="row1"><?php echo $user->lang['ALLOW_TOPIC_NOTIFY']; ?>: </td>
<td class="row2"><input type="radio" name="allow_topic_notify" value="1" <?php echo $topic_notify_yes; ?> /> <?php echo $user->lang['YES']; ?>&nbsp;&nbsp;<input type="radio" name="allow_topic_notify" value="0" <?php echo $topic_notify_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr>
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index d898617052..2a84135832 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -64,6 +64,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '2.1.1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_smilies', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_quote_depth', '10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255');
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');
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 1099dad145..ea887ccee3 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -590,6 +590,8 @@ $lang = array_merge($lang, array(
'CHAR_LIMIT_EXPLAIN' => 'Set to 0 for unlimited characters.',
'SMILIES_LIMIT' => 'Max smilies per post',
'SMILIES_LIMIT_EXPLAIN' => 'Set to 0 for unlimited smilies.',
+ 'QUOTE_DEPTH_LIMIT' => 'Max nested quotes in posts',
+ 'QUOTE_DEPTH_LIMIT_EXPLAIN' => 'Set to 0 for unlimited depth.',
'ALLOW_TOPIC_NOTIFY' => 'Allow Topic Watching',
'ALLOW_FORUM_NOTIFY' => 'Allow Forum Watching',
'ALLOW_NAME_CHANGE' => 'Allow Username changes',