From d908d932736775b0274564dbc6206babf64ba1be Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 12 Jul 2012 16:02:58 -0400 Subject: [ticket/10444] Do not default to the previous post edit reason. PHPBB3-10444 --- phpBB/posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 7f57f693af..558520dbaa 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1376,7 +1376,7 @@ $template->assign_vars(array( 'POST_DATE' => ($post_data['post_time']) ? $user->format_date($post_data['post_time']) : '', 'ERROR' => (sizeof($error)) ? implode('
', $error) : '', 'TOPIC_TIME_LIMIT' => (int) $post_data['topic_time_limit'], - 'EDIT_REASON' => $post_data['post_edit_reason'], + 'EDIT_REASON' => $request->variable('edit_reason', ''), 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"), 'U_VIEW_TOPIC' => ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id") : '', 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&mode=popup"), -- cgit v1.2.1 From 6613884a60cdf399cd8a3a908bc44247c646bb1b Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 20 Aug 2012 11:37:27 -0400 Subject: [feature/add_events] Added core.posting_refresh event PHPBB3-9550 --- phpBB/posting.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index a17578e343..77b3c8c861 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -39,6 +39,19 @@ $delete = (isset($_POST['delete'])) ? true : false; $cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false; $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load || $preview) ? true : false; + +/** +* This event allows you to alter the $refresh boolean variable. +* +* If $refresh is true the posting form retains previously submitted form data +* +* @event core.posting_refresh +* @var bool refresh Whether or not to retain previously submitted data +* @since 3.1-A1 +*/ +$vars = array('refresh'); +extract($phpbb_dispatcher->trigger_event('core.posting_refresh', compact($vars))); + $mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', ''); $error = $post_data = array(); -- cgit v1.2.1 From a02bfcc83a3c9a107bc2b840d07409a93628bbdc Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 21 Aug 2012 11:50:38 -0400 Subject: [feature/add_events] core.posting_refresh -> core.modify_posting_paramters The event now lets extensions modify the posting paramters, not just refresh PHPBB3-9550 --- phpBB/posting.php | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 77b3c8c861..33f0bae353 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -39,23 +39,36 @@ $delete = (isset($_POST['delete'])) ? true : false; $cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false; $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load || $preview) ? true : false; +$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', ''); + +$error = $post_data = array(); +$current_time = time(); /** -* This event allows you to alter the $refresh boolean variable. +* This event allows you to alter the above parameters, such as submit and mode * -* If $refresh is true the posting form retains previously submitted form data +* Note: $refresh must be true to retain previously submitted form data. * -* @event core.posting_refresh +* @event core.modify_posting_parameters +* @var bool submit Whether or not the form has been submitted +* @var bool preview Whether or not the post is being previewed +* @var bool save Whether or not a draft is being saved +* @var bool load Whether or not a draft is being loaded +* @var bool delete Whether or not the post is being deleted +* @var bool cancel Whether or not to cancel the form (returns to +* viewtopic or viewforum depending on if the user +* is posting a new topic or editing a post) * @var bool refresh Whether or not to retain previously submitted data +* @var string mode What action to take if the form has been sumitted +* post|reply|quote|edit|delete|bump|smilies|popup +* @var array error Any error strings; a non-empty array aborts +* form submission. +* NOTE: Should be actual language strings, NOT +* language keys. * @since 3.1-A1 */ -$vars = array('refresh'); -extract($phpbb_dispatcher->trigger_event('core.posting_refresh', compact($vars))); - -$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', ''); - -$error = $post_data = array(); -$current_time = time(); +$vars = array('submit', 'preview', 'save', 'load', 'delete', 'cancel', 'refresh', 'mode', 'error'); +extract($phpbb_dispatcher->trigger_event('core.modify_posting_parameters', compact($vars))); // Was cancel pressed? If so then redirect to the appropriate page if ($cancel || ($current_time - $lastclick < 2 && $submit)) -- cgit v1.2.1 From 7ee3eb16ac1a4f11003c72b77352ad7fda53050d Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 23 Aug 2012 12:49:09 -0400 Subject: [feature/add_events] Add more parameters to core.modify_posting_parameters PHPBB3-9550 --- phpBB/posting.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 33f0bae353..f37d6128de 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -50,6 +50,11 @@ $current_time = time(); * Note: $refresh must be true to retain previously submitted form data. * * @event core.modify_posting_parameters +* @var int post_id ID of the post +* @var int topic_id ID of the topic +* @var int forum_id ID of the forum +* @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 preview Whether or not the post is being previewed * @var bool save Whether or not a draft is being saved @@ -67,7 +72,7 @@ $current_time = time(); * language keys. * @since 3.1-A1 */ -$vars = array('submit', 'preview', 'save', 'load', 'delete', 'cancel', 'refresh', 'mode', 'error'); +$vars = array('post_id', 'topic_id', 'forum_id', 'draft_id', 'lastclick', 'submit', 'preview', 'save', 'load', 'delete', 'cancel', 'refresh', 'mode', 'error'); extract($phpbb_dispatcher->trigger_event('core.modify_posting_parameters', compact($vars))); // Was cancel pressed? If so then redirect to the appropriate page -- cgit v1.2.1 From ca62b1ffb0c1f37877fbb59beef7cd38c012b827 Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 25 Aug 2012 21:41:04 -0400 Subject: [feature/add_events] Added note in modify_posting_parameters The template assignment methods do not work until $user->setup() has been run. This event is called before it, so extensions requiring template methods must put such calls in a later event. PHPBB3-9550 --- phpBB/posting.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index f37d6128de..ff959bb4b7 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -49,6 +49,10 @@ $current_time = time(); * * Note: $refresh must be true to retain previously submitted form data. * +* Note: The template class will not work properly until $user->setup() is +* called, and it has not been called yet. Extensions requiring template +* assignments should use an event that comes later in this file. +* * @event core.modify_posting_parameters * @var int post_id ID of the post * @var int topic_id ID of the topic -- cgit v1.2.1 From 02644c02b9d6bed5e4a8e20323bdafb2ca9749b4 Mon Sep 17 00:00:00 2001 From: David King Date: Sun, 26 Aug 2012 15:09:50 -0400 Subject: [feature/add_events] Added core.posting_modify_template_vars Can be used to set template variables and such, as the template assignment methods are not available to the modify_posting_paramters event. PHPBB3-9550 --- phpBB/posting.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index ff959bb4b7..81ef31f96c 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1452,6 +1452,14 @@ $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); +/** +* This event allows you to modify template variables for the posting screen +* +* @event core.posting_modify_template_vars +* @since 3.1-A1 +*/ +$phpbb_dispatcher->trigger_event('core.posting_modify_template_vars'); + // Build custom bbcodes array display_custom_bbcodes(); -- cgit v1.2.1