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

Merge pull request #2145 from Elsensee/ticket/10590

Browse source 
[ticket/10590] Remove confirmation page after posting
This commit is contained in:
Dhruv Goel 2014-03-20 01:50:17 +05:30
commit 03f6ad544f
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/posting.php
View file

@ -1213,18 +1213,12 @@ if ($submit || $preview || $refresh)
meta_refresh(10, $redirect_url); meta_refresh(10, $redirect_url);
$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD']; $message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
$message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']); $message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']);
}
else
{
meta_refresh(3, $redirect_url);
$message = ($mode == 'edit') ? 'POST_EDITED' : 'POST_STORED';
$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $redirect_url . '">', '</a>');
}
$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>'); $message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $data['forum_id']) . '">', '</a>');
trigger_error($message); trigger_error($message);
} }
redirect($redirect_url);
}
} }
} }

20
tests/test_framework/phpbb_functional_test_case.php
View file

@ -893,9 +893,9 @@ class phpbb_functional_test_case extends phpbb_test_case
* @param string $message * @param string $message
* @param array $additional_form_data Any additional form data to be sent in the request * @param array $additional_form_data Any additional form data to be sent in the request
* @param string $expected Lang var of expected message after posting * @param string $expected Lang var of expected message after posting
* @return array|null post_id, topic_id if message is 'POST_STORED' * @return array|null post_id, topic_id if message is empty
*/ */
public function create_topic($forum_id, $subject, $message, $additional_form_data = array(), $expected = 'POST_STORED') public function create_topic($forum_id, $subject, $message, $additional_form_data = array(), $expected = '')
{ {
$posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}"; $posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}";
@ -919,9 +919,9 @@ class phpbb_functional_test_case extends phpbb_test_case
* @param string $message * @param string $message
* @param array $additional_form_data Any additional form data to be sent in the request * @param array $additional_form_data Any additional form data to be sent in the request
* @param string $expected Lang var of expected message after posting * @param string $expected Lang var of expected message after posting
* @return array|null post_id, topic_id if message is 'POST_STORED' * @return array|null post_id, topic_id if message is empty
*/ */
public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = 'POST_STORED') public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = '')
{ {
$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}"; $posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}";
@ -941,9 +941,9 @@ class phpbb_functional_test_case extends phpbb_test_case
* @param string $posting_contains * @param string $posting_contains
* @param array $form_data * @param array $form_data
* @param string $expected Lang var of expected message after posting * @param string $expected Lang var of expected message after posting
* @return array|null post_id, topic_id if message is 'POST_STORED' * @return array|null post_id, topic_id if message is empty
*/ */
protected function submit_post($posting_url, $posting_contains, $form_data, $expected = 'POST_STORED') protected function submit_post($posting_url, $posting_contains, $form_data, $expected = '')
{ {
$this->add_lang('posting'); $this->add_lang('posting');
@ -989,13 +989,13 @@ class phpbb_functional_test_case extends phpbb_test_case
// 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.
$crawler = self::request('POST', $posting_url, $form_data); $crawler = self::request('POST', $posting_url, $form_data);
$this->assertContainsLang($expected, $crawler->filter('html')->text());
if ($expected !== 'POST_STORED') if ($expected !== '')
{ {
return; $this->assertContainsLang($expected, $crawler->filter('html')->text());
return null;
} }
$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri(); $url = $crawler->selectLink($form_data['subject'])->link()->getUri();
return array( return array(
'topic_id' => $this->get_parameter_from_link($url, 't'), 'topic_id' => $this->get_parameter_from_link($url, 't'),