makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/auth-refactor] Refactor auth in acp_board

Browse source 
Changes the acp_board code to directly call the auth providers out
of the $auth_providers variable that is populated by the
phpbb_container.

PHPBB3-9734
This commit is contained in:
Joseph Warner 2013-06-25 22:21:38 -04:00
parent b78b6711c8
commit 3c394aee62
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/includes/acp/acp_board.php
View file

@ -525,20 +525,10 @@ class acp_board
$auth_plugins = array(); $auth_plugins = array();
$auth_providers = $phpbb_container->get('auth.provider_collection'); $auth_providers = $phpbb_container->get('auth.provider_collection');
foreach($auth_providers as $key => $value)
{
$auth_plugins[] = $key;
}
$updated_auth_settings = false; $updated_auth_settings = false;
$old_auth_config = array(); $old_auth_config = array();
foreach ($auth_plugins as $method) foreach ($auth_providers as $provider)
{ {
if ($method)
{
$provider = $auth_providers[$method];
if ($provider)
{
if ($fields = $provider->acp($this->new_config)) if ($fields = $provider->acp($this->new_config))
{ {
// Check if we need to create config fields for this plugin and save config when submit was pressed // Check if we need to create config fields for this plugin and save config when submit was pressed
@ -566,8 +556,6 @@ class acp_board
} }
} }
unset($fields); unset($fields);
}
}
} }
if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings)) if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings))
@ -575,7 +563,7 @@ class acp_board
$method = basename($cfg_array['auth_method']); $method = basename($cfg_array['auth_method']);
if ($method) if ($method)
{ {
$provider = $auth_providers[$method]; $provider = $auth_providers['auth.provider.' . $method];
if ($provider) if ($provider)
{ {
if ($error = $provider->init()) if ($error = $provider->init())
@ -669,13 +657,8 @@ class acp_board
{ {
$template->assign_var('S_AUTH', true); $template->assign_var('S_AUTH', true);
foreach ($auth_plugins as $method) foreach ($auth_provider as $provider)
{ {
if ($method)
{
$provider = $auth_providers[$method];
if ($provider)
{
$fields = $provider->acp($this->new_config); $fields = $provider->acp($this->new_config);
if ($fields['tpl']) if ($fields['tpl'])
@ -685,8 +668,6 @@ class acp_board
); );
} }
unset($fields); unset($fields);
}
}
} }
} }
} }