5 files changed, 33 insertions, 29 deletions
diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index ab45aa9db6..3a82457c4a 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -2226,8 +2226,8 @@ class colour_manager
 			return $this->random_colour($colour, $mode);
 		}
 
-		$rgb		= colour_manager::model_convert($colour, $mode, 'rgb');
-		$store		= ($this->mode == 'rgb') ? $rgb : colour_manager::model_convert($colour, $mode, $this->mode);
+		$rgb		= $this->model_convert($colour, $mode, 'rgb');
+		$store		= ($this->mode == 'rgb') ? $rgb : $this->model_convert($colour, $mode, $this->mode);
 		$resource	= imagecolorallocate($this->img, $rgb[0], $rgb[1], $rgb[2]);
 		$this->colours[$resource] = $store;
 
@@ -2345,7 +2345,7 @@ class colour_manager
 			$resource = $pre;
 		}
 
-		$colour = colour_manager::model_convert($this->colours[$resource], $this->mode, $mode);
+		$colour = $this->model_convert($this->colours[$resource], $this->mode, $mode);
 		$results = ($include_original) ? array($resource) : array();
 		$colour2 = $colour3 = $colour4 = $colour;
 		$colour2[0] += 150;
@@ -2380,7 +2380,7 @@ class colour_manager
 			$resource = $pre;
 		}
 
-		$colour = colour_manager::model_convert($this->colours[$resource], $this->mode, $mode);
+		$colour = $this->model_convert($this->colours[$resource], $this->mode, $mode);
 
 		$results = array();
 		if ($include_original)
@@ -2418,11 +2418,11 @@ class colour_manager
 				switch ($from_model)
 				{
 					case 'ahsv':
-						return colour_manager::ah2h($colour);
+						return $this->ah2h($colour);
 					break;
 
 					case 'rgb':
-						return colour_manager::rgb2hsv($colour);
+						return $this->rgb2hsv($colour);
 					break;
 				}
 			break;
@@ -2432,11 +2432,11 @@ class colour_manager
 				switch ($from_model)
 				{
 					case 'hsv':
-						return colour_manager::h2ah($colour);
+						return $this->h2ah($colour);
 					break;
 
 					case 'rgb':
-						return colour_manager::h2ah(colour_manager::rgb2hsv($colour));
+						return $this->h2ah($this->rgb2hsv($colour));
 					break;
 				}
 			break;
@@ -2445,11 +2445,11 @@ class colour_manager
 				switch ($from_model)
 				{
 					case 'hsv':
-						return colour_manager::hsv2rgb($colour);
+						return $this->hsv2rgb($colour);
 					break;
 
 					case 'ahsv':
-						return colour_manager::hsv2rgb(colour_manager::ah2h($colour));
+						return $this->hsv2rgb($this->ah2h($colour));
 					break;
 				}
 			break;
@@ -2462,7 +2462,7 @@ class colour_manager
 	*/
 	function hsv2rgb($hsv)
 	{
-		colour_manager::normalize_hue($hsv[0]);
+		$this->normalize_hue($hsv[0]);
 
 		$h = $hsv[0];
 		$s = min(1, max(0, $hsv[1] / 100));
@@ -2554,7 +2554,7 @@ class colour_manager
 				break;
 			}
 		}
-		colour_manager::normalize_hue($h);
+		$this->normalize_hue($h);
 
 		return array($h, $s * 100, $v * 100);
 	}
@@ -2578,10 +2578,10 @@ class colour_manager
 	{
 		if (is_array($ahue))
 		{
-			$ahue[0] = colour_manager::ah2h($ahue[0]);
+			$ahue[0] = $this->ah2h($ahue[0]);
 			return $ahue;
 		}
-		colour_manager::normalize_hue($ahue);
+		$this->normalize_hue($ahue);
 
 		// blue through red is already ok
 		if ($ahue >= 240)
@@ -2612,10 +2612,10 @@ class colour_manager
 	{
 		if (is_array($hue))
 		{
-			$hue[0] = colour_manager::h2ah($hue[0]);
+			$hue[0] = $this->h2ah($hue[0]);
 			return $hue;
 		}
-		colour_manager::normalize_hue($hue);
+		$this->normalize_hue($hue);
 
 		// blue through red is already ok
 		if ($hue >= 240)
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 6ceeb50330..907252f6d8 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -768,13 +768,15 @@ class queue
 
 					if (!$this->jabber->connect())
 					{
-						messenger::error('JABBER', $user->lang['ERR_JAB_CONNECT']);
+						$messenger = new messenger();
+						$messenger->error('JABBER', $user->lang['ERR_JAB_CONNECT']);
 						continue 2;
 					}
 
 					if (!$this->jabber->login())
 					{
-						messenger::error('JABBER', $user->lang['ERR_JAB_AUTH']);
+						$messenger = new messenger();
+						$messenger->error('JABBER', $user->lang['ERR_JAB_AUTH']);
 						continue 2;
 					}
 
@@ -807,7 +809,8 @@ class queue
 
 						if (!$result)
 						{
-							messenger::error('EMAIL', $err_msg);
+							$messenger = new messenger();
+							$messenger->error('EMAIL', $err_msg);
 							continue 2;
 						}
 					break;
@@ -817,7 +820,8 @@ class queue
 						{
 							if ($this->jabber->send_message($address, $msg, $subject) === false)
 							{
-								messenger::error('JABBER', $this->jabber->get_log());
+								$messenger = new messenger();
+								$messenger->error('JABBER', $this->jabber->get_log());
 								continue 3;
 							}
 						}
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 53055752f6..28af7994c8 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -495,7 +495,7 @@ class p_master
 
 		if ($this->active_module === false)
 		{
-			trigger_error('Module not accessible', E_USER_ERROR);
+			trigger_error('MODULE_NOT_ACCESS', E_USER_ERROR);
 		}
 
 		// new modules use the full class names, old ones are always called <type>_<name>, e.g. acp_board
@@ -503,14 +503,14 @@ class p_master
 		{
 			if (!file_exists("$module_path/{$this->p_name}.$phpEx"))
 			{
-				trigger_error("Cannot find module $module_path/{$this->p_name}.$phpEx", E_USER_ERROR);
+				trigger_error($user->lang('MODULE_NOT_FIND', "$module_path/{$this->p_name}.$phpEx"), E_USER_ERROR);
 			}
 
 			include("$module_path/{$this->p_name}.$phpEx");
 
 			if (!class_exists($this->p_name))
 			{
-				trigger_error("Module file $module_path/{$this->p_name}.$phpEx does not contain correct class [{$this->p_name}]", E_USER_ERROR);
+				trigger_error($user->lang('MODULE_FILE_RIGHT_CLASS', "$module_path/{$this->p_name}.$phpEx", $this->p_name), E_USER_ERROR);
 			}
 		}
 
diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php
index 9bec17ca8f..17b458d2cb 100644
--- a/phpBB/includes/functions_transfer.php
+++ b/phpBB/includes/functions_transfer.php
@@ -279,7 +279,7 @@ class ftp extends transfer
 		}
 
 		// Init some needed values
-		transfer::transfer();
+		$this->transfer();
 
 		return;
 	}
@@ -533,7 +533,7 @@ class ftp_fsock extends transfer
 		}
 
 		// Init some needed values
-		transfer::transfer();
+		$this->transfer();
 
 		return;
 	}
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
index c5d6815119..8e5ae20f93 100644
--- a/phpBB/includes/functions_url_matcher.php
+++ b/phpBB/includes/functions_url_matcher.php
@@ -53,8 +53,8 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $
 */
 function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext)
 {
-	$provider = new \phpbb\controller\provider();
-	$routes = $provider->import_paths_from_finder($finder)->find($root_path);
+	$provider = new \phpbb\controller\provider($finder);
+	$routes = $provider->find($root_path)->get_routes();
 	$dumper = new PhpMatcherDumper($routes);
 	$cached_url_matcher_dump = $dumper->dump(array(
 		'class'			=> 'phpbb_url_matcher',
@@ -72,8 +72,8 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_
 */
 function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path)
 {
-	$provider = new \phpbb\controller\provider();
-	$routes = $provider->import_paths_from_finder($finder)->find($root_path);
+	$provider = new \phpbb\controller\provider($finder);
+	$routes = $provider->find($root_path)->get_routes();
 	return new UrlMatcher($routes, $context);
 }