3 files changed, 77 insertions, 59 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index bef8ae0ea9..f051781547 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -104,13 +104,13 @@ class acp_captcha
 				foreach ($captchas['available'] as $value => $title)
 				{
 					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
-					$captcha_select .= '<option value="' . $value . '"' . $current . '>' . $user->lang[$title] . '</option>';
+					$captcha_select .= '<option value="' . $value . '"' . $current . '>' . $user->lang($title) . '</option>';
 				}
 
 				foreach ($captchas['unavailable'] as $value => $title)
 				{
 					$current = ($selected !== false && $value == $selected) ? ' selected="selected"' : '';
-					$captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option">' . $user->lang[$title] . '</option>';
+					$captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option">' . $user->lang($title) . '</option>';
 				}
 
 				$demo_captcha = phpbb_captcha_factory::get_instance($selected);
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php
index 52033b590c..e51b440d4d 100644
--- a/phpBB/includes/acp/acp_modules.php
+++ b/phpBB/includes/acp/acp_modules.php
@@ -111,7 +111,7 @@ class acp_modules
 				}
 
 			break;
-			
+
 			case 'enable':
 			case 'disable':
 				if (!$module_id)
@@ -170,7 +170,7 @@ class acp_modules
 					add_log('admin', 'LOG_MODULE_' . strtoupper($action), $this->lang_name($row['module_langname']), $move_module_name);
 					$this->remove_cache_file();
 				}
-		
+
 			break;
 
 			case 'quickadd':
@@ -207,7 +207,7 @@ class acp_modules
 						if (!sizeof($errors))
 						{
 							$this->remove_cache_file();
-	
+
 							trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
 						}
 					}
@@ -231,7 +231,7 @@ class acp_modules
 				{
 					trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
 				}
-				
+
 				$module_row = $this->get_module_row($module_id);
 
 			// no break
@@ -250,7 +250,7 @@ class acp_modules
 						'module_auth'		=> '',
 					);
 				}
-				
+
 				$module_data = array();
 
 				$module_data['module_basename'] = request_var('module_basename', (string) $module_row['module_basename']);
@@ -295,7 +295,7 @@ class acp_modules
 					if (!sizeof($errors))
 					{
 						$this->remove_cache_file();
-	
+
 						trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
 					}
 				}
@@ -316,7 +316,7 @@ class acp_modules
 					}
 
 					// Name options
-					$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_basename']) ? ' selected="selected"' : '') . '>' . $this->lang_name($values['title']) . ' [' . $this->module_class . '_' . $option . ']</option>';
+					$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_basename']) ? ' selected="selected"' : '') . '>' . $this->lang_name($values['title']) . ' [' . $option . ']</option>';
 
 					$template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option)));
 
@@ -327,7 +327,7 @@ class acp_modules
 						{
 							$s_mode_options .= '<option value="' . $m_mode . '"' . (($m_mode == $module_data['module_mode']) ? ' selected="selected"' : '') . '>' . $this->lang_name($m_values['title']) . '</option>';
 						}
-						
+
 						$template->assign_block_vars('m_names.modes', array(
 							'OPTION'		=> $m_mode,
 							'VALUE'			=> $this->lang_name($m_values['title']),
@@ -336,7 +336,7 @@ class acp_modules
 						);
 					}
 				}
-				
+
 				$s_cat_option = '<option value="0"' . (($module_data['parent_id'] == 0) ? ' selected="selected"' : '') . '>' . $user->lang['NO_PARENT'] . '</option>';
 
 				$template->assign_vars(array_merge(array(
@@ -349,7 +349,7 @@ class acp_modules
 					'U_EDIT_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
 
 					'L_TITLE'			=> $user->lang[strtoupper($action) . '_MODULE'],
-					
+
 					'MODULENAME'		=> $this->lang_name($module_data['module_langname']),
 					'ACTION'			=> $action,
 					'MODULE_ID'			=> $module_id,
@@ -480,7 +480,7 @@ class acp_modules
 		foreach ($module_infos as $option => $values)
 		{
 			// Name options
-			$s_install_options .= '<optgroup label="' . $this->lang_name($values['title']) . ' [' . $this->module_class . '_' . $option . ']">';
+			$s_install_options .= '<optgroup label="' . $this->lang_name($values['title']) . ' [' . $option . ']">';
 
 			// Build module modes
 			foreach ($values['modes'] as $m_mode => $m_values)
@@ -516,7 +516,7 @@ class acp_modules
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
-		
+
 		if (!$row)
 		{
 			trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
@@ -524,14 +524,14 @@ class acp_modules
 
 		return $row;
 	}
-	
+
 	/**
 	* Get available module information from module files
 	*/
 	function get_module_infos($module = '', $module_class = false)
 	{
 		global $phpbb_root_path, $phpEx;
-		
+
 		$module_class = ($module_class === false) ? $this->module_class : $module_class;
 
 		$directory = $phpbb_root_path . 'includes/' . $module_class . '/info/';
@@ -539,57 +539,72 @@ class acp_modules
 
 		if (!$module)
 		{
-			$dh = @opendir($directory);
+			global $phpbb_extension_manager;
 
-			if (!$dh)
-			{
-				return $fileinfo;
-			}
+			$finder = $phpbb_extension_manager->get_finder();
+
+			$modules = $finder
+				->extension_suffix('_module')
+				->extension_directory("/$module_class")
+				->core_path("includes/$module_class/info/")
+				->core_prefix($module_class . '_')
+				->get_classes();
 
-			while (($file = readdir($dh)) !== false)
+			foreach ($modules as $module)
 			{
-				// Is module?
-				if (preg_match('/^' . $module_class . '_.+\.' . $phpEx . '$/', $file))
-				{
-					$class = str_replace(".$phpEx", '', $file) . '_info';
+				$info_class = preg_replace('/_module$/', '_info', $module);
 
-					if (!class_exists($class))
+				// If the class does not exist it might be following the old
+				// format. phpbb_acp_info_acp_foo needs to be turned into
+				// acp_foo_info and the respective file has to be included
+				// manually because it does not support auto loading
+				if (!class_exists($info_class))
+				{
+					$info_class = str_replace("phpbb_{$module_class}_info_", '', $module) . '_info';
+					if (file_exists($directory . $info_class . '.' . $phpEx))
 					{
-						include($directory . $file);
+						include($directory . $info_class . '.' . $phpEx);
 					}
+				}
 
-					// Get module title tag
-					if (class_exists($class))
-					{
-						$c_class = new $class();
-						$module_info = $c_class->module();
-						$fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info;
-					}
+				if (class_exists($info_class))
+				{
+					$info = new $info_class();
+					$module_info = $info->module();
+
+					$main_class = (isset($module_info['filename'])) ? $module_info['filename'] : $module;
+
+					$fileinfo[$main_class] = $module_info;
 				}
 			}
-			closedir($dh);
 
 			ksort($fileinfo);
 		}
 		else
 		{
-			$filename = $module_class . '_' . basename($module);
-			$class = $module_class . '_' . basename($module) . '_info';
+			$info_class = preg_replace('/_module$/', '_info', $module);
 
-			if (!class_exists($class))
+			if (!class_exists($info_class))
 			{
-				include($directory . $filename . '.' . $phpEx);
+				if (file_exists($directory . $module . '.' . $phpEx))
+				{
+					include($directory . $module . '.' . $phpEx);
+				}
+				$info_class = $module . '_info';
 			}
 
 			// Get module title tag
-			if (class_exists($class))
+			if (class_exists($info_class))
 			{
-				$c_class = new $class();
-				$module_info = $c_class->module();
-				$fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info;
+				$info = new $info_class();
+				$module_info = $info->module();
+
+				$main_class = (isset($module_info['filename'])) ? $module_info['filename'] : $module;
+
+				$fileinfo[$main_class] = $module_info;
 			}
 		}
-		
+
 		return $fileinfo;
 	}
 
@@ -721,7 +736,7 @@ class acp_modules
 
 		// Sanitise for future path use, it's escaped as appropriate for queries
 		$p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class));
-		
+
 		$cache->destroy('_modules_' . $p_class);
 
 		// Additionally remove sql cache
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index a3061ae2da..049a70647f 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -77,7 +77,8 @@ class acp_search
 				continue;
 			}
 
-			$name = ucfirst(strtolower(str_replace('_', ' ', $type)));
+			$name = $search->get_name();
+
 			$selected = ($config['search_type'] == $type) ? ' selected="selected"' : '';
 			$search_options .= '<option value="' . $type . '"' . $selected . '>' . $name . '</option>';
 
@@ -275,7 +276,7 @@ class acp_search
 			{
 				trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
 			}
-			$name = ucfirst(strtolower(str_replace('_', ' ', $this->state[0])));
+			$name = $this->search->get_name();
 
 			$action = &$this->state[1];
 
@@ -454,7 +455,7 @@ class acp_search
 				continue;
 			}
 
-			$name = ucfirst(strtolower(str_replace('_', ' ', $type)));
+			$name = $search->get_name();
 
 			$data = array();
 			if (method_exists($search, 'index_stats'))
@@ -553,8 +554,17 @@ class acp_search
 
 	function get_search_types()
 	{
-		global $phpbb_root_path, $phpEx;
+		global $phpbb_root_path, $phpEx, $phpbb_extension_manager;
+
+		$finder = $phpbb_extension_manager->get_finder();
+
+		return $finder
+			->extension_suffix('_backend')
+			->extension_directory('/search')
+			->core_path('includes/search/')
+			->get_classes();
 
+/*
 		$search_types = array();
 
 		$dp = @opendir($phpbb_root_path . 'includes/search');
@@ -574,6 +584,7 @@ class acp_search
 		}
 
 		return $search_types;
+*/
 	}
 
 	function get_max_post_id()
@@ -610,15 +621,7 @@ class acp_search
 	{
 		global $phpbb_root_path, $phpEx, $user;
 
-		if (!preg_match('#^\w+$#', $type) || !file_exists("{$phpbb_root_path}includes/search/$type.$phpEx"))
-		{
-			$error = $user->lang['NO_SUCH_SEARCH_MODULE'];
-			return $error;
-		}
-
-		include_once("{$phpbb_root_path}includes/search/$type.$phpEx");
-
-		if (!class_exists($type))
+		if (!class_exists($type) || !method_exists($type, 'get_name'))
 		{
 			$error = $user->lang['NO_SUCH_SEARCH_MODULE'];
 			return $error;