[feature/oauth] More template work

PHPBB3-11673

phpBB/includes/ucp/ucp_auth_link.php

@@ -30,6 +30,7 @@ class ucp_auth_link
 		if ($provider_data === null)
 		{
 			// does not support this page, throw error?
+			throw new Exception('TEMPORARY EXCEPTION');
 		}
 
 		$error = array();
@@ -54,6 +55,8 @@ class ucp_auth_link
 		$s_hidden_fields = build_hidden_fields($s_hidden_fields);
 
 		$template->assign_vars(array(
+			'PROVIDER_TEMPLATE_FILE'	=> $provider_data['TEMPLATE_FILE'],
+
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
 			'S_UCP_ACTION'		=> $this->u_action,
 		));

phpBB/phpbb/auth/provider/oauth/oauth.php

@@ -442,4 +442,14 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
 
 		return;
 	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_auth_link_data()
+	{
+		return array(
+			'TEMPLATE_FILE'	=> 'ucp_auth_link_oauth.html',
+		);
+	}
 }

phpBB/styles/prosilver/template/ucp_auth_link.html

@@ -2,10 +2,6 @@
 
 <h2>{L_UCP_AUTH_LINK_TITLE}</h2>
 
-<form id="ucp" method="post" action="{S_UCP_ACTION}">
-
-{S_HIDDEN_FIELDS}
-{S_FORM_TOKEN}
-</form>
+<!-- INCLUDE {PROVIDER_TEMPLATE_FILE} -->
 
 <!-- INCLUDE ucp_footer.html -->

phpBB/styles/prosilver/template/ucp_auth_link_oauth.html

@@ -0,0 +1,5 @@
+<form id="ucp" method="post" action="{S_UCP_ACTION}">
+
+{S_HIDDEN_FIELDS}
+{S_FORM_TOKEN}
+</form>