2 files changed, 43 insertions, 8 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 8809a0c6b4..c7ebd1fb7f 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -221,24 +221,33 @@ class oauth extends \phpbb\auth\provider\base
 				'provider'	=> $service_name_original,
 				'oauth_provider_id'	=> $unique_id
 			);
+
 			$sql = 'SELECT user_id FROM ' . $this->auth_provider_oauth_token_account_assoc . '
 				WHERE ' . $this->db->sql_build_array('SELECT', $data);
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 
+			$redirect_data = array(
+				'auth_provider'				=> 'oauth',
+				'login_link_oauth_service'	=> $service_name_original,
+			);
+
 			/**
 			* Event is triggered before check if provider is already associated with an account
 			*
 			* @event core.oauth_login_after_check_if_provider_id_has_match
-			* @var	array									row		User row
-			* @var	array									data	Provider data
-			* @var	\OAuth\Common\Service\ServiceInterface	service	OAuth service
+			* @var	array									row				User row
+			* @var	array									data			Provider data
+			* @var	array									redirect_data	Data to be appended to the redirect url
+			* @var	\OAuth\Common\Service\ServiceInterface	service			OAuth service
 			* @since 3.2.3-RC1
+			* @changed 3.2.6-RC1 Added redirect_data
 			*/
 			$vars = array(
 				'row',
 				'data',
+				'redirect_data',
 				'service',
 			);
 			extract($this->dispatcher->trigger_event('core.oauth_login_after_check_if_provider_id_has_match', compact($vars)));
@@ -250,10 +259,7 @@ class oauth extends \phpbb\auth\provider\base
 					'status'		=> LOGIN_SUCCESS_LINK_PROFILE,
 					'error_msg'		=> 'LOGIN_OAUTH_ACCOUNT_NOT_LINKED',
 					'user_row'		=> array(),
-					'redirect_data'	=> array(
-						'auth_provider'				=> 'oauth',
-						'login_link_oauth_service'	=> $service_name_original,
-					),
+					'redirect_data'	=> $redirect_data,
 				);
 			}
 
@@ -674,6 +680,7 @@ class oauth extends \phpbb\auth\provider\base
 						'oauth_service' => $actual_name,
 					),
 
+					'SERVICE_ID'	=> $actual_name,
 					'SERVICE_NAME'	=> $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],
 					'UNIQUE_ID'		=> (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null,
 				);
diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php
index 96b8d3499e..ae1c1d8614 100644
--- a/phpBB/phpbb/message/admin_form.php
+++ b/phpBB/phpbb/message/admin_form.php
@@ -22,6 +22,9 @@ class admin_form extends form
 	/** @var \phpbb\config\db_text */
 	protected $config_text;
 
+	/** @var \phpbb\event\dispatcher_interface */
+	protected $dispatcher;
+
 	/** @var string */
 	protected $subject;
 	/** @var string */
@@ -37,13 +40,15 @@ class admin_form extends form
 	* @param \phpbb\config\db_text $config_text
 	* @param \phpbb\db\driver\driver_interface $db
 	* @param \phpbb\user $user
+	* @param \phpbb\event\dispatcher_interface $dispatcher
 	* @param string $phpbb_root_path
 	* @param string $phpEx
 	*/
-	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path, $phpEx)
+	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\event\dispatcher_interface $dispatcher, $phpbb_root_path, $phpEx)
 	{
 		parent::__construct($auth, $config, $db, $user, $phpbb_root_path, $phpEx);
 		$this->config_text = $config_text;
+		$this->dispatcher = $dispatcher;
 	}
 
 	/**
@@ -91,6 +96,29 @@ class admin_form extends form
 			$this->errors[] = $this->user->lang['EMPTY_MESSAGE_EMAIL'];
 		}
 
+		$subject = $this->subject;
+		$body = $this->body;
+		$errors = $this->errors;
+
+		/**
+		* You can use this event to modify subject and/or body and add new errors.
+		*
+		* @event core.message_admin_form_submit_before
+		* @var	string	subject	Message subject
+		* @var	string	body	Message body
+		* @var	array	errors	Form errors
+		* @since 3.2.6-RC1
+		*/
+		$vars = [
+			'subject',
+			'body',
+			'errors',
+		];
+		extract($this->dispatcher->trigger_event('core.message_admin_form_submit_before', compact($vars)));
+		$this->subject = $subject;
+		$this->body = $body;
+		$this->errors = $errors;
+
 		if ($this->user->data['is_registered'])
 		{
 			$this->message->set_sender_from_user($this->user);