4 files changed, 50 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 02cdfd7ed1..79391aba56 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3367,6 +3367,26 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
 		$s_hidden_fields['credential'] = $credential;
 	}
 
+	$auth_provider = $phpbb_container->get('auth.provider.' . $config['auth_method']);
+
+	$auth_provider_data = $auth_provider->get_login_data();
+	if ($auth_provider_data)
+	{
+		if (isset($auth_provider_data['VARS']))
+		{
+			$template->assign_vars($auth_provider_data['VARS']);
+		}
+
+		if (isset($auth_provider_data['BLOCK_VAR_NAME']))
+		{
+			$template->assign_block_vars($auth_provider_data['BLOCK_VAR_NAME'], $auth_provider_data['BLOCK_VARS']);
+		}
+
+		$template->assign_vars(array(
+			'PROVIDER_TEMPLATE_FILE' => $auth_provider_data['TEMPLATE_FILE'],
+		));
+	}
+
 	$oauth_login = ($config['auth_method'] == 'oauth') ? true : false;
 
 	if ($oauth_login)
diff --git a/phpBB/phpbb/auth/provider/base.php b/phpBB/phpbb/auth/provider/base.php
index ca1c635b15..ae1daba82b 100644
--- a/phpBB/phpbb/auth/provider/base.php
+++ b/phpBB/phpbb/auth/provider/base.php
@@ -57,6 +57,14 @@ abstract class phpbb_auth_provider_base implements phpbb_auth_provider_interface
 	/**
 	* {@inheritdoc}
 	*/
+	public function get_login_data()
+	{
+		return;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
 	public function logout($data, $new_session)
 	{
 		return;
diff --git a/phpBB/phpbb/auth/provider/interface.php b/phpBB/phpbb/auth/provider/interface.php
index fd3fa7d879..21526fd858 100644
--- a/phpBB/phpbb/auth/provider/interface.php
+++ b/phpBB/phpbb/auth/provider/interface.php
@@ -107,6 +107,27 @@ interface phpbb_auth_provider_interface
 	public function get_acp_template($new_config);
 
 	/**
+	* Returns an array of data necessary to build custom elements on the login
+	* form.
+	*
+	* @return	array|null	If this function is not implemented on an auth
+	*						provider then it returns null. If it is implemented
+	*						it will return an array of up to four elements of
+	*						which only 'TEMPLATE_FILE'. If 'BLOCK_VAR_NAME' is
+	*						present then 'BLOCK_VARS' must also be present in
+	*						the array. The fourth element 'VARS' is also
+	*						optional. The array, with all four elements present
+	*						looks like the following:
+	*						array(
+	*							'TEMPLATE_FILE'		=> string,
+	*							'BLOCK_VAR_NAME'	=> string,
+	*							'BLOCK_VARS'		=> array(...),
+	*							'VARS'				=> array(...),
+	*						)
+	*/
+	public function get_login_data();
+
+	/**
 	 * Performs additional actions during logout.
 	 *
 	 * @param 	array	$data			An array corresponding to
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 8979f413b5..62024ff094 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -274,9 +274,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 	}
 
 	/**
-	* Returns an array of login data for all enabled OAuth services.
-	*
-	* @return	array
+	* {@inheritdoc}
 	*/
 	public function get_login_data()
 	{