diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:36:24 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:36:24 -0400 |
| commit | 8352a7cadab7e16eb8eac29d869e06864acb1a93 (patch) | |
| tree | e78344d1237c9ca6e2d3004e4c6d2916c6514750 /phpBB/includes/auth/provider/interface.php | |
| parent | 28e3341fcde976754f122a9c540b20aa705658fc (diff) | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar.gz forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar.bz2 forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar.xz forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.zip | |
Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
Diffstat (limited to 'phpBB/includes/auth/provider/interface.php')
| -rw-r--r-- | phpBB/includes/auth/provider/interface.php | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/phpBB/includes/auth/provider/interface.php b/phpBB/includes/auth/provider/interface.php index 2d1935f8f0..47043bc107 100644 --- a/phpBB/includes/auth/provider/interface.php +++ b/phpBB/includes/auth/provider/interface.php @@ -60,16 +60,28 @@ interface phpbb_auth_provider_interface * This function is used to output any required fields in the authentication * admin panel. It also defines any required configuration table fields. * - * @param array $new Contains the new configuration values that have - * been set in acp_board. * @return array|null Returns null if not implemented or an array of the - * form: + * configuration fields of the provider. + */ + public function acp(); + + /** + * This function updates the template with variables related to the acp + * options with whatever configuraton values are passed to it as an array. + * It then returns the name of the acp file related to this authentication + * provider. + * @param array $new_config Contains the new configuration values that + * have been set in acp_board. + * @return array|null Returns null if not implemented or an array with + * the template file name and an array of the vars + * that the template needs that must conform to the + * following example: * array( - * 'tpl' => string - * 'config' => array + * 'TEMPLATE_FILE' => string, + * 'TEMPLATE_VARS' => array(...), * ) */ - public function acp($new); + public function get_acp_template($new_config); /** * Performs additional actions during logout. |