diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-09 05:26:44 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-09 05:26:44 -0400 |
| commit | 69cb2e4c603243f75fcfd288d0018390b763ce05 (patch) | |
| tree | 5af7dc8ab251e9230a14c3363d97aff1c1e6b359 /phpBB | |
| parent | 0b80aaf2178e5a40f9429ce972c490f6067ef114 (diff) | |
| download | forums-69cb2e4c603243f75fcfd288d0018390b763ce05.tar forums-69cb2e4c603243f75fcfd288d0018390b763ce05.tar.gz forums-69cb2e4c603243f75fcfd288d0018390b763ce05.tar.bz2 forums-69cb2e4c603243f75fcfd288d0018390b763ce05.tar.xz forums-69cb2e4c603243f75fcfd288d0018390b763ce05.zip | |
[feature/oauth] More template work
PHPBB3-11673
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_auth_link.php | 3 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 10 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_auth_link.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_auth_link_oauth.html | 5 |
4 files changed, 19 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_auth_link.php b/phpBB/includes/ucp/ucp_auth_link.php index c1d97c8cf8..cb6d85d6b7 100644 --- a/phpBB/includes/ucp/ucp_auth_link.php +++ b/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, )); diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 4973cde349..d27e40ca77 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/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', + ); + } } diff --git a/phpBB/styles/prosilver/template/ucp_auth_link.html b/phpBB/styles/prosilver/template/ucp_auth_link.html index b521518bf3..5e5fc6d2f0 100644 --- a/phpBB/styles/prosilver/template/ucp_auth_link.html +++ b/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 --> diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html new file mode 100644 index 0000000000..ca13ff0ab6 --- /dev/null +++ b/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>
\ No newline at end of file |