From e2435f25d90913455e0b8ffd92fb0918cf6f376f Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 14:54:00 -0400
Subject: [feature/auth-refactor] Check that providers implement auth interface

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/includes/acp/acp_board.php')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 24b913260b..19219f6323 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -563,6 +563,12 @@ class acp_board
 				if (array_key_exists('auth.provider.' . $method, $auth_providers))
 				{
 					$provider = $auth_providers['auth.provider.' . $method];
+
+					if (!($provider instanceof phpbb_auth_provider_interface))
+					{
+						throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
+					}
+
 					if ($error = $provider->init())
 					{
 						foreach ($old_auth_config as $config_name => $config_value)
-- 
cgit v1.2.1


From 9c0495664d8d89c5ee8e6187e40afbe353acf033 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 15:45:44 -0400
Subject: [feature/auth-refactor] Remove invalid providers from acp select

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/acp/acp_board.php')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 19219f6323..f142801b72 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -563,12 +563,6 @@ class acp_board
 				if (array_key_exists('auth.provider.' . $method, $auth_providers))
 				{
 					$provider = $auth_providers['auth.provider.' . $method];
-
-					if (!($provider instanceof phpbb_auth_provider_interface))
-					{
-						throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
-					}
-
 					if ($error = $provider->init())
 					{
 						foreach ($old_auth_config as $config_name => $config_value)
@@ -686,6 +680,10 @@ class acp_board
 
 		foreach($auth_providers as $key => $value)
 		{
+			if (!($provider instanceof phpbb_auth_provider_interface))
+			{
+				continue;
+			}
 			$auth_plugins[] = str_replace('auth.provider.', '', $key);
 		}
 
-- 
cgit v1.2.1


From a64a042830d3b0189e35ff0abe0649bff7105a1b Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 17:39:34 -0400
Subject: [feature/auth-refactor] Fix typo

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/acp/acp_board.php')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index f142801b72..7a3c4990d5 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -680,7 +680,7 @@ class acp_board
 
 		foreach($auth_providers as $key => $value)
 		{
-			if (!($provider instanceof phpbb_auth_provider_interface))
+			if (!($value instanceof phpbb_auth_provider_interface))
 			{
 				continue;
 			}
-- 
cgit v1.2.1


From f4f29a1c0ae04c3a3d41aee822d7c858f39f5295 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 11 Jul 2013 17:43:20 -0400
Subject: [feature/auth-refactor] Fix style issue

PHPBB3-9734
---
 phpBB/includes/acp/acp_board.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/acp/acp_board.php')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 7a3c4990d5..7627ff0b56 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -678,7 +678,7 @@ class acp_board
 		$auth_plugins = array();
 		$auth_providers = $phpbb_container->get('auth.provider_collection');
 
-		foreach($auth_providers as $key => $value)
+		foreach ($auth_providers as $key => $value)
 		{
 			if (!($value instanceof phpbb_auth_provider_interface))
 			{
-- 
cgit v1.2.1