7 files changed, 99 insertions, 11 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index cca655263f..d32b665039 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -288,6 +288,7 @@ services:
             - @template
             - @user
             - @controller.helper
+            - @dispatcher
 
     path_helper:
         class: phpbb\path_helper
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a502314ded..7700dcfd27 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5290,6 +5290,18 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
 		}
 	}
 
+	/**
+	* Execute code and/or modify output before displaying the template.
+	*
+	* @event core.page_footer_after
+	* @var	bool display_template	Whether or not to display the template
+	* @var	bool exit_handler		Whether or not to run the exit_handler()
+	*
+	* @since 3.1.0-RC5
+	*/
+	$vars = array('display_template', 'exit_handler');
+	extract($phpbb_dispatcher->trigger_event('core.page_footer_after', compact($vars)));
+
 	if ($display_template)
 	{
 		$template->display('body');
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index f275ed1dd1..25ca50e8f1 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -912,7 +912,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 		return;
 	}
 
-	global $template, $cache, $user;
+	global $template, $cache, $user, $phpbb_dispatcher;
 	global $extensions, $config, $phpbb_root_path, $phpEx;
 
 	//
@@ -1187,6 +1187,34 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
 			);
 		}
 
+		/**
+		* Use this event to modify the attachment template data.
+		*
+		* This event is triggered once per attachment.
+		*
+		* @event core.parse_attachments_modify_template_data
+		* @var array	attachment		Array with attachment data
+		* @var array	block_array		Template data of the attachment
+		* @var int		display_cat		Attachment category data
+		* @var string	download_link	Attachment download link
+		* @var array	extensions		Array with attachment extensions data
+		* @var mixed 	forum_id 		The forum id the attachments are displayed in (false if in private message)
+		* @var bool		preview			Flag indicating if we are in post preview mode
+		* @var array	update_count	Array with attachment ids to update download count
+		* @since 3.1.0-RC5
+		*/
+		$vars = array(
+			'attachment',
+			'block_array',
+			'display_cat',
+			'download_link',
+			'extensions',
+			'forum_id',
+			'preview',
+			'update_count',
+		);
+		extract($phpbb_dispatcher->trigger_event('core.parse_attachments_modify_template_data', compact($vars)));
+
 		$template->assign_block_vars('_file', $block_array);
 
 		$compiled_attachments[] = $template->assign_display('attachment_tpl');
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index bfd30a5be2..f9c00da3ec 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -745,11 +745,11 @@ class mcp_queue
 
 						if (!$post_data['topic_posts_approved'])
 						{
-							$phpbb_notifications->add_notifications('notification.type.approve_post', $post_data);
+							$phpbb_notifications->add_notifications('notification.type.approve_topic', $post_data);
 						}
 						else
 						{
-							$phpbb_notifications->add_notifications('notification.type.approve_topic', $post_data);
+							$phpbb_notifications->add_notifications('notification.type.approve_post', $post_data);
 						}
 					}
 				}
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php
index 8aba41d651..7a81c25ad2 100644
--- a/phpBB/phpbb/pagination.php
+++ b/phpBB/phpbb/pagination.php
@@ -21,18 +21,26 @@ class pagination
 	/** @var \phpbb\user */
 	protected $user;
 
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\event\dispatcher_interface */
+	protected $phpbb_dispatcher;
+
 	/**
 	* Constructor
 	*
-	* @param	\phpbb\template\template	$template
-	* @param	\phpbb\user					$user
-	* @param	\phpbb\controller\helper	$helper
+	* @param	\phpbb\template\template			$template
+	* @param	\phpbb\user							$user
+	* @param	\phpbb\controller\helper			$helper
+	* @param	\phpbb\event\dispatcher_interface	$phpbb_dispatcher
 	*/
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\event\dispatcher_interface $phpbb_dispatcher)
 	{
 		$this->template = $template;
 		$this->user = $user;
 		$this->helper = $helper;
+		$this->phpbb_dispatcher = $phpbb_dispatcher;
 	}
 
 	/**
@@ -50,6 +58,36 @@ class pagination
 	*/
 	protected function generate_page_link($base_url, $on_page, $start_name, $per_page)
 	{
+		// A listener can set this variable to the new pagination URL
+		// to override the generate_page_link() function generated value
+		$generate_page_link_override = false;
+
+		/**
+		* Execute code and/or override generate_page_link()
+		*
+		* To override the generate_page_link() function generated value
+		* set $generate_page_link_override to the new URL value
+		*
+		* @event core.pagination_generate_page_link
+		* @var string base_url is url prepended to all links generated within the function
+		*							If you use page numbers inside your controller route, base_url should contains a placeholder (%d)
+		*							for the page. Also be sure to specify the pagination path information into the start_name argument
+		* @var string on_page is the page for which we want to generate the link
+		* @var string start_name is the name of the parameter containing the first item of the given page (example: start=20)
+		*							If you use page numbers inside your controller route, start name should be the string
+		*							that should be removed for the first page (example: /page/%d)
+		* @var int per_page the number of items, posts, etc. to display per page, used to determine the number of pages to produce
+		* @var bool|string generate_page_link_override Shall we return custom pagination link (string URL) or not (false)
+		* @since 3.1.0-RC5
+		*/
+		$vars = array('base_url', 'on_page', 'start_name', 'per_page', 'generate_page_link_override');
+		extract($this->phpbb_dispatcher->trigger_event('core.pagination_generate_page_link', compact($vars)));
+
+		if ($generate_page_link_override)
+		{
+			return $generate_page_link_override;
+		}
+
 		if (!is_string($base_url))
 		{
 			if (is_array($base_url['routes']))
diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php
index 613551bffd..fa8b4a1036 100644
--- a/tests/mock/event_dispatcher.php
+++ b/tests/mock/event_dispatcher.php
@@ -11,9 +11,18 @@
 *
 */
 
-class phpbb_mock_event_dispatcher
+class phpbb_mock_event_dispatcher extends \phpbb\event\dispatcher
 {
-	public function trigger_event($eventName, $data)
+	/**
+	* Constructor.
+	*
+	* Overwrite the constructor to get rid of ContainerInterface param instance
+	*/
+	public function __construct()
+	{
+	}
+
+	public function trigger_event($eventName, $data = array())
 	{
 		return array();
 	}
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index 95856dd07d..d36aa11a8a 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -28,7 +28,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 
 		global $phpbb_dispatcher;
 
-		$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
+		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
 		$this->user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
 		$this->user->expects($this->any())
 			->method('lang')
@@ -58,7 +58,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 		);
 
 		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, $symfony_request, $filesystem, '', 'php', dirname(__FILE__) . '/');
-		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper);
+		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher);
 	}
 
 	public function generate_template_pagination_data()