1 files changed, 18 insertions, 35 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 0222a57bcc..f8b01bc770 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -21,13 +21,13 @@ if (!defined('IN_PHPBB'))
 */
 class messenger
 {
-	var $vars, $msg, $extra_headers, $replyto, $from, $subject;
+	var $msg, $extra_headers, $replyto, $from, $subject;
 	var $addresses = array();
 
 	var $mail_priority = MAIL_NORMAL_PRIORITY;
 	var $use_queue = true;
 
-	/** @var phpbb_template */
+	/** @var \phpbb\template\template */
 	protected $template;
 
 	var $eol = "\n";
@@ -53,7 +53,7 @@ class messenger
 	function reset()
 	{
 		$this->addresses = $this->extra_headers = array();
-		$this->vars = $this->msg = $this->replyto = $this->from = '';
+		$this->msg = $this->replyto = $this->from = '';
 		$this->mail_priority = MAIL_NORMAL_PRIORITY;
 	}
 
@@ -258,8 +258,6 @@ class messenger
 			'body'		=> $template_file . '.txt',
 		));
 
-		$this->vars = $this->template->get_template_vars();
-
 		return true;
 	}
 
@@ -288,26 +286,11 @@ class messenger
 		global $config, $user;
 
 		// We add some standard variables we always use, no need to specify them always
-		if (!isset($this->vars['U_BOARD']))
-		{
-			$this->assign_vars(array(
-				'U_BOARD'	=> generate_board_url(),
-			));
-		}
-
-		if (!isset($this->vars['EMAIL_SIG']))
-		{
-			$this->assign_vars(array(
-				'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
-			));
-		}
-
-		if (!isset($this->vars['SITENAME']))
-		{
-			$this->assign_vars(array(
-				'SITENAME'	=> htmlspecialchars_decode($config['sitename']),
-			));
-		}
+		$this->assign_vars(array(
+			'U_BOARD'	=> generate_board_url(),
+			'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])),
+			'SITENAME'	=> htmlspecialchars_decode($config['sitename']),
+		));
 
 		// Parse message through template
 		$this->msg = trim($this->template->assign_display('body'));
@@ -643,14 +626,14 @@ class messenger
 	*/
 	protected function setup_template()
 	{
-		global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
+		global $config, $phpbb_filesystem, $user, $phpbb_extension_manager;
 
-		if ($this->template instanceof phpbb_template)
+		if ($this->template instanceof \phpbb\template\template)
 		{
 			return;
 		}
 
-		$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
+		$this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new \phpbb\template\context(), $phpbb_extension_manager);
 	}
 
 	/**
@@ -660,7 +643,7 @@ class messenger
 	{
 		$this->setup_template();
 
-		$this->template->set_style_names(array($path_name), $paths);
+		$this->template->set_custom_style($path_name, $paths);
 	}
 }
 
@@ -717,7 +700,7 @@ class queue
 	{
 		global $db, $config, $phpEx, $phpbb_root_path, $user;
 
-		$lock = new phpbb_lock_flock($this->cache_file);
+		$lock = new \phpbb\lock\flock($this->cache_file);
 		$lock->acquire();
 
 		// avoid races, check file existence once
@@ -887,7 +870,7 @@ class queue
 			return;
 		}
 
-		$lock = new phpbb_lock_flock($this->cache_file);
+		$lock = new \phpbb\lock\flock($this->cache_file);
 		$lock->acquire();
 
 		if (file_exists($this->cache_file))
@@ -1004,12 +987,12 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false)
 	$smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']);
 
 	// Ok we have error checked as much as we can to this point let's get on it already.
-	if (!class_exists('phpbb_error_collector'))
+	if (!class_exists('\phpbb\error_collector'))
 	{
 		global $phpbb_root_path, $phpEx;
 		include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
 	}
-	$collector = new phpbb_error_collector;
+	$collector = new \phpbb\error_collector;
 	$collector->install();
 	$smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20);
 	$collector->uninstall();
@@ -1723,12 +1706,12 @@ function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg)
 	// Reference: http://bugs.php.net/bug.php?id=15841
 	$headers = implode($eol, $headers);
 
-	if (!class_exists('phpbb_error_collector'))
+	if (!class_exists('\phpbb\error_collector'))
 	{
 		include($phpbb_root_path . 'includes/error_collector.' . $phpEx);
 	}
 
-	$collector = new phpbb_error_collector;
+	$collector = new \phpbb\error_collector;
 	$collector->install();
 
 	// On some PHP Versions mail() *may* fail if there are newlines within the subject.