makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15733] Remove unused code related to deprecated flood control

Browse source 
PHPBB3-15733
This commit is contained in:
MikelAlejoBR 2018-07-28 14:29:37 +02:00
parent 04899d1efd
commit b2277e7bf6
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/posting.php
View file

@ -33,7 +33,6 @@ $post_id = $request->variable('p', 0);
$topic_id = $request->variable('t', 0); $topic_id = $request->variable('t', 0);
$forum_id = $request->variable('f', 0); $forum_id = $request->variable('f', 0);
$draft_id = $request->variable('d', 0); $draft_id = $request->variable('d', 0);
$lastclick = $request->variable('lastclick', 0);
$preview = (isset($_POST['preview'])) ? true : false; $preview = (isset($_POST['preview'])) ? true : false;
$save = (isset($_POST['save'])) ? true : false; $save = (isset($_POST['save'])) ? true : false;
@ -68,7 +67,6 @@ $current_time = time();
* @var int topic_id ID of the topic * @var int topic_id ID of the topic
* @var int forum_id ID of the forum * @var int forum_id ID of the forum
* @var int draft_id ID of the draft * @var int draft_id ID of the draft
* @var int lastclick Timestamp of when the form was last loaded
* @var bool submit Whether or not the form has been submitted * @var bool submit Whether or not the form has been submitted
* @var bool preview Whether or not the post is being previewed * @var bool preview Whether or not the post is being previewed
* @var bool save Whether or not a draft is being saved * @var bool save Whether or not a draft is being saved
@ -91,7 +89,6 @@ $vars = array(
'topic_id', 'topic_id',
'forum_id', 'forum_id',
'draft_id', 'draft_id',
'lastclick',
'submit', 'submit',
'preview', 'preview',
'save', 'save',
@ -354,7 +351,6 @@ switch ($mode)
* @var int topic_id ID of the topic * @var int topic_id ID of the topic
* @var int forum_id ID of the forum * @var int forum_id ID of the forum
* @var int draft_id ID of the draft * @var int draft_id ID of the draft
* @var int lastclick Timestamp of when the form was last loaded
* @var bool submit Whether or not the form has been submitted * @var bool submit Whether or not the form has been submitted
* @var bool preview Whether or not the post is being previewed * @var bool preview Whether or not the post is being previewed
* @var bool save Whether or not a draft is being saved * @var bool save Whether or not a draft is being saved
@ -376,7 +372,6 @@ $vars = array(
'topic_id', 'topic_id',
'forum_id', 'forum_id',
'draft_id', 'draft_id',
'lastclick',
'submit', 'submit',
'preview', 'preview',
'save', 'save',
@ -1762,7 +1757,6 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($c
} }
$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '" />' : ''; $s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '" />' : '';
$s_hidden_fields .= '<input type="hidden" name="lastclick" value="' . $current_time . '" />';
$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . $request->variable('draft_loaded', $draft_id) . '" />' : ''; $s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . $request->variable('draft_loaded', $draft_id) . '" />' : '';
if ($mode == 'edit') if ($mode == 'edit')

1
phpBB/viewtopic.php
View file

@ -2249,7 +2249,6 @@ if ($s_can_vote || $s_quick_reply)
$qr_hidden_fields = array( $qr_hidden_fields = array(
'topic_cur_post_id' => (int) $topic_data['topic_last_post_id'], 'topic_cur_post_id' => (int) $topic_data['topic_last_post_id'],
'lastclick' => (int) time(),
'topic_id' => (int) $topic_data['topic_id'], 'topic_id' => (int) $topic_data['topic_id'],
'forum_id' => (int) $forum_id, 'forum_id' => (int) $forum_id,
); );

4
tests/test_framework/phpbb_functional_test_case.php
View file

@ -1176,10 +1176,6 @@ class phpbb_functional_test_case extends phpbb_test_case
} }
} }
// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened)
// is not at least 2 seconds before submission, cancel the form
$form_data['lastclick'] = 0;
// I use a request because the form submission method does not allow you to send data that is not // I use a request because the form submission method does not allow you to send data that is not
// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs) // contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
// Instead, I send it as a request with the submit button "post" set to true. // Instead, I send it as a request with the submit button "post" set to true.