diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-06-21 10:30:56 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-06-21 10:30:56 +0200 |
| commit | 80180a6a20077aff293b3d3dd0ce8b0065c33f3b (patch) | |
| tree | dfce0506a9d1d88bd894112532e9c448eaac0d44 /phpBB/includes/ucp | |
| parent | 3e80268249983bef7455da89099bf4c1f7205008 (diff) | |
| parent | f1414386d7c22b7f3a9a978e902e67526bea029e (diff) | |
| download | forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar.gz forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar.bz2 forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.tar.xz forums-80180a6a20077aff293b3d3dd0ce8b0065c33f3b.zip | |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[ticket/10935] Limit number of PM rules per user to 5000
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 58c2d087c8..efa390ed87 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -328,10 +328,23 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit trigger_error('RULE_ALREADY_DEFINED'); } + // Prevent users from flooding the rules table + $sql = 'SELECT COUNT(rule_id) AS num_rules + FROM ' . PRIVMSGS_RULES_TABLE . ' + WHERE user_id = ' . (int) $user->data['user_id']; + $result = $db->sql_query($sql); + $num_rules = (int) $db->sql_fetchfield('num_rules'); + $db->sql_freeresult($result); + + if ($num_rules >= 5000) + { + trigger_error('RULE_LIMIT_REACHED'); + } + $sql = 'INSERT INTO ' . PRIVMSGS_RULES_TABLE . ' ' . $db->sql_build_array('INSERT', $rule_ary); $db->sql_query($sql); - // Update users message rules + // Set the user_message_rules bit $sql = 'UPDATE ' . USERS_TABLE . ' SET user_message_rules = 1 WHERE user_id = ' . $user->data['user_id']; @@ -378,7 +391,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - // Update users message rules + // Unset the user_message_rules bit if (!$row) { $sql = 'UPDATE ' . USERS_TABLE . ' |