2 files changed, 30 insertions, 22 deletions
diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
index c2ec8c5bda..2779a23d34 100644
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -59,38 +59,39 @@ class phpbb_captcha_factory
 	*/
 	function get_captcha_types()
 	{
-		global $phpbb_root_path, $phpEx;
+		global $phpbb_root_path, $phpEx, $phpbb_extension_manager;
 
 		$captchas = array(
 			'available'		=> array(),
 			'unavailable'	=> array(),
 		);
 
-		$dp = @opendir($phpbb_root_path . 'includes/captcha/plugins');
+		$finder = $phpbb_extension_manager->get_finder();
+		$captcha_plugin_classes = $finder
+			->directory('/captcha')
+			->suffix('_plugin')
+			->default_path('includes/captcha/plugins/')
+			->default_directory('')
+			->get_classes();
 
-		if ($dp)
+		foreach ($captcha_plugin_classes as $class)
 		{
-			while (($file = readdir($dp)) !== false)
+			// check if this class needs to be loaded in legacy mode
+			$old_class = preg_replace('/^phpbb_captcha_plugins_/', '', $class);
+			if (file_exists($phpbb_root_path . "includes/captcha/plugins/$old_class.$phpEx") && !class_exists($old_class))
 			{
-				if ((preg_match('#_plugin\.' . $phpEx . '$#', $file)))
-				{
-					$name = preg_replace('#^(.*?)_plugin\.' . $phpEx . '$#', '\1', $file);
-					if (!class_exists($name))
-					{
-						include($phpbb_root_path . "includes/captcha/plugins/$file");
-					}
+				include($phpbb_root_path . "includes/captcha/plugins/$old_class.$phpEx");
+				$class = preg_replace('/_plugin$/', '', $old_class);
+			}
 
-					if (call_user_func(array($name, 'is_available')))
-					{
-						$captchas['available'][$name] = call_user_func(array($name, 'get_name'));
-					}
-					else
-					{
-						$captchas['unavailable'][$name] = call_user_func(array($name, 'get_name'));
-					}
-				}
+			if (call_user_func(array($class, 'is_available')))
+			{
+				$captchas['available'][$class] = call_user_func(array($class, 'get_name'));
+			}
+			else
+			{
+				$captchas['unavailable'][$class] = call_user_func(array($class, 'get_name'));
 			}
-			closedir($dp);
 		}
 
 		return $captchas;
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index aea39b3123..07a0ea1279 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -22,7 +22,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package VC
 */
-class phpbb_default_captcha
+class phpbb_captcha_plugins_captcha_abstract
 {
 	var $confirm_id;
 	var $confirm_code;
@@ -364,3 +364,10 @@ class phpbb_default_captcha
 	}
 
 }
+
+/**
+* Old class name for legacy use. The new class name is auto loadable.
+*/
+class phpbb_default_captcha extends phpbb_captcha_plugins_captcha_abstract
+{
+}